diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
index 20aaae85a1e46..66b99ecf62065 100644
--- a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
+++ b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
@@ -27,8 +27,8 @@ class ContainerAwareEventManager extends EventManager
      *
      * <event> => <listeners>
      */
-    private $listeners = array();
-    private $initialized = array();
+    private $listeners = [];
+    private $initialized = [];
     private $container;
 
     public function __construct(ContainerInterface $container)
diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
index d06271d8d1e59..20fa37423fb21 100644
--- a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
+++ b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
@@ -33,7 +33,7 @@ class DoctrineDataCollector extends DataCollector
     /**
      * @var DebugStack[]
      */
-    private $loggers = array();
+    private $loggers = [];
 
     public function __construct(ManagerRegistry $registry)
     {
@@ -58,24 +58,24 @@ public function addLogger($name, DebugStack $logger)
      */
     public function collect(Request $request, Response $response, \Exception $exception = null)
     {
-        $queries = array();
+        $queries = [];
         foreach ($this->loggers as $name => $logger) {
             $queries[$name] = $this->sanitizeQueries($name, $logger->queries);
         }
 
-        $this->data = array(
+        $this->data = [
             'queries' => $queries,
             'connections' => $this->connections,
             'managers' => $this->managers,
-        );
+        ];
     }
 
     public function reset()
     {
-        $this->data = array();
+        $this->data = [];
 
         foreach ($this->loggers as $logger) {
-            $logger->queries = array();
+            $logger->queries = [];
             $logger->currentQuery = 0;
         }
     }
@@ -133,10 +133,10 @@ private function sanitizeQuery($connectionName, $query)
     {
         $query['explainable'] = true;
         if (null === $query['params']) {
-            $query['params'] = array();
+            $query['params'] = [];
         }
         if (!\is_array($query['params'])) {
-            $query['params'] = array($query['params']);
+            $query['params'] = [$query['params']];
         }
         foreach ($query['params'] as $j => $param) {
             if (isset($query['types'][$j])) {
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
index 449d6fe413539..8648c8aad99d1 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -27,12 +27,12 @@ abstract class AbstractDoctrineExtension extends Extension
     /**
      * Used inside metadata driver method to simplify aggregation of data.
      */
-    protected $aliasMap = array();
+    protected $aliasMap = [];
 
     /**
      * Used inside metadata driver method to simplify aggregation of data.
      */
-    protected $drivers = array();
+    protected $drivers = [];
 
     /**
      * @param array            $objectManager A configured object manager
@@ -46,10 +46,10 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder
             // automatically register bundle mappings
             foreach (array_keys($container->getParameter('kernel.bundles')) as $bundle) {
                 if (!isset($objectManager['mappings'][$bundle])) {
-                    $objectManager['mappings'][$bundle] = array(
+                    $objectManager['mappings'][$bundle] = [
                         'mapping' => true,
                         'is_bundle' => true,
-                    );
+                    ];
                 }
             }
         }
@@ -59,11 +59,11 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder
                 continue;
             }
 
-            $mappingConfig = array_replace(array(
+            $mappingConfig = array_replace([
                 'dir' => false,
                 'type' => false,
                 'prefix' => false,
-            ), (array) $mappingConfig);
+            ], (array) $mappingConfig);
 
             $mappingConfig['dir'] = $container->getParameterBag()->resolveValue($mappingConfig['dir']);
             // 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
         }
 
         if (!$bundleConfig['dir']) {
-            if (\in_array($bundleConfig['type'], array('annotation', 'staticphp'))) {
+            if (\in_array($bundleConfig['type'], ['annotation', 'staticphp'])) {
                 $bundleConfig['dir'] = $bundleDir.'/'.$this->getMappingObjectDefaultName();
             } else {
                 $bundleConfig['dir'] = $bundleDir.'/'.$this->getMappingResourceConfigDirectory();
@@ -197,25 +197,25 @@ protected function registerMappingDrivers($objectManager, ContainerBuilder $cont
                 }
                 $mappingDriverDef->setArguments($args);
             } elseif ('annotation' == $driverType) {
-                $mappingDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class%'), array(
+                $mappingDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class%'), [
                     new Reference($this->getObjectManagerElementName('metadata.annotation_reader')),
                     array_values($driverPaths),
-                ));
+                ]);
             } else {
-                $mappingDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class%'), array(
+                $mappingDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class%'), [
                     array_values($driverPaths),
-                ));
+                ]);
             }
             $mappingDriverDef->setPublic(false);
             if (false !== strpos($mappingDriverDef->getClass(), 'yml') || false !== strpos($mappingDriverDef->getClass(), 'xml')) {
-                $mappingDriverDef->setArguments(array(array_flip($driverPaths)));
-                $mappingDriverDef->addMethodCall('setGlobalBasename', array('mapping'));
+                $mappingDriverDef->setArguments([array_flip($driverPaths)]);
+                $mappingDriverDef->addMethodCall('setGlobalBasename', ['mapping']);
             }
 
             $container->setDefinition($mappingService, $mappingDriverDef);
 
             foreach ($driverPaths as $prefix => $driverPath) {
-                $chainDriverDef->addMethodCall('addDriver', array(new Reference($mappingService), $prefix));
+                $chainDriverDef->addMethodCall('addDriver', [new Reference($mappingService), $prefix]);
             }
         }
 
@@ -240,7 +240,7 @@ protected function assertValidMappingConfiguration(array $mappingConfig, $object
             throw new \InvalidArgumentException(sprintf('Specified non-existing directory "%s" as Doctrine mapping source.', $mappingConfig['dir']));
         }
 
-        if (!\in_array($mappingConfig['type'], array('xml', 'yml', 'annotation', 'php', 'staticphp'))) {
+        if (!\in_array($mappingConfig['type'], ['xml', 'yml', 'annotation', 'php', 'staticphp'])) {
             throw new \InvalidArgumentException(sprintf('Can only configure "xml", "yml", "annotation", "php" or '.
                 '"staticphp" through the DoctrineBundle. Use your own bundle to configure other metadata drivers. '.
                 'You can register them by adding a new driver to the '.
@@ -340,11 +340,11 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
                 $cacheDef = new Definition($memcachedClass);
                 $memcachedInstance = new Definition($memcachedInstanceClass);
                 $memcachedInstance->setPrivate(true);
-                $memcachedInstance->addMethodCall('addServer', array(
+                $memcachedInstance->addMethodCall('addServer', [
                     $memcachedHost, $memcachedPort,
-                ));
+                ]);
                 $container->setDefinition($this->getObjectManagerElementName(sprintf('%s_memcached_instance', $objectManagerName)), $memcachedInstance);
-                $cacheDef->addMethodCall('setMemcached', array(new Reference($this->getObjectManagerElementName(sprintf('%s_memcached_instance', $objectManagerName)))));
+                $cacheDef->addMethodCall('setMemcached', [new Reference($this->getObjectManagerElementName(sprintf('%s_memcached_instance', $objectManagerName)))]);
                 break;
              case 'redis':
                 $redisClass = !empty($cacheDriver['class']) ? $cacheDriver['class'] : '%'.$this->getObjectManagerElementName('cache.redis.class').'%';
@@ -354,11 +354,11 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
                 $cacheDef = new Definition($redisClass);
                 $redisInstance = new Definition($redisInstanceClass);
                 $redisInstance->setPrivate(true);
-                $redisInstance->addMethodCall('connect', array(
+                $redisInstance->addMethodCall('connect', [
                     $redisHost, $redisPort,
-                ));
+                ]);
                 $container->setDefinition($this->getObjectManagerElementName(sprintf('%s_redis_instance', $objectManagerName)), $redisInstance);
-                $cacheDef->addMethodCall('setRedis', array(new Reference($this->getObjectManagerElementName(sprintf('%s_redis_instance', $objectManagerName)))));
+                $cacheDef->addMethodCall('setRedis', [new Reference($this->getObjectManagerElementName(sprintf('%s_redis_instance', $objectManagerName)))]);
                 break;
             case 'apc':
             case 'apcu':
@@ -387,7 +387,7 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
             $cacheDriver['namespace'] = $namespace;
         }
 
-        $cacheDef->addMethodCall('setNamespace', array($cacheDriver['namespace']));
+        $cacheDef->addMethodCall('setNamespace', [$cacheDriver['namespace']]);
 
         $container->setDefinition($cacheDriverServiceId, $cacheDef);
 
@@ -410,10 +410,10 @@ protected function fixManagersAutoMappings(array $managerConfigs, array $bundles
                         continue 2;
                     }
                 }
-                $managerConfigs[$autoMappedManager]['mappings'][$bundle] = array(
+                $managerConfigs[$autoMappedManager]['mappings'][$bundle] = [
                     'mapping' => true,
                     'is_bundle' => true,
-                );
+                ];
             }
             $managerConfigs[$autoMappedManager]['auto_mapping'] = false;
         }
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
index 219b18f0fd04d..91edd8fe7b79b 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
@@ -65,13 +65,13 @@ private function addTaggedSubscribers(ContainerBuilder $container)
 
         foreach ($taggedSubscribers as $taggedSubscriber) {
             list($id, $tag) = $taggedSubscriber;
-            $connections = isset($tag['connection']) ? array($tag['connection']) : array_keys($this->connections);
+            $connections = isset($tag['connection']) ? [$tag['connection']] : array_keys($this->connections);
             foreach ($connections as $con) {
                 if (!isset($this->connections[$con])) {
                     throw new RuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: %s', $con, $id, implode(', ', array_keys($this->connections))));
                 }
 
-                $this->getEventManagerDef($container, $con)->addMethodCall('addEventSubscriber', array(new Reference($id)));
+                $this->getEventManagerDef($container, $con)->addMethodCall('addEventSubscriber', [new Reference($id)]);
             }
         }
     }
@@ -88,7 +88,7 @@ private function addTaggedListeners(ContainerBuilder $container)
                 throw new InvalidArgumentException(sprintf('Doctrine event listener "%s" must specify the "event" attribute.', $id));
             }
 
-            $connections = isset($tag['connection']) ? array($tag['connection']) : array_keys($this->connections);
+            $connections = isset($tag['connection']) ? [$tag['connection']] : array_keys($this->connections);
             foreach ($connections as $con) {
                 if (!isset($this->connections[$con])) {
                     throw new RuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: %s', $con, $id, implode(', ', array_keys($this->connections))));
@@ -130,12 +130,12 @@ private function getEventManagerDef(ContainerBuilder $container, $name)
      */
     private function findAndSortTags($tagName, ContainerBuilder $container)
     {
-        $sortedTags = array();
+        $sortedTags = [];
 
         foreach ($container->findTaggedServiceIds($tagName, true) as $serviceId => $tags) {
             foreach ($tags as $attributes) {
                 $priority = isset($attributes['priority']) ? $attributes['priority'] : 0;
-                $sortedTags[$priority][] = array($serviceId, $attributes);
+                $sortedTags[$priority][] = [$serviceId, $attributes];
             }
         }
 
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
index 61e8c1e7b92ae..d149f2b9cb341 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
@@ -146,7 +146,7 @@ public function process(ContainerBuilder $container)
         // Definition for a Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain
         $chainDriverDef = $container->getDefinition($chainDriverDefService);
         foreach ($this->namespaces as $namespace) {
-            $chainDriverDef->addMethodCall('addDriver', array($mappingDriverDef, $namespace));
+            $chainDriverDef->addMethodCall('addDriver', [$mappingDriverDef, $namespace]);
         }
 
         if (!\count($this->aliasMap)) {
@@ -157,7 +157,7 @@ public function process(ContainerBuilder $container)
         // Definition of the Doctrine\...\Configuration class specific to the Doctrine flavour.
         $configurationServiceDefinition = $container->getDefinition($configurationServiceName);
         foreach ($this->aliasMap as $alias => $namespace) {
-            $configurationServiceDefinition->addMethodCall($this->registerAliasMethodName, array($alias, $namespace));
+            $configurationServiceDefinition->addMethodCall($this->registerAliasMethodName, [$alias, $namespace]);
         }
     }
 
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
index 0ea2738a3f065..89df8931c75aa 100644
--- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
+++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -92,7 +92,7 @@ public function loadValuesForChoices(array $choices, $value = null)
     {
         // Performance optimization
         if (empty($choices)) {
-            return array();
+            return [];
         }
 
         // Optimize performance for single-field identifiers. We already
@@ -101,7 +101,7 @@ public function loadValuesForChoices(array $choices, $value = null)
 
         // Attention: This optimization does not check choices for existence
         if ($optimize && !$this->choiceList && $this->idReader->isSingleId()) {
-            $values = array();
+            $values = [];
 
             // Maintain order and indices of the given objects
             foreach ($choices as $i => $object) {
@@ -129,7 +129,7 @@ public function loadChoicesForValues(array $values, $value = null)
         // statements, consequently no test fails when this code is removed.
         // https://github.com/symfony/symfony/pull/8981#issuecomment-24230557
         if (empty($values)) {
-            return array();
+            return [];
         }
 
         // Optimize performance in case we have an object loader and
@@ -138,8 +138,8 @@ public function loadChoicesForValues(array $values, $value = null)
 
         if ($optimize && !$this->choiceList && $this->objectLoader && $this->idReader->isSingleId()) {
             $unorderedObjects = $this->objectLoader->getEntitiesByIds($this->idReader->getIdField(), $values);
-            $objectsById = array();
-            $objects = array();
+            $objectsById = [];
+            $objects = [];
 
             // Maintain order and indices from the given $values
             // An alternative approach to the following loop is to add the
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php
index 58753669b4a79..e41074c4ea03e 100644
--- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php
+++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php
@@ -43,7 +43,7 @@ public function __construct(ObjectManager $om, ClassMetadata $classMetadata)
         $this->om = $om;
         $this->classMetadata = $classMetadata;
         $this->singleId = 1 === \count($ids);
-        $this->intId = $this->singleId && \in_array($idType, array('integer', 'smallint', 'bigint'));
+        $this->intId = $this->singleId && \in_array($idType, ['integer', 'smallint', 'bigint']);
         $this->idField = current($ids);
 
         // single field association are resolved, since the schema column could be an int
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
index a2f1fa7ae8b70..96f5e2f5f1868 100644
--- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
+++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
@@ -64,7 +64,7 @@ public function getEntitiesByIds($identifier, array $values)
         // Guess type
         $entity = current($qb->getRootEntities());
         $metadata = $qb->getEntityManager()->getClassMetadata($entity);
-        if (\in_array($metadata->getTypeOfField($identifier), array('integer', 'bigint', 'smallint'))) {
+        if (\in_array($metadata->getTypeOfField($identifier), ['integer', 'bigint', 'smallint'])) {
             $parameterType = Connection::PARAM_INT_ARRAY;
 
             // Filter out non-integer values (e.g. ""). If we don't, some
@@ -72,7 +72,7 @@ public function getEntitiesByIds($identifier, array $values)
             $values = array_values(array_filter($values, function ($v) {
                 return (string) $v === (string) (int) $v || ctype_digit($v);
             }));
-        } elseif (\in_array($metadata->getTypeOfField($identifier), array('uuid', 'guid'))) {
+        } elseif (\in_array($metadata->getTypeOfField($identifier), ['uuid', 'guid'])) {
             $parameterType = Connection::PARAM_STR_ARRAY;
 
             // Like above, but we just filter out empty strings.
@@ -83,7 +83,7 @@ public function getEntitiesByIds($identifier, array $values)
             $parameterType = Connection::PARAM_STR_ARRAY;
         }
         if (!$values) {
-            return array();
+            return [];
         }
 
         return $qb->andWhere($where)
diff --git a/src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php b/src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php
index 4010512ba9c49..3202dae97f5c2 100644
--- a/src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php
+++ b/src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php
@@ -31,7 +31,7 @@ class CollectionToArrayTransformer implements DataTransformerInterface
     public function transform($collection)
     {
         if (null === $collection) {
-            return array();
+            return [];
         }
 
         // For cases when the collection getter returns $collection->toArray()
@@ -57,7 +57,7 @@ public function transform($collection)
     public function reverseTransform($array)
     {
         if ('' === $array || null === $array) {
-            $array = array();
+            $array = [];
         } else {
             $array = (array) $array;
         }
diff --git a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php
index fe86b103cbb34..891754a1da08f 100644
--- a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php
+++ b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php
@@ -26,9 +26,9 @@ public function __construct(ManagerRegistry $registry)
 
     protected function loadTypes()
     {
-        return array(
+        return [
             new EntityType($this->registry),
-        );
+        ];
     }
 
     protected function loadTypeGuesser()
diff --git a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
index 8b49f06621344..9ad959889c4e8 100644
--- a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
+++ b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
@@ -26,7 +26,7 @@ class DoctrineOrmTypeGuesser implements FormTypeGuesserInterface
 {
     protected $registry;
 
-    private $cache = array();
+    private $cache = [];
 
     public function __construct(ManagerRegistry $registry)
     {
@@ -39,7 +39,7 @@ public function __construct(ManagerRegistry $registry)
     public function guessType($class, $property)
     {
         if (!$ret = $this->getMetadata($class)) {
-            return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', array(), Guess::LOW_CONFIDENCE);
+            return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', [], Guess::LOW_CONFIDENCE);
         }
 
         list($metadata, $name) = $ret;
@@ -133,7 +133,7 @@ public function guessMaxLength($class, $property)
                 return new ValueGuess($mapping['length'], Guess::HIGH_CONFIDENCE);
             }
 
-            if (\in_array($ret[0]->getTypeOfField($property), array(Type::DECIMAL, Type::FLOAT))) {
+            if (\in_array($ret[0]->getTypeOfField($property), [Type::DECIMAL, Type::FLOAT])) {
                 return new ValueGuess(null, Guess::MEDIUM_CONFIDENCE);
             }
         }
@@ -146,7 +146,7 @@ public function guessPattern($class, $property)
     {
         $ret = $this->getMetadata($class);
         if ($ret && isset($ret[0]->fieldMappings[$property]) && !$ret[0]->hasAssociation($property)) {
-            if (\in_array($ret[0]->getTypeOfField($property), array(Type::DECIMAL, Type::FLOAT))) {
+            if (\in_array($ret[0]->getTypeOfField($property), [Type::DECIMAL, Type::FLOAT])) {
                 return new ValueGuess(null, Guess::MEDIUM_CONFIDENCE);
             }
         }
@@ -164,7 +164,7 @@ protected function getMetadata($class)
         $this->cache[$class] = null;
         foreach ($this->registry->getManagers() as $name => $em) {
             try {
-                return $this->cache[$class] = array($em->getClassMetadata($class), $name);
+                return $this->cache[$class] = [$em->getClassMetadata($class), $name];
             } catch (MappingException $e) {
                 // not an entity or mapped super class
             } catch (LegacyMappingException $e) {
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
index f521dcbd3fb18..95ce28cb652f9 100644
--- a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
+++ b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -35,12 +35,12 @@ abstract class DoctrineType extends AbstractType
     /**
      * @var IdReader[]
      */
-    private $idReaders = array();
+    private $idReaders = [];
 
     /**
      * @var DoctrineChoiceLoader[]
      */
-    private $choiceLoaders = array();
+    private $choiceLoaders = [];
 
     /**
      * Creates the label for a choice.
@@ -126,11 +126,11 @@ public function configureOptions(OptionsResolver $resolver)
                 // also if concrete Type can return important QueryBuilder parts to generate
                 // hash key we go for it as well
                 if (!$options['query_builder'] || false !== ($qbParts = $this->getQueryBuilderPartsForCachingHash($options['query_builder']))) {
-                    $hash = CachingFactoryDecorator::generateHash(array(
+                    $hash = CachingFactoryDecorator::generateHash([
                         $options['em'],
                         $options['class'],
                         $qbParts,
-                    ));
+                    ]);
 
                     if (isset($this->choiceLoaders[$hash])) {
                         return $this->choiceLoaders[$hash];
@@ -167,7 +167,7 @@ public function configureOptions(OptionsResolver $resolver)
             // field name. We can only use numeric IDs as names, as we cannot
             // guarantee that a non-numeric ID contains a valid form name
             if ($idReader->isIntId()) {
-                return array(__CLASS__, 'createChoiceName');
+                return [__CLASS__, 'createChoiceName'];
             }
 
             // Otherwise, an incrementing integer is used as name automatically
@@ -183,7 +183,7 @@ public function configureOptions(OptionsResolver $resolver)
 
             // If the entity has a single-column ID, use that ID as value
             if ($idReader->isSingleId()) {
-                return array($idReader, 'getIdValue');
+                return [$idReader, 'getIdValue'];
             }
 
             // Otherwise, an incrementing integer is used as value automatically
@@ -221,10 +221,10 @@ public function configureOptions(OptionsResolver $resolver)
         // Set the "id_reader" option via the normalizer. This option is not
         // supposed to be set by the user.
         $idReaderNormalizer = function (Options $options) {
-            $hash = CachingFactoryDecorator::generateHash(array(
+            $hash = CachingFactoryDecorator::generateHash([
                 $options['em'],
                 $options['class'],
-            ));
+            ]);
 
             // The ID reader is a utility that is needed to read the object IDs
             // when generating the field values. The callback generating the
@@ -240,25 +240,25 @@ public function configureOptions(OptionsResolver $resolver)
             return $this->idReaders[$hash];
         };
 
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'em' => null,
             'query_builder' => null,
             'choices' => null,
             'choice_loader' => $choiceLoader,
-            'choice_label' => array(__CLASS__, 'createChoiceLabel'),
+            'choice_label' => [__CLASS__, 'createChoiceLabel'],
             'choice_name' => $choiceName,
             'choice_value' => $choiceValue,
             'id_reader' => null, // internal
             'choice_translation_domain' => false,
-        ));
+        ]);
 
-        $resolver->setRequired(array('class'));
+        $resolver->setRequired(['class']);
 
         $resolver->setNormalizer('em', $emNormalizer);
         $resolver->setNormalizer('query_builder', $queryBuilderNormalizer);
         $resolver->setNormalizer('id_reader', $idReaderNormalizer);
 
-        $resolver->setAllowedTypes('em', array('null', 'string', 'Doctrine\Common\Persistence\ObjectManager'));
+        $resolver->setAllowedTypes('em', ['null', 'string', 'Doctrine\Common\Persistence\ObjectManager']);
     }
 
     /**
@@ -279,6 +279,6 @@ public function getParent()
 
     public function reset()
     {
-        $this->choiceLoaders = array();
+        $this->choiceLoaders = [];
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
index fa4176ee18f38..d173836bb2cef 100644
--- a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
+++ b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
@@ -40,7 +40,7 @@ public function configureOptions(OptionsResolver $resolver)
         };
 
         $resolver->setNormalizer('query_builder', $queryBuilderNormalizer);
-        $resolver->setAllowedTypes('query_builder', array('null', 'callable', 'Doctrine\ORM\QueryBuilder'));
+        $resolver->setAllowedTypes('query_builder', ['null', 'callable', 'Doctrine\ORM\QueryBuilder']);
     }
 
     /**
@@ -78,10 +78,10 @@ public function getBlockPrefix()
      */
     public function getQueryBuilderPartsForCachingHash($queryBuilder)
     {
-        return array(
+        return [
             $queryBuilder->getQuery()->getSQL(),
-            array_map(array($this, 'parameterToArray'), $queryBuilder->getParameters()->toArray()),
-        );
+            array_map([$this, 'parameterToArray'], $queryBuilder->getParameters()->toArray()),
+        ];
     }
 
     /**
diff --git a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
index 0200c2657a0e6..63880a6d614a0 100644
--- a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
+++ b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
@@ -42,7 +42,7 @@ public function startQuery($sql, array $params = null, array $types = null)
         }
 
         if (null !== $this->logger) {
-            $this->log($sql, null === $params ? array() : $this->normalizeParams($params));
+            $this->log($sql, null === $params ? [] : $this->normalizeParams($params));
         }
     }
 
diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
index f875b5c727569..3bab2d1a3ee0e 100644
--- a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
+++ b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -37,7 +37,7 @@ public function __construct(ClassMetadataFactory $classMetadataFactory)
     /**
      * {@inheritdoc}
      */
-    public function getProperties($class, array $context = array())
+    public function getProperties($class, array $context = [])
     {
         try {
             $metadata = $this->classMetadataFactory->getMetadataFor($class);
@@ -63,7 +63,7 @@ public function getProperties($class, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function getTypes($class, $property, array $context = array())
+    public function getTypes($class, $property, array $context = [])
     {
         try {
             $metadata = $this->classMetadataFactory->getMetadataFor($class);
@@ -85,7 +85,7 @@ public function getTypes($class, $property, array $context = array())
                     $nullable = false;
                 }
 
-                return array(new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, $class));
+                return [new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, $class)];
             }
 
             $collectionKeyType = Type::BUILTIN_TYPE_INT;
@@ -112,18 +112,18 @@ public function getTypes($class, $property, array $context = array())
                 }
             }
 
-            return array(new Type(
+            return [new Type(
                 Type::BUILTIN_TYPE_OBJECT,
                 false,
                 'Doctrine\Common\Collections\Collection',
                 true,
                 new Type($collectionKeyType),
                 new Type(Type::BUILTIN_TYPE_OBJECT, false, $class)
-            ));
+            )];
         }
 
         if ($metadata instanceof ClassMetadataInfo && class_exists('Doctrine\ORM\Mapping\Embedded') && isset($metadata->embeddedClasses[$property])) {
-            return array(new Type(Type::BUILTIN_TYPE_OBJECT, false, $metadata->embeddedClasses[$property]['class']));
+            return [new Type(Type::BUILTIN_TYPE_OBJECT, false, $metadata->embeddedClasses[$property]['class'])];
         }
 
         if ($metadata->hasField($property)) {
@@ -136,30 +136,30 @@ public function getTypes($class, $property, array $context = array())
                 case DBALType::DATETIMETZ:
                 case 'vardatetime':
                 case DBALType::TIME:
-                    return array(new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, 'DateTime'));
+                    return [new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, 'DateTime')];
 
                 case 'date_immutable':
                 case 'datetime_immutable':
                 case 'datetimetz_immutable':
                 case 'time_immutable':
-                    return array(new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, 'DateTimeImmutable'));
+                    return [new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, 'DateTimeImmutable')];
 
                 case 'dateinterval':
-                    return array(new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, 'DateInterval'));
+                    return [new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, 'DateInterval')];
 
                 case DBALType::TARRAY:
-                    return array(new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true));
+                    return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true)];
 
                 case DBALType::SIMPLE_ARRAY:
-                    return array(new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING)));
+                    return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING))];
 
                 case DBALType::JSON_ARRAY:
-                    return array(new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true));
+                    return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true)];
 
                 default:
                     $builtinType = $this->getPhpType($typeOfField);
 
-                    return $builtinType ? array(new Type($builtinType, $nullable)) : null;
+                    return $builtinType ? [new Type($builtinType, $nullable)] : null;
             }
         }
     }
diff --git a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
index 5e41b10e14bb2..64515fac71840 100644
--- a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
+++ b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
@@ -53,8 +53,8 @@ public function loadTokenBySeries($series)
         // the alias for lastUsed works around case insensitivity in PostgreSQL
         $sql = 'SELECT class, username, value, lastUsed AS last_used'
             .' FROM rememberme_token WHERE series=:series';
-        $paramValues = array('series' => $series);
-        $paramTypes = array('series' => \PDO::PARAM_STR);
+        $paramValues = ['series' => $series];
+        $paramTypes = ['series' => \PDO::PARAM_STR];
         $stmt = $this->conn->executeQuery($sql, $paramValues, $paramTypes);
         $row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
@@ -71,8 +71,8 @@ public function loadTokenBySeries($series)
     public function deleteTokenBySeries($series)
     {
         $sql = 'DELETE FROM rememberme_token WHERE series=:series';
-        $paramValues = array('series' => $series);
-        $paramTypes = array('series' => \PDO::PARAM_STR);
+        $paramValues = ['series' => $series];
+        $paramTypes = ['series' => \PDO::PARAM_STR];
         $this->conn->executeUpdate($sql, $paramValues, $paramTypes);
     }
 
@@ -83,16 +83,16 @@ public function updateToken($series, $tokenValue, \DateTime $lastUsed)
     {
         $sql = 'UPDATE rememberme_token SET value=:value, lastUsed=:lastUsed'
             .' WHERE series=:series';
-        $paramValues = array(
+        $paramValues = [
             'value' => $tokenValue,
             'lastUsed' => $lastUsed,
             'series' => $series,
-        );
-        $paramTypes = array(
+        ];
+        $paramTypes = [
             'value' => \PDO::PARAM_STR,
             'lastUsed' => DoctrineType::DATETIME,
             'series' => \PDO::PARAM_STR,
-        );
+        ];
         $updated = $this->conn->executeUpdate($sql, $paramValues, $paramTypes);
         if ($updated < 1) {
             throw new TokenNotFoundException('No token found.');
@@ -107,20 +107,20 @@ public function createNewToken(PersistentTokenInterface $token)
         $sql = 'INSERT INTO rememberme_token'
             .' (class, username, series, value, lastUsed)'
             .' VALUES (:class, :username, :series, :value, :lastUsed)';
-        $paramValues = array(
+        $paramValues = [
             'class' => $token->getClass(),
             'username' => $token->getUsername(),
             'series' => $token->getSeries(),
             'value' => $token->getTokenValue(),
             'lastUsed' => $token->getLastUsed(),
-        );
-        $paramTypes = array(
+        ];
+        $paramTypes = [
             'class' => \PDO::PARAM_STR,
             'username' => \PDO::PARAM_STR,
             'series' => \PDO::PARAM_STR,
             'value' => \PDO::PARAM_STR,
             'lastUsed' => DoctrineType::DATETIME,
-        );
+        ];
         $this->conn->executeUpdate($sql, $paramValues, $paramTypes);
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php b/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
index db836eb9cdc89..8923aa21aa29f 100644
--- a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
+++ b/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
@@ -48,7 +48,7 @@ public function loadUserByUsername($username)
     {
         $repository = $this->getRepository();
         if (null !== $this->property) {
-            $user = $repository->findOneBy(array($this->property => $username));
+            $user = $repository->findOneBy([$this->property => $username]);
         } else {
             if (!$repository instanceof UserLoaderInterface) {
                 throw new \InvalidArgumentException(sprintf('You must either make the "%s" entity Doctrine Repository ("%s") implement "Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface" or set the "property" option in the corresponding entity provider configuration.', $this->classOrAlias, \get_class($repository)));
diff --git a/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php b/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php
index 06dc628475e9f..3f6ffeebb6e2d 100644
--- a/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php
+++ b/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php
@@ -42,10 +42,10 @@ public static function createTestEntityManager(Configuration $config = null)
             $config = self::createTestConfiguration();
         }
 
-        $params = array(
+        $params = [
             'driver' => 'pdo_sqlite',
             'memory' => true,
-        );
+        ];
 
         return EntityManager::create($params, $config);
     }
@@ -56,7 +56,7 @@ public static function createTestEntityManager(Configuration $config = null)
     public static function createTestConfiguration()
     {
         $config = new Configuration();
-        $config->setEntityNamespaces(array('SymfonyTestsDoctrine' => 'Symfony\Bridge\Doctrine\Tests\Fixtures'));
+        $config->setEntityNamespaces(['SymfonyTestsDoctrine' => 'Symfony\Bridge\Doctrine\Tests\Fixtures']);
         $config->setAutoGenerateProxyClasses(true);
         $config->setProxyDir(\sys_get_temp_dir());
         $config->setProxyNamespace('SymfonyTests\Doctrine');
diff --git a/src/Symfony/Bridge/Doctrine/Test/TestRepositoryFactory.php b/src/Symfony/Bridge/Doctrine/Test/TestRepositoryFactory.php
index b7cbafa947aef..e7df3702ebf1f 100644
--- a/src/Symfony/Bridge/Doctrine/Test/TestRepositoryFactory.php
+++ b/src/Symfony/Bridge/Doctrine/Test/TestRepositoryFactory.php
@@ -24,7 +24,7 @@ final class TestRepositoryFactory implements RepositoryFactory
     /**
      * @var ObjectRepository[]
      */
-    private $repositoryList = array();
+    private $repositoryList = [];
 
     /**
      * {@inheritdoc}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php b/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php
index f40d1ca710ed1..2e97edb1d2e14 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php
@@ -43,15 +43,15 @@ public function testRemoveEventListener()
         $this->evm->addEventListener('foo', 'bar');
         $this->evm->addEventListener('foo', $listener = new MyListener());
 
-        $listeners = array('foo' => array('_service_bar' => 'bar', spl_object_hash($listener) => $listener));
+        $listeners = ['foo' => ['_service_bar' => 'bar', spl_object_hash($listener) => $listener]];
         $this->assertSame($listeners, $this->evm->getListeners());
         $this->assertSame($listeners['foo'], $this->evm->getListeners('foo'));
 
         $this->evm->removeEventListener('foo', $listener);
-        $this->assertSame(array('_service_bar' => 'bar'), $this->evm->getListeners('foo'));
+        $this->assertSame(['_service_bar' => 'bar'], $this->evm->getListeners('foo'));
 
         $this->evm->removeEventListener('foo', 'bar');
-        $this->assertSame(array(), $this->evm->getListeners('foo'));
+        $this->assertSame([], $this->evm->getListeners('foo'));
     }
 }
 
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php b/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
index 3d97b7bcefb61..38d0e72e85e38 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
@@ -22,27 +22,27 @@ class DoctrineDataCollectorTest extends TestCase
 {
     public function testCollectConnections()
     {
-        $c = $this->createCollector(array());
+        $c = $this->createCollector([]);
         $c->collect(new Request(), new Response());
-        $this->assertEquals(array('default' => 'doctrine.dbal.default_connection'), $c->getConnections());
+        $this->assertEquals(['default' => 'doctrine.dbal.default_connection'], $c->getConnections());
     }
 
     public function testCollectManagers()
     {
-        $c = $this->createCollector(array());
+        $c = $this->createCollector([]);
         $c->collect(new Request(), new Response());
-        $this->assertEquals(array('default' => 'doctrine.orm.default_entity_manager'), $c->getManagers());
+        $this->assertEquals(['default' => 'doctrine.orm.default_entity_manager'], $c->getManagers());
     }
 
     public function testCollectQueryCount()
     {
-        $c = $this->createCollector(array());
+        $c = $this->createCollector([]);
         $c->collect(new Request(), new Response());
         $this->assertEquals(0, $c->getQueryCount());
 
-        $queries = array(
-            array('sql' => 'SELECT * FROM table1', 'params' => array(), 'types' => array(), 'executionMS' => 0),
-        );
+        $queries = [
+            ['sql' => 'SELECT * FROM table1', 'params' => [], 'types' => [], 'executionMS' => 0],
+        ];
         $c = $this->createCollector($queries);
         $c->collect(new Request(), new Response());
         $this->assertEquals(1, $c->getQueryCount());
@@ -50,21 +50,21 @@ public function testCollectQueryCount()
 
     public function testCollectTime()
     {
-        $c = $this->createCollector(array());
+        $c = $this->createCollector([]);
         $c->collect(new Request(), new Response());
         $this->assertEquals(0, $c->getTime());
 
-        $queries = array(
-            array('sql' => 'SELECT * FROM table1', 'params' => array(), 'types' => array(), 'executionMS' => 1),
-        );
+        $queries = [
+            ['sql' => 'SELECT * FROM table1', 'params' => [], 'types' => [], 'executionMS' => 1],
+        ];
         $c = $this->createCollector($queries);
         $c->collect(new Request(), new Response());
         $this->assertEquals(1, $c->getTime());
 
-        $queries = array(
-            array('sql' => 'SELECT * FROM table1', 'params' => array(), 'types' => array(), 'executionMS' => 1),
-            array('sql' => 'SELECT * FROM table2', 'params' => array(), 'types' => array(), 'executionMS' => 2),
-        );
+        $queries = [
+            ['sql' => 'SELECT * FROM table1', 'params' => [], 'types' => [], 'executionMS' => 1],
+            ['sql' => 'SELECT * FROM table2', 'params' => [], 'types' => [], 'executionMS' => 2],
+        ];
         $c = $this->createCollector($queries);
         $c->collect(new Request(), new Response());
         $this->assertEquals(3, $c->getTime());
@@ -75,9 +75,9 @@ public function testCollectTime()
      */
     public function testCollectQueries($param, $types, $expected, $explainable)
     {
-        $queries = array(
-            array('sql' => 'SELECT * FROM table1 WHERE field1 = ?1', 'params' => array($param), 'types' => $types, 'executionMS' => 1),
-        );
+        $queries = [
+            ['sql' => 'SELECT * FROM table1 WHERE field1 = ?1', 'params' => [$param], 'types' => $types, 'executionMS' => 1],
+        ];
         $c = $this->createCollector($queries);
         $c->collect(new Request(), new Response());
 
@@ -88,32 +88,32 @@ public function testCollectQueries($param, $types, $expected, $explainable)
 
     public function testCollectQueryWithNoParams()
     {
-        $queries = array(
-            array('sql' => 'SELECT * FROM table1', 'params' => array(), 'types' => array(), 'executionMS' => 1),
-            array('sql' => 'SELECT * FROM table1', 'params' => null, 'types' => null, 'executionMS' => 1),
-        );
+        $queries = [
+            ['sql' => 'SELECT * FROM table1', 'params' => [], 'types' => [], 'executionMS' => 1],
+            ['sql' => 'SELECT * FROM table1', 'params' => null, 'types' => null, 'executionMS' => 1],
+        ];
         $c = $this->createCollector($queries);
         $c->collect(new Request(), new Response());
 
         $collectedQueries = $c->getQueries();
-        $this->assertEquals(array(), $collectedQueries['default'][0]['params']);
+        $this->assertEquals([], $collectedQueries['default'][0]['params']);
         $this->assertTrue($collectedQueries['default'][0]['explainable']);
-        $this->assertEquals(array(), $collectedQueries['default'][1]['params']);
+        $this->assertEquals([], $collectedQueries['default'][1]['params']);
         $this->assertTrue($collectedQueries['default'][1]['explainable']);
     }
 
     public function testReset()
     {
-        $queries = array(
-            array('sql' => 'SELECT * FROM table1', 'params' => array(), 'types' => array(), 'executionMS' => 1),
-        );
+        $queries = [
+            ['sql' => 'SELECT * FROM table1', 'params' => [], 'types' => [], 'executionMS' => 1],
+        ];
         $c = $this->createCollector($queries);
         $c->collect(new Request(), new Response());
 
         $c->reset();
         $c->collect(new Request(), new Response());
 
-        $this->assertEquals(array('default' => array()), $c->getQueries());
+        $this->assertEquals(['default' => []], $c->getQueries());
     }
 
     /**
@@ -121,9 +121,9 @@ public function testReset()
      */
     public function testSerialization($param, $types, $expected, $explainable)
     {
-        $queries = array(
-            array('sql' => 'SELECT * FROM table1 WHERE field1 = ?1', 'params' => array($param), 'types' => $types, 'executionMS' => 1),
-        );
+        $queries = [
+            ['sql' => 'SELECT * FROM table1 WHERE field1 = ?1', 'params' => [$param], 'types' => $types, 'executionMS' => 1],
+        ];
         $c = $this->createCollector($queries);
         $c->collect(new Request(), new Response());
         $c = unserialize(serialize($c));
@@ -172,11 +172,11 @@ private function createCollector($queries)
         $registry
             ->expects($this->any())
             ->method('getConnectionNames')
-            ->will($this->returnValue(array('default' => 'doctrine.dbal.default_connection')));
+            ->will($this->returnValue(['default' => 'doctrine.dbal.default_connection']));
         $registry
             ->expects($this->any())
             ->method('getManagerNames')
-            ->will($this->returnValue(array('default' => 'doctrine.orm.default_entity_manager')));
+            ->will($this->returnValue(['default' => 'doctrine.orm.default_entity_manager']));
         $registry->expects($this->any())
             ->method('getConnection')
             ->will($this->returnValue($connection));
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php
index 7e99a7d9356c2..088e3535656a1 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php
@@ -44,7 +44,7 @@ public function testExceptionOnAbstractTaggedListener()
 
         $abstractDefinition = new Definition('stdClass');
         $abstractDefinition->setAbstract(true);
-        $abstractDefinition->addTag('doctrine.event_listener', array('event' => 'test'));
+        $abstractDefinition->addTag('doctrine.event_listener', ['event' => 'test']);
 
         $container->setDefinition('a', $abstractDefinition);
 
@@ -159,42 +159,42 @@ public function testProcessEventSubscribersWithMultipleConnections()
 
         $container
             ->register('a', 'stdClass')
-            ->addTag('doctrine.event_subscriber', array(
+            ->addTag('doctrine.event_subscriber', [
                 'event' => 'onFlush',
-            ))
+            ])
         ;
 
         $container
             ->register('b', 'stdClass')
-            ->addTag('doctrine.event_subscriber', array(
+            ->addTag('doctrine.event_subscriber', [
                 'event' => 'onFlush',
                 'connection' => 'default',
-            ))
+            ])
         ;
 
         $container
             ->register('c', 'stdClass')
-            ->addTag('doctrine.event_subscriber', array(
+            ->addTag('doctrine.event_subscriber', [
                 'event' => 'onFlush',
                 'connection' => 'second',
-            ))
+            ])
         ;
 
         $this->process($container);
 
         $this->assertEquals(
-            array(
-                array('addEventSubscriber', array(new Reference('a'))),
-                array('addEventSubscriber', array(new Reference('b'))),
-            ),
+            [
+                ['addEventSubscriber', [new Reference('a')]],
+                ['addEventSubscriber', [new Reference('b')]],
+            ],
             $container->getDefinition('doctrine.dbal.default_connection.event_manager')->getMethodCalls()
         );
 
         $this->assertEquals(
-            array(
-                array('addEventSubscriber', array(new Reference('a'))),
-                array('addEventSubscriber', array(new Reference('c'))),
-            ),
+            [
+                ['addEventSubscriber', [new Reference('a')]],
+                ['addEventSubscriber', [new Reference('c')]],
+            ],
             $container->getDefinition('doctrine.dbal.second_connection.event_manager')->getMethodCalls()
         );
     }
@@ -209,39 +209,39 @@ public function testProcessEventSubscribersWithPriorities()
         ;
         $container
             ->register('b', 'stdClass')
-            ->addTag('doctrine.event_subscriber', array(
+            ->addTag('doctrine.event_subscriber', [
                 'priority' => 5,
-            ))
+            ])
         ;
         $container
             ->register('c', 'stdClass')
-            ->addTag('doctrine.event_subscriber', array(
+            ->addTag('doctrine.event_subscriber', [
                 'priority' => 10,
-            ))
+            ])
         ;
         $container
             ->register('d', 'stdClass')
-            ->addTag('doctrine.event_subscriber', array(
+            ->addTag('doctrine.event_subscriber', [
                 'priority' => 10,
-            ))
+            ])
         ;
         $container
             ->register('e', 'stdClass')
-            ->addTag('doctrine.event_subscriber', array(
+            ->addTag('doctrine.event_subscriber', [
                 'priority' => 10,
-            ))
+            ])
         ;
 
         $this->process($container);
 
         $this->assertEquals(
-            array(
-                array('addEventSubscriber', array(new Reference('c'))),
-                array('addEventSubscriber', array(new Reference('d'))),
-                array('addEventSubscriber', array(new Reference('e'))),
-                array('addEventSubscriber', array(new Reference('b'))),
-                array('addEventSubscriber', array(new Reference('a'))),
-            ),
+            [
+                ['addEventSubscriber', [new Reference('c')]],
+                ['addEventSubscriber', [new Reference('d')]],
+                ['addEventSubscriber', [new Reference('e')]],
+                ['addEventSubscriber', [new Reference('b')]],
+                ['addEventSubscriber', [new Reference('a')]],
+            ],
             $container->getDefinition('doctrine.dbal.default_connection.event_manager')->getMethodCalls()
         );
     }
@@ -252,9 +252,9 @@ public function testProcessNoTaggedServices()
 
         $this->process($container);
 
-        $this->assertEquals(array(), $container->getDefinition('doctrine.dbal.default_connection.event_manager')->getMethodCalls());
+        $this->assertEquals([], $container->getDefinition('doctrine.dbal.default_connection.event_manager')->getMethodCalls());
 
-        $this->assertEquals(array(), $container->getDefinition('doctrine.dbal.second_connection.event_manager')->getMethodCalls());
+        $this->assertEquals([], $container->getDefinition('doctrine.dbal.second_connection.event_manager')->getMethodCalls());
     }
 
     private function process(ContainerBuilder $container)
@@ -267,7 +267,7 @@ private function createBuilder($multipleConnections = false)
     {
         $container = new ContainerBuilder();
 
-        $connections = array('default' => 'doctrine.dbal.default_connection');
+        $connections = ['default' => 'doctrine.dbal.default_connection'];
 
         $container->register('doctrine.dbal.default_connection.event_manager', 'stdClass');
         $container->register('doctrine.dbal.default_connection', 'stdClass');
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterMappingsPassTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterMappingsPassTest.php
index 90dd1455921b2..0bb2642a7696e 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterMappingsPassTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterMappingsPassTest.php
@@ -16,17 +16,17 @@ class RegisterMappingsPassTest extends TestCase
     public function testNoDriverParmeterException()
     {
         $container = $this->createBuilder();
-        $this->process($container, array(
+        $this->process($container, [
             'manager.param.one',
             'manager.param.two',
-        ));
+        ]);
     }
 
     private function process(ContainerBuilder $container, array $managerParamNames)
     {
         $pass = new ConcreteMappingsPass(
             new Definition('\stdClass'),
-            array(),
+            [],
             $managerParamNames,
             'some.%s.metadata_driver'
         );
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
index 4540a4bb3ff7d..99d9223f189cb 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -32,13 +32,13 @@ protected function setUp()
 
         $this->extension = $this
             ->getMockBuilder('Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension')
-            ->setMethods(array(
+            ->setMethods([
                 'getMappingResourceConfigDirectory',
                 'getObjectManagerElementName',
                 'getMappingObjectDefaultName',
                 'getMappingResourceExtension',
                 'load',
-            ))
+            ])
             ->getMock()
         ;
 
@@ -54,19 +54,19 @@ protected function setUp()
      */
     public function testFixManagersAutoMappingsWithTwoAutomappings()
     {
-        $emConfigs = array(
-            'em1' => array(
+        $emConfigs = [
+            'em1' => [
                 'auto_mapping' => true,
-            ),
-            'em2' => array(
+            ],
+            'em2' => [
                 'auto_mapping' => true,
-            ),
-        );
+            ],
+        ];
 
-        $bundles = array(
+        $bundles = [
             'FristBundle' => 'My\FristBundle',
             'SecondBundle' => 'My\SecondBundle',
-        );
+        ];
 
         $reflection = new \ReflectionClass(\get_class($this->extension));
         $method = $reflection->getMethod('fixManagersAutoMappings');
@@ -77,69 +77,69 @@ public function testFixManagersAutoMappingsWithTwoAutomappings()
 
     public function getAutomappingData()
     {
-        return array(
-            array(
-                array( // no auto mapping on em1
+        return [
+            [
+                [ // no auto mapping on em1
                     'auto_mapping' => false,
-                ),
-                array( // no auto mapping on em2
+                ],
+                [ // no auto mapping on em2
                     'auto_mapping' => false,
-                ),
-                array(),
-                array(),
-            ),
-            array(
-                array( // no auto mapping on em1
+                ],
+                [],
+                [],
+            ],
+            [
+                [ // no auto mapping on em1
                     'auto_mapping' => false,
-                ),
-                array( // auto mapping enabled on em2
+                ],
+                [ // auto mapping enabled on em2
                     'auto_mapping' => true,
-                ),
-                array(),
-                array(
-                    'mappings' => array(
-                        'FristBundle' => array(
+                ],
+                [],
+                [
+                    'mappings' => [
+                        'FristBundle' => [
                             'mapping' => true,
                             'is_bundle' => true,
-                        ),
-                        'SecondBundle' => array(
+                        ],
+                        'SecondBundle' => [
                             'mapping' => true,
                             'is_bundle' => true,
-                        ),
-                    ),
-                ),
-            ),
-            array(
-                array( // no auto mapping on em1, but it defines SecondBundle as own
+                        ],
+                    ],
+                ],
+            ],
+            [
+                [ // no auto mapping on em1, but it defines SecondBundle as own
                     'auto_mapping' => false,
-                    'mappings' => array(
-                        'SecondBundle' => array(
+                    'mappings' => [
+                        'SecondBundle' => [
                             'mapping' => true,
                             'is_bundle' => true,
-                        ),
-                    ),
-                ),
-                array( // auto mapping enabled on em2
+                        ],
+                    ],
+                ],
+                [ // auto mapping enabled on em2
                     'auto_mapping' => true,
-                ),
-                array(
-                    'mappings' => array(
-                        'SecondBundle' => array(
+                ],
+                [
+                    'mappings' => [
+                        'SecondBundle' => [
                             'mapping' => true,
                             'is_bundle' => true,
-                        ),
-                    ),
-                ),
-                array(
-                    'mappings' => array(
-                        'FristBundle' => array(
+                        ],
+                    ],
+                ],
+                [
+                    'mappings' => [
+                        'FristBundle' => [
                             'mapping' => true,
                             'is_bundle' => true,
-                        ),
-                    ),
-                ),
-            ),
-        );
+                        ],
+                    ],
+                ],
+            ],
+        ];
     }
 
     /**
@@ -147,15 +147,15 @@ public function getAutomappingData()
      */
     public function testFixManagersAutoMappings(array $originalEm1, array $originalEm2, array $expectedEm1, array $expectedEm2)
     {
-        $emConfigs = array(
+        $emConfigs = [
             'em1' => $originalEm1,
             'em2' => $originalEm2,
-        );
+        ];
 
-        $bundles = array(
+        $bundles = [
             'FristBundle' => 'My\FristBundle',
             'SecondBundle' => 'My\SecondBundle',
-        );
+        ];
 
         $reflection = new \ReflectionClass(\get_class($this->extension));
         $method = $reflection->getMethod('fixManagersAutoMappings');
@@ -223,13 +223,13 @@ public function testServiceCacheDriver()
         $cacheName = 'metadata_cache';
         $container = $this->createContainer();
         $definition = new Definition('%doctrine.orm.cache.apc.class%');
-        $objectManager = array(
+        $objectManager = [
             'name' => 'default',
-            'metadata_cache_driver' => array(
+            'metadata_cache_driver' => [
                 'type' => 'service',
                 'id' => 'service_driver',
-            ),
-        );
+            ],
+        ];
 
         $container->setDefinition('service_driver', $definition);
 
@@ -246,12 +246,12 @@ public function testUnrecognizedCacheDriverException()
     {
         $cacheName = 'metadata_cache';
         $container = $this->createContainer();
-        $objectManager = array(
+        $objectManager = [
             'name' => 'default',
-            'metadata_cache_driver' => array(
+            'metadata_cache_driver' => [
                 'type' => 'unrecognized_type',
-            ),
-        );
+            ],
+        ];
 
         $this->invokeLoadCacheDriver($objectManager, $container, $cacheName);
     }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleIntIdEntity.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleIntIdEntity.php
index d98b0ef93a60d..ff29145e3353f 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleIntIdEntity.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleIntIdEntity.php
@@ -25,7 +25,7 @@ class SingleIntIdEntity
     public $name;
 
     /** @Column(type="array", nullable=true) */
-    public $phoneNumbers = array();
+    public $phoneNumbers = [];
 
     public function __construct($id, $name)
     {
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
index 2ab9eac244915..e601ac87dcd5b 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
@@ -81,9 +81,9 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->objectLoader = $this->getMockBuilder('Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface')->getMock();
-        $this->obj1 = (object) array('name' => 'A');
-        $this->obj2 = (object) array('name' => 'B');
-        $this->obj3 = (object) array('name' => 'C');
+        $this->obj1 = (object) ['name' => 'A'];
+        $this->obj2 = (object) ['name' => 'B'];
+        $this->obj3 = (object) ['name' => 'C'];
 
         $this->om->expects($this->any())
             ->method('getRepository')
@@ -104,7 +104,7 @@ public function testLoadChoiceList()
             $this->idReader
         );
 
-        $choices = array($this->obj1, $this->obj2, $this->obj3);
+        $choices = [$this->obj1, $this->obj2, $this->obj3];
         $value = function () {};
         $choiceList = new ArrayChoiceList($choices, $value);
 
@@ -159,7 +159,7 @@ public function testLoadChoiceListUsesObjectLoaderIfAvailable()
             $this->objectLoader
         );
 
-        $choices = array($this->obj1, $this->obj2, $this->obj3);
+        $choices = [$this->obj1, $this->obj2, $this->obj3];
         $choiceList = new ArrayChoiceList($choices);
 
         $this->repository->expects($this->never())
@@ -184,17 +184,17 @@ public function testLoadValuesForChoices()
             $this->idReader
         );
 
-        $choices = array($this->obj1, $this->obj2, $this->obj3);
+        $choices = [$this->obj1, $this->obj2, $this->obj3];
 
         $this->repository->expects($this->once())
             ->method('findAll')
             ->willReturn($choices);
 
-        $this->assertSame(array('1', '2'), $loader->loadValuesForChoices(array($this->obj2, $this->obj3)));
+        $this->assertSame(['1', '2'], $loader->loadValuesForChoices([$this->obj2, $this->obj3]));
 
         // no further loads on subsequent calls
 
-        $this->assertSame(array('1', '2'), $loader->loadValuesForChoices(array($this->obj2, $this->obj3)));
+        $this->assertSame(['1', '2'], $loader->loadValuesForChoices([$this->obj2, $this->obj3]));
     }
 
     public function testLoadValuesForChoicesDoesNotLoadIfEmptyChoices()
@@ -208,7 +208,7 @@ public function testLoadValuesForChoicesDoesNotLoadIfEmptyChoices()
         $this->repository->expects($this->never())
             ->method('findAll');
 
-        $this->assertSame(array(), $loader->loadValuesForChoices(array()));
+        $this->assertSame([], $loader->loadValuesForChoices([]));
     }
 
     public function testLoadValuesForChoicesDoesNotLoadIfSingleIntId()
@@ -231,7 +231,7 @@ public function testLoadValuesForChoicesDoesNotLoadIfSingleIntId()
             ->with($this->obj2)
             ->willReturn('2');
 
-        $this->assertSame(array('2'), $loader->loadValuesForChoices(array($this->obj2)));
+        $this->assertSame(['2'], $loader->loadValuesForChoices([$this->obj2]));
     }
 
     public function testLoadValuesForChoicesLoadsIfSingleIntIdAndValueGiven()
@@ -242,7 +242,7 @@ public function testLoadValuesForChoicesLoadsIfSingleIntIdAndValueGiven()
             $this->idReader
         );
 
-        $choices = array($this->obj1, $this->obj2, $this->obj3);
+        $choices = [$this->obj1, $this->obj2, $this->obj3];
         $value = function (\stdClass $object) { return $object->name; };
 
         $this->idReader->expects($this->any())
@@ -253,8 +253,8 @@ public function testLoadValuesForChoicesLoadsIfSingleIntIdAndValueGiven()
             ->method('findAll')
             ->willReturn($choices);
 
-        $this->assertSame(array('B'), $loader->loadValuesForChoices(
-            array($this->obj2),
+        $this->assertSame(['B'], $loader->loadValuesForChoices(
+            [$this->obj2],
             $value
         ));
     }
@@ -267,7 +267,7 @@ public function testLoadValuesForChoicesDoesNotLoadIfValueIsIdReader()
             $this->idReader
         );
 
-        $value = array($this->idReader, 'getIdValue');
+        $value = [$this->idReader, 'getIdValue'];
 
         $this->idReader->expects($this->any())
             ->method('isSingleId')
@@ -281,8 +281,8 @@ public function testLoadValuesForChoicesDoesNotLoadIfValueIsIdReader()
             ->with($this->obj2)
             ->willReturn('2');
 
-        $this->assertSame(array('2'), $loader->loadValuesForChoices(
-            array($this->obj2),
+        $this->assertSame(['2'], $loader->loadValuesForChoices(
+            [$this->obj2],
             $value
         ));
     }
@@ -295,17 +295,17 @@ public function testLoadChoicesForValues()
             $this->idReader
         );
 
-        $choices = array($this->obj1, $this->obj2, $this->obj3);
+        $choices = [$this->obj1, $this->obj2, $this->obj3];
 
         $this->repository->expects($this->once())
             ->method('findAll')
             ->willReturn($choices);
 
-        $this->assertSame(array($this->obj2, $this->obj3), $loader->loadChoicesForValues(array('1', '2')));
+        $this->assertSame([$this->obj2, $this->obj3], $loader->loadChoicesForValues(['1', '2']));
 
         // no further loads on subsequent calls
 
-        $this->assertSame(array($this->obj2, $this->obj3), $loader->loadChoicesForValues(array('1', '2')));
+        $this->assertSame([$this->obj2, $this->obj3], $loader->loadChoicesForValues(['1', '2']));
     }
 
     public function testLoadChoicesForValuesDoesNotLoadIfEmptyValues()
@@ -319,7 +319,7 @@ public function testLoadChoicesForValuesDoesNotLoadIfEmptyValues()
         $this->repository->expects($this->never())
             ->method('findAll');
 
-        $this->assertSame(array(), $loader->loadChoicesForValues(array()));
+        $this->assertSame([], $loader->loadChoicesForValues([]));
     }
 
     public function testLoadChoicesForValuesLoadsOnlyChoicesIfSingleIntId()
@@ -331,7 +331,7 @@ public function testLoadChoicesForValuesLoadsOnlyChoicesIfSingleIntId()
             $this->objectLoader
         );
 
-        $choices = array($this->obj2, $this->obj3);
+        $choices = [$this->obj2, $this->obj3];
 
         $this->idReader->expects($this->any())
             ->method('isSingleId')
@@ -346,19 +346,19 @@ public function testLoadChoicesForValuesLoadsOnlyChoicesIfSingleIntId()
 
         $this->objectLoader->expects($this->once())
             ->method('getEntitiesByIds')
-            ->with('idField', array(4 => '3', 7 => '2'))
+            ->with('idField', [4 => '3', 7 => '2'])
             ->willReturn($choices);
 
         $this->idReader->expects($this->any())
             ->method('getIdValue')
-            ->willReturnMap(array(
-                array($this->obj2, '2'),
-                array($this->obj3, '3'),
-            ));
+            ->willReturnMap([
+                [$this->obj2, '2'],
+                [$this->obj3, '3'],
+            ]);
 
         $this->assertSame(
-            array(4 => $this->obj3, 7 => $this->obj2),
-            $loader->loadChoicesForValues(array(4 => '3', 7 => '2')
+            [4 => $this->obj3, 7 => $this->obj2],
+            $loader->loadChoicesForValues([4 => '3', 7 => '2']
         ));
     }
 
@@ -370,7 +370,7 @@ public function testLoadChoicesForValuesLoadsAllIfSingleIntIdAndValueGiven()
             $this->idReader
         );
 
-        $choices = array($this->obj1, $this->obj2, $this->obj3);
+        $choices = [$this->obj1, $this->obj2, $this->obj3];
         $value = function (\stdClass $object) { return $object->name; };
 
         $this->idReader->expects($this->any())
@@ -381,8 +381,8 @@ public function testLoadChoicesForValuesLoadsAllIfSingleIntIdAndValueGiven()
             ->method('findAll')
             ->willReturn($choices);
 
-        $this->assertSame(array($this->obj2), $loader->loadChoicesForValues(
-            array('B'),
+        $this->assertSame([$this->obj2], $loader->loadChoicesForValues(
+            ['B'],
             $value
         ));
     }
@@ -396,8 +396,8 @@ public function testLoadChoicesForValuesLoadsOnlyChoicesIfValueIsIdReader()
             $this->objectLoader
         );
 
-        $choices = array($this->obj2, $this->obj3);
-        $value = array($this->idReader, 'getIdValue');
+        $choices = [$this->obj2, $this->obj3];
+        $value = [$this->idReader, 'getIdValue'];
 
         $this->idReader->expects($this->any())
             ->method('isSingleId')
@@ -412,16 +412,16 @@ public function testLoadChoicesForValuesLoadsOnlyChoicesIfValueIsIdReader()
 
         $this->objectLoader->expects($this->once())
             ->method('getEntitiesByIds')
-            ->with('idField', array('2'))
+            ->with('idField', ['2'])
             ->willReturn($choices);
 
         $this->idReader->expects($this->any())
             ->method('getIdValue')
-            ->willReturnMap(array(
-                array($this->obj2, '2'),
-                array($this->obj3, '3'),
-            ));
+            ->willReturnMap([
+                [$this->obj2, '2'],
+                [$this->obj3, '3'],
+            ]);
 
-        $this->assertSame(array($this->obj2), $loader->loadChoicesForValues(array('2'), $value));
+        $this->assertSame([$this->obj2], $loader->loadChoicesForValues(['2'], $value));
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
index 211cb12e4df2c..3abdb3578aaf9 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
@@ -34,17 +34,17 @@ protected function checkIdentifierType($classname, $expectedType)
         $em = DoctrineTestHelper::createTestEntityManager();
 
         $query = $this->getMockBuilder('QueryMock')
-            ->setMethods(array('setParameter', 'getResult', 'getSql', '_doExecute'))
+            ->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
             ->getMock();
 
         $query->expects($this->once())
             ->method('setParameter')
-            ->with('ORMQueryBuilderLoader_getEntitiesByIds_id', array(1, 2), $expectedType)
+            ->with('ORMQueryBuilderLoader_getEntitiesByIds_id', [1, 2], $expectedType)
             ->willReturn($query);
 
         $qb = $this->getMockBuilder('Doctrine\ORM\QueryBuilder')
-            ->setConstructorArgs(array($em))
-            ->setMethods(array('getQuery'))
+            ->setConstructorArgs([$em])
+            ->setMethods(['getQuery'])
             ->getMock();
 
         $qb->expects($this->once())
@@ -55,7 +55,7 @@ protected function checkIdentifierType($classname, $expectedType)
             ->from($classname, 'e');
 
         $loader = new ORMQueryBuilderLoader($qb);
-        $loader->getEntitiesByIds('id', array(1, 2));
+        $loader->getEntitiesByIds('id', [1, 2]);
     }
 
     public function testFilterNonIntegerValues()
@@ -63,17 +63,17 @@ public function testFilterNonIntegerValues()
         $em = DoctrineTestHelper::createTestEntityManager();
 
         $query = $this->getMockBuilder('QueryMock')
-            ->setMethods(array('setParameter', 'getResult', 'getSql', '_doExecute'))
+            ->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
             ->getMock();
 
         $query->expects($this->once())
             ->method('setParameter')
-            ->with('ORMQueryBuilderLoader_getEntitiesByIds_id', array(1, 2, 3, '9223372036854775808'), Connection::PARAM_INT_ARRAY)
+            ->with('ORMQueryBuilderLoader_getEntitiesByIds_id', [1, 2, 3, '9223372036854775808'], Connection::PARAM_INT_ARRAY)
             ->willReturn($query);
 
         $qb = $this->getMockBuilder('Doctrine\ORM\QueryBuilder')
-            ->setConstructorArgs(array($em))
-            ->setMethods(array('getQuery'))
+            ->setConstructorArgs([$em])
+            ->setMethods(['getQuery'])
             ->getMock();
 
         $qb->expects($this->once())
@@ -84,7 +84,7 @@ public function testFilterNonIntegerValues()
             ->from('Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity', 'e');
 
         $loader = new ORMQueryBuilderLoader($qb);
-        $loader->getEntitiesByIds('id', array(1, '', 2, 3, 'foo', '9223372036854775808'));
+        $loader->getEntitiesByIds('id', [1, '', 2, 3, 'foo', '9223372036854775808']);
     }
 
     /**
@@ -95,17 +95,17 @@ public function testFilterEmptyUuids($entityClass)
         $em = DoctrineTestHelper::createTestEntityManager();
 
         $query = $this->getMockBuilder('QueryMock')
-            ->setMethods(array('setParameter', 'getResult', 'getSql', '_doExecute'))
+            ->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
             ->getMock();
 
         $query->expects($this->once())
             ->method('setParameter')
-            ->with('ORMQueryBuilderLoader_getEntitiesByIds_id', array('71c5fd46-3f16-4abb-bad7-90ac1e654a2d', 'b98e8e11-2897-44df-ad24-d2627eb7f499'), Connection::PARAM_STR_ARRAY)
+            ->with('ORMQueryBuilderLoader_getEntitiesByIds_id', ['71c5fd46-3f16-4abb-bad7-90ac1e654a2d', 'b98e8e11-2897-44df-ad24-d2627eb7f499'], Connection::PARAM_STR_ARRAY)
             ->willReturn($query);
 
         $qb = $this->getMockBuilder('Doctrine\ORM\QueryBuilder')
-            ->setConstructorArgs(array($em))
-            ->setMethods(array('getQuery'))
+            ->setConstructorArgs([$em])
+            ->setMethods(['getQuery'])
             ->getMock();
 
         $qb->expects($this->once())
@@ -116,7 +116,7 @@ public function testFilterEmptyUuids($entityClass)
             ->from($entityClass, 'e');
 
         $loader = new ORMQueryBuilderLoader($qb);
-        $loader->getEntitiesByIds('id', array('71c5fd46-3f16-4abb-bad7-90ac1e654a2d', '', 'b98e8e11-2897-44df-ad24-d2627eb7f499'));
+        $loader->getEntitiesByIds('id', ['71c5fd46-3f16-4abb-bad7-90ac1e654a2d', '', 'b98e8e11-2897-44df-ad24-d2627eb7f499']);
     }
 
     public function testEmbeddedIdentifierName()
@@ -130,17 +130,17 @@ public function testEmbeddedIdentifierName()
         $em = DoctrineTestHelper::createTestEntityManager();
 
         $query = $this->getMockBuilder('QueryMock')
-            ->setMethods(array('setParameter', 'getResult', 'getSql', '_doExecute'))
+            ->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
             ->getMock();
 
         $query->expects($this->once())
             ->method('setParameter')
-            ->with('ORMQueryBuilderLoader_getEntitiesByIds_id_value', array(1, 2, 3), Connection::PARAM_INT_ARRAY)
+            ->with('ORMQueryBuilderLoader_getEntitiesByIds_id_value', [1, 2, 3], Connection::PARAM_INT_ARRAY)
             ->willReturn($query);
 
         $qb = $this->getMockBuilder('Doctrine\ORM\QueryBuilder')
-            ->setConstructorArgs(array($em))
-            ->setMethods(array('getQuery'))
+            ->setConstructorArgs([$em])
+            ->setMethods(['getQuery'])
             ->getMock();
         $qb->expects($this->once())
             ->method('getQuery')
@@ -150,14 +150,14 @@ public function testEmbeddedIdentifierName()
             ->from('Symfony\Bridge\Doctrine\Tests\Fixtures\EmbeddedIdentifierEntity', 'e');
 
         $loader = new ORMQueryBuilderLoader($qb);
-        $loader->getEntitiesByIds('id.value', array(1, '', 2, 3, 'foo'));
+        $loader->getEntitiesByIds('id.value', [1, '', 2, 3, 'foo']);
     }
 
     public function provideGuidEntityClasses()
     {
-        return array(
-            array('Symfony\Bridge\Doctrine\Tests\Fixtures\GuidIdEntity'),
-            array('Symfony\Bridge\Doctrine\Tests\Fixtures\UuidIdEntity'),
-        );
+        return [
+            ['Symfony\Bridge\Doctrine\Tests\Fixtures\GuidIdEntity'],
+            ['Symfony\Bridge\Doctrine\Tests\Fixtures\UuidIdEntity'],
+        ];
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php
index fa3ff911ad355..e6e85f4d3f7df 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php
@@ -32,10 +32,10 @@ protected function setUp()
 
     public function testTransform()
     {
-        $array = array(
+        $array = [
             2 => 'foo',
             3 => 'bar',
-        );
+        ];
 
         $this->assertSame($array, $this->transformer->transform(new ArrayCollection($array)));
     }
@@ -49,17 +49,17 @@ public function testTransform()
      */
     public function testTransformArray()
     {
-        $array = array(
+        $array = [
             2 => 'foo',
             3 => 'bar',
-        );
+        ];
 
         $this->assertSame($array, $this->transformer->transform($array));
     }
 
     public function testTransformNull()
     {
-        $this->assertSame(array(), $this->transformer->transform(null));
+        $this->assertSame([], $this->transformer->transform(null));
     }
 
     /**
@@ -72,10 +72,10 @@ public function testTransformExpectsArrayOrCollection()
 
     public function testReverseTransform()
     {
-        $array = array(
+        $array = [
             2 => 'foo',
             3 => 'bar',
-        );
+        ];
 
         $this->assertEquals(new ArrayCollection($array), $this->transformer->reverseTransform($array));
     }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/DoctrineOrmTypeGuesserTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/DoctrineOrmTypeGuesserTest.php
index 0eda4a3ba6f0a..c323385ff1929 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/DoctrineOrmTypeGuesserTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/DoctrineOrmTypeGuesserTest.php
@@ -29,54 +29,54 @@ public function testRequiredGuesser($classMetadata, $expected)
 
     public function requiredProvider()
     {
-        $return = array();
+        $return = [];
 
         // Simple field, not nullable
         $classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')->disableOriginalConstructor()->getMock();
         $classMetadata->fieldMappings['field'] = true;
         $classMetadata->expects($this->once())->method('isNullable')->with('field')->will($this->returnValue(false));
 
-        $return[] = array($classMetadata, new ValueGuess(true, Guess::HIGH_CONFIDENCE));
+        $return[] = [$classMetadata, new ValueGuess(true, Guess::HIGH_CONFIDENCE)];
 
         // Simple field, nullable
         $classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')->disableOriginalConstructor()->getMock();
         $classMetadata->fieldMappings['field'] = true;
         $classMetadata->expects($this->once())->method('isNullable')->with('field')->will($this->returnValue(true));
 
-        $return[] = array($classMetadata, new ValueGuess(false, Guess::MEDIUM_CONFIDENCE));
+        $return[] = [$classMetadata, new ValueGuess(false, Guess::MEDIUM_CONFIDENCE)];
 
         // One-to-one, nullable (by default)
         $classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')->disableOriginalConstructor()->getMock();
         $classMetadata->expects($this->once())->method('isAssociationWithSingleJoinColumn')->with('field')->will($this->returnValue(true));
 
-        $mapping = array('joinColumns' => array(array()));
+        $mapping = ['joinColumns' => [[]]];
         $classMetadata->expects($this->once())->method('getAssociationMapping')->with('field')->will($this->returnValue($mapping));
 
-        $return[] = array($classMetadata, new ValueGuess(false, Guess::HIGH_CONFIDENCE));
+        $return[] = [$classMetadata, new ValueGuess(false, Guess::HIGH_CONFIDENCE)];
 
         // One-to-one, nullable (explicit)
         $classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')->disableOriginalConstructor()->getMock();
         $classMetadata->expects($this->once())->method('isAssociationWithSingleJoinColumn')->with('field')->will($this->returnValue(true));
 
-        $mapping = array('joinColumns' => array(array('nullable' => true)));
+        $mapping = ['joinColumns' => [['nullable' => true]]];
         $classMetadata->expects($this->once())->method('getAssociationMapping')->with('field')->will($this->returnValue($mapping));
 
-        $return[] = array($classMetadata, new ValueGuess(false, Guess::HIGH_CONFIDENCE));
+        $return[] = [$classMetadata, new ValueGuess(false, Guess::HIGH_CONFIDENCE)];
 
         // One-to-one, not nullable
         $classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')->disableOriginalConstructor()->getMock();
         $classMetadata->expects($this->once())->method('isAssociationWithSingleJoinColumn')->with('field')->will($this->returnValue(true));
 
-        $mapping = array('joinColumns' => array(array('nullable' => false)));
+        $mapping = ['joinColumns' => [['nullable' => false]]];
         $classMetadata->expects($this->once())->method('getAssociationMapping')->with('field')->will($this->returnValue($mapping));
 
-        $return[] = array($classMetadata, new ValueGuess(true, Guess::HIGH_CONFIDENCE));
+        $return[] = [$classMetadata, new ValueGuess(true, Guess::HIGH_CONFIDENCE)];
 
         // One-to-many, no clue
         $classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')->disableOriginalConstructor()->getMock();
         $classMetadata->expects($this->once())->method('isAssociationWithSingleJoinColumn')->with('field')->will($this->returnValue(false));
 
-        $return[] = array($classMetadata, null);
+        $return[] = [$classMetadata, null];
 
         return $return;
     }
@@ -87,7 +87,7 @@ private function getGuesser(ClassMetadata $classMetadata)
         $em->expects($this->once())->method('getClassMetaData')->with('TestEntity')->will($this->returnValue($classMetadata));
 
         $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')->getMock();
-        $registry->expects($this->once())->method('getManagers')->will($this->returnValue(array($em)));
+        $registry->expects($this->once())->method('getManagers')->will($this->returnValue([$em]));
 
         return new DoctrineOrmTypeGuesser($registry);
     }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/EventListener/MergeDoctrineCollectionListenerTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/EventListener/MergeDoctrineCollectionListenerTest.php
index dbcbc0f325e4b..11cb22d6e4cb3 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/EventListener/MergeDoctrineCollectionListenerTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/EventListener/MergeDoctrineCollectionListenerTest.php
@@ -30,7 +30,7 @@ class MergeDoctrineCollectionListenerTest extends TestCase
 
     protected function setUp()
     {
-        $this->collection = new ArrayCollection(array('test'));
+        $this->collection = new ArrayCollection(['test']);
         $this->dispatcher = new EventDispatcher();
         $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
         $this->form = $this->getBuilder()
@@ -60,7 +60,7 @@ protected function getForm($name = 'name')
 
     public function testOnSubmitDoNothing()
     {
-        $submittedData = array('test');
+        $submittedData = ['test'];
         $event = new FormEvent($this->getForm(), $submittedData);
 
         $this->dispatcher->dispatch(FormEvents::SUBMIT, $event);
@@ -71,7 +71,7 @@ public function testOnSubmitDoNothing()
 
     public function testOnSubmitNullClearCollection()
     {
-        $submittedData = array();
+        $submittedData = [];
         $event = new FormEvent($this->getForm(), $submittedData);
 
         $this->dispatcher->dispatch(FormEvents::SUBMIT, $event);
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
index f4f7effa61c20..afdeb5f720e27 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
@@ -42,10 +42,10 @@ protected function getExtensions()
             ->method('getManagerForClass')
             ->will($this->returnValue($this->em));
 
-        return array(
+        return [
             new CoreExtension(),
             new DoctrineOrmExtension($manager),
-        );
+        ];
     }
 
     protected function setUp()
@@ -55,9 +55,9 @@ protected function setUp()
         parent::setUp();
 
         $schemaTool = new SchemaTool($this->em);
-        $classes = array(
+        $classes = [
             $this->em->getClassMetadata(self::ENTITY_CLASS),
-        );
+        ];
 
         try {
             $schemaTool->dropSchema($classes);
@@ -90,9 +90,9 @@ public function testCollapsedEntityField()
         $this->setMaxRunningTime(1);
 
         for ($i = 0; $i < 40; ++$i) {
-            $form = $this->factory->create('Symfony\Bridge\Doctrine\Form\Type\EntityType', null, array(
+            $form = $this->factory->create('Symfony\Bridge\Doctrine\Form\Type\EntityType', null, [
                 'class' => self::ENTITY_CLASS,
-            ));
+            ]);
 
             // force loading of the choice list
             $form->createView();
@@ -108,10 +108,10 @@ public function testCollapsedEntityFieldWithChoices()
         $this->setMaxRunningTime(1);
 
         for ($i = 0; $i < 40; ++$i) {
-            $form = $this->factory->create('Symfony\Bridge\Doctrine\Form\Type\EntityType', null, array(
+            $form = $this->factory->create('Symfony\Bridge\Doctrine\Form\Type\EntityType', null, [
                 'class' => self::ENTITY_CLASS,
                 'choices' => $choices,
-            ));
+            ]);
 
             // force loading of the choice list
             $form->createView();
@@ -127,10 +127,10 @@ public function testCollapsedEntityFieldWithPreferredChoices()
         $this->setMaxRunningTime(1);
 
         for ($i = 0; $i < 40; ++$i) {
-            $form = $this->factory->create('Symfony\Bridge\Doctrine\Form\Type\EntityType', null, array(
+            $form = $this->factory->create('Symfony\Bridge\Doctrine\Form\Type\EntityType', null, [
                     'class' => self::ENTITY_CLASS,
                     'preferred_choices' => $choices,
-                ));
+                ]);
 
             // force loading of the choice list
             $form->createView();
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
index d60992fcf119a..2869c2b804c4c 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -65,7 +65,7 @@ protected function setUp()
         parent::setUp();
 
         $schemaTool = new SchemaTool($this->em);
-        $classes = array(
+        $classes = [
             $this->em->getClassMetadata(self::ITEM_GROUP_CLASS),
             $this->em->getClassMetadata(self::SINGLE_IDENT_CLASS),
             $this->em->getClassMetadata(self::SINGLE_IDENT_NO_TO_STRING_CLASS),
@@ -74,7 +74,7 @@ protected function setUp()
             $this->em->getClassMetadata(self::SINGLE_STRING_CASTABLE_IDENT_CLASS),
             $this->em->getClassMetadata(self::COMPOSITE_IDENT_CLASS),
             $this->em->getClassMetadata(self::COMPOSITE_STRING_IDENT_CLASS),
-        );
+        ];
 
         try {
             $schemaTool->dropSchema($classes);
@@ -97,9 +97,9 @@ protected function tearDown()
 
     protected function getExtensions()
     {
-        return array_merge(parent::getExtensions(), array(
+        return array_merge(parent::getExtensions(), [
             new DoctrineOrmExtension($this->emRegistry),
-        ));
+        ]);
     }
 
     protected function persist(array $entities)
@@ -126,9 +126,9 @@ public function testClassOptionIsRequired()
      */
     public function testInvalidClassOption()
     {
-        $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'class' => 'foo',
-        ));
+        ]);
     }
 
     public function testSetDataToUninitializedEntityWithNonRequired()
@@ -136,16 +136,16 @@ public function testSetDataToUninitializedEntityWithNonRequired()
         $entity1 = new SingleIntIdEntity(1, 'Foo');
         $entity2 = new SingleIntIdEntity(2, 'Bar');
 
-        $this->persist(array($entity1, $entity2));
+        $this->persist([$entity1, $entity2]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'required' => false,
             'choice_label' => 'name',
-        ));
+        ]);
 
-        $this->assertEquals(array(1 => new ChoiceView($entity1, '1', 'Foo'), 2 => new ChoiceView($entity2, '2', 'Bar')), $field->createView()->vars['choices']);
+        $this->assertEquals([1 => new ChoiceView($entity1, '1', 'Foo'), 2 => new ChoiceView($entity2, '2', 'Bar')], $field->createView()->vars['choices']);
     }
 
     public function testSetDataToUninitializedEntityWithNonRequiredToString()
@@ -153,16 +153,16 @@ public function testSetDataToUninitializedEntityWithNonRequiredToString()
         $entity1 = new SingleIntIdEntity(1, 'Foo');
         $entity2 = new SingleIntIdEntity(2, 'Bar');
 
-        $this->persist(array($entity1, $entity2));
+        $this->persist([$entity1, $entity2]);
 
-        $view = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $view = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'required' => false,
-        ))
+        ])
             ->createView();
 
-        $this->assertEquals(array(1 => new ChoiceView($entity1, '1', 'Foo'), 2 => new ChoiceView($entity2, '2', 'Bar')), $view->vars['choices']);
+        $this->assertEquals([1 => new ChoiceView($entity1, '1', 'Foo'), 2 => new ChoiceView($entity2, '2', 'Bar')], $view->vars['choices']);
     }
 
     public function testSetDataToUninitializedEntityWithNonRequiredQueryBuilder()
@@ -170,19 +170,19 @@ public function testSetDataToUninitializedEntityWithNonRequiredQueryBuilder()
         $entity1 = new SingleIntIdEntity(1, 'Foo');
         $entity2 = new SingleIntIdEntity(2, 'Bar');
 
-        $this->persist(array($entity1, $entity2));
+        $this->persist([$entity1, $entity2]);
         $qb = $this->em->createQueryBuilder()->select('e')->from(self::SINGLE_IDENT_CLASS, 'e');
 
-        $view = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $view = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'required' => false,
             'choice_label' => 'name',
             'query_builder' => $qb,
-        ))
+        ])
             ->createView();
 
-        $this->assertEquals(array(1 => new ChoiceView($entity1, '1', 'Foo'), 2 => new ChoiceView($entity2, '2', 'Bar')), $view->vars['choices']);
+        $this->assertEquals([1 => new ChoiceView($entity1, '1', 'Foo'), 2 => new ChoiceView($entity2, '2', 'Bar')], $view->vars['choices']);
     }
 
     /**
@@ -190,11 +190,11 @@ public function testSetDataToUninitializedEntityWithNonRequiredQueryBuilder()
      */
     public function testConfigureQueryBuilderWithNonQueryBuilderAndNonClosure()
     {
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'query_builder' => new \stdClass(),
-        ));
+        ]);
     }
 
     /**
@@ -202,13 +202,13 @@ public function testConfigureQueryBuilderWithNonQueryBuilderAndNonClosure()
      */
     public function testConfigureQueryBuilderWithClosureReturningNonQueryBuilder()
     {
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'query_builder' => function () {
                 return new \stdClass();
             },
-        ));
+        ]);
 
         $field->submit('2');
     }
@@ -218,26 +218,26 @@ public function testConfigureQueryBuilderWithClosureReturningNullUseDefault()
         $entity1 = new SingleIntIdEntity(1, 'Foo');
         $entity2 = new SingleIntIdEntity(2, 'Bar');
 
-        $this->persist(array($entity1, $entity2));
+        $this->persist([$entity1, $entity2]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'query_builder' => function () {
                 return;
             },
-        ));
+        ]);
 
-        $this->assertEquals(array(1 => new ChoiceView($entity1, '1', 'Foo'), 2 => new ChoiceView($entity2, '2', 'Bar')), $field->createView()->vars['choices']);
+        $this->assertEquals([1 => new ChoiceView($entity1, '1', 'Foo'), 2 => new ChoiceView($entity2, '2', 'Bar')], $field->createView()->vars['choices']);
     }
 
     public function testSetDataSingleNull()
     {
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => false,
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
-        ));
+        ]);
         $field->setData(null);
 
         $this->assertNull($field->getData());
@@ -246,30 +246,30 @@ public function testSetDataSingleNull()
 
     public function testSetDataMultipleExpandedNull()
     {
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => true,
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
-        ));
+        ]);
         $field->setData(null);
 
         $this->assertNull($field->getData());
-        $this->assertSame(array(), $field->getViewData());
+        $this->assertSame([], $field->getViewData());
     }
 
     public function testSetDataMultipleNonExpandedNull()
     {
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => false,
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
-        ));
+        ]);
         $field->setData(null);
 
         $this->assertNull($field->getData());
-        $this->assertSame(array(), $field->getViewData());
+        $this->assertSame([], $field->getViewData());
     }
 
     public function testSubmitSingleNonExpandedSingleIdentifier()
@@ -277,15 +277,15 @@ public function testSubmitSingleNonExpandedSingleIdentifier()
         $entity1 = new SingleIntIdEntity(1, 'Foo');
         $entity2 = new SingleIntIdEntity(2, 'Bar');
 
-        $this->persist(array($entity1, $entity2));
+        $this->persist([$entity1, $entity2]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
         $field->submit('2');
 
@@ -302,15 +302,15 @@ public function testSubmitSingleNonExpandedSingleAssocIdentifier()
         $entity1 = new SingleAssociationToIntIdEntity($innerEntity1, 'Foo');
         $entity2 = new SingleAssociationToIntIdEntity($innerEntity2, 'Bar');
 
-        $this->persist(array($innerEntity1, $innerEntity2, $entity1, $entity2));
+        $this->persist([$innerEntity1, $innerEntity2, $entity1, $entity2]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
             'em' => 'default',
             'class' => self::SINGLE_ASSOC_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
         $field->submit('2');
 
@@ -324,15 +324,15 @@ public function testSubmitSingleNonExpandedCompositeIdentifier()
         $entity1 = new CompositeIntIdEntity(10, 20, 'Foo');
         $entity2 = new CompositeIntIdEntity(30, 40, 'Bar');
 
-        $this->persist(array($entity1, $entity2));
+        $this->persist([$entity1, $entity2]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
             'em' => 'default',
             'class' => self::COMPOSITE_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
         // the collection key is used here
         $field->submit('1');
@@ -348,23 +348,23 @@ public function testSubmitMultipleNonExpandedSingleIdentifier()
         $entity2 = new SingleIntIdEntity(2, 'Bar');
         $entity3 = new SingleIntIdEntity(3, 'Baz');
 
-        $this->persist(array($entity1, $entity2, $entity3));
+        $this->persist([$entity1, $entity2, $entity3]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => false,
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
-        $field->submit(array('1', '3'));
+        $field->submit(['1', '3']);
 
-        $expected = new ArrayCollection(array($entity1, $entity3));
+        $expected = new ArrayCollection([$entity1, $entity3]);
 
         $this->assertTrue($field->isSynchronized());
         $this->assertEquals($expected, $field->getData());
-        $this->assertSame(array('1', '3'), $field->getViewData());
+        $this->assertSame(['1', '3'], $field->getViewData());
     }
 
     public function testSubmitMultipleNonExpandedSingleAssocIdentifier()
@@ -377,23 +377,23 @@ public function testSubmitMultipleNonExpandedSingleAssocIdentifier()
         $entity2 = new SingleAssociationToIntIdEntity($innerEntity2, 'Bar');
         $entity3 = new SingleAssociationToIntIdEntity($innerEntity3, 'Baz');
 
-        $this->persist(array($innerEntity1, $innerEntity2, $innerEntity3, $entity1, $entity2, $entity3));
+        $this->persist([$innerEntity1, $innerEntity2, $innerEntity3, $entity1, $entity2, $entity3]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => false,
             'em' => 'default',
             'class' => self::SINGLE_ASSOC_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
-        $field->submit(array('1', '3'));
+        $field->submit(['1', '3']);
 
-        $expected = new ArrayCollection(array($entity1, $entity3));
+        $expected = new ArrayCollection([$entity1, $entity3]);
 
         $this->assertTrue($field->isSynchronized());
         $this->assertEquals($expected, $field->getData());
-        $this->assertSame(array('1', '3'), $field->getViewData());
+        $this->assertSame(['1', '3'], $field->getViewData());
     }
 
     public function testSubmitMultipleNonExpandedSingleIdentifierForExistingData()
@@ -402,29 +402,29 @@ public function testSubmitMultipleNonExpandedSingleIdentifierForExistingData()
         $entity2 = new SingleIntIdEntity(2, 'Bar');
         $entity3 = new SingleIntIdEntity(3, 'Baz');
 
-        $this->persist(array($entity1, $entity2, $entity3));
+        $this->persist([$entity1, $entity2, $entity3]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => false,
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
-        $existing = new ArrayCollection(array(0 => $entity2));
+        $existing = new ArrayCollection([0 => $entity2]);
 
         $field->setData($existing);
-        $field->submit(array('1', '3'));
+        $field->submit(['1', '3']);
 
         // entry with index 0 ($entity2) was replaced
-        $expected = new ArrayCollection(array(0 => $entity1, 1 => $entity3));
+        $expected = new ArrayCollection([0 => $entity1, 1 => $entity3]);
 
         $this->assertTrue($field->isSynchronized());
         $this->assertEquals($expected, $field->getData());
         // same object still, useful if it is a PersistentCollection
         $this->assertSame($existing, $field->getData());
-        $this->assertSame(array('1', '3'), $field->getViewData());
+        $this->assertSame(['1', '3'], $field->getViewData());
     }
 
     public function testSubmitMultipleNonExpandedCompositeIdentifier()
@@ -433,24 +433,24 @@ public function testSubmitMultipleNonExpandedCompositeIdentifier()
         $entity2 = new CompositeIntIdEntity(30, 40, 'Bar');
         $entity3 = new CompositeIntIdEntity(50, 60, 'Baz');
 
-        $this->persist(array($entity1, $entity2, $entity3));
+        $this->persist([$entity1, $entity2, $entity3]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => false,
             'em' => 'default',
             'class' => self::COMPOSITE_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
         // because of the composite key collection keys are used
-        $field->submit(array('0', '2'));
+        $field->submit(['0', '2']);
 
-        $expected = new ArrayCollection(array($entity1, $entity3));
+        $expected = new ArrayCollection([$entity1, $entity3]);
 
         $this->assertTrue($field->isSynchronized());
         $this->assertEquals($expected, $field->getData());
-        $this->assertSame(array('0', '2'), $field->getViewData());
+        $this->assertSame(['0', '2'], $field->getViewData());
     }
 
     public function testSubmitMultipleNonExpandedCompositeIdentifierExistingData()
@@ -459,29 +459,29 @@ public function testSubmitMultipleNonExpandedCompositeIdentifierExistingData()
         $entity2 = new CompositeIntIdEntity(30, 40, 'Bar');
         $entity3 = new CompositeIntIdEntity(50, 60, 'Baz');
 
-        $this->persist(array($entity1, $entity2, $entity3));
+        $this->persist([$entity1, $entity2, $entity3]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => false,
             'em' => 'default',
             'class' => self::COMPOSITE_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
-        $existing = new ArrayCollection(array(0 => $entity2));
+        $existing = new ArrayCollection([0 => $entity2]);
 
         $field->setData($existing);
-        $field->submit(array('0', '2'));
+        $field->submit(['0', '2']);
 
         // entry with index 0 ($entity2) was replaced
-        $expected = new ArrayCollection(array(0 => $entity1, 1 => $entity3));
+        $expected = new ArrayCollection([0 => $entity1, 1 => $entity3]);
 
         $this->assertTrue($field->isSynchronized());
         $this->assertEquals($expected, $field->getData());
         // same object still, useful if it is a PersistentCollection
         $this->assertSame($existing, $field->getData());
-        $this->assertSame(array('0', '2'), $field->getViewData());
+        $this->assertSame(['0', '2'], $field->getViewData());
     }
 
     public function testSubmitSingleExpanded()
@@ -489,15 +489,15 @@ public function testSubmitSingleExpanded()
         $entity1 = new SingleIntIdEntity(1, 'Foo');
         $entity2 = new SingleIntIdEntity(2, 'Bar');
 
-        $this->persist(array($entity1, $entity2));
+        $this->persist([$entity1, $entity2]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
         $field->submit('2');
 
@@ -515,19 +515,19 @@ public function testSubmitMultipleExpanded()
         $entity2 = new SingleIntIdEntity(2, 'Bar');
         $entity3 = new SingleIntIdEntity(3, 'Bar');
 
-        $this->persist(array($entity1, $entity2, $entity3));
+        $this->persist([$entity1, $entity2, $entity3]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => true,
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
-        $field->submit(array('1', '3'));
+        $field->submit(['1', '3']);
 
-        $expected = new ArrayCollection(array($entity1, $entity3));
+        $expected = new ArrayCollection([$entity1, $entity3]);
 
         $this->assertTrue($field->isSynchronized());
         $this->assertEquals($expected, $field->getData());
@@ -544,19 +544,19 @@ public function testSubmitMultipleExpandedWithNegativeIntegerId()
         $entity1 = new SingleIntIdEntity(-1, 'Foo');
         $entity2 = new SingleIntIdEntity(2, 'Bar');
 
-        $this->persist(array($entity1, $entity2));
+        $this->persist([$entity1, $entity2]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => true,
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
-        $field->submit(array('-1'));
+        $field->submit(['-1']);
 
-        $expected = new ArrayCollection(array($entity1));
+        $expected = new ArrayCollection([$entity1]);
 
         $this->assertTrue($field->isSynchronized());
         $this->assertEquals($expected, $field->getData());
@@ -569,15 +569,15 @@ public function testSubmitSingleNonExpandedStringCastableIdentifier()
         $entity1 = new SingleStringCastableIdEntity(1, 'Foo');
         $entity2 = new SingleStringCastableIdEntity(2, 'Bar');
 
-        $this->persist(array($entity1, $entity2));
+        $this->persist([$entity1, $entity2]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
             'em' => 'default',
             'class' => self::SINGLE_STRING_CASTABLE_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
         $field->submit('2');
 
@@ -591,15 +591,15 @@ public function testSubmitSingleStringCastableIdentifierExpanded()
         $entity1 = new SingleStringCastableIdEntity(1, 'Foo');
         $entity2 = new SingleStringCastableIdEntity(2, 'Bar');
 
-        $this->persist(array($entity1, $entity2));
+        $this->persist([$entity1, $entity2]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'em' => 'default',
             'class' => self::SINGLE_STRING_CASTABLE_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
         $field->submit('2');
 
@@ -617,29 +617,29 @@ public function testSubmitMultipleNonExpandedStringCastableIdentifierForExisting
         $entity2 = new SingleStringCastableIdEntity(2, 'Bar');
         $entity3 = new SingleStringCastableIdEntity(3, 'Baz');
 
-        $this->persist(array($entity1, $entity2, $entity3));
+        $this->persist([$entity1, $entity2, $entity3]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => false,
             'em' => 'default',
             'class' => self::SINGLE_STRING_CASTABLE_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
-        $existing = new ArrayCollection(array(0 => $entity2));
+        $existing = new ArrayCollection([0 => $entity2]);
 
         $field->setData($existing);
-        $field->submit(array('1', '3'));
+        $field->submit(['1', '3']);
 
         // entry with index 0 ($entity2) was replaced
-        $expected = new ArrayCollection(array(0 => $entity1, 1 => $entity3));
+        $expected = new ArrayCollection([0 => $entity1, 1 => $entity3]);
 
         $this->assertTrue($field->isSynchronized());
         $this->assertEquals($expected, $field->getData());
         // same object still, useful if it is a PersistentCollection
         $this->assertSame($existing, $field->getData());
-        $this->assertSame(array('1', '3'), $field->getViewData());
+        $this->assertSame(['1', '3'], $field->getViewData());
     }
 
     public function testSubmitMultipleNonExpandedStringCastableIdentifier()
@@ -648,23 +648,23 @@ public function testSubmitMultipleNonExpandedStringCastableIdentifier()
         $entity2 = new SingleStringCastableIdEntity(2, 'Bar');
         $entity3 = new SingleStringCastableIdEntity(3, 'Baz');
 
-        $this->persist(array($entity1, $entity2, $entity3));
+        $this->persist([$entity1, $entity2, $entity3]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => false,
             'em' => 'default',
             'class' => self::SINGLE_STRING_CASTABLE_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
-        $field->submit(array('1', '3'));
+        $field->submit(['1', '3']);
 
-        $expected = new ArrayCollection(array($entity1, $entity3));
+        $expected = new ArrayCollection([$entity1, $entity3]);
 
         $this->assertTrue($field->isSynchronized());
         $this->assertEquals($expected, $field->getData());
-        $this->assertSame(array('1', '3'), $field->getViewData());
+        $this->assertSame(['1', '3'], $field->getViewData());
     }
 
     public function testSubmitMultipleStringCastableIdentifierExpanded()
@@ -673,19 +673,19 @@ public function testSubmitMultipleStringCastableIdentifierExpanded()
         $entity2 = new SingleStringCastableIdEntity(2, 'Bar');
         $entity3 = new SingleStringCastableIdEntity(3, 'Bar');
 
-        $this->persist(array($entity1, $entity2, $entity3));
+        $this->persist([$entity1, $entity2, $entity3]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => true,
             'em' => 'default',
             'class' => self::SINGLE_STRING_CASTABLE_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
-        $field->submit(array('1', '3'));
+        $field->submit(['1', '3']);
 
-        $expected = new ArrayCollection(array($entity1, $entity3));
+        $expected = new ArrayCollection([$entity1, $entity3]);
 
         $this->assertTrue($field->isSynchronized());
         $this->assertEquals($expected, $field->getData());
@@ -703,19 +703,19 @@ public function testOverrideChoices()
         $entity2 = new SingleIntIdEntity(2, 'Bar');
         $entity3 = new SingleIntIdEntity(3, 'Baz');
 
-        $this->persist(array($entity1, $entity2, $entity3));
+        $this->persist([$entity1, $entity2, $entity3]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             // not all persisted entities should be displayed
-            'choices' => array($entity1, $entity2),
+            'choices' => [$entity1, $entity2],
             'choice_label' => 'name',
-        ));
+        ]);
 
         $field->submit('2');
 
-        $this->assertEquals(array(1 => new ChoiceView($entity1, '1', 'Foo'), 2 => new ChoiceView($entity2, '2', 'Bar')), $field->createView()->vars['choices']);
+        $this->assertEquals([1 => new ChoiceView($entity1, '1', 'Foo'), 2 => new ChoiceView($entity2, '2', 'Bar')], $field->createView()->vars['choices']);
         $this->assertTrue($field->isSynchronized());
         $this->assertSame($entity2, $field->getData());
         $this->assertSame('2', $field->getViewData());
@@ -726,18 +726,18 @@ public function testOverrideChoicesValues()
         $entity1 = new SingleIntIdEntity(1, 'Foo');
         $entity2 = new SingleIntIdEntity(2, 'Bar');
 
-        $this->persist(array($entity1, $entity2));
+        $this->persist([$entity1, $entity2]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'choice_label' => 'name',
             'choice_value' => 'name',
-        ));
+        ]);
 
         $field->submit('Bar');
 
-        $this->assertEquals(array('Foo' => new ChoiceView($entity1, 'Foo', 'Foo'), 'Bar' => new ChoiceView($entity2, 'Bar', 'Bar')), $field->createView()->vars['choices']);
+        $this->assertEquals(['Foo' => new ChoiceView($entity1, 'Foo', 'Foo'), 'Bar' => new ChoiceView($entity2, 'Bar', 'Bar')], $field->createView()->vars['choices']);
         $this->assertTrue($field->isSynchronized(), 'Field should be synchronized.');
         $this->assertSame($entity2, $field->getData(), 'Entity should be loaded by custom value.');
         $this->assertSame('Bar', $field->getViewData());
@@ -748,9 +748,9 @@ public function testOverrideChoicesValuesWithCallable()
         $entity1 = new GroupableEntity(1, 'Foo', 'BazGroup');
         $entity2 = new GroupableEntity(2, 'Bar', 'BooGroup');
 
-        $this->persist(array($entity1, $entity2));
+        $this->persist([$entity1, $entity2]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::ITEM_GROUP_CLASS,
             'choice_label' => 'name',
@@ -761,14 +761,14 @@ public function testOverrideChoicesValuesWithCallable()
 
                 return $entity->groupName.'/'.$entity->name;
             },
-        ));
+        ]);
 
         $field->submit('BooGroup/Bar');
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'BazGroup/Foo' => new ChoiceView($entity1, 'BazGroup/Foo', 'Foo'),
             'BooGroup/Bar' => new ChoiceView($entity2, 'BooGroup/Bar', 'Bar'),
-            ), $field->createView()->vars['choices']);
+            ], $field->createView()->vars['choices']);
         $this->assertTrue($field->isSynchronized(), 'Field should be synchronized.');
         $this->assertSame($entity2, $field->getData(), 'Entity should be loaded by custom value.');
         $this->assertSame('BooGroup/Bar', $field->getViewData());
@@ -779,13 +779,13 @@ public function testChoicesForValuesOptimization()
         $entity1 = new SingleIntIdEntity(1, 'Foo');
         $entity2 = new SingleIntIdEntity(2, 'Bar');
 
-        $this->persist(array($entity1, $entity2));
+        $this->persist([$entity1, $entity2]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
         $this->em->clear();
 
@@ -805,29 +805,29 @@ public function testGroupByChoices()
         $item3 = new GroupableEntity(3, 'Baz', 'Group2');
         $item4 = new GroupableEntity(4, 'Boo!', null);
 
-        $this->persist(array($item1, $item2, $item3, $item4));
+        $this->persist([$item1, $item2, $item3, $item4]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::ITEM_GROUP_CLASS,
-            'choices' => array($item1, $item2, $item3, $item4),
+            'choices' => [$item1, $item2, $item3, $item4],
             'choice_label' => 'name',
             'group_by' => 'groupName',
-        ));
+        ]);
 
         $field->submit('2');
 
         $this->assertSame('2', $field->getViewData());
-        $this->assertEquals(array(
-            'Group1' => new ChoiceGroupView('Group1', array(
+        $this->assertEquals([
+            'Group1' => new ChoiceGroupView('Group1', [
                 1 => new ChoiceView($item1, '1', 'Foo'),
                 2 => new ChoiceView($item2, '2', 'Bar'),
-            )),
-            'Group2' => new ChoiceGroupView('Group2', array(
+            ]),
+            'Group2' => new ChoiceGroupView('Group2', [
                 3 => new ChoiceView($item3, '3', 'Baz'),
-            )),
+            ]),
             4 => new ChoiceView($item4, '4', 'Boo!'),
-        ), $field->createView()->vars['choices']);
+        ], $field->createView()->vars['choices']);
     }
 
     public function testPreferredChoices()
@@ -836,17 +836,17 @@ public function testPreferredChoices()
         $entity2 = new SingleIntIdEntity(2, 'Bar');
         $entity3 = new SingleIntIdEntity(3, 'Baz');
 
-        $this->persist(array($entity1, $entity2, $entity3));
+        $this->persist([$entity1, $entity2, $entity3]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
-            'preferred_choices' => array($entity3, $entity2),
+            'preferred_choices' => [$entity3, $entity2],
             'choice_label' => 'name',
-        ));
+        ]);
 
-        $this->assertEquals(array(3 => new ChoiceView($entity3, '3', 'Baz'), 2 => new ChoiceView($entity2, '2', 'Bar')), $field->createView()->vars['preferred_choices']);
-        $this->assertEquals(array(1 => new ChoiceView($entity1, '1', 'Foo')), $field->createView()->vars['choices']);
+        $this->assertEquals([3 => new ChoiceView($entity3, '3', 'Baz'), 2 => new ChoiceView($entity2, '2', 'Bar')], $field->createView()->vars['preferred_choices']);
+        $this->assertEquals([1 => new ChoiceView($entity1, '1', 'Foo')], $field->createView()->vars['choices']);
     }
 
     public function testOverrideChoicesWithPreferredChoices()
@@ -855,18 +855,18 @@ public function testOverrideChoicesWithPreferredChoices()
         $entity2 = new SingleIntIdEntity(2, 'Bar');
         $entity3 = new SingleIntIdEntity(3, 'Baz');
 
-        $this->persist(array($entity1, $entity2, $entity3));
+        $this->persist([$entity1, $entity2, $entity3]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
-            'choices' => array($entity2, $entity3),
-            'preferred_choices' => array($entity3),
+            'choices' => [$entity2, $entity3],
+            'preferred_choices' => [$entity3],
             'choice_label' => 'name',
-        ));
+        ]);
 
-        $this->assertEquals(array(3 => new ChoiceView($entity3, '3', 'Baz')), $field->createView()->vars['preferred_choices']);
-        $this->assertEquals(array(2 => new ChoiceView($entity2, '2', 'Bar')), $field->createView()->vars['choices']);
+        $this->assertEquals([3 => new ChoiceView($entity3, '3', 'Baz')], $field->createView()->vars['preferred_choices']);
+        $this->assertEquals([2 => new ChoiceView($entity2, '2', 'Bar')], $field->createView()->vars['choices']);
     }
 
     public function testDisallowChoicesThatAreNotIncludedChoicesSingleIdentifier()
@@ -875,14 +875,14 @@ public function testDisallowChoicesThatAreNotIncludedChoicesSingleIdentifier()
         $entity2 = new SingleIntIdEntity(2, 'Bar');
         $entity3 = new SingleIntIdEntity(3, 'Baz');
 
-        $this->persist(array($entity1, $entity2, $entity3));
+        $this->persist([$entity1, $entity2, $entity3]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
-            'choices' => array($entity1, $entity2),
+            'choices' => [$entity1, $entity2],
             'choice_label' => 'name',
-        ));
+        ]);
 
         $field->submit('3');
 
@@ -898,14 +898,14 @@ public function testDisallowChoicesThatAreNotIncludedChoicesSingleAssocIdentifie
         $entity1 = new SingleAssociationToIntIdEntity($innerEntity1, 'Foo');
         $entity2 = new SingleAssociationToIntIdEntity($innerEntity2, 'Bar');
 
-        $this->persist(array($innerEntity1, $innerEntity2, $entity1, $entity2));
+        $this->persist([$innerEntity1, $innerEntity2, $entity1, $entity2]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_ASSOC_IDENT_CLASS,
-            'choices' => array($entity1, $entity2),
+            'choices' => [$entity1, $entity2],
             'choice_label' => 'name',
-        ));
+        ]);
 
         $field->submit('3');
 
@@ -919,14 +919,14 @@ public function testDisallowChoicesThatAreNotIncludedChoicesCompositeIdentifier(
         $entity2 = new CompositeIntIdEntity(30, 40, 'Bar');
         $entity3 = new CompositeIntIdEntity(50, 60, 'Baz');
 
-        $this->persist(array($entity1, $entity2, $entity3));
+        $this->persist([$entity1, $entity2, $entity3]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::COMPOSITE_IDENT_CLASS,
-            'choices' => array($entity1, $entity2),
+            'choices' => [$entity1, $entity2],
             'choice_label' => 'name',
-        ));
+        ]);
 
         $field->submit('2');
 
@@ -940,17 +940,17 @@ public function testDisallowChoicesThatAreNotIncludedQueryBuilderSingleIdentifie
         $entity2 = new SingleIntIdEntity(2, 'Bar');
         $entity3 = new SingleIntIdEntity(3, 'Baz');
 
-        $this->persist(array($entity1, $entity2, $entity3));
+        $this->persist([$entity1, $entity2, $entity3]);
 
         $repository = $this->em->getRepository(self::SINGLE_IDENT_CLASS);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'query_builder' => $repository->createQueryBuilder('e')
                 ->where('e.id IN (1, 2)'),
             'choice_label' => 'name',
-        ));
+        ]);
 
         $field->submit('3');
 
@@ -968,17 +968,17 @@ public function testDisallowChoicesThatAreNotIncludedQueryBuilderSingleAssocIden
         $entity2 = new SingleAssociationToIntIdEntity($innerEntity2, 'Bar');
         $entity3 = new SingleAssociationToIntIdEntity($innerEntity3, 'Baz');
 
-        $this->persist(array($innerEntity1, $innerEntity2, $innerEntity3, $entity1, $entity2, $entity3));
+        $this->persist([$innerEntity1, $innerEntity2, $innerEntity3, $entity1, $entity2, $entity3]);
 
         $repository = $this->em->getRepository(self::SINGLE_ASSOC_IDENT_CLASS);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_ASSOC_IDENT_CLASS,
             'query_builder' => $repository->createQueryBuilder('e')
                 ->where('e.entity IN (1, 2)'),
             'choice_label' => 'name',
-        ));
+        ]);
 
         $field->submit('3');
 
@@ -992,9 +992,9 @@ public function testDisallowChoicesThatAreNotIncludedQueryBuilderAsClosureSingle
         $entity2 = new SingleIntIdEntity(2, 'Bar');
         $entity3 = new SingleIntIdEntity(3, 'Baz');
 
-        $this->persist(array($entity1, $entity2, $entity3));
+        $this->persist([$entity1, $entity2, $entity3]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'query_builder' => function (EntityRepository $repository) {
@@ -1002,7 +1002,7 @@ public function testDisallowChoicesThatAreNotIncludedQueryBuilderAsClosureSingle
                     ->where('e.id IN (1, 2)');
             },
             'choice_label' => 'name',
-        ));
+        ]);
 
         $field->submit('3');
 
@@ -1016,9 +1016,9 @@ public function testDisallowChoicesThatAreNotIncludedQueryBuilderAsClosureCompos
         $entity2 = new CompositeIntIdEntity(30, 40, 'Bar');
         $entity3 = new CompositeIntIdEntity(50, 60, 'Baz');
 
-        $this->persist(array($entity1, $entity2, $entity3));
+        $this->persist([$entity1, $entity2, $entity3]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::COMPOSITE_IDENT_CLASS,
             'query_builder' => function (EntityRepository $repository) {
@@ -1026,7 +1026,7 @@ public function testDisallowChoicesThatAreNotIncludedQueryBuilderAsClosureCompos
                     ->where('e.id1 IN (10, 50)');
             },
             'choice_label' => 'name',
-        ));
+        ]);
 
         $field->submit('2');
 
@@ -1038,15 +1038,15 @@ public function testSubmitSingleStringIdentifier()
     {
         $entity1 = new SingleStringIdEntity('foo', 'Foo');
 
-        $this->persist(array($entity1));
+        $this->persist([$entity1]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
             'em' => 'default',
             'class' => self::SINGLE_STRING_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
         $field->submit('foo');
 
@@ -1059,15 +1059,15 @@ public function testSubmitCompositeStringIdentifier()
     {
         $entity1 = new CompositeStringIdEntity('foo1', 'foo2', 'Foo');
 
-        $this->persist(array($entity1));
+        $this->persist([$entity1]);
 
-        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
             'em' => 'default',
             'class' => self::COMPOSITE_STRING_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
 
         // the collection key is used here
         $field->submit('0');
@@ -1087,11 +1087,11 @@ public function testGetManagerForClassIfNoEm()
             ->with(self::SINGLE_IDENT_CLASS)
             ->will($this->returnValue($this->em));
 
-        $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'class' => self::SINGLE_IDENT_CLASS,
             'required' => false,
             'choice_label' => 'name',
-        ));
+        ]);
     }
 
     public function testExplicitEm()
@@ -1102,11 +1102,11 @@ public function testExplicitEm()
         $this->emRegistry->expects($this->never())
             ->method('getManagerForClass');
 
-        $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => $this->em,
             'class' => self::SINGLE_IDENT_CLASS,
             'choice_label' => 'name',
-        ));
+        ]);
     }
 
     public function testLoaderCaching()
@@ -1115,7 +1115,7 @@ public function testLoaderCaching()
         $entity2 = new SingleIntIdEntity(2, 'Bar');
         $entity3 = new SingleIntIdEntity(3, 'Baz');
 
-        $this->persist(array($entity1, $entity2, $entity3));
+        $this->persist([$entity1, $entity2, $entity3]);
 
         $repo = $this->em->getRepository(self::SINGLE_IDENT_CLASS);
 
@@ -1130,35 +1130,35 @@ public function testLoaderCaching()
 
         $formBuilder = $factory->createNamedBuilder('form', FormTypeTest::TESTED_TYPE);
 
-        $formBuilder->add('property1', static::TESTED_TYPE, array(
+        $formBuilder->add('property1', static::TESTED_TYPE, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'query_builder' => $repo->createQueryBuilder('e')->where('e.id IN (1, 2)'),
-        ));
+        ]);
 
-        $formBuilder->add('property2', static::TESTED_TYPE, array(
+        $formBuilder->add('property2', static::TESTED_TYPE, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'query_builder' => function (EntityRepository $repo) {
                 return $repo->createQueryBuilder('e')->where('e.id IN (1, 2)');
             },
-        ));
+        ]);
 
-        $formBuilder->add('property3', static::TESTED_TYPE, array(
+        $formBuilder->add('property3', static::TESTED_TYPE, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'query_builder' => function (EntityRepository $repo) {
                 return $repo->createQueryBuilder('e')->where('e.id IN (1, 2)');
             },
-        ));
+        ]);
 
         $form = $formBuilder->getForm();
 
-        $form->submit(array(
+        $form->submit([
             'property1' => 1,
             'property2' => 1,
             'property3' => 2,
-        ));
+        ]);
 
         $choiceLoader1 = $form->get('property1')->getConfig()->getOption('choice_loader');
         $choiceLoader2 = $form->get('property2')->getConfig()->getOption('choice_loader');
@@ -1175,7 +1175,7 @@ public function testLoaderCachingWithParameters()
         $entity2 = new SingleIntIdEntity(2, 'Bar');
         $entity3 = new SingleIntIdEntity(3, 'Baz');
 
-        $this->persist(array($entity1, $entity2, $entity3));
+        $this->persist([$entity1, $entity2, $entity3]);
 
         $repo = $this->em->getRepository(self::SINGLE_IDENT_CLASS);
 
@@ -1190,35 +1190,35 @@ public function testLoaderCachingWithParameters()
 
         $formBuilder = $factory->createNamedBuilder('form', FormTypeTest::TESTED_TYPE);
 
-        $formBuilder->add('property1', static::TESTED_TYPE, array(
+        $formBuilder->add('property1', static::TESTED_TYPE, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'query_builder' => $repo->createQueryBuilder('e')->where('e.id = :id')->setParameter('id', 1),
-        ));
+        ]);
 
-        $formBuilder->add('property2', static::TESTED_TYPE, array(
+        $formBuilder->add('property2', static::TESTED_TYPE, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'query_builder' => function (EntityRepository $repo) {
                 return $repo->createQueryBuilder('e')->where('e.id = :id')->setParameter('id', 1);
             },
-        ));
+        ]);
 
-        $formBuilder->add('property3', static::TESTED_TYPE, array(
+        $formBuilder->add('property3', static::TESTED_TYPE, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'query_builder' => function (EntityRepository $repo) {
                 return $repo->createQueryBuilder('e')->where('e.id = :id')->setParameter('id', 1);
             },
-        ));
+        ]);
 
         $form = $formBuilder->getForm();
 
-        $form->submit(array(
+        $form->submit([
             'property1' => 1,
             'property2' => 1,
             'property3' => 2,
-        ));
+        ]);
 
         $choiceLoader1 = $form->get('property1')->getConfig()->getOption('choice_loader');
         $choiceLoader2 = $form->get('property2')->getConfig()->getOption('choice_loader');
@@ -1242,21 +1242,21 @@ protected function createRegistryMock($name, $em)
 
     public function testPassDisabledAsOption()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'em' => 'default',
             'disabled' => true,
             'class' => self::SINGLE_IDENT_CLASS,
-        ));
+        ]);
 
         $this->assertTrue($form->isDisabled());
     }
 
     public function testPassIdAndNameToView()
     {
-        $view = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $view = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
-        ))
+        ])
             ->createView();
 
         $this->assertEquals('name', $view->vars['id']);
@@ -1266,10 +1266,10 @@ public function testPassIdAndNameToView()
 
     public function testStripLeadingUnderscoresAndDigitsFromId()
     {
-        $view = $this->factory->createNamed('_09name', static::TESTED_TYPE, null, array(
+        $view = $this->factory->createNamed('_09name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
-        ))
+        ])
             ->createView();
 
         $this->assertEquals('name', $view->vars['id']);
@@ -1280,10 +1280,10 @@ public function testStripLeadingUnderscoresAndDigitsFromId()
     public function testPassIdAndNameToViewWithParent()
     {
         $view = $this->factory->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE)
-            ->add('child', static::TESTED_TYPE, array(
+            ->add('child', static::TESTED_TYPE, [
                 'em' => 'default',
                 'class' => self::SINGLE_IDENT_CLASS,
-            ))
+            ])
             ->getForm()
             ->createView();
 
@@ -1296,10 +1296,10 @@ public function testPassIdAndNameToViewWithGrandParent()
     {
         $builder = $this->factory->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE)
             ->add('child', FormTypeTest::TESTED_TYPE);
-        $builder->get('child')->add('grand_child', static::TESTED_TYPE, array(
+        $builder->get('child')->add('grand_child', static::TESTED_TYPE, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
-        ));
+        ]);
         $view = $builder->getForm()->createView();
 
         $this->assertEquals('parent_child_grand_child', $view['child']['grand_child']->vars['id']);
@@ -1309,11 +1309,11 @@ public function testPassIdAndNameToViewWithGrandParent()
 
     public function testPassTranslationDomainToView()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'translation_domain' => 'domain',
-        ))
+        ])
             ->createView();
 
         $this->assertSame('domain', $view->vars['translation_domain']);
@@ -1322,13 +1322,13 @@ public function testPassTranslationDomainToView()
     public function testInheritTranslationDomainFromParent()
     {
         $view = $this->factory
-            ->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, array(
+            ->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, [
                 'translation_domain' => 'domain',
-            ))
-            ->add('child', static::TESTED_TYPE, array(
+            ])
+            ->add('child', static::TESTED_TYPE, [
                 'em' => 'default',
                 'class' => self::SINGLE_IDENT_CLASS,
-            ))
+            ])
             ->getForm()
             ->createView();
 
@@ -1338,14 +1338,14 @@ public function testInheritTranslationDomainFromParent()
     public function testPreferOwnTranslationDomain()
     {
         $view = $this->factory
-            ->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, array(
+            ->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, [
                 'translation_domain' => 'parent_domain',
-            ))
-            ->add('child', static::TESTED_TYPE, array(
+            ])
+            ->add('child', static::TESTED_TYPE, [
                 'em' => 'default',
                 'class' => self::SINGLE_IDENT_CLASS,
                 'translation_domain' => 'domain',
-            ))
+            ])
             ->getForm()
             ->createView();
 
@@ -1356,10 +1356,10 @@ public function testDefaultTranslationDomain()
     {
         $view = $this->factory
             ->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE)
-            ->add('child', static::TESTED_TYPE, array(
+            ->add('child', static::TESTED_TYPE, [
                 'em' => 'default',
                 'class' => self::SINGLE_IDENT_CLASS,
-            ))
+            ])
             ->getForm()
             ->createView();
 
@@ -1368,11 +1368,11 @@ public function testDefaultTranslationDomain()
 
     public function testPassLabelToView()
     {
-        $view = $this->factory->createNamed('__test___field', static::TESTED_TYPE, null, array(
+        $view = $this->factory->createNamed('__test___field', static::TESTED_TYPE, null, [
             'label' => 'My label',
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
-        ))
+        ])
             ->createView();
 
         $this->assertSame('My label', $view->vars['label']);
@@ -1380,10 +1380,10 @@ public function testPassLabelToView()
 
     public function testPassMultipartFalseToView()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
-        ))
+        ])
             ->createView();
 
         $this->assertFalse($view->vars['multipart']);
@@ -1391,10 +1391,10 @@ public function testPassMultipartFalseToView()
 
     public function testSubmitNull($expected = null, $norm = null, $view = null)
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
-        ));
+        ]);
         $form->submit(null);
 
         $this->assertNull($form->getData());
@@ -1404,11 +1404,11 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
 
     public function testSubmitNullExpanded()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'expanded' => true,
-        ));
+        ]);
         $form->submit(null);
 
         $this->assertNull($form->getData());
@@ -1418,82 +1418,82 @@ public function testSubmitNullExpanded()
 
     public function testSubmitNullMultiple()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'multiple' => true,
-        ));
+        ]);
         $form->submit(null);
 
         $collection = new ArrayCollection();
 
         $this->assertEquals($collection, $form->getData());
         $this->assertEquals($collection, $form->getNormData());
-        $this->assertSame(array(), $form->getViewData(), 'View data is always an array');
+        $this->assertSame([], $form->getViewData(), 'View data is always an array');
     }
 
     public function testSubmitNullExpandedMultiple()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'expanded' => true,
             'multiple' => true,
-        ));
+        ]);
         $form->submit(null);
 
         $collection = new ArrayCollection();
 
         $this->assertEquals($collection, $form->getData());
         $this->assertEquals($collection, $form->getNormData());
-        $this->assertSame(array(), $form->getViewData(), 'View data is always an array');
+        $this->assertSame([], $form->getViewData(), 'View data is always an array');
     }
 
     public function testSetDataEmptyArraySubmitNullMultiple()
     {
-        $emptyArray = array();
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $emptyArray = [];
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'multiple' => true,
-        ));
+        ]);
         $form->setData($emptyArray);
         $form->submit(null);
         $this->assertInternalType('array', $form->getData());
-        $this->assertEquals(array(), $form->getData());
-        $this->assertEquals(array(), $form->getNormData());
-        $this->assertSame(array(), $form->getViewData(), 'View data is always an array');
+        $this->assertEquals([], $form->getData());
+        $this->assertEquals([], $form->getNormData());
+        $this->assertSame([], $form->getViewData(), 'View data is always an array');
     }
 
     public function testSetDataNonEmptyArraySubmitNullMultiple()
     {
         $entity1 = new SingleIntIdEntity(1, 'Foo');
-        $this->persist(array($entity1));
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->persist([$entity1]);
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'multiple' => true,
-        ));
-        $existing = array(0 => $entity1);
+        ]);
+        $existing = [0 => $entity1];
         $form->setData($existing);
         $form->submit(null);
         $this->assertInternalType('array', $form->getData());
-        $this->assertEquals(array(), $form->getData());
-        $this->assertEquals(array(), $form->getNormData());
-        $this->assertSame(array(), $form->getViewData(), 'View data is always an array');
+        $this->assertEquals([], $form->getData());
+        $this->assertEquals([], $form->getNormData());
+        $this->assertSame([], $form->getViewData(), 'View data is always an array');
     }
 
     public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expectedData = null)
     {
         $emptyData = '1';
         $entity1 = new SingleIntIdEntity(1, 'Foo');
-        $this->persist(array($entity1));
+        $this->persist([$entity1]);
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'empty_data' => $emptyData,
-        ));
+        ]);
         $form->submit(null);
 
         $this->assertSame($emptyData, $form->getViewData());
@@ -1503,19 +1503,19 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expect
 
     public function testSubmitNullMultipleUsesDefaultEmptyData()
     {
-        $emptyData = array('1');
+        $emptyData = ['1'];
         $entity1 = new SingleIntIdEntity(1, 'Foo');
-        $this->persist(array($entity1));
+        $this->persist([$entity1]);
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'multiple' => true,
             'empty_data' => $emptyData,
-        ));
+        ]);
         $form->submit(null);
 
-        $collection = new ArrayCollection(array($entity1));
+        $collection = new ArrayCollection([$entity1]);
 
         $this->assertSame($emptyData, $form->getViewData());
         $this->assertEquals($collection, $form->getNormData());
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php b/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
index 38bbed12945fe..10c403f461688 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
@@ -25,8 +25,8 @@ public function testLog($sql, $params, $logParams)
 
         $dbalLogger = $this
             ->getMockBuilder('Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger')
-            ->setConstructorArgs(array($logger, null))
-            ->setMethods(array('log'))
+            ->setConstructorArgs([$logger, null])
+            ->setMethods(['log'])
             ->getMock()
         ;
 
@@ -41,14 +41,14 @@ public function testLog($sql, $params, $logParams)
 
     public function getLogFixtures()
     {
-        return array(
-            array('SQL', null, array()),
-            array('SQL', array(), array()),
-            array('SQL', array('foo' => 'bar'), array('foo' => 'bar')),
-            array('SQL', array('foo' => "\x7F\xFF"), array('foo' => DbalLogger::BINARY_DATA_VALUE)),
-            array('SQL', array('foo' => "bar\x7F\xFF"), array('foo' => DbalLogger::BINARY_DATA_VALUE)),
-            array('SQL', array('foo' => ''), array('foo' => '')),
-        );
+        return [
+            ['SQL', null, []],
+            ['SQL', [], []],
+            ['SQL', ['foo' => 'bar'], ['foo' => 'bar']],
+            ['SQL', ['foo' => "\x7F\xFF"], ['foo' => DbalLogger::BINARY_DATA_VALUE]],
+            ['SQL', ['foo' => "bar\x7F\xFF"], ['foo' => DbalLogger::BINARY_DATA_VALUE]],
+            ['SQL', ['foo' => ''], ['foo' => '']],
+        ];
     }
 
     public function testLogNonUtf8()
@@ -57,21 +57,21 @@ public function testLogNonUtf8()
 
         $dbalLogger = $this
             ->getMockBuilder('Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger')
-            ->setConstructorArgs(array($logger, null))
-            ->setMethods(array('log'))
+            ->setConstructorArgs([$logger, null])
+            ->setMethods(['log'])
             ->getMock()
         ;
 
         $dbalLogger
             ->expects($this->once())
             ->method('log')
-            ->with('SQL', array('utf8' => 'foo', 'nonutf8' => DbalLogger::BINARY_DATA_VALUE))
+            ->with('SQL', ['utf8' => 'foo', 'nonutf8' => DbalLogger::BINARY_DATA_VALUE])
         ;
 
-        $dbalLogger->startQuery('SQL', array(
+        $dbalLogger->startQuery('SQL', [
             'utf8' => 'foo',
             'nonutf8' => "\x7F\xFF",
-        ));
+        ]);
     }
 
     public function testLogNonUtf8Array()
@@ -80,29 +80,29 @@ public function testLogNonUtf8Array()
 
         $dbalLogger = $this
             ->getMockBuilder('Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger')
-            ->setConstructorArgs(array($logger, null))
-            ->setMethods(array('log'))
+            ->setConstructorArgs([$logger, null])
+            ->setMethods(['log'])
             ->getMock()
         ;
 
         $dbalLogger
             ->expects($this->once())
             ->method('log')
-            ->with('SQL', array(
+            ->with('SQL', [
                     'utf8' => 'foo',
-                    array(
+                    [
                         'nonutf8' => DbalLogger::BINARY_DATA_VALUE,
-                    ),
-                )
+                    ],
+                ]
             )
         ;
 
-        $dbalLogger->startQuery('SQL', array(
+        $dbalLogger->startQuery('SQL', [
             'utf8' => 'foo',
-            array(
+            [
                 'nonutf8' => "\x7F\xFF",
-            ),
-        ));
+            ],
+        ]);
     }
 
     public function testLogLongString()
@@ -111,8 +111,8 @@ public function testLogLongString()
 
         $dbalLogger = $this
             ->getMockBuilder('Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger')
-            ->setConstructorArgs(array($logger, null))
-            ->setMethods(array('log'))
+            ->setConstructorArgs([$logger, null])
+            ->setMethods(['log'])
             ->getMock()
         ;
 
@@ -124,13 +124,13 @@ public function testLogLongString()
         $dbalLogger
             ->expects($this->once())
             ->method('log')
-            ->with('SQL', array('short' => $shortString, 'long' => substr($longString, 0, DbalLogger::MAX_STRING_LENGTH - 6).' [...]'))
+            ->with('SQL', ['short' => $shortString, 'long' => substr($longString, 0, DbalLogger::MAX_STRING_LENGTH - 6).' [...]'])
         ;
 
-        $dbalLogger->startQuery('SQL', array(
+        $dbalLogger->startQuery('SQL', [
             'short' => $shortString,
             'long' => $longString,
-        ));
+        ]);
     }
 
     public function testLogUTF8LongString()
@@ -139,12 +139,12 @@ public function testLogUTF8LongString()
 
         $dbalLogger = $this
             ->getMockBuilder('Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger')
-            ->setConstructorArgs(array($logger, null))
-            ->setMethods(array('log'))
+            ->setConstructorArgs([$logger, null])
+            ->setMethods(['log'])
             ->getMock()
         ;
 
-        $testStringArray = array('é', 'á', 'ű', 'ő', 'ú', 'ö', 'ü', 'ó', 'í');
+        $testStringArray = ['é', 'á', 'ű', 'ő', 'ú', 'ö', 'ü', 'ó', 'í'];
         $testStringCount = \count($testStringArray);
 
         $shortString = '';
@@ -158,12 +158,12 @@ public function testLogUTF8LongString()
         $dbalLogger
             ->expects($this->once())
             ->method('log')
-            ->with('SQL', array('short' => $shortString, 'long' => mb_substr($longString, 0, DbalLogger::MAX_STRING_LENGTH - 6, 'UTF-8').' [...]'))
+            ->with('SQL', ['short' => $shortString, 'long' => mb_substr($longString, 0, DbalLogger::MAX_STRING_LENGTH - 6, 'UTF-8').' [...]'])
         ;
 
-        $dbalLogger->startQuery('SQL', array(
+        $dbalLogger->startQuery('SQL', [
                 'short' => $shortString,
                 'long' => $longString,
-            ));
+            ]);
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php b/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php
index 490a48cfe6c6e..e5ebeeacf813a 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php
@@ -30,7 +30,7 @@ public function testResetService()
     {
         $container = new \LazyServiceProjectServiceContainer();
 
-        $registry = new TestManagerRegistry('name', array(), array('defaultManager' => 'foo'), 'defaultConnection', 'defaultManager', 'proxyInterfaceName');
+        $registry = new TestManagerRegistry('name', [], ['defaultManager' => 'foo'], 'defaultConnection', 'defaultManager', 'proxyInterfaceName');
         $registry->setTestContainer($container);
 
         $foo = $container->get('foo');
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
index dcb52718b1176..a6f9b01284c85 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -30,8 +30,8 @@ class DoctrineExtractorTest extends TestCase
 
     protected function setUp()
     {
-        $config = Setup::createAnnotationMetadataConfiguration(array(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'), true);
-        $entityManager = EntityManager::create(array('driver' => 'pdo_sqlite'), $config);
+        $config = Setup::createAnnotationMetadataConfiguration([__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'], true);
+        $entityManager = EntityManager::create(['driver' => 'pdo_sqlite'], $config);
 
         if (!DBALType::hasType('foo')) {
             DBALType::addType('foo', 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineFooType');
@@ -113,47 +113,47 @@ public function testExtractWithEmbedded()
 
     public function typesProvider()
     {
-        return array(
-            array('id', array(new Type(Type::BUILTIN_TYPE_INT))),
-            array('guid', array(new Type(Type::BUILTIN_TYPE_STRING))),
-            array('bigint', array(new Type(Type::BUILTIN_TYPE_STRING))),
-            array('time', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTime'))),
-            array('timeImmutable', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTimeImmutable'))),
-            array('dateInterval', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateInterval'))),
-            array('float', array(new Type(Type::BUILTIN_TYPE_FLOAT))),
-            array('decimal', array(new Type(Type::BUILTIN_TYPE_STRING))),
-            array('bool', array(new Type(Type::BUILTIN_TYPE_BOOL))),
-            array('binary', array(new Type(Type::BUILTIN_TYPE_RESOURCE))),
-            array('json', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true))),
-            array('foo', array(new Type(Type::BUILTIN_TYPE_OBJECT, true, 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineRelation'))),
-            array('bar', array(new Type(
+        return [
+            ['id', [new Type(Type::BUILTIN_TYPE_INT)]],
+            ['guid', [new Type(Type::BUILTIN_TYPE_STRING)]],
+            ['bigint', [new Type(Type::BUILTIN_TYPE_STRING)]],
+            ['time', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTime')]],
+            ['timeImmutable', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTimeImmutable')]],
+            ['dateInterval', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateInterval')]],
+            ['float', [new Type(Type::BUILTIN_TYPE_FLOAT)]],
+            ['decimal', [new Type(Type::BUILTIN_TYPE_STRING)]],
+            ['bool', [new Type(Type::BUILTIN_TYPE_BOOL)]],
+            ['binary', [new Type(Type::BUILTIN_TYPE_RESOURCE)]],
+            ['json', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true)]],
+            ['foo', [new Type(Type::BUILTIN_TYPE_OBJECT, true, 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineRelation')]],
+            ['bar', [new Type(
                 Type::BUILTIN_TYPE_OBJECT,
                 false,
                 'Doctrine\Common\Collections\Collection',
                 true,
                 new Type(Type::BUILTIN_TYPE_INT),
                 new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineRelation')
-            ))),
-            array('indexedBar', array(new Type(
+            )]],
+            ['indexedBar', [new Type(
                 Type::BUILTIN_TYPE_OBJECT,
                 false,
                 'Doctrine\Common\Collections\Collection',
                 true,
                 new Type(Type::BUILTIN_TYPE_STRING),
                 new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineRelation')
-            ))),
-            array('indexedFoo', array(new Type(
+            )]],
+            ['indexedFoo', [new Type(
                 Type::BUILTIN_TYPE_OBJECT,
                 false,
                 'Doctrine\Common\Collections\Collection',
                 true,
                 new Type(Type::BUILTIN_TYPE_STRING),
                 new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineRelation')
-            ))),
-            array('simpleArray', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING)))),
-            array('customFoo', null),
-            array('notMapped', null),
-        );
+            )]],
+            ['simpleArray', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING))]],
+            ['customFoo', null],
+            ['notMapped', null],
+        ];
     }
 
     public function testGetPropertiesCatchException()
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php
index 8d0a9381143df..1b8cba50f3ece 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php
@@ -38,7 +38,7 @@ public function getName()
      */
     public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
     {
-        return $platform->getClobTypeDeclarationSQL(array());
+        return $platform->getClobTypeDeclarationSQL([]);
     }
 
     /**
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php
index 9d0f79948ba6e..7188a3abc1a75 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php
@@ -145,7 +145,7 @@ public function testSupportProxy()
 
         $provider = new EntityUserProvider($this->getManager($em), 'Symfony\Bridge\Doctrine\Tests\Fixtures\User', 'name');
 
-        $user2 = $em->getReference('Symfony\Bridge\Doctrine\Tests\Fixtures\User', array('id1' => 1, 'id2' => 1));
+        $user2 = $em->getReference('Symfony\Bridge\Doctrine\Tests\Fixtures\User', ['id1' => 1, 'id2' => 1]);
         $this->assertTrue($provider->supportsClass(\get_class($user2)));
     }
 
@@ -196,7 +196,7 @@ private function getManager($em, $name = null)
     private function getObjectManager($repository)
     {
         $em = $this->getMockBuilder('\Doctrine\Common\Persistence\ObjectManager')
-            ->setMethods(array('getClassMetadata', 'getRepository'))
+            ->setMethods(['getClassMetadata', 'getRepository'])
             ->getMockForAbstractClass();
         $em->expects($this->any())
             ->method('getRepository')
@@ -208,8 +208,8 @@ private function getObjectManager($repository)
     private function createSchema($em)
     {
         $schemaTool = new SchemaTool($em);
-        $schemaTool->createSchema(array(
+        $schemaTool->createSchema([
             $em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\User'),
-        ));
+        ]);
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
index d8b55eb808fc2..60007eb8a3ba8 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -90,7 +90,7 @@ protected function createRegistryMock(ObjectManager $em = null)
     protected function createRepositoryMock()
     {
         $repository = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectRepository')
-            ->setMethods(array('findByCustom', 'find', 'findAll', 'findOneBy', 'findBy', 'getClassName'))
+            ->setMethods(['findByCustom', 'find', 'findAll', 'findOneBy', 'findBy', 'getClassName'])
             ->getMock()
         ;
 
@@ -118,8 +118,8 @@ protected function createEntityManagerMock($repositoryMock)
             ->getMock()
         ;
         $refl = $this->getMockBuilder('Doctrine\Common\Reflection\StaticReflectionProperty')
-            ->setConstructorArgs(array($reflParser, 'property-name'))
-            ->setMethods(array('getValue'))
+            ->setConstructorArgs([$reflParser, 'property-name'])
+            ->setMethods(['getValue'])
             ->getMock()
         ;
         $refl
@@ -127,7 +127,7 @@ protected function createEntityManagerMock($repositoryMock)
             ->method('getValue')
             ->will($this->returnValue(true))
         ;
-        $classMetadata->reflFields = array('name' => $refl);
+        $classMetadata->reflFields = ['name' => $refl];
         $em->expects($this->any())
             ->method('getClassMetadata')
             ->will($this->returnValue($classMetadata))
@@ -144,7 +144,7 @@ protected function createValidator()
     private function createSchema(ObjectManager $em)
     {
         $schemaTool = new SchemaTool($em);
-        $schemaTool->createSchema(array(
+        $schemaTool->createSchema([
             $em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity'),
             $em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity'),
             $em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\DoubleNameEntity'),
@@ -156,7 +156,7 @@ private function createSchema(ObjectManager $em)
             $em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\Employee'),
             $em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeObjectNoToStringIdEntity'),
             $em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdStringWrapperNameEntity'),
-        ));
+        ]);
     }
 
     /**
@@ -164,11 +164,11 @@ private function createSchema(ObjectManager $em)
      */
     public function testValidateUniqueness()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('name'),
+            'fields' => ['name'],
             'em' => self::EM_NAME,
-        ));
+        ]);
 
         $entity1 = new SingleIntIdEntity(1, 'Foo');
         $entity2 = new SingleIntIdEntity(2, 'Foo');
@@ -190,19 +190,19 @@ public function testValidateUniqueness()
             ->atPath('property.path.name')
             ->setParameter('{{ value }}', '"Foo"')
             ->setInvalidValue($entity2)
-            ->setCause(array($entity1))
+            ->setCause([$entity1])
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
 
     public function testValidateCustomErrorPath()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('name'),
+            'fields' => ['name'],
             'em' => self::EM_NAME,
             'errorPath' => 'bar',
-        ));
+        ]);
 
         $entity1 = new SingleIntIdEntity(1, 'Foo');
         $entity2 = new SingleIntIdEntity(2, 'Foo');
@@ -216,18 +216,18 @@ public function testValidateCustomErrorPath()
             ->atPath('property.path.bar')
             ->setParameter('{{ value }}', '"Foo"')
             ->setInvalidValue($entity2)
-            ->setCause(array($entity1))
+            ->setCause([$entity1])
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
 
     public function testValidateUniquenessWithNull()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('name'),
+            'fields' => ['name'],
             'em' => self::EM_NAME,
-        ));
+        ]);
 
         $entity1 = new SingleIntIdEntity(1, null);
         $entity2 = new SingleIntIdEntity(2, null);
@@ -243,12 +243,12 @@ public function testValidateUniquenessWithNull()
 
     public function testValidateUniquenessWithIgnoreNullDisabled()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('name', 'name2'),
+            'fields' => ['name', 'name2'],
             'em' => self::EM_NAME,
             'ignoreNull' => false,
-        ));
+        ]);
 
         $entity1 = new DoubleNameEntity(1, 'Foo', null);
         $entity2 = new DoubleNameEntity(2, 'Foo', null);
@@ -270,7 +270,7 @@ public function testValidateUniquenessWithIgnoreNullDisabled()
             ->atPath('property.path.name')
             ->setParameter('{{ value }}', '"Foo"')
             ->setInvalidValue('Foo')
-            ->setCause(array($entity1))
+            ->setCause([$entity1])
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
@@ -280,12 +280,12 @@ public function testValidateUniquenessWithIgnoreNullDisabled()
      */
     public function testAllConfiguredFieldsAreCheckedOfBeingMappedByDoctrineWithIgnoreNullEnabled()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('name', 'name2'),
+            'fields' => ['name', 'name2'],
             'em' => self::EM_NAME,
             'ignoreNull' => true,
-        ));
+        ]);
 
         $entity1 = new SingleIntIdEntity(1, null);
 
@@ -294,12 +294,12 @@ public function testAllConfiguredFieldsAreCheckedOfBeingMappedByDoctrineWithIgno
 
     public function testNoValidationIfFirstFieldIsNullAndNullValuesAreIgnored()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('name', 'name2'),
+            'fields' => ['name', 'name2'],
             'em' => self::EM_NAME,
             'ignoreNull' => true,
-        ));
+        ]);
 
         $entity1 = new DoubleNullableNameEntity(1, null, 'Foo');
         $entity2 = new DoubleNullableNameEntity(2, null, 'Foo');
@@ -322,12 +322,12 @@ public function testNoValidationIfFirstFieldIsNullAndNullValuesAreIgnored()
 
     public function testValidateUniquenessWithValidCustomErrorPath()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('name', 'name2'),
+            'fields' => ['name', 'name2'],
             'em' => self::EM_NAME,
             'errorPath' => 'name2',
-        ));
+        ]);
 
         $entity1 = new DoubleNameEntity(1, 'Foo', 'Bar');
         $entity2 = new DoubleNameEntity(2, 'Foo', 'Bar');
@@ -349,24 +349,24 @@ public function testValidateUniquenessWithValidCustomErrorPath()
             ->atPath('property.path.name2')
             ->setParameter('{{ value }}', '"Bar"')
             ->setInvalidValue('Bar')
-            ->setCause(array($entity1))
+            ->setCause([$entity1])
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
 
     public function testValidateUniquenessUsingCustomRepositoryMethod()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('name'),
+            'fields' => ['name'],
             'em' => self::EM_NAME,
             'repositoryMethod' => 'findByCustom',
-        ));
+        ]);
 
         $repository = $this->createRepositoryMock();
         $repository->expects($this->once())
             ->method('findByCustom')
-            ->will($this->returnValue(array()))
+            ->will($this->returnValue([]))
         ;
         $this->em = $this->createEntityManagerMock($repository);
         $this->registry = $this->createRegistryMock($this->em);
@@ -382,12 +382,12 @@ public function testValidateUniquenessUsingCustomRepositoryMethod()
 
     public function testValidateUniquenessWithUnrewoundArray()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('name'),
+            'fields' => ['name'],
             'em' => self::EM_NAME,
             'repositoryMethod' => 'findByCustom',
-        ));
+        ]);
 
         $entity = new SingleIntIdEntity(1, 'foo');
 
@@ -396,9 +396,9 @@ public function testValidateUniquenessWithUnrewoundArray()
             ->method('findByCustom')
             ->will(
                 $this->returnCallback(function () use ($entity) {
-                    $returnValue = array(
+                    $returnValue = [
                         $entity,
-                    );
+                    ];
                     next($returnValue);
 
                     return $returnValue;
@@ -420,12 +420,12 @@ public function testValidateUniquenessWithUnrewoundArray()
      */
     public function testValidateResultTypes($entity1, $result)
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('name'),
+            'fields' => ['name'],
             'em' => self::EM_NAME,
             'repositoryMethod' => 'findByCustom',
-        ));
+        ]);
 
         $repository = $this->createRepositoryMock();
         $repository->expects($this->once())
@@ -446,20 +446,20 @@ public function resultTypesProvider()
     {
         $entity = new SingleIntIdEntity(1, 'foo');
 
-        return array(
-            array($entity, array($entity)),
-            array($entity, new \ArrayIterator(array($entity))),
-            array($entity, new ArrayCollection(array($entity))),
-        );
+        return [
+            [$entity, [$entity]],
+            [$entity, new \ArrayIterator([$entity])],
+            [$entity, new ArrayCollection([$entity])],
+        ];
     }
 
     public function testAssociatedEntity()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('single'),
+            'fields' => ['single'],
             'em' => self::EM_NAME,
-        ));
+        ]);
 
         $entity1 = new SingleIntIdEntity(1, 'foo');
         $associated = new AssociationEntity();
@@ -485,17 +485,17 @@ public function testAssociatedEntity()
             ->setParameter('{{ value }}', 'foo')
             ->setInvalidValue($entity1)
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
-            ->setCause(array($associated, $associated2))
+            ->setCause([$associated, $associated2])
             ->assertRaised();
     }
 
     public function testValidateUniquenessNotToStringEntityWithAssociatedEntity()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('single'),
+            'fields' => ['single'],
             'em' => self::EM_NAME,
-        ));
+        ]);
 
         $entity1 = new SingleIntIdNoToStringEntity(1, 'foo');
         $associated = new AssociationEntity2();
@@ -522,19 +522,19 @@ public function testValidateUniquenessNotToStringEntityWithAssociatedEntity()
             ->atPath('property.path.single')
             ->setParameter('{{ value }}', $expectedValue)
             ->setInvalidValue($entity1)
-            ->setCause(array($associated, $associated2))
+            ->setCause([$associated, $associated2])
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
 
     public function testAssociatedEntityWithNull()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('single'),
+            'fields' => ['single'],
             'em' => self::EM_NAME,
             'ignoreNull' => false,
-        ));
+        ]);
 
         $associated = new AssociationEntity();
         $associated->single = null;
@@ -552,19 +552,19 @@ public function testValidateUniquenessWithArrayValue()
         $repository = $this->createRepositoryMock();
         $this->repositoryFactory->setRepository($this->em, 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity', $repository);
 
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('phoneNumbers'),
+            'fields' => ['phoneNumbers'],
             'em' => self::EM_NAME,
             'repositoryMethod' => 'findByCustom',
-        ));
+        ]);
 
         $entity1 = new SingleIntIdEntity(1, 'foo');
         $entity1->phoneNumbers[] = 123;
 
         $repository->expects($this->once())
             ->method('findByCustom')
-            ->will($this->returnValue(array($entity1)))
+            ->will($this->returnValue([$entity1]))
         ;
 
         $this->em->persist($entity1);
@@ -580,8 +580,8 @@ public function testValidateUniquenessWithArrayValue()
         $this->buildViolation('myMessage')
             ->atPath('property.path.phoneNumbers')
             ->setParameter('{{ value }}', 'array')
-            ->setInvalidValue(array(123))
-            ->setCause(array($entity1))
+            ->setInvalidValue([123])
+            ->setCause([$entity1])
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
@@ -592,11 +592,11 @@ public function testValidateUniquenessWithArrayValue()
      */
     public function testDedicatedEntityManagerNullObject()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('name'),
+            'fields' => ['name'],
             'em' => self::EM_NAME,
-        ));
+        ]);
 
         $this->em = null;
         $this->registry = $this->createRegistryMock($this->em);
@@ -614,11 +614,11 @@ public function testDedicatedEntityManagerNullObject()
      */
     public function testEntityManagerNullObject()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('name'),
+            'fields' => ['name'],
             // no "em" option set
-        ));
+        ]);
 
         $this->em = null;
         $this->registry = $this->createRegistryMock($this->em);
@@ -643,11 +643,11 @@ public function testValidateUniquenessOnNullResult()
         $this->validator = $this->createValidator();
         $this->validator->initialize($this->context);
 
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('name'),
+            'fields' => ['name'],
             'em' => self::EM_NAME,
-        ));
+        ]);
 
         $entity = new SingleIntIdEntity(1, null);
 
@@ -660,12 +660,12 @@ public function testValidateUniquenessOnNullResult()
 
     public function testValidateInheritanceUniqueness()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('name'),
+            'fields' => ['name'],
             'em' => self::EM_NAME,
             'entityClass' => 'Symfony\Bridge\Doctrine\Tests\Fixtures\Person',
-        ));
+        ]);
 
         $entity1 = new Person(1, 'Foo');
         $entity2 = new Employee(2, 'Foo');
@@ -687,8 +687,8 @@ public function testValidateInheritanceUniqueness()
             ->atPath('property.path.name')
             ->setInvalidValue('Foo')
             ->setCode('23bd9dbf-6b9b-41cd-a99e-4844bcf3077f')
-            ->setCause(array($entity1))
-            ->setParameters(array('{{ value }}' => '"Foo"'))
+            ->setCause([$entity1])
+            ->setParameters(['{{ value }}' => '"Foo"'])
             ->assertRaised();
     }
 
@@ -698,12 +698,12 @@ public function testValidateInheritanceUniqueness()
      */
     public function testInvalidateRepositoryForInheritance()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('name'),
+            'fields' => ['name'],
             'em' => self::EM_NAME,
             'entityClass' => 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringIdEntity',
-        ));
+        ]);
 
         $entity = new Person(1, 'Foo');
         $this->validator->validate($entity, $constraint);
@@ -711,11 +711,11 @@ public function testInvalidateRepositoryForInheritance()
 
     public function testValidateUniquenessWithCompositeObjectNoToStringIdEntity()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('objectOne', 'objectTwo'),
+            'fields' => ['objectOne', 'objectTwo'],
             'em' => self::EM_NAME,
-        ));
+        ]);
 
         $objectOne = new SingleIntIdNoToStringEntity(1, 'foo');
         $objectTwo = new SingleIntIdNoToStringEntity(2, 'bar');
@@ -739,18 +739,18 @@ public function testValidateUniquenessWithCompositeObjectNoToStringIdEntity()
             ->atPath('property.path.objectOne')
             ->setParameter('{{ value }}', $expectedValue)
             ->setInvalidValue($objectOne)
-            ->setCause(array($entity))
+            ->setCause([$entity])
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
 
     public function testValidateUniquenessWithCustomDoctrineTypeValue()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('name'),
+            'fields' => ['name'],
             'em' => self::EM_NAME,
-        ));
+        ]);
 
         $existingEntity = new SingleIntIdStringWrapperNameEntity(1, new StringWrapper('foo'));
 
@@ -767,7 +767,7 @@ public function testValidateUniquenessWithCustomDoctrineTypeValue()
             ->atPath('property.path.name')
             ->setParameter('{{ value }}', $expectedValue)
             ->setInvalidValue($existingEntity->name)
-            ->setCause(array($existingEntity))
+            ->setCause([$existingEntity])
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
@@ -777,11 +777,11 @@ public function testValidateUniquenessWithCustomDoctrineTypeValue()
      */
     public function testValidateUniquenessCause()
     {
-        $constraint = new UniqueEntity(array(
+        $constraint = new UniqueEntity([
             'message' => 'myMessage',
-            'fields' => array('name'),
+            'fields' => ['name'],
             'em' => self::EM_NAME,
-        ));
+        ]);
 
         $entity1 = new SingleIntIdEntity(1, 'Foo');
         $entity2 = new SingleIntIdEntity(2, 'Foo');
@@ -803,7 +803,7 @@ public function testValidateUniquenessCause()
             ->atPath('property.path.name')
             ->setParameter('{{ value }}', '"Foo"')
             ->setInvalidValue($entity2)
-            ->setCause(array($entity1))
+            ->setCause([$entity1])
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php
index c9b13dcf59960..2c319709ebc9d 100644
--- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php
+++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php
@@ -30,17 +30,17 @@ class UniqueEntity extends Constraint
     public $em = null;
     public $entityClass = null;
     public $repositoryMethod = 'findBy';
-    public $fields = array();
+    public $fields = [];
     public $errorPath = null;
     public $ignoreNull = true;
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::NOT_UNIQUE_ERROR => 'NOT_UNIQUE_ERROR',
-    );
+    ];
 
     public function getRequiredOptions()
     {
-        return array('fields');
+        return ['fields'];
     }
 
     /**
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
index 161a187ff98ab..47cb2bd730317 100644
--- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
+++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -81,7 +81,7 @@ public function validate($entity, Constraint $constraint)
         $class = $em->getClassMetadata(\get_class($entity));
         /* @var $class \Doctrine\Common\Persistence\Mapping\ClassMetadata */
 
-        $criteria = array();
+        $criteria = [];
         $hasNullValue = false;
 
         foreach ($fields as $fieldName) {
@@ -149,15 +149,15 @@ public function validate($entity, Constraint $constraint)
         if ($result instanceof \Iterator) {
             $result->rewind();
             if ($result instanceof \Countable && 1 < \count($result)) {
-                $result = array($result->current(), $result->current());
+                $result = [$result->current(), $result->current()];
             } else {
                 $result = $result->current();
-                $result = null === $result ? array() : array($result);
+                $result = null === $result ? [] : [$result];
             }
         } elseif (\is_array($result)) {
             reset($result);
         } else {
-            $result = null === $result ? array() : array($result);
+            $result = null === $result ? [] : [$result];
         }
 
         /* If no entity matched the query criteria or a single entity matched,
@@ -197,7 +197,7 @@ private function formatWithIdentifiers(ObjectManager $em, ClassMetadata $class,
             } else {
                 // this case might happen if the non unique column has a custom doctrine type and its value is an object
                 // in which case we cannot get any identifiers for it
-                $identifiers = array();
+                $identifiers = [];
             }
         } else {
             $identifiers = $class->getIdentifierValues($value);
diff --git a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
index 4f2681a88a63d..e097c7ca37e23 100644
--- a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
+++ b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
@@ -30,7 +30,7 @@ class ConsoleFormatter implements FormatterInterface
     const SIMPLE_FORMAT = "%datetime% %start_tag%%level_name%%end_tag% <comment>[%channel%]</> %message%%context%%extra%\n";
     const SIMPLE_DATE = 'H:i:s';
 
-    private static $levelColorMap = array(
+    private static $levelColorMap = [
         Logger::DEBUG => 'fg=white',
         Logger::INFO => 'fg=green',
         Logger::NOTICE => 'fg=blue',
@@ -39,7 +39,7 @@ class ConsoleFormatter implements FormatterInterface
         Logger::CRITICAL => 'fg=red',
         Logger::ALERT => 'fg=red',
         Logger::EMERGENCY => 'fg=white;bg=red',
-    );
+    ];
 
     private $options;
     private $cloner;
@@ -132,7 +132,7 @@ public function format(array $record)
             $extra = '';
         }
 
-        $formatted = strtr($this->options['format'], array(
+        $formatted = strtr($this->options['format'], [
             '%datetime%' => $record['datetime']->format($this->options['date_format']),
             '%start_tag%' => sprintf('<%s>', $levelColor),
             '%level_name%' => sprintf('%-9s', $record['level_name']),
@@ -141,7 +141,7 @@ public function format(array $record)
             '%message%' => $this->replacePlaceHolder($record)['message'],
             '%context%' => $context,
             '%extra%' => $extra,
-        ));
+        ]);
 
         return $formatted;
     }
@@ -167,7 +167,7 @@ public function castObject($v, array $a, Stub $s, $isNested)
 
         if ($isNested && !$v instanceof \DateTimeInterface) {
             $s->cut = -1;
-            $a = array();
+            $a = [];
         }
 
         return $a;
@@ -183,7 +183,7 @@ private function replacePlaceHolder(array $record)
 
         $context = $record['context'];
 
-        $replacements = array();
+        $replacements = [];
         foreach ($context as $k => $v) {
             // Remove quotes added by the dumper around string.
             $v = trim($this->dumpData($v, false), '"');
diff --git a/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php b/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php
index 65e99f6f87b75..c27b0803e200e 100644
--- a/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php
+++ b/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php
@@ -22,7 +22,7 @@
  */
 class ChromePhpHandler extends BaseChromePhpHandler
 {
-    private $headers = array();
+    private $headers = [];
 
     /**
      * @var Response
@@ -40,7 +40,7 @@ public function onKernelResponse(FilterResponseEvent $event)
 
         if (!preg_match(static::USER_AGENT_REGEX, $event->getRequest()->headers->get('User-Agent'))) {
             $this->sendHeaders = false;
-            $this->headers = array();
+            $this->headers = [];
 
             return;
         }
@@ -49,7 +49,7 @@ public function onKernelResponse(FilterResponseEvent $event)
         foreach ($this->headers as $header => $content) {
             $this->response->headers->set($header, $content);
         }
-        $this->headers = array();
+        $this->headers = [];
     }
 
     /**
diff --git a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php
index 04943779dd241..52e411e24a5f8 100644
--- a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php
+++ b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php
@@ -43,13 +43,13 @@
 class ConsoleHandler extends AbstractProcessingHandler implements EventSubscriberInterface
 {
     private $output;
-    private $verbosityLevelMap = array(
+    private $verbosityLevelMap = [
         OutputInterface::VERBOSITY_QUIET => Logger::ERROR,
         OutputInterface::VERBOSITY_NORMAL => Logger::WARNING,
         OutputInterface::VERBOSITY_VERBOSE => Logger::NOTICE,
         OutputInterface::VERBOSITY_VERY_VERBOSE => Logger::INFO,
         OutputInterface::VERBOSITY_DEBUG => Logger::DEBUG,
-    );
+    ];
 
     /**
      * @param OutputInterface|null $output            The console output to use (the handler remains disabled when passing null
@@ -131,10 +131,10 @@ public function onTerminate(ConsoleTerminateEvent $event)
      */
     public static function getSubscribedEvents()
     {
-        return array(
-            ConsoleEvents::COMMAND => array('onCommand', 255),
-            ConsoleEvents::TERMINATE => array('onTerminate', -255),
-        );
+        return [
+            ConsoleEvents::COMMAND => ['onCommand', 255],
+            ConsoleEvents::TERMINATE => ['onTerminate', -255],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php b/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php
index 9956edad386d1..9c3ec5f98144c 100644
--- a/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php
+++ b/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php
@@ -22,7 +22,7 @@
  */
 class FirePHPHandler extends BaseFirePHPHandler
 {
-    private $headers = array();
+    private $headers = [];
 
     /**
      * @var Response
@@ -42,7 +42,7 @@ public function onKernelResponse(FilterResponseEvent $event)
         if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $request->headers->get('User-Agent'))
             && !$request->headers->has('X-FirePHP-Version')) {
             self::$sendHeaders = false;
-            $this->headers = array();
+            $this->headers = [];
 
             return;
         }
@@ -51,7 +51,7 @@ public function onKernelResponse(FilterResponseEvent $event)
         foreach ($this->headers as $header => $content) {
             $this->response->headers->set($header, $content);
         }
-        $this->headers = array();
+        $this->headers = [];
     }
 
     /**
diff --git a/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php b/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php
index 8aa56a86f414f..30ab485b9058e 100644
--- a/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php
+++ b/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php
@@ -108,7 +108,7 @@ private function formatRecord(array $record)
 
         $recordFormatted = $this->getFormatter()->format($record);
 
-        foreach (array('log_uuid', 'uuid', 'uid') as $key) {
+        foreach (['log_uuid', 'uuid', 'uid'] as $key) {
             if (isset($record['extra'][$key])) {
                 $recordFormatted['log_id'] = $record['extra'][$key];
                 break;
diff --git a/src/Symfony/Bridge/Monolog/Logger.php b/src/Symfony/Bridge/Monolog/Logger.php
index 7cd75c5ec11ca..a8b31cc09b910 100644
--- a/src/Symfony/Bridge/Monolog/Logger.php
+++ b/src/Symfony/Bridge/Monolog/Logger.php
@@ -30,7 +30,7 @@ public function getLogs()
             return $logger->getLogs();
         }
 
-        return array();
+        return [];
     }
 
     /**
diff --git a/src/Symfony/Bridge/Monolog/Processor/TokenProcessor.php b/src/Symfony/Bridge/Monolog/Processor/TokenProcessor.php
index 11547be22b2ee..7bf03a036a257 100644
--- a/src/Symfony/Bridge/Monolog/Processor/TokenProcessor.php
+++ b/src/Symfony/Bridge/Monolog/Processor/TokenProcessor.php
@@ -31,11 +31,11 @@ public function __invoke(array $records)
     {
         $records['extra']['token'] = null;
         if (null !== $token = $this->tokenStorage->getToken()) {
-            $records['extra']['token'] = array(
+            $records['extra']['token'] = [
                 'username' => $token->getUsername(),
                 'authenticated' => $token->isAuthenticated(),
                 'roles' => array_map(function ($role) { return $role->getRole(); }, $token->getRoles()),
-            );
+            ];
         }
 
         return $records;
diff --git a/src/Symfony/Bridge/Monolog/Processor/WebProcessor.php b/src/Symfony/Bridge/Monolog/Processor/WebProcessor.php
index 5222258e46936..987c72dda3ff0 100644
--- a/src/Symfony/Bridge/Monolog/Processor/WebProcessor.php
+++ b/src/Symfony/Bridge/Monolog/Processor/WebProcessor.php
@@ -24,7 +24,7 @@ class WebProcessor extends BaseWebProcessor
     public function __construct(array $extraFields = null)
     {
         // Pass an empty array as the default null value would access $_SERVER
-        parent::__construct(array(), $extraFields);
+        parent::__construct([], $extraFields);
     }
 
     public function onKernelRequest(GetResponseEvent $event)
diff --git a/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php b/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php
index 0764f89151f10..0f042a90ae862 100644
--- a/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php
+++ b/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php
@@ -38,13 +38,13 @@ public function testConstructor()
     public function testIsHandling()
     {
         $handler = new ConsoleHandler();
-        $this->assertFalse($handler->isHandling(array()), '->isHandling returns false when no output is set');
+        $this->assertFalse($handler->isHandling([]), '->isHandling returns false when no output is set');
     }
 
     /**
      * @dataProvider provideVerbosityMappingTests
      */
-    public function testVerbosityMapping($verbosity, $level, $isHandling, array $map = array())
+    public function testVerbosityMapping($verbosity, $level, $isHandling, array $map = [])
     {
         $output = $this->getMockBuilder('Symfony\Component\Console\Output\OutputInterface')->getMock();
         $output
@@ -53,7 +53,7 @@ public function testVerbosityMapping($verbosity, $level, $isHandling, array $map
             ->will($this->returnValue($verbosity))
         ;
         $handler = new ConsoleHandler($output, true, $map);
-        $this->assertSame($isHandling, $handler->isHandling(array('level' => $level)),
+        $this->assertSame($isHandling, $handler->isHandling(['level' => $level]),
             '->isHandling returns correct value depending on console verbosity and log level'
         );
 
@@ -61,7 +61,7 @@ public function testVerbosityMapping($verbosity, $level, $isHandling, array $map
         $levelName = Logger::getLevelName($level);
         $levelName = sprintf('%-9s', $levelName);
 
-        $realOutput = $this->getMockBuilder('Symfony\Component\Console\Output\Output')->setMethods(array('doWrite'))->getMock();
+        $realOutput = $this->getMockBuilder('Symfony\Component\Console\Output\Output')->setMethods(['doWrite'])->getMock();
         $realOutput->setVerbosity($verbosity);
         if ($realOutput->isDebug()) {
             $log = "16:21:54 $levelName [app] My info message\n";
@@ -74,38 +74,38 @@ public function testVerbosityMapping($verbosity, $level, $isHandling, array $map
             ->with($log, false);
         $handler = new ConsoleHandler($realOutput, true, $map);
 
-        $infoRecord = array(
+        $infoRecord = [
             'message' => 'My info message',
-            'context' => array(),
+            'context' => [],
             'level' => $level,
             'level_name' => Logger::getLevelName($level),
             'channel' => 'app',
             'datetime' => new \DateTime('2013-05-29 16:21:54'),
-            'extra' => array(),
-        );
+            'extra' => [],
+        ];
         $this->assertFalse($handler->handle($infoRecord), 'The handler finished handling the log.');
     }
 
     public function provideVerbosityMappingTests()
     {
-        return array(
-            array(OutputInterface::VERBOSITY_QUIET, Logger::ERROR, true),
-            array(OutputInterface::VERBOSITY_QUIET, Logger::WARNING, false),
-            array(OutputInterface::VERBOSITY_NORMAL, Logger::WARNING, true),
-            array(OutputInterface::VERBOSITY_NORMAL, Logger::NOTICE, false),
-            array(OutputInterface::VERBOSITY_VERBOSE, Logger::NOTICE, true),
-            array(OutputInterface::VERBOSITY_VERBOSE, Logger::INFO, false),
-            array(OutputInterface::VERBOSITY_VERY_VERBOSE, Logger::INFO, true),
-            array(OutputInterface::VERBOSITY_VERY_VERBOSE, Logger::DEBUG, false),
-            array(OutputInterface::VERBOSITY_DEBUG, Logger::DEBUG, true),
-            array(OutputInterface::VERBOSITY_DEBUG, Logger::EMERGENCY, true),
-            array(OutputInterface::VERBOSITY_NORMAL, Logger::NOTICE, true, array(
+        return [
+            [OutputInterface::VERBOSITY_QUIET, Logger::ERROR, true],
+            [OutputInterface::VERBOSITY_QUIET, Logger::WARNING, false],
+            [OutputInterface::VERBOSITY_NORMAL, Logger::WARNING, true],
+            [OutputInterface::VERBOSITY_NORMAL, Logger::NOTICE, false],
+            [OutputInterface::VERBOSITY_VERBOSE, Logger::NOTICE, true],
+            [OutputInterface::VERBOSITY_VERBOSE, Logger::INFO, false],
+            [OutputInterface::VERBOSITY_VERY_VERBOSE, Logger::INFO, true],
+            [OutputInterface::VERBOSITY_VERY_VERBOSE, Logger::DEBUG, false],
+            [OutputInterface::VERBOSITY_DEBUG, Logger::DEBUG, true],
+            [OutputInterface::VERBOSITY_DEBUG, Logger::EMERGENCY, true],
+            [OutputInterface::VERBOSITY_NORMAL, Logger::NOTICE, true, [
                 OutputInterface::VERBOSITY_NORMAL => Logger::NOTICE,
-            )),
-            array(OutputInterface::VERBOSITY_DEBUG, Logger::NOTICE, true, array(
+            ]],
+            [OutputInterface::VERBOSITY_DEBUG, Logger::NOTICE, true, [
                 OutputInterface::VERBOSITY_NORMAL => Logger::NOTICE,
-            )),
-        );
+            ]],
+        ];
     }
 
     public function testVerbosityChanged()
@@ -122,10 +122,10 @@ public function testVerbosityChanged()
             ->will($this->returnValue(OutputInterface::VERBOSITY_DEBUG))
         ;
         $handler = new ConsoleHandler($output);
-        $this->assertFalse($handler->isHandling(array('level' => Logger::NOTICE)),
+        $this->assertFalse($handler->isHandling(['level' => Logger::NOTICE]),
             'when verbosity is set to quiet, the handler does not handle the log'
         );
-        $this->assertTrue($handler->isHandling(array('level' => Logger::NOTICE)),
+        $this->assertTrue($handler->isHandling(['level' => Logger::NOTICE]),
             'since the verbosity of the output increased externally, the handler is now handling the log'
         );
     }
@@ -155,15 +155,15 @@ public function testWritingAndFormatting()
         $handler = new ConsoleHandler(null, false);
         $handler->setOutput($output);
 
-        $infoRecord = array(
+        $infoRecord = [
             'message' => 'My info message',
-            'context' => array(),
+            'context' => [],
             'level' => Logger::INFO,
             'level_name' => Logger::getLevelName(Logger::INFO),
             'channel' => 'app',
             'datetime' => new \DateTime('2013-05-29 16:21:54'),
-            'extra' => array(),
-        );
+            'extra' => [],
+        ];
 
         $this->assertTrue($handler->handle($infoRecord), 'The handler finished handling the log as bubble is false.');
     }
diff --git a/src/Symfony/Bridge/Monolog/Tests/Handler/FingersCrossed/NotFoundActivationStrategyTest.php b/src/Symfony/Bridge/Monolog/Tests/Handler/FingersCrossed/NotFoundActivationStrategyTest.php
index 3c34f065eb038..b04678106c96e 100644
--- a/src/Symfony/Bridge/Monolog/Tests/Handler/FingersCrossed/NotFoundActivationStrategyTest.php
+++ b/src/Symfony/Bridge/Monolog/Tests/Handler/FingersCrossed/NotFoundActivationStrategyTest.php
@@ -28,28 +28,28 @@ public function testIsActivated($url, $record, $expected)
         $requestStack = new RequestStack();
         $requestStack->push(Request::create($url));
 
-        $strategy = new NotFoundActivationStrategy($requestStack, array('^/foo', 'bar'), Logger::WARNING);
+        $strategy = new NotFoundActivationStrategy($requestStack, ['^/foo', 'bar'], Logger::WARNING);
 
         $this->assertEquals($expected, $strategy->isHandlerActivated($record));
     }
 
     public function isActivatedProvider()
     {
-        return array(
-            array('/test',      array('level' => Logger::DEBUG), false),
-            array('/foo',       array('level' => Logger::DEBUG, 'context' => $this->getContextException(404)), false),
-            array('/baz/bar',   array('level' => Logger::ERROR, 'context' => $this->getContextException(404)), false),
-            array('/foo',       array('level' => Logger::ERROR, 'context' => $this->getContextException(404)), false),
-            array('/foo',       array('level' => Logger::ERROR, 'context' => $this->getContextException(500)), true),
-
-            array('/test',      array('level' => Logger::ERROR), true),
-            array('/baz',       array('level' => Logger::ERROR, 'context' => $this->getContextException(404)), true),
-            array('/baz',       array('level' => Logger::ERROR, 'context' => $this->getContextException(500)), true),
-        );
+        return [
+            ['/test',      ['level' => Logger::DEBUG], false],
+            ['/foo',       ['level' => Logger::DEBUG, 'context' => $this->getContextException(404)], false],
+            ['/baz/bar',   ['level' => Logger::ERROR, 'context' => $this->getContextException(404)], false],
+            ['/foo',       ['level' => Logger::ERROR, 'context' => $this->getContextException(404)], false],
+            ['/foo',       ['level' => Logger::ERROR, 'context' => $this->getContextException(500)], true],
+
+            ['/test',      ['level' => Logger::ERROR], true],
+            ['/baz',       ['level' => Logger::ERROR, 'context' => $this->getContextException(404)], true],
+            ['/baz',       ['level' => Logger::ERROR, 'context' => $this->getContextException(500)], true],
+        ];
     }
 
     protected function getContextException($code)
     {
-        return array('exception' => new HttpException($code));
+        return ['exception' => new HttpException($code)];
     }
 }
diff --git a/src/Symfony/Bridge/Monolog/Tests/LoggerTest.php b/src/Symfony/Bridge/Monolog/Tests/LoggerTest.php
index 255d5efa7bb9b..8abc8dbe78226 100644
--- a/src/Symfony/Bridge/Monolog/Tests/LoggerTest.php
+++ b/src/Symfony/Bridge/Monolog/Tests/LoggerTest.php
@@ -80,7 +80,7 @@ public function testGetLogsWithDebugHandler2()
     public function testCountErrorsWithoutDebugProcessor()
     {
         $handler = new TestHandler();
-        $logger = new Logger(__METHOD__, array($handler));
+        $logger = new Logger(__METHOD__, [$handler]);
 
         $this->assertTrue($logger->error('error message'));
         $this->assertSame(0, $logger->countErrors());
@@ -90,7 +90,7 @@ public function testGetLogsWithDebugProcessor()
     {
         $handler = new TestHandler();
         $processor = new DebugProcessor();
-        $logger = new Logger(__METHOD__, array($handler), array($processor));
+        $logger = new Logger(__METHOD__, [$handler], [$processor]);
 
         $this->assertTrue($logger->error('error message'));
         $this->assertCount(1, $logger->getLogs());
@@ -100,7 +100,7 @@ public function testCountErrorsWithDebugProcessor()
     {
         $handler = new TestHandler();
         $processor = new DebugProcessor();
-        $logger = new Logger(__METHOD__, array($handler), array($processor));
+        $logger = new Logger(__METHOD__, [$handler], [$processor]);
 
         $this->assertTrue($logger->debug('test message'));
         $this->assertTrue($logger->info('test message'));
@@ -118,7 +118,7 @@ public function testCountErrorsWithDebugProcessor()
     public function testGetLogsWithDebugProcessor2()
     {
         $handler = new TestHandler();
-        $logger = new Logger('test', array($handler));
+        $logger = new Logger('test', [$handler]);
         $logger->pushProcessor(new DebugProcessor());
 
         $logger->addInfo('test');
@@ -132,7 +132,7 @@ public function testGetLogsWithDebugProcessor2()
     public function testClear()
     {
         $handler = new TestHandler();
-        $logger = new Logger('test', array($handler));
+        $logger = new Logger('test', [$handler]);
         $logger->pushProcessor(new DebugProcessor());
 
         $logger->addInfo('test');
diff --git a/src/Symfony/Bridge/Monolog/Tests/Processor/TokenProcessorTest.php b/src/Symfony/Bridge/Monolog/Tests/Processor/TokenProcessorTest.php
index e78acf47b54c4..1b01348639b0d 100644
--- a/src/Symfony/Bridge/Monolog/Tests/Processor/TokenProcessorTest.php
+++ b/src/Symfony/Bridge/Monolog/Tests/Processor/TokenProcessorTest.php
@@ -25,12 +25,12 @@ class TokenProcessorTest extends TestCase
 {
     public function testProcessor()
     {
-        $token = new UsernamePasswordToken('user', 'password', 'provider', array('ROLE_USER'));
+        $token = new UsernamePasswordToken('user', 'password', 'provider', ['ROLE_USER']);
         $tokenStorage = $this->getMockBuilder(TokenStorageInterface::class)->getMock();
         $tokenStorage->method('getToken')->willReturn($token);
 
         $processor = new TokenProcessor($tokenStorage);
-        $record = array('extra' => array());
+        $record = ['extra' => []];
         $record = $processor($record);
 
         $this->assertArrayHasKey('token', $record['extra']);
diff --git a/src/Symfony/Bridge/Monolog/Tests/Processor/WebProcessorTest.php b/src/Symfony/Bridge/Monolog/Tests/Processor/WebProcessorTest.php
index b62c83f426ea0..7bedacb2a6047 100644
--- a/src/Symfony/Bridge/Monolog/Tests/Processor/WebProcessorTest.php
+++ b/src/Symfony/Bridge/Monolog/Tests/Processor/WebProcessorTest.php
@@ -36,8 +36,8 @@ public function testUsesRequestServerData()
 
     public function testUseRequestClientIp()
     {
-        Request::setTrustedProxies(array('192.168.0.1'), Request::HEADER_X_FORWARDED_ALL);
-        list($event, $server) = $this->createRequestEvent(array('X_FORWARDED_FOR' => '192.168.0.2'));
+        Request::setTrustedProxies(['192.168.0.1'], Request::HEADER_X_FORWARDED_ALL);
+        list($event, $server) = $this->createRequestEvent(['X_FORWARDED_FOR' => '192.168.0.2']);
 
         $processor = new WebProcessor();
         $processor->onKernelRequest($event);
@@ -50,7 +50,7 @@ public function testUseRequestClientIp()
         $this->assertEquals($server['SERVER_NAME'], $record['extra']['server']);
         $this->assertEquals($server['HTTP_REFERER'], $record['extra']['referrer']);
 
-        Request::setTrustedProxies(array(), -1);
+        Request::setTrustedProxies([], -1);
     }
 
     public function testCanBeConstructedWithExtraFields()
@@ -61,7 +61,7 @@ public function testCanBeConstructedWithExtraFields()
 
         list($event, $server) = $this->createRequestEvent();
 
-        $processor = new WebProcessor(array('url', 'referrer'));
+        $processor = new WebProcessor(['url', 'referrer']);
         $processor->onKernelRequest($event);
         $record = $processor($this->getRecord());
 
@@ -100,7 +100,7 @@ private function createRequestEvent($additionalServerParameters = array())
             ->method('getRequest')
             ->will($this->returnValue($request));
 
-        return array($event, $server);
+        return [$event, $server];
     }
 
     /**
@@ -111,15 +111,15 @@ private function createRequestEvent($additionalServerParameters = array())
      */
     private function getRecord($level = Logger::WARNING, $message = 'test')
     {
-        return array(
+        return [
             'message' => $message,
-            'context' => array(),
+            'context' => [],
             'level' => $level,
             'level_name' => Logger::getLevelName($level),
             'channel' => 'test',
             'datetime' => new \DateTime(),
-            'extra' => array(),
-        );
+            'extra' => [],
+        ];
     }
 
     private function isExtraFieldsSupported()
diff --git a/src/Symfony/Bridge/PhpUnit/ClockMock.php b/src/Symfony/Bridge/PhpUnit/ClockMock.php
index 4c5432f2603c4..a29edd9078866 100644
--- a/src/Symfony/Bridge/PhpUnit/ClockMock.php
+++ b/src/Symfony/Bridge/PhpUnit/ClockMock.php
@@ -73,7 +73,7 @@ public static function register($class)
     {
         $self = \get_called_class();
 
-        $mockedNs = array(substr($class, 0, strrpos($class, '\\')));
+        $mockedNs = [substr($class, 0, strrpos($class, '\\'))];
         if (0 < strpos($class, '\\Tests\\')) {
             $ns = str_replace('\\Tests\\', '\\', $class);
             $mockedNs[] = substr($ns, 0, strrpos($ns, '\\'));
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
index b81eff528a121..a9425da7dbc94 100644
--- a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
+++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -92,19 +92,19 @@ public static function register($mode = 0)
             return false;
         };
 
-        $deprecations = array(
+        $deprecations = [
             'unsilencedCount' => 0,
             'remainingCount' => 0,
             'legacyCount' => 0,
             'otherCount' => 0,
             'remaining vendorCount' => 0,
-            'unsilenced' => array(),
-            'remaining' => array(),
-            'legacy' => array(),
-            'other' => array(),
-            'remaining vendor' => array(),
-        );
-        $deprecationHandler = function ($type, $msg, $file, $line, $context = array()) use (&$deprecations, $getMode, $UtilPrefix, $inVendors) {
+            'unsilenced' => [],
+            'remaining' => [],
+            'legacy' => [],
+            'other' => [],
+            'remaining vendor' => [],
+        ];
+        $deprecationHandler = function ($type, $msg, $file, $line, $context = []) use (&$deprecations, $getMode, $UtilPrefix, $inVendors) {
             $mode = $getMode();
             if ((E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) || DeprecationErrorHandler::MODE_DISABLED === $mode) {
                 $ErrorHandler = $UtilPrefix.'ErrorHandler';
@@ -184,7 +184,7 @@ public static function register($mode = 0)
 
         if (null !== $oldErrorHandler) {
             restore_error_handler();
-            if (array($UtilPrefix.'ErrorHandler', 'handleError') === $oldErrorHandler) {
+            if ([$UtilPrefix.'ErrorHandler', 'handleError'] === $oldErrorHandler) {
                 restore_error_handler();
                 self::register($mode);
             }
@@ -218,7 +218,7 @@ public static function register($mode = 0)
                     return $b['count'] - $a['count'];
                 };
 
-                $groups = array('unsilenced', 'remaining');
+                $groups = ['unsilenced', 'remaining'];
                 if (DeprecationErrorHandler::MODE_WEAK_VENDORS === $mode) {
                     $groups[] = 'remaining vendor';
                 }
@@ -259,7 +259,7 @@ public static function register($mode = 0)
 
                 // reset deprecations array
                 foreach ($deprecations as $group => $arrayOrInt) {
-                    $deprecations[$group] = \is_int($arrayOrInt) ? 0 : array();
+                    $deprecations[$group] = \is_int($arrayOrInt) ? 0 : [];
                 }
 
                 register_shutdown_function(function () use (&$deprecations, $isFailing, $displayDeprecations, $mode) {
@@ -280,8 +280,8 @@ public static function register($mode = 0)
 
     public static function collectDeprecations($outputFile)
     {
-        $deprecations = array();
-        $previousErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = array()) use (&$deprecations, &$previousErrorHandler) {
+        $deprecations = [];
+        $previousErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$deprecations, &$previousErrorHandler) {
             if (E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) {
                 if ($previousErrorHandler) {
                     return $previousErrorHandler($type, $msg, $file, $line, $context);
@@ -293,7 +293,7 @@ public static function collectDeprecations($outputFile)
 
                 return $ErrorHandler::handleError($type, $msg, $file, $line, $context);
             }
-            $deprecations[] = array(error_reporting(), $msg, $file);
+            $deprecations[] = [error_reporting(), $msg, $file];
         });
 
         register_shutdown_function(function () use ($outputFile, &$deprecations) {
diff --git a/src/Symfony/Bridge/PhpUnit/DnsMock.php b/src/Symfony/Bridge/PhpUnit/DnsMock.php
index 790cfa91af5c2..a58bf2efcde35 100644
--- a/src/Symfony/Bridge/PhpUnit/DnsMock.php
+++ b/src/Symfony/Bridge/PhpUnit/DnsMock.php
@@ -16,8 +16,8 @@
  */
 class DnsMock
 {
-    private static $hosts = array();
-    private static $dnsTypes = array(
+    private static $hosts = [];
+    private static $dnsTypes = [
         'A' => DNS_A,
         'MX' => DNS_MX,
         'NS' => DNS_NS,
@@ -30,7 +30,7 @@ class DnsMock
         'NAPTR' => DNS_NAPTR,
         'TXT' => DNS_TXT,
         'HINFO' => DNS_HINFO,
-    );
+    ];
 
     /**
      * Configures the mock values for DNS queries.
@@ -68,7 +68,7 @@ public static function getmxrr($hostname, &$mxhosts, &$weight = null)
         if (!self::$hosts) {
             return \getmxrr($hostname, $mxhosts, $weight);
         }
-        $mxhosts = $weight = array();
+        $mxhosts = $weight = [];
 
         if (isset(self::$hosts[$hostname])) {
             foreach (self::$hosts[$hostname] as $record) {
@@ -125,7 +125,7 @@ public static function gethostbynamel($hostname)
         $ips = false;
 
         if (isset(self::$hosts[$hostname])) {
-            $ips = array();
+            $ips = [];
 
             foreach (self::$hosts[$hostname] as $record) {
                 if ('A' === $record['type']) {
@@ -149,11 +149,11 @@ public static function dns_get_record($hostname, $type = DNS_ANY, &$authns = nul
             if (DNS_ANY === $type) {
                 $type = DNS_ALL;
             }
-            $records = array();
+            $records = [];
 
             foreach (self::$hosts[$hostname] as $record) {
                 if (isset(self::$dnsTypes[$record['type']]) && (self::$dnsTypes[$record['type']] & $type)) {
-                    $records[] = array_merge(array('host' => $hostname, 'class' => 'IN', 'ttl' => 1, 'type' => $record['type']), $record);
+                    $records[] = array_merge(['host' => $hostname, 'class' => 'IN', 'ttl' => 1, 'type' => $record['type']], $record);
                 }
             }
         }
@@ -165,7 +165,7 @@ public static function register($class)
     {
         $self = \get_called_class();
 
-        $mockedNs = array(substr($class, 0, strrpos($class, '\\')));
+        $mockedNs = [substr($class, 0, strrpos($class, '\\'))];
         if (0 < strpos($class, '\\Tests\\')) {
             $ns = str_replace('\\Tests\\', '\\', $class);
             $mockedNs[] = substr($ns, 0, strrpos($ns, '\\'));
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php
index 8e9bdbe92ed4d..07a9679d13c1c 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php
@@ -31,7 +31,7 @@ public function __construct(callable $sutFqcnResolver = null, $warningOnSutNotFo
     {
         $this->sutFqcnResolver = $sutFqcnResolver;
         $this->warningOnSutNotFound = $warningOnSutNotFound;
-        $this->warnings = array();
+        $this->warnings = [];
     }
 
     public function startTest($test)
@@ -42,7 +42,7 @@ public function startTest($test)
 
         $annotations = $test->getAnnotations();
 
-        $ignoredAnnotations = array('covers', 'coversDefaultClass', 'coversNothing');
+        $ignoredAnnotations = ['covers', 'coversDefaultClass', 'coversNothing'];
 
         foreach ($ignoredAnnotations as $annotation) {
             if (isset($annotations['class'][$annotation]) || isset($annotations['method'][$annotation])) {
@@ -74,11 +74,11 @@ public function startTest($test)
         $r->setAccessible(true);
 
         $cache = $r->getValue();
-        $cache = array_replace_recursive($cache, array(
-            \get_class($test) => array(
-                'covers' => array($sutFqcn),
-            ),
-        ));
+        $cache = array_replace_recursive($cache, [
+            \get_class($test) => [
+                'covers' => [$sutFqcn],
+            ],
+        ]);
         $r->setValue($testClass, $cache);
     }
 
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV5.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV5.php
index 2da40f2c204f1..c825a8ddb2f30 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV5.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV5.php
@@ -22,7 +22,7 @@ class SymfonyTestsListenerForV5 extends \PHPUnit_Framework_BaseTestListener
 {
     private $trait;
 
-    public function __construct(array $mockedNamespaces = array())
+    public function __construct(array $mockedNamespaces = [])
     {
         $this->trait = new SymfonyTestsListenerTrait($mockedNamespaces);
     }
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV6.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV6.php
index 5b864bfe58a32..0c0b57080e01f 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV6.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV6.php
@@ -27,7 +27,7 @@ class SymfonyTestsListenerForV6 extends BaseTestListener
 {
     private $trait;
 
-    public function __construct(array $mockedNamespaces = array())
+    public function __construct(array $mockedNamespaces = [])
     {
         $this->trait = new SymfonyTestsListenerTrait($mockedNamespaces);
     }
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV7.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV7.php
index 18bbdbeba0f03..25ad718a80416 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV7.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV7.php
@@ -30,7 +30,7 @@ class SymfonyTestsListenerForV7 implements TestListener
 
     private $trait;
 
-    public function __construct(array $mockedNamespaces = array())
+    public function __construct(array $mockedNamespaces = [])
     {
         $this->trait = new SymfonyTestsListenerTrait($mockedNamespaces);
     }
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
index 6333c4fd763a2..140434428a31b 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -31,10 +31,10 @@ class SymfonyTestsListenerTrait
     private static $globallyEnabled = false;
     private $state = -1;
     private $skippedFile = false;
-    private $wasSkipped = array();
-    private $isSkipped = array();
-    private $expectedDeprecations = array();
-    private $gatheredDeprecations = array();
+    private $wasSkipped = [];
+    private $isSkipped = [];
+    private $expectedDeprecations = [];
+    private $gatheredDeprecations = [];
     private $previousErrorHandler;
     private $testsWithWarnings;
     private $reportUselessTests;
@@ -44,7 +44,7 @@ class SymfonyTestsListenerTrait
     /**
      * @param array $mockedNamespaces List of namespaces, indexed by mocked features (time-sensitive or dns-sensitive)
      */
-    public function __construct(array $mockedNamespaces = array())
+    public function __construct(array $mockedNamespaces = [])
     {
         if (class_exists('PHPUnit_Util_Blacklist')) {
             \PHPUnit_Util_Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait'] = 2;
@@ -55,7 +55,7 @@ public function __construct(array $mockedNamespaces = array())
         $warn = false;
         foreach ($mockedNamespaces as $type => $namespaces) {
             if (!\is_array($namespaces)) {
-                $namespaces = array($namespaces);
+                $namespaces = [$namespaces];
             }
             if (\is_int($type)) {
                 // @deprecated BC with v2.8 to v3.0
@@ -104,7 +104,7 @@ public function startTestSuite($suite)
             $Test = 'PHPUnit\Util\Test';
         }
         $suiteName = $suite->getName();
-        $this->testsWithWarnings = array();
+        $this->testsWithWarnings = [];
 
         foreach ($suite->tests() as $test) {
             if (!($test instanceof \PHPUnit\Framework\TestCase || $test instanceof TestCase)) {
@@ -135,11 +135,11 @@ public function startTestSuite($suite)
 
                     if (!$this->wasSkipped = require $this->skippedFile) {
                         echo "All tests already ran successfully.\n";
-                        $suite->setTests(array());
+                        $suite->setTests([]);
                     }
                 }
             }
-            $testSuites = array($suite);
+            $testSuites = [$suite];
             for ($i = 0; isset($testSuites[$i]); ++$i) {
                 foreach ($testSuites[$i]->tests() as $test) {
                     if ($test instanceof \PHPUnit_Framework_TestSuite || $test instanceof TestSuite) {
@@ -158,7 +158,7 @@ public function startTestSuite($suite)
                 }
             }
         } elseif (2 === $this->state) {
-            $skipped = array();
+            $skipped = [];
             foreach ($suite->tests() as $test) {
                 if (!($test instanceof \PHPUnit\Framework\TestCase || $test instanceof TestCase)
                     || isset($this->wasSkipped[$suiteName]['*'])
@@ -230,7 +230,7 @@ public function startTest($test)
                 $test->getTestResultObject()->beStrictAboutTestsThatDoNotTestAnything(false);
 
                 $this->expectedDeprecations = $annotations['method']['expectedDeprecation'];
-                $this->previousErrorHandler = set_error_handler(array($this, 'handleError'));
+                $this->previousErrorHandler = set_error_handler([$this, 'handleError']);
             }
         }
     }
@@ -271,8 +271,8 @@ public function endTest($test, $time)
             $deprecations = file_get_contents($this->runsInSeparateProcess);
             unlink($this->runsInSeparateProcess);
             putenv('SYMFONY_DEPRECATIONS_SERIALIZE');
-            foreach ($deprecations ? unserialize($deprecations) : array() as $deprecation) {
-                $error = serialize(array('deprecation' => $deprecation[1], 'class' => $className, 'method' => $test->getName(false), 'triggering_file' => isset($deprecation[2]) ? $deprecation[2] : null));
+            foreach ($deprecations ? unserialize($deprecations) : [] as $deprecation) {
+                $error = serialize(['deprecation' => $deprecation[1], 'class' => $className, 'method' => $test->getName(false), 'triggering_file' => isset($deprecation[2]) ? $deprecation[2] : null]);
                 if ($deprecation[0]) {
                     @trigger_error($error, E_USER_DEPRECATED);
                 } else {
@@ -283,13 +283,13 @@ public function endTest($test, $time)
         }
 
         if ($this->expectedDeprecations) {
-            if (!\in_array($test->getStatus(), array($BaseTestRunner::STATUS_SKIPPED, $BaseTestRunner::STATUS_INCOMPLETE), true)) {
+            if (!\in_array($test->getStatus(), [$BaseTestRunner::STATUS_SKIPPED, $BaseTestRunner::STATUS_INCOMPLETE], true)) {
                 $test->addToAssertionCount(\count($this->expectedDeprecations));
             }
 
             restore_error_handler();
 
-            if (!$errored && !\in_array($test->getStatus(), array($BaseTestRunner::STATUS_SKIPPED, $BaseTestRunner::STATUS_INCOMPLETE, $BaseTestRunner::STATUS_FAILURE, $BaseTestRunner::STATUS_ERROR), true)) {
+            if (!$errored && !\in_array($test->getStatus(), [$BaseTestRunner::STATUS_SKIPPED, $BaseTestRunner::STATUS_INCOMPLETE, $BaseTestRunner::STATUS_FAILURE, $BaseTestRunner::STATUS_ERROR], true)) {
                 try {
                     $prefix = "@expectedDeprecation:\n";
                     $test->assertStringMatchesFormat($prefix.'%A  '.implode("\n%A  ", $this->expectedDeprecations)."\n%A", $prefix.'  '.implode("\n  ", $this->gatheredDeprecations)."\n");
@@ -300,7 +300,7 @@ public function endTest($test, $time)
                 }
             }
 
-            $this->expectedDeprecations = $this->gatheredDeprecations = array();
+            $this->expectedDeprecations = $this->gatheredDeprecations = [];
             $this->previousErrorHandler = null;
         }
         if (!$this->runsInSeparateProcess && -2 < $this->state && ($test instanceof \PHPUnit\Framework\TestCase || $test instanceof TestCase)) {
@@ -308,7 +308,7 @@ public function endTest($test, $time)
                 ClockMock::withClockMock(false);
             }
             if (\in_array('dns-sensitive', $groups, true)) {
-                DnsMock::withMockedHosts(array());
+                DnsMock::withMockedHosts([]);
             }
         }
 
@@ -329,7 +329,7 @@ public function endTest($test, $time)
         }
     }
 
-    public function handleError($type, $msg, $file, $line, $context = array())
+    public function handleError($type, $msg, $file, $line, $context = [])
     {
         if (E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) {
             $h = $this->previousErrorHandler;
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV5.php b/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV5.php
index 7897861cf52f7..1a89019fe3060 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV5.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV5.php
@@ -27,7 +27,7 @@ protected function handleConfiguration(array &$arguments)
 
         $result = parent::handleConfiguration($arguments);
 
-        $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
+        $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : [];
 
         $registeredLocally = false;
 
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV6.php b/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV6.php
index 6da7c65448532..8489a58627fa9 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV6.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV6.php
@@ -30,7 +30,7 @@ protected function handleConfiguration(array &$arguments)
 
         parent::handleConfiguration($arguments);
 
-        $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
+        $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : [];
 
         $registeredLocally = false;
 
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV7.php b/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV7.php
index a175fb65d7f5a..bc5fff95ba716 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV7.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV7.php
@@ -30,7 +30,7 @@ protected function handleConfiguration(array &$arguments): void
 
         parent::handleConfiguration($arguments);
 
-        $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
+        $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : [];
 
         $registeredLocally = false;
 
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt
index 7a0595a7ddebc..1070b19a43717 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt
@@ -35,7 +35,7 @@ class PHPUnit_Util_Test
 {
     public static function getGroups()
     {
-        return array();
+        return [];
     }
 }
 
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt
index fddeed6085dea..a0bf3e2ba761c 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/shutdown_deprecations.phpt
@@ -35,7 +35,7 @@ class PHPUnit_Util_Test
 {
     public static function getGroups()
     {
-        return array();
+        return [];
     }
 }
 
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DnsMockTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DnsMockTest.php
index a178ac7e898c7..ebbc87a770672 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DnsMockTest.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DnsMockTest.php
@@ -18,15 +18,15 @@ class DnsMockTest extends TestCase
 {
     protected function tearDown()
     {
-        DnsMock::withMockedHosts(array());
+        DnsMock::withMockedHosts([]);
     }
 
     public function testCheckdnsrr()
     {
-        DnsMock::withMockedHosts(array('example.com' => array(array('type' => 'MX'))));
+        DnsMock::withMockedHosts(['example.com' => [['type' => 'MX']]]);
         $this->assertTrue(DnsMock::checkdnsrr('example.com'));
 
-        DnsMock::withMockedHosts(array('example.com' => array(array('type' => 'A'))));
+        DnsMock::withMockedHosts(['example.com' => [['type' => 'A']]]);
         $this->assertFalse(DnsMock::checkdnsrr('example.com'));
         $this->assertTrue(DnsMock::checkdnsrr('example.com', 'a'));
         $this->assertTrue(DnsMock::checkdnsrr('example.com', 'any'));
@@ -35,34 +35,34 @@ public function testCheckdnsrr()
 
     public function testGetmxrr()
     {
-        DnsMock::withMockedHosts(array(
-            'example.com' => array(array(
+        DnsMock::withMockedHosts([
+            'example.com' => [[
                 'type' => 'MX',
                 'host' => 'mx.example.com',
                 'pri' => 10,
-            )),
-        ));
+            ]],
+        ]);
 
         $this->assertFalse(DnsMock::getmxrr('foobar.com', $mxhosts, $weight));
         $this->assertTrue(DnsMock::getmxrr('example.com', $mxhosts, $weight));
-        $this->assertSame(array('mx.example.com'), $mxhosts);
-        $this->assertSame(array(10), $weight);
+        $this->assertSame(['mx.example.com'], $mxhosts);
+        $this->assertSame([10], $weight);
     }
 
     public function testGethostbyaddr()
     {
-        DnsMock::withMockedHosts(array(
-            'example.com' => array(
-                array(
+        DnsMock::withMockedHosts([
+            'example.com' => [
+                [
                     'type' => 'A',
                     'ip' => '1.2.3.4',
-                ),
-                array(
+                ],
+                [
                     'type' => 'AAAA',
                     'ipv6' => '::12',
-                ),
-            ),
-        ));
+                ],
+            ],
+        ]);
 
         $this->assertSame('::21', DnsMock::gethostbyaddr('::21'));
         $this->assertSame('example.com', DnsMock::gethostbyaddr('::12'));
@@ -71,18 +71,18 @@ public function testGethostbyaddr()
 
     public function testGethostbyname()
     {
-        DnsMock::withMockedHosts(array(
-            'example.com' => array(
-                array(
+        DnsMock::withMockedHosts([
+            'example.com' => [
+                [
                     'type' => 'AAAA',
                     'ipv6' => '::12',
-                ),
-                array(
+                ],
+                [
                     'type' => 'A',
                     'ip' => '1.2.3.4',
-                ),
-            ),
-        ));
+                ],
+            ],
+        ]);
 
         $this->assertSame('foobar.com', DnsMock::gethostbyname('foobar.com'));
         $this->assertSame('1.2.3.4', DnsMock::gethostbyname('example.com'));
@@ -90,59 +90,59 @@ public function testGethostbyname()
 
     public function testGethostbynamel()
     {
-        DnsMock::withMockedHosts(array(
-            'example.com' => array(
-                array(
+        DnsMock::withMockedHosts([
+            'example.com' => [
+                [
                     'type' => 'A',
                     'ip' => '1.2.3.4',
-                ),
-                array(
+                ],
+                [
                     'type' => 'A',
                     'ip' => '2.3.4.5',
-                ),
-            ),
-        ));
+                ],
+            ],
+        ]);
 
         $this->assertFalse(DnsMock::gethostbynamel('foobar.com'));
-        $this->assertSame(array('1.2.3.4', '2.3.4.5'), DnsMock::gethostbynamel('example.com'));
+        $this->assertSame(['1.2.3.4', '2.3.4.5'], DnsMock::gethostbynamel('example.com'));
     }
 
     public function testDnsGetRecord()
     {
-        DnsMock::withMockedHosts(array(
-            'example.com' => array(
-                array(
+        DnsMock::withMockedHosts([
+            'example.com' => [
+                [
                     'type' => 'A',
                     'ip' => '1.2.3.4',
-                ),
-                array(
+                ],
+                [
                     'type' => 'PTR',
                     'ip' => '2.3.4.5',
-                ),
-            ),
-        ));
+                ],
+            ],
+        ]);
 
-        $records = array(
-            array(
+        $records = [
+            [
                 'host' => 'example.com',
                 'class' => 'IN',
                 'ttl' => 1,
                 'type' => 'A',
                 'ip' => '1.2.3.4',
-            ),
-            $ptr = array(
+            ],
+            $ptr = [
                 'host' => 'example.com',
                 'class' => 'IN',
                 'ttl' => 1,
                 'type' => 'PTR',
                 'ip' => '2.3.4.5',
-            ),
-        );
+            ],
+        ];
 
         $this->assertFalse(DnsMock::dns_get_record('foobar.com'));
         $this->assertSame($records, DnsMock::dns_get_record('example.com'));
         $this->assertSame($records, DnsMock::dns_get_record('example.com', DNS_ALL));
         $this->assertSame($records, DnsMock::dns_get_record('example.com', DNS_A | DNS_PTR));
-        $this->assertSame(array($ptr), DnsMock::dns_get_record('example.com', DNS_PTR));
+        $this->assertSame([$ptr], DnsMock::dns_get_record('example.com', DNS_PTR));
     }
 }
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php
index 7c7464133315a..647d1667c3ea6 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php
@@ -69,6 +69,6 @@ private function dumpLazyServiceProjectServiceContainer()
 
         $dumper->setProxyDumper(new ProxyDumper());
 
-        return $dumper->dump(array('class' => 'LazyServiceProjectServiceContainer'));
+        return $dumper->dump(['class' => 'LazyServiceProjectServiceContainer']);
     }
 }
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/includes/foo.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/includes/foo.php
index 8ffc5be9af40a..435e9a4d77bff 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/includes/foo.php
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/includes/foo.php
@@ -11,14 +11,14 @@ class ProxyManagerBridgeFooClass
     public $initialized = false;
     public $configured = false;
     public $called = false;
-    public $arguments = array();
+    public $arguments = [];
 
-    public function __construct($arguments = array())
+    public function __construct($arguments = [])
     {
         $this->arguments = $arguments;
     }
 
-    public static function getInstance($arguments = array())
+    public static function getInstance($arguments = [])
     {
         $obj = new self($arguments);
         $obj->called = true;
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
index 8bdc63146605d..ff7ff068aefd0 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -134,12 +134,12 @@ public function testLegacyGetProxyFactoryCode()
      */
     public function getProxyCandidates()
     {
-        $definitions = array(
-            array(new Definition(__CLASS__), true),
-            array(new Definition('stdClass'), true),
-            array(new Definition(uniqid('foo', true)), false),
-            array(new Definition(), false),
-        );
+        $definitions = [
+            [new Definition(__CLASS__), true],
+            [new Definition('stdClass'), true],
+            [new Definition(uniqid('foo', true)), false],
+            [new Definition(), false],
+        ];
 
         array_map(
             function ($definition) {
diff --git a/src/Symfony/Bridge/Twig/AppVariable.php b/src/Symfony/Bridge/Twig/AppVariable.php
index 702edcbceaa7e..d3fb5a55b3b84 100644
--- a/src/Symfony/Bridge/Twig/AppVariable.php
+++ b/src/Symfony/Bridge/Twig/AppVariable.php
@@ -159,13 +159,13 @@ public function getFlashes($types = null)
         try {
             $session = $this->getSession();
             if (null === $session) {
-                return array();
+                return [];
             }
         } catch (\RuntimeException $e) {
-            return array();
+            return [];
         }
 
-        if (null === $types || '' === $types || array() === $types) {
+        if (null === $types || '' === $types || [] === $types) {
             return $session->getFlashBag()->all();
         }
 
@@ -173,7 +173,7 @@ public function getFlashes($types = null)
             return $session->getFlashBag()->get($types);
         }
 
-        $result = array();
+        $result = [];
         foreach ($types as $type) {
             $result[$type] = $session->getFlashBag()->get($type);
         }
diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
index a119aa7ae97b5..94d7f944dadae 100644
--- a/src/Symfony/Bridge/Twig/Command/DebugCommand.php
+++ b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
@@ -133,7 +133,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $filter = $input->getArgument('filter');
 
         foreach ($types as $index => $type) {
-            $items = array();
+            $items = [];
             foreach ($this->twig->{'get'.ucfirst($type)}() as $name => $entity) {
                 if (!$filter || false !== strpos($name, $filter)) {
                     $items[$name] = $name.$this->getPrettyMetadata($type, $entity);
diff --git a/src/Symfony/Bridge/Twig/Command/LintCommand.php b/src/Symfony/Bridge/Twig/Command/LintCommand.php
index cb14e5c35988d..c8b5bb5ba2a05 100644
--- a/src/Symfony/Bridge/Twig/Command/LintCommand.php
+++ b/src/Symfony/Bridge/Twig/Command/LintCommand.php
@@ -129,7 +129,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $template .= fread(STDIN, 1024);
             }
 
-            return $this->display($input, $output, $io, array($this->validate($template, uniqid('sf_', true))));
+            return $this->display($input, $output, $io, [$this->validate($template, uniqid('sf_', true))]);
         }
 
         $filesInfo = $this->getFilesInfo($filenames);
@@ -139,7 +139,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
     private function getFilesInfo(array $filenames)
     {
-        $filesInfo = array();
+        $filesInfo = [];
         foreach ($filenames as $filename) {
             foreach ($this->findFiles($filename) as $file) {
                 $filesInfo[] = $this->validate(file_get_contents($file), $file);
@@ -152,7 +152,7 @@ private function getFilesInfo(array $filenames)
     protected function findFiles($filename)
     {
         if (is_file($filename)) {
-            return array($filename);
+            return [$filename];
         } elseif (is_dir($filename)) {
             return Finder::create()->files()->in($filename)->name('*.twig');
         }
@@ -164,7 +164,7 @@ private function validate($template, $file)
     {
         $realLoader = $this->twig->getLoader();
         try {
-            $temporaryLoader = new ArrayLoader(array((string) $file => $template));
+            $temporaryLoader = new ArrayLoader([(string) $file => $template]);
             $this->twig->setLoader($temporaryLoader);
             $nodeTree = $this->twig->parse($this->twig->tokenize(new Source($template, (string) $file)));
             $this->twig->compile($nodeTree);
@@ -172,10 +172,10 @@ private function validate($template, $file)
         } catch (Error $e) {
             $this->twig->setLoader($realLoader);
 
-            return array('template' => $template, 'file' => $file, 'line' => $e->getTemplateLine(), 'valid' => false, 'exception' => $e);
+            return ['template' => $template, 'file' => $file, 'line' => $e->getTemplateLine(), 'valid' => false, 'exception' => $e];
         }
 
-        return array('template' => $template, 'file' => $file, 'valid' => true);
+        return ['template' => $template, 'file' => $file, 'valid' => true];
     }
 
     private function display(InputInterface $input, OutputInterface $output, SymfonyStyle $io, $files)
@@ -261,7 +261,7 @@ private function getContext($template, $line, $context = 3)
         $position = max(0, $line - $context);
         $max = min(\count($lines), $line - 1 + $context);
 
-        $result = array();
+        $result = [];
         while ($position < $max) {
             $result[$position + 1] = $lines[$position];
             ++$position;
diff --git a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
index 392b9a617c63e..0cf91d99d6200 100644
--- a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
+++ b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
@@ -51,7 +51,7 @@ public function reset()
     {
         $this->profile->reset();
         $this->computed = null;
-        $this->data = array();
+        $this->data = [];
     }
 
     /**
@@ -60,7 +60,7 @@ public function reset()
     public function lateCollect()
     {
         $this->data['profile'] = serialize($this->profile);
-        $this->data['template_paths'] = array();
+        $this->data['template_paths'] = [];
 
         if (null === $this->twig) {
             return;
@@ -122,15 +122,15 @@ public function getHtmlCallGraph()
         $dump = $dumper->dump($this->getProfile());
 
         // needed to remove the hardcoded CSS styles
-        $dump = str_replace(array(
+        $dump = str_replace([
             '<span style="background-color: #ffd">',
             '<span style="color: #d44">',
             '<span style="background-color: #dfd">',
-        ), array(
+        ], [
             '<span class="status-warning">',
             '<span class="status-error">',
             '<span class="status-success">',
-        ), $dump);
+        ], $dump);
 
         return new Markup($dump, 'UTF-8');
     }
@@ -159,13 +159,13 @@ private function getComputedData($index)
 
     private function computeData(Profile $profile)
     {
-        $data = array(
+        $data = [
             'template_count' => 0,
             'block_count' => 0,
             'macro_count' => 0,
-        );
+        ];
 
-        $templates = array();
+        $templates = [];
         foreach ($profile as $p) {
             $d = $this->computeData($p);
 
diff --git a/src/Symfony/Bridge/Twig/Extension/AssetExtension.php b/src/Symfony/Bridge/Twig/Extension/AssetExtension.php
index d5d70fb397f69..cc2cdb268e5b5 100644
--- a/src/Symfony/Bridge/Twig/Extension/AssetExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/AssetExtension.php
@@ -34,10 +34,10 @@ public function __construct(Packages $packages)
      */
     public function getFunctions()
     {
-        return array(
-            new TwigFunction('asset', array($this, 'getAssetUrl')),
-            new TwigFunction('asset_version', array($this, 'getAssetVersion')),
-        );
+        return [
+            new TwigFunction('asset', [$this, 'getAssetUrl']),
+            new TwigFunction('asset_version', [$this, 'getAssetVersion']),
+        ];
     }
 
     /**
diff --git a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
index 5bc383d5f5483..089d4a9e2fdec 100644
--- a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
@@ -87,7 +87,7 @@ public function abbrMethod($method)
      */
     public function formatArgs($args)
     {
-        $result = array();
+        $result = [];
         foreach ($args as $key => $item) {
             if ('object' === $item[0]) {
                 $parts = explode('\\', $item[1]);
@@ -146,7 +146,7 @@ public function fileExcerpt($file, $line, $srcContext = 3)
             }, $code);
             $content = explode('<br />', $code);
 
-            $lines = array();
+            $lines = [];
             if (0 > $srcContext) {
                 $srcContext = \count($content);
             }
@@ -205,7 +205,7 @@ public function formatFile($file, $line, $text = null)
     public function getFileLink($file, $line)
     {
         if ($fmt = $this->fileLinkFormat) {
-            return \is_string($fmt) ? strtr($fmt, array('%f' => $file, '%l' => $line)) : $fmt->format($file, $line);
+            return \is_string($fmt) ? strtr($fmt, ['%f' => $file, '%l' => $line]) : $fmt->format($file, $line);
         }
 
         return false;
@@ -224,7 +224,7 @@ public function formatFileFromText($text)
     public function formatLogMessage($message, array $context)
     {
         if ($context && false !== strpos($message, '{')) {
-            $replacements = array();
+            $replacements = [];
             foreach ($context as $key => $val) {
                 if (is_scalar($val)) {
                     $replacements['{'.$key.'}'] = $val;
diff --git a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php
index 3d4c6841f201e..88b75368da203 100644
--- a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php
@@ -37,14 +37,14 @@ public function __construct(ClonerInterface $cloner, HtmlDumper $dumper = null)
 
     public function getFunctions()
     {
-        return array(
-            new TwigFunction('dump', array($this, 'dump'), array('is_safe' => array('html'), 'needs_context' => true, 'needs_environment' => true)),
-        );
+        return [
+            new TwigFunction('dump', [$this, 'dump'], ['is_safe' => ['html'], 'needs_context' => true, 'needs_environment' => true]),
+        ];
     }
 
     public function getTokenParsers()
     {
-        return array(new DumpTokenParser());
+        return [new DumpTokenParser()];
     }
 
     public function getName()
@@ -59,14 +59,14 @@ public function dump(Environment $env, $context)
         }
 
         if (2 === \func_num_args()) {
-            $vars = array();
+            $vars = [];
             foreach ($context as $key => $value) {
                 if (!$value instanceof Template) {
                     $vars[$key] = $value;
                 }
             }
 
-            $vars = array($vars);
+            $vars = [$vars];
         } else {
             $vars = \func_get_args();
             unset($vars[0], $vars[1]);
diff --git a/src/Symfony/Bridge/Twig/Extension/ExpressionExtension.php b/src/Symfony/Bridge/Twig/Extension/ExpressionExtension.php
index fc64fa3e3775d..21f6be4d6ec6d 100644
--- a/src/Symfony/Bridge/Twig/Extension/ExpressionExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/ExpressionExtension.php
@@ -27,9 +27,9 @@ class ExpressionExtension extends AbstractExtension
      */
     public function getFunctions()
     {
-        return array(
-            new TwigFunction('expression', array($this, 'createExpression')),
-        );
+        return [
+            new TwigFunction('expression', [$this, 'createExpression']),
+        ];
     }
 
     public function createExpression($expression)
diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
index 0571fbf1ff0b4..94cf7c4a73fdf 100644
--- a/src/Symfony/Bridge/Twig/Extension/FormExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -65,10 +65,10 @@ public function initRuntime(Environment $environment)
      */
     public function getTokenParsers()
     {
-        return array(
+        return [
             // {% form_theme form "SomeBundle::widgets.twig" %}
             new FormThemeTokenParser(),
-        );
+        ];
     }
 
     /**
@@ -94,10 +94,10 @@ public function getFunctions()
      */
     public function getFilters()
     {
-        return array(
-            new TwigFilter('humanize', array('Symfony\Component\Form\FormRenderer', 'humanize')),
-            new TwigFilter('form_encode_currency', array('Symfony\Component\Form\FormRenderer', 'encodeCurrency'), array('is_safe' => array('html'), 'needs_environment' => true)),
-        );
+        return [
+            new TwigFilter('humanize', ['Symfony\Component\Form\FormRenderer', 'humanize']),
+            new TwigFilter('form_encode_currency', ['Symfony\Component\Form\FormRenderer', 'encodeCurrency'], ['is_safe' => ['html'], 'needs_environment' => true]),
+        ];
     }
 
     /**
@@ -105,10 +105,10 @@ public function getFilters()
      */
     public function getTests()
     {
-        return array(
+        return [
             new TwigTest('selectedchoice', 'Symfony\Bridge\Twig\Extension\twig_is_selected_choice'),
             new TwigTest('rootform', 'Symfony\Bridge\Twig\Extension\twig_is_root_form'),
-        );
+        ];
     }
 
     /**
diff --git a/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php
index fe2778393cfd2..82b9a92f7516c 100644
--- a/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php
@@ -38,10 +38,10 @@ public function __construct(RequestStack $requestStack, RequestContext $requestC
      */
     public function getFunctions()
     {
-        return array(
-            new TwigFunction('absolute_url', array($this, 'generateAbsoluteUrl')),
-            new TwigFunction('relative_path', array($this, 'generateRelativePath')),
-        );
+        return [
+            new TwigFunction('absolute_url', [$this, 'generateAbsoluteUrl']),
+            new TwigFunction('relative_path', [$this, 'generateRelativePath']),
+        ];
     }
 
     /**
diff --git a/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php
index 45142e7402a67..f8b93ada15475 100644
--- a/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php
@@ -24,14 +24,14 @@ class HttpKernelExtension extends AbstractExtension
 {
     public function getFunctions()
     {
-        return array(
-            new TwigFunction('render', array(HttpKernelRuntime::class, 'renderFragment'), array('is_safe' => array('html'))),
-            new TwigFunction('render_*', array(HttpKernelRuntime::class, 'renderFragmentStrategy'), array('is_safe' => array('html'))),
+        return [
+            new TwigFunction('render', [HttpKernelRuntime::class, 'renderFragment'], ['is_safe' => ['html']]),
+            new TwigFunction('render_*', [HttpKernelRuntime::class, 'renderFragmentStrategy'], ['is_safe' => ['html']]),
             new TwigFunction('controller', static::class.'::controller'),
-        );
+        ];
     }
 
-    public static function controller($controller, $attributes = array(), $query = array())
+    public static function controller($controller, $attributes = [], $query = [])
     {
         return new ControllerReference($controller, $attributes, $query);
     }
diff --git a/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php b/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php
index 6eea673e25fa6..fcd7c24416fbe 100644
--- a/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php
+++ b/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php
@@ -38,7 +38,7 @@ public function __construct(FragmentHandler $handler)
      *
      * @see FragmentHandler::render()
      */
-    public function renderFragment($uri, $options = array())
+    public function renderFragment($uri, $options = [])
     {
         $strategy = isset($options['strategy']) ? $options['strategy'] : 'inline';
         unset($options['strategy']);
@@ -57,7 +57,7 @@ public function renderFragment($uri, $options = array())
      *
      * @see FragmentHandler::render()
      */
-    public function renderFragmentStrategy($strategy, $uri, $options = array())
+    public function renderFragmentStrategy($strategy, $uri, $options = [])
     {
         return $this->handler->render($uri, $strategy, $options);
     }
diff --git a/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php b/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php
index 17abb779899ac..e8bc6190cd65a 100644
--- a/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php
@@ -34,10 +34,10 @@ public function __construct(LogoutUrlGenerator $generator)
      */
     public function getFunctions()
     {
-        return array(
-            new TwigFunction('logout_url', array($this, 'getLogoutUrl')),
-            new TwigFunction('logout_path', array($this, 'getLogoutPath')),
-        );
+        return [
+            new TwigFunction('logout_url', [$this, 'getLogoutUrl']),
+            new TwigFunction('logout_path', [$this, 'getLogoutPath']),
+        ];
     }
 
     /**
diff --git a/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php b/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php
index a23352fd00575..f380d13a57426 100644
--- a/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php
@@ -39,10 +39,10 @@ public function __construct(UrlGeneratorInterface $generator)
      */
     public function getFunctions()
     {
-        return array(
-            new TwigFunction('url', array($this, 'getUrl'), array('is_safe_callback' => array($this, 'isUrlGenerationSafe'))),
-            new TwigFunction('path', array($this, 'getPath'), array('is_safe_callback' => array($this, 'isUrlGenerationSafe'))),
-        );
+        return [
+            new TwigFunction('url', [$this, 'getUrl'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),
+            new TwigFunction('path', [$this, 'getPath'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),
+        ];
     }
 
     /**
@@ -52,7 +52,7 @@ public function getFunctions()
      *
      * @return string
      */
-    public function getPath($name, $parameters = array(), $relative = false)
+    public function getPath($name, $parameters = [], $relative = false)
     {
         return $this->generator->generate($name, $parameters, $relative ? UrlGeneratorInterface::RELATIVE_PATH : UrlGeneratorInterface::ABSOLUTE_PATH);
     }
@@ -64,7 +64,7 @@ public function getPath($name, $parameters = array(), $relative = false)
      *
      * @return string
      */
-    public function getUrl($name, $parameters = array(), $schemeRelative = false)
+    public function getUrl($name, $parameters = [], $schemeRelative = false)
     {
         return $this->generator->generate($name, $parameters, $schemeRelative ? UrlGeneratorInterface::NETWORK_PATH : UrlGeneratorInterface::ABSOLUTE_URL);
     }
@@ -103,10 +103,10 @@ public function isUrlGenerationSafe(\Twig_Node $argsNode)
         if (null === $paramsNode || $paramsNode instanceof ArrayExpression && \count($paramsNode) <= 2 &&
             (!$paramsNode->hasNode(1) || $paramsNode->getNode(1) instanceof ConstantExpression)
         ) {
-            return array('html');
+            return ['html'];
         }
 
-        return array();
+        return [];
     }
 
     /**
diff --git a/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php b/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php
index 193726a684371..439c31aad3df2 100644
--- a/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php
@@ -53,9 +53,9 @@ public function isGranted($role, $object = null, $field = null)
      */
     public function getFunctions()
     {
-        return array(
-            new TwigFunction('is_granted', array($this, 'isGranted')),
-        );
+        return [
+            new TwigFunction('is_granted', [$this, 'isGranted']),
+        ];
     }
 
     /**
diff --git a/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php b/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php
index ffbfcf8845fe4..45b65d4e64d66 100644
--- a/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php
@@ -38,14 +38,14 @@ public function getStopwatch()
 
     public function getTokenParsers()
     {
-        return array(
+        return [
             /*
              * {% stopwatch foo %}
              * Some stuff which will be recorded on the timeline
              * {% endstopwatch %}
              */
             new StopwatchTokenParser(null !== $this->stopwatch && $this->enabled),
-        );
+        ];
     }
 
     public function getName()
diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
index fe1adc4a7dd04..415e58474256c 100644
--- a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
@@ -61,7 +61,7 @@ public function getFilters()
      */
     public function getTokenParsers()
     {
-        return array(
+        return [
             // {% trans %}Symfony is great!{% endtrans %}
             new TransTokenParser(),
 
@@ -72,7 +72,7 @@ public function getTokenParsers()
 
             // {% trans_default_domain "foobar" %}
             new TransDefaultDomainTokenParser(),
-        );
+        ];
     }
 
     /**
@@ -80,7 +80,7 @@ public function getTokenParsers()
      */
     public function getNodeVisitors()
     {
-        return array($this->getTranslationNodeVisitor(), new TranslationDefaultDomainNodeVisitor());
+        return [$this->getTranslationNodeVisitor(), new TranslationDefaultDomainNodeVisitor()];
     }
 
     public function getTranslationNodeVisitor()
diff --git a/src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php b/src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php
index 3d90c3bf21c74..cf00b4c53af2c 100644
--- a/src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php
@@ -36,14 +36,14 @@ public function __construct(RequestStack $requestStack)
      */
     public function getFunctions()
     {
-        return array(
-            new TwigFunction('link', array($this, 'link')),
-            new TwigFunction('preload', array($this, 'preload')),
-            new TwigFunction('dns_prefetch', array($this, 'dnsPrefetch')),
-            new TwigFunction('preconnect', array($this, 'preconnect')),
-            new TwigFunction('prefetch', array($this, 'prefetch')),
-            new TwigFunction('prerender', array($this, 'prerender')),
-        );
+        return [
+            new TwigFunction('link', [$this, 'link']),
+            new TwigFunction('preload', [$this, 'preload']),
+            new TwigFunction('dns_prefetch', [$this, 'dnsPrefetch']),
+            new TwigFunction('preconnect', [$this, 'preconnect']),
+            new TwigFunction('prefetch', [$this, 'prefetch']),
+            new TwigFunction('prerender', [$this, 'prerender']),
+        ];
     }
 
     /**
@@ -55,7 +55,7 @@ public function getFunctions()
      *
      * @return string The relation URI
      */
-    public function link($uri, $rel, array $attributes = array())
+    public function link($uri, $rel, array $attributes = [])
     {
         if (!$request = $this->requestStack->getMasterRequest()) {
             return $uri;
@@ -80,7 +80,7 @@ public function link($uri, $rel, array $attributes = array())
      *
      * @return string The path of the asset
      */
-    public function preload($uri, array $attributes = array())
+    public function preload($uri, array $attributes = [])
     {
         return $this->link($uri, 'preload', $attributes);
     }
@@ -93,7 +93,7 @@ public function preload($uri, array $attributes = array())
      *
      * @return string The path of the asset
      */
-    public function dnsPrefetch($uri, array $attributes = array())
+    public function dnsPrefetch($uri, array $attributes = [])
     {
         return $this->link($uri, 'dns-prefetch', $attributes);
     }
@@ -106,7 +106,7 @@ public function dnsPrefetch($uri, array $attributes = array())
      *
      * @return string The path of the asset
      */
-    public function preconnect($uri, array $attributes = array())
+    public function preconnect($uri, array $attributes = [])
     {
         return $this->link($uri, 'preconnect', $attributes);
     }
@@ -119,7 +119,7 @@ public function preconnect($uri, array $attributes = array())
      *
      * @return string The path of the asset
      */
-    public function prefetch($uri, array $attributes = array())
+    public function prefetch($uri, array $attributes = [])
     {
         return $this->link($uri, 'prefetch', $attributes);
     }
@@ -132,7 +132,7 @@ public function prefetch($uri, array $attributes = array())
      *
      * @return string The path of the asset
      */
-    public function prerender($uri, array $attributes = array())
+    public function prerender($uri, array $attributes = [])
     {
         return $this->link($uri, 'prerender', $attributes);
     }
diff --git a/src/Symfony/Bridge/Twig/Extension/YamlExtension.php b/src/Symfony/Bridge/Twig/Extension/YamlExtension.php
index a94c07426ef5a..bb8d5a12bd62e 100644
--- a/src/Symfony/Bridge/Twig/Extension/YamlExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/YamlExtension.php
@@ -28,10 +28,10 @@ class YamlExtension extends AbstractExtension
      */
     public function getFilters()
     {
-        return array(
-            new TwigFilter('yaml_encode', array($this, 'encode')),
-            new TwigFilter('yaml_dump', array($this, 'dump')),
-        );
+        return [
+            new TwigFilter('yaml_encode', [$this, 'encode']),
+            new TwigFilter('yaml_dump', [$this, 'dump']),
+        ];
     }
 
     public function encode($input, $inline = 0, $dumpObjects = 0)
diff --git a/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php b/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
index eb4cc1ce80460..b7e0e7d157780 100644
--- a/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
+++ b/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
@@ -58,7 +58,7 @@ public function setEnvironment(Environment $environment)
     /**
      * {@inheritdoc}
      */
-    public function renderBlock(FormView $view, $resource, $blockName, array $variables = array())
+    public function renderBlock(FormView $view, $resource, $blockName, array $variables = [])
     {
         $cacheKey = $view->vars[self::CACHE_KEY_VAR];
 
@@ -187,7 +187,7 @@ protected function loadResourcesFromTheme($cacheKey, &$theme)
         // theme is a reference and we don't want to change it.
         $currentTheme = $theme;
 
-        $context = $this->environment->mergeGlobals(array());
+        $context = $this->environment->mergeGlobals([]);
 
         // The do loop takes care of template inheritance.
         // Add blocks from all templates in the inheritance tree, but avoid
diff --git a/src/Symfony/Bridge/Twig/Node/DumpNode.php b/src/Symfony/Bridge/Twig/Node/DumpNode.php
index d820d75cc7db9..e631aa319ba3a 100644
--- a/src/Symfony/Bridge/Twig/Node/DumpNode.php
+++ b/src/Symfony/Bridge/Twig/Node/DumpNode.php
@@ -23,12 +23,12 @@ class DumpNode extends Node
 
     public function __construct($varPrefix, Node $values = null, $lineno, $tag = null)
     {
-        $nodes = array();
+        $nodes = [];
         if (null !== $values) {
             $nodes['values'] = $values;
         }
 
-        parent::__construct($nodes, array(), $lineno, $tag);
+        parent::__construct($nodes, [], $lineno, $tag);
         $this->varPrefix = $varPrefix;
     }
 
diff --git a/src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php b/src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php
index 224e1d60e0aad..3dc82a938b8b1 100644
--- a/src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php
+++ b/src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php
@@ -53,7 +53,7 @@ public function compile(Compiler $compiler)
                         // Only insert the label into the array if it is not empty
                         if (!twig_test_empty($label->getAttribute('value'))) {
                             $originalVariables = $variables;
-                            $variables = new ArrayExpression(array(), $lineno);
+                            $variables = new ArrayExpression([], $lineno);
                             $labelKey = new ConstantExpression('label', $lineno);
 
                             if (null !== $originalVariables) {
diff --git a/src/Symfony/Bridge/Twig/Node/StopwatchNode.php b/src/Symfony/Bridge/Twig/Node/StopwatchNode.php
index fac770c2499ba..538c22bb79238 100644
--- a/src/Symfony/Bridge/Twig/Node/StopwatchNode.php
+++ b/src/Symfony/Bridge/Twig/Node/StopwatchNode.php
@@ -24,7 +24,7 @@ class StopwatchNode extends Node
 {
     public function __construct(Node $name, Node $body, AssignNameExpression $var, $lineno = 0, $tag = null)
     {
-        parent::__construct(array('body' => $body, 'name' => $name, 'var' => $var), array(), $lineno, $tag);
+        parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno, $tag);
     }
 
     public function compile(Compiler $compiler)
diff --git a/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php b/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php
index c9c82b33e541c..294718ba1f1fa 100644
--- a/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php
+++ b/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php
@@ -22,7 +22,7 @@ class TransDefaultDomainNode extends Node
 {
     public function __construct(AbstractExpression $expr, $lineno = 0, $tag = null)
     {
-        parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
+        parent::__construct(['expr' => $expr], [], $lineno, $tag);
     }
 
     public function compile(Compiler $compiler)
diff --git a/src/Symfony/Bridge/Twig/Node/TransNode.php b/src/Symfony/Bridge/Twig/Node/TransNode.php
index 020810f7b7c55..1b02b9c3d7da1 100644
--- a/src/Symfony/Bridge/Twig/Node/TransNode.php
+++ b/src/Symfony/Bridge/Twig/Node/TransNode.php
@@ -29,7 +29,7 @@ class TransNode extends Node
 {
     public function __construct(Node $body, Node $domain = null, AbstractExpression $count = null, AbstractExpression $vars = null, AbstractExpression $locale = null, $lineno = 0, $tag = null)
     {
-        $nodes = array('body' => $body);
+        $nodes = ['body' => $body];
         if (null !== $domain) {
             $nodes['domain'] = $domain;
         }
@@ -43,14 +43,14 @@ public function __construct(Node $body, Node $domain = null, AbstractExpression
             $nodes['locale'] = $locale;
         }
 
-        parent::__construct($nodes, array(), $lineno, $tag);
+        parent::__construct($nodes, [], $lineno, $tag);
     }
 
     public function compile(Compiler $compiler)
     {
         $compiler->addDebugInfo($this);
 
-        $defaults = new ArrayExpression(array(), -1);
+        $defaults = new ArrayExpression([], -1);
         if ($this->hasNode('vars') && ($vars = $this->getNode('vars')) instanceof ArrayExpression) {
             $defaults = $this->getNode('vars');
             $vars = null;
@@ -109,7 +109,7 @@ protected function compileString(Node $body, ArrayExpression $vars, $ignoreStric
         } elseif ($body instanceof TextNode) {
             $msg = $body->getAttribute('data');
         } else {
-            return array($body, $vars);
+            return [$body, $vars];
         }
 
         preg_match_all('/(?<!%)%([^%]+)%/', $msg, $matches);
@@ -127,6 +127,6 @@ protected function compileString(Node $body, ArrayExpression $vars, $ignoreStric
             }
         }
 
-        return array(new ConstantExpression(str_replace('%%', '%', trim($msg)), $body->getTemplateLine()), $vars);
+        return [new ConstantExpression(str_replace('%%', '%', trim($msg)), $body->getTemplateLine()), $vars];
     }
 }
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php b/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php
index 59497dc961984..d5bcfa8b8fceb 100644
--- a/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php
+++ b/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php
@@ -17,7 +17,7 @@
 class Scope
 {
     private $parent;
-    private $data = array();
+    private $data = [];
     private $left = false;
 
     public function __construct(self $parent = null)
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
index 6a34a037e48f2..5beae16dba3f7 100644
--- a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
+++ b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
@@ -56,7 +56,7 @@ protected function doEnterNode(Node $node, Environment $env)
                 $name = new AssignNameExpression($var, $node->getTemplateLine());
                 $this->scope->set('domain', new NameExpression($var, $node->getTemplateLine()));
 
-                return new SetNode(false, new Node(array($name)), new Node(array($node->getNode('expr'))), $node->getTemplateLine());
+                return new SetNode(false, new Node([$name]), new Node([$node->getNode('expr')]), $node->getTemplateLine());
             }
         }
 
@@ -64,7 +64,7 @@ protected function doEnterNode(Node $node, Environment $env)
             return $node;
         }
 
-        if ($node instanceof FilterExpression && \in_array($node->getNode('filter')->getAttribute('value'), array('trans', 'transchoice'))) {
+        if ($node instanceof FilterExpression && \in_array($node->getNode('filter')->getAttribute('value'), ['trans', 'transchoice'])) {
             $arguments = $node->getNode('arguments');
             $ind = 'trans' === $node->getNode('filter')->getAttribute('value') ? 1 : 2;
             if ($this->isNamedArguments($arguments)) {
@@ -74,7 +74,7 @@ protected function doEnterNode(Node $node, Environment $env)
             } else {
                 if (!$arguments->hasNode($ind)) {
                     if (!$arguments->hasNode($ind - 1)) {
-                        $arguments->setNode($ind - 1, new ArrayExpression(array(), $node->getTemplateLine()));
+                        $arguments->setNode($ind - 1, new ArrayExpression([], $node->getTemplateLine()));
                     }
 
                     $arguments->setNode($ind, $this->scope->get('domain'));
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
index 1fbce9c6af811..2585b4823db53 100644
--- a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
+++ b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
@@ -28,18 +28,18 @@ class TranslationNodeVisitor extends AbstractNodeVisitor
     const UNDEFINED_DOMAIN = '_undefined';
 
     private $enabled = false;
-    private $messages = array();
+    private $messages = [];
 
     public function enable()
     {
         $this->enabled = true;
-        $this->messages = array();
+        $this->messages = [];
     }
 
     public function disable()
     {
         $this->enabled = false;
-        $this->messages = array();
+        $this->messages = [];
     }
 
     public function getMessages()
@@ -62,26 +62,26 @@ protected function doEnterNode(Node $node, Environment $env)
             $node->getNode('node') instanceof ConstantExpression
         ) {
             // extract constant nodes with a trans filter
-            $this->messages[] = array(
+            $this->messages[] = [
                 $node->getNode('node')->getAttribute('value'),
                 $this->getReadDomainFromArguments($node->getNode('arguments'), 1),
-            );
+            ];
         } elseif (
             $node instanceof FilterExpression &&
             'transchoice' === $node->getNode('filter')->getAttribute('value') &&
             $node->getNode('node') instanceof ConstantExpression
         ) {
             // extract constant nodes with a trans filter
-            $this->messages[] = array(
+            $this->messages[] = [
                 $node->getNode('node')->getAttribute('value'),
                 $this->getReadDomainFromArguments($node->getNode('arguments'), 2),
-            );
+            ];
         } elseif ($node instanceof TransNode) {
             // extract trans nodes
-            $this->messages[] = array(
+            $this->messages[] = [
                 $node->getNode('body')->getAttribute('data'),
                 $node->hasNode('domain') ? $this->getReadDomainFromNode($node->getNode('domain')) : null,
-            );
+            ];
         }
 
         return $node;
diff --git a/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php b/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
index 27eca0c44a74a..0502a64ce1da9 100644
--- a/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
@@ -32,10 +32,10 @@ public function testDebug($debugFlag)
 
     public function debugDataProvider()
     {
-        return array(
-            'debug on' => array(true),
-            'debug off' => array(false),
-        );
+        return [
+            'debug on' => [true],
+            'debug off' => [false],
+        ];
     }
 
     public function testEnvironment()
@@ -166,7 +166,7 @@ public function testGetFlashesWithNoRequest()
     {
         $this->setRequestStack(null);
 
-        $this->assertEquals(array(), $this->appVariable->getFlashes());
+        $this->assertEquals([], $this->appVariable->getFlashes());
     }
 
     /**
@@ -190,15 +190,15 @@ public function testGetFlashes()
         $this->assertEquals($flashMessages, $this->appVariable->getFlashes(''));
 
         $flashMessages = $this->setFlashMessages();
-        $this->assertEquals($flashMessages, $this->appVariable->getFlashes(array()));
+        $this->assertEquals($flashMessages, $this->appVariable->getFlashes([]));
 
         $flashMessages = $this->setFlashMessages();
-        $this->assertEquals(array(), $this->appVariable->getFlashes('this-does-not-exist'));
+        $this->assertEquals([], $this->appVariable->getFlashes('this-does-not-exist'));
 
         $flashMessages = $this->setFlashMessages();
         $this->assertEquals(
-            array('this-does-not-exist' => array()),
-            $this->appVariable->getFlashes(array('this-does-not-exist'))
+            ['this-does-not-exist' => []],
+            $this->appVariable->getFlashes(['this-does-not-exist'])
         );
 
         $flashMessages = $this->setFlashMessages();
@@ -206,31 +206,31 @@ public function testGetFlashes()
 
         $flashMessages = $this->setFlashMessages();
         $this->assertEquals(
-            array('notice' => $flashMessages['notice']),
-            $this->appVariable->getFlashes(array('notice'))
+            ['notice' => $flashMessages['notice']],
+            $this->appVariable->getFlashes(['notice'])
         );
 
         $flashMessages = $this->setFlashMessages();
         $this->assertEquals(
-            array('notice' => $flashMessages['notice'], 'this-does-not-exist' => array()),
-            $this->appVariable->getFlashes(array('notice', 'this-does-not-exist'))
+            ['notice' => $flashMessages['notice'], 'this-does-not-exist' => []],
+            $this->appVariable->getFlashes(['notice', 'this-does-not-exist'])
         );
 
         $flashMessages = $this->setFlashMessages();
         $this->assertEquals(
-            array('notice' => $flashMessages['notice'], 'error' => $flashMessages['error']),
-            $this->appVariable->getFlashes(array('notice', 'error'))
+            ['notice' => $flashMessages['notice'], 'error' => $flashMessages['error']],
+            $this->appVariable->getFlashes(['notice', 'error'])
         );
 
         $this->assertEquals(
-            array('warning' => $flashMessages['warning']),
-            $this->appVariable->getFlashes(array('warning')),
+            ['warning' => $flashMessages['warning']],
+            $this->appVariable->getFlashes(['warning']),
             'After getting some flash types (e.g. "notice" and "error"), the rest of flash messages must remain (e.g. "warning").'
         );
 
         $this->assertEquals(
-            array('this-does-not-exist' => array()),
-            $this->appVariable->getFlashes(array('this-does-not-exist'))
+            ['this-does-not-exist' => []],
+            $this->appVariable->getFlashes(['this-does-not-exist'])
         );
     }
 
@@ -255,11 +255,11 @@ protected function setTokenStorage($user)
 
     private function setFlashMessages($sessionHasStarted = true)
     {
-        $flashMessages = array(
-            'notice' => array('Notice #1 message'),
-            'warning' => array('Warning #1 message'),
-            'error' => array('Error #1 message', 'Error #2 message'),
-        );
+        $flashMessages = [
+            'notice' => ['Notice #1 message'],
+            'warning' => ['Warning #1 message'],
+            'error' => ['Error #1 message', 'Error #2 message'],
+        ];
         $flashBag = new FlashBag();
         $flashBag->initialize($flashMessages);
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Command/DebugCommandTest.php b/src/Symfony/Bridge/Twig/Tests/Command/DebugCommandTest.php
index 39b0d0df5a2b3..a0a5650b0f1b7 100644
--- a/src/Symfony/Bridge/Twig/Tests/Command/DebugCommandTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Command/DebugCommandTest.php
@@ -23,7 +23,7 @@ class DebugCommandTest extends TestCase
     public function testDebugCommand()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array(), array('decorated' => false));
+        $ret = $tester->execute([], ['decorated' => false]);
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
         $this->assertContains('Functions', trim($tester->getDisplay()));
diff --git a/src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php b/src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php
index bf0bf7c42cbc9..4917d9409db3a 100644
--- a/src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php
@@ -28,7 +28,7 @@ public function testLintCorrectFile()
         $tester = $this->createCommandTester();
         $filename = $this->createFile('{{ foo }}');
 
-        $ret = $tester->execute(array('filename' => array($filename)), array('verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false));
+        $ret = $tester->execute(['filename' => [$filename]], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false]);
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
         $this->assertContains('OK in', trim($tester->getDisplay()));
@@ -39,7 +39,7 @@ public function testLintIncorrectFile()
         $tester = $this->createCommandTester();
         $filename = $this->createFile('{{ foo');
 
-        $ret = $tester->execute(array('filename' => array($filename)), array('decorated' => false));
+        $ret = $tester->execute(['filename' => [$filename]], ['decorated' => false]);
 
         $this->assertEquals(1, $ret, 'Returns 1 in case of error');
         $this->assertRegExp('/ERROR  in \S+ \(line /', trim($tester->getDisplay()));
@@ -54,7 +54,7 @@ public function testLintFileNotReadable()
         $filename = $this->createFile('');
         unlink($filename);
 
-        $ret = $tester->execute(array('filename' => array($filename)), array('decorated' => false));
+        $ret = $tester->execute(['filename' => [$filename]], ['decorated' => false]);
     }
 
     public function testLintFileCompileTimeException()
@@ -62,7 +62,7 @@ public function testLintFileCompileTimeException()
         $tester = $this->createCommandTester();
         $filename = $this->createFile("{{ 2|number_format(2, decimal_point='.', ',') }}");
 
-        $ret = $tester->execute(array('filename' => array($filename)), array('decorated' => false));
+        $ret = $tester->execute(['filename' => [$filename]], ['decorated' => false]);
 
         $this->assertEquals(1, $ret, 'Returns 1 in case of error');
         $this->assertRegExp('/ERROR  in \S+ \(line /', trim($tester->getDisplay()));
@@ -115,7 +115,7 @@ private function createFile($content)
 
     protected function setUp()
     {
-        $this->files = array();
+        $this->files = [];
     }
 
     protected function tearDown()
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3HorizontalLayoutTest.php
index 97311b38a93f9..9131216182a3d 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3HorizontalLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3HorizontalLayoutTest.php
@@ -17,7 +17,7 @@ public function testLabelOnForm()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType');
         $view = $form->createView();
-        $this->renderWidget($view, array('label' => 'foo'));
+        $this->renderWidget($view, ['label' => 'foo']);
         $html = $this->renderLabel($view);
 
         $this->assertMatchesXpath($html,
@@ -31,11 +31,11 @@ public function testLabelOnForm()
     public function testLabelDoesNotRenderFieldAttributes()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
-        $html = $this->renderLabel($form->createView(), null, array(
-            'attr' => array(
+        $html = $this->renderLabel($form->createView(), null, [
+            'attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -48,11 +48,11 @@ public function testLabelDoesNotRenderFieldAttributes()
     public function testLabelWithCustomAttributesPassedDirectly()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
-        $html = $this->renderLabel($form->createView(), null, array(
-            'label_attr' => array(
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -65,11 +65,11 @@ public function testLabelWithCustomAttributesPassedDirectly()
     public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
-        $html = $this->renderLabel($form->createView(), 'Custom label', array(
-            'label_attr' => array(
+        $html = $this->renderLabel($form->createView(), 'Custom label', [
+            'label_attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -82,14 +82,14 @@ public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
 
     public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
             'label' => 'Custom label',
-        ));
-        $html = $this->renderLabel($form->createView(), null, array(
-            'label_attr' => array(
+        ]);
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -102,10 +102,10 @@ public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly
 
     public function testStartTag()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'get',
             'action' => 'http://example.com/directory',
-        ));
+        ]);
 
         $html = $this->renderStart($form->createView());
 
@@ -114,25 +114,25 @@ public function testStartTag()
 
     public function testStartTagWithOverriddenVars()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'put',
             'action' => 'http://example.com/directory',
-        ));
+        ]);
 
-        $html = $this->renderStart($form->createView(), array(
+        $html = $this->renderStart($form->createView(), [
             'method' => 'post',
             'action' => 'http://foo.com/directory',
-        ));
+        ]);
 
         $this->assertSame('<form name="form" method="post" action="http://foo.com/directory" class="form-horizontal">', $html);
     }
 
     public function testStartTagForMultipartForm()
     {
-        $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                 'method' => 'get',
                 'action' => 'http://example.com/directory',
-            ))
+            ])
             ->add('file', 'Symfony\Component\Form\Extension\Core\Type\FileType')
             ->getForm();
 
@@ -143,14 +143,14 @@ public function testStartTagForMultipartForm()
 
     public function testStartTagWithExtraAttributes()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'get',
             'action' => 'http://example.com/directory',
-        ));
+        ]);
 
-        $html = $this->renderStart($form->createView(), array(
-            'attr' => array('class' => 'foobar'),
-        ));
+        $html = $this->renderStart($form->createView(), [
+            'attr' => ['class' => 'foobar'],
+        ]);
 
         $this->assertSame('<form name="form" method="get" action="http://example.com/directory" class="foobar form-horizontal">', $html);
     }
@@ -159,7 +159,7 @@ public function testCheckboxRow()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType');
         $view = $form->createView();
-        $html = $this->renderRow($view, array('label' => 'foo'));
+        $html = $this->renderRow($view, ['label' => 'foo']);
 
         $this->assertMatchesXpath($html, '/div[@class="form-group"]/div[@class="col-sm-2" or @class="col-sm-10"]', 2);
     }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
index 965295bfa75c9..ae62a40f604f7 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
@@ -20,7 +20,7 @@ public function testLabelOnForm()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType');
         $view = $form->createView();
-        $this->renderWidget($view, array('label' => 'foo'));
+        $this->renderWidget($view, ['label' => 'foo']);
         $html = $this->renderLabel($view);
 
         $this->assertMatchesXpath($html,
@@ -34,11 +34,11 @@ public function testLabelOnForm()
     public function testLabelDoesNotRenderFieldAttributes()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
-        $html = $this->renderLabel($form->createView(), null, array(
-            'attr' => array(
+        $html = $this->renderLabel($form->createView(), null, [
+            'attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -51,11 +51,11 @@ public function testLabelDoesNotRenderFieldAttributes()
     public function testLabelWithCustomAttributesPassedDirectly()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
-        $html = $this->renderLabel($form->createView(), null, array(
-            'label_attr' => array(
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -68,11 +68,11 @@ public function testLabelWithCustomAttributesPassedDirectly()
     public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
-        $html = $this->renderLabel($form->createView(), 'Custom label', array(
-            'label_attr' => array(
+        $html = $this->renderLabel($form->createView(), 'Custom label', [
+            'label_attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -85,14 +85,14 @@ public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
 
     public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
             'label' => 'Custom label',
-        ));
-        $html = $this->renderLabel($form->createView(), null, array(
-            'label_attr' => array(
+        ]);
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -158,7 +158,7 @@ public function testCheckedCheckbox()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', true);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
 '/div
     [@class="checkbox"]
     [
@@ -176,7 +176,7 @@ public function testUncheckedCheckbox()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', false);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
 '/div
     [@class="checkbox"]
     [
@@ -192,11 +192,11 @@ public function testUncheckedCheckbox()
 
     public function testCheckboxWithValue()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', false, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', false, [
             'value' => 'foo&bar',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
 '/div
     [@class="checkbox"]
     [
@@ -212,13 +212,13 @@ public function testCheckboxWithValue()
 
     public function testSingleChoice()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@name="name"]
     [@class="my&class form-control"]
@@ -234,14 +234,14 @@ public function testSingleChoice()
 
     public function testSingleChoiceAttributesWithMainAttributes()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => false,
-            'attr' => array('class' => 'bar&baz'),
-        ));
+            'attr' => ['class' => 'bar&baz'],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'bar&baz')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'bar&baz']],
 '/select
     [@name="name"]
     [@class="bar&baz form-control"]
@@ -257,14 +257,14 @@ public function testSingleChoiceAttributesWithMainAttributes()
 
     public function testSingleExpandedChoiceAttributesWithMainAttributes()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => true,
-            'attr' => array('class' => 'bar&baz'),
-        ));
+            'attr' => ['class' => 'bar&baz'],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'bar&baz')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'bar&baz']],
 '/div
     [@class="bar&baz"]
     [
@@ -294,14 +294,14 @@ public function testSingleExpandedChoiceAttributesWithMainAttributes()
 
     public function testSelectWithSizeBiggerThanOneCanBeRequired()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array(
-            'choices' => array('a', 'b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, [
+            'choices' => ['a', 'b'],
             'multiple' => false,
             'expanded' => false,
-            'attr' => array('size' => 2),
-        ));
+            'attr' => ['size' => 2],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => '')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => '']],
 '/select
     [@name="name"]
     [@required="required"]
@@ -313,14 +313,14 @@ public function testSelectWithSizeBiggerThanOneCanBeRequired()
 
     public function testSingleChoiceWithoutTranslation()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => false,
             'choice_translation_domain' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@name="name"]
     [@class="my&class form-control"]
@@ -336,16 +336,16 @@ public function testSingleChoiceWithoutTranslation()
 
     public function testSingleChoiceWithPlaceholderWithoutTranslation()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => false,
             'required' => false,
             'translation_domain' => false,
             'placeholder' => 'Placeholder&Not&Translated',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@name="name"]
     [@class="my&class form-control"]
@@ -362,14 +362,14 @@ public function testSingleChoiceWithPlaceholderWithoutTranslation()
 
     public function testSingleChoiceAttributes()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-            'choice_attr' => array('Choice&B' => array('class' => 'foo&bar')),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_attr' => ['Choice&B' => ['class' => 'foo&bar']],
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@name="name"]
     [@class="my&class form-control"]
@@ -385,14 +385,14 @@ public function testSingleChoiceAttributes()
 
     public function testSingleChoiceWithPreferred()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-            'preferred_choices' => array('&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'preferred_choices' => ['&b'],
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('separator' => '-- sep --', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['separator' => '-- sep --', 'attr' => ['class' => 'my&class']],
 '/select
     [@name="name"]
     [@class="my&class form-control"]
@@ -409,14 +409,14 @@ public function testSingleChoiceWithPreferred()
 
     public function testSingleChoiceWithPreferredAndNoSeparator()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-            'preferred_choices' => array('&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'preferred_choices' => ['&b'],
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('separator' => null, 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['separator' => null, 'attr' => ['class' => 'my&class']],
 '/select
     [@name="name"]
     [@class="my&class form-control"]
@@ -432,14 +432,14 @@ public function testSingleChoiceWithPreferredAndNoSeparator()
 
     public function testSingleChoiceWithPreferredAndBlankSeparator()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-            'preferred_choices' => array('&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'preferred_choices' => ['&b'],
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('separator' => '', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['separator' => '', 'attr' => ['class' => 'my&class']],
 '/select
     [@name="name"]
     [@class="my&class form-control"]
@@ -456,14 +456,14 @@ public function testSingleChoiceWithPreferredAndBlankSeparator()
 
     public function testChoiceWithOnlyPreferred()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-            'preferred_choices' => array('&a', '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'preferred_choices' => ['&a', '&b'],
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@class="my&class form-control"]
     [count(./option)=2]
@@ -473,14 +473,14 @@ public function testChoiceWithOnlyPreferred()
 
     public function testSingleChoiceNonRequired()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'required' => false,
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@name="name"]
     [@class="my&class form-control"]
@@ -497,14 +497,14 @@ public function testSingleChoiceNonRequired()
 
     public function testSingleChoiceNonRequiredNoneSelected()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'required' => false,
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@name="name"]
     [@class="my&class form-control"]
@@ -521,15 +521,15 @@ public function testSingleChoiceNonRequiredNoneSelected()
 
     public function testSingleChoiceNonRequiredWithPlaceholder()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => false,
             'required' => false,
             'placeholder' => 'Select&Anything&Not&Me',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@name="name"]
     [@class="my&class form-control"]
@@ -546,15 +546,15 @@ public function testSingleChoiceNonRequiredWithPlaceholder()
 
     public function testSingleChoiceRequiredWithPlaceholder()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'required' => true,
             'multiple' => false,
             'expanded' => false,
             'placeholder' => 'Test&Me',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@name="name"]
     [@class="my&class form-control"]
@@ -571,14 +571,14 @@ public function testSingleChoiceRequiredWithPlaceholder()
 
     public function testSingleChoiceRequiredWithPlaceholderViaView()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'required' => true,
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('placeholder' => '', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['placeholder' => '', 'attr' => ['class' => 'my&class']],
 '/select
     [@name="name"]
     [@class="my&class form-control"]
@@ -595,16 +595,16 @@ public function testSingleChoiceRequiredWithPlaceholderViaView()
 
     public function testSingleChoiceGrouped()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array(
-                'Group&1' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-                'Group&2' => array('Choice&C' => '&c'),
-            ),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => [
+                'Group&1' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+                'Group&2' => ['Choice&C' => '&c'],
+            ],
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@name="name"]
     [@class="my&class form-control"]
@@ -626,14 +626,14 @@ public function testSingleChoiceGrouped()
 
     public function testMultipleChoice()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'required' => true,
             'multiple' => true,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@name="name[]"]
     [@class="my&class form-control"]
@@ -650,15 +650,15 @@ public function testMultipleChoice()
 
     public function testMultipleChoiceAttributes()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-            'choice_attr' => array('Choice&B' => array('class' => 'foo&bar')),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_attr' => ['Choice&B' => ['class' => 'foo&bar']],
             'required' => true,
             'multiple' => true,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@name="name[]"]
     [@class="my&class form-control"]
@@ -675,14 +675,14 @@ public function testMultipleChoiceAttributes()
 
     public function testMultipleChoiceSkipsPlaceholder()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => true,
             'expanded' => false,
             'placeholder' => 'Test&Me',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@name="name[]"]
     [@class="my&class form-control"]
@@ -698,14 +698,14 @@ public function testMultipleChoiceSkipsPlaceholder()
 
     public function testMultipleChoiceNonRequired()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'required' => false,
             'multiple' => true,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@name="name[]"]
     [@class="my&class form-control"]
@@ -721,13 +721,13 @@ public function testMultipleChoiceNonRequired()
 
     public function testSingleChoiceExpanded()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -756,14 +756,14 @@ public function testSingleChoiceExpanded()
 
     public function testSingleChoiceExpandedWithLabelsAsFalse()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'choice_label' => false,
             'multiple' => false,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -790,8 +790,8 @@ public function testSingleChoiceExpandedWithLabelsAsFalse()
 
     public function testSingleChoiceExpandedWithLabelsSetByCallable()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
             'choice_label' => function ($choice, $label, $value) {
                 if ('&b' === $choice) {
                     return false;
@@ -801,9 +801,9 @@ public function testSingleChoiceExpandedWithLabelsSetByCallable()
             },
             'multiple' => false,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -840,16 +840,16 @@ public function testSingleChoiceExpandedWithLabelsSetByCallable()
 
     public function testSingleChoiceExpandedWithLabelsSetFalseByCallable()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'choice_label' => function () {
                 return false;
             },
             'multiple' => false,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -876,14 +876,14 @@ public function testSingleChoiceExpandedWithLabelsSetFalseByCallable()
 
     public function testSingleChoiceExpandedWithoutTranslation()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => true,
             'choice_translation_domain' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -912,14 +912,14 @@ public function testSingleChoiceExpandedWithoutTranslation()
 
     public function testSingleChoiceExpandedAttributes()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-            'choice_attr' => array('Choice&B' => array('class' => 'foo&bar')),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_attr' => ['Choice&B' => ['class' => 'foo&bar']],
             'multiple' => false,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -948,15 +948,15 @@ public function testSingleChoiceExpandedAttributes()
 
     public function testSingleChoiceExpandedWithPlaceholder()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => true,
             'placeholder' => 'Test&Me',
             'required' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -994,16 +994,16 @@ public function testSingleChoiceExpandedWithPlaceholder()
 
     public function testSingleChoiceExpandedWithPlaceholderWithoutTranslation()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => true,
             'required' => false,
             'choice_translation_domain' => false,
             'placeholder' => 'Placeholder&Not&Translated',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -1041,13 +1041,13 @@ public function testSingleChoiceExpandedWithPlaceholderWithoutTranslation()
 
     public function testSingleChoiceExpandedWithBooleanValue()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', true, array(
-            'choices' => array('Choice&A' => '1', 'Choice&B' => '0'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', true, [
+            'choices' => ['Choice&A' => '1', 'Choice&B' => '0'],
             'multiple' => false,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -1076,14 +1076,14 @@ public function testSingleChoiceExpandedWithBooleanValue()
 
     public function testMultipleChoiceExpanded()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a', '&c'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a', '&c'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
             'multiple' => true,
             'expanded' => true,
             'required' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -1121,14 +1121,14 @@ public function testMultipleChoiceExpanded()
 
     public function testMultipleChoiceExpandedWithLabelsAsFalse()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'choice_label' => false,
             'multiple' => true,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -1155,8 +1155,8 @@ public function testMultipleChoiceExpandedWithLabelsAsFalse()
 
     public function testMultipleChoiceExpandedWithLabelsSetByCallable()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
             'choice_label' => function ($choice, $label, $value) {
                 if ('&b' === $choice) {
                     return false;
@@ -1166,9 +1166,9 @@ public function testMultipleChoiceExpandedWithLabelsSetByCallable()
             },
             'multiple' => true,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
             '/div
     [
         ./div
@@ -1205,16 +1205,16 @@ public function testMultipleChoiceExpandedWithLabelsSetByCallable()
 
     public function testMultipleChoiceExpandedWithLabelsSetFalseByCallable()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'choice_label' => function () {
                 return false;
             },
             'multiple' => true,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -1241,15 +1241,15 @@ public function testMultipleChoiceExpandedWithLabelsSetFalseByCallable()
 
     public function testMultipleChoiceExpandedWithoutTranslation()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a', '&c'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a', '&c'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
             'multiple' => true,
             'expanded' => true,
             'required' => true,
             'choice_translation_domain' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -1287,15 +1287,15 @@ public function testMultipleChoiceExpandedWithoutTranslation()
 
     public function testMultipleChoiceExpandedAttributes()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a', '&c'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'),
-            'choice_attr' => array('Choice&B' => array('class' => 'foo&bar')),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a', '&c'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
+            'choice_attr' => ['Choice&B' => ['class' => 'foo&bar']],
             'multiple' => true,
             'expanded' => true,
             'required' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -1335,7 +1335,7 @@ public function testCountry()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CountryType', 'AT');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@name="name"]
     [@class="my&class form-control"]
@@ -1347,12 +1347,12 @@ public function testCountry()
 
     public function testCountryWithPlaceholder()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CountryType', 'AT', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CountryType', 'AT', [
             'placeholder' => 'Select&Country',
             'required' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@name="name"]
     [@class="my&class form-control"]
@@ -1365,12 +1365,12 @@ public function testCountryWithPlaceholder()
 
     public function testDateTime()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', date('Y').'-02-03 04:05:06', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', date('Y').'-02-03 04:05:06', [
             'input' => 'string',
             'with_seconds' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/div
     [
         ./select
@@ -1401,13 +1401,13 @@ public function testDateTime()
 
     public function testDateTimeWithPlaceholderGlobal()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', null, [
             'input' => 'string',
             'placeholder' => 'Change&Me',
             'required' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/div
     [@class="my&class form-inline"]
     [
@@ -1439,14 +1439,14 @@ public function testDateTimeWithPlaceholderGlobal()
 
     public function testDateTimeWithHourAndMinute()
     {
-        $data = array('year' => date('Y'), 'month' => '2', 'day' => '3', 'hour' => '4', 'minute' => '5');
+        $data = ['year' => date('Y'), 'month' => '2', 'day' => '3', 'hour' => '4', 'minute' => '5'];
 
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', $data, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', $data, [
             'input' => 'array',
             'required' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/div
     [@class="my&class form-inline"]
     [
@@ -1478,12 +1478,12 @@ public function testDateTimeWithHourAndMinute()
 
     public function testDateTimeWithSeconds()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', date('Y').'-02-03 04:05:06', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', date('Y').'-02-03 04:05:06', [
             'input' => 'string',
             'with_seconds' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/div
     [@class="my&class form-inline"]
     [
@@ -1519,13 +1519,13 @@ public function testDateTimeWithSeconds()
 
     public function testDateTimeSingleText()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', [
             'input' => 'string',
             'date_widget' => 'single_text',
             'time_widget' => 'single_text',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/div
     [@class="my&class form-inline"]
     [
@@ -1548,14 +1548,14 @@ public function testDateTimeSingleText()
 
     public function testDateTimeWithWidgetSingleText()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', [
             'input' => 'string',
             'widget' => 'single_text',
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="datetime-local"]
     [@name="name"]
@@ -1567,16 +1567,16 @@ public function testDateTimeWithWidgetSingleText()
 
     public function testDateTimeWithWidgetSingleTextIgnoreDateAndTimeWidgets()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', [
             'input' => 'string',
             'date_widget' => 'choice',
             'time_widget' => 'choice',
             'widget' => 'single_text',
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="datetime-local"]
     [@name="name"]
@@ -1588,12 +1588,12 @@ public function testDateTimeWithWidgetSingleTextIgnoreDateAndTimeWidgets()
 
     public function testDateChoice()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', date('Y').'-02-03', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', date('Y').'-02-03', [
             'input' => 'string',
             'widget' => 'choice',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/div
     [@class="my&class form-inline"]
     [
@@ -1617,14 +1617,14 @@ public function testDateChoice()
 
     public function testDateChoiceWithPlaceholderGlobal()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', null, [
             'input' => 'string',
             'widget' => 'choice',
             'placeholder' => 'Change&Me',
             'required' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/div
     [@class="my&class form-inline"]
     [
@@ -1648,14 +1648,14 @@ public function testDateChoiceWithPlaceholderGlobal()
 
     public function testDateChoiceWithPlaceholderOnYear()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', null, [
             'input' => 'string',
             'widget' => 'choice',
             'required' => false,
-            'placeholder' => array('year' => 'Change&Me'),
-        ));
+            'placeholder' => ['year' => 'Change&Me'],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/div
     [@class="my&class form-inline"]
     [
@@ -1679,12 +1679,12 @@ public function testDateChoiceWithPlaceholderOnYear()
 
     public function testDateText()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', '2011-02-03', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', '2011-02-03', [
             'input' => 'string',
             'widget' => 'text',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/div
     [@class="my&class form-inline"]
     [
@@ -1711,12 +1711,12 @@ public function testDateText()
 
     public function testDateSingleText()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', '2011-02-03', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', '2011-02-03', [
             'input' => 'string',
             'widget' => 'single_text',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="date"]
     [@name="name"]
@@ -1728,11 +1728,11 @@ public function testDateSingleText()
 
     public function testBirthDay()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\BirthdayType', '2000-02-03', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\BirthdayType', '2000-02-03', [
             'input' => 'string',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/div
     [@class="my&class form-inline"]
     [
@@ -1756,13 +1756,13 @@ public function testBirthDay()
 
     public function testBirthDayWithPlaceholder()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\BirthdayType', '1950-01-01', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\BirthdayType', '1950-01-01', [
             'input' => 'string',
             'placeholder' => '',
             'required' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/div
     [@class="my&class form-inline"]
     [
@@ -1791,7 +1791,7 @@ public function testEmail()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\EmailType', 'foo&bar');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="email"]
     [@name="name"]
@@ -1804,11 +1804,11 @@ public function testEmail()
 
     public function testEmailWithMaxLength()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\EmailType', 'foo&bar', array(
-            'attr' => array('maxlength' => 123),
-        ));
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\EmailType', 'foo&bar', [
+            'attr' => ['maxlength' => 123],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="email"]
     [@name="name"]
@@ -1823,7 +1823,7 @@ public function testHidden()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\HiddenType', 'foo&bar');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="hidden"]
     [@name="name"]
@@ -1835,11 +1835,11 @@ public function testHidden()
 
     public function testDisabled()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
             'disabled' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="text"]
     [@name="name"]
@@ -1853,7 +1853,7 @@ public function testInteger()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\IntegerType', 123);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="number"]
     [@name="name"]
@@ -1867,7 +1867,7 @@ public function testLanguage()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\LanguageType', 'de');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@name="name"]
     [@class="my&class form-control"]
@@ -1881,7 +1881,7 @@ public function testLocale()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\LocaleType', 'de_AT');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@name="name"]
     [@class="my&class form-control"]
@@ -1893,11 +1893,11 @@ public function testLocale()
 
     public function testMoney()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\MoneyType', 1234.56, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\MoneyType', 1234.56, [
             'currency' => 'EUR',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
 '/div
     [@class="input-group"]
     [
@@ -1917,11 +1917,11 @@ public function testMoney()
 
     public function testMoneyWithoutCurrency()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\MoneyType', 1234.56, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\MoneyType', 1234.56, [
             'currency' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
 '/input
     [@id="my&id"]
     [@type="text"]
@@ -1938,7 +1938,7 @@ public function testNumber()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\NumberType', 1234.56);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="text"]
     [@name="name"]
@@ -1952,7 +1952,7 @@ public function testPassword()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', 'foo&bar');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="password"]
     [@name="name"]
@@ -1963,12 +1963,12 @@ public function testPassword()
 
     public function testPasswordSubmittedWithNotAlwaysEmpty()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', null, [
             'always_empty' => false,
-        ));
+        ]);
         $form->submit('foo&bar');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="password"]
     [@name="name"]
@@ -1980,11 +1980,11 @@ public function testPasswordSubmittedWithNotAlwaysEmpty()
 
     public function testPasswordWithMaxLength()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', 'foo&bar', array(
-            'attr' => array('maxlength' => 123),
-        ));
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', 'foo&bar', [
+            'attr' => ['maxlength' => 123],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="password"]
     [@name="name"]
@@ -1998,7 +1998,7 @@ public function testPercent()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PercentType', 0.1);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
 '/div
     [@class="input-group"]
     [
@@ -2020,7 +2020,7 @@ public function testCheckedRadio()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RadioType', true);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
 '/div
     [@class="radio"]
     [
@@ -2044,7 +2044,7 @@ public function testUncheckedRadio()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RadioType', false);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
 '/div
     [@class="radio"]
     [
@@ -2065,11 +2065,11 @@ public function testUncheckedRadio()
 
     public function testRadioWithValue()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RadioType', false, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RadioType', false, [
             'value' => 'foo&bar',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
 '/div
     [@class="radio"]
     [
@@ -2090,9 +2090,9 @@ public function testRadioWithValue()
 
     public function testRange()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RangeType', 42, array('attr' => array('min' => 5)));
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RangeType', 42, ['attr' => ['min' => 5]]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="range"]
     [@name="name"]
@@ -2105,9 +2105,9 @@ public function testRange()
 
     public function testRangeWithMinMaxValues()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RangeType', 42, array('attr' => array('min' => 5, 'max' => 57)));
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RangeType', 42, ['attr' => ['min' => 5, 'max' => 57]]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="range"]
     [@name="name"]
@@ -2121,11 +2121,11 @@ public function testRangeWithMinMaxValues()
 
     public function testTextarea()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextareaType', 'foo&bar', array(
-            'attr' => array('pattern' => 'foo'),
-        ));
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextareaType', 'foo&bar', [
+            'attr' => ['pattern' => 'foo'],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/textarea
     [@name="name"]
     [@pattern="foo"]
@@ -2139,7 +2139,7 @@ public function testText()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'foo&bar');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="text"]
     [@name="name"]
@@ -2152,11 +2152,11 @@ public function testText()
 
     public function testTextWithMaxLength()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'foo&bar', array(
-            'attr' => array('maxlength' => 123),
-        ));
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'foo&bar', [
+            'attr' => ['maxlength' => 123],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="text"]
     [@name="name"]
@@ -2171,7 +2171,7 @@ public function testSearch()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\SearchType', 'foo&bar');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="search"]
     [@name="name"]
@@ -2184,12 +2184,12 @@ public function testSearch()
 
     public function testTime()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', [
             'input' => 'string',
             'with_seconds' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/div
     [@class="my&class form-inline"]
     [
@@ -2211,12 +2211,12 @@ public function testTime()
 
     public function testTimeWithSeconds()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', [
             'input' => 'string',
             'with_seconds' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/div
     [@class="my&class form-inline"]
     [
@@ -2246,12 +2246,12 @@ public function testTimeWithSeconds()
 
     public function testTimeText()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', [
             'input' => 'string',
             'widget' => 'text',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/div
     [@class="my&class form-inline"]
     [
@@ -2279,12 +2279,12 @@ public function testTimeText()
 
     public function testTimeSingleText()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', [
             'input' => 'string',
             'widget' => 'single_text',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="time"]
     [@name="name"]
@@ -2297,13 +2297,13 @@ public function testTimeSingleText()
 
     public function testTimeWithPlaceholderGlobal()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', null, [
             'input' => 'string',
             'placeholder' => 'Change&Me',
             'required' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/div
     [@class="my&class form-inline"]
     [
@@ -2324,13 +2324,13 @@ public function testTimeWithPlaceholderGlobal()
 
     public function testTimeWithPlaceholderOnYear()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', null, [
             'input' => 'string',
             'required' => false,
-            'placeholder' => array('hour' => 'Change&Me'),
-        ));
+            'placeholder' => ['hour' => 'Change&Me'],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/div
     [@class="my&class form-inline"]
     [
@@ -2353,7 +2353,7 @@ public function testTimezone()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimezoneType', 'Europe/Vienna');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@name="name"]
     [@class="my&class form-control"]
@@ -2370,12 +2370,12 @@ public function testTimezone()
 
     public function testTimezoneWithPlaceholder()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimezoneType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimezoneType', null, [
             'placeholder' => 'Select&Timezone',
             'required' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@class="my&class form-control"]
     [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Select&Timezone[/trans]"]]
@@ -2390,7 +2390,7 @@ public function testUrl()
         $url = 'http://www.google.com?foo1=bar1&foo2=bar2';
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\UrlType', $url);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/input
     [@type="url"]
     [@name="name"]
@@ -2404,18 +2404,18 @@ public function testButton()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ButtonType');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
             '/button[@type="button"][@name="name"][.="[trans]Name[/trans]"][@class="my&class btn"]'
         );
     }
 
     public function testButtonlabelWithoutTranslation()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ButtonType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ButtonType', null, [
             'translation_domain' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
             '/button[@type="button"][@name="name"][.="Name"][@class="my&class btn"]'
         );
     }
@@ -2424,7 +2424,7 @@ public function testSubmit()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\SubmitType');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
             '/button[@type="submit"][@name="name"][@class="my&class btn"]'
         );
     }
@@ -2433,18 +2433,18 @@ public function testReset()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ResetType');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
             '/button[@type="reset"][@name="name"][@class="my&class btn"]'
         );
     }
 
     public function testWidgetAttributes()
     {
-        $form = $this->factory->createNamed('text', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'value', array(
+        $form = $this->factory->createNamed('text', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'value', [
             'required' => true,
             'disabled' => true,
-            'attr' => array('readonly' => true, 'maxlength' => 10, 'pattern' => '\d+', 'class' => 'foobar', 'data-foo' => 'bar'),
-        ));
+            'attr' => ['readonly' => true, 'maxlength' => 10, 'pattern' => '\d+', 'class' => 'foobar', 'data-foo' => 'bar'],
+        ]);
 
         $html = $this->renderWidget($form->createView());
 
@@ -2454,9 +2454,9 @@ public function testWidgetAttributes()
 
     public function testWidgetAttributeNameRepeatedIfTrue()
     {
-        $form = $this->factory->createNamed('text', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'value', array(
-            'attr' => array('foo' => true),
-        ));
+        $form = $this->factory->createNamed('text', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'value', [
+            'attr' => ['foo' => true],
+        ]);
 
         $html = $this->renderWidget($form->createView());
 
@@ -2466,10 +2466,10 @@ public function testWidgetAttributeNameRepeatedIfTrue()
 
     public function testButtonAttributes()
     {
-        $form = $this->factory->createNamed('button', 'Symfony\Component\Form\Extension\Core\Type\ButtonType', null, array(
+        $form = $this->factory->createNamed('button', 'Symfony\Component\Form\Extension\Core\Type\ButtonType', null, [
             'disabled' => true,
-            'attr' => array('class' => 'foobar', 'data-foo' => 'bar'),
-        ));
+            'attr' => ['class' => 'foobar', 'data-foo' => 'bar'],
+        ]);
 
         $html = $this->renderWidget($form->createView());
 
@@ -2479,9 +2479,9 @@ public function testButtonAttributes()
 
     public function testButtonAttributeNameRepeatedIfTrue()
     {
-        $form = $this->factory->createNamed('button', 'Symfony\Component\Form\Extension\Core\Type\ButtonType', null, array(
-            'attr' => array('foo' => true),
-        ));
+        $form = $this->factory->createNamed('button', 'Symfony\Component\Form\Extension\Core\Type\ButtonType', null, [
+            'attr' => ['foo' => true],
+        ]);
 
         $html = $this->renderWidget($form->createView());
 
@@ -2494,7 +2494,7 @@ public function testTel()
         $tel = '0102030405';
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TelType', $tel);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
             '/input
     [@type="tel"]
     [@name="name"]
@@ -2509,7 +2509,7 @@ public function testColor()
         $color = '#0000ff';
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ColorType', $color);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
             '/input
     [@type="color"]
     [@name="name"]
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTest.php
index 9d216e38194f2..51a1360f63f4d 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTest.php
@@ -49,7 +49,7 @@ public function testLabelOnForm()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType');
         $view = $form->createView();
-        $this->renderWidget($view, array('label' => 'foo'));
+        $this->renderWidget($view, ['label' => 'foo']);
         $html = $this->renderLabel($view);
 
         $this->assertMatchesXpath($html,
@@ -63,11 +63,11 @@ public function testLabelOnForm()
     public function testLabelDoesNotRenderFieldAttributes()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
-        $html = $this->renderLabel($form->createView(), null, array(
-            'attr' => array(
+        $html = $this->renderLabel($form->createView(), null, [
+            'attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -80,11 +80,11 @@ public function testLabelDoesNotRenderFieldAttributes()
     public function testLabelWithCustomAttributesPassedDirectly()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
-        $html = $this->renderLabel($form->createView(), null, array(
-            'label_attr' => array(
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -97,11 +97,11 @@ public function testLabelWithCustomAttributesPassedDirectly()
     public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
-        $html = $this->renderLabel($form->createView(), 'Custom label', array(
-            'label_attr' => array(
+        $html = $this->renderLabel($form->createView(), 'Custom label', [
+            'label_attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -114,14 +114,14 @@ public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
 
     public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
             'label' => 'Custom label',
-        ));
-        $html = $this->renderLabel($form->createView(), null, array(
-            'label_attr' => array(
+        ]);
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -134,11 +134,11 @@ public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly
 
     public function testLegendOnExpandedType()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, [
             'label' => 'Custom label',
             'expanded' => true,
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-        ));
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+        ]);
         $view = $form->createView();
         $this->renderWidget($view);
         $html = $this->renderLabel($view);
@@ -153,10 +153,10 @@ public function testLegendOnExpandedType()
 
     public function testStartTag()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'get',
             'action' => 'http://example.com/directory',
-        ));
+        ]);
 
         $html = $this->renderStart($form->createView());
 
@@ -165,25 +165,25 @@ public function testStartTag()
 
     public function testStartTagWithOverriddenVars()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'put',
             'action' => 'http://example.com/directory',
-        ));
+        ]);
 
-        $html = $this->renderStart($form->createView(), array(
+        $html = $this->renderStart($form->createView(), [
             'method' => 'post',
             'action' => 'http://foo.com/directory',
-        ));
+        ]);
 
         $this->assertSame('<form name="form" method="post" action="http://foo.com/directory">', $html);
     }
 
     public function testStartTagForMultipartForm()
     {
-        $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                 'method' => 'get',
                 'action' => 'http://example.com/directory',
-            ))
+            ])
             ->add('file', 'Symfony\Component\Form\Extension\Core\Type\FileType')
             ->getForm();
 
@@ -194,14 +194,14 @@ public function testStartTagForMultipartForm()
 
     public function testStartTagWithExtraAttributes()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'get',
             'action' => 'http://example.com/directory',
-        ));
+        ]);
 
-        $html = $this->renderStart($form->createView(), array(
-            'attr' => array('class' => 'foobar'),
-        ));
+        $html = $this->renderStart($form->createView(), [
+            'attr' => ['class' => 'foobar'],
+        ]);
 
         $this->assertSame('<form name="form" method="get" action="http://example.com/directory" class="foobar">', $html);
     }
@@ -210,7 +210,7 @@ public function testCheckboxRow()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType');
         $view = $form->createView();
-        $html = $this->renderRow($view, array('label' => 'foo'));
+        $html = $this->renderRow($view, ['label' => 'foo']);
 
         $this->assertMatchesXpath($html, '/div[@class="form-group row"]/div[@class="col-sm-2" or @class="col-sm-10"]', 2);
     }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php
index 1d8c597920ce5..a8ebc0adb09d8 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php
@@ -58,7 +58,7 @@ public function testLabelOnForm()
     {
         $form = $this->factory->createNamed('name', DateType::class);
         $view = $form->createView();
-        $this->renderWidget($view, array('label' => 'foo'));
+        $this->renderWidget($view, ['label' => 'foo']);
         $html = $this->renderLabel($view);
 
         $this->assertMatchesXpath($html,
@@ -72,11 +72,11 @@ public function testLabelOnForm()
     public function testLabelDoesNotRenderFieldAttributes()
     {
         $form = $this->factory->createNamed('name', TextType::class);
-        $html = $this->renderLabel($form->createView(), null, array(
-            'attr' => array(
+        $html = $this->renderLabel($form->createView(), null, [
+            'attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -89,11 +89,11 @@ public function testLabelDoesNotRenderFieldAttributes()
     public function testLabelWithCustomAttributesPassedDirectly()
     {
         $form = $this->factory->createNamed('name', TextType::class);
-        $html = $this->renderLabel($form->createView(), null, array(
-            'label_attr' => array(
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -106,11 +106,11 @@ public function testLabelWithCustomAttributesPassedDirectly()
     public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
     {
         $form = $this->factory->createNamed('name', TextType::class);
-        $html = $this->renderLabel($form->createView(), 'Custom label', array(
-            'label_attr' => array(
+        $html = $this->renderLabel($form->createView(), 'Custom label', [
+            'label_attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -123,14 +123,14 @@ public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
 
     public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly()
     {
-        $form = $this->factory->createNamed('name', TextType::class, null, array(
+        $form = $this->factory->createNamed('name', TextType::class, null, [
             'label' => 'Custom label',
-        ));
-        $html = $this->renderLabel($form->createView(), null, array(
-            'label_attr' => array(
+        ]);
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -143,11 +143,11 @@ public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly
 
     public function testLegendOnExpandedType()
     {
-        $form = $this->factory->createNamed('name', ChoiceType::class, null, array(
+        $form = $this->factory->createNamed('name', ChoiceType::class, null, [
             'label' => 'Custom label',
             'expanded' => true,
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-        ));
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+        ]);
         $view = $form->createView();
         $this->renderWidget($view);
         $html = $this->renderLabel($view);
@@ -187,7 +187,7 @@ public function testErrors()
 
     public function testErrorWithNoLabel()
     {
-        $form = $this->factory->createNamed('name', TextType::class, array('label' => false));
+        $form = $this->factory->createNamed('name', TextType::class, ['label' => false]);
         $form->addError(new FormError('[trans]Error 1[/trans]'));
         $view = $form->createView();
         $html = $this->renderLabel($view);
@@ -199,7 +199,7 @@ public function testCheckedCheckbox()
     {
         $form = $this->factory->createNamed('name', CheckboxType::class, true);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
 '/div
     [@class="form-check"]
     [
@@ -214,14 +214,14 @@ public function testCheckedCheckbox()
 
     public function testSingleChoiceAttributesWithMainAttributes()
     {
-        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => false,
-            'attr' => array('class' => 'bar&baz'),
-        ));
+            'attr' => ['class' => 'bar&baz'],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'bar&baz')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'bar&baz']],
 '/select
     [@name="name"]
     [@class="bar&baz form-control"]
@@ -237,14 +237,14 @@ public function testSingleChoiceAttributesWithMainAttributes()
 
     public function testSingleExpandedChoiceAttributesWithMainAttributes()
     {
-        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => true,
-            'attr' => array('class' => 'bar&baz'),
-        ));
+            'attr' => ['class' => 'bar&baz'],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'bar&baz')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'bar&baz']],
 '/div
     [@class="bar&baz"]
     [
@@ -272,7 +272,7 @@ public function testUncheckedCheckbox()
     {
         $form = $this->factory->createNamed('name', CheckboxType::class, false);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
 '/div
     [@class="form-check"]
     [
@@ -286,11 +286,11 @@ public function testUncheckedCheckbox()
 
     public function testCheckboxWithValue()
     {
-        $form = $this->factory->createNamed('name', CheckboxType::class, false, array(
+        $form = $this->factory->createNamed('name', CheckboxType::class, false, [
             'value' => 'foo&bar',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
 '/div
     [@class="form-check"]
     [
@@ -304,13 +304,13 @@ public function testCheckboxWithValue()
 
     public function testSingleChoiceExpanded()
     {
-        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -335,14 +335,14 @@ public function testSingleChoiceExpanded()
 
     public function testSingleChoiceExpandedWithLabelsAsFalse()
     {
-        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'choice_label' => false,
             'multiple' => false,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -365,8 +365,8 @@ public function testSingleChoiceExpandedWithLabelsAsFalse()
 
     public function testSingleChoiceExpandedWithLabelsSetByCallable()
     {
-        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'),
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
             'choice_label' => function ($choice, $label, $value) {
                 if ('&b' === $choice) {
                     return false;
@@ -376,9 +376,9 @@ public function testSingleChoiceExpandedWithLabelsSetByCallable()
             },
             'multiple' => false,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -409,16 +409,16 @@ public function testSingleChoiceExpandedWithLabelsSetByCallable()
 
     public function testSingleChoiceExpandedWithLabelsSetFalseByCallable()
     {
-        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'choice_label' => function () {
                 return false;
             },
             'multiple' => false,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -441,14 +441,14 @@ public function testSingleChoiceExpandedWithLabelsSetFalseByCallable()
 
     public function testSingleChoiceExpandedWithoutTranslation()
     {
-        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => true,
             'choice_translation_domain' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -473,14 +473,14 @@ public function testSingleChoiceExpandedWithoutTranslation()
 
     public function testSingleChoiceExpandedAttributes()
     {
-        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-            'choice_attr' => array('Choice&B' => array('class' => 'foo&bar')),
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_attr' => ['Choice&B' => ['class' => 'foo&bar']],
             'multiple' => false,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -505,15 +505,15 @@ public function testSingleChoiceExpandedAttributes()
 
     public function testSingleChoiceExpandedWithPlaceholder()
     {
-        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => true,
             'placeholder' => 'Test&Me',
             'required' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -545,16 +545,16 @@ public function testSingleChoiceExpandedWithPlaceholder()
 
     public function testSingleChoiceExpandedWithPlaceholderWithoutTranslation()
     {
-        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => true,
             'required' => false,
             'choice_translation_domain' => false,
             'placeholder' => 'Placeholder&Not&Translated',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -586,13 +586,13 @@ public function testSingleChoiceExpandedWithPlaceholderWithoutTranslation()
 
     public function testSingleChoiceExpandedWithBooleanValue()
     {
-        $form = $this->factory->createNamed('name', ChoiceType::class, true, array(
-            'choices' => array('Choice&A' => '1', 'Choice&B' => '0'),
+        $form = $this->factory->createNamed('name', ChoiceType::class, true, [
+            'choices' => ['Choice&A' => '1', 'Choice&B' => '0'],
             'multiple' => false,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -617,14 +617,14 @@ public function testSingleChoiceExpandedWithBooleanValue()
 
     public function testMultipleChoiceExpanded()
     {
-        $form = $this->factory->createNamed('name', ChoiceType::class, array('&a', '&c'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'),
+        $form = $this->factory->createNamed('name', ChoiceType::class, ['&a', '&c'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
             'multiple' => true,
             'expanded' => true,
             'required' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -656,14 +656,14 @@ public function testMultipleChoiceExpanded()
 
     public function testMultipleChoiceExpandedWithLabelsAsFalse()
     {
-        $form = $this->factory->createNamed('name', ChoiceType::class, array('&a'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', ChoiceType::class, ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'choice_label' => false,
             'multiple' => true,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -686,8 +686,8 @@ public function testMultipleChoiceExpandedWithLabelsAsFalse()
 
     public function testMultipleChoiceExpandedWithLabelsSetByCallable()
     {
-        $form = $this->factory->createNamed('name', ChoiceType::class, array('&a'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'),
+        $form = $this->factory->createNamed('name', ChoiceType::class, ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
             'choice_label' => function ($choice, $label, $value) {
                 if ('&b' === $choice) {
                     return false;
@@ -697,9 +697,9 @@ public function testMultipleChoiceExpandedWithLabelsSetByCallable()
             },
             'multiple' => true,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
             '/div
     [
         ./div
@@ -730,16 +730,16 @@ public function testMultipleChoiceExpandedWithLabelsSetByCallable()
 
     public function testMultipleChoiceExpandedWithLabelsSetFalseByCallable()
     {
-        $form = $this->factory->createNamed('name', ChoiceType::class, array('&a'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', ChoiceType::class, ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'choice_label' => function () {
                 return false;
             },
             'multiple' => true,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -762,15 +762,15 @@ public function testMultipleChoiceExpandedWithLabelsSetFalseByCallable()
 
     public function testMultipleChoiceExpandedWithoutTranslation()
     {
-        $form = $this->factory->createNamed('name', ChoiceType::class, array('&a', '&c'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'),
+        $form = $this->factory->createNamed('name', ChoiceType::class, ['&a', '&c'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
             'multiple' => true,
             'expanded' => true,
             'required' => true,
             'choice_translation_domain' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -802,15 +802,15 @@ public function testMultipleChoiceExpandedWithoutTranslation()
 
     public function testMultipleChoiceExpandedAttributes()
     {
-        $form = $this->factory->createNamed('name', ChoiceType::class, array('&a', '&c'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'),
-            'choice_attr' => array('Choice&B' => array('class' => 'foo&bar')),
+        $form = $this->factory->createNamed('name', ChoiceType::class, ['&a', '&c'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
+            'choice_attr' => ['Choice&B' => ['class' => 'foo&bar']],
             'multiple' => true,
             'expanded' => true,
             'required' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -844,7 +844,7 @@ public function testCheckedRadio()
     {
         $form = $this->factory->createNamed('name', RadioType::class, true);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
 '/div
     [@class="form-check"]
     [
@@ -866,7 +866,7 @@ public function testUncheckedRadio()
     {
         $form = $this->factory->createNamed('name', RadioType::class, false);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
 '/div
     [@class="form-check"]
     [
@@ -885,11 +885,11 @@ public function testUncheckedRadio()
 
     public function testRadioWithValue()
     {
-        $form = $this->factory->createNamed('name', RadioType::class, false, array(
+        $form = $this->factory->createNamed('name', RadioType::class, false, [
             'value' => 'foo&bar',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
 '/div
     [@class="form-check"]
     [
@@ -909,9 +909,9 @@ public function testRadioWithValue()
 
     public function testButtonAttributeNameRepeatedIfTrue()
     {
-        $form = $this->factory->createNamed('button', ButtonType::class, null, array(
-            'attr' => array('foo' => true),
-        ));
+        $form = $this->factory->createNamed('button', ButtonType::class, null, [
+            'attr' => ['foo' => true],
+        ]);
 
         $html = $this->renderWidget($form->createView());
 
@@ -932,11 +932,11 @@ public function testFile()
 
     public function testMoney()
     {
-        $form = $this->factory->createNamed('name', MoneyType::class, 1234.56, array(
+        $form = $this->factory->createNamed('name', MoneyType::class, 1234.56, [
             'currency' => 'EUR',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
             '/div
     [@class="input-group"]
     [
@@ -962,7 +962,7 @@ public function testPercent()
     {
         $form = $this->factory->createNamed('name', PercentType::class, 0.1);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'my&id', 'attr' => array('class' => 'my&class')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
             '/div
     [@class="input-group"]
     [
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/CodeExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/CodeExtensionTest.php
index 336991c6ca9f2..a637117f0933f 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/CodeExtensionTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/CodeExtensionTest.php
@@ -41,20 +41,20 @@ public function testGettingMethodAbbreviation($method, $abbr)
 
     public function getClassNameProvider()
     {
-        return array(
-            array('F\Q\N\Foo', '<abbr title="F\Q\N\Foo">Foo</abbr>'),
-            array('Bare', '<abbr title="Bare">Bare</abbr>'),
-        );
+        return [
+            ['F\Q\N\Foo', '<abbr title="F\Q\N\Foo">Foo</abbr>'],
+            ['Bare', '<abbr title="Bare">Bare</abbr>'],
+        ];
     }
 
     public function getMethodNameProvider()
     {
-        return array(
-            array('F\Q\N\Foo::Method', '<abbr title="F\Q\N\Foo">Foo</abbr>::Method()'),
-            array('Bare::Method', '<abbr title="Bare">Bare</abbr>::Method()'),
-            array('Closure', '<abbr title="Closure">Closure</abbr>'),
-            array('Method', '<abbr title="Method">Method</abbr>()'),
-        );
+        return [
+            ['F\Q\N\Foo::Method', '<abbr title="F\Q\N\Foo">Foo</abbr>::Method()'],
+            ['Bare::Method', '<abbr title="Bare">Bare</abbr>::Method()'],
+            ['Closure', '<abbr title="Closure">Closure</abbr>'],
+            ['Method', '<abbr title="Method">Method</abbr>()'],
+        ];
     }
 
     public function testGetName()
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
index 1522928a6c419..c41eda406ebb0 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
@@ -27,11 +27,11 @@ class DumpExtensionTest extends TestCase
     public function testDumpTag($template, $debug, $expectedOutput, $expectedDumped)
     {
         $extension = new DumpExtension(new VarCloner());
-        $twig = new Environment(new ArrayLoader(array('template' => $template)), array(
+        $twig = new Environment(new ArrayLoader(['template' => $template]), [
             'debug' => $debug,
             'cache' => false,
             'optimizations' => 0,
-        ));
+        ]);
         $twig->addExtension($extension);
 
         $dumped = null;
@@ -54,11 +54,11 @@ public function testDumpTag($template, $debug, $expectedOutput, $expectedDumped)
 
     public function getDumpTags()
     {
-        return array(
-            array('A{% dump %}B', true, 'AB', array()),
-            array('A{% set foo="bar"%}B{% dump %}C', true, 'ABC', array('foo' => 'bar')),
-            array('A{% dump %}B', false, 'AB', null),
-        );
+        return [
+            ['A{% dump %}B', true, 'AB', []],
+            ['A{% set foo="bar"%}B{% dump %}C', true, 'ABC', ['foo' => 'bar']],
+            ['A{% dump %}B', false, 'AB', null],
+        ];
     }
 
     /**
@@ -88,24 +88,24 @@ public function testDump($context, $args, $expectedOutput, $debug = true)
 
     public function getDumpArgs()
     {
-        return array(
-            array(array(), array(), '', false),
-            array(array(), array(), "<pre class=sf-dump id=sf-dump data-indent-pad=\"  \">[]\n</pre><script>Sfdump(\"sf-dump\")</script>\n"),
-            array(
-                array(),
-                array(123, 456),
+        return [
+            [[], [], '', false],
+            [[], [], "<pre class=sf-dump id=sf-dump data-indent-pad=\"  \">[]\n</pre><script>Sfdump(\"sf-dump\")</script>\n"],
+            [
+                [],
+                [123, 456],
                 "<pre class=sf-dump id=sf-dump data-indent-pad=\"  \"><span class=sf-dump-num>123</span>\n</pre><script>Sfdump(\"sf-dump\")</script>\n"
                 ."<pre class=sf-dump id=sf-dump data-indent-pad=\"  \"><span class=sf-dump-num>456</span>\n</pre><script>Sfdump(\"sf-dump\")</script>\n",
-            ),
-            array(
-                array('foo' => 'bar'),
-                array(),
+            ],
+            [
+                ['foo' => 'bar'],
+                [],
                 "<pre class=sf-dump id=sf-dump data-indent-pad=\"  \"><span class=sf-dump-note>array:1</span> [<samp>\n"
                 ."  \"<span class=sf-dump-key>foo</span>\" => \"<span class=sf-dump-str title=\"3 characters\">bar</span>\"\n"
                 ."</samp>]\n"
                 ."</pre><script>Sfdump(\"sf-dump\")</script>\n",
-            ),
-        );
+            ],
+        ];
     }
 
     public function testCustomDumper()
@@ -123,13 +123,13 @@ public function testCustomDumper()
             '</pre><script>Sfdump("%s")</script>'
         );
         $extension = new DumpExtension(new VarCloner(), $dumper);
-        $twig = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), array(
+        $twig = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), [
             'debug' => true,
             'cache' => false,
             'optimizations' => 0,
-        ));
+        ]);
 
-        $dump = $extension->dump($twig, array(), 'foo');
+        $dump = $extension->dump($twig, [], 'foo');
         $dump = preg_replace('/sf-dump-\d+/', 'sf-dump', $dump);
 
         $this->assertEquals(
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/ExpressionExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/ExpressionExtensionTest.php
index b2ee22c6a969b..bfb9c578bbc95 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/ExpressionExtensionTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/ExpressionExtensionTest.php
@@ -21,7 +21,7 @@ class ExpressionExtensionTest extends TestCase
     public function testExpressionCreation()
     {
         $template = "{{ expression('1 == 1') }}";
-        $twig = new Environment(new ArrayLoader(array('template' => $template)), array('debug' => true, 'cache' => false, 'autoescape' => 'html', 'optimizations' => 0));
+        $twig = new Environment(new ArrayLoader(['template' => $template]), ['debug' => true, 'cache' => false, 'autoescape' => 'html', 'optimizations' => 0]);
         $twig->addExtension(new ExpressionExtension());
 
         $output = $twig->render('template');
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
index 56690a7e9bf50..02f6ac9b1e269 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
@@ -24,9 +24,9 @@ class FormExtensionBootstrap3HorizontalLayoutTest extends AbstractBootstrap3Hori
 {
     use RuntimeLoaderProvider;
 
-    protected $testableFeatures = array(
+    protected $testableFeatures = [
         'choice_attr',
-    );
+    ];
 
     /**
      * @var FormRenderer
@@ -37,32 +37,32 @@ protected function setUp()
     {
         parent::setUp();
 
-        $loader = new StubFilesystemLoader(array(
+        $loader = new StubFilesystemLoader([
             __DIR__.'/../../Resources/views/Form',
             __DIR__.'/Fixtures/templates/form',
-        ));
+        ]);
 
-        $environment = new Environment($loader, array('strict_variables' => true));
+        $environment = new Environment($loader, ['strict_variables' => true]);
         $environment->addExtension(new TranslationExtension(new StubTranslator()));
         $environment->addExtension(new FormExtension());
 
-        $rendererEngine = new TwigRendererEngine(array(
+        $rendererEngine = new TwigRendererEngine([
             'bootstrap_3_horizontal_layout.html.twig',
             'custom_widgets.html.twig',
-        ), $environment);
+        ], $environment);
         $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
         $this->registerTwigRuntimeLoader($environment, $this->renderer);
     }
 
-    protected function renderForm(FormView $view, array $vars = array())
+    protected function renderForm(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->renderBlock($view, 'form', $vars);
     }
 
-    protected function renderLabel(FormView $view, $label = null, array $vars = array())
+    protected function renderLabel(FormView $view, $label = null, array $vars = [])
     {
         if (null !== $label) {
-            $vars += array('label' => $label);
+            $vars += ['label' => $label];
         }
 
         return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
@@ -73,27 +73,27 @@ protected function renderErrors(FormView $view)
         return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
     }
 
-    protected function renderWidget(FormView $view, array $vars = array())
+    protected function renderWidget(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
     }
 
-    protected function renderRow(FormView $view, array $vars = array())
+    protected function renderRow(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
     }
 
-    protected function renderRest(FormView $view, array $vars = array())
+    protected function renderRest(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
     }
 
-    protected function renderStart(FormView $view, array $vars = array())
+    protected function renderStart(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
     }
 
-    protected function renderEnd(FormView $view, array $vars = array())
+    protected function renderEnd(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
     }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
index 5a36f6e4fd1be..0c2ef171b254b 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
@@ -33,29 +33,29 @@ protected function setUp()
     {
         parent::setUp();
 
-        $loader = new StubFilesystemLoader(array(
+        $loader = new StubFilesystemLoader([
             __DIR__.'/../../Resources/views/Form',
             __DIR__.'/Fixtures/templates/form',
-        ));
+        ]);
 
-        $environment = new Environment($loader, array('strict_variables' => true));
+        $environment = new Environment($loader, ['strict_variables' => true]);
         $environment->addExtension(new TranslationExtension(new StubTranslator()));
         $environment->addExtension(new FormExtension());
 
-        $rendererEngine = new TwigRendererEngine(array(
+        $rendererEngine = new TwigRendererEngine([
             'bootstrap_3_layout.html.twig',
             'custom_widgets.html.twig',
-        ), $environment);
+        ], $environment);
         $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
         $this->registerTwigRuntimeLoader($environment, $this->renderer);
     }
 
     public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'get',
             'action' => '',
-        ));
+        ]);
 
         $html = $this->renderStart($form->createView());
 
@@ -64,10 +64,10 @@ public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
 
     public function testStartTagHasActionAttributeWhenActionIsZero()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'get',
             'action' => '0',
-        ));
+        ]);
 
         $html = $this->renderStart($form->createView());
 
@@ -76,18 +76,18 @@ public function testStartTagHasActionAttributeWhenActionIsZero()
 
     public function testMoneyWidgetInIso()
     {
-        $environment = new Environment(new StubFilesystemLoader(array(
+        $environment = new Environment(new StubFilesystemLoader([
             __DIR__.'/../../Resources/views/Form',
             __DIR__.'/Fixtures/templates/form',
-        )), array('strict_variables' => true));
+        ]), ['strict_variables' => true]);
         $environment->addExtension(new TranslationExtension(new StubTranslator()));
         $environment->addExtension(new FormExtension());
         $environment->setCharset('ISO-8859-1');
 
-        $rendererEngine = new TwigRendererEngine(array(
+        $rendererEngine = new TwigRendererEngine([
             'bootstrap_3_layout.html.twig',
             'custom_widgets.html.twig',
-        ), $environment);
+        ], $environment);
         $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
         $this->registerTwigRuntimeLoader($environment, $this->renderer);
 
@@ -104,15 +104,15 @@ public function testMoneyWidgetInIso()
         , trim($this->renderWidget($view)));
     }
 
-    protected function renderForm(FormView $view, array $vars = array())
+    protected function renderForm(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->renderBlock($view, 'form', $vars);
     }
 
-    protected function renderLabel(FormView $view, $label = null, array $vars = array())
+    protected function renderLabel(FormView $view, $label = null, array $vars = [])
     {
         if (null !== $label) {
-            $vars += array('label' => $label);
+            $vars += ['label' => $label];
         }
 
         return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
@@ -123,27 +123,27 @@ protected function renderErrors(FormView $view)
         return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
     }
 
-    protected function renderWidget(FormView $view, array $vars = array())
+    protected function renderWidget(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
     }
 
-    protected function renderRow(FormView $view, array $vars = array())
+    protected function renderRow(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
     }
 
-    protected function renderRest(FormView $view, array $vars = array())
+    protected function renderRest(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
     }
 
-    protected function renderStart(FormView $view, array $vars = array())
+    protected function renderStart(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
     }
 
-    protected function renderEnd(FormView $view, array $vars = array())
+    protected function renderEnd(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
     }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
index 27415924e7d1d..319c0e57308a2 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
@@ -29,9 +29,9 @@ class FormExtensionBootstrap4HorizontalLayoutTest extends AbstractBootstrap4Hori
 {
     use RuntimeLoaderProvider;
 
-    protected $testableFeatures = array(
+    protected $testableFeatures = [
         'choice_attr',
-    );
+    ];
 
     private $renderer;
 
@@ -39,32 +39,32 @@ protected function setUp()
     {
         parent::setUp();
 
-        $loader = new StubFilesystemLoader(array(
+        $loader = new StubFilesystemLoader([
             __DIR__.'/../../Resources/views/Form',
             __DIR__.'/Fixtures/templates/form',
-        ));
+        ]);
 
-        $environment = new Environment($loader, array('strict_variables' => true));
+        $environment = new Environment($loader, ['strict_variables' => true]);
         $environment->addExtension(new TranslationExtension(new StubTranslator()));
         $environment->addExtension(new FormExtension());
 
-        $rendererEngine = new TwigRendererEngine(array(
+        $rendererEngine = new TwigRendererEngine([
             'bootstrap_4_horizontal_layout.html.twig',
             'custom_widgets.html.twig',
-        ), $environment);
+        ], $environment);
         $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
         $this->registerTwigRuntimeLoader($environment, $this->renderer);
     }
 
-    protected function renderForm(FormView $view, array $vars = array())
+    protected function renderForm(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->renderBlock($view, 'form', $vars);
     }
 
-    protected function renderLabel(FormView $view, $label = null, array $vars = array())
+    protected function renderLabel(FormView $view, $label = null, array $vars = [])
     {
         if (null !== $label) {
-            $vars += array('label' => $label);
+            $vars += ['label' => $label];
         }
 
         return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
@@ -75,27 +75,27 @@ protected function renderErrors(FormView $view)
         return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
     }
 
-    protected function renderWidget(FormView $view, array $vars = array())
+    protected function renderWidget(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
     }
 
-    protected function renderRow(FormView $view, array $vars = array())
+    protected function renderRow(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
     }
 
-    protected function renderRest(FormView $view, array $vars = array())
+    protected function renderRest(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
     }
 
-    protected function renderStart(FormView $view, array $vars = array())
+    protected function renderStart(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
     }
 
-    protected function renderEnd(FormView $view, array $vars = array())
+    protected function renderEnd(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
     }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
index 9c41610d1c73d..ea36552d85b71 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
@@ -37,29 +37,29 @@ protected function setUp()
     {
         parent::setUp();
 
-        $loader = new StubFilesystemLoader(array(
+        $loader = new StubFilesystemLoader([
             __DIR__.'/../../Resources/views/Form',
             __DIR__.'/Fixtures/templates/form',
-        ));
+        ]);
 
-        $environment = new Environment($loader, array('strict_variables' => true));
+        $environment = new Environment($loader, ['strict_variables' => true]);
         $environment->addExtension(new TranslationExtension(new StubTranslator()));
         $environment->addExtension(new FormExtension());
 
-        $rendererEngine = new TwigRendererEngine(array(
+        $rendererEngine = new TwigRendererEngine([
             'bootstrap_4_layout.html.twig',
             'custom_widgets.html.twig',
-        ), $environment);
+        ], $environment);
         $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
         $this->registerTwigRuntimeLoader($environment, $this->renderer);
     }
 
     public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'get',
             'action' => '',
-        ));
+        ]);
 
         $html = $this->renderStart($form->createView());
 
@@ -68,10 +68,10 @@ public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
 
     public function testStartTagHasActionAttributeWhenActionIsZero()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'get',
             'action' => '0',
-        ));
+        ]);
 
         $html = $this->renderStart($form->createView());
 
@@ -80,18 +80,18 @@ public function testStartTagHasActionAttributeWhenActionIsZero()
 
     public function testMoneyWidgetInIso()
     {
-        $environment = new Environment(new StubFilesystemLoader(array(
+        $environment = new Environment(new StubFilesystemLoader([
             __DIR__.'/../../Resources/views/Form',
             __DIR__.'/Fixtures/templates/form',
-        )), array('strict_variables' => true));
+        ]), ['strict_variables' => true]);
         $environment->addExtension(new TranslationExtension(new StubTranslator()));
         $environment->addExtension(new FormExtension());
         $environment->setCharset('ISO-8859-1');
 
-        $rendererEngine = new TwigRendererEngine(array(
+        $rendererEngine = new TwigRendererEngine([
             'bootstrap_4_layout.html.twig',
             'custom_widgets.html.twig',
-        ), $environment);
+        ], $environment);
         $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
         $this->registerTwigRuntimeLoader($environment, $this->renderer);
 
@@ -108,15 +108,15 @@ public function testMoneyWidgetInIso()
         , trim($this->renderWidget($view)));
     }
 
-    protected function renderForm(FormView $view, array $vars = array())
+    protected function renderForm(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->renderBlock($view, 'form', $vars);
     }
 
-    protected function renderLabel(FormView $view, $label = null, array $vars = array())
+    protected function renderLabel(FormView $view, $label = null, array $vars = [])
     {
         if (null !== $label) {
-            $vars += array('label' => $label);
+            $vars += ['label' => $label];
         }
 
         return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
@@ -127,27 +127,27 @@ protected function renderErrors(FormView $view)
         return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
     }
 
-    protected function renderWidget(FormView $view, array $vars = array())
+    protected function renderWidget(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
     }
 
-    protected function renderRow(FormView $view, array $vars = array())
+    protected function renderRow(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
     }
 
-    protected function renderRest(FormView $view, array $vars = array())
+    protected function renderRest(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
     }
 
-    protected function renderStart(FormView $view, array $vars = array())
+    protected function renderStart(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
     }
 
-    protected function renderEnd(FormView $view, array $vars = array())
+    protected function renderEnd(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
     }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
index 314f9055c22ea..86f728b00924d 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -35,22 +35,22 @@ protected function setUp()
     {
         parent::setUp();
 
-        $loader = new StubFilesystemLoader(array(
+        $loader = new StubFilesystemLoader([
             __DIR__.'/../../Resources/views/Form',
             __DIR__.'/Fixtures/templates/form',
-        ));
+        ]);
 
-        $environment = new Environment($loader, array('strict_variables' => true));
+        $environment = new Environment($loader, ['strict_variables' => true]);
         $environment->addExtension(new TranslationExtension(new StubTranslator()));
         $environment->addGlobal('global', '');
         // the value can be any template that exists
         $environment->addGlobal('dynamic_template_name', 'child_label');
         $environment->addExtension(new FormExtension());
 
-        $rendererEngine = new TwigRendererEngine(array(
+        $rendererEngine = new TwigRendererEngine([
             'form_div_layout.html.twig',
             'custom_widgets.html.twig',
-        ), $environment);
+        ], $environment);
         $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
         $this->registerTwigRuntimeLoader($environment, $this->renderer);
     }
@@ -62,7 +62,7 @@ public function testThemeBlockInheritanceUsingUse()
             ->createView()
         ;
 
-        $this->setTheme($view, array('theme_use.html.twig'));
+        $this->setTheme($view, ['theme_use.html.twig']);
 
         $this->assertMatchesXpath(
             $this->renderWidget($view),
@@ -77,7 +77,7 @@ public function testThemeBlockInheritanceUsingExtend()
             ->createView()
         ;
 
-        $this->setTheme($view, array('theme_extends.html.twig'));
+        $this->setTheme($view, ['theme_extends.html.twig']);
 
         $this->assertMatchesXpath(
             $this->renderWidget($view),
@@ -92,7 +92,7 @@ public function testThemeBlockInheritanceUsingDynamicExtend()
             ->createView()
         ;
 
-        $this->renderer->setTheme($view, array('page_dynamic_extends.html.twig'));
+        $this->renderer->setTheme($view, ['page_dynamic_extends.html.twig']);
         $this->assertMatchesXpath(
             $this->renderer->searchAndRenderBlock($view, 'row'),
             '/div/label[text()="child"]'
@@ -101,18 +101,18 @@ public function testThemeBlockInheritanceUsingDynamicExtend()
 
     public function isSelectedChoiceProvider()
     {
-        return array(
-            array(true, '0', '0'),
-            array(true, '1', '1'),
-            array(true, '', ''),
-            array(true, '1.23', '1.23'),
-            array(true, 'foo', 'foo'),
-            array(true, 'foo10', 'foo10'),
-            array(true, 'foo', array(1, 'foo', 'foo10')),
-
-            array(false, 10, array(1, 'foo', 'foo10')),
-            array(false, 0, array(1, 'foo', 'foo10')),
-        );
+        return [
+            [true, '0', '0'],
+            [true, '1', '1'],
+            [true, '', ''],
+            [true, '1.23', '1.23'],
+            [true, 'foo', 'foo'],
+            [true, 'foo10', 'foo10'],
+            [true, 'foo', [1, 'foo', 'foo10']],
+
+            [false, 10, [1, 'foo', 'foo10']],
+            [false, 0, [1, 'foo', 'foo10']],
+        ];
     }
 
     /**
@@ -127,10 +127,10 @@ public function testIsChoiceSelected($expected, $choice, $value)
 
     public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'get',
             'action' => '',
-        ));
+        ]);
 
         $html = $this->renderStart($form->createView());
 
@@ -139,10 +139,10 @@ public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
 
     public function testStartTagHasActionAttributeWhenActionIsZero()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'get',
             'action' => '0',
-        ));
+        ]);
 
         $html = $this->renderStart($form->createView());
 
@@ -151,10 +151,10 @@ public function testStartTagHasActionAttributeWhenActionIsZero()
 
     public function isRootFormProvider()
     {
-        return array(
-            array(true, new FormView()),
-            array(false, new FormView(new FormView())),
-        );
+        return [
+            [true, new FormView()],
+            [false, new FormView(new FormView())],
+        ];
     }
 
     /**
@@ -167,18 +167,18 @@ public function testIsRootForm($expected, FormView $formView)
 
     public function testMoneyWidgetInIso()
     {
-        $environment = new Environment(new StubFilesystemLoader(array(
+        $environment = new Environment(new StubFilesystemLoader([
             __DIR__.'/../../Resources/views/Form',
             __DIR__.'/Fixtures/templates/form',
-        )), array('strict_variables' => true));
+        ]), ['strict_variables' => true]);
         $environment->addExtension(new TranslationExtension(new StubTranslator()));
         $environment->addExtension(new FormExtension());
         $environment->setCharset('ISO-8859-1');
 
-        $rendererEngine = new TwigRendererEngine(array(
+        $rendererEngine = new TwigRendererEngine([
             'form_div_layout.html.twig',
             'custom_widgets.html.twig',
-        ), $environment);
+        ], $environment);
         $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
         $this->registerTwigRuntimeLoader($environment, $this->renderer);
 
@@ -195,10 +195,10 @@ protected function renderForm(FormView $view, array $vars = array())
         return (string) $this->renderer->renderBlock($view, 'form', $vars);
     }
 
-    protected function renderLabel(FormView $view, $label = null, array $vars = array())
+    protected function renderLabel(FormView $view, $label = null, array $vars = [])
     {
         if (null !== $label) {
-            $vars += array('label' => $label);
+            $vars += ['label' => $label];
         }
 
         return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
@@ -209,27 +209,27 @@ protected function renderErrors(FormView $view)
         return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
     }
 
-    protected function renderWidget(FormView $view, array $vars = array())
+    protected function renderWidget(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
     }
 
-    protected function renderRow(FormView $view, array $vars = array())
+    protected function renderRow(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
     }
 
-    protected function renderRest(FormView $view, array $vars = array())
+    protected function renderRest(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
     }
 
-    protected function renderStart(FormView $view, array $vars = array())
+    protected function renderStart(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
     }
 
-    protected function renderEnd(FormView $view, array $vars = array())
+    protected function renderEnd(FormView $view, array $vars = [])
     {
         return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
     }
@@ -241,15 +241,15 @@ protected function setTheme(FormView $view, array $themes, $useDefaultThemes = t
 
     public static function themeBlockInheritanceProvider()
     {
-        return array(
-            array(array('theme.html.twig')),
-        );
+        return [
+            [['theme.html.twig']],
+        ];
     }
 
     public static function themeInheritanceProvider()
     {
-        return array(
-            array(array('parent_label.html.twig'), array('child_label.html.twig')),
-        );
+        return [
+            [['parent_label.html.twig'], ['child_label.html.twig']],
+        ];
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
index 7f2b900f11d69..ad97eb0f6e5a1 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
@@ -34,30 +34,30 @@ protected function setUp()
     {
         parent::setUp();
 
-        $loader = new StubFilesystemLoader(array(
+        $loader = new StubFilesystemLoader([
             __DIR__.'/../../Resources/views/Form',
             __DIR__.'/Fixtures/templates/form',
-        ));
+        ]);
 
-        $environment = new Environment($loader, array('strict_variables' => true));
+        $environment = new Environment($loader, ['strict_variables' => true]);
         $environment->addExtension(new TranslationExtension(new StubTranslator()));
         $environment->addGlobal('global', '');
         $environment->addExtension(new FormExtension());
 
-        $rendererEngine = new TwigRendererEngine(array(
+        $rendererEngine = new TwigRendererEngine([
             'form_table_layout.html.twig',
             'custom_widgets.html.twig',
-        ), $environment);
+        ], $environment);
         $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
         $this->registerTwigRuntimeLoader($environment, $this->renderer);
     }
 
     public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'get',
             'action' => '',
-        ));
+        ]);
 
         $html = $this->renderStart($form->createView());
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/HttpFoundationExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/HttpFoundationExtensionTest.php
index dcabc5739be5b..38ee375b94b13 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/HttpFoundationExtensionTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/HttpFoundationExtensionTest.php
@@ -33,25 +33,25 @@ public function testGenerateAbsoluteUrl($expected, $path, $pathinfo)
 
     public function getGenerateAbsoluteUrlData()
     {
-        return array(
-            array('http://localhost/foo.png', '/foo.png', '/foo/bar.html'),
-            array('http://localhost/foo/foo.png', 'foo.png', '/foo/bar.html'),
-            array('http://localhost/foo/foo.png', 'foo.png', '/foo/bar'),
-            array('http://localhost/foo/bar/foo.png', 'foo.png', '/foo/bar/'),
-
-            array('http://example.com/baz', 'http://example.com/baz', '/'),
-            array('https://example.com/baz', 'https://example.com/baz', '/'),
-            array('//example.com/baz', '//example.com/baz', '/'),
-
-            array('http://localhost/foo/bar?baz', '?baz', '/foo/bar'),
-            array('http://localhost/foo/bar?baz=1', '?baz=1', '/foo/bar?foo=1'),
-            array('http://localhost/foo/baz?baz=1', 'baz?baz=1', '/foo/bar?foo=1'),
-
-            array('http://localhost/foo/bar#baz', '#baz', '/foo/bar'),
-            array('http://localhost/foo/bar?0#baz', '#baz', '/foo/bar?0'),
-            array('http://localhost/foo/bar?baz=1#baz', '?baz=1#baz', '/foo/bar?foo=1'),
-            array('http://localhost/foo/baz?baz=1#baz', 'baz?baz=1#baz', '/foo/bar?foo=1'),
-        );
+        return [
+            ['http://localhost/foo.png', '/foo.png', '/foo/bar.html'],
+            ['http://localhost/foo/foo.png', 'foo.png', '/foo/bar.html'],
+            ['http://localhost/foo/foo.png', 'foo.png', '/foo/bar'],
+            ['http://localhost/foo/bar/foo.png', 'foo.png', '/foo/bar/'],
+
+            ['http://example.com/baz', 'http://example.com/baz', '/'],
+            ['https://example.com/baz', 'https://example.com/baz', '/'],
+            ['//example.com/baz', '//example.com/baz', '/'],
+
+            ['http://localhost/foo/bar?baz', '?baz', '/foo/bar'],
+            ['http://localhost/foo/bar?baz=1', '?baz=1', '/foo/bar?foo=1'],
+            ['http://localhost/foo/baz?baz=1', 'baz?baz=1', '/foo/bar?foo=1'],
+
+            ['http://localhost/foo/bar#baz', '#baz', '/foo/bar'],
+            ['http://localhost/foo/bar?0#baz', '#baz', '/foo/bar?0'],
+            ['http://localhost/foo/bar?baz=1#baz', '?baz=1#baz', '/foo/bar?foo=1'],
+            ['http://localhost/foo/baz?baz=1#baz', 'baz?baz=1#baz', '/foo/bar?foo=1'],
+        ];
     }
 
     /**
@@ -85,16 +85,16 @@ public function testGenerateAbsoluteUrlWithoutRequestAndRequestContext($path)
 
     public function getGenerateAbsoluteUrlRequestContextData()
     {
-        return array(
-            array('/foo.png', '/foo', 'localhost', 'http', 80, 443, 'http://localhost/foo.png'),
-            array('foo.png', '/foo', 'localhost', 'http', 80, 443, 'http://localhost/foo/foo.png'),
-            array('foo.png', '/foo/bar/', 'localhost', 'http', 80, 443, 'http://localhost/foo/bar/foo.png'),
-            array('/foo.png', '/foo', 'localhost', 'https', 80, 443, 'https://localhost/foo.png'),
-            array('foo.png', '/foo', 'localhost', 'https', 80, 443, 'https://localhost/foo/foo.png'),
-            array('foo.png', '/foo/bar/', 'localhost', 'https', 80, 443, 'https://localhost/foo/bar/foo.png'),
-            array('/foo.png', '/foo', 'localhost', 'http', 443, 80, 'http://localhost:443/foo.png'),
-            array('/foo.png', '/foo', 'localhost', 'https', 443, 80, 'https://localhost:80/foo.png'),
-        );
+        return [
+            ['/foo.png', '/foo', 'localhost', 'http', 80, 443, 'http://localhost/foo.png'],
+            ['foo.png', '/foo', 'localhost', 'http', 80, 443, 'http://localhost/foo/foo.png'],
+            ['foo.png', '/foo/bar/', 'localhost', 'http', 80, 443, 'http://localhost/foo/bar/foo.png'],
+            ['/foo.png', '/foo', 'localhost', 'https', 80, 443, 'https://localhost/foo.png'],
+            ['foo.png', '/foo', 'localhost', 'https', 80, 443, 'https://localhost/foo/foo.png'],
+            ['foo.png', '/foo/bar/', 'localhost', 'https', 80, 443, 'https://localhost/foo/bar/foo.png'],
+            ['/foo.png', '/foo', 'localhost', 'http', 443, 80, 'http://localhost:443/foo.png'],
+            ['/foo.png', '/foo', 'localhost', 'https', 443, 80, 'https://localhost:80/foo.png'],
+        ];
     }
 
     public function testGenerateAbsoluteUrlWithScriptFileName()
@@ -130,14 +130,14 @@ public function testGenerateRelativePath($expected, $path, $pathinfo)
 
     public function getGenerateRelativePathData()
     {
-        return array(
-            array('../foo.png', '/foo.png', '/foo/bar.html'),
-            array('../baz/foo.png', '/baz/foo.png', '/foo/bar.html'),
-            array('baz/foo.png', 'baz/foo.png', '/foo/bar.html'),
-
-            array('http://example.com/baz', 'http://example.com/baz', '/'),
-            array('https://example.com/baz', 'https://example.com/baz', '/'),
-            array('//example.com/baz', '//example.com/baz', '/'),
-        );
+        return [
+            ['../foo.png', '/foo.png', '/foo/bar.html'],
+            ['../baz/foo.png', '/baz/foo.png', '/foo/bar.html'],
+            ['baz/foo.png', 'baz/foo.png', '/foo/bar.html'],
+
+            ['http://example.com/baz', 'http://example.com/baz', '/'],
+            ['https://example.com/baz', 'https://example.com/baz', '/'],
+            ['//example.com/baz', '//example.com/baz', '/'],
+        ];
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php
index 9f19847eb8824..9fe36b40c9063 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php
@@ -72,19 +72,19 @@ protected function getFragmentHandler($return)
 
         $context->expects($this->any())->method('getCurrentRequest')->will($this->returnValue(Request::create('/')));
 
-        return new FragmentHandler($context, array($strategy), false);
+        return new FragmentHandler($context, [$strategy], false);
     }
 
     protected function renderTemplate(FragmentHandler $renderer, $template = '{{ render("foo") }}')
     {
-        $loader = new ArrayLoader(array('index' => $template));
-        $twig = new Environment($loader, array('debug' => true, 'cache' => false));
+        $loader = new ArrayLoader(['index' => $template]);
+        $twig = new Environment($loader, ['debug' => true, 'cache' => false]);
         $twig->addExtension(new HttpKernelExtension());
 
         $loader = $this->getMockBuilder('Twig\RuntimeLoader\RuntimeLoaderInterface')->getMock();
-        $loader->expects($this->any())->method('load')->will($this->returnValueMap(array(
-            array('Symfony\Bridge\Twig\Extension\HttpKernelRuntime', new HttpKernelRuntime($renderer)),
-        )));
+        $loader->expects($this->any())->method('load')->will($this->returnValueMap([
+            ['Symfony\Bridge\Twig\Extension\HttpKernelRuntime', new HttpKernelRuntime($renderer)],
+        ]));
         $twig->addRuntimeLoader($loader);
 
         return $twig->render('index');
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/RoutingExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/RoutingExtensionTest.php
index fdff039851228..05f7ad741c7ea 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/RoutingExtensionTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/RoutingExtensionTest.php
@@ -24,7 +24,7 @@ class RoutingExtensionTest extends TestCase
      */
     public function testEscaping($template, $mustBeEscaped)
     {
-        $twig = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), array('debug' => true, 'cache' => false, 'autoescape' => 'html', 'optimizations' => 0));
+        $twig = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), ['debug' => true, 'cache' => false, 'autoescape' => 'html', 'optimizations' => 0]);
         $twig->addExtension(new RoutingExtension($this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGeneratorInterface')->getMock()));
 
         $nodes = $twig->parse($twig->tokenize(new Source($template, '')));
@@ -34,21 +34,21 @@ public function testEscaping($template, $mustBeEscaped)
 
     public function getEscapingTemplates()
     {
-        return array(
-            array('{{ path("foo") }}', false),
-            array('{{ path("foo", {}) }}', false),
-            array('{{ path("foo", { foo: "foo" }) }}', false),
-            array('{{ path("foo", foo) }}', true),
-            array('{{ path("foo", { foo: foo }) }}', true),
-            array('{{ path("foo", { foo: ["foo", "bar"] }) }}', true),
-            array('{{ path("foo", { foo: "foo", bar: "bar" }) }}', true),
-
-            array('{{ path(name = "foo", parameters = {}) }}', false),
-            array('{{ path(name = "foo", parameters = { foo: "foo" }) }}', false),
-            array('{{ path(name = "foo", parameters = foo) }}', true),
-            array('{{ path(name = "foo", parameters = { foo: ["foo", "bar"] }) }}', true),
-            array('{{ path(name = "foo", parameters = { foo: foo }) }}', true),
-            array('{{ path(name = "foo", parameters = { foo: "foo", bar: "bar" }) }}', true),
-        );
+        return [
+            ['{{ path("foo") }}', false],
+            ['{{ path("foo", {}) }}', false],
+            ['{{ path("foo", { foo: "foo" }) }}', false],
+            ['{{ path("foo", foo) }}', true],
+            ['{{ path("foo", { foo: foo }) }}', true],
+            ['{{ path("foo", { foo: ["foo", "bar"] }) }}', true],
+            ['{{ path("foo", { foo: "foo", bar: "bar" }) }}', true],
+
+            ['{{ path(name = "foo", parameters = {}) }}', false],
+            ['{{ path(name = "foo", parameters = { foo: "foo" }) }}', false],
+            ['{{ path(name = "foo", parameters = foo) }}', true],
+            ['{{ path(name = "foo", parameters = { foo: ["foo", "bar"] }) }}', true],
+            ['{{ path(name = "foo", parameters = { foo: foo }) }}', true],
+            ['{{ path(name = "foo", parameters = { foo: "foo", bar: "bar" }) }}', true],
+        ];
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/RuntimeLoaderProvider.php b/src/Symfony/Bridge/Twig/Tests/Extension/RuntimeLoaderProvider.php
index 4934bef87d467..0bec8ec6f1aab 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/RuntimeLoaderProvider.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/RuntimeLoaderProvider.php
@@ -19,9 +19,9 @@ trait RuntimeLoaderProvider
     protected function registerTwigRuntimeLoader(Environment $environment, FormRenderer $renderer)
     {
         $loader = $this->getMockBuilder('Twig\RuntimeLoader\RuntimeLoaderInterface')->getMock();
-        $loader->expects($this->any())->method('load')->will($this->returnValueMap(array(
-            array('Symfony\Component\Form\FormRenderer', $renderer),
-        )));
+        $loader->expects($this->any())->method('load')->will($this->returnValueMap([
+            ['Symfony\Component\Form\FormRenderer', $renderer],
+        ]));
         $environment->addRuntimeLoader($loader);
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php
index 901425b1b94c2..1af65e4c19a7d 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php
@@ -24,7 +24,7 @@ class StopwatchExtensionTest extends TestCase
      */
     public function testFailIfStoppingWrongEvent()
     {
-        $this->testTiming('{% stopwatch "foo" %}{% endstopwatch "bar" %}', array());
+        $this->testTiming('{% stopwatch "foo" %}{% endstopwatch "bar" %}', []);
     }
 
     /**
@@ -32,7 +32,7 @@ public function testFailIfStoppingWrongEvent()
      */
     public function testTiming($template, $events)
     {
-        $twig = new Environment(new ArrayLoader(array('template' => $template)), array('debug' => true, 'cache' => false, 'autoescape' => 'html', 'optimizations' => 0));
+        $twig = new Environment(new ArrayLoader(['template' => $template]), ['debug' => true, 'cache' => false, 'autoescape' => 'html', 'optimizations' => 0]);
         $twig->addExtension(new StopwatchExtension($this->getStopwatch($events)));
 
         try {
@@ -44,19 +44,19 @@ public function testTiming($template, $events)
 
     public function getTimingTemplates()
     {
-        return array(
-            array('{% stopwatch "foo" %}something{% endstopwatch %}', 'foo'),
-            array('{% stopwatch "foo" %}symfony is fun{% endstopwatch %}{% stopwatch "bar" %}something{% endstopwatch %}', array('foo', 'bar')),
-            array('{% set foo = "foo" %}{% stopwatch foo %}something{% endstopwatch %}', 'foo'),
-            array('{% set foo = "foo" %}{% stopwatch foo %}something {% set foo = "bar" %}{% endstopwatch %}', 'foo'),
-            array('{% stopwatch "foo.bar" %}something{% endstopwatch %}', 'foo.bar'),
-            array('{% stopwatch "foo" %}something{% endstopwatch %}{% stopwatch "foo" %}something else{% endstopwatch %}', array('foo', 'foo')),
-        );
+        return [
+            ['{% stopwatch "foo" %}something{% endstopwatch %}', 'foo'],
+            ['{% stopwatch "foo" %}symfony is fun{% endstopwatch %}{% stopwatch "bar" %}something{% endstopwatch %}', ['foo', 'bar']],
+            ['{% set foo = "foo" %}{% stopwatch foo %}something{% endstopwatch %}', 'foo'],
+            ['{% set foo = "foo" %}{% stopwatch foo %}something {% set foo = "bar" %}{% endstopwatch %}', 'foo'],
+            ['{% stopwatch "foo.bar" %}something{% endstopwatch %}', 'foo.bar'],
+            ['{% stopwatch "foo" %}something{% endstopwatch %}{% stopwatch "foo" %}something else{% endstopwatch %}', ['foo', 'foo']],
+        ];
     }
 
-    protected function getStopwatch($events = array())
+    protected function getStopwatch($events = [])
     {
-        $events = \is_array($events) ? $events : array($events);
+        $events = \is_array($events) ? $events : [$events];
         $stopwatch = $this->getMockBuilder('Symfony\Component\Stopwatch\Stopwatch')->getMock();
 
         $i = -1;
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php
index feba2b2b6b0d0..e129107ac360a 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php
@@ -22,7 +22,7 @@ class TranslationExtensionTest extends TestCase
 {
     public function testEscaping()
     {
-        $output = $this->getTemplate('{% trans %}Percent: %value%%% (%msg%){% endtrans %}')->render(array('value' => 12, 'msg' => 'approx.'));
+        $output = $this->getTemplate('{% trans %}Percent: %value%%% (%msg%){% endtrans %}')->render(['value' => 12, 'msg' => 'approx.']);
 
         $this->assertEquals('Percent: 12% (approx.)', $output);
     }
@@ -30,12 +30,12 @@ public function testEscaping()
     /**
      * @dataProvider getTransTests
      */
-    public function testTrans($template, $expected, array $variables = array())
+    public function testTrans($template, $expected, array $variables = [])
     {
         if ($expected != $this->getTemplate($template)->render($variables)) {
             echo $template."\n";
-            $loader = new TwigArrayLoader(array('index' => $template));
-            $twig = new Environment($loader, array('debug' => true, 'cache' => false));
+            $loader = new TwigArrayLoader(['index' => $template]);
+            $twig = new Environment($loader, ['debug' => true, 'cache' => false]);
             $twig->addExtension(new TranslationExtension(new Translator('en')));
 
             echo $twig->compile($twig->parse($twig->tokenize($twig->getLoader()->getSourceContext('index'))))."\n\n";
@@ -76,59 +76,59 @@ public function getTransTests()
     {
         return array(
             // trans tag
-            array('{% trans %}Hello{% endtrans %}', 'Hello'),
-            array('{% trans %}%name%{% endtrans %}', 'Symfony', array('name' => 'Symfony')),
+            ['{% trans %}Hello{% endtrans %}', 'Hello'],
+            ['{% trans %}%name%{% endtrans %}', 'Symfony', ['name' => 'Symfony']],
 
-            array('{% trans from elsewhere %}Hello{% endtrans %}', 'Hello'),
+            ['{% trans from elsewhere %}Hello{% endtrans %}', 'Hello'],
 
-            array('{% trans %}Hello %name%{% endtrans %}', 'Hello Symfony', array('name' => 'Symfony')),
-            array('{% trans with { \'%name%\': \'Symfony\' } %}Hello %name%{% endtrans %}', 'Hello Symfony'),
-            array('{% set vars = { \'%name%\': \'Symfony\' } %}{% trans with vars %}Hello %name%{% endtrans %}', 'Hello Symfony'),
+            ['{% trans %}Hello %name%{% endtrans %}', 'Hello Symfony', ['name' => 'Symfony']],
+            ['{% trans with { \'%name%\': \'Symfony\' } %}Hello %name%{% endtrans %}', 'Hello Symfony'],
+            ['{% set vars = { \'%name%\': \'Symfony\' } %}{% trans with vars %}Hello %name%{% endtrans %}', 'Hello Symfony'],
 
-            array('{% trans into "fr"%}Hello{% endtrans %}', 'Hello'),
+            ['{% trans into "fr"%}Hello{% endtrans %}', 'Hello'],
 
             // transchoice
-            array(
+            [
                 '{% transchoice count from "messages" %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
                 'There is no apples',
-                array('count' => 0),
-            ),
-            array(
+                ['count' => 0],
+            ],
+            [
                 '{% transchoice count %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
                 'There is 5 apples',
-                array('count' => 5),
-            ),
-            array(
+                ['count' => 5],
+            ],
+            [
                 '{% transchoice count %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
                 'There is 5 apples (Symfony)',
-                array('count' => 5, 'name' => 'Symfony'),
-            ),
-            array(
+                ['count' => 5, 'name' => 'Symfony'],
+            ],
+            [
                 '{% transchoice count with { \'%name%\': \'Symfony\' } %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
                 'There is 5 apples (Symfony)',
-                array('count' => 5),
-            ),
-            array(
+                ['count' => 5],
+            ],
+            [
                 '{% transchoice count into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
                 'There is no apples',
-                array('count' => 0),
-            ),
-            array(
+                ['count' => 0],
+            ],
+            [
                 '{% transchoice 5 into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
                 'There is 5 apples',
-            ),
+            ],
 
             // trans filter
-            array('{{ "Hello"|trans }}', 'Hello'),
-            array('{{ name|trans }}', 'Symfony', array('name' => 'Symfony')),
-            array('{{ hello|trans({ \'%name%\': \'Symfony\' }) }}', 'Hello Symfony', array('hello' => 'Hello %name%')),
-            array('{% set vars = { \'%name%\': \'Symfony\' } %}{{ hello|trans(vars) }}', 'Hello Symfony', array('hello' => 'Hello %name%')),
-            array('{{ "Hello"|trans({}, "messages", "fr") }}', 'Hello'),
+            ['{{ "Hello"|trans }}', 'Hello'],
+            ['{{ name|trans }}', 'Symfony', ['name' => 'Symfony']],
+            ['{{ hello|trans({ \'%name%\': \'Symfony\' }) }}', 'Hello Symfony', ['hello' => 'Hello %name%']],
+            ['{% set vars = { \'%name%\': \'Symfony\' } %}{{ hello|trans(vars) }}', 'Hello Symfony', ['hello' => 'Hello %name%']],
+            ['{{ "Hello"|trans({}, "messages", "fr") }}', 'Hello'],
 
             // transchoice filter
-            array('{{ "{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples"|transchoice(count) }}', 'There is 5 apples', array('count' => 5)),
-            array('{{ text|transchoice(5, {\'%name%\': \'Symfony\'}) }}', 'There is 5 apples (Symfony)', array('text' => '{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%)')),
-            array('{{ "{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples"|transchoice(count, {}, "messages", "fr") }}', 'There is 5 apples', array('count' => 5)),
+            ['{{ "{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples"|transchoice(count) }}', 'There is 5 apples', ['count' => 5]],
+            ['{{ text|transchoice(5, {\'%name%\': \'Symfony\'}) }}', 'There is 5 apples (Symfony)', ['text' => '{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%)']],
+            ['{{ "{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples"|transchoice(count, {}, "messages", "fr") }}', 'There is 5 apples', ['count' => 5]],
         );
     }
 
@@ -157,18 +157,18 @@ public function testDefaultTranslationDomain()
 
         $translator = new Translator('en');
         $translator->addLoader('array', new ArrayLoader());
-        $translator->addResource('array', array('foo' => 'foo (messages)'), 'en');
-        $translator->addResource('array', array('foo' => 'foo (custom)'), 'en', 'custom');
-        $translator->addResource('array', array('foo' => 'foo (foo)'), 'en', 'foo');
+        $translator->addResource('array', ['foo' => 'foo (messages)'], 'en');
+        $translator->addResource('array', ['foo' => 'foo (custom)'], 'en', 'custom');
+        $translator->addResource('array', ['foo' => 'foo (foo)'], 'en', 'foo');
 
         $template = $this->getTemplate($templates, $translator);
 
-        $this->assertEquals('foo (foo)foo (custom)foo (foo)foo (custom)foo (foo)foo (custom)', trim($template->render(array())));
+        $this->assertEquals('foo (foo)foo (custom)foo (foo)foo (custom)foo (foo)foo (custom)', trim($template->render([])));
     }
 
     public function testDefaultTranslationDomainWithNamedArguments()
     {
-        $templates = array(
+        $templates = [
             'index' => '
                 {%- trans_default_domain "foo" %}
 
@@ -186,18 +186,18 @@ public function testDefaultTranslationDomainWithNamedArguments()
             'base' => '
                 {%- block content "" %}
             ',
-        );
+        ];
 
         $translator = new Translator('en');
         $translator->addLoader('array', new ArrayLoader());
-        $translator->addResource('array', array('foo' => 'foo (messages)'), 'en');
-        $translator->addResource('array', array('foo' => 'foo (custom)'), 'en', 'custom');
-        $translator->addResource('array', array('foo' => 'foo (foo)'), 'en', 'foo');
-        $translator->addResource('array', array('foo' => 'foo (fr)'), 'fr', 'custom');
+        $translator->addResource('array', ['foo' => 'foo (messages)'], 'en');
+        $translator->addResource('array', ['foo' => 'foo (custom)'], 'en', 'custom');
+        $translator->addResource('array', ['foo' => 'foo (foo)'], 'en', 'foo');
+        $translator->addResource('array', ['foo' => 'foo (fr)'], 'fr', 'custom');
 
         $template = $this->getTemplate($templates, $translator);
 
-        $this->assertEquals('foo (custom)foo (foo)foo (custom)foo (custom)foo (fr)foo (custom)foo (fr)', trim($template->render(array())));
+        $this->assertEquals('foo (custom)foo (foo)foo (custom)foo (custom)foo (fr)foo (custom)foo (fr)', trim($template->render([])));
     }
 
     protected function getTemplate($template, $translator = null)
@@ -209,9 +209,9 @@ protected function getTemplate($template, $translator = null)
         if (\is_array($template)) {
             $loader = new TwigArrayLoader($template);
         } else {
-            $loader = new TwigArrayLoader(array('index' => $template));
+            $loader = new TwigArrayLoader(['index' => $template]);
         }
-        $twig = new Environment($loader, array('debug' => true, 'cache' => false));
+        $twig = new Environment($loader, ['debug' => true, 'cache' => false]);
         $twig->addExtension(new TranslationExtension($translator));
 
         return $twig->loadTemplate('index');
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/WebLinkExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/WebLinkExtensionTest.php
index 3424b58875fbc..f49eea396d0d8 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/WebLinkExtensionTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/WebLinkExtensionTest.php
@@ -44,49 +44,49 @@ protected function setUp()
 
     public function testLink()
     {
-        $this->assertEquals('/foo.css', $this->extension->link('/foo.css', 'preload', array('as' => 'style', 'nopush' => true)));
+        $this->assertEquals('/foo.css', $this->extension->link('/foo.css', 'preload', ['as' => 'style', 'nopush' => true]));
 
         $link = (new Link('preload', '/foo.css'))->withAttribute('as', 'style')->withAttribute('nopush', true);
-        $this->assertEquals(array($link), array_values($this->request->attributes->get('_links')->getLinks()));
+        $this->assertEquals([$link], array_values($this->request->attributes->get('_links')->getLinks()));
     }
 
     public function testPreload()
     {
-        $this->assertEquals('/foo.css', $this->extension->preload('/foo.css', array('as' => 'style', 'crossorigin' => true)));
+        $this->assertEquals('/foo.css', $this->extension->preload('/foo.css', ['as' => 'style', 'crossorigin' => true]));
 
         $link = (new Link('preload', '/foo.css'))->withAttribute('as', 'style')->withAttribute('crossorigin', true);
-        $this->assertEquals(array($link), array_values($this->request->attributes->get('_links')->getLinks()));
+        $this->assertEquals([$link], array_values($this->request->attributes->get('_links')->getLinks()));
     }
 
     public function testDnsPrefetch()
     {
-        $this->assertEquals('/foo.css', $this->extension->dnsPrefetch('/foo.css', array('as' => 'style', 'crossorigin' => true)));
+        $this->assertEquals('/foo.css', $this->extension->dnsPrefetch('/foo.css', ['as' => 'style', 'crossorigin' => true]));
 
         $link = (new Link('dns-prefetch', '/foo.css'))->withAttribute('as', 'style')->withAttribute('crossorigin', true);
-        $this->assertEquals(array($link), array_values($this->request->attributes->get('_links')->getLinks()));
+        $this->assertEquals([$link], array_values($this->request->attributes->get('_links')->getLinks()));
     }
 
     public function testPreconnect()
     {
-        $this->assertEquals('/foo.css', $this->extension->preconnect('/foo.css', array('as' => 'style', 'crossorigin' => true)));
+        $this->assertEquals('/foo.css', $this->extension->preconnect('/foo.css', ['as' => 'style', 'crossorigin' => true]));
 
         $link = (new Link('preconnect', '/foo.css'))->withAttribute('as', 'style')->withAttribute('crossorigin', true);
-        $this->assertEquals(array($link), array_values($this->request->attributes->get('_links')->getLinks()));
+        $this->assertEquals([$link], array_values($this->request->attributes->get('_links')->getLinks()));
     }
 
     public function testPrefetch()
     {
-        $this->assertEquals('/foo.css', $this->extension->prefetch('/foo.css', array('as' => 'style', 'crossorigin' => true)));
+        $this->assertEquals('/foo.css', $this->extension->prefetch('/foo.css', ['as' => 'style', 'crossorigin' => true]));
 
         $link = (new Link('prefetch', '/foo.css'))->withAttribute('as', 'style')->withAttribute('crossorigin', true);
-        $this->assertEquals(array($link), array_values($this->request->attributes->get('_links')->getLinks()));
+        $this->assertEquals([$link], array_values($this->request->attributes->get('_links')->getLinks()));
     }
 
     public function testPrerender()
     {
-        $this->assertEquals('/foo.css', $this->extension->prerender('/foo.css', array('as' => 'style', 'crossorigin' => true)));
+        $this->assertEquals('/foo.css', $this->extension->prerender('/foo.css', ['as' => 'style', 'crossorigin' => true]));
 
         $link = (new Link('prerender', '/foo.css'))->withAttribute('as', 'style')->withAttribute('crossorigin', true);
-        $this->assertEquals(array($link), array_values($this->request->attributes->get('_links')->getLinks()));
+        $this->assertEquals([$link], array_values($this->request->attributes->get('_links')->getLinks()));
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/WorkflowExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/WorkflowExtensionTest.php
index 2adf12d99ea88..33d70c95e95b7 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/WorkflowExtensionTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/WorkflowExtensionTest.php
@@ -42,7 +42,7 @@ protected function setUp()
     public function testCanTransition()
     {
         $subject = new \stdClass();
-        $subject->marking = array();
+        $subject->marking = [];
 
         $this->assertTrue($this->extension->canTransition($subject, 't1'));
         $this->assertFalse($this->extension->canTransition($subject, 't2'));
@@ -51,7 +51,7 @@ public function testCanTransition()
     public function testGetEnabledTransitions()
     {
         $subject = new \stdClass();
-        $subject->marking = array();
+        $subject->marking = [];
 
         $transitions = $this->extension->getEnabledTransitions($subject);
 
@@ -63,8 +63,8 @@ public function testGetEnabledTransitions()
     public function testHasMarkedPlace()
     {
         $subject = new \stdClass();
-        $subject->marking = array();
-        $subject->marking = array('ordered' => 1, 'waiting_for_payment' => 1);
+        $subject->marking = [];
+        $subject->marking = ['ordered' => 1, 'waiting_for_payment' => 1];
 
         $this->assertTrue($this->extension->hasMarkedPlace($subject, 'ordered'));
         $this->assertTrue($this->extension->hasMarkedPlace($subject, 'waiting_for_payment'));
@@ -74,10 +74,10 @@ public function testHasMarkedPlace()
     public function testGetMarkedPlaces()
     {
         $subject = new \stdClass();
-        $subject->marking = array();
-        $subject->marking = array('ordered' => 1, 'waiting_for_payment' => 1);
+        $subject->marking = [];
+        $subject->marking = ['ordered' => 1, 'waiting_for_payment' => 1];
 
-        $this->assertSame(array('ordered', 'waiting_for_payment'), $this->extension->getMarkedPlaces($subject));
+        $this->assertSame(['ordered', 'waiting_for_payment'], $this->extension->getMarkedPlaces($subject));
         $this->assertSame($subject->marking, $this->extension->getMarkedPlaces($subject, false));
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php b/src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php
index 7f8737a3af6ef..ff9873d3bbf21 100644
--- a/src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php
@@ -70,9 +70,9 @@ public function testIndented()
 
     public function testOneVar()
     {
-        $vars = new Node(array(
+        $vars = new Node([
             new NameExpression('foo', 7),
-        ));
+        ]);
         $node = new DumpNode('bar', $vars, 7);
 
         $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock());
@@ -97,10 +97,10 @@ public function testOneVar()
 
     public function testMultiVars()
     {
-        $vars = new Node(array(
+        $vars = new Node([
             new NameExpression('foo', 7),
             new NameExpression('bar', 7),
-        ));
+        ]);
         $node = new DumpNode('bar', $vars, 7);
 
         $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock());
diff --git a/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php b/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php
index 1f7f6322bdef0..209d7c42dae2e 100644
--- a/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php
@@ -30,10 +30,10 @@ class FormThemeTest extends TestCase
     public function testConstructor()
     {
         $form = new NameExpression('form', 0);
-        $resources = new Node(array(
+        $resources = new Node([
             new ConstantExpression('tpl1', 0),
             new ConstantExpression('tpl2', 0),
-        ));
+        ]);
 
         $node = new FormThemeNode($form, $resources, 0);
 
@@ -45,12 +45,12 @@ public function testConstructor()
     public function testCompile()
     {
         $form = new NameExpression('form', 0);
-        $resources = new ArrayExpression(array(
+        $resources = new ArrayExpression([
             new ConstantExpression(0, 0),
             new ConstantExpression('tpl1', 0),
             new ConstantExpression(1, 0),
             new ConstantExpression('tpl2', 0),
-        ), 0);
+        ], 0);
 
         $node = new FormThemeNode($form, $resources, 0);
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php b/src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php
index 4f66406a8ae32..9607ee1fef5b1 100644
--- a/src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php
@@ -25,9 +25,9 @@ class SearchAndRenderBlockNodeTest extends TestCase
 {
     public function testCompileWidget()
     {
-        $arguments = new Node(array(
+        $arguments = new Node([
             new NameExpression('form', 0),
-        ));
+        ]);
 
         $node = new SearchAndRenderBlockNode('form_widget', $arguments, 0);
 
@@ -44,13 +44,13 @@ public function testCompileWidget()
 
     public function testCompileWidgetWithVariables()
     {
-        $arguments = new Node(array(
+        $arguments = new Node([
             new NameExpression('form', 0),
-            new ArrayExpression(array(
+            new ArrayExpression([
                 new ConstantExpression('foo', 0),
                 new ConstantExpression('bar', 0),
-            ), 0),
-        ));
+            ], 0),
+        ]);
 
         $node = new SearchAndRenderBlockNode('form_widget', $arguments, 0);
 
@@ -67,10 +67,10 @@ public function testCompileWidgetWithVariables()
 
     public function testCompileLabelWithLabel()
     {
-        $arguments = new Node(array(
+        $arguments = new Node([
             new NameExpression('form', 0),
             new ConstantExpression('my label', 0),
-        ));
+        ]);
 
         $node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
 
@@ -87,10 +87,10 @@ public function testCompileLabelWithLabel()
 
     public function testCompileLabelWithNullLabel()
     {
-        $arguments = new Node(array(
+        $arguments = new Node([
             new NameExpression('form', 0),
             new ConstantExpression(null, 0),
-        ));
+        ]);
 
         $node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
 
@@ -109,10 +109,10 @@ public function testCompileLabelWithNullLabel()
 
     public function testCompileLabelWithEmptyStringLabel()
     {
-        $arguments = new Node(array(
+        $arguments = new Node([
             new NameExpression('form', 0),
             new ConstantExpression('', 0),
-        ));
+        ]);
 
         $node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
 
@@ -131,9 +131,9 @@ public function testCompileLabelWithEmptyStringLabel()
 
     public function testCompileLabelWithDefaultLabel()
     {
-        $arguments = new Node(array(
+        $arguments = new Node([
             new NameExpression('form', 0),
-        ));
+        ]);
 
         $node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
 
@@ -150,14 +150,14 @@ public function testCompileLabelWithDefaultLabel()
 
     public function testCompileLabelWithAttributes()
     {
-        $arguments = new Node(array(
+        $arguments = new Node([
             new NameExpression('form', 0),
             new ConstantExpression(null, 0),
-            new ArrayExpression(array(
+            new ArrayExpression([
                 new ConstantExpression('foo', 0),
                 new ConstantExpression('bar', 0),
-            ), 0),
-        ));
+            ], 0),
+        ]);
 
         $node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
 
@@ -177,16 +177,16 @@ public function testCompileLabelWithAttributes()
 
     public function testCompileLabelWithLabelAndAttributes()
     {
-        $arguments = new Node(array(
+        $arguments = new Node([
             new NameExpression('form', 0),
             new ConstantExpression('value in argument', 0),
-            new ArrayExpression(array(
+            new ArrayExpression([
                 new ConstantExpression('foo', 0),
                 new ConstantExpression('bar', 0),
                 new ConstantExpression('label', 0),
                 new ConstantExpression('value in attributes', 0),
-            ), 0),
-        ));
+            ], 0),
+        ]);
 
         $node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
 
@@ -203,7 +203,7 @@ public function testCompileLabelWithLabelAndAttributes()
 
     public function testCompileLabelWithLabelThatEvaluatesToNull()
     {
-        $arguments = new Node(array(
+        $arguments = new Node([
             new NameExpression('form', 0),
             new ConditionalExpression(
                 // if
@@ -214,7 +214,7 @@ public function testCompileLabelWithLabelThatEvaluatesToNull()
                 new ConstantExpression(null, 0),
                 0
             ),
-        ));
+        ]);
 
         $node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
 
@@ -234,7 +234,7 @@ public function testCompileLabelWithLabelThatEvaluatesToNull()
 
     public function testCompileLabelWithLabelThatEvaluatesToNullAndAttributes()
     {
-        $arguments = new Node(array(
+        $arguments = new Node([
             new NameExpression('form', 0),
             new ConditionalExpression(
                 // if
@@ -245,13 +245,13 @@ public function testCompileLabelWithLabelThatEvaluatesToNullAndAttributes()
                 new ConstantExpression(null, 0),
                 0
             ),
-            new ArrayExpression(array(
+            new ArrayExpression([
                 new ConstantExpression('foo', 0),
                 new ConstantExpression('bar', 0),
                 new ConstantExpression('label', 0),
                 new ConstantExpression('value in attributes', 0),
-            ), 0),
-        ));
+            ], 0),
+        ]);
 
         $node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php b/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php
index dd4c7136c138e..626cf73c14acb 100644
--- a/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php
@@ -29,7 +29,7 @@ public function testCompileStrict()
         $vars = new NameExpression('foo', 0);
         $node = new TransNode($body, null, null, $vars);
 
-        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), array('strict_variables' => true));
+        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), ['strict_variables' => true]);
         $compiler = new Compiler($env);
 
         $this->assertEquals(
diff --git a/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationDefaultDomainNodeVisitorTest.php b/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationDefaultDomainNodeVisitorTest.php
index eb4c9a83e86d7..5abfe1e92a6ca 100644
--- a/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationDefaultDomainNodeVisitorTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationDefaultDomainNodeVisitorTest.php
@@ -26,7 +26,7 @@ class TranslationDefaultDomainNodeVisitorTest extends TestCase
     /** @dataProvider getDefaultDomainAssignmentTestData */
     public function testDefaultDomainAssignment(Node $node)
     {
-        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), array('cache' => false, 'autoescape' => false, 'optimizations' => 0));
+        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), ['cache' => false, 'autoescape' => false, 'optimizations' => 0]);
         $visitor = new TranslationDefaultDomainNodeVisitor();
 
         // visit trans_default_domain tag
@@ -46,13 +46,13 @@ public function testDefaultDomainAssignment(Node $node)
         $visitor->enterNode($node, $env);
         $visitor->leaveNode($node, $env);
 
-        $this->assertEquals(array(array(self::$message, self::$domain)), $visitor->getMessages());
+        $this->assertEquals([[self::$message, self::$domain]], $visitor->getMessages());
     }
 
     /** @dataProvider getDefaultDomainAssignmentTestData */
     public function testNewModuleWithoutDefaultDomainTag(Node $node)
     {
-        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), array('cache' => false, 'autoescape' => false, 'optimizations' => 0));
+        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), ['cache' => false, 'autoescape' => false, 'optimizations' => 0]);
         $visitor = new TranslationDefaultDomainNodeVisitor();
 
         // visit trans_default_domain tag
@@ -72,22 +72,22 @@ public function testNewModuleWithoutDefaultDomainTag(Node $node)
         $visitor->enterNode($node, $env);
         $visitor->leaveNode($node, $env);
 
-        $this->assertEquals(array(array(self::$message, null)), $visitor->getMessages());
+        $this->assertEquals([[self::$message, null]], $visitor->getMessages());
     }
 
     public function getDefaultDomainAssignmentTestData()
     {
-        return array(
-            array(TwigNodeProvider::getTransFilter(self::$message)),
-            array(TwigNodeProvider::getTransChoiceFilter(self::$message)),
-            array(TwigNodeProvider::getTransTag(self::$message)),
+        return [
+            [TwigNodeProvider::getTransFilter(self::$message)],
+            [TwigNodeProvider::getTransChoiceFilter(self::$message)],
+            [TwigNodeProvider::getTransTag(self::$message)],
             // with named arguments
-            array(TwigNodeProvider::getTransFilter(self::$message, null, array(
-                'arguments' => new ArrayExpression(array(), 0),
-            ))),
-            array(TwigNodeProvider::getTransChoiceFilter(self::$message), null, array(
-                'arguments' => new ArrayExpression(array(), 0),
-            )),
-        );
+            [TwigNodeProvider::getTransFilter(self::$message, null, [
+                'arguments' => new ArrayExpression([], 0),
+            ])],
+            [TwigNodeProvider::getTransChoiceFilter(self::$message), null, [
+                'arguments' => new ArrayExpression([], 0),
+            ]],
+        ];
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationNodeVisitorTest.php b/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationNodeVisitorTest.php
index 9c2d0ab9e40e5..11d16e4cd6744 100644
--- a/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationNodeVisitorTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationNodeVisitorTest.php
@@ -25,7 +25,7 @@ class TranslationNodeVisitorTest extends TestCase
     /** @dataProvider getMessagesExtractionTestData */
     public function testMessagesExtraction(Node $node, array $expectedMessages)
     {
-        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), array('cache' => false, 'autoescape' => false, 'optimizations' => 0));
+        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), ['cache' => false, 'autoescape' => false, 'optimizations' => 0]);
         $visitor = new TranslationNodeVisitor();
         $visitor->enable();
         $visitor->enterNode($node, $env);
@@ -40,14 +40,14 @@ public function testMessageExtractionWithInvalidDomainNode()
         $node = new FilterExpression(
             new ConstantExpression($message, 0),
             new ConstantExpression('trans', 0),
-            new Node(array(
-                new ArrayExpression(array(), 0),
+            new Node([
+                new ArrayExpression([], 0),
                 new NameExpression('variable', 0),
-            )),
+            ]),
             0
         );
 
-        $this->testMessagesExtraction($node, array(array($message, TranslationNodeVisitor::UNDEFINED_DOMAIN)));
+        $this->testMessagesExtraction($node, [[$message, TranslationNodeVisitor::UNDEFINED_DOMAIN]]);
     }
 
     public function getMessagesExtractionTestData()
@@ -55,13 +55,13 @@ public function getMessagesExtractionTestData()
         $message = 'new key';
         $domain = 'domain';
 
-        return array(
-            array(TwigNodeProvider::getTransFilter($message), array(array($message, null))),
-            array(TwigNodeProvider::getTransChoiceFilter($message), array(array($message, null))),
-            array(TwigNodeProvider::getTransTag($message), array(array($message, null))),
-            array(TwigNodeProvider::getTransFilter($message, $domain), array(array($message, $domain))),
-            array(TwigNodeProvider::getTransChoiceFilter($message, $domain), array(array($message, $domain))),
-            array(TwigNodeProvider::getTransTag($message, $domain), array(array($message, $domain))),
-        );
+        return [
+            [TwigNodeProvider::getTransFilter($message), [[$message, null]]],
+            [TwigNodeProvider::getTransChoiceFilter($message), [[$message, null]]],
+            [TwigNodeProvider::getTransTag($message), [[$message, null]]],
+            [TwigNodeProvider::getTransFilter($message, $domain), [[$message, $domain]]],
+            [TwigNodeProvider::getTransChoiceFilter($message, $domain), [[$message, $domain]]],
+            [TwigNodeProvider::getTransTag($message, $domain), [[$message, $domain]]],
+        ];
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TwigNodeProvider.php b/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TwigNodeProvider.php
index 49eac23e8aeda..5147724675817 100644
--- a/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TwigNodeProvider.php
+++ b/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TwigNodeProvider.php
@@ -28,9 +28,9 @@ public static function getModule($content)
         return new ModuleNode(
             new ConstantExpression($content, 0),
             null,
-            new ArrayExpression(array(), 0),
-            new ArrayExpression(array(), 0),
-            new ArrayExpression(array(), 0),
+            new ArrayExpression([], 0),
+            new ArrayExpression([], 0),
+            new ArrayExpression([], 0),
             null,
             new Source('', '')
         );
@@ -39,10 +39,10 @@ public static function getModule($content)
     public static function getTransFilter($message, $domain = null, $arguments = null)
     {
         if (!$arguments) {
-            $arguments = $domain ? array(
-                new ArrayExpression(array(), 0),
+            $arguments = $domain ? [
+                new ArrayExpression([], 0),
                 new ConstantExpression($domain, 0),
-            ) : array();
+            ] : [];
         }
 
         return new FilterExpression(
@@ -56,11 +56,11 @@ public static function getTransFilter($message, $domain = null, $arguments = nul
     public static function getTransChoiceFilter($message, $domain = null, $arguments = null)
     {
         if (!$arguments) {
-            $arguments = $domain ? array(
+            $arguments = $domain ? [
                 new ConstantExpression(0, 0),
-                new ArrayExpression(array(), 0),
+                new ArrayExpression([], 0),
                 new ConstantExpression($domain, 0),
-            ) : array();
+            ] : [];
         }
 
         return new FilterExpression(
@@ -74,7 +74,7 @@ public static function getTransChoiceFilter($message, $domain = null, $arguments
     public static function getTransTag($message, $domain = null)
     {
         return new TransNode(
-            new BodyNode(array(), array('data' => $message)),
+            new BodyNode([], ['data' => $message]),
             $domain ? new ConstantExpression($domain, 0) : null
         );
     }
diff --git a/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php b/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php
index fc7af4f94de80..572685a6c4b35 100644
--- a/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php
@@ -28,7 +28,7 @@ class FormThemeTokenParserTest extends TestCase
      */
     public function testCompile($source, $expected)
     {
-        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), array('cache' => false, 'autoescape' => false, 'optimizations' => 0));
+        $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), ['cache' => false, 'autoescape' => false, 'optimizations' => 0]);
         $env->addTokenParser(new FormThemeTokenParser());
         $stream = $env->tokenize(new Source($source, ''));
         $parser = new Parser($env);
@@ -38,34 +38,34 @@ public function testCompile($source, $expected)
 
     public function getTestsForFormTheme()
     {
-        return array(
-            array(
+        return [
+            [
                 '{% form_theme form "tpl1" %}',
                 new FormThemeNode(
                     new NameExpression('form', 1),
-                    new ArrayExpression(array(
+                    new ArrayExpression([
                         new ConstantExpression(0, 1),
                         new ConstantExpression('tpl1', 1),
-                    ), 1),
+                    ], 1),
                     1,
                     'form_theme'
                 ),
-            ),
-            array(
+            ],
+            [
                 '{% form_theme form "tpl1" "tpl2" %}',
                 new FormThemeNode(
                     new NameExpression('form', 1),
-                    new ArrayExpression(array(
+                    new ArrayExpression([
                         new ConstantExpression(0, 1),
                         new ConstantExpression('tpl1', 1),
                         new ConstantExpression(1, 1),
                         new ConstantExpression('tpl2', 1),
-                    ), 1),
+                    ], 1),
                     1,
                     'form_theme'
                 ),
-            ),
-            array(
+            ],
+            [
                 '{% form_theme form with "tpl1" %}',
                 new FormThemeNode(
                     new NameExpression('form', 1),
@@ -73,48 +73,48 @@ public function getTestsForFormTheme()
                     1,
                     'form_theme'
                 ),
-            ),
-            array(
+            ],
+            [
                 '{% form_theme form with ["tpl1"] %}',
                 new FormThemeNode(
                     new NameExpression('form', 1),
-                    new ArrayExpression(array(
+                    new ArrayExpression([
                         new ConstantExpression(0, 1),
                         new ConstantExpression('tpl1', 1),
-                    ), 1),
+                    ], 1),
                     1,
                     'form_theme'
                 ),
-            ),
-            array(
+            ],
+            [
                 '{% form_theme form with ["tpl1", "tpl2"] %}',
                 new FormThemeNode(
                     new NameExpression('form', 1),
-                    new ArrayExpression(array(
+                    new ArrayExpression([
                         new ConstantExpression(0, 1),
                         new ConstantExpression('tpl1', 1),
                         new ConstantExpression(1, 1),
                         new ConstantExpression('tpl2', 1),
-                    ), 1),
+                    ], 1),
                     1,
                     'form_theme'
                 ),
-            ),
-            array(
+            ],
+            [
                 '{% form_theme form with ["tpl1", "tpl2"] only %}',
                 new FormThemeNode(
                     new NameExpression('form', 1),
-                    new ArrayExpression(array(
+                    new ArrayExpression([
                         new ConstantExpression(0, 1),
                         new ConstantExpression('tpl1', 1),
                         new ConstantExpression(1, 1),
                         new ConstantExpression('tpl2', 1),
-                    ), 1),
+                    ], 1),
                     1,
                     'form_theme',
                     true
                 ),
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php b/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
index 8e5c84bbc987f..df8ce2784a154 100644
--- a/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
@@ -105,11 +105,11 @@ public function testExtractSyntaxError($resources)
      */
     public function resourcesWithSyntaxErrorsProvider()
     {
-        return array(
-            array(__DIR__.'/../Fixtures'),
-            array(__DIR__.'/../Fixtures/extractor/syntax_error.twig'),
-            array(new \SplFileInfo(__DIR__.'/../Fixtures/extractor/syntax_error.twig')),
-        );
+        return [
+            [__DIR__.'/../Fixtures'],
+            [__DIR__.'/../Fixtures/extractor/syntax_error.twig'],
+            [new \SplFileInfo(__DIR__.'/../Fixtures/extractor/syntax_error.twig')],
+        ];
     }
 
     /**
@@ -141,12 +141,12 @@ public function resourceProvider()
     {
         $directory = __DIR__.'/../Fixtures/extractor/';
 
-        return array(
-            array($directory.'with_translations.html.twig'),
-            array(array($directory.'with_translations.html.twig')),
-            array(array(new \SplFileInfo($directory.'with_translations.html.twig'))),
-            array(new \ArrayObject(array($directory.'with_translations.html.twig'))),
-            array(new \ArrayObject(array(new \SplFileInfo($directory.'with_translations.html.twig')))),
-        );
+        return [
+            [$directory.'with_translations.html.twig'],
+            [[$directory.'with_translations.html.twig']],
+            [[new \SplFileInfo($directory.'with_translations.html.twig')]],
+            [new \ArrayObject([$directory.'with_translations.html.twig'])],
+            [new \ArrayObject([new \SplFileInfo($directory.'with_translations.html.twig')])],
+        ];
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/TwigEngineTest.php b/src/Symfony/Bridge/Twig/Tests/TwigEngineTest.php
index a74c59e8d28c9..ab932eebc3dcf 100644
--- a/src/Symfony/Bridge/Twig/Tests/TwigEngineTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/TwigEngineTest.php
@@ -23,7 +23,7 @@ public function testExistsWithTemplateInstances()
     {
         $engine = $this->getTwig();
 
-        $this->assertTrue($engine->exists($this->getMockForAbstractClass('Twig\Template', array(), '', false)));
+        $this->assertTrue($engine->exists($this->getMockForAbstractClass('Twig\Template', [], '', false)));
     }
 
     public function testExistsWithNonExistentTemplates()
@@ -70,10 +70,10 @@ public function testRenderWithError()
 
     protected function getTwig()
     {
-        $twig = new Environment(new ArrayLoader(array(
+        $twig = new Environment(new ArrayLoader([
             'index' => 'foo',
             'error' => '{{ foo }',
-        )));
+        ]));
         $parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
 
         return new TwigEngine($twig, $parser);
diff --git a/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php
index 2388cc56623be..ffef9e9859277 100644
--- a/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php
+++ b/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php
@@ -45,7 +45,7 @@ public function parse(Token $token)
                 $only = true;
             }
         } else {
-            $resources = new ArrayExpression(array(), $stream->getCurrent()->getLine());
+            $resources = new ArrayExpression([], $stream->getCurrent()->getLine());
             do {
                 $resources->addElement($this->parser->getExpressionParser()->parseExpression());
             } while (!$stream->test(Token::BLOCK_END_TYPE));
diff --git a/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php
index 82c58d40bbf8d..4cf4ffcd7e9c5 100644
--- a/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php
+++ b/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php
@@ -41,7 +41,7 @@ public function parse(Token $token)
         $stream->expect(Token::BLOCK_END_TYPE);
 
         // {% endstopwatch %}
-        $body = $this->parser->subparse(array($this, 'decideStopwatchEnd'), true);
+        $body = $this->parser->subparse([$this, 'decideStopwatchEnd'], true);
         $stream->expect(Token::BLOCK_END_TYPE);
 
         if ($this->stopwatchIsAvailable) {
diff --git a/src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php
index 5261d7ad52cee..bd375f18a7841 100644
--- a/src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php
+++ b/src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php
@@ -65,7 +65,7 @@ public function parse(Token $token)
 
         $stream->expect(Token::BLOCK_END_TYPE);
 
-        $body = $this->parser->subparse(array($this, 'decideTransChoiceFork'), true);
+        $body = $this->parser->subparse([$this, 'decideTransChoiceFork'], true);
 
         if (!$body instanceof TextNode && !$body instanceof AbstractExpression) {
             throw new SyntaxError('A message inside a transchoice tag must be a simple text.', $body->getTemplateLine(), $stream->getSourceContext()->getName());
@@ -78,7 +78,7 @@ public function parse(Token $token)
 
     public function decideTransChoiceFork($token)
     {
-        return $token->test(array('endtranschoice'));
+        return $token->test(['endtranschoice']);
     }
 
     /**
diff --git a/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php
index 76c8dc06100c1..c77c8affa5072 100644
--- a/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php
+++ b/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php
@@ -66,7 +66,7 @@ public function parse(Token $token)
 
         // {% trans %}message{% endtrans %}
         $stream->expect(Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse(array($this, 'decideTransFork'), true);
+        $body = $this->parser->subparse([$this, 'decideTransFork'], true);
 
         if (!$body instanceof TextNode && !$body instanceof AbstractExpression) {
             throw new SyntaxError('A message inside a trans tag must be a simple text.', $body->getTemplateLine(), $stream->getSourceContext()->getName());
@@ -79,7 +79,7 @@ public function parse(Token $token)
 
     public function decideTransFork($token)
     {
-        return $token->test(array('endtrans'));
+        return $token->test(['endtrans']);
     }
 
     /**
diff --git a/src/Symfony/Bridge/Twig/TwigEngine.php b/src/Symfony/Bridge/Twig/TwigEngine.php
index bc0a4fecc9af5..4789f3f4d60b0 100644
--- a/src/Symfony/Bridge/Twig/TwigEngine.php
+++ b/src/Symfony/Bridge/Twig/TwigEngine.php
@@ -44,7 +44,7 @@ public function __construct(Environment $environment, TemplateNameParserInterfac
      *
      * @throws Error if something went wrong like a thrown exception while rendering the template
      */
-    public function render($name, array $parameters = array())
+    public function render($name, array $parameters = [])
     {
         return $this->load($name)->render($parameters);
     }
@@ -56,7 +56,7 @@ public function render($name, array $parameters = array())
      *
      * @throws Error if something went wrong like a thrown exception while rendering the template
      */
-    public function stream($name, array $parameters = array())
+    public function stream($name, array $parameters = [])
     {
         $this->load($name)->display($parameters);
     }
diff --git a/src/Symfony/Bridge/Twig/UndefinedCallableHandler.php b/src/Symfony/Bridge/Twig/UndefinedCallableHandler.php
index c81d1cac7d3d0..8476e89cab0ee 100644
--- a/src/Symfony/Bridge/Twig/UndefinedCallableHandler.php
+++ b/src/Symfony/Bridge/Twig/UndefinedCallableHandler.php
@@ -19,15 +19,15 @@
  */
 class UndefinedCallableHandler
 {
-    private static $filterComponents = array(
+    private static $filterComponents = [
         'humanize' => 'form',
         'trans' => 'translation',
         'transchoice' => 'translation',
         'yaml_encode' => 'yaml',
         'yaml_dump' => 'yaml',
-    );
+    ];
 
-    private static $functionComponents = array(
+    private static $functionComponents = [
         'asset' => 'asset',
         'asset_version' => 'asset',
         'dump' => 'debug-bundle',
@@ -54,15 +54,15 @@ class UndefinedCallableHandler
         'workflow_transitions' => 'workflow',
         'workflow_has_marked_place' => 'workflow',
         'workflow_marked_places' => 'workflow',
-    );
+    ];
 
-    private static $fullStackEnable = array(
+    private static $fullStackEnable = [
         'form' => 'enable "framework.form"',
         'security-core' => 'add the "SecurityBundle"',
         'security-http' => 'add the "SecurityBundle"',
         'web-link' => 'enable "framework.web_link"',
         'workflow' => 'enable "framework.workflows"',
-    );
+    ];
 
     public static function onUndefinedFilter($name)
     {
diff --git a/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php b/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php
index d7c0ee7287468..59cd3343ab9af 100644
--- a/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php
+++ b/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php
@@ -39,9 +39,9 @@ public function load(array $configs, ContainerBuilder $container)
         $container->getDefinition('var_dumper.cli_dumper')->setPrivate(true);
 
         $container->getDefinition('var_dumper.cloner')
-            ->addMethodCall('setMaxItems', array($config['max_items']))
-            ->addMethodCall('setMinDepth', array($config['min_depth']))
-            ->addMethodCall('setMaxString', array($config['max_string_length']));
+            ->addMethodCall('setMaxItems', [$config['max_items']])
+            ->addMethodCall('setMinDepth', [$config['min_depth']])
+            ->addMethodCall('setMaxString', [$config['max_string_length']]);
 
         if (null !== $config['dump_destination']) {
             $container->getDefinition('var_dumper.cli_dumper')
diff --git a/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/Compiler/DumpDataCollectorPassTest.php b/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/Compiler/DumpDataCollectorPassTest.php
index 6f49c021260ed..0b518ee00f71a 100644
--- a/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/Compiler/DumpDataCollectorPassTest.php
+++ b/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/Compiler/DumpDataCollectorPassTest.php
@@ -25,7 +25,7 @@ public function testProcessWithoutFileLinkFormatParameter()
         $container = new ContainerBuilder();
         $container->addCompilerPass(new DumpDataCollectorPass());
 
-        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', array(null, null, null, null));
+        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', [null, null, null, null]);
         $container->setDefinition('data_collector.dump', $definition);
 
         $container->compile();
@@ -39,7 +39,7 @@ public function testProcessWithToolbarEnabled()
         $container->addCompilerPass(new DumpDataCollectorPass());
         $requestStack = new RequestStack();
 
-        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', array(null, null, null, $requestStack));
+        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', [null, null, null, $requestStack]);
         $container->setDefinition('data_collector.dump', $definition);
         $container->setParameter('web_profiler.debug_toolbar.mode', WebDebugToolbarListener::ENABLED);
 
@@ -53,7 +53,7 @@ public function testProcessWithToolbarDisabled()
         $container = new ContainerBuilder();
         $container->addCompilerPass(new DumpDataCollectorPass());
 
-        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', array(null, null, null, new RequestStack()));
+        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', [null, null, null, new RequestStack()]);
         $container->setDefinition('data_collector.dump', $definition);
         $container->setParameter('web_profiler.debug_toolbar.mode', WebDebugToolbarListener::DISABLED);
 
@@ -67,7 +67,7 @@ public function testProcessWithoutToolbar()
         $container = new ContainerBuilder();
         $container->addCompilerPass(new DumpDataCollectorPass());
 
-        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', array(null, null, null, new RequestStack()));
+        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', [null, null, null, new RequestStack()]);
         $container->setDefinition('data_collector.dump', $definition);
 
         $container->compile();
diff --git a/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/DebugExtensionTest.php b/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/DebugExtensionTest.php
index 0c285a02ac180..cd6084c5e3bce 100644
--- a/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/DebugExtensionTest.php
+++ b/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/DebugExtensionTest.php
@@ -22,36 +22,36 @@ public function testLoadWithoutConfiguration()
     {
         $container = $this->createContainer();
         $container->registerExtension(new DebugExtension());
-        $container->loadFromExtension('debug', array());
+        $container->loadFromExtension('debug', []);
         $this->compileContainer($container);
 
-        $expectedTags = array(
-            array(
+        $expectedTags = [
+            [
                 'id' => 'dump',
                 'template' => '@Debug/Profiler/dump.html.twig',
                 'priority' => 240,
-            ),
-        );
+            ],
+        ];
 
         $this->assertSame($expectedTags, $container->getDefinition('data_collector.dump')->getTag('data_collector'));
     }
 
     private function createContainer()
     {
-        $container = new ContainerBuilder(new ParameterBag(array(
+        $container = new ContainerBuilder(new ParameterBag([
             'kernel.cache_dir' => __DIR__,
             'kernel.charset' => 'UTF-8',
             'kernel.debug' => true,
-            'kernel.bundles' => array('DebugBundle' => 'Symfony\\Bundle\\DebugBundle\\DebugBundle'),
-        )));
+            'kernel.bundles' => ['DebugBundle' => 'Symfony\\Bundle\\DebugBundle\\DebugBundle'],
+        ]));
 
         return $container;
     }
 
     private function compileContainer(ContainerBuilder $container)
     {
-        $container->getCompilerPassConfig()->setOptimizationPasses(array());
-        $container->getCompilerPassConfig()->setRemovingPasses(array());
+        $container->getCompilerPassConfig()->setOptimizationPasses([]);
+        $container->getCompilerPassConfig()->setRemovingPasses([]);
         $container->compile();
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
index 25801a7829c91..43cbb7968a8ad 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
@@ -54,13 +54,13 @@ public function warmUp($cacheDir)
     {
         $arrayAdapter = new ArrayAdapter();
 
-        spl_autoload_register(array(PhpArrayAdapter::class, 'throwOnRequiredClass'));
+        spl_autoload_register([PhpArrayAdapter::class, 'throwOnRequiredClass']);
         try {
             if (!$this->doWarmUp($cacheDir, $arrayAdapter)) {
                 return;
             }
         } finally {
-            spl_autoload_unregister(array(PhpArrayAdapter::class, 'throwOnRequiredClass'));
+            spl_autoload_unregister([PhpArrayAdapter::class, 'throwOnRequiredClass']);
         }
 
         // the ArrayAdapter stores the values serialized
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php
index 795fdbfc514a5..e3ef1f0553eb7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php
@@ -71,8 +71,8 @@ public function isOptional()
      */
     public static function getSubscribedServices()
     {
-        return array(
+        return [
             'router' => RouterInterface::class,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php
index 22d2bcfe9cf50..917ea47235fd7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php
@@ -74,7 +74,7 @@ protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)
      */
     private function extractSupportedLoaders(array $loaders)
     {
-        $supportedLoaders = array();
+        $supportedLoaders = [];
 
         foreach ($loaders as $loader) {
             if ($loader instanceof XmlFileLoader || $loader instanceof YamlFileLoader) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php
index 4ceca5c6be86b..e3eea295e64e3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php
@@ -52,7 +52,7 @@ public function findAllTemplates()
             return $this->templates;
         }
 
-        $templates = array();
+        $templates = [];
 
         foreach ($this->kernel->getBundles() as $bundle) {
             $templates = array_merge($templates, $this->findTemplatesInBundle($bundle));
@@ -72,7 +72,7 @@ public function findAllTemplates()
      */
     private function findTemplatesInFolder($dir)
     {
-        $templates = array();
+        $templates = [];
 
         if (is_dir($dir)) {
             $finder = new Finder();
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php
index 523d7ecce0af5..6662a1808d5e1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php
@@ -39,7 +39,7 @@ public function __construct(TemplateFinderInterface $finder, TemplateLocator $lo
     public function warmUp($cacheDir)
     {
         $filesystem = new Filesystem();
-        $templates = array();
+        $templates = [];
 
         foreach ($this->finder->findAllTemplates() as $template) {
             $templates[$template->getLogicalName()] = rtrim($filesystem->makePathRelative($this->locator->locate($template), $cacheDir), '/');
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php
index 7d9ec9f9d45c1..b4439eff48d82 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php
@@ -72,8 +72,8 @@ public function isOptional()
      */
     public static function getSubscribedServices()
     {
-        return array(
+        return [
             'translator' => TranslatorInterface::class,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
index 2fb4ace86401c..8ac38133c06ee 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
@@ -85,7 +85,7 @@ protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array
      */
     private function extractSupportedLoaders(array $loaders)
     {
-        $supportedLoaders = array();
+        $supportedLoaders = [];
 
         foreach ($loaders as $loader) {
             if ($loader instanceof XmlFileLoader || $loader instanceof YamlFileLoader) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Client.php b/src/Symfony/Bundle/FrameworkBundle/Client.php
index c86a2772eb3cd..6473f97584f39 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Client.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Client.php
@@ -34,7 +34,7 @@ class Client extends BaseClient
     /**
      * {@inheritdoc}
      */
-    public function __construct(KernelInterface $kernel, array $server = array(), History $history = null, CookieJar $cookieJar = null)
+    public function __construct(KernelInterface $kernel, array $server = [], History $history = null, CookieJar $cookieJar = null)
     {
         parent::__construct($kernel, $server, $history, $cookieJar);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
index c7016c4ba3dd2..eb83530df37eb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
@@ -130,7 +130,7 @@ private static function isExpired($date)
 
     private static function getDotenvVars()
     {
-        $vars = array();
+        $vars = [];
         foreach (explode(',', getenv('SYMFONY_DOTENV_VARS')) as $name) {
             if ('' !== $name && false !== $value = getenv($name)) {
                 $vars[$name] = $value;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
index 6d8960cd031ed..cc1b858abb337 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
@@ -29,8 +29,8 @@ abstract class AbstractConfigCommand extends ContainerDebugCommand
     protected function listBundles($output)
     {
         $title = 'Available registered bundles with their extension alias if available';
-        $headers = array('Bundle name', 'Extension alias');
-        $rows = array();
+        $headers = ['Bundle name', 'Extension alias'];
+        $rows = [];
 
         $bundles = $this->getApplication()->getKernel()->getBundles();
         usort($bundles, function ($bundleA, $bundleB) {
@@ -39,7 +39,7 @@ protected function listBundles($output)
 
         foreach ($bundles as $bundle) {
             $extension = $bundle->getContainerExtension();
-            $rows[] = array($bundle->getName(), $extension ? $extension->getAlias() : '');
+            $rows[] = [$bundle->getName(), $extension ? $extension->getAlias() : ''];
         }
 
         if ($output instanceof StyleInterface) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
index a52fe67aba7d8..bcd224dce1508 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
@@ -64,9 +64,9 @@ public function __construct($filesystem = null)
     protected function configure()
     {
         $this
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('target', InputArgument::OPTIONAL, 'The target directory', 'public'),
-            ))
+            ])
             ->addOption('symlink', null, InputOption::VALUE_NONE, 'Symlinks the assets instead of copying it')
             ->addOption('relative', null, InputOption::VALUE_NONE, 'Make relative symlinks')
             ->setDescription('Installs bundles web assets under a public directory')
@@ -139,10 +139,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $io->newLine();
 
-        $rows = array();
+        $rows = [];
         $copyUsed = false;
         $exitCode = 0;
-        $validAssetDirs = array();
+        $validAssetDirs = [];
         /** @var BundleInterface $bundle */
         foreach ($kernel->getBundles() as $bundle) {
             if (!is_dir($originDir = $bundle->getPath().'/Resources/public')) {
@@ -175,13 +175,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 }
 
                 if ($method === $expectedMethod) {
-                    $rows[] = array(sprintf('<fg=green;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'OK' : "\xE2\x9C\x94" /* HEAVY CHECK MARK (U+2714) */), $message, $method);
+                    $rows[] = [sprintf('<fg=green;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'OK' : "\xE2\x9C\x94" /* HEAVY CHECK MARK (U+2714) */), $message, $method];
                 } else {
-                    $rows[] = array(sprintf('<fg=yellow;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'WARNING' : '!'), $message, $method);
+                    $rows[] = [sprintf('<fg=yellow;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'WARNING' : '!'), $message, $method];
                 }
             } catch (\Exception $e) {
                 $exitCode = 1;
-                $rows[] = array(sprintf('<fg=red;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'ERROR' : "\xE2\x9C\x98" /* HEAVY BALLOT X (U+2718) */), $message, $e->getMessage());
+                $rows[] = [sprintf('<fg=red;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'ERROR' : "\xE2\x9C\x98" /* HEAVY BALLOT X (U+2718) */), $message, $e->getMessage()];
             }
         }
         // remove the assets of the bundles that no longer exist
@@ -191,7 +191,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         if ($rows) {
-            $io->table(array('', 'Bundle', 'Method / Error'), $rows);
+            $io->table(['', 'Bundle', 'Method / Error'], $rows);
         }
 
         if (0 !== $exitCode) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
index 6c5f0e1293fb6..4fefd3c2db2a8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -66,10 +66,10 @@ public function __construct($cacheClearer = null, Filesystem $filesystem = null)
     protected function configure()
     {
         $this
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputOption('no-warmup', '', InputOption::VALUE_NONE, 'Do not warm up the cache'),
                 new InputOption('no-optional-warmers', '', InputOption::VALUE_NONE, 'Skip optional cache warmers (faster)'),
-            ))
+            ])
             ->setDescription('Clears the cache')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command clears the application cache for a given environment
@@ -222,7 +222,7 @@ protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = tr
         $warmer->warmUp($warmupDir);
 
         // fix references to cached files with the real cache directory name
-        $search = array($warmupDir, str_replace('\\', '\\\\', $warmupDir));
+        $search = [$warmupDir, str_replace('\\', '\\\\', $warmupDir)];
         $replace = str_replace('\\', '/', $realCacheDir);
         foreach (Finder::create()->files()->in($warmupDir) as $file) {
             $content = str_replace($search, $replace, file_get_contents($file), $count);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php
index 43b27e673f894..dfb4df194fda7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php
@@ -54,9 +54,9 @@ public function __construct($poolClearer = null)
     protected function configure()
     {
         $this
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('pools', InputArgument::IS_ARRAY | InputArgument::REQUIRED, 'A list of cache pools or cache pool clearers'),
-            ))
+            ])
             ->setDescription('Clears cache pools')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command clears the given cache pools or cache pool clearers.
@@ -80,8 +80,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $io = new SymfonyStyle($input, $output);
         $kernel = $this->getApplication()->getKernel();
-        $pools = array();
-        $clearers = array();
+        $pools = [];
+        $clearers = [];
 
         foreach ($input->getArgument('pools') as $id) {
             if ($this->poolClearer->hasPool($id)) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php
index 593b93475564e..0893f2db53b0d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php
@@ -54,9 +54,9 @@ public function __construct($cacheWarmer = null)
     protected function configure()
     {
         $this
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputOption('no-optional-warmers', '', InputOption::VALUE_NONE, 'Skip optional cache warmers (faster)'),
-            ))
+            ])
             ->setDescription('Warms up an empty cache')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command warms up the cache.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
index 658f1f9e0184a..758c605ecfa01 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
@@ -36,10 +36,10 @@ class ConfigDebugCommand extends AbstractConfigCommand
     protected function configure()
     {
         $this
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('name', InputArgument::OPTIONAL, 'The bundle name or the extension alias'),
                 new InputArgument('path', InputArgument::OPTIONAL, 'The configuration option path'),
-            ))
+            ])
             ->setDescription('Dumps the current configuration for an extension')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command dumps the current configuration for an
@@ -94,7 +94,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 sprintf('Current configuration for %s', ($name === $extensionAlias ? sprintf('extension with alias "%s"', $extensionAlias) : sprintf('"%s"', $name)))
             );
 
-            $io->writeln(Yaml::dump(array($extensionAlias => $config), 10));
+            $io->writeln(Yaml::dump([$extensionAlias => $config], 10));
 
             return;
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
index bdcf13e8d650c..37b179899830f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
@@ -39,11 +39,11 @@ class ConfigDumpReferenceCommand extends AbstractConfigCommand
     protected function configure()
     {
         $this
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('name', InputArgument::OPTIONAL, 'The Bundle name or the extension alias'),
                 new InputArgument('path', InputArgument::OPTIONAL, 'The configuration option path'),
                 new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (yaml or xml)', 'yaml'),
-            ))
+            ])
             ->setDescription('Dumps the default configuration for an extension')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command dumps the default configuration for an
@@ -81,17 +81,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if (null === $name = $input->getArgument('name')) {
             $this->listBundles($errorIo);
-            $errorIo->comment(array(
+            $errorIo->comment([
                 'Provide the name of a bundle as the first argument of this command to dump its default configuration. (e.g. <comment>config:dump-reference FrameworkBundle</comment>)',
                 'For dumping a specific option, add its path as the second argument of this command. (e.g. <comment>config:dump-reference FrameworkBundle profiler.matcher</comment> to dump the <comment>framework.profiler.matcher</comment> configuration)',
-            ));
+            ]);
 
             return;
         }
 
         $extension = $this->findExtension($name);
 
-        $configuration = $extension->getConfiguration(array(), $this->getContainerBuilder());
+        $configuration = $extension->getConfiguration([], $this->getContainerBuilder());
 
         $this->validateConfiguration($extension, $configuration);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
index ad7affab87d8b..5b44c53afe2f2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -46,7 +46,7 @@ class ContainerDebugCommand extends ContainerAwareCommand
     protected function configure()
     {
         $this
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('name', InputArgument::OPTIONAL, 'A service name (foo)'),
                 new InputOption('show-private', null, InputOption::VALUE_NONE, 'Used to show public *and* private services'),
                 new InputOption('show-arguments', null, InputOption::VALUE_NONE, 'Used to show arguments in services'),
@@ -57,7 +57,7 @@ protected function configure()
                 new InputOption('types', null, InputOption::VALUE_NONE, 'Displays types (classes/interfaces) available in the container'),
                 new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt, xml, json, or md)', 'txt'),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw description'),
-            ))
+            ])
             ->setDescription('Displays current services for an application')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command displays all configured <comment>public</comment> services:
@@ -157,7 +157,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
      */
     protected function validateInput(InputInterface $input)
     {
-        $options = array('tags', 'tag', 'parameters', 'parameter');
+        $options = ['tags', 'tag', 'parameters', 'parameter'];
 
         $optionsCount = 0;
         foreach ($options as $option) {
@@ -192,7 +192,7 @@ protected function getContainerBuilder()
         if (!$kernel->isDebug() || !(new ConfigCache($kernel->getContainer()->getParameter('debug.container.dump'), true))->isFresh()) {
             $buildContainer = \Closure::bind(function () { return $this->buildContainer(); }, $kernel, \get_class($kernel));
             $container = $buildContainer();
-            $container->getCompilerPassConfig()->setRemovingPasses(array());
+            $container->getCompilerPassConfig()->setRemovingPasses([]);
             $container->compile();
         } else {
             (new XmlFileLoader($container = new ContainerBuilder(), new FileLocator()))->load($kernel->getContainer()->getParameter('debug.container.dump'));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
index 23d688495db74..41baf3889219f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
@@ -62,7 +62,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $builder = $this->getContainerBuilder();
         $serviceIds = $builder->getServiceIds();
-        $serviceIds = array_filter($serviceIds, array($this, 'filterToServiceTypes'));
+        $serviceIds = array_filter($serviceIds, [$this, 'filterToServiceTypes']);
 
         if ($search = $input->getArgument('search')) {
             $serviceIds = array_filter($serviceIds, function ($serviceId) use ($search) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php
index 9f7a916fdf254..846895323a7f9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php
@@ -55,11 +55,11 @@ public function __construct($dispatcher = null)
     protected function configure()
     {
         $this
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('event', InputArgument::OPTIONAL, 'An event name'),
                 new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format  (txt, xml, json, or md)', 'txt'),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw description'),
-            ))
+            ])
             ->setDescription('Displays configured listeners for an application')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command displays all configured listeners:
@@ -88,7 +88,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $io = new SymfonyStyle($input, $output);
 
-        $options = array();
+        $options = [];
         if ($event = $input->getArgument('event')) {
             if (!$this->dispatcher->hasListeners($event)) {
                 $io->getErrorStyle()->warning(sprintf('The event "%s" does not have any registered listeners.', $event));
@@ -96,7 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 return;
             }
 
-            $options = array('event' => $event);
+            $options = ['event' => $event];
         }
 
         $helper = new DescriptorHelper();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
index fbf7ba9d8e04d..5a906b24bbc1d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
@@ -81,12 +81,12 @@ public function isEnabled()
     protected function configure()
     {
         $this
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('name', InputArgument::OPTIONAL, 'A route name'),
                 new InputOption('show-controllers', null, InputOption::VALUE_NONE, 'Show assigned controllers in overview'),
                 new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt, xml, json, or md)', 'txt'),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw route(s)'),
-            ))
+            ])
             ->setDescription('Displays current routes for an application')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> displays the configured routes:
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
index 7ea1af66dd9a1..972c055bd162a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
@@ -78,12 +78,12 @@ public function isEnabled()
     protected function configure()
     {
         $this
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('path_info', InputArgument::REQUIRED, 'A path info'),
                 new InputOption('method', null, InputOption::VALUE_REQUIRED, 'Sets the HTTP method'),
                 new InputOption('scheme', null, InputOption::VALUE_REQUIRED, 'Sets the URI scheme (usually http or https)'),
                 new InputOption('host', null, InputOption::VALUE_REQUIRED, 'Sets the URI host'),
-            ))
+            ])
             ->setDescription('Helps debug routes by simulating a path info match')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> shows which routes match a given request and which don't and for what reason:
@@ -136,7 +136,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $io->success(sprintf('Route "%s" matches', $trace['name']));
 
                 $routerDebugCommand = $this->getApplication()->find('debug:router');
-                $routerDebugCommand->run(new ArrayInput(array('name' => $trace['name'])), $output);
+                $routerDebugCommand->run(new ArrayInput(['name' => $trace['name']]), $output);
 
                 $matches = true;
             } elseif ($input->getOption('verbose')) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
index cd737e88f3c45..52bba3f9e2e41 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
@@ -74,14 +74,14 @@ public function __construct($translator = null, TranslationReaderInterface $read
     protected function configure()
     {
         $this
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('locale', InputArgument::REQUIRED, 'The locale'),
                 new InputArgument('bundle', InputArgument::OPTIONAL, 'The bundle name or directory where to load the messages'),
                 new InputOption('domain', null, InputOption::VALUE_OPTIONAL, 'The messages domain'),
                 new InputOption('only-missing', null, InputOption::VALUE_NONE, 'Displays only missing messages'),
                 new InputOption('only-unused', null, InputOption::VALUE_NONE, 'Displays only unused messages'),
                 new InputOption('all', null, InputOption::VALUE_NONE, 'Load messages from all registered bundles'),
-            ))
+            ])
             ->setDescription('Displays translation messages information')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command helps finding unused or missing translation
@@ -213,7 +213,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $mergeOperation = new MergeOperation($extractedCatalogue, $currentCatalogue);
         $allMessages = $mergeOperation->getResult()->all($domain);
         if (null !== $domain) {
-            $allMessages = array($domain => $allMessages);
+            $allMessages = [$domain => $allMessages];
         }
 
         // No defined or extracted messages
@@ -233,16 +233,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $fallbackCatalogues = $this->loadFallbackCatalogues($locale, $transPaths);
 
         // Display header line
-        $headers = array('State', 'Domain', 'Id', sprintf('Message Preview (%s)', $locale));
+        $headers = ['State', 'Domain', 'Id', sprintf('Message Preview (%s)', $locale)];
         foreach ($fallbackCatalogues as $fallbackCatalogue) {
             $headers[] = sprintf('Fallback Message Preview (%s)', $fallbackCatalogue->getLocale());
         }
-        $rows = array();
+        $rows = [];
         // Iterate all message ids and determine their state
         foreach ($allMessages as $domain => $messages) {
             foreach (array_keys($messages) as $messageId) {
                 $value = $currentCatalogue->get($messageId, $domain);
-                $states = array();
+                $states = [];
 
                 if ($extractedCatalogue->defines($messageId, $domain)) {
                     if (!$currentCatalogue->defines($messageId, $domain)) {
@@ -265,7 +265,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     }
                 }
 
-                $row = array($this->formatStates($states), $domain, $this->formatId($messageId), $this->sanitizeString($value));
+                $row = [$this->formatStates($states), $domain, $this->formatId($messageId), $this->sanitizeString($value)];
                 foreach ($fallbackCatalogues as $fallbackCatalogue) {
                     $row[] = $this->sanitizeString($fallbackCatalogue->get($messageId, $domain));
                 }
@@ -296,7 +296,7 @@ private function formatState($state)
 
     private function formatStates(array $states)
     {
-        $result = array();
+        $result = [];
         foreach ($states as $state) {
             $result[] = $this->formatState($state);
         }
@@ -368,7 +368,7 @@ private function loadCurrentMessages($locale, $transPaths)
      */
     private function loadFallbackCatalogues($locale, $transPaths)
     {
-        $fallbackCatalogues = array();
+        $fallbackCatalogues = [];
         if ($this->translator instanceof Translator || $this->translator instanceof DataCollectorTranslator || $this->translator instanceof LoggingTranslator) {
             foreach ($this->translator->getFallbackLocales() as $fallbackLocale) {
                 if ($fallbackLocale === $locale) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
index 0926501306c33..38d23b862a769 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -78,7 +78,7 @@ public function __construct($writer = null, TranslationReaderInterface $reader =
     protected function configure()
     {
         $this
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('locale', InputArgument::REQUIRED, 'The locale'),
                 new InputArgument('bundle', InputArgument::OPTIONAL, 'The bundle name or directory where to load the messages'),
                 new InputOption('prefix', null, InputOption::VALUE_OPTIONAL, 'Override the default prefix', '__'),
@@ -89,7 +89,7 @@ protected function configure()
                 new InputOption('no-backup', null, InputOption::VALUE_NONE, 'Should backup be disabled'),
                 new InputOption('clean', null, InputOption::VALUE_NONE, 'Should clean not found messages'),
                 new InputOption('domain', null, InputOption::VALUE_OPTIONAL, 'Specify the domain to update'),
-            ))
+            ])
             ->setDescription('Updates the translation file')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command extracts translation strings from templates
@@ -299,7 +299,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $bundleTransPath = end($transPaths);
             }
 
-            $this->writer->write($operation->getResult(), $input->getOption('output-format'), array('path' => $bundleTransPath, 'default_locale' => $this->defaultLocale));
+            $this->writer->write($operation->getResult(), $input->getOption('output-format'), ['path' => $bundleTransPath, 'default_locale' => $this->defaultLocale]);
 
             if (true === $input->getOption('dump-messages')) {
                 $resultMessage .= ' and translation files were updated';
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
index 10255a4886733..04312e7983228 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
@@ -31,7 +31,7 @@ class Application extends BaseApplication
 {
     private $kernel;
     private $commandsRegistered = false;
-    private $registrationErrors = array();
+    private $registrationErrors = [];
 
     public function __construct(KernelInterface $kernel)
     {
@@ -166,7 +166,7 @@ protected function registerCommands()
         }
 
         if ($container->hasParameter('console.command.ids')) {
-            $lazyCommandIds = $container->hasParameter('console.lazy_command.ids') ? $container->getParameter('console.lazy_command.ids') : array();
+            $lazyCommandIds = $container->hasParameter('console.lazy_command.ids') ? $container->getParameter('console.lazy_command.ids') : [];
             foreach ($container->getParameter('console.command.ids') as $id) {
                 if (!isset($lazyCommandIds[$id])) {
                     try {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
index be1ef79d205af..fda0fb28d3039 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -36,7 +36,7 @@ abstract class Descriptor implements DescriptorInterface
     /**
      * {@inheritdoc}
      */
-    public function describe(OutputInterface $output, $object, array $options = array())
+    public function describe(OutputInterface $output, $object, array $options = [])
     {
         $this->output = $output;
 
@@ -103,22 +103,22 @@ protected function write($content, $decorated = false)
     /**
      * Describes an InputArgument instance.
      */
-    abstract protected function describeRouteCollection(RouteCollection $routes, array $options = array());
+    abstract protected function describeRouteCollection(RouteCollection $routes, array $options = []);
 
     /**
      * Describes an InputOption instance.
      */
-    abstract protected function describeRoute(Route $route, array $options = array());
+    abstract protected function describeRoute(Route $route, array $options = []);
 
     /**
      * Describes container parameters.
      */
-    abstract protected function describeContainerParameters(ParameterBag $parameters, array $options = array());
+    abstract protected function describeContainerParameters(ParameterBag $parameters, array $options = []);
 
     /**
      * Describes container tags.
      */
-    abstract protected function describeContainerTags(ContainerBuilder $builder, array $options = array());
+    abstract protected function describeContainerTags(ContainerBuilder $builder, array $options = []);
 
     /**
      * Describes a container service by its name.
@@ -130,7 +130,7 @@ abstract protected function describeContainerTags(ContainerBuilder $builder, arr
      * @param array                   $options
      * @param ContainerBuilder|null   $builder
      */
-    abstract protected function describeContainerService($service, array $options = array(), ContainerBuilder $builder = null);
+    abstract protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null);
 
     /**
      * Describes container services.
@@ -138,22 +138,22 @@ abstract protected function describeContainerService($service, array $options =
      * Common options are:
      * * tag: filters described services by given tag
      */
-    abstract protected function describeContainerServices(ContainerBuilder $builder, array $options = array());
+    abstract protected function describeContainerServices(ContainerBuilder $builder, array $options = []);
 
     /**
      * Describes a service definition.
      */
-    abstract protected function describeContainerDefinition(Definition $definition, array $options = array());
+    abstract protected function describeContainerDefinition(Definition $definition, array $options = []);
 
     /**
      * Describes a service alias.
      */
-    abstract protected function describeContainerAlias(Alias $alias, array $options = array(), ContainerBuilder $builder = null);
+    abstract protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null);
 
     /**
      * Describes a container parameter.
      */
-    abstract protected function describeContainerParameter($parameter, array $options = array());
+    abstract protected function describeContainerParameter($parameter, array $options = []);
 
     /**
      * Describes event dispatcher listeners.
@@ -161,7 +161,7 @@ abstract protected function describeContainerParameter($parameter, array $option
      * Common options are:
      * * name: name of listened event
      */
-    abstract protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = array());
+    abstract protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = []);
 
     /**
      * Describes a callable.
@@ -169,7 +169,7 @@ abstract protected function describeEventDispatcherListeners(EventDispatcherInte
      * @param callable $callable
      * @param array    $options
      */
-    abstract protected function describeCallable($callable, array $options = array());
+    abstract protected function describeCallable($callable, array $options = []);
 
     /**
      * Formats a value as string.
@@ -242,7 +242,7 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI
      */
     protected function findDefinitionsByTag(ContainerBuilder $builder, $showPrivate)
     {
-        $definitions = array();
+        $definitions = [];
         $tags = $builder->findTags();
         asort($tags);
 
@@ -255,7 +255,7 @@ protected function findDefinitionsByTag(ContainerBuilder $builder, $showPrivate)
                 }
 
                 if (!isset($definitions[$tag])) {
-                    $definitions[$tag] = array();
+                    $definitions[$tag] = [];
                 }
 
                 $definitions[$tag][$serviceId] = $definition;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
index 05238f37240e4..74166f11740be 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -32,9 +32,9 @@ class JsonDescriptor extends Descriptor
     /**
      * {@inheritdoc}
      */
-    protected function describeRouteCollection(RouteCollection $routes, array $options = array())
+    protected function describeRouteCollection(RouteCollection $routes, array $options = [])
     {
-        $data = array();
+        $data = [];
         foreach ($routes->all() as $name => $route) {
             $data[$name] = $this->getRouteData($route);
         }
@@ -45,7 +45,7 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
     /**
      * {@inheritdoc}
      */
-    protected function describeRoute(Route $route, array $options = array())
+    protected function describeRoute(Route $route, array $options = [])
     {
         $this->writeData($this->getRouteData($route), $options);
     }
@@ -53,7 +53,7 @@ protected function describeRoute(Route $route, array $options = array())
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerParameters(ParameterBag $parameters, array $options = array())
+    protected function describeContainerParameters(ParameterBag $parameters, array $options = [])
     {
         $this->writeData($this->sortParameters($parameters), $options);
     }
@@ -79,7 +79,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerService($service, array $options = array(), ContainerBuilder $builder = null)
+    protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null)
     {
         if (!isset($options['id'])) {
             throw new \InvalidArgumentException('An "id" option must be provided.');
@@ -131,7 +131,7 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerDefinition(Definition $definition, array $options = array())
+    protected function describeContainerDefinition(Definition $definition, array $options = [])
     {
         $this->writeData($this->getContainerDefinitionData($definition, isset($options['omit_tags']) && $options['omit_tags'], isset($options['show_arguments']) && $options['show_arguments']), $options);
     }
@@ -139,22 +139,22 @@ protected function describeContainerDefinition(Definition $definition, array $op
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerAlias(Alias $alias, array $options = array(), ContainerBuilder $builder = null)
+    protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null)
     {
         if (!$builder) {
             return $this->writeData($this->getContainerAliasData($alias), $options);
         }
 
         $this->writeData(
-            array($this->getContainerAliasData($alias), $this->getContainerDefinitionData($builder->getDefinition((string) $alias), isset($options['omit_tags']) && $options['omit_tags'], isset($options['show_arguments']) && $options['show_arguments'])),
-            array_merge($options, array('id' => (string) $alias))
+            [$this->getContainerAliasData($alias), $this->getContainerDefinitionData($builder->getDefinition((string) $alias), isset($options['omit_tags']) && $options['omit_tags'], isset($options['show_arguments']) && $options['show_arguments'])],
+            array_merge($options, ['id' => (string) $alias])
         );
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = array())
+    protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = [])
     {
         $this->writeData($this->getEventDispatcherListenersData($eventDispatcher, array_key_exists('event', $options) ? $options['event'] : null), $options);
     }
@@ -162,7 +162,7 @@ protected function describeEventDispatcherListeners(EventDispatcherInterface $ev
     /**
      * {@inheritdoc}
      */
-    protected function describeCallable($callable, array $options = array())
+    protected function describeCallable($callable, array $options = [])
     {
         $this->writeData($this->getCallableData($callable, $options), $options);
     }
@@ -170,11 +170,11 @@ protected function describeCallable($callable, array $options = array())
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerParameter($parameter, array $options = array())
+    protected function describeContainerParameter($parameter, array $options = [])
     {
         $key = isset($options['parameter']) ? $options['parameter'] : '';
 
-        $this->writeData(array($key => $parameter), $options);
+        $this->writeData([$key => $parameter], $options);
     }
 
     /**
@@ -193,7 +193,7 @@ private function writeData(array $data, array $options)
      */
     protected function getRouteData(Route $route)
     {
-        return array(
+        return [
             'path' => $route->getPath(),
             'pathRegex' => $route->compile()->getRegex(),
             'host' => '' !== $route->getHost() ? $route->getHost() : 'ANY',
@@ -204,7 +204,7 @@ protected function getRouteData(Route $route)
             'defaults' => $route->getDefaults(),
             'requirements' => $route->getRequirements() ?: 'NO CUSTOM',
             'options' => $route->getOptions(),
-        );
+        ];
     }
 
     /**
@@ -215,7 +215,7 @@ protected function getRouteData(Route $route)
      */
     private function getContainerDefinitionData(Definition $definition, $omitTags = false, $showArguments = false)
     {
-        $data = array(
+        $data = [
             'class' => (string) $definition->getClass(),
             'public' => $definition->isPublic() && !$definition->isPrivate(),
             'synthetic' => $definition->isSynthetic(),
@@ -224,7 +224,7 @@ private function getContainerDefinitionData(Definition $definition, $omitTags =
             'abstract' => $definition->isAbstract(),
             'autowire' => $definition->isAutowired(),
             'autoconfigure' => $definition->isAutoconfigured(),
-        );
+        ];
 
         // forward compatibility with DependencyInjection component in version 4.0
         if (method_exists($definition, 'getAutowiringTypes')) {
@@ -256,17 +256,17 @@ private function getContainerDefinitionData(Definition $definition, $omitTags =
 
         $calls = $definition->getMethodCalls();
         if (\count($calls) > 0) {
-            $data['calls'] = array();
+            $data['calls'] = [];
             foreach ($calls as $callData) {
                 $data['calls'][] = $callData[0];
             }
         }
 
         if (!$omitTags) {
-            $data['tags'] = array();
+            $data['tags'] = [];
             foreach ($definition->getTags() as $tagName => $tagData) {
                 foreach ($tagData as $parameters) {
-                    $data['tags'][] = array('name' => $tagName, 'parameters' => $parameters);
+                    $data['tags'][] = ['name' => $tagName, 'parameters' => $parameters];
                 }
             }
         }
@@ -279,10 +279,10 @@ private function getContainerDefinitionData(Definition $definition, $omitTags =
      */
     private function getContainerAliasData(Alias $alias)
     {
-        return array(
+        return [
             'service' => (string) $alias,
             'public' => $alias->isPublic() && !$alias->isPrivate(),
-        );
+        ];
     }
 
     /**
@@ -293,7 +293,7 @@ private function getContainerAliasData(Alias $alias)
      */
     private function getEventDispatcherListenersData(EventDispatcherInterface $eventDispatcher, $event = null)
     {
-        $data = array();
+        $data = [];
 
         $registeredListeners = $eventDispatcher->getListeners($event);
         if (null !== $event) {
@@ -397,7 +397,7 @@ private function getCallableData($callable, array $options = array())
     private function describeValue($value, $omitTags, $showArguments)
     {
         if (\is_array($value)) {
-            $data = array();
+            $data = [];
             foreach ($value as $k => $v) {
                 $data[$k] = $this->describeValue($v, $omitTags, $showArguments);
             }
@@ -410,10 +410,10 @@ private function describeValue($value, $omitTags, $showArguments)
         }
 
         if ($value instanceof Reference) {
-            return array(
+            return [
                 'type' => 'service',
                 'id' => (string) $value,
-            );
+            ];
         }
 
         if ($value instanceof ArgumentInterface) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
index 9249ca5baa6b3..a0a0dc85166fe 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
@@ -30,7 +30,7 @@ class MarkdownDescriptor extends Descriptor
     /**
      * {@inheritdoc}
      */
-    protected function describeRouteCollection(RouteCollection $routes, array $options = array())
+    protected function describeRouteCollection(RouteCollection $routes, array $options = [])
     {
         $first = true;
         foreach ($routes->all() as $name => $route) {
@@ -39,7 +39,7 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
             } else {
                 $this->write("\n\n");
             }
-            $this->describeRoute($route, array('name' => $name));
+            $this->describeRoute($route, ['name' => $name]);
         }
         $this->write("\n");
     }
@@ -47,7 +47,7 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
     /**
      * {@inheritdoc}
      */
-    protected function describeRoute(Route $route, array $options = array())
+    protected function describeRoute(Route $route, array $options = [])
     {
         $output = '- Path: '.$route->getPath()
             ."\n".'- Path Regex: '.$route->compile()->getRegex()
@@ -69,7 +69,7 @@ protected function describeRoute(Route $route, array $options = array())
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerParameters(ParameterBag $parameters, array $options = array())
+    protected function describeContainerParameters(ParameterBag $parameters, array $options = [])
     {
         $this->write("Container parameters\n====================\n");
         foreach ($this->sortParameters($parameters) as $key => $value) {
@@ -80,7 +80,7 @@ protected function describeContainerParameters(ParameterBag $parameters, array $
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerTags(ContainerBuilder $builder, array $options = array())
+    protected function describeContainerTags(ContainerBuilder $builder, array $options = [])
     {
         $showPrivate = isset($options['show_private']) && $options['show_private'];
         $this->write("Container tags\n==============");
@@ -89,7 +89,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio
             $this->write("\n\n".$tag."\n".str_repeat('-', \strlen($tag)));
             foreach ($definitions as $serviceId => $definition) {
                 $this->write("\n\n");
-                $this->describeContainerDefinition($definition, array('omit_tags' => true, 'id' => $serviceId));
+                $this->describeContainerDefinition($definition, ['omit_tags' => true, 'id' => $serviceId]);
             }
         }
     }
@@ -97,13 +97,13 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerService($service, array $options = array(), ContainerBuilder $builder = null)
+    protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null)
     {
         if (!isset($options['id'])) {
             throw new \InvalidArgumentException('An "id" option must be provided.');
         }
 
-        $childOptions = array_merge($options, array('id' => $options['id'], 'as_array' => true));
+        $childOptions = array_merge($options, ['id' => $options['id'], 'as_array' => true]);
 
         if ($service instanceof Alias) {
             $this->describeContainerAlias($service, $childOptions, $builder);
@@ -117,7 +117,7 @@ protected function describeContainerService($service, array $options = array(),
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerServices(ContainerBuilder $builder, array $options = array())
+    protected function describeContainerServices(ContainerBuilder $builder, array $options = [])
     {
         $showPrivate = isset($options['show_private']) && $options['show_private'];
 
@@ -129,7 +129,7 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
 
         $serviceIds = isset($options['tag']) && $options['tag'] ? array_keys($builder->findTaggedServiceIds($options['tag'])) : $builder->getServiceIds();
         $showArguments = isset($options['show_arguments']) && $options['show_arguments'];
-        $services = array('definitions' => array(), 'aliases' => array(), 'services' => array());
+        $services = ['definitions' => [], 'aliases' => [], 'services' => []];
 
         if (isset($options['filter'])) {
             $serviceIds = array_filter($serviceIds, $options['filter']);
@@ -155,7 +155,7 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
             $this->write("\n\nDefinitions\n-----------\n");
             foreach ($services['definitions'] as $id => $service) {
                 $this->write("\n");
-                $this->describeContainerDefinition($service, array('id' => $id, 'show_arguments' => $showArguments));
+                $this->describeContainerDefinition($service, ['id' => $id, 'show_arguments' => $showArguments]);
             }
         }
 
@@ -163,7 +163,7 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
             $this->write("\n\nAliases\n-------\n");
             foreach ($services['aliases'] as $id => $service) {
                 $this->write("\n");
-                $this->describeContainerAlias($service, array('id' => $id));
+                $this->describeContainerAlias($service, ['id' => $id]);
             }
         }
 
@@ -179,7 +179,7 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerDefinition(Definition $definition, array $options = array())
+    protected function describeContainerDefinition(Definition $definition, array $options = [])
     {
         $output = '- Class: `'.$definition->getClass().'`'
             ."\n".'- Public: '.($definition->isPublic() && !$definition->isPrivate() ? 'yes' : 'no')
@@ -243,7 +243,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerAlias(Alias $alias, array $options = array(), ContainerBuilder $builder = null)
+    protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null)
     {
         $output = '- Service: `'.$alias.'`'
             ."\n".'- Public: '.($alias->isPublic() && !$alias->isPrivate() ? 'yes' : 'no');
@@ -259,13 +259,13 @@ protected function describeContainerAlias(Alias $alias, array $options = array()
         }
 
         $this->write("\n");
-        $this->describeContainerDefinition($builder->getDefinition((string) $alias), array_merge($options, array('id' => (string) $alias)));
+        $this->describeContainerDefinition($builder->getDefinition((string) $alias), array_merge($options, ['id' => (string) $alias]));
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerParameter($parameter, array $options = array())
+    protected function describeContainerParameter($parameter, array $options = [])
     {
         $this->write(isset($options['parameter']) ? sprintf("%s\n%s\n\n%s", $options['parameter'], str_repeat('=', \strlen($options['parameter'])), $this->formatParameter($parameter)) : $parameter);
     }
@@ -273,7 +273,7 @@ protected function describeContainerParameter($parameter, array $options = array
     /**
      * {@inheritdoc}
      */
-    protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = array())
+    protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = [])
     {
         $event = array_key_exists('event', $options) ? $options['event'] : null;
 
@@ -309,7 +309,7 @@ protected function describeEventDispatcherListeners(EventDispatcherInterface $ev
     /**
      * {@inheritdoc}
      */
-    protected function describeCallable($callable, array $options = array())
+    protected function describeCallable($callable, array $options = [])
     {
         $string = '';
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
index d91743e5c0da8..e1e0243d37cb9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -35,24 +35,24 @@ class TextDescriptor extends Descriptor
     /**
      * {@inheritdoc}
      */
-    protected function describeRouteCollection(RouteCollection $routes, array $options = array())
+    protected function describeRouteCollection(RouteCollection $routes, array $options = [])
     {
         $showControllers = isset($options['show_controllers']) && $options['show_controllers'];
 
-        $tableHeaders = array('Name', 'Method', 'Scheme', 'Host', 'Path');
+        $tableHeaders = ['Name', 'Method', 'Scheme', 'Host', 'Path'];
         if ($showControllers) {
             $tableHeaders[] = 'Controller';
         }
 
-        $tableRows = array();
+        $tableRows = [];
         foreach ($routes->all() as $name => $route) {
-            $row = array(
+            $row = [
                 $name,
                 $route->getMethods() ? implode('|', $route->getMethods()) : 'ANY',
                 $route->getSchemes() ? implode('|', $route->getSchemes()) : 'ANY',
                 '' !== $route->getHost() ? $route->getHost() : 'ANY',
                 $route->getPath(),
-            );
+            ];
 
             if ($showControllers) {
                 $controller = $route->getDefault('_controller');
@@ -102,13 +102,13 @@ protected function describeRoute(Route $route, array $options = array())
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerParameters(ParameterBag $parameters, array $options = array())
+    protected function describeContainerParameters(ParameterBag $parameters, array $options = [])
     {
-        $tableHeaders = array('Parameter', 'Value');
+        $tableHeaders = ['Parameter', 'Value'];
 
-        $tableRows = array();
+        $tableRows = [];
         foreach ($this->sortParameters($parameters) as $parameter => $value) {
-            $tableRows[] = array($parameter, $this->formatParameter($value));
+            $tableRows[] = [$parameter, $this->formatParameter($value)];
         }
 
         $options['output']->title('Symfony Container Parameters');
@@ -118,7 +118,7 @@ protected function describeContainerParameters(ParameterBag $parameters, array $
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerTags(ContainerBuilder $builder, array $options = array())
+    protected function describeContainerTags(ContainerBuilder $builder, array $options = [])
     {
         $showPrivate = isset($options['show_private']) && $options['show_private'];
 
@@ -137,7 +137,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerService($service, array $options = array(), ContainerBuilder $builder = null)
+    protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null)
     {
         if (!isset($options['id'])) {
             throw new \InvalidArgumentException('An "id" option must be provided.');
@@ -150,10 +150,10 @@ protected function describeContainerService($service, array $options = array(),
         } else {
             $options['output']->title(sprintf('Information for Service "<info>%s</info>"', $options['id']));
             $options['output']->table(
-                array('Service ID', 'Class'),
-                array(
-                    array(isset($options['id']) ? $options['id'] : '-', \get_class($service)),
-                )
+                ['Service ID', 'Class'],
+                [
+                    [isset($options['id']) ? $options['id'] : '-', \get_class($service)],
+                ]
             );
         }
     }
@@ -161,7 +161,7 @@ protected function describeContainerService($service, array $options = array(),
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerServices(ContainerBuilder $builder, array $options = array())
+    protected function describeContainerServices(ContainerBuilder $builder, array $options = [])
     {
         $showPrivate = isset($options['show_private']) && $options['show_private'];
         $showTag = isset($options['tag']) ? $options['tag'] : null;
@@ -179,7 +179,7 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
         $options['output']->title($title);
 
         $serviceIds = isset($options['tag']) && $options['tag'] ? array_keys($builder->findTaggedServiceIds($options['tag'])) : $builder->getServiceIds();
-        $maxTags = array();
+        $maxTags = [];
 
         if (isset($options['filter'])) {
             $serviceIds = array_filter($serviceIds, $options['filter']);
@@ -217,8 +217,8 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
         $tagsCount = \count($maxTags);
         $tagsNames = array_keys($maxTags);
 
-        $tableHeaders = array_merge(array('Service ID'), $tagsNames, array('Class name'));
-        $tableRows = array();
+        $tableHeaders = array_merge(['Service ID'], $tagsNames, ['Class name']);
+        $tableRows = [];
         $rawOutput = isset($options['raw_text']) && $options['raw_text'];
         foreach ($this->sortServiceIds($serviceIds) as $serviceId) {
             $definition = $this->resolveServiceDefinition($builder, $serviceId);
@@ -227,24 +227,24 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
             if ($definition instanceof Definition) {
                 if ($showTag) {
                     foreach ($definition->getTag($showTag) as $key => $tag) {
-                        $tagValues = array();
+                        $tagValues = [];
                         foreach ($tagsNames as $tagName) {
                             $tagValues[] = isset($tag[$tagName]) ? $tag[$tagName] : '';
                         }
                         if (0 === $key) {
-                            $tableRows[] = array_merge(array($serviceId), $tagValues, array($definition->getClass()));
+                            $tableRows[] = array_merge([$serviceId], $tagValues, [$definition->getClass()]);
                         } else {
-                            $tableRows[] = array_merge(array('  "'), $tagValues, array(''));
+                            $tableRows[] = array_merge(['  "'], $tagValues, ['']);
                         }
                     }
                 } else {
-                    $tableRows[] = array($styledServiceId, $definition->getClass());
+                    $tableRows[] = [$styledServiceId, $definition->getClass()];
                 }
             } elseif ($definition instanceof Alias) {
                 $alias = $definition;
-                $tableRows[] = array_merge(array($styledServiceId, sprintf('alias for "%s"', $alias)), $tagsCount ? array_fill(0, $tagsCount, '') : array());
+                $tableRows[] = array_merge([$styledServiceId, sprintf('alias for "%s"', $alias)], $tagsCount ? array_fill(0, $tagsCount, '') : []);
             } else {
-                $tableRows[] = array_merge(array($styledServiceId, \get_class($definition)), $tagsCount ? array_fill(0, $tagsCount, '') : array());
+                $tableRows[] = array_merge([$styledServiceId, \get_class($definition)], $tagsCount ? array_fill(0, $tagsCount, '') : []);
             }
         }
 
@@ -347,7 +347,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
                 }
             }
 
-            $tableRows[] = array('Arguments', implode("\n", $argumentsInformation));
+            $tableRows[] = ['Arguments', implode("\n", $argumentsInformation)];
         }
 
         $options['output']->table($tableHeaders, $tableRows);
@@ -356,7 +356,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerAlias(Alias $alias, array $options = array(), ContainerBuilder $builder = null)
+    protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null)
     {
         $options['output']->comment(sprintf('This service is an alias for the service <info>%s</info>', (string) $alias));
 
@@ -364,26 +364,26 @@ protected function describeContainerAlias(Alias $alias, array $options = array()
             return;
         }
 
-        return $this->describeContainerDefinition($builder->getDefinition((string) $alias), array_merge($options, array('id' => (string) $alias)));
+        return $this->describeContainerDefinition($builder->getDefinition((string) $alias), array_merge($options, ['id' => (string) $alias]));
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerParameter($parameter, array $options = array())
+    protected function describeContainerParameter($parameter, array $options = [])
     {
         $options['output']->table(
-            array('Parameter', 'Value'),
-            array(
-                array($options['parameter'], $this->formatParameter($parameter),
-            ),
-        ));
+            ['Parameter', 'Value'],
+            [
+                [$options['parameter'], $this->formatParameter($parameter),
+            ],
+        ]);
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = array())
+    protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = [])
     {
         $event = array_key_exists('event', $options) ? $options['event'] : null;
 
@@ -410,19 +410,19 @@ protected function describeEventDispatcherListeners(EventDispatcherInterface $ev
     /**
      * {@inheritdoc}
      */
-    protected function describeCallable($callable, array $options = array())
+    protected function describeCallable($callable, array $options = [])
     {
         $this->writeText($this->formatCallable($callable), $options);
     }
 
     private function renderEventListenerTable(EventDispatcherInterface $eventDispatcher, $event, array $eventListeners, SymfonyStyle $io)
     {
-        $tableHeaders = array('Order', 'Callable', 'Priority');
-        $tableRows = array();
+        $tableHeaders = ['Order', 'Callable', 'Priority'];
+        $tableRows = [];
 
         $order = 1;
         foreach ($eventListeners as $order => $listener) {
-            $tableRows[] = array(sprintf('#%d', $order + 1), $this->formatCallable($listener), $eventDispatcher->getListenerPriority($event, $listener));
+            $tableRows[] = [sprintf('#%d', $order + 1), $this->formatCallable($listener), $eventDispatcher->getListenerPriority($event, $listener)];
         }
 
         $io->table($tableHeaders, $tableRows);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
index b663e762212bb..343c7f256372e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -32,7 +32,7 @@ class XmlDescriptor extends Descriptor
     /**
      * {@inheritdoc}
      */
-    protected function describeRouteCollection(RouteCollection $routes, array $options = array())
+    protected function describeRouteCollection(RouteCollection $routes, array $options = [])
     {
         $this->writeDocument($this->getRouteCollectionDocument($routes));
     }
@@ -40,7 +40,7 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
     /**
      * {@inheritdoc}
      */
-    protected function describeRoute(Route $route, array $options = array())
+    protected function describeRoute(Route $route, array $options = [])
     {
         $this->writeDocument($this->getRouteDocument($route, isset($options['name']) ? $options['name'] : null));
     }
@@ -48,7 +48,7 @@ protected function describeRoute(Route $route, array $options = array())
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerParameters(ParameterBag $parameters, array $options = array())
+    protected function describeContainerParameters(ParameterBag $parameters, array $options = [])
     {
         $this->writeDocument($this->getContainerParametersDocument($parameters));
     }
@@ -56,7 +56,7 @@ protected function describeContainerParameters(ParameterBag $parameters, array $
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerTags(ContainerBuilder $builder, array $options = array())
+    protected function describeContainerTags(ContainerBuilder $builder, array $options = [])
     {
         $this->writeDocument($this->getContainerTagsDocument($builder, isset($options['show_private']) && $options['show_private']));
     }
@@ -64,7 +64,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerService($service, array $options = array(), ContainerBuilder $builder = null)
+    protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null)
     {
         if (!isset($options['id'])) {
             throw new \InvalidArgumentException('An "id" option must be provided.');
@@ -76,7 +76,7 @@ protected function describeContainerService($service, array $options = array(),
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerServices(ContainerBuilder $builder, array $options = array())
+    protected function describeContainerServices(ContainerBuilder $builder, array $options = [])
     {
         $this->writeDocument($this->getContainerServicesDocument($builder, isset($options['tag']) ? $options['tag'] : null, isset($options['show_private']) && $options['show_private'], isset($options['show_arguments']) && $options['show_arguments'], isset($options['filter']) ? $options['filter'] : null));
     }
@@ -84,7 +84,7 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerDefinition(Definition $definition, array $options = array())
+    protected function describeContainerDefinition(Definition $definition, array $options = [])
     {
         $this->writeDocument($this->getContainerDefinitionDocument($definition, isset($options['id']) ? $options['id'] : null, isset($options['omit_tags']) && $options['omit_tags'], isset($options['show_arguments']) && $options['show_arguments']));
     }
@@ -92,7 +92,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerAlias(Alias $alias, array $options = array(), ContainerBuilder $builder = null)
+    protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null)
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->appendChild($dom->importNode($this->getContainerAliasDocument($alias, isset($options['id']) ? $options['id'] : null)->childNodes->item(0), true));
@@ -109,7 +109,7 @@ protected function describeContainerAlias(Alias $alias, array $options = array()
     /**
      * {@inheritdoc}
      */
-    protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = array())
+    protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = [])
     {
         $this->writeDocument($this->getEventDispatcherListenersDocument($eventDispatcher, array_key_exists('event', $options) ? $options['event'] : null));
     }
@@ -117,7 +117,7 @@ protected function describeEventDispatcherListeners(EventDispatcherInterface $ev
     /**
      * {@inheritdoc}
      */
-    protected function describeCallable($callable, array $options = array())
+    protected function describeCallable($callable, array $options = [])
     {
         $this->writeDocument($this->getCallableDocument($callable));
     }
@@ -125,7 +125,7 @@ protected function describeCallable($callable, array $options = array())
     /**
      * {@inheritdoc}
      */
-    protected function describeContainerParameter($parameter, array $options = array())
+    protected function describeContainerParameter($parameter, array $options = [])
     {
         $this->writeDocument($this->getContainerParameterDocument($parameter, $options));
     }
@@ -413,7 +413,7 @@ private function getContainerDefinitionDocument(Definition $definition, $id = nu
      */
     private function getArgumentNodes(array $arguments, \DOMDocument $dom)
     {
-        $nodes = array();
+        $nodes = [];
 
         foreach ($arguments as $argumentKey => $argument) {
             $argumentXML = $dom->createElement('argument');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
index ae6b6d741962b..244e8a0f355a3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
@@ -79,7 +79,7 @@ public function redirectAction(Request $request, $route, $permanent = false, $ig
             throw new HttpException($permanent ? 410 : 404);
         }
 
-        $attributes = array();
+        $attributes = [];
         if (false === $ignoreAttributes || \is_array($ignoreAttributes)) {
             $attributes = $request->attributes->get('_route_params');
             unset($attributes['route'], $attributes['permanent'], $attributes['ignoreAttributes']);
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddDebugLogProcessorPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddDebugLogProcessorPass.php
index 69038cf92f97a..b4da145010403 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddDebugLogProcessorPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddDebugLogProcessorPass.php
@@ -30,6 +30,6 @@ public function process(ContainerBuilder $container)
         }
 
         $definition = $container->getDefinition('monolog.logger_prototype');
-        $definition->addMethodCall('pushProcessor', array(new Reference('debug.log_processor')));
+        $definition->addMethodCall('pushProcessor', [new Reference('debug.log_processor')]);
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
index a5bdfd626faec..77c070059983c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
@@ -31,7 +31,7 @@ public function process(ContainerBuilder $container)
         if ($container->has('router')) {
             $definition = $container->findDefinition('router');
             foreach ($container->findTaggedServiceIds('routing.expression_language_provider', true) as $id => $attributes) {
-                $definition->addMethodCall('addExpressionLanguageProvider', array(new Reference($id)));
+                $definition->addMethodCall('addExpressionLanguageProvider', [new Reference($id)]);
             }
         }
 
@@ -39,7 +39,7 @@ public function process(ContainerBuilder $container)
         if ($container->has('security.expression_language')) {
             $definition = $container->findDefinition('security.expression_language');
             foreach ($container->findTaggedServiceIds('security.expression_language_provider', true) as $id => $attributes) {
-                $definition->addMethodCall('registerProvider', array(new Reference($id)));
+                $definition->addMethodCall('registerProvider', [new Reference($id)]);
             }
         }
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/LoggingTranslatorPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/LoggingTranslatorPass.php
index 4945e1c12e6c1..88660356376eb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/LoggingTranslatorPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/LoggingTranslatorPass.php
@@ -47,7 +47,7 @@ public function process(ContainerBuilder $container)
                         $warmer->addTag('container.service_subscriber', $v);
                     }
                 }
-                $warmer->addTag('container.service_subscriber', array('key' => 'translator', 'id' => 'translator.logging.inner'));
+                $warmer->addTag('container.service_subscriber', ['key' => 'translator', 'id' => 'translator.logging.inner']);
             }
         }
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php
index 8e15979a90e31..357c079c4aa0b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php
@@ -41,15 +41,15 @@ public function process(ContainerBuilder $container)
                 if (!isset($attributes[0]['id'])) {
                     throw new InvalidArgumentException(sprintf('Data collector service "%s" must have an id attribute in order to specify a template', $id));
                 }
-                $template = array($attributes[0]['id'], $attributes[0]['template']);
+                $template = [$attributes[0]['id'], $attributes[0]['template']];
             }
 
-            $collectors->insert(array($id, $template), array($priority, --$order));
+            $collectors->insert([$id, $template], [$priority, --$order]);
         }
 
-        $templates = array();
+        $templates = [];
         foreach ($collectors as $collector) {
-            $definition->addMethodCall('add', array(new Reference($collector[0])));
+            $definition->addMethodCall('add', [new Reference($collector[0])]);
             $templates[$collector[0]] = $collector[1];
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingPass.php
index 8de51211d3796..4eff0b6c8eb64 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingPass.php
@@ -32,8 +32,8 @@ public function process(ContainerBuilder $container)
         }
 
         if ($container->hasDefinition('templating.engine.php')) {
-            $refs = array();
-            $helpers = array();
+            $refs = [];
+            $helpers = [];
             foreach ($container->findTaggedServiceIds('templating.helper', true) as $id => $attributes) {
                 if (isset($attributes[0]['alias'])) {
                     $helpers[$attributes[0]['alias']] = $id;
@@ -43,7 +43,7 @@ public function process(ContainerBuilder $container)
 
             if (\count($helpers) > 0) {
                 $definition = $container->getDefinition('templating.engine.php');
-                $definition->addMethodCall('setHelpers', array($helpers));
+                $definition->addMethodCall('setHelpers', [$helpers]);
 
                 if ($container->hasDefinition('templating.engine.php.helpers_locator')) {
                     $container->getDefinition('templating.engine.php.helpers_locator')->replaceArgument(0, $refs);
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
index 264bde0564f28..606fbd045355e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -21,7 +21,7 @@
  */
 class UnusedTagsPass implements CompilerPassInterface
 {
-    private $whitelist = array(
+    private $whitelist = [
         'annotations.cached_reader',
         'cache.pool.clearer',
         'console.command',
@@ -55,7 +55,7 @@ class UnusedTagsPass implements CompilerPassInterface
         'twig.loader',
         'validator.constraint_validator',
         'validator.initializer',
-    );
+    ];
 
     public function process(ContainerBuilder $container)
     {
@@ -68,7 +68,7 @@ public function process(ContainerBuilder $container)
             }
 
             // check for typos
-            $candidates = array();
+            $candidates = [];
             foreach ($tags as $definedTag) {
                 if ($definedTag === $tag) {
                     continue;
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php
index c5498adc4728d..ad62e19384976 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php
@@ -32,12 +32,12 @@ public function process(ContainerBuilder $container)
 
         $container->getParameterBag()->remove('workflow.has_guard_listeners');
 
-        $servicesNeeded = array(
+        $servicesNeeded = [
             'security.token_storage',
             'security.authorization_checker',
             'security.authentication.trust_resolver',
             'security.role_hierarchy',
-        );
+        ];
 
         foreach ($servicesNeeded as $service) {
             if (!$container->has($service)) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 29086735e3fde..aba823cbcc8d7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -60,7 +60,7 @@ public function getConfigTreeBuilder()
             ->beforeNormalization()
                 ->ifTrue(function ($v) { return !isset($v['assets']) && isset($v['templating']) && class_exists(Package::class); })
                 ->then(function ($v) {
-                    $v['assets'] = array();
+                    $v['assets'] = [];
 
                     return $v;
                 })
@@ -108,7 +108,7 @@ public function getConfigTreeBuilder()
                 ->booleanNode('test')->end()
                 ->scalarNode('default_locale')->defaultValue('en')->end()
                 ->arrayNode('trusted_hosts')
-                    ->beforeNormalization()->ifString()->then(function ($v) { return array($v); })->end()
+                    ->beforeNormalization()->ifString()->then(function ($v) { return [$v]; })->end()
                     ->prototype('scalar')->end()
                 ->end()
             ->end()
@@ -145,9 +145,9 @@ private function addCsrfSection(ArrayNodeDefinition $rootNode)
         $rootNode
             ->children()
                 ->arrayNode('csrf_protection')
-                    ->treatFalseLike(array('enabled' => false))
-                    ->treatTrueLike(array('enabled' => true))
-                    ->treatNullLike(array('enabled' => true))
+                    ->treatFalseLike(['enabled' => false])
+                    ->treatTrueLike(['enabled' => true])
+                    ->treatNullLike(['enabled' => true])
                     ->addDefaultsIfNotSet()
                     ->children()
                         // defaults to framework.session.enabled && !class_exists(FullStack::class) && interface_exists(CsrfTokenManagerInterface::class)
@@ -167,9 +167,9 @@ private function addFormSection(ArrayNodeDefinition $rootNode)
                     ->{!class_exists(FullStack::class) && class_exists(Form::class) ? 'canBeDisabled' : 'canBeEnabled'}()
                     ->children()
                         ->arrayNode('csrf_protection')
-                            ->treatFalseLike(array('enabled' => false))
-                            ->treatTrueLike(array('enabled' => true))
-                            ->treatNullLike(array('enabled' => true))
+                            ->treatFalseLike(['enabled' => false])
+                            ->treatTrueLike(['enabled' => true])
+                            ->treatNullLike(['enabled' => true])
                             ->addDefaultsIfNotSet()
                             ->children()
                                 ->booleanNode('enabled')->defaultNull()->end() // defaults to framework.csrf_protection.enabled
@@ -269,10 +269,10 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
                                 unset($workflows['enabled']);
 
                                 if (1 === \count($workflows) && isset($workflows[0]['enabled']) && 1 === \count($workflows[0])) {
-                                    $workflows = array();
+                                    $workflows = [];
                                 }
 
-                                if (1 === \count($workflows) && isset($workflows['workflows']) && array_keys($workflows['workflows']) !== range(0, \count($workflows) - 1) && !empty(array_diff(array_keys($workflows['workflows']), array('audit_trail', 'type', 'marking_store', 'supports', 'support_strategy', 'initial_place', 'places', 'transitions')))) {
+                                if (1 === \count($workflows) && isset($workflows['workflows']) && array_keys($workflows['workflows']) !== range(0, \count($workflows) - 1) && !empty(array_diff(array_keys($workflows['workflows']), ['audit_trail', 'type', 'marking_store', 'supports', 'support_strategy', 'initial_place', 'places', 'transitions']))) {
                                     $workflows = $workflows['workflows'];
                                 }
 
@@ -284,10 +284,10 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
                                     unset($workflows[$key]['enabled']);
                                 }
 
-                                $v = array(
+                                $v = [
                                     'enabled' => true,
                                     'workflows' => $workflows,
-                                );
+                                ];
                             }
 
                             return $v;
@@ -338,7 +338,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
                                     ->arrayNode('supports')
                                         ->beforeNormalization()
                                             ->ifString()
-                                            ->then(function ($v) { return array($v); })
+                                            ->then(function ($v) { return [$v]; })
                                         ->end()
                                         ->prototype('scalar')
                                             ->cannotBeEmpty()
@@ -397,7 +397,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
                                                 ->arrayNode('from')
                                                     ->beforeNormalization()
                                                         ->ifString()
-                                                        ->then(function ($v) { return array($v); })
+                                                        ->then(function ($v) { return [$v]; })
                                                     ->end()
                                                     ->requiresAtLeastOneElement()
                                                     ->prototype('scalar')
@@ -407,7 +407,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
                                                 ->arrayNode('to')
                                                     ->beforeNormalization()
                                                         ->ifString()
-                                                        ->then(function ($v) { return array($v); })
+                                                        ->then(function ($v) { return [$v]; })
                                                     ->end()
                                                     ->requiresAtLeastOneElement()
                                                     ->prototype('scalar')
@@ -527,7 +527,7 @@ private function addRequestSection(ArrayNodeDefinition $rootNode)
                                 ->end()
                                 ->beforeNormalization()
                                     ->ifTrue(function ($v) { return !\is_array($v); })
-                                    ->then(function ($v) { return array($v); })
+                                    ->then(function ($v) { return [$v]; })
                                 ->end()
                                 ->prototype('scalar')->end()
                             ->end()
@@ -547,7 +547,7 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
                     ->canBeEnabled()
                     ->beforeNormalization()
                         ->ifTrue(function ($v) { return false === $v || \is_array($v) && false === $v['enabled']; })
-                        ->then(function () { return array('enabled' => false, 'engines' => false); })
+                        ->then(function () { return ['enabled' => false, 'engines' => false]; })
                     ->end()
                     ->children()
                         ->scalarNode('hinclude_default_template')->defaultNull()->end()
@@ -562,7 +562,7 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
                                     ->validate()
                                         ->ifTrue(function ($v) {return !\in_array('FrameworkBundle:Form', $v); })
                                         ->then(function ($v) {
-                                            return array_merge(array('FrameworkBundle:Form'), $v);
+                                            return array_merge(['FrameworkBundle:Form'], $v);
                                         })
                                     ->end()
                                 ->end()
@@ -572,13 +572,13 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
                     ->fixXmlConfig('engine')
                     ->children()
                         ->arrayNode('engines')
-                            ->example(array('twig'))
+                            ->example(['twig'])
                             ->isRequired()
                             ->requiresAtLeastOneElement()
                             ->canBeUnset()
                             ->beforeNormalization()
                                 ->ifTrue(function ($v) { return !\is_array($v) && false !== $v; })
-                                ->then(function ($v) { return array($v); })
+                                ->then(function ($v) { return [$v]; })
                             ->end()
                             ->prototype('scalar')->end()
                         ->end()
@@ -588,7 +588,7 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
                         ->arrayNode('loaders')
                             ->beforeNormalization()
                                 ->ifTrue(function ($v) { return !\is_array($v); })
-                                ->then(function ($v) { return array($v); })
+                                ->then(function ($v) { return [$v]; })
                              ->end()
                             ->prototype('scalar')->end()
                         ->end()
@@ -616,7 +616,7 @@ private function addAssetsSection(ArrayNodeDefinition $rootNode)
                             ->requiresAtLeastOneElement()
                             ->beforeNormalization()
                                 ->ifTrue(function ($v) { return !\is_array($v); })
-                                ->then(function ($v) { return array($v); })
+                                ->then(function ($v) { return [$v]; })
                             ->end()
                             ->prototype('scalar')->end()
                         ->end()
@@ -660,7 +660,7 @@ private function addAssetsSection(ArrayNodeDefinition $rootNode)
                                         ->requiresAtLeastOneElement()
                                         ->beforeNormalization()
                                             ->ifTrue(function ($v) { return !\is_array($v); })
-                                            ->then(function ($v) { return array($v); })
+                                            ->then(function ($v) { return [$v]; })
                                         ->end()
                                         ->prototype('scalar')->end()
                                     ->end()
@@ -702,9 +702,9 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode)
                     ->fixXmlConfig('path')
                     ->children()
                         ->arrayNode('fallbacks')
-                            ->beforeNormalization()->ifString()->then(function ($v) { return array($v); })->end()
+                            ->beforeNormalization()->ifString()->then(function ($v) { return [$v]; })->end()
                             ->prototype('scalar')->end()
-                            ->defaultValue(array('en'))
+                            ->defaultValue(['en'])
                         ->end()
                         ->booleanNode('logging')->defaultValue($this->debug)->end()
                         ->scalarNode('formatter')->defaultValue('translator.formatter.default')->end()
@@ -744,9 +744,9 @@ private function addValidationSection(ArrayNodeDefinition $rootNode)
                         ->end()
                         ->booleanNode('enable_annotations')->{!class_exists(FullStack::class) && class_exists(Annotation::class) ? 'defaultTrue' : 'defaultFalse'}()->end()
                         ->arrayNode('static_method')
-                            ->defaultValue(array('loadValidatorMetadata'))
+                            ->defaultValue(['loadValidatorMetadata'])
                             ->prototype('scalar')->end()
-                            ->treatFalseLike(array())
+                            ->treatFalseLike([])
                             ->validate()
                                 ->ifTrue(function ($v) { return !\is_array($v); })
                                 ->then(function ($v) { return (array) $v; })
@@ -925,7 +925,7 @@ private function addLockSection(ArrayNodeDefinition $rootNode)
                     ->info('Lock configuration')
                     ->{!class_exists(FullStack::class) && class_exists(Lock::class) ? 'canBeDisabled' : 'canBeEnabled'}()
                     ->beforeNormalization()
-                        ->ifString()->then(function ($v) { return array('enabled' => true, 'resources' => $v); })
+                        ->ifString()->then(function ($v) { return ['enabled' => true, 'resources' => $v]; })
                     ->end()
                     ->beforeNormalization()
                         ->ifTrue(function ($v) { return \is_array($v) && !isset($v['resources']); })
@@ -933,7 +933,7 @@ private function addLockSection(ArrayNodeDefinition $rootNode)
                             $e = $v['enabled'];
                             unset($v['enabled']);
 
-                            return array('enabled' => $e, 'resources' => $v);
+                            return ['enabled' => $e, 'resources' => $v];
                         })
                     ->end()
                     ->addDefaultsIfNotSet()
@@ -941,16 +941,16 @@ private function addLockSection(ArrayNodeDefinition $rootNode)
                     ->children()
                         ->arrayNode('resources')
                             ->requiresAtLeastOneElement()
-                            ->defaultValue(array('default' => array(class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphore' : 'flock')))
+                            ->defaultValue(['default' => [class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphore' : 'flock']])
                             ->beforeNormalization()
-                                ->ifString()->then(function ($v) { return array('default' => $v); })
+                                ->ifString()->then(function ($v) { return ['default' => $v]; })
                             ->end()
                             ->beforeNormalization()
                                 ->ifTrue(function ($v) { return \is_array($v) && array_keys($v) === range(0, \count($v) - 1); })
-                                ->then(function ($v) { return array('default' => $v); })
+                                ->then(function ($v) { return ['default' => $v]; })
                             ->end()
                             ->prototype('array')
-                                ->beforeNormalization()->ifString()->then(function ($v) { return array($v); })->end()
+                                ->beforeNormalization()->ifString()->then(function ($v) { return [$v]; })->end()
                                 ->prototype('scalar')->end()
                             ->end()
                         ->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 9ec02f07228a5..fabe4fb0d0d50 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -506,7 +506,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
     {
         if (!$this->isConfigEnabled($container, $config)) {
             // this is needed for the WebProfiler to work even if the profiler is disabled
-            $container->setParameter('data_collector.templates', array());
+            $container->setParameter('data_collector.templates', []);
 
             return;
         }
@@ -627,7 +627,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
                 } elseif ('state_machine' === $type) {
                     foreach ($transition['from'] as $from) {
                         foreach ($transition['to'] as $to) {
-                            $transitionDefinition = new Definition(Workflow\Transition::class, array($transition['name'], $from, $to));
+                            $transitionDefinition = new Definition(Workflow\Transition::class, [$transition['name'], $from, $to]);
                             $transitionDefinition->setPublic(false);
                             $transitionId = sprintf('%s.transition.%s', $workflowId, $transitionCounter++);
                             $container->setDefinition($transitionId, $transitionDefinition);
@@ -717,7 +717,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
                 $guard = new Definition(Workflow\EventListener\GuardListener::class);
                 $guard->setPrivate(true);
 
-                $guard->setArguments(array(
+                $guard->setArguments([
                     $guardsConfiguration,
                     new Reference('workflow.security.expression_language'),
                     new Reference('security.token_storage'),
@@ -725,9 +725,9 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
                     new Reference('security.authentication.trust_resolver'),
                     new Reference('security.role_hierarchy'),
                     new Reference('validator', ContainerInterface::NULL_ON_INVALID_REFERENCE),
-                ));
+                ]);
                 foreach ($guardsConfiguration as $eventName => $config) {
-                    $guard->addTag('kernel.event_listener', array('event' => $eventName, 'method' => 'onTransition'));
+                    $guard->addTag('kernel.event_listener', ['event' => $eventName, 'method' => 'onTransition']);
                 }
 
                 $container->setDefinition(sprintf('%s.listener.guard', $workflowId), $guard);
@@ -746,7 +746,7 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con
             $container->register('debug.stopwatch', Stopwatch::class)
                 ->addArgument(true)
                 ->setPrivate(true)
-                ->addTag('kernel.reset', array('method' => 'reset'));
+                ->addTag('kernel.reset', ['method' => 'reset']);
             $container->setAlias(Stopwatch::class, new Alias('debug.stopwatch', false));
         }
 
@@ -920,11 +920,11 @@ private function registerTemplatingConfiguration(array $config, ContainerBuilder
             $logger = new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE);
 
             $container->getDefinition('templating.loader.cache')
-                ->addTag('monolog.logger', array('channel' => 'templating'))
-                ->addMethodCall('setLogger', array($logger));
+                ->addTag('monolog.logger', ['channel' => 'templating'])
+                ->addMethodCall('setLogger', [$logger]);
             $container->getDefinition('templating.loader.chain')
-                ->addTag('monolog.logger', array('channel' => 'templating'))
-                ->addMethodCall('setLogger', array($logger));
+                ->addTag('monolog.logger', ['channel' => 'templating'])
+                ->addMethodCall('setLogger', [$logger]);
         }
 
         if (!empty($config['loaders'])) {
@@ -967,13 +967,13 @@ private function registerTemplatingConfiguration(array $config, ContainerBuilder
         } else {
             $templateEngineDefinition = $container->getDefinition('templating.engine.delegating');
             foreach ($engines as $engine) {
-                $templateEngineDefinition->addMethodCall('addEngine', array($engine));
+                $templateEngineDefinition->addMethodCall('addEngine', [$engine]);
             }
             $container->setAlias('templating', 'templating.engine.delegating')->setPublic(true);
         }
 
         $container->getDefinition('fragment.renderer.hinclude')
-            ->addTag('kernel.fragment_renderer', array('alias' => 'hinclude'))
+            ->addTag('kernel.fragment_renderer', ['alias' => 'hinclude'])
             ->replaceArgument(0, new Reference('templating'))
         ;
 
@@ -1043,7 +1043,7 @@ private function registerAssetsConfiguration(array $config, ContainerBuilder $co
         $defaultPackage = $this->createPackageDefinition($config['base_path'], $config['base_urls'], $defaultVersion);
         $container->setDefinition('assets._default_package', $defaultPackage);
 
-        $namedPackages = array();
+        $namedPackages = [];
         foreach ($config['packages'] as $name => $package) {
             if (null !== $package['version_strategy']) {
                 $version = new Reference($package['version_strategy']);
@@ -1155,13 +1155,13 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
         $container->setAlias('translator', 'translator.default')->setPublic(true);
         $container->setAlias('translator.formatter', new Alias($config['formatter'], false));
         $translator = $container->findDefinition('translator.default');
-        $translator->addMethodCall('setFallbackLocales', array($config['fallbacks']));
+        $translator->addMethodCall('setFallbackLocales', [$config['fallbacks']]);
 
         $container->setParameter('translator.logging', $config['logging']);
         $container->setParameter('translator.default_path', $config['default_path']);
 
         // Discover translation directories
-        $dirs = array();
+        $dirs = [];
         if (class_exists('Symfony\Component\Validator\Validation')) {
             $r = new \ReflectionClass('Symfony\Component\Validator\Validation');
 
@@ -1205,7 +1205,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
 
         // Register translation resources
         if ($dirs) {
-            $files = array();
+            $files = [];
             $finder = Finder::create()
                 ->followLinks()
                 ->files()
@@ -1219,7 +1219,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
             foreach ($finder as $file) {
                 list(, $locale) = explode('.', $file->getBasename(), 3);
                 if (!isset($files[$locale])) {
-                    $files[$locale] = array();
+                    $files[$locale] = [];
                 }
 
                 $files[$locale][] = (string) $file;
@@ -1227,7 +1227,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
 
             $options = array_merge(
                 $translator->getArgument(4),
-                array('resource_files' => $files)
+                ['resource_files' => $files]
             );
 
             $translator->replaceArgument(4, $options);
@@ -1254,15 +1254,15 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
 
         $container->setParameter('validator.translation_domain', $config['translation_domain']);
 
-        $files = array('xml' => array(), 'yml' => array());
+        $files = ['xml' => [], 'yml' => []];
         $this->registerValidatorMapping($container, $config, $files);
 
         if (!empty($files['xml'])) {
-            $validatorBuilder->addMethodCall('addXmlMappings', array($files['xml']));
+            $validatorBuilder->addMethodCall('addXmlMappings', [$files['xml']]);
         }
 
         if (!empty($files['yml'])) {
-            $validatorBuilder->addMethodCall('addYamlMappings', array($files['yml']));
+            $validatorBuilder->addMethodCall('addYamlMappings', [$files['yml']]);
         }
 
         $definition = $container->findDefinition('validator.email');
@@ -1273,12 +1273,12 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
                 throw new \LogicException('"enable_annotations" on the validator cannot be set as Annotations support is disabled.');
             }
 
-            $validatorBuilder->addMethodCall('enableAnnotationMapping', array(new Reference('annotation_reader')));
+            $validatorBuilder->addMethodCall('enableAnnotationMapping', [new Reference('annotation_reader')]);
         }
 
         if (array_key_exists('static_method', $config) && $config['static_method']) {
             foreach ($config['static_method'] as $methodName) {
-                $validatorBuilder->addMethodCall('addMethodMapping', array($methodName));
+                $validatorBuilder->addMethodCall('addMethodMapping', [$methodName]);
             }
         }
 
@@ -1372,7 +1372,7 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
 
         if (!method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
             $container->getDefinition('annotations.dummy_registry')
-                ->setMethodCalls(array(array('registerLoader', array('class_exists'))));
+                ->setMethodCalls([['registerLoader', ['class_exists']]]);
         }
 
         if ('none' !== $config['cache']) {
@@ -1481,7 +1481,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
             $container->removeDefinition('serializer.encoder.yaml');
         }
 
-        $serializerLoaders = array();
+        $serializerLoaders = [];
         if (isset($config['enable_annotations']) && $config['enable_annotations']) {
             if (!$this->annotationsConfigEnabled) {
                 throw new \LogicException('"enable_annotations" on the serializer cannot be set as Annotations support is disabled.');
@@ -1497,7 +1497,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
         }
 
         $fileRecorder = function ($extension, $path) use (&$serializerLoaders) {
-            $definition = new Definition(\in_array($extension, array('yaml', 'yml')) ? 'Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader' : 'Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader', array($path));
+            $definition = new Definition(\in_array($extension, ['yaml', 'yml']) ? 'Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader' : 'Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader', [$path]);
             $definition->setPublic(false);
             $serializerLoaders[] = $definition;
         };
@@ -1543,10 +1543,10 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
         } elseif (!$container->getParameter('kernel.debug')) {
             $cacheMetadataFactory = new Definition(
                 CacheClassMetadataFactory::class,
-                array(
+                [
                     new Reference('serializer.mapping.cache_class_metadata_factory.inner'),
                     new Reference('serializer.mapping.cache.symfony'),
-                )
+                ]
             );
             $cacheMetadataFactory->setPublic(false);
             $cacheMetadataFactory->setDecoratedService('serializer.mapping.class_metadata_factory');
@@ -1559,7 +1559,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
         }
 
         if (isset($config['circular_reference_handler']) && $config['circular_reference_handler']) {
-            $container->getDefinition('serializer.normalizer.object')->addMethodCall('setCircularReferenceHandler', array(new Reference($config['circular_reference_handler'])));
+            $container->getDefinition('serializer.normalizer.object')->addMethodCall('setCircularReferenceHandler', [new Reference($config['circular_reference_handler'])]);
         }
     }
 
@@ -1576,8 +1576,8 @@ private function registerPropertyInfoConfiguration(ContainerBuilder $container,
         if (interface_exists('phpDocumentor\Reflection\DocBlockFactoryInterface')) {
             $definition = $container->register('property_info.php_doc_extractor', 'Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor');
             $definition->setPrivate(true);
-            $definition->addTag('property_info.description_extractor', array('priority' => -1000));
-            $definition->addTag('property_info.type_extractor', array('priority' => -1001));
+            $definition->addTag('property_info.description_extractor', ['priority' => -1000]);
+            $definition->addTag('property_info.type_extractor', ['priority' => -1001]);
         }
     }
 
@@ -1591,7 +1591,7 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont
             }
 
             // Generate stores
-            $storeDefinitions = array();
+            $storeDefinitions = [];
             foreach ($resourceStores as $storeDsn) {
                 $storeDsn = $container->resolveEnvPlaceholders($storeDsn, null, $usedEnvs);
                 switch (true) {
@@ -1605,15 +1605,15 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont
                         if (!$container->hasDefinition($connectionDefinitionId = $container->hash($storeDsn))) {
                             $connectionDefinition = new Definition(\stdClass::class);
                             $connectionDefinition->setPublic(false);
-                            $connectionDefinition->setFactory(array(AbstractAdapter::class, 'createConnection'));
-                            $connectionDefinition->setArguments(array($storeDsn, array('lazy' => true)));
+                            $connectionDefinition->setFactory([AbstractAdapter::class, 'createConnection']);
+                            $connectionDefinition->setArguments([$storeDsn, ['lazy' => true]]);
                             $container->setDefinition($connectionDefinitionId, $connectionDefinition);
                         }
 
                         $storeDefinition = new Definition(StoreInterface::class);
                         $storeDefinition->setPublic(false);
-                        $storeDefinition->setFactory(array(StoreFactory::class, 'createStore'));
-                        $storeDefinition->setArguments(array(new Reference($connectionDefinitionId)));
+                        $storeDefinition->setFactory([StoreFactory::class, 'createStore']);
+                        $storeDefinition->setArguments([new Reference($connectionDefinitionId)]);
 
                         $container->setDefinition($storeDefinitionId = 'lock.'.$resourceName.'.store.'.$container->hash($storeDsn), $storeDefinition);
 
@@ -1643,8 +1643,8 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont
             // Generate services for lock instances
             $lockDefinition = new Definition(Lock::class);
             $lockDefinition->setPublic(false);
-            $lockDefinition->setFactory(array(new Reference('lock.'.$resourceName.'.factory'), 'createLock'));
-            $lockDefinition->setArguments(array($resourceName));
+            $lockDefinition->setFactory([new Reference('lock.'.$resourceName.'.factory'), 'createLock']);
+            $lockDefinition->setArguments([$resourceName]);
             $container->setDefinition('lock.'.$resourceName, $lockDefinition);
 
             // provide alias for default resource
diff --git a/src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php b/src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php
index 5fb6c3b56fda5..ffb32b2f2bc8a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php
+++ b/src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php
@@ -41,8 +41,8 @@ public function onKernelRequest(GetResponseEvent $event)
 
     public static function getSubscribedEvents()
     {
-        return array(
-            KernelEvents::REQUEST => array('onKernelRequest', 24),
-        );
+        return [
+            KernelEvents::REQUEST => ['onKernelRequest', 24],
+        ];
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
index 3288c4b1a8528..daf7a37bf8547 100644
--- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
+++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -84,13 +84,13 @@ public function build(ContainerBuilder $container)
     {
         parent::build($container);
 
-        $hotPathEvents = array(
+        $hotPathEvents = [
             KernelEvents::REQUEST,
             KernelEvents::CONTROLLER,
             KernelEvents::CONTROLLER_ARGUMENTS,
             KernelEvents::RESPONSE,
             KernelEvents::FINISH_REQUEST,
-        );
+        ];
 
         $container->addCompilerPass(new LoggerPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, -32);
         $container->addCompilerPass(new RegisterControllerArgumentLocatorsPass());
diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
index d9bd456350210..6d79c6a90e29e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
+++ b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
@@ -37,7 +37,7 @@ public function __construct(KernelInterface $kernel, $cacheDir = null)
         $this->kernel = $kernel;
         $this->cacheDir = $cacheDir;
 
-        parent::__construct($kernel, $this->createStore(), $this->createSurrogate(), array_merge(array('debug' => $kernel->isDebug()), $this->getOptions()));
+        parent::__construct($kernel, $this->createStore(), $this->createSurrogate(), array_merge(['debug' => $kernel->isDebug()], $this->getOptions()));
     }
 
     /**
@@ -64,7 +64,7 @@ protected function forward(Request $request, $raw = false, Response $entry = nul
      */
     protected function getOptions()
     {
-        return array();
+        return [];
     }
 
     protected function createSurrogate()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php
index a9bd62f2a1b9e..dbed8eff722ee 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php
@@ -1,6 +1,6 @@
 <?php foreach ($attr as $k => $v): ?>
 <?php if ('placeholder' === $k || 'title' === $k): ?>
-<?php printf('%s="%s" ', $view->escape($k), $view->escape(false !== $translation_domain ? $view['translator']->trans($v, array(), $translation_domain) : $v)) ?>
+<?php printf('%s="%s" ', $view->escape($k), $view->escape(false !== $translation_domain ? $view['translator']->trans($v, [], $translation_domain) : $v)) ?>
 <?php elseif (true === $v): ?>
 <?php printf('%s="%s" ', $view->escape($k), $view->escape($k)) ?>
 <?php elseif (false !== $v): ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_widget.html.php
index 4b63876984506..2a10aa0f415b0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_widget.html.php
@@ -1,4 +1,4 @@
 <?php if (!$label) { $label = isset($label_format)
-    ? strtr($label_format, array('%name%' => $name, '%id%' => $id))
+    ? strtr($label_format, ['%name%' => $name, '%id%' => $id])
     : $view['form']->humanize($name); } ?>
-<button type="<?php echo isset($type) ? $view->escape($type) : 'button' ?>" <?php echo $view['form']->block($form, 'button_attributes') ?>><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($label, array(), $translation_domain) : $label) ?></button>
+<button type="<?php echo isset($type) ? $view->escape($type) : 'button' ?>" <?php echo $view['form']->block($form, 'button_attributes') ?>><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($label, [], $translation_domain) : $label) ?></button>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
index 92298cf5fcff5..c63d354e1789c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
@@ -2,17 +2,17 @@
     <?php if ($required && null === $placeholder && $placeholder_in_choices === false && $multiple === false && (!isset($attr['size']) || $attr['size'] <= 1)):
         $required = false;
     endif; ?>
-    <?php echo $view['form']->block($form, 'widget_attributes', array(
+    <?php echo $view['form']->block($form, 'widget_attributes', [
         'required' => $required,
-    )) ?>
+    ]) ?>
     <?php if ($multiple): ?> multiple="multiple"<?php endif ?>
 >
-    <?php if (null !== $placeholder): ?><option value=""<?php if ($required && empty($value) && '0' !== $value): ?> selected="selected"<?php endif?>><?php echo '' != $placeholder ? $view->escape(false !== $translation_domain ? $view['translator']->trans($placeholder, array(), $translation_domain) : $placeholder) : '' ?></option><?php endif; ?>
+    <?php if (null !== $placeholder): ?><option value=""<?php if ($required && empty($value) && '0' !== $value): ?> selected="selected"<?php endif?>><?php echo '' != $placeholder ? $view->escape(false !== $translation_domain ? $view['translator']->trans($placeholder, [], $translation_domain) : $placeholder) : '' ?></option><?php endif; ?>
     <?php if (count($preferred_choices) > 0): ?>
-        <?php echo $view['form']->block($form, 'choice_widget_options', array('choices' => $preferred_choices)) ?>
+        <?php echo $view['form']->block($form, 'choice_widget_options', ['choices' => $preferred_choices]) ?>
         <?php if (count($choices) > 0 && null !== $separator): ?>
             <option disabled="disabled"><?php echo $separator ?></option>
         <?php endif ?>
     <?php endif ?>
-    <?php echo $view['form']->block($form, 'choice_widget_options', array('choices' => $choices)) ?>
+    <?php echo $view['form']->block($form, 'choice_widget_options', ['choices' => $choices]) ?>
 </select>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_expanded.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_expanded.html.php
index 2c426872071fc..9691759a907f5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_expanded.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_expanded.html.php
@@ -1,6 +1,6 @@
 <div <?php echo $view['form']->block($form, 'widget_container_attributes') ?>>
 <?php foreach ($form as $child): ?>
     <?php echo $view['form']->widget($child) ?>
-    <?php echo $view['form']->label($child, null, array('translation_domain' => $choice_translation_domain)) ?>
+    <?php echo $view['form']->label($child, null, ['translation_domain' => $choice_translation_domain]) ?>
 <?php endforeach ?>
 </div>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_options.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_options.html.php
index f1c6ad3b56f21..a19b5a5e6e0b8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_options.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_options.html.php
@@ -4,10 +4,10 @@
 <?php $formHelper = $view['form']; ?>
 <?php foreach ($choices as $group_label => $choice): ?>
     <?php if (is_array($choice) || $choice instanceof ChoiceGroupView): ?>
-        <optgroup label="<?php echo $view->escape(false !== $choice_translation_domain ? $translatorHelper->trans($group_label, array(), $choice_translation_domain) : $group_label) ?>">
-            <?php echo $formHelper->block($form, 'choice_widget_options', array('choices' => $choice)) ?>
+        <optgroup label="<?php echo $view->escape(false !== $choice_translation_domain ? $translatorHelper->trans($group_label, [], $choice_translation_domain) : $group_label) ?>">
+            <?php echo $formHelper->block($form, 'choice_widget_options', ['choices' => $choice]) ?>
         </optgroup>
     <?php else: ?>
-        <option value="<?php echo $view->escape($choice->value) ?>" <?php echo $formHelper->block($form, 'choice_attributes', array('choice_attr' => $choice->attr)) ?><?php if ($is_selected($choice->value, $value)): ?> selected="selected"<?php endif?>><?php echo $view->escape(false !== $choice_translation_domain ? $translatorHelper->trans($choice->label, array(), $choice_translation_domain) : $choice->label) ?></option>
+        <option value="<?php echo $view->escape($choice->value) ?>" <?php echo $formHelper->block($form, 'choice_attributes', ['choice_attr' => $choice->attr]) ?><?php if ($is_selected($choice->value, $value)): ?> selected="selected"<?php endif?>><?php echo $view->escape(false !== $choice_translation_domain ? $translatorHelper->trans($choice->label, [], $choice_translation_domain) : $choice->label) ?></option>
     <?php endif ?>
 <?php endforeach ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/collection_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/collection_widget.html.php
index 9f6a94bcefc93..40dfdaf1f031f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/collection_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/collection_widget.html.php
@@ -1,4 +1,4 @@
 <?php if (isset($prototype)): ?>
     <?php $attr['data-prototype'] = $view->escape($view['form']->row($prototype)) ?>
 <?php endif ?>
-<?php echo $view['form']->widget($form, array('attr' => $attr)) ?>
+<?php echo $view['form']->widget($form, ['attr' => $attr]) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/color_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/color_widget.html.php
index 10a8cdf14930e..48f5c2c30dfd5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/color_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/color_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'color'));
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'color']);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_widget.html.php
index 22e51d2735a70..fbd844f28693b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/date_widget.html.php
@@ -2,10 +2,10 @@
     <?php echo $view['form']->block($form, 'form_widget_simple'); ?>
 <?php else: ?>
     <div <?php echo $view['form']->block($form, 'widget_container_attributes') ?>>
-        <?php echo str_replace(array('{{ year }}', '{{ month }}', '{{ day }}'), array(
+        <?php echo str_replace(['{{ year }}', '{{ month }}', '{{ day }}'], [
             $view['form']->widget($form['year']),
             $view['form']->widget($form['month']),
             $view['form']->widget($form['day']),
-        ), $date_pattern) ?>
+        ], $date_pattern) ?>
     </div>
 <?php endif ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/email_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/email_widget.html.php
index 0b30c5bb7ae54..fa6b0ee8a14a4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/email_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/email_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'email')) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'email']) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_label.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_label.html.php
index 78c953ec5a1f3..8e8e5b94983bb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_label.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_label.html.php
@@ -2,7 +2,7 @@
 <?php if ($required) { $label_attr['class'] = trim((isset($label_attr['class']) ? $label_attr['class'] : '').' required'); } ?>
 <?php if (!$compound) { $label_attr['for'] = $id; } ?>
 <?php if (!$label) { $label = isset($label_format)
-    ? strtr($label_format, array('%name%' => $name, '%id%' => $id))
+    ? strtr($label_format, ['%name%' => $name, '%id%' => $id])
     : $view['form']->humanize($name); } ?>
-<label<?php if ($label_attr) { echo ' '.$view['form']->block($form, 'attributes', array('attr' => $label_attr)); } ?>><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($label, array(), $translation_domain) : $label) ?></label>
+<label<?php if ($label_attr) { echo ' '.$view['form']->block($form, 'attributes', ['attr' => $label_attr]); } ?>><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($label, [], $translation_domain) : $label) ?></label>
 <?php endif ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_widget.html.php
index a43f7de475e7a..6bcbb5e0461a9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'hidden')) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'hidden']) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/integer_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/integer_widget.html.php
index 5fceb49a38953..faaff51e676f5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/integer_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/integer_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'number')) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'number']) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_widget.html.php
index bf4a4c478502b..3d6f79c63bedb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'text')) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'text']) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_widget.html.php
index ec96cfb46b24c..5514468f6a1b3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'password')) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'password']) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_widget.html.php
index 8519da429b188..f5839ebf70203 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'text')) ?> %
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'text']) ?> %
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/range_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/range_widget.html.php
index 4c628f8e005bc..d6650d8154676 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/range_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/range_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'range'));
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'range']);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/reset_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/reset_widget.html.php
index e8fa18e488df8..af45b1566998a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/reset_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/reset_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'button_widget', array('type' => isset($type) ? $type : 'reset')) ?>
+<?php echo $view['form']->block($form, 'button_widget', ['type' => isset($type) ? $type : 'reset']) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/search_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/search_widget.html.php
index 48a33f4aa2dbc..191279b517eb2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/search_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/search_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'search')) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'search']) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/submit_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/submit_widget.html.php
index 6bf71f5a1e1c9..baea833326334 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/submit_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/submit_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'button_widget', array('type' => isset($type) ? $type : 'submit')) ?>
+<?php echo $view['form']->block($form, 'button_widget', ['type' => isset($type) ? $type : 'submit']) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/tel_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/tel_widget.html.php
index 7779538127026..dd471b9518d20 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/tel_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/tel_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'tel'));
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'tel']);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_widget.html.php
index e24411cd74b8b..cd2f5596011c1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_widget.html.php
@@ -1,7 +1,7 @@
 <?php if ($widget == 'single_text'): ?>
     <?php echo $view['form']->block($form, 'form_widget_simple'); ?>
 <?php else: ?>
-    <?php $vars = $widget == 'text' ? array('attr' => array('size' => 1)) : array() ?>
+    <?php $vars = $widget == 'text' ? ['attr' => ['size' => 1]] : [] ?>
     <div <?php echo $view['form']->block($form, 'widget_container_attributes') ?>>
         <?php
             // There should be no spaces between the colons and the widgets, that's why
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_widget.html.php
index 9e26318497b3c..cd653c89c5ccc 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'url')) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'url']) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/AnnotatedRouteControllerLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/AnnotatedRouteControllerLoader.php
index 474c725566d5c..51419c8914988 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Routing/AnnotatedRouteControllerLoader.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Routing/AnnotatedRouteControllerLoader.php
@@ -43,14 +43,14 @@ protected function configureRoute(Route $route, \ReflectionClass $class, \Reflec
      */
     protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method)
     {
-        return preg_replace(array(
+        return preg_replace([
             '/(bundle|controller)_/',
             '/action(_\d+)?$/',
             '/__/',
-        ), array(
+        ], [
             '_',
             '\\1',
             '_',
-        ), parent::getDefaultRouteName($class, $method));
+        ], parent::getDefaultRouteName($class, $method));
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/RedirectableUrlMatcher.php b/src/Symfony/Bundle/FrameworkBundle/Routing/RedirectableUrlMatcher.php
index 5571c74e81d19..fd1594c8833fc 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Routing/RedirectableUrlMatcher.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Routing/RedirectableUrlMatcher.php
@@ -29,7 +29,7 @@ class RedirectableUrlMatcher extends BaseMatcher
      */
     public function redirect($path, $route, $scheme = null)
     {
-        return array(
+        return [
             '_controller' => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\RedirectController::urlRedirectAction',
             'path' => $path,
             'permanent' => true,
@@ -37,6 +37,6 @@ public function redirect($path, $route, $scheme = null)
             'httpPort' => $this->context->getHttpPort(),
             'httpsPort' => $this->context->getHttpsPort(),
             '_route' => $route,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
index 3904996aa459f..cf3849b585baa 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
@@ -99,13 +99,13 @@ private function resolveParameters(RouteCollection $collection)
             $route->setPath($this->resolve($route->getPath()));
             $route->setHost($this->resolve($route->getHost()));
 
-            $schemes = array();
+            $schemes = [];
             foreach ($route->getSchemes() as $scheme) {
                 $schemes = array_merge($schemes, explode('|', $this->resolve($scheme)));
             }
             $route->setSchemes($schemes);
 
-            $methods = array();
+            $methods = [];
             foreach ($route->getMethods() as $method) {
                 $methods = array_merge($methods, explode('|', $this->resolve($method)));
             }
@@ -170,8 +170,8 @@ private function resolve($value)
      */
     public static function getSubscribedServices()
     {
-        return array(
+        return [
             'routing.loader' => LoaderInterface::class,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php b/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php
index 07bf39f5b4501..f40760fc91eb6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php
@@ -43,7 +43,7 @@ public function getEngine($name)
     /**
      * {@inheritdoc}
      */
-    public function renderResponse($view, array $parameters = array(), Response $response = null)
+    public function renderResponse($view, array $parameters = [], Response $response = null)
     {
         $engine = $this->getEngine($view);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/EngineInterface.php b/src/Symfony/Bundle/FrameworkBundle/Templating/EngineInterface.php
index cc0d573ee26d7..0b3a8b32006b3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/EngineInterface.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/EngineInterface.php
@@ -32,5 +32,5 @@ interface EngineInterface extends BaseEngineInterface
      *
      * @throws \RuntimeException if the template cannot be rendered
      */
-    public function renderResponse($view, array $parameters = array(), Response $response = null);
+    public function renderResponse($view, array $parameters = [], Response $response = null);
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php
index 76a6046d9b0b2..70e5a314bba64 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php
@@ -39,7 +39,7 @@ public function __construct(FragmentHandler $handler)
      *
      * @see FragmentHandler::render()
      */
-    public function render($uri, array $options = array())
+    public function render($uri, array $options = [])
     {
         $strategy = isset($options['strategy']) ? $options['strategy'] : 'inline';
         unset($options['strategy']);
@@ -47,7 +47,7 @@ public function render($uri, array $options = array())
         return $this->handler->render($uri, $strategy, $options);
     }
 
-    public function controller($controller, $attributes = array(), $query = array())
+    public function controller($controller, $attributes = [], $query = [])
     {
         return new ControllerReference($controller, $attributes, $query);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
index c4087a2f39d5f..c8914c3a58580 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
@@ -78,7 +78,7 @@ public function abbrMethod($method)
      */
     public function formatArgs(array $args)
     {
-        $result = array();
+        $result = [];
         foreach ($args as $key => $item) {
             if ('object' === $item[0]) {
                 $parts = explode('\\', $item[1]);
@@ -131,7 +131,7 @@ public function fileExcerpt($file, $line)
             $code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
             $content = explode('<br />', $code);
 
-            $lines = array();
+            $lines = [];
             for ($i = max($line - 3, 1), $max = min($line + 3, \count($content)); $i <= $max; ++$i) {
                 $lines[] = '<li'.($i == $line ? ' class="selected"' : '').'><code>'.self::fixCodeMarkup($content[$i - 1]).'</code></li>';
             }
@@ -157,7 +157,7 @@ public function formatFile($file, $line, $text = null)
             $file = trim($file);
             $fileStr = $file;
             if (0 === strpos($fileStr, $this->rootDir)) {
-                $fileStr = str_replace(array('\\', $this->rootDir), array('/', ''), $fileStr);
+                $fileStr = str_replace(['\\', $this->rootDir], ['/', ''], $fileStr);
                 $fileStr = htmlspecialchars($fileStr, $flags, $this->charset);
                 $fileStr = sprintf('<abbr title="%s">kernel.root_dir</abbr>/%s', htmlspecialchars($this->rootDir, $flags, $this->charset), $fileStr);
             }
@@ -183,7 +183,7 @@ public function formatFile($file, $line, $text = null)
     public function getFileLink($file, $line)
     {
         if ($fmt = $this->fileLinkFormat) {
-            return \is_string($fmt) ? strtr($fmt, array('%f' => $file, '%l' => $line)) : $fmt->format($file, $line);
+            return \is_string($fmt) ? strtr($fmt, ['%f' => $file, '%l' => $line]) : $fmt->format($file, $line);
         }
 
         return false;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
index a07b0500e9c76..9e602b2aeb872 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
@@ -76,7 +76,7 @@ public function setTheme(FormView $view, $themes, $useDefaultThemes = true)
      *
      * @return string The HTML markup
      */
-    public function form(FormView $view, array $variables = array())
+    public function form(FormView $view, array $variables = [])
     {
         return $this->renderer->renderBlock($view, 'form', $variables);
     }
@@ -93,7 +93,7 @@ public function form(FormView $view, array $variables = array())
      *
      * @return string The HTML markup
      */
-    public function start(FormView $view, array $variables = array())
+    public function start(FormView $view, array $variables = [])
     {
         return $this->renderer->renderBlock($view, 'form_start', $variables);
     }
@@ -110,7 +110,7 @@ public function start(FormView $view, array $variables = array())
      *
      * @return string The HTML markup
      */
-    public function end(FormView $view, array $variables = array())
+    public function end(FormView $view, array $variables = [])
     {
         return $this->renderer->renderBlock($view, 'form_end', $variables);
     }
@@ -133,7 +133,7 @@ public function end(FormView $view, array $variables = array())
      *
      * @return string The HTML markup
      */
-    public function widget(FormView $view, array $variables = array())
+    public function widget(FormView $view, array $variables = [])
     {
         return $this->renderer->searchAndRenderBlock($view, 'widget', $variables);
     }
@@ -146,7 +146,7 @@ public function widget(FormView $view, array $variables = array())
      *
      * @return string The HTML markup
      */
-    public function row(FormView $view, array $variables = array())
+    public function row(FormView $view, array $variables = [])
     {
         return $this->renderer->searchAndRenderBlock($view, 'row', $variables);
     }
@@ -160,10 +160,10 @@ public function row(FormView $view, array $variables = array())
      *
      * @return string The HTML markup
      */
-    public function label(FormView $view, $label = null, array $variables = array())
+    public function label(FormView $view, $label = null, array $variables = [])
     {
         if (null !== $label) {
-            $variables += array('label' => $label);
+            $variables += ['label' => $label];
         }
 
         return $this->renderer->searchAndRenderBlock($view, 'label', $variables);
@@ -187,7 +187,7 @@ public function errors(FormView $view)
      *
      * @return string The HTML markup
      */
-    public function rest(FormView $view, array $variables = array())
+    public function rest(FormView $view, array $variables = [])
     {
         return $this->renderer->searchAndRenderBlock($view, 'rest', $variables);
     }
@@ -201,7 +201,7 @@ public function rest(FormView $view, array $variables = array())
      *
      * @return string The HTML markup
      */
-    public function block(FormView $view, $blockName, array $variables = array())
+    public function block(FormView $view, $blockName, array $variables = [])
     {
         return $this->renderer->renderBlock($view, $blockName, $variables);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php
index 683efd5974be3..f242479086e9a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php
@@ -39,7 +39,7 @@ public function __construct(UrlGeneratorInterface $router)
      *
      * @see UrlGeneratorInterface
      */
-    public function path($name, $parameters = array(), $relative = false)
+    public function path($name, $parameters = [], $relative = false)
     {
         return $this->generator->generate($name, $parameters, $relative ? UrlGeneratorInterface::RELATIVE_PATH : UrlGeneratorInterface::ABSOLUTE_PATH);
     }
@@ -55,7 +55,7 @@ public function path($name, $parameters = array(), $relative = false)
      *
      * @see UrlGeneratorInterface
      */
-    public function url($name, $parameters = array(), $schemeRelative = false)
+    public function url($name, $parameters = [], $schemeRelative = false)
     {
         return $this->generator->generate($name, $parameters, $schemeRelative ? UrlGeneratorInterface::NETWORK_PATH : UrlGeneratorInterface::ABSOLUTE_URL);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php
index 4de6e7eec07c8..072c1d3d21467 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php
@@ -42,7 +42,7 @@ public function get($name, $default = null)
         return $this->getSession()->get($name, $default);
     }
 
-    public function getFlash($name, array $default = array())
+    public function getFlash($name, array $default = [])
     {
         return $this->getSession()->getFlashBag()->get($name, $default);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php
index 5c4a9ae0fa1c5..4846cb11019c1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php
@@ -29,7 +29,7 @@ public function __construct(TranslatorInterface $translator)
     /**
      * @see TranslatorInterface::trans()
      */
-    public function trans($id, array $parameters = array(), $domain = 'messages', $locale = null)
+    public function trans($id, array $parameters = [], $domain = 'messages', $locale = null)
     {
         return $this->translator->trans($id, $parameters, $domain, $locale);
     }
@@ -37,7 +37,7 @@ public function trans($id, array $parameters = array(), $domain = 'messages', $l
     /**
      * @see TranslatorInterface::transChoice()
      */
-    public function transChoice($id, $number, array $parameters = array(), $domain = 'messages', $locale = null)
+    public function transChoice($id, $number, array $parameters = [], $domain = 'messages', $locale = null)
     {
         return $this->translator->transChoice($id, $number, $parameters, $domain, $locale);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php
index dc57cc0964c56..b90b9a275a8a0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php
@@ -24,7 +24,7 @@ class TemplateLocator implements FileLocatorInterface
     protected $locator;
     protected $cache;
 
-    private $cacheHits = array();
+    private $cacheHits = [];
 
     /**
      * @param FileLocatorInterface $locator  A FileLocatorInterface instance
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php b/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php
index bad7c1793162f..ef9c43b8fd456 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php
@@ -65,7 +65,7 @@ public function setHelpers(array $helpers)
     /**
      * {@inheritdoc}
      */
-    public function renderResponse($view, array $parameters = array(), Response $response = null)
+    public function renderResponse($view, array $parameters = [], Response $response = null)
     {
         if (null === $response) {
             $response = new Response();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php
index f1e54af31335b..22dbe3c972890 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php
@@ -25,7 +25,7 @@
 class TemplateNameParser extends BaseTemplateNameParser
 {
     protected $kernel;
-    protected $cache = array();
+    protected $cache = [];
 
     public function __construct(KernelInterface $kernel)
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateReference.php b/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateReference.php
index d9bc982d74524..8f1daf8599e31 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateReference.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateReference.php
@@ -22,13 +22,13 @@ class TemplateReference extends BaseTemplateReference
 {
     public function __construct($bundle = null, $controller = null, $name = null, $format = null, $engine = null)
     {
-        $this->parameters = array(
+        $this->parameters = [
             'bundle' => $bundle,
             'controller' => $controller,
             'name' => $name,
             'format' => $format,
             'engine' => $engine,
-        );
+        ];
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/TimedPhpEngine.php b/src/Symfony/Bundle/FrameworkBundle/Templating/TimedPhpEngine.php
index 3263ea24d0be3..783e675f975af 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/TimedPhpEngine.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/TimedPhpEngine.php
@@ -35,7 +35,7 @@ public function __construct(TemplateNameParserInterface $parser, ContainerInterf
     /**
      * {@inheritdoc}
      */
-    public function render($name, array $parameters = array())
+    public function render($name, array $parameters = [])
     {
         $e = $this->stopwatch->start(sprintf('template.php (%s)', $name), 'template');
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
index 4febf5033d7a9..0feb15380e1c4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -158,7 +158,7 @@ protected static function getKernelClass()
      *
      * @return KernelInterface A KernelInterface instance
      */
-    protected static function bootKernel(array $options = array())
+    protected static function bootKernel(array $options = [])
     {
         static::ensureKernelShutdown();
 
@@ -178,7 +178,7 @@ protected static function bootKernel(array $options = array())
      *
      * @return KernelInterface A KernelInterface instance
      */
-    protected static function createKernel(array $options = array())
+    protected static function createKernel(array $options = [])
     {
         if (null === static::$class) {
             static::$class = static::getKernelClass();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
index b5aaa2604b24d..28b27099d6aa9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
@@ -28,7 +28,7 @@ abstract class WebTestCase extends KernelTestCase
      *
      * @return Client A Client instance
      */
-    protected static function createClient(array $options = array(), array $server = array())
+    protected static function createClient(array $options = [], array $server = [])
     {
         $kernel = static::bootKernel($options);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php
index b32274e7e7a80..b0940caaf2206 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php
@@ -34,7 +34,7 @@ protected function tearDown()
 
     public function testAnnotationsCacheWarmerWithDebugDisabled()
     {
-        file_put_contents($this->cacheDir.'/annotations.map', sprintf('<?php return %s;', var_export(array(__CLASS__), true)));
+        file_put_contents($this->cacheDir.'/annotations.map', sprintf('<?php return %s;', var_export([__CLASS__], true)));
         $cacheFile = tempnam($this->cacheDir, __FUNCTION__);
         $reader = new AnnotationReader();
         $fallbackPool = new ArrayAdapter();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/SerializerCacheWarmerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/SerializerCacheWarmerTest.php
index fdd40d48d6fd9..4aeabab3a695f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/SerializerCacheWarmerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/SerializerCacheWarmerTest.php
@@ -28,10 +28,10 @@ public function testWarmUp()
             $this->markTestSkipped('The Serializer default cache warmer has been introduced in the Serializer Component version 3.2.');
         }
 
-        $loaders = array(
+        $loaders = [
             new XmlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/person.xml'),
             new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/author.yml'),
-        );
+        ];
 
         $file = sys_get_temp_dir().'/cache-serializer.php';
         @unlink($file);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/TemplateFinderTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/TemplateFinderTest.php
index 5da592c356a6b..94b5432c3ab9b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/TemplateFinderTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/TemplateFinderTest.php
@@ -34,7 +34,7 @@ public function testFindAllTemplates()
         $kernel
             ->expects($this->once())
             ->method('getBundles')
-            ->will($this->returnValue(array('BaseBundle' => new BaseBundle())))
+            ->will($this->returnValue(['BaseBundle' => new BaseBundle()]))
         ;
 
         $parser = new TemplateFilenameParser();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/TemplatePathsCacheWarmerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/TemplatePathsCacheWarmerTest.php
index 75d5934c79065..30d0242663723 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/TemplatePathsCacheWarmerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/TemplatePathsCacheWarmerTest.php
@@ -39,13 +39,13 @@ protected function setUp()
     {
         $this->templateFinder = $this
             ->getMockBuilder(TemplateFinderInterface::class)
-            ->setMethods(array('findAllTemplates'))
+            ->setMethods(['findAllTemplates'])
             ->getMock();
 
         $this->fileLocator = $this
             ->getMockBuilder(FileLocator::class)
-            ->setMethods(array('locate'))
-            ->setConstructorArgs(array('/path/to/fallback'))
+            ->setMethods(['locate'])
+            ->setConstructorArgs(['/path/to/fallback'])
             ->getMock();
 
         $this->templateLocator = new TemplateLocator($this->fileLocator);
@@ -68,7 +68,7 @@ public function testWarmUp()
         $this->templateFinder
             ->expects($this->once())
             ->method('findAllTemplates')
-            ->will($this->returnValue(array($template)));
+            ->will($this->returnValue([$template]));
 
         $this->fileLocator
             ->expects($this->once())
@@ -87,7 +87,7 @@ public function testWarmUpEmpty()
         $this->templateFinder
             ->expects($this->once())
             ->method('findAllTemplates')
-            ->will($this->returnValue(array()));
+            ->will($this->returnValue([]));
 
         $this->fileLocator
             ->expects($this->never())
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/ClientTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/ClientTest.php
index d021b0a29ac58..ba253d1d1f511 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/ClientTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/ClientTest.php
@@ -54,7 +54,7 @@ public function testEnableRebootKernel()
     private function getKernelMock()
     {
         $mock = $this->getMockBuilder($this->getKernelClass())
-            ->setMethods(array('shutdown', 'boot', 'handle'))
+            ->setMethods(['shutdown', 'boot', 'handle'])
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
index e2104d36f449d..f211f283869eb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
@@ -45,7 +45,7 @@ protected function tearDown()
 
     public function testCacheIsFreshAfterCacheClearedWithWarmup()
     {
-        $input = new ArrayInput(array('cache:clear'));
+        $input = new ArrayInput(['cache:clear']);
         $application = new Application($this->kernel);
         $application->setCatchExceptions(false);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
index 213d75ecc6dc0..1022b31a4f45b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
@@ -21,9 +21,9 @@ class TestAppKernel extends Kernel
 {
     public function registerBundles()
     {
-        return array(
+        return [
             new FrameworkBundle(),
-        );
+        ];
     }
 
     public function setRootDir($rootDir)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePruneCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePruneCommandTest.php
index 5356f4a0adb51..084514ad51e0c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePruneCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePruneCommandTest.php
@@ -24,13 +24,13 @@ class CachePruneCommandTest extends TestCase
     public function testCommandWithPools()
     {
         $tester = $this->getCommandTester($this->getKernel(), $this->getRewindableGenerator());
-        $tester->execute(array());
+        $tester->execute([]);
     }
 
     public function testCommandWithNoPools()
     {
         $tester = $this->getCommandTester($this->getKernel(), $this->getEmptyRewindableGenerator());
-        $tester->execute(array());
+        $tester->execute([]);
     }
 
     /**
@@ -50,7 +50,7 @@ private function getRewindableGenerator()
     private function getEmptyRewindableGenerator()
     {
         return new RewindableGenerator(function () {
-            return new \ArrayIterator(array());
+            return new \ArrayIterator([]);
         }, 0);
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php
index 0b07bc9f57698..454d058e08153 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php
@@ -26,7 +26,7 @@ class RouterMatchCommandTest extends TestCase
     public function testWithMatchPath()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array('path_info' => '/foo', 'foo'), array('decorated' => false));
+        $ret = $tester->execute(['path_info' => '/foo', 'foo'], ['decorated' => false]);
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
         $this->assertContains('Route Name   | foo', $tester->getDisplay());
@@ -35,7 +35,7 @@ public function testWithMatchPath()
     public function testWithNotMatchPath()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array('path_info' => '/test', 'foo'), array('decorated' => false));
+        $ret = $tester->execute(['path_info' => '/test', 'foo'], ['decorated' => false]);
 
         $this->assertEquals(1, $ret, 'Returns 1 in case of failure');
         $this->assertContains('None of the routes match the path "/test"', $tester->getDisplay());
@@ -119,7 +119,7 @@ private function getKernel()
         $kernel
             ->expects($this->once())
             ->method('getBundles')
-            ->willReturn(array())
+            ->willReturn([])
         ;
 
         return $kernel;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php
index f08921a56da5e..43786a91a559a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php
@@ -25,24 +25,24 @@ class TranslationDebugCommandTest extends TestCase
 
     public function testDebugMissingMessages()
     {
-        $tester = $this->createCommandTester(array('foo' => 'foo'));
-        $tester->execute(array('locale' => 'en', 'bundle' => 'foo'));
+        $tester = $this->createCommandTester(['foo' => 'foo']);
+        $tester->execute(['locale' => 'en', 'bundle' => 'foo']);
 
         $this->assertRegExp('/missing/', $tester->getDisplay());
     }
 
     public function testDebugUnusedMessages()
     {
-        $tester = $this->createCommandTester(array(), array('foo' => 'foo'));
-        $tester->execute(array('locale' => 'en', 'bundle' => 'foo'));
+        $tester = $this->createCommandTester([], ['foo' => 'foo']);
+        $tester->execute(['locale' => 'en', 'bundle' => 'foo']);
 
         $this->assertRegExp('/unused/', $tester->getDisplay());
     }
 
     public function testDebugFallbackMessages()
     {
-        $tester = $this->createCommandTester(array(), array('foo' => 'foo'));
-        $tester->execute(array('locale' => 'fr', 'bundle' => 'foo'));
+        $tester = $this->createCommandTester([], ['foo' => 'foo']);
+        $tester->execute(['locale' => 'fr', 'bundle' => 'foo']);
 
         $this->assertRegExp('/fallback/', $tester->getDisplay());
     }
@@ -50,15 +50,15 @@ public function testDebugFallbackMessages()
     public function testNoDefinedMessages()
     {
         $tester = $this->createCommandTester();
-        $tester->execute(array('locale' => 'fr', 'bundle' => 'test'));
+        $tester->execute(['locale' => 'fr', 'bundle' => 'test']);
 
         $this->assertRegExp('/No defined or extracted messages for locale "fr"/', $tester->getDisplay());
     }
 
     public function testDebugDefaultDirectory()
     {
-        $tester = $this->createCommandTester(array('foo' => 'foo'), array('bar' => 'bar'));
-        $tester->execute(array('locale' => 'en'));
+        $tester = $this->createCommandTester(['foo' => 'foo'], ['bar' => 'bar']);
+        $tester->execute(['locale' => 'en']);
 
         $this->assertRegExp('/missing/', $tester->getDisplay());
         $this->assertRegExp('/unused/', $tester->getDisplay());
@@ -105,8 +105,8 @@ public function testDebugInvalidDirectory()
             ->with($this->equalTo('dir'))
             ->will($this->throwException(new \InvalidArgumentException()));
 
-        $tester = $this->createCommandTester(array(), array(), $kernel);
-        $tester->execute(array('locale' => 'en', 'bundle' => 'dir'));
+        $tester = $this->createCommandTester([], [], $kernel);
+        $tester->execute(['locale' => 'en', 'bundle' => 'dir']);
     }
 
     protected function setUp()
@@ -127,7 +127,7 @@ protected function tearDown()
     /**
      * @return CommandTester
      */
-    private function createCommandTester($extractedMessages = array(), $loadedMessages = array(), $kernel = null)
+    private function createCommandTester($extractedMessages = [], $loadedMessages = [], $kernel = null)
     {
         $translator = $this->getMockBuilder('Symfony\Component\Translation\Translator')
             ->disableOriginalConstructor()
@@ -136,7 +136,7 @@ private function createCommandTester($extractedMessages = array(), $loadedMessag
         $translator
             ->expects($this->any())
             ->method('getFallbackLocales')
-            ->will($this->returnValue(array('en')));
+            ->will($this->returnValue(['en']));
 
         $extractor = $this->getMockBuilder('Symfony\Component\Translation\Extractor\ExtractorInterface')->getMock();
         $extractor
@@ -159,15 +159,15 @@ private function createCommandTester($extractedMessages = array(), $loadedMessag
             );
 
         if (null === $kernel) {
-            $returnValues = array(
-                array('foo', $this->getBundle($this->translationDir)),
-                array('test', $this->getBundle('test')),
-            );
+            $returnValues = [
+                ['foo', $this->getBundle($this->translationDir)],
+                ['test', $this->getBundle('test')],
+            ];
             if (HttpKernel\Kernel::VERSION_ID < 40000) {
-                $returnValues = array(
-                    array('foo', true, $this->getBundle($this->translationDir)),
-                    array('test', true, $this->getBundle('test')),
-                );
+                $returnValues = [
+                    ['foo', true, $this->getBundle($this->translationDir)],
+                    ['test', true, $this->getBundle('test')],
+                ];
             }
             $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
             $kernel
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php
index e92c1756526e3..6fb4736700668 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php
@@ -25,8 +25,8 @@ class TranslationUpdateCommandTest extends TestCase
 
     public function testDumpMessagesAndClean()
     {
-        $tester = $this->createCommandTester(array('messages' => array('foo' => 'foo')));
-        $tester->execute(array('command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true));
+        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
+        $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true]);
         $this->assertRegExp('/foo/', $tester->getDisplay());
         $this->assertRegExp('/1 message was successfully extracted/', $tester->getDisplay());
     }
@@ -38,16 +38,16 @@ public function testDumpMessagesAndCleanInRootDirectory()
         $this->fs->mkdir($this->translationDir.'/translations');
         $this->fs->mkdir($this->translationDir.'/templates');
 
-        $tester = $this->createCommandTester(array('messages' => array('foo' => 'foo')));
-        $tester->execute(array('command' => 'translation:update', 'locale' => 'en', '--dump-messages' => true, '--clean' => true));
+        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
+        $tester->execute(['command' => 'translation:update', 'locale' => 'en', '--dump-messages' => true, '--clean' => true]);
         $this->assertRegExp('/foo/', $tester->getDisplay());
         $this->assertRegExp('/1 message was successfully extracted/', $tester->getDisplay());
     }
 
     public function testDumpTwoMessagesAndClean()
     {
-        $tester = $this->createCommandTester(array('messages' => array('foo' => 'foo', 'bar' => 'bar')));
-        $tester->execute(array('command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true));
+        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'bar' => 'bar']]);
+        $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true]);
         $this->assertRegExp('/foo/', $tester->getDisplay());
         $this->assertRegExp('/bar/', $tester->getDisplay());
         $this->assertRegExp('/2 messages were successfully extracted/', $tester->getDisplay());
@@ -55,16 +55,16 @@ public function testDumpTwoMessagesAndClean()
 
     public function testDumpMessagesForSpecificDomain()
     {
-        $tester = $this->createCommandTester(array('messages' => array('foo' => 'foo'), 'mydomain' => array('bar' => 'bar')));
-        $tester->execute(array('command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true, '--domain' => 'mydomain'));
+        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo'], 'mydomain' => ['bar' => 'bar']]);
+        $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true, '--domain' => 'mydomain']);
         $this->assertRegExp('/bar/', $tester->getDisplay());
         $this->assertRegExp('/1 message was successfully extracted/', $tester->getDisplay());
     }
 
     public function testWriteMessages()
     {
-        $tester = $this->createCommandTester(array('messages' => array('foo' => 'foo')));
-        $tester->execute(array('command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--force' => true));
+        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
+        $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--force' => true]);
         $this->assertRegExp('/Translation files were successfully updated./', $tester->getDisplay());
     }
 
@@ -75,15 +75,15 @@ public function testWriteMessagesInRootDirectory()
         $this->fs->mkdir($this->translationDir.'/translations');
         $this->fs->mkdir($this->translationDir.'/templates');
 
-        $tester = $this->createCommandTester(array('messages' => array('foo' => 'foo')));
-        $tester->execute(array('command' => 'translation:update', 'locale' => 'en', '--force' => true));
+        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
+        $tester->execute(['command' => 'translation:update', 'locale' => 'en', '--force' => true]);
         $this->assertRegExp('/Translation files were successfully updated./', $tester->getDisplay());
     }
 
     public function testWriteMessagesForSpecificDomain()
     {
-        $tester = $this->createCommandTester(array('messages' => array('foo' => 'foo'), 'mydomain' => array('bar' => 'bar')));
-        $tester->execute(array('command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--force' => true, '--domain' => 'mydomain'));
+        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo'], 'mydomain' => ['bar' => 'bar']]);
+        $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--force' => true, '--domain' => 'mydomain']);
         $this->assertRegExp('/Translation files were successfully updated./', $tester->getDisplay());
     }
 
@@ -105,7 +105,7 @@ protected function tearDown()
     /**
      * @return CommandTester
      */
-    private function createCommandTester($extractedMessages = array(), $loadedMessages = array(), HttpKernel\KernelInterface $kernel = null)
+    private function createCommandTester($extractedMessages = [], $loadedMessages = [], HttpKernel\KernelInterface $kernel = null)
     {
         $translator = $this->getMockBuilder('Symfony\Component\Translation\Translator')
             ->disableOriginalConstructor()
@@ -114,7 +114,7 @@ private function createCommandTester($extractedMessages = array(), $loadedMessag
         $translator
             ->expects($this->any())
             ->method('getFallbackLocales')
-            ->will($this->returnValue(array('en')));
+            ->will($this->returnValue(['en']));
 
         $extractor = $this->getMockBuilder('Symfony\Component\Translation\Extractor\ExtractorInterface')->getMock();
         $extractor
@@ -143,19 +143,19 @@ private function createCommandTester($extractedMessages = array(), $loadedMessag
             ->expects($this->any())
             ->method('getFormats')
             ->will(
-                $this->returnValue(array('xlf', 'yml'))
+                $this->returnValue(['xlf', 'yml'])
             );
 
         if (null === $kernel) {
-            $returnValues = array(
-                array('foo', $this->getBundle($this->translationDir)),
-                array('test', $this->getBundle('test')),
-            );
+            $returnValues = [
+                ['foo', $this->getBundle($this->translationDir)],
+                ['test', $this->getBundle('test')],
+            ];
             if (HttpKernel\Kernel::VERSION_ID < 40000) {
-                $returnValues = array(
-                    array('foo', true, $this->getBundle($this->translationDir)),
-                    array('test', true, $this->getBundle('test')),
-                );
+                $returnValues = [
+                    ['foo', true, $this->getBundle($this->translationDir)],
+                    ['test', true, $this->getBundle('test')],
+                ];
             }
             $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
             $kernel
@@ -172,7 +172,7 @@ private function createCommandTester($extractedMessages = array(), $loadedMessag
         $kernel
             ->expects($this->any())
             ->method('getBundles')
-            ->will($this->returnValue(array()));
+            ->will($this->returnValue([]));
 
         $kernel
             ->expects($this->any())
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/YamlLintCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/YamlLintCommandTest.php
index 2daa2e3228318..a71fb824d57c4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/YamlLintCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/YamlLintCommandTest.php
@@ -36,8 +36,8 @@ public function testLintCorrectFile()
         $filename = $this->createFile('foo: bar');
 
         $tester->execute(
-            array('filename' => $filename),
-            array('verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false)
+            ['filename' => $filename],
+            ['verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false]
         );
 
         $this->assertEquals(0, $tester->getStatusCode(), 'Returns 0 in case of success');
@@ -52,7 +52,7 @@ public function testLintIncorrectFile()
         $tester = $this->createCommandTester();
         $filename = $this->createFile($incorrectContent);
 
-        $tester->execute(array('filename' => $filename), array('decorated' => false));
+        $tester->execute(['filename' => $filename], ['decorated' => false]);
 
         $this->assertEquals(1, $tester->getStatusCode(), 'Returns 1 in case of error');
         $this->assertContains('Unable to parse at line 3 (near "bar").', trim($tester->getDisplay()));
@@ -67,7 +67,7 @@ public function testLintFileNotReadable()
         $filename = $this->createFile('');
         unlink($filename);
 
-        $tester->execute(array('filename' => $filename), array('decorated' => false));
+        $tester->execute(['filename' => $filename], ['decorated' => false]);
     }
 
     public function testGetHelp()
@@ -103,8 +103,8 @@ public function testLintFilesFromBundleDirectory()
     {
         $tester = $this->createCommandTester($this->getKernelAwareApplicationMock());
         $tester->execute(
-            array('filename' => '@AppBundle/Resources'),
-            array('verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false)
+            ['filename' => '@AppBundle/Resources'],
+            ['verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false]
         );
 
         $this->assertEquals(0, $tester->getStatusCode(), 'Returns 0 in case of success');
@@ -186,7 +186,7 @@ private function getKernelAwareApplicationMock()
     protected function setUp()
     {
         @mkdir(sys_get_temp_dir().'/yml-lint-test');
-        $this->files = array();
+        $this->files = [];
     }
 
     protected function tearDown()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
index c977bb13a1313..8c25ef9672f45 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
@@ -29,30 +29,30 @@ public function testBundleInterfaceImplementation()
     {
         $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')->getMock();
 
-        $kernel = $this->getKernel(array($bundle), true);
+        $kernel = $this->getKernel([$bundle], true);
 
         $application = new Application($kernel);
-        $application->doRun(new ArrayInput(array('list')), new NullOutput());
+        $application->doRun(new ArrayInput(['list']), new NullOutput());
     }
 
     public function testBundleCommandsAreRegistered()
     {
-        $bundle = $this->createBundleMock(array());
+        $bundle = $this->createBundleMock([]);
 
-        $kernel = $this->getKernel(array($bundle), true);
+        $kernel = $this->getKernel([$bundle], true);
 
         $application = new Application($kernel);
-        $application->doRun(new ArrayInput(array('list')), new NullOutput());
+        $application->doRun(new ArrayInput(['list']), new NullOutput());
 
         // Calling twice: registration should only be done once.
-        $application->doRun(new ArrayInput(array('list')), new NullOutput());
+        $application->doRun(new ArrayInput(['list']), new NullOutput());
     }
 
     public function testBundleCommandsAreRetrievable()
     {
-        $bundle = $this->createBundleMock(array());
+        $bundle = $this->createBundleMock([]);
 
-        $kernel = $this->getKernel(array($bundle));
+        $kernel = $this->getKernel([$bundle]);
 
         $application = new Application($kernel);
         $application->all();
@@ -65,9 +65,9 @@ public function testBundleSingleCommandIsRetrievable()
     {
         $command = new Command('example');
 
-        $bundle = $this->createBundleMock(array($command));
+        $bundle = $this->createBundleMock([$command]);
 
-        $kernel = $this->getKernel(array($bundle));
+        $kernel = $this->getKernel([$bundle]);
 
         $application = new Application($kernel);
 
@@ -78,9 +78,9 @@ public function testBundleCommandCanBeFound()
     {
         $command = new Command('example');
 
-        $bundle = $this->createBundleMock(array($command));
+        $bundle = $this->createBundleMock([$command]);
 
-        $kernel = $this->getKernel(array($bundle));
+        $kernel = $this->getKernel([$bundle]);
 
         $application = new Application($kernel);
 
@@ -90,11 +90,11 @@ public function testBundleCommandCanBeFound()
     public function testBundleCommandCanBeFoundByAlias()
     {
         $command = new Command('example');
-        $command->setAliases(array('alias'));
+        $command->setAliases(['alias']);
 
-        $bundle = $this->createBundleMock(array($command));
+        $bundle = $this->createBundleMock([$command]);
 
-        $kernel = $this->getKernel(array($bundle));
+        $kernel = $this->getKernel([$bundle]);
 
         $application = new Application($kernel);
 
@@ -103,30 +103,30 @@ public function testBundleCommandCanBeFoundByAlias()
 
     public function testBundleCommandsHaveRightContainer()
     {
-        $command = $this->getMockForAbstractClass('Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand', array('foo'), '', true, true, true, array('setContainer'));
+        $command = $this->getMockForAbstractClass('Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand', ['foo'], '', true, true, true, ['setContainer']);
         $command->setCode(function () {});
         $command->expects($this->exactly(2))->method('setContainer');
 
-        $application = new Application($this->getKernel(array(), true));
+        $application = new Application($this->getKernel([], true));
         $application->setAutoExit(false);
         $application->setCatchExceptions(false);
         $application->add($command);
         $tester = new ApplicationTester($application);
 
         // set container is called here
-        $tester->run(array('command' => 'foo'));
+        $tester->run(['command' => 'foo']);
 
         // as the container might have change between two runs, setContainer must called again
-        $tester->run(array('command' => 'foo'));
+        $tester->run(['command' => 'foo']);
     }
 
     public function testBundleCommandCanOverriddeAPreExistingCommandWithTheSameName()
     {
         $command = new Command('example');
 
-        $bundle = $this->createBundleMock(array($command));
+        $bundle = $this->createBundleMock([$command]);
 
-        $kernel = $this->getKernel(array($bundle));
+        $kernel = $this->getKernel([$bundle]);
 
         $application = new Application($kernel);
         $newCommand = new Command('example');
@@ -140,14 +140,14 @@ public function testRunOnlyWarnsOnUnregistrableCommand()
         $container = new ContainerBuilder();
         $container->register('event_dispatcher', EventDispatcher::class);
         $container->register(ThrowingCommand::class, ThrowingCommand::class);
-        $container->setParameter('console.command.ids', array(ThrowingCommand::class => ThrowingCommand::class));
+        $container->setParameter('console.command.ids', [ThrowingCommand::class => ThrowingCommand::class]);
 
         $kernel = $this->getMockBuilder(KernelInterface::class)->getMock();
         $kernel
             ->method('getBundles')
-            ->willReturn(array($this->createBundleMock(
-                array((new Command('fine'))->setCode(function (InputInterface $input, OutputInterface $output) { $output->write('fine'); }))
-            )));
+            ->willReturn([$this->createBundleMock(
+                [(new Command('fine'))->setCode(function (InputInterface $input, OutputInterface $output) { $output->write('fine'); })]
+            )]);
         $kernel
             ->method('getContainer')
             ->willReturn($container);
@@ -156,7 +156,7 @@ public function testRunOnlyWarnsOnUnregistrableCommand()
         $application->setAutoExit(false);
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'fine'));
+        $tester->run(['command' => 'fine']);
         $output = $tester->getDisplay();
 
         $this->assertSame(0, $tester->getStatusCode());
@@ -173,9 +173,9 @@ public function testRegistrationErrorsAreDisplayedOnCommandNotFound()
         $kernel = $this->getMockBuilder(KernelInterface::class)->getMock();
         $kernel
             ->method('getBundles')
-            ->willReturn(array($this->createBundleMock(
-                array((new Command(null))->setCode(function (InputInterface $input, OutputInterface $output) { $output->write('fine'); }))
-            )));
+            ->willReturn([$this->createBundleMock(
+                [(new Command(null))->setCode(function (InputInterface $input, OutputInterface $output) { $output->write('fine'); })]
+            )]);
         $kernel
             ->method('getContainer')
             ->willReturn($container);
@@ -184,7 +184,7 @@ public function testRegistrationErrorsAreDisplayedOnCommandNotFound()
         $application->setAutoExit(false);
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'fine'));
+        $tester->run(['command' => 'fine']);
         $output = $tester->getDisplay();
 
         $this->assertSame(1, $tester->getStatusCode());
@@ -212,14 +212,14 @@ private function getKernel(array $bundles, $useDispatcher = false)
         $container
             ->expects($this->exactly(2))
             ->method('hasParameter')
-            ->withConsecutive(array('console.command.ids'), array('console.lazy_command.ids'))
+            ->withConsecutive(['console.command.ids'], ['console.lazy_command.ids'])
             ->willReturnOnConsecutiveCalls(true, true)
         ;
         $container
             ->expects($this->exactly(2))
             ->method('getParameter')
-            ->withConsecutive(array('console.lazy_command.ids'), array('console.command.ids'))
-            ->willReturnOnConsecutiveCalls(array(), array())
+            ->withConsecutive(['console.lazy_command.ids'], ['console.command.ids'])
+            ->willReturnOnConsecutiveCalls([], [])
         ;
 
         $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php
index ab5c95a7d8b85..2ad0cd4aef862 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php
@@ -83,13 +83,13 @@ public function getDescribeContainerDefinitionTestData()
     /** @dataProvider getDescribeContainerDefinitionWithArgumentsShownTestData */
     public function testDescribeContainerDefinitionWithArgumentsShown(Definition $definition, $expectedDescription)
     {
-        $this->assertDescription($expectedDescription, $definition, array('show_arguments' => true));
+        $this->assertDescription($expectedDescription, $definition, ['show_arguments' => true]);
     }
 
     public function getDescribeContainerDefinitionWithArgumentsShownTestData()
     {
         $definitions = ObjectsProvider::getContainerDefinitions();
-        $definitionsWithArgs = array();
+        $definitionsWithArgs = [];
 
         foreach ($definitions as $key => $definition) {
             $definitionsWithArgs[str_replace('definition_', 'definition_arguments_', $key)] = $definition;
@@ -110,7 +110,7 @@ public function getDescribeContainerAliasTestData()
     }
 
     /** @dataProvider getDescribeContainerDefinitionWhichIsAnAliasTestData */
-    public function testDescribeContainerDefinitionWhichIsAnAlias(Alias $alias, $expectedDescription, ContainerBuilder $builder, $options = array())
+    public function testDescribeContainerDefinitionWhichIsAnAlias(Alias $alias, $expectedDescription, ContainerBuilder $builder, $options = [])
     {
         $this->assertDescription($expectedDescription, $builder, $options);
     }
@@ -122,7 +122,7 @@ public function getDescribeContainerDefinitionWhichIsAnAliasTestData()
         $builder->setDefinition('service_2', $builder->getDefinition('definition_2'));
 
         $aliases = ObjectsProvider::getContainerAliases();
-        $aliasesWithDefinitions = array();
+        $aliasesWithDefinitions = [];
         foreach ($aliases as $name => $alias) {
             $aliasesWithDefinitions[str_replace('alias_', 'alias_with_definition_', $name)] = $alias;
         }
@@ -180,14 +180,14 @@ abstract protected function getDescriptor();
 
     abstract protected function getFormat();
 
-    private function assertDescription($expectedDescription, $describedObject, array $options = array())
+    private function assertDescription($expectedDescription, $describedObject, array $options = [])
     {
         $options['raw_output'] = true;
         $options['raw_text'] = true;
         $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true);
 
         if ('txt' === $this->getFormat()) {
-            $options['output'] = new SymfonyStyle(new ArrayInput(array()), $output);
+            $options['output'] = new SymfonyStyle(new ArrayInput([]), $output);
         }
 
         $this->getDescriptor()->describe($output, $describedObject, $options);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
index b46e322353818..9b5ff9f07be95 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
@@ -31,60 +31,60 @@ public static function getRouteCollections()
             $collection1->add($name, $route);
         }
 
-        return array('route_collection_1' => $collection1);
+        return ['route_collection_1' => $collection1];
     }
 
     public static function getRoutes()
     {
-        return array(
+        return [
             'route_1' => new RouteStub(
                 '/hello/{name}',
-                array('name' => 'Joseph'),
-                array('name' => '[a-z]+'),
-                array('opt1' => 'val1', 'opt2' => 'val2'),
+                ['name' => 'Joseph'],
+                ['name' => '[a-z]+'],
+                ['opt1' => 'val1', 'opt2' => 'val2'],
                 'localhost',
-                array('http', 'https'),
-                array('get', 'head')
+                ['http', 'https'],
+                ['get', 'head']
             ),
             'route_2' => new RouteStub(
                 '/name/add',
-                array(),
-                array(),
-                array('opt1' => 'val1', 'opt2' => 'val2'),
+                [],
+                [],
+                ['opt1' => 'val1', 'opt2' => 'val2'],
                 'localhost',
-                array('http', 'https'),
-                array('put', 'post')
+                ['http', 'https'],
+                ['put', 'post']
             ),
-        );
+        ];
     }
 
     public static function getContainerParameters()
     {
-        return array(
-            'parameters_1' => new ParameterBag(array(
+        return [
+            'parameters_1' => new ParameterBag([
                 'integer' => 12,
                 'string' => 'Hello world!',
                 'boolean' => true,
-                'array' => array(12, 'Hello world!', true),
-            )),
-        );
+                'array' => [12, 'Hello world!', true],
+            ]),
+        ];
     }
 
     public static function getContainerParameter()
     {
         $builder = new ContainerBuilder();
         $builder->setParameter('database_name', 'symfony');
-        $builder->setParameter('twig.form.resources', array(
+        $builder->setParameter('twig.form.resources', [
             'bootstrap_3_horizontal_layout.html.twig',
             'bootstrap_3_layout.html.twig',
             'form_div_layout.html.twig',
             'form_table_layout.html.twig',
-        ));
+        ]);
 
-        return array(
+        return [
             'parameter' => $builder,
             'array_parameter' => $builder,
-        );
+        ];
     }
 
     public static function getContainerBuilders()
@@ -93,7 +93,7 @@ public static function getContainerBuilders()
         $builder1->setDefinitions(self::getContainerDefinitions());
         $builder1->setAliases(self::getContainerAliases());
 
-        return array('builder_1' => $builder1);
+        return ['builder_1' => $builder1];
     }
 
     public static function getContainerDefinitions()
@@ -150,20 +150,20 @@ public static function getEventDispatchers()
         $eventDispatcher->addListener('event1', function () { return 'Closure'; }, -1);
         $eventDispatcher->addListener('event2', new CallableClass());
 
-        return array('event_dispatcher_1' => $eventDispatcher);
+        return ['event_dispatcher_1' => $eventDispatcher];
     }
 
     public static function getCallables()
     {
-        $callables = array(
+        $callables = [
             'callable_1' => 'array_key_exists',
-            'callable_2' => array('Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass', 'staticMethod'),
-            'callable_3' => array(new CallableClass(), 'method'),
+            'callable_2' => ['Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass', 'staticMethod'],
+            'callable_3' => [new CallableClass(), 'method'],
             'callable_4' => 'Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass::staticMethod',
-            'callable_5' => array('Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\ExtendedCallableClass', 'parent::staticMethod'),
+            'callable_5' => ['Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\ExtendedCallableClass', 'parent::staticMethod'],
             'callable_6' => function () { return 'Closure'; },
             'callable_7' => new CallableClass(),
-        );
+        ];
 
         if (\PHP_VERSION_ID >= 70100) {
             $callables['callable_from_callable'] = \Closure::fromCallable(new CallableClass());
@@ -199,6 +199,6 @@ class RouteStub extends Route
 {
     public function compile()
     {
-        return new CompiledRoute('', '#PATH_REGEX#', array(), array(), '#HOST_REGEX#');
+        return new CompiledRoute('', '#PATH_REGEX#', [], [], '#HOST_REGEX#');
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
index b5edad94ca852..3d7fe4d8b305c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
@@ -100,13 +100,13 @@ public function testMissingControllers($name)
     public function getMissingControllersTest()
     {
         // a normal bundle
-        $bundles = array(
-            array('FooBundle:Fake:index'),
-        );
+        $bundles = [
+            ['FooBundle:Fake:index'],
+        ];
 
         // a bundle with children
         if (Kernel::VERSION_ID < 40000) {
-            $bundles[] = array('SensioFooBundle:Fake:index');
+            $bundles[] = ['SensioFooBundle:Fake:index'];
         }
 
         return $bundles;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
index 5880ee0186a18..93ce1527ba238 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
@@ -83,7 +83,7 @@ class_exists(AbstractControllerTest::class);
         $request = Request::create('/');
         $request->attributes->set('_controller', TestAbstractController::class.':testAction');
 
-        $this->assertSame(array($controller, 'testAction'), $resolver->getController($request));
+        $this->assertSame([$controller, 'testAction'], $resolver->getController($request));
         $this->assertSame($container, $controller->getContainer());
     }
 
@@ -101,7 +101,7 @@ class_exists(AbstractControllerTest::class);
         $request = Request::create('/');
         $request->attributes->set('_controller', TestAbstractController::class.'::fooAction');
 
-        $this->assertSame(array($controller, 'fooAction'), $resolver->getController($request));
+        $this->assertSame([$controller, 'fooAction'], $resolver->getController($request));
         $this->assertSame($container, $controller->setContainer($container));
     }
 
@@ -119,7 +119,7 @@ class_exists(AbstractControllerTest::class);
         $request = Request::create('/');
         $request->attributes->set('_controller', DummyController::class.':fooAction');
 
-        $this->assertSame(array($controller, 'fooAction'), $resolver->getController($request));
+        $this->assertSame([$controller, 'fooAction'], $resolver->getController($request));
         $this->assertSame($container, $controller->getContainer());
     }
 
@@ -139,7 +139,7 @@ class_exists(AbstractControllerTest::class);
         $request = Request::create('/');
         $request->attributes->set('_controller', TestAbstractController::class.'::fooAction');
 
-        $this->assertSame(array($controller, 'fooAction'), $resolver->getController($request));
+        $this->assertSame([$controller, 'fooAction'], $resolver->getController($request));
         $this->assertSame($controllerContainer, $controller->setContainer($container));
     }
 
@@ -159,7 +159,7 @@ class_exists(AbstractControllerTest::class);
         $request = Request::create('/');
         $request->attributes->set('_controller', DummyController::class.':fooAction');
 
-        $this->assertSame(array($controller, 'fooAction'), $resolver->getController($request));
+        $this->assertSame([$controller, 'fooAction'], $resolver->getController($request));
         $this->assertSame($controllerContainer, $controller->getContainer());
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
index e72f53649b3e6..36b6bd95b7ec1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
@@ -59,7 +59,7 @@ public function testForward()
     public function testGetUser()
     {
         $user = new User('user', 'pass');
-        $token = new UsernamePasswordToken($user, 'pass', 'default', array('ROLE_USER'));
+        $token = new UsernamePasswordToken($user, 'pass', 'default', ['ROLE_USER']);
 
         $controller = $this->createController();
         $controller->setContainer($this->getContainerWithTokenStorage($token));
@@ -121,7 +121,7 @@ public function testJson()
         $controller = $this->createController();
         $controller->setContainer(new Container());
 
-        $response = $controller->json(array());
+        $response = $controller->json([]);
         $this->assertInstanceOf(JsonResponse::class, $response);
         $this->assertEquals('[]', $response->getContent());
     }
@@ -134,7 +134,7 @@ public function testJsonWithSerializer()
         $serializer
             ->expects($this->once())
             ->method('serialize')
-            ->with(array(), 'json', array('json_encode_options' => JsonResponse::DEFAULT_ENCODING_OPTIONS))
+            ->with([], 'json', ['json_encode_options' => JsonResponse::DEFAULT_ENCODING_OPTIONS])
             ->will($this->returnValue('[]'));
 
         $container->set('serializer', $serializer);
@@ -142,7 +142,7 @@ public function testJsonWithSerializer()
         $controller = $this->createController();
         $controller->setContainer($container);
 
-        $response = $controller->json(array());
+        $response = $controller->json([]);
         $this->assertInstanceOf(JsonResponse::class, $response);
         $this->assertEquals('[]', $response->getContent());
     }
@@ -155,7 +155,7 @@ public function testJsonWithSerializerContextOverride()
         $serializer
             ->expects($this->once())
             ->method('serialize')
-            ->with(array(), 'json', array('json_encode_options' => 0, 'other' => 'context'))
+            ->with([], 'json', ['json_encode_options' => 0, 'other' => 'context'])
             ->will($this->returnValue('[]'));
 
         $container->set('serializer', $serializer);
@@ -163,7 +163,7 @@ public function testJsonWithSerializerContextOverride()
         $controller = $this->createController();
         $controller->setContainer($container);
 
-        $response = $controller->json(array(), 200, array(), array('json_encode_options' => 0, 'other' => 'context'));
+        $response = $controller->json([], 200, [], ['json_encode_options' => 0, 'other' => 'context']);
         $this->assertInstanceOf(JsonResponse::class, $response);
         $this->assertEquals('[]', $response->getContent());
         $response->setEncodingOptions(JSON_FORCE_OBJECT);
@@ -388,7 +388,7 @@ public function testAddFlash()
         $controller->setContainer($container);
         $controller->addFlash('foo', 'bar');
 
-        $this->assertSame(array('bar'), $flashBag->get('foo'));
+        $this->assertSame(['bar'], $flashBag->get('foo'));
     }
 
     public function testCreateAccessDeniedException()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
index 9a1883b6d6618..9d2e496d57d56 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
@@ -169,33 +169,33 @@ public function testUrlRedirectDefaultPortParameters()
 
     public function urlRedirectProvider()
     {
-        return array(
+        return [
             // Standard ports
-            array('http',  null, null,  'http',  80,   ''),
-            array('http',  80,   null,  'http',  80,   ''),
-            array('https', null, null,  'http',  80,   ''),
-            array('https', 80,   null,  'http',  80,   ''),
+            ['http',  null, null,  'http',  80,   ''],
+            ['http',  80,   null,  'http',  80,   ''],
+            ['https', null, null,  'http',  80,   ''],
+            ['https', 80,   null,  'http',  80,   ''],
 
-            array('http',  null,  null, 'https', 443,  ''),
-            array('http',  null,  443,  'https', 443,  ''),
-            array('https', null,  null, 'https', 443,  ''),
-            array('https', null,  443,  'https', 443,  ''),
+            ['http',  null,  null, 'https', 443,  ''],
+            ['http',  null,  443,  'https', 443,  ''],
+            ['https', null,  null, 'https', 443,  ''],
+            ['https', null,  443,  'https', 443,  ''],
 
             // Non-standard ports
-            array('http',  null,  null, 'http',  8080, ':8080'),
-            array('http',  4080,  null, 'http',  8080, ':4080'),
-            array('http',  80,    null, 'http',  8080, ''),
-            array('https', null,  null, 'http',  8080, ''),
-            array('https', null,  8443, 'http',  8080, ':8443'),
-            array('https', null,  443,  'http',  8080, ''),
-
-            array('https', null,  null, 'https', 8443, ':8443'),
-            array('https', null,  4443, 'https', 8443, ':4443'),
-            array('https', null,  443,  'https', 8443, ''),
-            array('http',  null,  null, 'https', 8443, ''),
-            array('http',  8080,  4443, 'https', 8443, ':8080'),
-            array('http',  80,    4443, 'https', 8443, ''),
-        );
+            ['http',  null,  null, 'http',  8080, ':8080'],
+            ['http',  4080,  null, 'http',  8080, ':4080'],
+            ['http',  80,    null, 'http',  8080, ''],
+            ['https', null,  null, 'http',  8080, ''],
+            ['https', null,  8443, 'http',  8080, ':8443'],
+            ['https', null,  443,  'http',  8080, ''],
+
+            ['https', null,  null, 'https', 8443, ':8443'],
+            ['https', null,  4443, 'https', 8443, ':4443'],
+            ['https', null,  443,  'https', 8443, ''],
+            ['http',  null,  null, 'https', 8443, ''],
+            ['http',  8080,  4443, 'https', 8443, ':8080'],
+            ['http',  80,    4443, 'https', 8443, ''],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CacheCollectorPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CacheCollectorPassTest.php
index 6a9438ecbd7c8..992691de6f618 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CacheCollectorPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CacheCollectorPassTest.php
@@ -37,10 +37,10 @@ public function testProcess()
         $collector = $container->register('data_collector.cache', CacheDataCollector::class);
         (new CacheCollectorPass())->process($container);
 
-        $this->assertEquals(array(
-            array('addInstance', array('fs', new Reference('fs'))),
-            array('addInstance', array('tagged_fs', new Reference('tagged_fs'))),
-        ), $collector->getMethodCalls());
+        $this->assertEquals([
+            ['addInstance', ['fs', new Reference('fs')]],
+            ['addInstance', ['tagged_fs', new Reference('tagged_fs')]],
+        ], $collector->getMethodCalls());
 
         $this->assertSame(TraceableAdapter::class, $container->findDefinition('fs')->getClass());
         $this->assertSame(TraceableTagAwareAdapter::class, $container->getDefinition('tagged_fs')->getClass());
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolPassTest.php
index 4619301b6e997..1e7dc416cb47f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolPassTest.php
@@ -76,10 +76,10 @@ public function testArgsAreReplaced()
         $container->setParameter('kernel.environment', 'prod');
         $container->setParameter('cache.prefix.seed', 'foo');
         $cachePool = new Definition();
-        $cachePool->addTag('cache.pool', array(
+        $cachePool->addTag('cache.pool', [
             'provider' => 'foobar',
             'default_lifetime' => 3,
-        ));
+        ]);
         $cachePool->addArgument(null);
         $cachePool->addArgument(null);
         $cachePool->addArgument(null);
@@ -109,7 +109,7 @@ public function testThrowsExceptionWhenCachePoolTagHasUnknownAttributes()
         $adapter->addTag('cache.pool');
         $container->setDefinition('app.cache_adapter', $adapter);
         $cachePool = new ChildDefinition('app.cache_adapter');
-        $cachePool->addTag('cache.pool', array('foobar' => 123));
+        $cachePool->addTag('cache.pool', ['foobar' => 123]);
         $container->setDefinition('app.cache_pool', $cachePool);
 
         $this->cachePoolPass->process($container);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolPrunerPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolPrunerPassTest.php
index df9a49b428e7c..60ba763509f4c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolPrunerPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolPrunerPassTest.php
@@ -24,17 +24,17 @@ class CachePoolPrunerPassTest extends TestCase
     public function testCompilerPassReplacesCommandArgument()
     {
         $container = new ContainerBuilder();
-        $container->register('console.command.cache_pool_prune')->addArgument(array());
+        $container->register('console.command.cache_pool_prune')->addArgument([]);
         $container->register('pool.foo', FilesystemAdapter::class)->addTag('cache.pool');
         $container->register('pool.bar', PhpFilesAdapter::class)->addTag('cache.pool');
 
         $pass = new CachePoolPrunerPass();
         $pass->process($container);
 
-        $expected = array(
+        $expected = [
             'pool.foo' => new Reference('pool.foo'),
             'pool.bar' => new Reference('pool.bar'),
-        );
+        ];
         $argument = $container->getDefinition('console.command.cache_pool_prune')->getArgument(0);
 
         $this->assertInstanceOf(IteratorArgument::class, $argument);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php
index 2d6e8ca3be478..bffb07b08b02d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php
@@ -33,11 +33,11 @@ protected function setUp()
         $this->container->register('translator.data_collector', 'Symfony\Component\Translation\DataCollectorTranslator')
             ->setPublic(false)
             ->setDecoratedService('translator')
-            ->setArguments(array(new Reference('translator.data_collector.inner')))
+            ->setArguments([new Reference('translator.data_collector.inner')])
         ;
 
         $this->container->register('data_collector.translation', 'Symfony\Component\Translation\DataCollector\TranslationDataCollector')
-            ->setArguments(array(new Reference('translator.data_collector')))
+            ->setArguments([new Reference('translator.data_collector')])
         ;
     }
 
@@ -67,10 +67,10 @@ public function testProcessKeepsDataCollectorIfTranslatorImplementsTranslatorBag
 
     public function getImplementingTranslatorBagInterfaceTranslatorClassNames()
     {
-        return array(
-            array('Symfony\Component\Translation\Translator'),
-            array('%translator_implementing_bag%'),
-        );
+        return [
+            ['Symfony\Component\Translation\Translator'],
+            ['%translator_implementing_bag%'],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
index 7788df0c7b4ba..6838d47883d77 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
@@ -30,17 +30,17 @@ public function testProcess()
         $container->setAlias('translator', 'translator.default');
         $translationWarmerDefinition = $container->register('translation.warmer')
             ->addArgument(new Reference('translator'))
-            ->addTag('container.service_subscriber', array('id' => 'translator'))
-            ->addTag('container.service_subscriber', array('id' => 'foo'));
+            ->addTag('container.service_subscriber', ['id' => 'translator'])
+            ->addTag('container.service_subscriber', ['id' => 'foo']);
 
         $pass = new LoggingTranslatorPass();
         $pass->process($container);
 
         $this->assertEquals(
-            array('container.service_subscriber' => array(
-                array('id' => 'foo'),
-                array('key' => 'translator', 'id' => 'translator.logging.inner'),
-            )),
+            ['container.service_subscriber' => [
+                ['id' => 'foo'],
+                ['key' => 'translator', 'id' => 'translator.logging.inner'],
+            ]],
             $translationWarmerDefinition->getTags()
         );
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
index f46779ada1c19..ba4ba5a638500 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
@@ -32,7 +32,7 @@ public function testTemplateNoIdThrowsException()
         $builder = new ContainerBuilder();
         $builder->register('profiler', 'ProfilerClass');
         $builder->register('my_collector_service')
-            ->addTag('data_collector', array('template' => 'foo'));
+            ->addTag('data_collector', ['template' => 'foo']);
 
         $profilerPass = new ProfilerPass();
         $profilerPass->process($builder);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
index d91c806bc8c10..1377a62882494 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
@@ -29,6 +29,6 @@ public function testProcess()
 
         $pass->process($container);
 
-        $this->assertSame(array(sprintf('%s: Tag "kenrel.event_subscriber" was defined on service(s) "foo", "bar", but was never used. Did you mean "kernel.event_subscriber"?', UnusedTagsPass::class)), $container->getCompiler()->getLog());
+        $this->assertSame([sprintf('%s: Tag "kenrel.event_subscriber" was defined on service(s) "foo", "bar", but was never used. Did you mean "kernel.event_subscriber"?', UnusedTagsPass::class)], $container->getCompiler()->getLog());
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
index d3317809aafcd..663f924d66088 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -23,23 +23,23 @@ class ConfigurationTest extends TestCase
     public function testDefaultConfig()
     {
         $processor = new Processor();
-        $config = $processor->processConfiguration(new Configuration(true), array(array('secret' => 's3cr3t')));
+        $config = $processor->processConfiguration(new Configuration(true), [['secret' => 's3cr3t']]);
 
         $this->assertEquals(
-            array_merge(array('secret' => 's3cr3t', 'trusted_hosts' => array()), self::getBundleDefaultConfig()),
+            array_merge(['secret' => 's3cr3t', 'trusted_hosts' => []], self::getBundleDefaultConfig()),
             $config
         );
     }
 
     public function testDoNoDuplicateDefaultFormResources()
     {
-        $input = array('templating' => array(
-            'form' => array('resources' => array('FrameworkBundle:Form')),
-            'engines' => array('php'),
-        ));
+        $input = ['templating' => [
+            'form' => ['resources' => ['FrameworkBundle:Form']],
+            'engines' => ['php'],
+        ]];
 
         $processor = new Processor();
-        $config = $processor->processConfiguration(new Configuration(true), array($input));
+        $config = $processor->processConfiguration(new Configuration(true), [$input]);
 
         $this->assertEquals(array('FrameworkBundle:Form'), $config['templating']['form']['resources']);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets.php
index dc6bf7bb8df55..c05c6fe3a1c86 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets.php
@@ -1,32 +1,32 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'assets' => array(
+$container->loadFromExtension('framework', [
+    'assets' => [
         'version' => 'SomeVersionScheme',
         'base_urls' => 'http://cdn.example.com',
         'version_format' => '%%s?version=%%s',
-        'packages' => array(
-            'images_path' => array(
+        'packages' => [
+            'images_path' => [
                 'base_path' => '/foo',
-            ),
-            'images' => array(
+            ],
+            'images' => [
                 'version' => '1.0.0',
-                'base_urls' => array('http://images1.example.com', 'http://images2.example.com'),
-            ),
-            'foo' => array(
+                'base_urls' => ['http://images1.example.com', 'http://images2.example.com'],
+            ],
+            'foo' => [
                 'version' => '1.0.0',
                 'version_format' => '%%s-%%s',
-            ),
-            'bar' => array(
-                'base_urls' => array('https://bar2.example.com'),
-            ),
-            'bar_version_strategy' => array(
-                'base_urls' => array('https://bar2.example.com'),
+            ],
+            'bar' => [
+                'base_urls' => ['https://bar2.example.com'],
+            ],
+            'bar_version_strategy' => [
+                'base_urls' => ['https://bar2.example.com'],
                 'version_strategy' => 'assets.custom_version_strategy',
-            ),
-            'json_manifest_strategy' => array(
+            ],
+            'json_manifest_strategy' => [
                 'json_manifest_path' => '/path/to/manifest.json',
-            ),
-        ),
-    ),
-));
+            ],
+        ],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets_disabled.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets_disabled.php
index 3ade7047a100c..d10595fba9df1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets_disabled.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets_disabled.php
@@ -1,7 +1,7 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'assets' => array(
+$container->loadFromExtension('framework', [
+    'assets' => [
         'enabled' => false,
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets_version_strategy_as_service.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets_version_strategy_as_service.php
index 4f9123aefb0f5..b57f78ba47bb5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets_version_strategy_as_service.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets_version_strategy_as_service.php
@@ -1,8 +1,8 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'assets' => array(
+$container->loadFromExtension('framework', [
+    'assets' => [
         'version_strategy' => 'assets.custom_version_strategy',
         'base_urls' => 'http://cdn.example.com',
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache.php
index ef7a1be190468..2a85f849fa88a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache.php
@@ -1,29 +1,29 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'cache' => array(
-        'pools' => array(
-            'cache.foo' => array(
+$container->loadFromExtension('framework', [
+    'cache' => [
+        'pools' => [
+            'cache.foo' => [
                 'adapter' => 'cache.adapter.apcu',
                 'default_lifetime' => 30,
-            ),
-            'cache.bar' => array(
+            ],
+            'cache.bar' => [
                 'adapter' => 'cache.adapter.doctrine',
                 'default_lifetime' => 5,
                 'provider' => 'app.doctrine_cache_provider',
-            ),
-            'cache.baz' => array(
+            ],
+            'cache.baz' => [
                 'adapter' => 'cache.adapter.filesystem',
                 'default_lifetime' => 7,
-            ),
-            'cache.foobar' => array(
+            ],
+            'cache.foobar' => [
                 'adapter' => 'cache.adapter.psr6',
                 'default_lifetime' => 10,
                 'provider' => 'app.cache_pool',
-            ),
-            'cache.def' => array(
+            ],
+            'cache.def' => [
                 'default_lifetime' => 11,
-            ),
-        ),
-    ),
-));
+            ],
+        ],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache_env_var.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache_env_var.php
index b93ade8f4c816..4f819e7204d71 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache_env_var.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache_env_var.php
@@ -2,8 +2,8 @@
 
 $container->setParameter('env(REDIS_URL)', 'redis://paas.com');
 
-$container->loadFromExtension('framework', array(
-    'cache' => array(
+$container->loadFromExtension('framework', [
+    'cache' => [
         'default_redis_provider' => '%env(REDIS_URL)%',
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/csrf.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/csrf.php
index 497ceb2b6e3c0..886cb657b2dc6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/csrf.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/csrf.php
@@ -1,9 +1,9 @@
 <?php
 
-$container->loadFromExtension('framework', array(
+$container->loadFromExtension('framework', [
     'csrf_protection' => true,
     'form' => true,
-    'session' => array(
+    'session' => [
         'handler_id' => null,
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/csrf_needs_session.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/csrf_needs_session.php
index d1df1c596233c..34fdb4c1f9931 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/csrf_needs_session.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/csrf_needs_session.php
@@ -1,7 +1,7 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'csrf_protection' => array(
+$container->loadFromExtension('framework', [
+    'csrf_protection' => [
         'enabled' => true,
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/default_config.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/default_config.php
index cd2e56bddf147..4b2021df7bb2e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/default_config.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/default_config.php
@@ -1,3 +1,3 @@
 <?php
 
-$container->loadFromExtension('framework', array());
+$container->loadFromExtension('framework', []);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/esi_and_ssi_without_fragments.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/esi_and_ssi_without_fragments.php
index b8f3aa0441ac4..beada36b84359 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/esi_and_ssi_without_fragments.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/esi_and_ssi_without_fragments.php
@@ -1,13 +1,13 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'fragments' => array(
+$container->loadFromExtension('framework', [
+    'fragments' => [
         'enabled' => false,
-    ),
-    'esi' => array(
+    ],
+    'esi' => [
         'enabled' => true,
-    ),
-    'ssi' => array(
+    ],
+    'ssi' => [
         'enabled' => true,
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/esi_disabled.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/esi_disabled.php
index 1fb5936fdec11..a24cd8158c6b7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/esi_disabled.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/esi_disabled.php
@@ -1,7 +1,7 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'esi' => array(
+$container->loadFromExtension('framework', [
+    'esi' => [
         'enabled' => false,
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/form_no_csrf.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/form_no_csrf.php
index 7360c49c72ef5..e0befdb320612 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/form_no_csrf.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/form_no_csrf.php
@@ -1,9 +1,9 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'form' => array(
-        'csrf_protection' => array(
+$container->loadFromExtension('framework', [
+    'form' => [
+        'csrf_protection' => [
             'enabled' => false,
-        ),
-    ),
-));
+        ],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php
index 64de9309e80c0..8b6ceca5f756b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php
@@ -4,26 +4,26 @@
     'secret' => 's3cr3t',
     'default_locale' => 'fr',
     'csrf_protection' => true,
-    'form' => array(
-        'csrf_protection' => array(
+    'form' => [
+        'csrf_protection' => [
             'field_name' => '_csrf',
-        ),
-    ),
+        ],
+    ],
     'http_method_override' => false,
-    'esi' => array(
+    'esi' => [
         'enabled' => true,
-    ),
-    'ssi' => array(
+    ],
+    'ssi' => [
         'enabled' => true,
-    ),
-    'profiler' => array(
+    ],
+    'profiler' => [
         'only_exceptions' => true,
         'enabled' => false,
-    ),
-    'router' => array(
+    ],
+    'router' => [
         'resource' => '%kernel.project_dir%/config/routing.xml',
         'type' => 'xml',
-    ),
+    ],
     'session' => array(
         'storage_id' => 'session.storage.native',
         'handler_id' => 'session.handler.native_file',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/php_errors_disabled.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/php_errors_disabled.php
index 1338ec55107ec..cff0582bf3b3d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/php_errors_disabled.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/php_errors_disabled.php
@@ -1,8 +1,8 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'php_errors' => array(
+$container->loadFromExtension('framework', [
+    'php_errors' => [
         'log' => false,
         'throw' => false,
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/php_errors_enabled.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/php_errors_enabled.php
index a33875ec6a7ae..9afa5d1c02266 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/php_errors_enabled.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/php_errors_enabled.php
@@ -1,8 +1,8 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'php_errors' => array(
+$container->loadFromExtension('framework', [
+    'php_errors' => [
         'log' => true,
         'throw' => true,
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/profiler.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/profiler.php
index 6615aa74ce558..552c95e137bb3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/profiler.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/profiler.php
@@ -1,7 +1,7 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'profiler' => array(
+$container->loadFromExtension('framework', [
+    'profiler' => [
         'enabled' => true,
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/property_accessor.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/property_accessor.php
index 4340e61fc0961..b5b060c1baa43 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/property_accessor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/property_accessor.php
@@ -1,8 +1,8 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'property_access' => array(
+$container->loadFromExtension('framework', [
+    'property_access' => [
         'magic_call' => true,
         'throw_exception_on_invalid_index' => true,
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/property_info.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/property_info.php
index 847e15fa194ff..bff8d41158582 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/property_info.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/property_info.php
@@ -1,7 +1,7 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'property_info' => array(
+$container->loadFromExtension('framework', [
+    'property_info' => [
         'enabled' => true,
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/request.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/request.php
index 1e7cb2921c4cd..d69d7512ad995 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/request.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/request.php
@@ -1,7 +1,7 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'request' => array(
-        'formats' => array(),
-    ),
-));
+$container->loadFromExtension('framework', [
+    'request' => [
+        'formats' => [],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/serializer_enabled.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/serializer_enabled.php
index eadad57ec7180..de3381c21e3a1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/serializer_enabled.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/serializer_enabled.php
@@ -1,7 +1,7 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'serializer' => array(
+$container->loadFromExtension('framework', [
+    'serializer' => [
         'enabled' => true,
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/serializer_legacy_cache.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/serializer_legacy_cache.php
index 65ddd321548ac..9636b1d6613aa 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/serializer_legacy_cache.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/serializer_legacy_cache.php
@@ -1,8 +1,8 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'serializer' => array(
+$container->loadFromExtension('framework', [
+    'serializer' => [
         'enabled' => true,
         'cache' => 'foo',
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/serializer_mapping.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/serializer_mapping.php
index f2b928ff2d693..2f6f48e95888d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/serializer_mapping.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/serializer_mapping.php
@@ -1,15 +1,15 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'annotations' => array('enabled' => true),
-    'serializer' => array(
+$container->loadFromExtension('framework', [
+    'annotations' => ['enabled' => true],
+    'serializer' => [
         'enable_annotations' => true,
-        'mapping' => array(
-            'paths' => array(
+        'mapping' => [
+            'paths' => [
                 '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/files',
                 '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml',
                 '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml',
-            ),
-        ),
-    ),
-));
+            ],
+        ],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/session.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/session.php
index 104183764a4db..375008c7db468 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/session.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/session.php
@@ -1,7 +1,7 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'session' => array(
+$container->loadFromExtension('framework', [
+    'session' => [
         'handler_id' => null,
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/ssi_disabled.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/ssi_disabled.php
index 4d61d821660f8..32e1bf0c554da 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/ssi_disabled.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/ssi_disabled.php
@@ -1,7 +1,7 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'ssi' => array(
+$container->loadFromExtension('framework', [
+    'ssi' => [
         'enabled' => false,
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_disabled.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_disabled.php
index f76d8ad35177c..2d5e6d779f79c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_disabled.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_disabled.php
@@ -1,5 +1,5 @@
 <?php
 
-$container->loadFromExtension('framework', array(
+$container->loadFromExtension('framework', [
     'templating' => false,
-));
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_no_assets.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_no_assets.php
index bf12a8bc47e5f..f4d5a28aafc67 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_no_assets.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_no_assets.php
@@ -1,7 +1,7 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'templating' => array(
-        'engines' => array('php', 'twig'),
-    ),
-));
+$container->loadFromExtension('framework', [
+    'templating' => [
+        'engines' => ['php', 'twig'],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/translator_fallbacks.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/translator_fallbacks.php
index 0abe3a46abbdd..592a61de65a7f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/translator_fallbacks.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/translator_fallbacks.php
@@ -1,7 +1,7 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'translator' => array(
-        'fallbacks' => array('en', 'fr'),
-    ),
-));
+$container->loadFromExtension('framework', [
+    'translator' => [
+        'fallbacks' => ['en', 'fr'],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_annotations.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_annotations.php
index 35a0b3d39e4f1..dff03e398e2dc 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_annotations.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_annotations.php
@@ -1,9 +1,9 @@
 <?php
 
-$container->loadFromExtension('framework', array(
+$container->loadFromExtension('framework', [
     'secret' => 's3cr3t',
-    'validation' => array(
+    'validation' => [
         'enabled' => true,
         'enable_annotations' => true,
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_mapping.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_mapping.php
index 5d44c6c215a17..f8b19e34801c9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_mapping.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_mapping.php
@@ -1,13 +1,13 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'validation' => array(
-        'mapping' => array(
-            'paths' => array(
+$container->loadFromExtension('framework', [
+    'validation' => [
+        'mapping' => [
+            'paths' => [
                 '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/files',
                 '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yml',
                 '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/validation_mapping/validation.yaml',
-            ),
-        ),
-    ),
-));
+            ],
+        ],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_multiple_static_methods.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_multiple_static_methods.php
index 476da7948e166..ad2bd817a208f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_multiple_static_methods.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_multiple_static_methods.php
@@ -1,9 +1,9 @@
 <?php
 
-$container->loadFromExtension('framework', array(
+$container->loadFromExtension('framework', [
     'secret' => 's3cr3t',
-    'validation' => array(
+    'validation' => [
         'enabled' => true,
-        'static_method' => array('loadFoo', 'loadBar'),
-    ),
-));
+        'static_method' => ['loadFoo', 'loadBar'],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_translation_domain.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_translation_domain.php
index 40a81d4936ce1..42ea0713030a3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_translation_domain.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_translation_domain.php
@@ -1,7 +1,7 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'validation' => array(
+$container->loadFromExtension('framework', [
+    'validation' => [
         'translation_domain' => 'messages',
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/web_link.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/web_link.php
index 990064cca934e..44d52e402d8b8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/web_link.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/web_link.php
@@ -1,5 +1,5 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'web_link' => array('enabled' => true),
-));
+$container->loadFromExtension('framework', [
+    'web_link' => ['enabled' => true],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_arguments_and_service.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_arguments_and_service.php
index d97f9700a0f1b..003b99f210973 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_arguments_and_service.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_arguments_and_service.php
@@ -2,30 +2,30 @@
 
 use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
 
-$container->loadFromExtension('framework', array(
-    'workflows' => array(
-        'my_workflow' => array(
-            'marking_store' => array(
-                'arguments' => array('a', 'b'),
+$container->loadFromExtension('framework', [
+    'workflows' => [
+        'my_workflow' => [
+            'marking_store' => [
+                'arguments' => ['a', 'b'],
                 'service' => 'workflow_service',
-            ),
-            'supports' => array(
+            ],
+            'supports' => [
                 FrameworkExtensionTest::class,
-            ),
-            'places' => array(
+            ],
+            'places' => [
                 'first',
                 'last',
-            ),
-            'transitions' => array(
-                'go' => array(
-                    'from' => array(
+            ],
+            'transitions' => [
+                'go' => [
+                    'from' => [
                         'first',
-                    ),
-                    'to' => array(
+                    ],
+                    'to' => [
                         'last',
-                    ),
-                ),
-            ),
-        ),
-    ),
-));
+                    ],
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_guard_expression.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_guard_expression.php
index 89c86339afe15..19de6363e62c0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_guard_expression.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_guard_expression.php
@@ -2,50 +2,50 @@
 
 use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
 
-$container->loadFromExtension('framework', array(
-    'workflows' => array(
-        'article' => array(
+$container->loadFromExtension('framework', [
+    'workflows' => [
+        'article' => [
             'type' => 'workflow',
-            'marking_store' => array(
+            'marking_store' => [
                 'type' => 'multiple_state',
-            ),
-            'supports' => array(
+            ],
+            'supports' => [
                 FrameworkExtensionTest::class,
-            ),
+            ],
             'initial_place' => 'draft',
-            'places' => array(
+            'places' => [
                 'draft',
                 'wait_for_journalist',
                 'approved_by_journalist',
                 'wait_for_spellchecker',
                 'approved_by_spellchecker',
                 'published',
-            ),
-            'transitions' => array(
-                'request_review' => array(
+            ],
+            'transitions' => [
+                'request_review' => [
                     'from' => 'draft',
-                    'to' => array('wait_for_journalist', 'wait_for_spellchecker'),
-                ),
-                'journalist_approval' => array(
+                    'to' => ['wait_for_journalist', 'wait_for_spellchecker'],
+                ],
+                'journalist_approval' => [
                     'from' => 'wait_for_journalist',
                     'to' => 'approved_by_journalist',
-                ),
-                'spellchecker_approval' => array(
+                ],
+                'spellchecker_approval' => [
                     'from' => 'wait_for_spellchecker',
                     'to' => 'approved_by_spellchecker',
-                ),
-                'publish' => array(
-                    'from' => array('approved_by_journalist', 'approved_by_spellchecker'),
+                ],
+                'publish' => [
+                    'from' => ['approved_by_journalist', 'approved_by_spellchecker'],
                     'to' => 'published',
                     'guard' => '!!true',
-                ),
-                'publish_editor_in_chief' => array(
+                ],
+                'publish_editor_in_chief' => [
                     'name' => 'publish',
                     'from' => 'draft',
                     'to' => 'published',
                     'guard' => '!!false',
-                ),
-            ),
-        ),
-    ),
-));
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_multiple_transitions_with_same_name.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_multiple_transitions_with_same_name.php
index 2619a2dd4316a..c1a525db03cdc 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_multiple_transitions_with_same_name.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_multiple_transitions_with_same_name.php
@@ -2,48 +2,48 @@
 
 use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
 
-$container->loadFromExtension('framework', array(
-    'workflows' => array(
-        'article' => array(
+$container->loadFromExtension('framework', [
+    'workflows' => [
+        'article' => [
             'type' => 'workflow',
-            'marking_store' => array(
+            'marking_store' => [
                 'type' => 'multiple_state',
-            ),
-            'supports' => array(
+            ],
+            'supports' => [
                 FrameworkExtensionTest::class,
-            ),
+            ],
             'initial_place' => 'draft',
-            'places' => array(
+            'places' => [
                 'draft',
                 'wait_for_journalist',
                 'approved_by_journalist',
                 'wait_for_spellchecker',
                 'approved_by_spellchecker',
                 'published',
-            ),
-            'transitions' => array(
-                'request_review' => array(
+            ],
+            'transitions' => [
+                'request_review' => [
                     'from' => 'draft',
-                    'to' => array('wait_for_journalist', 'wait_for_spellchecker'),
-                ),
-                'journalist_approval' => array(
+                    'to' => ['wait_for_journalist', 'wait_for_spellchecker'],
+                ],
+                'journalist_approval' => [
                     'from' => 'wait_for_journalist',
                     'to' => 'approved_by_journalist',
-                ),
-                'spellchecker_approval' => array(
+                ],
+                'spellchecker_approval' => [
                     'from' => 'wait_for_spellchecker',
                     'to' => 'approved_by_spellchecker',
-                ),
-                'publish' => array(
-                    'from' => array('approved_by_journalist', 'approved_by_spellchecker'),
+                ],
+                'publish' => [
+                    'from' => ['approved_by_journalist', 'approved_by_spellchecker'],
                     'to' => 'published',
-                ),
-                'publish_editor_in_chief' => array(
+                ],
+                'publish_editor_in_chief' => [
                     'name' => 'publish',
                     'from' => 'draft',
                     'to' => 'published',
-                ),
-            ),
-        ),
-    ),
-));
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_support_and_support_strategy.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_support_and_support_strategy.php
index 062fdb9f0dba4..4b38093a3d1d0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_support_and_support_strategy.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_support_and_support_strategy.php
@@ -2,30 +2,30 @@
 
 use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
 
-$container->loadFromExtension('framework', array(
-    'workflows' => array(
-        'my_workflow' => array(
-            'marking_store' => array(
+$container->loadFromExtension('framework', [
+    'workflows' => [
+        'my_workflow' => [
+            'marking_store' => [
                 'type' => 'multiple_state',
-            ),
-            'supports' => array(
+            ],
+            'supports' => [
                 FrameworkExtensionTest::class,
-            ),
+            ],
             'support_strategy' => 'foobar',
-            'places' => array(
+            'places' => [
                 'first',
                 'last',
-            ),
-            'transitions' => array(
-                'go' => array(
-                    'from' => array(
+            ],
+            'transitions' => [
+                'go' => [
+                    'from' => [
                         'first',
-                    ),
-                    'to' => array(
+                    ],
+                    'to' => [
                         'last',
-                    ),
-                ),
-            ),
-        ),
-    ),
-));
+                    ],
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_type_and_service.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_type_and_service.php
index 7d9e596408c97..eca1e29c45b4a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_type_and_service.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_type_and_service.php
@@ -2,30 +2,30 @@
 
 use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
 
-$container->loadFromExtension('framework', array(
-    'workflows' => array(
-        'my_workflow' => array(
-            'marking_store' => array(
+$container->loadFromExtension('framework', [
+    'workflows' => [
+        'my_workflow' => [
+            'marking_store' => [
                 'type' => 'multiple_state',
                 'service' => 'workflow_service',
-            ),
-            'supports' => array(
+            ],
+            'supports' => [
                 FrameworkExtensionTest::class,
-            ),
-            'places' => array(
+            ],
+            'places' => [
                 'first',
                 'last',
-            ),
-            'transitions' => array(
-                'go' => array(
-                    'from' => array(
+            ],
+            'transitions' => [
+                'go' => [
+                    'from' => [
                         'first',
-                    ),
-                    'to' => array(
+                    ],
+                    'to' => [
                         'last',
-                    ),
-                ),
-            ),
-        ),
-    ),
-));
+                    ],
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_without_support_and_support_strategy.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_without_support_and_support_strategy.php
index 06948785e927c..dd2a92dc2613b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_without_support_and_support_strategy.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_without_support_and_support_strategy.php
@@ -2,26 +2,26 @@
 
 use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
 
-$container->loadFromExtension('framework', array(
-    'workflows' => array(
-        'my_workflow' => array(
-            'marking_store' => array(
+$container->loadFromExtension('framework', [
+    'workflows' => [
+        'my_workflow' => [
+            'marking_store' => [
                 'type' => 'multiple_state',
-            ),
-            'places' => array(
+            ],
+            'places' => [
                 'first',
                 'last',
-            ),
-            'transitions' => array(
-                'go' => array(
-                    'from' => array(
+            ],
+            'transitions' => [
+                'go' => [
+                    'from' => [
                         'first',
-                    ),
-                    'to' => array(
+                    ],
+                    'to' => [
                         'last',
-                    ),
-                ),
-            ),
-        ),
-    ),
-));
+                    ],
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_enabled.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_enabled.php
index 9a2fe9136a4b3..eb17731940973 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_enabled.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_enabled.php
@@ -1,5 +1,5 @@
 <?php
 
-$container->loadFromExtension('framework', array(
+$container->loadFromExtension('framework', [
     'workflows' => null,
-));
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled.php
index 16009b588fff7..165d0daa11ae5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled.php
@@ -1,19 +1,19 @@
 <?php
 
-$container->loadFromExtension('framework', array(
-    'workflows' => array(
+$container->loadFromExtension('framework', [
+    'workflows' => [
         'enabled' => true,
-        'foo' => array(
+        'foo' => [
             'type' => 'workflow',
-            'supports' => array('Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest'),
+            'supports' => ['Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest'],
             'initial_place' => 'bar',
-            'places' => array('bar', 'baz'),
-            'transitions' => array(
-                'bar_baz' => array(
-                    'from' => array('foo'),
-                    'to' => array('bar'),
-                ),
-            ),
-        ),
-    ),
-));
+            'places' => ['bar', 'baz'],
+            'transitions' => [
+                'bar_baz' => [
+                    'from' => ['foo'],
+                    'to' => ['bar'],
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index 01d395216a1af..eca02f4408df5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -48,7 +48,7 @@
 
 abstract class FrameworkExtensionTest extends TestCase
 {
-    private static $containerCache = array();
+    private static $containerCache = [];
 
     abstract protected function loadFromFile(ContainerBuilder $container, $file);
 
@@ -90,13 +90,13 @@ public function testPropertyAccessCache()
         }
 
         $cache = $container->getDefinition('cache.property_access');
-        $this->assertSame(array(PropertyAccessor::class, 'createCache'), $cache->getFactory(), 'PropertyAccessor::createCache() should be used in non-debug mode');
+        $this->assertSame([PropertyAccessor::class, 'createCache'], $cache->getFactory(), 'PropertyAccessor::createCache() should be used in non-debug mode');
         $this->assertSame(AdapterInterface::class, $cache->getClass());
     }
 
     public function testPropertyAccessCacheWithDebug()
     {
-        $container = $this->createContainerFromFile('property_accessor', array('kernel.debug' => true));
+        $container = $this->createContainerFromFile('property_accessor', ['kernel.debug' => true]);
 
         if (!method_exists(PropertyAccessor::class, 'createCache')) {
             return $this->assertFalse($container->hasDefinition('cache.property_access'));
@@ -218,18 +218,18 @@ public function testWorkflows()
         $stateMachineDefinition = $container->getDefinition('state_machine.pull_request.definition');
 
         $this->assertSame(
-            array(
+            [
                 'start',
                 'coding',
                 'travis',
                 'review',
                 'merged',
                 'closed',
-            ),
+            ],
             $stateMachineDefinition->getArgument(0),
             'Places are passed to the state machine definition'
         );
-        $this->assertSame(array('workflow.definition' => array(array('name' => 'pull_request', 'type' => 'state_machine', 'marking_store' => 'single_state'))), $stateMachineDefinition->getTags());
+        $this->assertSame(['workflow.definition' => [['name' => 'pull_request', 'type' => 'state_machine', 'marking_store' => 'single_state']]], $stateMachineDefinition->getTags());
         $this->assertCount(9, $stateMachineDefinition->getArgument(1));
         $this->assertSame('start', $stateMachineDefinition->getArgument(2));
 
@@ -303,60 +303,60 @@ public function testWorkflowMultipleTransitionsWithSameName()
         $this->assertCount(5, $transitions);
 
         $this->assertSame('workflow.article.transition.0', (string) $transitions[0]);
-        $this->assertSame(array(
+        $this->assertSame([
             'request_review',
-            array(
+            [
                 'draft',
-            ),
-            array(
+            ],
+            [
                 'wait_for_journalist', 'wait_for_spellchecker',
-            ),
-        ), $container->getDefinition($transitions[0])->getArguments());
+            ],
+        ], $container->getDefinition($transitions[0])->getArguments());
 
         $this->assertSame('workflow.article.transition.1', (string) $transitions[1]);
-        $this->assertSame(array(
+        $this->assertSame([
             'journalist_approval',
-            array(
+            [
                 'wait_for_journalist',
-            ),
-            array(
+            ],
+            [
                 'approved_by_journalist',
-            ),
-        ), $container->getDefinition($transitions[1])->getArguments());
+            ],
+        ], $container->getDefinition($transitions[1])->getArguments());
 
         $this->assertSame('workflow.article.transition.2', (string) $transitions[2]);
-        $this->assertSame(array(
+        $this->assertSame([
             'spellchecker_approval',
-            array(
+            [
                 'wait_for_spellchecker',
-            ),
-            array(
+            ],
+            [
                 'approved_by_spellchecker',
-            ),
-        ), $container->getDefinition($transitions[2])->getArguments());
+            ],
+        ], $container->getDefinition($transitions[2])->getArguments());
 
         $this->assertSame('workflow.article.transition.3', (string) $transitions[3]);
-        $this->assertSame(array(
+        $this->assertSame([
             'publish',
-            array(
+            [
                 'approved_by_journalist',
                 'approved_by_spellchecker',
-            ),
-            array(
+            ],
+            [
                 'published',
-            ),
-        ), $container->getDefinition($transitions[3])->getArguments());
+            ],
+        ], $container->getDefinition($transitions[3])->getArguments());
 
         $this->assertSame('workflow.article.transition.4', (string) $transitions[4]);
-        $this->assertSame(array(
+        $this->assertSame([
             'publish',
-            array(
+            [
                 'draft',
-            ),
-            array(
+            ],
+            [
                 'published',
-            ),
-        ), $container->getDefinition($transitions[4])->getArguments());
+            ],
+        ], $container->getDefinition($transitions[4])->getArguments());
     }
 
     public function testGuardExpressions()
@@ -367,12 +367,12 @@ public function testGuardExpressions()
         $this->assertTrue($container->hasParameter('workflow.has_guard_listeners'), 'Workflow guard listeners parameter exists');
         $this->assertTrue(true === $container->getParameter('workflow.has_guard_listeners'), 'Workflow guard listeners parameter is enabled');
         $guardDefinition = $container->getDefinition('workflow.article.listener.guard');
-        $this->assertSame(array(
-            array(
+        $this->assertSame([
+            [
                 'event' => 'workflow.article.guard.publish',
                 'method' => 'onTransition',
-            ),
-        ), $guardDefinition->getTag('kernel.event_listener'));
+            ],
+        ], $guardDefinition->getTag('kernel.event_listener'));
         $guardsConfiguration = $guardDefinition->getArgument(0);
         $this->assertTrue(1 === \count($guardsConfiguration), 'Workflow guard configuration contains one element per transition name');
         $transitionGuardExpressions = $guardsConfiguration['workflow.article.guard.publish'];
@@ -438,7 +438,7 @@ public function testRouterRequiresResourceOption()
     {
         $container = $this->createContainer();
         $loader = new FrameworkExtension();
-        $loader->load(array(array('router' => true)), $container);
+        $loader->load([['router' => true]], $container);
     }
 
     public function testSession()
@@ -480,7 +480,7 @@ public function testRequest()
 
         $this->assertTrue($container->hasDefinition('request.add_request_formats_listener'), '->registerRequestConfiguration() loads request.xml');
         $listenerDef = $container->getDefinition('request.add_request_formats_listener');
-        $this->assertEquals(array('csv' => array('text/csv', 'text/plain'), 'pdf' => array('application/pdf')), $listenerDef->getArgument(0));
+        $this->assertEquals(['csv' => ['text/csv', 'text/plain'], 'pdf' => ['application/pdf']], $listenerDef->getArgument(0));
     }
 
     public function testEmptyRequestFormats()
@@ -505,9 +505,9 @@ public function testTemplating()
         $this->assertEquals('%templating.loader.cache.path%', $container->getDefinition('templating.loader.cache')->getArgument(1));
         $this->assertEquals('/path/to/cache', $container->getParameter('templating.loader.cache.path'));
 
-        $this->assertEquals(array('php', 'twig'), $container->getParameter('templating.engines'), '->registerTemplatingConfiguration() sets a templating.engines parameter');
+        $this->assertEquals(['php', 'twig'], $container->getParameter('templating.engines'), '->registerTemplatingConfiguration() sets a templating.engines parameter');
 
-        $this->assertEquals(array('FrameworkBundle:Form', 'theme1', 'theme2'), $container->getParameter('templating.helper.form.resources'), '->registerTemplatingConfiguration() registers the theme and adds the base theme');
+        $this->assertEquals(['FrameworkBundle:Form', 'theme1', 'theme2'], $container->getParameter('templating.helper.form.resources'), '->registerTemplatingConfiguration() registers the theme and adds the base theme');
         $this->assertEquals('global_hinclude_template', $container->getParameter('fragment.renderer.hinclude.global_template'), '->registerTemplatingConfiguration() registers the global hinclude.js template');
     }
 
@@ -525,7 +525,7 @@ public function testAssets()
 
         // default package
         $defaultPackage = $container->getDefinition((string) $packages->getArgument(0));
-        $this->assertUrlPackage($container, $defaultPackage, array('http://cdn.example.com'), 'SomeVersionScheme', '%%s?version=%%s');
+        $this->assertUrlPackage($container, $defaultPackage, ['http://cdn.example.com'], 'SomeVersionScheme', '%%s?version=%%s');
 
         // packages
         $packages = $packages->getArgument(1);
@@ -535,13 +535,13 @@ public function testAssets()
         $this->assertPathPackage($container, $package, '/foo', 'SomeVersionScheme', '%%s?version=%%s');
 
         $package = $container->getDefinition((string) $packages['images']);
-        $this->assertUrlPackage($container, $package, array('http://images1.example.com', 'http://images2.example.com'), '1.0.0', '%%s?version=%%s');
+        $this->assertUrlPackage($container, $package, ['http://images1.example.com', 'http://images2.example.com'], '1.0.0', '%%s?version=%%s');
 
         $package = $container->getDefinition((string) $packages['foo']);
         $this->assertPathPackage($container, $package, '', '1.0.0', '%%s-%%s');
 
         $package = $container->getDefinition((string) $packages['bar']);
-        $this->assertUrlPackage($container, $package, array('https://bar2.example.com'), 'SomeVersionScheme', '%%s?version=%%s');
+        $this->assertUrlPackage($container, $package, ['https://bar2.example.com'], 'SomeVersionScheme', '%%s?version=%%s');
 
         $package = $container->getDefinition((string) $packages['bar_version_strategy']);
         $this->assertEquals('assets.custom_version_strategy', (string) $package->getArgument(1));
@@ -613,7 +613,7 @@ public function testTranslator()
         );
 
         $calls = $container->getDefinition('translator.default')->getMethodCalls();
-        $this->assertEquals(array('fr'), $calls[1][1][0]);
+        $this->assertEquals(['fr'], $calls[1][1][0]);
     }
 
     public function testTranslatorMultipleFallbacks()
@@ -645,7 +645,7 @@ public function testTemplatingRequiresAtLeastOneEngine()
     {
         $container = $this->createContainer();
         $loader = new FrameworkExtension();
-        $loader->load(array(array('templating' => null)), $container);
+        $loader->load([['templating' => null]], $container);
     }
 
     public function testValidation()
@@ -654,10 +654,10 @@ public function testValidation()
         $projectDir = $container->getParameter('kernel.project_dir');
 
         $ref = new \ReflectionClass('Symfony\Component\Form\Form');
-        $xmlMappings = array(
+        $xmlMappings = [
             \dirname($ref->getFileName()).'/Resources/config/validation.xml',
             strtr($projectDir.'/config/validator/foo.xml', '/', \DIRECTORY_SEPARATOR),
-        );
+        ];
 
         $calls = $container->getDefinition('validator.builder')->getMethodCalls();
 
@@ -665,33 +665,33 @@ public function testValidation()
 
         $this->assertCount($annotations ? 7 : 6, $calls);
         $this->assertSame('setConstraintValidatorFactory', $calls[0][0]);
-        $this->assertEquals(array(new Reference('validator.validator_factory')), $calls[0][1]);
+        $this->assertEquals([new Reference('validator.validator_factory')], $calls[0][1]);
         $this->assertSame('setTranslator', $calls[1][0]);
-        $this->assertEquals(array(new Reference('translator')), $calls[1][1]);
+        $this->assertEquals([new Reference('translator')], $calls[1][1]);
         $this->assertSame('setTranslationDomain', $calls[2][0]);
-        $this->assertSame(array('%validator.translation_domain%'), $calls[2][1]);
+        $this->assertSame(['%validator.translation_domain%'], $calls[2][1]);
         $this->assertSame('addXmlMappings', $calls[3][0]);
-        $this->assertSame(array($xmlMappings), $calls[3][1]);
+        $this->assertSame([$xmlMappings], $calls[3][1]);
         $i = 3;
         if ($annotations) {
             $this->assertSame('enableAnnotationMapping', $calls[++$i][0]);
         }
         $this->assertSame('addMethodMapping', $calls[++$i][0]);
-        $this->assertSame(array('loadValidatorMetadata'), $calls[$i][1]);
+        $this->assertSame(['loadValidatorMetadata'], $calls[$i][1]);
         $this->assertSame('setMetadataCache', $calls[++$i][0]);
-        $this->assertEquals(array(new Reference('validator.mapping.cache.symfony')), $calls[$i][1]);
+        $this->assertEquals([new Reference('validator.mapping.cache.symfony')], $calls[$i][1]);
     }
 
     public function testValidationService()
     {
-        $container = $this->createContainerFromFile('validation_annotations', array('kernel.charset' => 'UTF-8'), false);
+        $container = $this->createContainerFromFile('validation_annotations', ['kernel.charset' => 'UTF-8'], false);
 
         $this->assertInstanceOf('Symfony\Component\Validator\Validator\ValidatorInterface', $container->get('validator'));
     }
 
     public function testAnnotations()
     {
-        $container = $this->createContainerFromFile('full', array(), true, false);
+        $container = $this->createContainerFromFile('full', [], true, false);
         $container->addCompilerPass(new TestAnnotationsPass());
         $container->compile();
 
@@ -718,11 +718,11 @@ public function testValidationAnnotations()
 
         $this->assertCount(7, $calls);
         $this->assertSame('enableAnnotationMapping', $calls[4][0]);
-        $this->assertEquals(array(new Reference('annotation_reader')), $calls[4][1]);
+        $this->assertEquals([new Reference('annotation_reader')], $calls[4][1]);
         $this->assertSame('addMethodMapping', $calls[5][0]);
-        $this->assertSame(array('loadValidatorMetadata'), $calls[5][1]);
+        $this->assertSame(['loadValidatorMetadata'], $calls[5][1]);
         $this->assertSame('setMetadataCache', $calls[6][0]);
-        $this->assertEquals(array(new Reference('validator.mapping.cache.symfony')), $calls[6][1]);
+        $this->assertEquals([new Reference('validator.mapping.cache.symfony')], $calls[6][1]);
         // no cache this time
     }
 
@@ -742,9 +742,9 @@ public function testValidationPaths()
         $this->assertSame('addYamlMappings', $calls[4][0]);
         $this->assertSame('enableAnnotationMapping', $calls[5][0]);
         $this->assertSame('addMethodMapping', $calls[6][0]);
-        $this->assertSame(array('loadValidatorMetadata'), $calls[6][1]);
+        $this->assertSame(['loadValidatorMetadata'], $calls[6][1]);
         $this->assertSame('setMetadataCache', $calls[7][0]);
-        $this->assertEquals(array(new Reference('validator.mapping.cache.symfony')), $calls[7][1]);
+        $this->assertEquals([new Reference('validator.mapping.cache.symfony')], $calls[7][1]);
 
         $xmlMappings = $calls[3][1][0];
         $this->assertCount(3, $xmlMappings);
@@ -847,19 +847,19 @@ public function testFormsCanBeEnabledWithoutCsrfProtection()
 
     public function testStopwatchEnabledWithDebugModeEnabled()
     {
-        $container = $this->createContainerFromFile('default_config', array(
+        $container = $this->createContainerFromFile('default_config', [
             'kernel.container_class' => 'foo',
             'kernel.debug' => true,
-        ));
+        ]);
 
         $this->assertTrue($container->has('debug.stopwatch'));
     }
 
     public function testStopwatchEnabledWithDebugModeDisabled()
     {
-        $container = $this->createContainerFromFile('default_config', array(
+        $container = $this->createContainerFromFile('default_config', [
             'kernel.container_class' => 'foo',
-        ));
+        ]);
 
         $this->assertTrue($container->has('debug.stopwatch'));
     }
@@ -894,7 +894,7 @@ public function testRegisterSerializerExtractor()
         $this->assertEquals('serializer.mapping.class_metadata_factory', $serializerExtractorDefinition->getArgument(0)->__toString());
         $this->assertFalse($serializerExtractorDefinition->isPublic());
         $tag = $serializerExtractorDefinition->getTag('property_info.list_extractor');
-        $this->assertEquals(array('priority' => -999), $tag[0]);
+        $this->assertEquals(['priority' => -999], $tag[0]);
     }
 
     public function testDataUriNormalizerRegistered()
@@ -1150,7 +1150,7 @@ protected function createContainer(array $data = array())
         ), $data)));
     }
 
-    protected function createContainerFromFile($file, $data = array(), $resetCompilerPasses = true, $compile = true)
+    protected function createContainerFromFile($file, $data = [], $resetCompilerPasses = true, $compile = true)
     {
         $cacheKey = md5(\get_class($this).$file.serialize($data));
         if ($compile && isset(self::$containerCache[$cacheKey])) {
@@ -1175,15 +1175,15 @@ protected function createContainerFromFile($file, $data = array(), $resetCompile
         return self::$containerCache[$cacheKey] = $container;
     }
 
-    protected function createContainerFromClosure($closure, $data = array())
+    protected function createContainerFromClosure($closure, $data = [])
     {
         $container = $this->createContainer($data);
         $container->registerExtension(new FrameworkExtension());
         $loader = new ClosureLoader($container);
         $loader->load($closure);
 
-        $container->getCompilerPassConfig()->setOptimizationPasses(array());
-        $container->getCompilerPassConfig()->setRemovingPasses(array());
+        $container->getCompilerPassConfig()->setOptimizationPasses([]);
+        $container->getCompilerPassConfig()->setRemovingPasses([]);
         $container->compile();
 
         return $container;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
index c554532c7a098..ec39372b1dcde 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
@@ -29,12 +29,12 @@ protected function loadFromFile(ContainerBuilder $container, $file)
     public function testAssetsCannotHavePathAndUrl()
     {
         $this->createContainerFromClosure(function ($container) {
-            $container->loadFromExtension('framework', array(
-                'assets' => array(
+            $container->loadFromExtension('framework', [
+                'assets' => [
                     'base_urls' => 'http://cdn.example.com',
                     'base_path' => '/foo',
-                ),
-            ));
+                ],
+            ]);
         });
     }
 
@@ -44,16 +44,16 @@ public function testAssetsCannotHavePathAndUrl()
     public function testAssetPackageCannotHavePathAndUrl()
     {
         $this->createContainerFromClosure(function ($container) {
-            $container->loadFromExtension('framework', array(
-                'assets' => array(
-                    'packages' => array(
-                        'impossible' => array(
+            $container->loadFromExtension('framework', [
+                'assets' => [
+                    'packages' => [
+                        'impossible' => [
                             'base_urls' => 'http://cdn.example.com',
                             'base_path' => '/foo',
-                        ),
-                    ),
-                ),
-            ));
+                        ],
+                    ],
+                ],
+            ]);
         });
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/ResolveControllerNameSubscriberTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/ResolveControllerNameSubscriberTest.php
index 338c1ec81a5c0..92211dc34132e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/ResolveControllerNameSubscriberTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/ResolveControllerNameSubscriberTest.php
@@ -57,7 +57,7 @@ public function testSkipsOtherControllerFormats($controller)
 
     public function provideSkippedControllers()
     {
-        yield array('Other:format');
-        yield array(function () {});
+        yield ['Other:format'];
+        yield [function () {}];
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php
index 1dcc5536c19b9..b8a20d246a096 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php
@@ -29,21 +29,21 @@
 <?php echo $view['translator']->transChoice(
     '{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples',
     10,
-    array('%count%' => 10)
+    ['%count%' => 10]
 ) ?>
 
-<?php echo $view['translator']->trans('other-domain-test-no-params-short-array', array(), 'not_messages'); ?>
+<?php echo $view['translator']->trans('other-domain-test-no-params-short-array', [], 'not_messages'); ?>
 
-<?php echo $view['translator']->trans('other-domain-test-no-params-long-array', array(), 'not_messages'); ?>
+<?php echo $view['translator']->trans('other-domain-test-no-params-long-array', [], 'not_messages'); ?>
 
-<?php echo $view['translator']->trans('other-domain-test-params-short-array', array('foo' => 'bar'), 'not_messages'); ?>
+<?php echo $view['translator']->trans('other-domain-test-params-short-array', ['foo' => 'bar'], 'not_messages'); ?>
 
-<?php echo $view['translator']->trans('other-domain-test-params-long-array', array('foo' => 'bar'), 'not_messages'); ?>
+<?php echo $view['translator']->trans('other-domain-test-params-long-array', ['foo' => 'bar'], 'not_messages'); ?>
 
-<?php echo $view['translator']->transChoice('other-domain-test-trans-choice-short-array-%count%', 10, array('%count%' => 10), 'not_messages'); ?>
+<?php echo $view['translator']->transChoice('other-domain-test-trans-choice-short-array-%count%', 10, ['%count%' => 10], 'not_messages'); ?>
 
-<?php echo $view['translator']->transChoice('other-domain-test-trans-choice-long-array-%count%', 10, array('%count%' => 10), 'not_messages'); ?>
+<?php echo $view['translator']->transChoice('other-domain-test-trans-choice-long-array-%count%', 10, ['%count%' => 10], 'not_messages'); ?>
 
-<?php echo $view['translator']->trans('typecast', array('a' => (int) '123'), 'not_messages'); ?>
-<?php echo $view['translator']->transChoice('msg1', 10 + 1, array(), 'not_messages'); ?>
-<?php echo $view['translator']->transChoice('msg2', ceil(4.5), array(), 'not_messages'); ?>
+<?php echo $view['translator']->trans('typecast', ['a' => (int) '123'], 'not_messages'); ?>
+<?php echo $view['translator']->transChoice('msg1', 10 + 1, [], 'not_messages'); ?>
+<?php echo $view['translator']->transChoice('msg2', ceil(4.5), [], 'not_messages'); ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/templates.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/templates.php
index b97a6ba6a7c57..c9a7ad7a1df02 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/templates.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/templates.php
@@ -1,5 +1,5 @@
 <?php
 
-return array(
+return [
     'bundle:controller:name.format.engine' => __DIR__.'/../Fixtures/Resources/views/this.is.a.template.format.engine',
-);
+];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AnnotatedControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AnnotatedControllerTest.php
index 2fdbef8839496..51a3e7ee54247 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AnnotatedControllerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AnnotatedControllerTest.php
@@ -18,7 +18,7 @@ class AnnotatedControllerTest extends WebTestCase
      */
     public function testAnnotatedController($path, $expectedValue)
     {
-        $client = $this->createClient(array('test_case' => 'AnnotatedController', 'root_config' => 'config.yml'));
+        $client = $this->createClient(['test_case' => 'AnnotatedController', 'root_config' => 'config.yml']);
         $client->request('GET', '/annotated'.$path);
 
         $this->assertSame(200, $client->getResponse()->getStatusCode());
@@ -27,13 +27,13 @@ public function testAnnotatedController($path, $expectedValue)
 
     public function getRoutes()
     {
-        return array(
-            array('/null_request', 'Symfony\Component\HttpFoundation\Request'),
-            array('/null_argument', ''),
-            array('/null_argument_with_route_param', ''),
-            array('/null_argument_with_route_param/value', 'value'),
-            array('/argument_with_route_param_and_default', 'value'),
-            array('/argument_with_route_param_and_default/custom', 'custom'),
-        );
+        return [
+            ['/null_request', 'Symfony\Component\HttpFoundation\Request'],
+            ['/null_argument', ''],
+            ['/null_argument_with_route_param', ''],
+            ['/null_argument_with_route_param/value', 'value'],
+            ['/argument_with_route_param_and_default', 'value'],
+            ['/argument_with_route_param_and_default/custom', 'custom'],
+        ];
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AutowiringTypesTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AutowiringTypesTest.php
index 1fba6d7762525..3b4b8ceecf7e8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AutowiringTypesTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AutowiringTypesTest.php
@@ -79,8 +79,8 @@ public function testCacheAutowiring()
         $this->assertInstanceOf(FilesystemAdapter::class, $autowiredServices->getCachePool());
     }
 
-    protected static function createKernel(array $options = array())
+    protected static function createKernel(array $options = [])
     {
-        return parent::createKernel(array('test_case' => 'AutowiringTypes') + $options);
+        return parent::createKernel(['test_case' => 'AutowiringTypes'] + $options);
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/FragmentController.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/FragmentController.php
index 88bd102a5f4ce..aa78c87190e60 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/FragmentController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/FragmentController.php
@@ -22,7 +22,7 @@ class FragmentController implements ContainerAwareInterface
 
     public function indexAction(Request $request)
     {
-        return $this->container->get('templating')->renderResponse('fragment.html.php', array('bar' => new Bar()));
+        return $this->container->get('templating')->renderResponse('fragment.html.php', ['bar' => new Bar()]);
     }
 
     public function inlinedAction($options, $_format)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php
index 1df462992be30..54ae9c19e89eb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php
@@ -23,12 +23,12 @@ class SubRequestController implements ContainerAwareInterface
 
     public function indexAction($handler)
     {
-        $errorUrl = $this->generateUrl('subrequest_fragment_error', array('_locale' => 'fr', '_format' => 'json'));
-        $altUrl = $this->generateUrl('subrequest_fragment', array('_locale' => 'fr', '_format' => 'json'));
+        $errorUrl = $this->generateUrl('subrequest_fragment_error', ['_locale' => 'fr', '_format' => 'json']);
+        $altUrl = $this->generateUrl('subrequest_fragment', ['_locale' => 'fr', '_format' => 'json']);
 
         // simulates a failure during the rendering of a fragment...
         // should render fr/json
-        $content = $handler->render($errorUrl, 'inline', array('alt' => $altUrl));
+        $content = $handler->render($errorUrl, 'inline', ['alt' => $altUrl]);
 
         // ...to check that the FragmentListener still references the right Request
         // when rendering another fragment after the error occurred
@@ -59,7 +59,7 @@ public function fragmentErrorAction()
         throw new \RuntimeException('error');
     }
 
-    protected function generateUrl($name, $arguments = array())
+    protected function generateUrl($name, $arguments = [])
     {
         return $this->container->get('router')->generate($name, $arguments);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php
index 66489374f6220..59670fdd19a24 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php
@@ -36,7 +36,7 @@ public function load(array $configs, ContainerBuilder $container)
      */
     public function prepend(ContainerBuilder $container)
     {
-        $container->prependExtensionConfig('test', array('custom' => 'foo'));
+        $container->prependExtensionConfig('test', ['custom' => 'foo']);
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php
index 384beebff1f6f..36ac2d11cf499 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php
@@ -22,13 +22,13 @@ class CachePoolClearCommandTest extends WebTestCase
 {
     protected function setUp()
     {
-        static::bootKernel(array('test_case' => 'CachePoolClear', 'root_config' => 'config.yml'));
+        static::bootKernel(['test_case' => 'CachePoolClear', 'root_config' => 'config.yml']);
     }
 
     public function testClearPrivatePool()
     {
         $tester = $this->createCommandTester();
-        $tester->execute(array('pools' => array('cache.private_pool')), array('decorated' => false));
+        $tester->execute(['pools' => ['cache.private_pool']], ['decorated' => false]);
 
         $this->assertSame(0, $tester->getStatusCode(), 'cache:pool:clear exits with 0 in case of success');
         $this->assertContains('Clearing cache pool: cache.private_pool', $tester->getDisplay());
@@ -38,7 +38,7 @@ public function testClearPrivatePool()
     public function testClearPublicPool()
     {
         $tester = $this->createCommandTester();
-        $tester->execute(array('pools' => array('cache.public_pool')), array('decorated' => false));
+        $tester->execute(['pools' => ['cache.public_pool']], ['decorated' => false]);
 
         $this->assertSame(0, $tester->getStatusCode(), 'cache:pool:clear exits with 0 in case of success');
         $this->assertContains('Clearing cache pool: cache.public_pool', $tester->getDisplay());
@@ -48,7 +48,7 @@ public function testClearPublicPool()
     public function testClearPoolWithCustomClearer()
     {
         $tester = $this->createCommandTester();
-        $tester->execute(array('pools' => array('cache.pool_with_clearer')), array('decorated' => false));
+        $tester->execute(['pools' => ['cache.pool_with_clearer']], ['decorated' => false]);
 
         $this->assertSame(0, $tester->getStatusCode(), 'cache:pool:clear exits with 0 in case of success');
         $this->assertContains('Clearing cache pool: cache.pool_with_clearer', $tester->getDisplay());
@@ -58,7 +58,7 @@ public function testClearPoolWithCustomClearer()
     public function testCallClearer()
     {
         $tester = $this->createCommandTester();
-        $tester->execute(array('pools' => array('cache.app_clearer')), array('decorated' => false));
+        $tester->execute(['pools' => ['cache.app_clearer']], ['decorated' => false]);
 
         $this->assertSame(0, $tester->getStatusCode(), 'cache:pool:clear exits with 0 in case of success');
         $this->assertContains('Calling cache clearer: cache.app_clearer', $tester->getDisplay());
@@ -72,7 +72,7 @@ public function testCallClearer()
     public function testClearUnexistingPool()
     {
         $this->createCommandTester()
-            ->execute(array('pools' => array('unknown_pool')), array('decorated' => false));
+            ->execute(['pools' => ['unknown_pool']], ['decorated' => false]);
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
index eafc798a4838b..2a6d43a9f806e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
@@ -19,7 +19,7 @@ class CachePoolsTest extends WebTestCase
 {
     public function testCachePools()
     {
-        $this->doTestCachePools(array(), AdapterInterface::class);
+        $this->doTestCachePools([], AdapterInterface::class);
     }
 
     /**
@@ -28,7 +28,7 @@ public function testCachePools()
     public function testRedisCachePools()
     {
         try {
-            $this->doTestCachePools(array('root_config' => 'redis_config.yml', 'environment' => 'redis_cache'), RedisAdapter::class);
+            $this->doTestCachePools(['root_config' => 'redis_config.yml', 'environment' => 'redis_cache'], RedisAdapter::class);
         } catch (\PHPUnit\Framework\Error\Warning $e) {
             if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
                 throw $e;
@@ -53,7 +53,7 @@ public function testRedisCachePools()
     public function testRedisCustomCachePools()
     {
         try {
-            $this->doTestCachePools(array('root_config' => 'redis_custom_config.yml', 'environment' => 'custom_redis_cache'), RedisAdapter::class);
+            $this->doTestCachePools(['root_config' => 'redis_custom_config.yml', 'environment' => 'custom_redis_cache'], RedisAdapter::class);
         } catch (\PHPUnit\Framework\Error\Warning $e) {
             if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
                 throw $e;
@@ -96,8 +96,8 @@ private function doTestCachePools($options, $adapterClass)
         $this->assertTrue($item->isHit());
     }
 
-    protected static function createKernel(array $options = array())
+    protected static function createKernel(array $options = [])
     {
-        return parent::createKernel(array('test_case' => 'CachePools') + $options);
+        return parent::createKernel(['test_case' => 'CachePools'] + $options);
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php
index a98879938d13e..2c0a75481b390 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php
@@ -25,15 +25,15 @@ class ConfigDebugCommandTest extends WebTestCase
 
     protected function setUp()
     {
-        $kernel = static::createKernel(array('test_case' => 'ConfigDump', 'root_config' => 'config.yml'));
+        $kernel = static::createKernel(['test_case' => 'ConfigDump', 'root_config' => 'config.yml']);
         $this->application = new Application($kernel);
-        $this->application->doRun(new ArrayInput(array()), new NullOutput());
+        $this->application->doRun(new ArrayInput([]), new NullOutput());
     }
 
     public function testDumpBundleName()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array('name' => 'TestBundle'));
+        $ret = $tester->execute(['name' => 'TestBundle']);
 
         $this->assertSame(0, $ret, 'Returns 0 in case of success');
         $this->assertContains('custom: foo', $tester->getDisplay());
@@ -42,7 +42,7 @@ public function testDumpBundleName()
     public function testDumpBundleOption()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array('name' => 'TestBundle', 'path' => 'custom'));
+        $ret = $tester->execute(['name' => 'TestBundle', 'path' => 'custom']);
 
         $this->assertSame(0, $ret, 'Returns 0 in case of success');
         $this->assertContains('foo', $tester->getDisplay());
@@ -51,7 +51,7 @@ public function testDumpBundleOption()
     public function testParametersValuesAreResolved()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array('name' => 'framework'));
+        $ret = $tester->execute(['name' => 'framework']);
 
         $this->assertSame(0, $ret, 'Returns 0 in case of success');
         $this->assertContains("locale: '%env(LOCALE)%'", $tester->getDisplay());
@@ -61,7 +61,7 @@ public function testParametersValuesAreResolved()
     public function testDumpUndefinedBundleOption()
     {
         $tester = $this->createCommandTester();
-        $tester->execute(array('name' => 'TestBundle', 'path' => 'foo'));
+        $tester->execute(['name' => 'TestBundle', 'path' => 'foo']);
 
         $this->assertContains('Unable to find configuration for "test.foo"', $tester->getDisplay());
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDumpReferenceCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDumpReferenceCommandTest.php
index 3817afed170c3..a4cfd6cfa9b7d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDumpReferenceCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDumpReferenceCommandTest.php
@@ -25,15 +25,15 @@ class ConfigDumpReferenceCommandTest extends WebTestCase
 
     protected function setUp()
     {
-        $kernel = static::createKernel(array('test_case' => 'ConfigDump', 'root_config' => 'config.yml'));
+        $kernel = static::createKernel(['test_case' => 'ConfigDump', 'root_config' => 'config.yml']);
         $this->application = new Application($kernel);
-        $this->application->doRun(new ArrayInput(array()), new NullOutput());
+        $this->application->doRun(new ArrayInput([]), new NullOutput());
     }
 
     public function testDumpBundleName()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array('name' => 'TestBundle'));
+        $ret = $tester->execute(['name' => 'TestBundle']);
 
         $this->assertSame(0, $ret, 'Returns 0 in case of success');
         $this->assertContains('test:', $tester->getDisplay());
@@ -43,10 +43,10 @@ public function testDumpBundleName()
     public function testDumpAtPath()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array(
+        $ret = $tester->execute([
             'name' => 'test',
             'path' => 'array',
-        ));
+        ]);
 
         $this->assertSame(0, $ret, 'Returns 0 in case of success');
         $this->assertSame(<<<'EOL'
@@ -63,11 +63,11 @@ public function testDumpAtPath()
     public function testDumpAtPathXml()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array(
+        $ret = $tester->execute([
             'name' => 'test',
             'path' => 'array',
             '--format' => 'xml',
-        ));
+        ]);
 
         $this->assertSame(1, $ret);
         $this->assertContains('[ERROR] The "path" option is only available for the "yaml" format.', $tester->getDisplay());
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php
index d19b08f739b82..12456721d750c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php
@@ -21,7 +21,7 @@ class ContainerDebugCommandTest extends WebTestCase
 {
     public function testDumpContainerIfNotExists()
     {
-        static::bootKernel(array('test_case' => 'ContainerDebug', 'root_config' => 'config.yml'));
+        static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml']);
 
         $application = new Application(static::$kernel);
         $application->setAutoExit(false);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php
index 0b7f9290a50bb..7e41d3298d9c2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php
@@ -21,13 +21,13 @@ class DebugAutowiringCommandTest extends WebTestCase
 {
     public function testBasicFunctionality()
     {
-        static::bootKernel(array('test_case' => 'ContainerDebug', 'root_config' => 'config.yml'));
+        static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml']);
 
         $application = new Application(static::$kernel);
         $application->setAutoExit(false);
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'debug:autowiring'));
+        $tester->run(['command' => 'debug:autowiring']);
 
         $this->assertContains('Symfony\Component\HttpKernel\HttpKernelInterface', $tester->getDisplay());
         $this->assertContains('alias to http_kernel', $tester->getDisplay());
@@ -35,13 +35,13 @@ public function testBasicFunctionality()
 
     public function testSearchArgument()
     {
-        static::bootKernel(array('test_case' => 'ContainerDebug', 'root_config' => 'config.yml'));
+        static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml']);
 
         $application = new Application(static::$kernel);
         $application->setAutoExit(false);
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'debug:autowiring', 'search' => 'kern'));
+        $tester->run(['command' => 'debug:autowiring', 'search' => 'kern']);
 
         $this->assertContains('Symfony\Component\HttpKernel\HttpKernelInterface', $tester->getDisplay());
         $this->assertNotContains('Symfony\Component\Routing\RouterInterface', $tester->getDisplay());
@@ -49,13 +49,13 @@ public function testSearchArgument()
 
     public function testSearchNoResults()
     {
-        static::bootKernel(array('test_case' => 'ContainerDebug', 'root_config' => 'config.yml'));
+        static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml']);
 
         $application = new Application(static::$kernel);
         $application->setAutoExit(false);
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'debug:autowiring', 'search' => 'foo_fake'), array('capture_stderr_separately' => true));
+        $tester->run(['command' => 'debug:autowiring', 'search' => 'foo_fake'], ['capture_stderr_separately' => true]);
 
         $this->assertContains('No autowirable classes or interfaces found matching "foo_fake"', $tester->getErrorOutput());
         $this->assertEquals(1, $tester->getStatusCode());
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/FragmentTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/FragmentTest.php
index dff65d636c0b9..db550a23129ba 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/FragmentTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/FragmentTest.php
@@ -18,7 +18,7 @@ class FragmentTest extends WebTestCase
      */
     public function testFragment($insulate)
     {
-        $client = $this->createClient(array('test_case' => 'Fragment', 'root_config' => 'config.yml'));
+        $client = $this->createClient(['test_case' => 'Fragment', 'root_config' => 'config.yml']);
         if ($insulate) {
             $client->insulate();
         }
@@ -30,9 +30,9 @@ public function testFragment($insulate)
 
     public function getConfigs()
     {
-        return array(
-            array(false),
-            array(true),
-        );
+        return [
+            [false],
+            [true],
+        ];
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php
index 2d422b0292081..c5252c0d5892e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php
@@ -18,7 +18,7 @@ class ProfilerTest extends WebTestCase
      */
     public function testProfilerIsDisabled($insulate)
     {
-        $client = $this->createClient(array('test_case' => 'Profiler', 'root_config' => 'config.yml'));
+        $client = $this->createClient(['test_case' => 'Profiler', 'root_config' => 'config.yml']);
         if ($insulate) {
             $client->insulate();
         }
@@ -38,9 +38,9 @@ public function testProfilerIsDisabled($insulate)
 
     public function getConfigs()
     {
-        return array(
-            array(false),
-            array(true),
-        );
+        return [
+            [false],
+            [true],
+        ];
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SerializerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SerializerTest.php
index bc7dc12ebfbca..bbc03eb8906bd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SerializerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SerializerTest.php
@@ -29,7 +29,7 @@ public function testDeserializeArrayOfObject()
         $bar2->id = 2;
 
         $expected = new Foo();
-        $expected->bars = array($bar1, $bar2);
+        $expected->bars = [$bar1, $bar2];
 
         $this->assertEquals($expected, $result);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php
index 2e1634220c3a5..aad3d77949ba4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php
@@ -20,7 +20,7 @@ class SessionTest extends WebTestCase
      */
     public function testWelcome($config, $insulate)
     {
-        $client = $this->createClient(array('test_case' => 'Session', 'root_config' => $config));
+        $client = $this->createClient(['test_case' => 'Session', 'root_config' => $config]);
         if ($insulate) {
             $client->insulate();
         }
@@ -53,7 +53,7 @@ public function testWelcome($config, $insulate)
      */
     public function testFlash($config, $insulate)
     {
-        $client = $this->createClient(array('test_case' => 'Session', 'root_config' => $config));
+        $client = $this->createClient(['test_case' => 'Session', 'root_config' => $config]);
         if ($insulate) {
             $client->insulate();
         }
@@ -78,13 +78,13 @@ public function testFlash($config, $insulate)
     public function testTwoClients($config, $insulate)
     {
         // start first client
-        $client1 = $this->createClient(array('test_case' => 'Session', 'root_config' => $config));
+        $client1 = $this->createClient(['test_case' => 'Session', 'root_config' => $config]);
         if ($insulate) {
             $client1->insulate();
         }
 
         // start second client
-        $client2 = $this->createClient(array('test_case' => 'Session', 'root_config' => $config));
+        $client2 = $this->createClient(['test_case' => 'Session', 'root_config' => $config]);
         if ($insulate) {
             $client2->insulate();
         }
@@ -131,7 +131,7 @@ public function testTwoClients($config, $insulate)
      */
     public function testCorrectCacheControlHeadersForCacheableAction($config, $insulate)
     {
-        $client = $this->createClient(array('test_case' => 'Session', 'root_config' => $config));
+        $client = $this->createClient(['test_case' => 'Session', 'root_config' => $config]);
         if ($insulate) {
             $client->insulate();
         }
@@ -144,10 +144,10 @@ public function testCorrectCacheControlHeadersForCacheableAction($config, $insul
 
     public function getConfigs()
     {
-        return array(
+        return [
             // configfile, insulate
-            array('config.yml', true),
-            array('config.yml', false),
-        );
+            ['config.yml', true],
+            ['config.yml', false],
+        ];
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SubRequestsTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SubRequestsTest.php
index 1a87ff928a6e4..9d040581db50f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SubRequestsTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SubRequestsTest.php
@@ -15,7 +15,7 @@ class SubRequestsTest extends WebTestCase
 {
     public function testStateAfterSubRequest()
     {
-        $client = $this->createClient(array('test_case' => 'Session', 'root_config' => 'config.yml'));
+        $client = $this->createClient(['test_case' => 'Session', 'root_config' => 'config.yml']);
         $client->request('GET', 'https://localhost/subrequest/en');
 
         $this->assertEquals('--fr/json--en/html--fr/json--http://localhost/subrequest/fragment/en', $client->getResponse()->getContent());
@@ -23,7 +23,7 @@ public function testStateAfterSubRequest()
 
     public function testSubRequestControllerServicesAreResolved()
     {
-        $client = $this->createClient(array('test_case' => 'ControllerServiceResolution', 'root_config' => 'config.yml'));
+        $client = $this->createClient(['test_case' => 'ControllerServiceResolution', 'root_config' => 'config.yml']);
         $client->request('GET', 'https://localhost/subrequest');
 
         $this->assertEquals('---', $client->getResponse()->getContent());
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php
index b25ab8e5a61c9..3f7bb4c7ee680 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php
@@ -49,7 +49,7 @@ protected static function getKernelClass()
         return 'Symfony\Bundle\FrameworkBundle\Tests\Functional\app\AppKernel';
     }
 
-    protected static function createKernel(array $options = array())
+    protected static function createKernel(array $options = [])
     {
         $class = self::getKernelClass();
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AnnotatedController/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AnnotatedController/bundles.php
index 422ffc917fc92..15ff182c6fed5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AnnotatedController/bundles.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AnnotatedController/bundles.php
@@ -12,7 +12,7 @@
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
 
-return array(
+return [
     new FrameworkBundle(),
     new TestBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
index e239bb5331696..11457f6a7927c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
@@ -81,7 +81,7 @@ protected function build(ContainerBuilder $container)
 
     public function serialize()
     {
-        return serialize(array($this->varDir, $this->testCase, $this->rootConfig, $this->getEnvironment(), $this->isDebug()));
+        return serialize([$this->varDir, $this->testCase, $this->rootConfig, $this->getEnvironment(), $this->isDebug()]);
     }
 
     public function unserialize($str)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AutowiringTypes/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AutowiringTypes/bundles.php
index 422ffc917fc92..15ff182c6fed5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AutowiringTypes/bundles.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AutowiringTypes/bundles.php
@@ -12,7 +12,7 @@
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
 
-return array(
+return [
     new FrameworkBundle(),
     new TestBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePoolClear/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePoolClear/bundles.php
index 422ffc917fc92..15ff182c6fed5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePoolClear/bundles.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePoolClear/bundles.php
@@ -12,7 +12,7 @@
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
 
-return array(
+return [
     new FrameworkBundle(),
     new TestBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/bundles.php
index 422ffc917fc92..15ff182c6fed5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/bundles.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/bundles.php
@@ -12,7 +12,7 @@
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
 
-return array(
+return [
     new FrameworkBundle(),
     new TestBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/bundles.php
index 422ffc917fc92..15ff182c6fed5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/bundles.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/bundles.php
@@ -12,7 +12,7 @@
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
 
-return array(
+return [
     new FrameworkBundle(),
     new TestBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDebug/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDebug/bundles.php
index 422ffc917fc92..15ff182c6fed5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDebug/bundles.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDebug/bundles.php
@@ -12,7 +12,7 @@
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
 
-return array(
+return [
     new FrameworkBundle(),
     new TestBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDump/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDump/bundles.php
index 422ffc917fc92..15ff182c6fed5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDump/bundles.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDump/bundles.php
@@ -12,7 +12,7 @@
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
 
-return array(
+return [
     new FrameworkBundle(),
     new TestBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ControllerServiceResolution/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ControllerServiceResolution/bundles.php
index 422ffc917fc92..15ff182c6fed5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ControllerServiceResolution/bundles.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ControllerServiceResolution/bundles.php
@@ -12,7 +12,7 @@
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
 
-return array(
+return [
     new FrameworkBundle(),
     new TestBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Fragment/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Fragment/bundles.php
index 422ffc917fc92..15ff182c6fed5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Fragment/bundles.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Fragment/bundles.php
@@ -12,7 +12,7 @@
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
 
-return array(
+return [
     new FrameworkBundle(),
     new TestBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Profiler/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Profiler/bundles.php
index 422ffc917fc92..15ff182c6fed5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Profiler/bundles.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Profiler/bundles.php
@@ -12,7 +12,7 @@
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
 
-return array(
+return [
     new FrameworkBundle(),
     new TestBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/bundles.php
index 144db90236034..13ab9fddee4a6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/bundles.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Serializer/bundles.php
@@ -11,6 +11,6 @@
 
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 
-return array(
+return [
     new FrameworkBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/bundles.php
index 422ffc917fc92..15ff182c6fed5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/bundles.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/bundles.php
@@ -12,7 +12,7 @@
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
 
-return array(
+return [
     new FrameworkBundle(),
     new TestBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php
index 3c80e70220f7b..c436d979c7c67 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php
@@ -49,9 +49,9 @@ public function dangerousAction()
 
     public function registerBundles()
     {
-        return array(
+        return [
             new FrameworkBundle(),
-        );
+        ];
     }
 
     public function getCacheDir()
@@ -79,9 +79,9 @@ protected function configureRoutes(RouteCollectionBuilder $routes)
     protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader)
     {
         $c->register('logger', NullLogger::class);
-        $c->loadFromExtension('framework', array(
+        $c->loadFromExtension('framework', [
             'secret' => '$ecret',
-        ));
+        ]);
 
         $c->setParameter('halloween', 'Have a great day!');
         $c->register('halloween', 'stdClass')->setPublic(true);
@@ -92,9 +92,9 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
      */
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             KernelEvents::EXCEPTION => 'onKernelException',
-        );
+        ];
     }
 }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RedirectableUrlMatcherTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RedirectableUrlMatcherTest.php
index b5f7a3bd4833a..d87eee58ccb48 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RedirectableUrlMatcherTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RedirectableUrlMatcherTest.php
@@ -26,7 +26,7 @@ public function testRedirectWhenNoSlash()
 
         $matcher = new RedirectableUrlMatcher($coll, $context = new RequestContext());
 
-        $this->assertEquals(array(
+        $this->assertEquals([
                 '_controller' => 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::urlRedirectAction',
                 'path' => '/foo/',
                 'permanent' => true,
@@ -34,7 +34,7 @@ public function testRedirectWhenNoSlash()
                 'httpPort' => $context->getHttpPort(),
                 'httpsPort' => $context->getHttpsPort(),
                 '_route' => 'foo',
-            ),
+            ],
             $matcher->match('/foo')
         );
     }
@@ -42,11 +42,11 @@ public function testRedirectWhenNoSlash()
     public function testSchemeRedirect()
     {
         $coll = new RouteCollection();
-        $coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https')));
+        $coll->add('foo', new Route('/foo', [], [], [], '', ['https']));
 
         $matcher = new RedirectableUrlMatcher($coll, $context = new RequestContext());
 
-        $this->assertEquals(array(
+        $this->assertEquals([
                 '_controller' => 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::urlRedirectAction',
                 'path' => '/foo',
                 'permanent' => true,
@@ -54,7 +54,7 @@ public function testSchemeRedirect()
                 'httpPort' => $context->getHttpPort(),
                 'httpsPort' => $context->getHttpsPort(),
                 '_route' => 'foo',
-            ),
+            ],
             $matcher->match('/foo')
         );
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
index ba5db79405cc5..8309090809759 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
@@ -25,12 +25,12 @@ public function testGenerateWithServiceParam()
 
         $routes->add('foo', new Route(
             ' /{_locale}',
-            array(
+            [
                 '_locale' => '%locale%',
-            ),
-            array(
+            ],
+            [
                 '_locale' => 'en|es',
-            ), array(), '', array(), array(), '"%foo%" == "bar"'
+            ], [], '', [], [], '"%foo%" == "bar"'
         ));
 
         $sc = $this->getServiceContainer($routes);
@@ -39,8 +39,8 @@ public function testGenerateWithServiceParam()
 
         $router = new Router($sc, 'foo');
 
-        $this->assertSame('/en', $router->generate('foo', array('_locale' => 'en')));
-        $this->assertSame('/', $router->generate('foo', array('_locale' => 'es')));
+        $this->assertSame('/en', $router->generate('foo', ['_locale' => 'en']));
+        $this->assertSame('/', $router->generate('foo', ['_locale' => 'es']));
         $this->assertSame('"bar" == "bar"', $router->getRouteCollection()->get('foo')->getCondition());
     }
 
@@ -50,15 +50,15 @@ public function testDefaultsPlaceholders()
 
         $routes->add('foo', new Route(
             '/foo',
-            array(
+            [
                 'foo' => 'before_%parameter.foo%',
                 'bar' => '%parameter.bar%_after',
                 'baz' => '%%escaped%%',
-                'boo' => array('%parameter%', '%%escaped_parameter%%', array('%bee_parameter%', 'bee')),
-                'bee' => array('bee', 'bee'),
-            ),
-            array(
-            )
+                'boo' => ['%parameter%', '%%escaped_parameter%%', ['%bee_parameter%', 'bee']],
+                'bee' => ['bee', 'bee'],
+            ],
+            [
+            ]
         ));
 
         $sc = $this->getServiceContainer($routes);
@@ -72,13 +72,13 @@ public function testDefaultsPlaceholders()
         $route = $router->getRouteCollection()->get('foo');
 
         $this->assertEquals(
-            array(
+            [
                 'foo' => 'before_foo',
                 'bar' => 'bar_after',
                 'baz' => '%escaped%',
-                'boo' => array('boo', '%escaped_parameter%', array('foo_bee', 'bee')),
-                'bee' => array('bee', 'bee'),
-            ),
+                'boo' => ['boo', '%escaped_parameter%', ['foo_bee', 'bee']],
+                'bee' => ['bee', 'bee'],
+            ],
             $route->getDefaults()
         );
     }
@@ -89,13 +89,13 @@ public function testRequirementsPlaceholders()
 
         $routes->add('foo', new Route(
             '/foo',
-            array(
-            ),
-            array(
+            [
+            ],
+            [
                 'foo' => 'before_%parameter.foo%',
                 'bar' => '%parameter.bar%_after',
                 'baz' => '%%escaped%%',
-            )
+            ]
         ));
 
         $sc = $this->getServiceContainer($routes);
@@ -106,11 +106,11 @@ public function testRequirementsPlaceholders()
         $route = $router->getRouteCollection()->get('foo');
 
         $this->assertEquals(
-            array(
+            [
                 'foo' => 'before_foo',
                 'bar' => 'bar_after',
                 'baz' => '%escaped%',
-            ),
+            ],
             $route->getRequirements()
         );
     }
@@ -207,7 +207,7 @@ public function testExceptionOnNonStringParameter()
     public function testDefaultValuesAsNonStrings($value)
     {
         $routes = new RouteCollection();
-        $routes->add('foo', new Route('foo', array('foo' => $value), array('foo' => '\d+')));
+        $routes->add('foo', new Route('foo', ['foo' => $value], ['foo' => '\d+']));
 
         $sc = $this->getServiceContainer($routes);
 
@@ -230,12 +230,12 @@ public function testGetRouteCollectionAddsContainerParametersResource()
 
         $routeCollection = $router->getRouteCollection();
 
-        $this->assertEquals(array(new ContainerParametersResource(array('locale' => 'en'))), $routeCollection->getResources());
+        $this->assertEquals([new ContainerParametersResource(['locale' => 'en'])], $routeCollection->getResources());
     }
 
     public function getNonStringValues()
     {
-        return array(array(null), array(false), array(true), array(new \stdClass()), array(array('foo', 'bar')), array(array(array())));
+        return [[null], [false], [true], [new \stdClass()], [['foo', 'bar']], [[[]]]];
     }
 
     /**
@@ -251,7 +251,7 @@ private function getServiceContainer(RouteCollection $routes)
             ->will($this->returnValue($routes))
         ;
 
-        $sc = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\Container')->setMethods(array('get'))->getMock();
+        $sc = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\Container')->setMethods(['get'])->getMock();
 
         $sc
             ->expects($this->once())
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/DelegatingEngineTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/DelegatingEngineTest.php
index e3ff92b874c08..73983e47ce363 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/DelegatingEngineTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/DelegatingEngineTest.php
@@ -19,12 +19,12 @@ class DelegatingEngineTest extends TestCase
 {
     public function testSupportsRetrievesEngineFromTheContainer()
     {
-        $container = $this->getContainerMock(array(
+        $container = $this->getContainerMock([
             'engine.first' => $this->getEngineMock('template.php', false),
             'engine.second' => $this->getEngineMock('template.php', true),
-        ));
+        ]);
 
-        $delegatingEngine = new DelegatingEngine($container, array('engine.first', 'engine.second'));
+        $delegatingEngine = new DelegatingEngine($container, ['engine.first', 'engine.second']);
 
         $this->assertTrue($delegatingEngine->supports('template.php'));
     }
@@ -33,12 +33,12 @@ public function testGetExistingEngine()
     {
         $firstEngine = $this->getEngineMock('template.php', false);
         $secondEngine = $this->getEngineMock('template.php', true);
-        $container = $this->getContainerMock(array(
+        $container = $this->getContainerMock([
             'engine.first' => $firstEngine,
             'engine.second' => $secondEngine,
-        ));
+        ]);
 
-        $delegatingEngine = new DelegatingEngine($container, array('engine.first', 'engine.second'));
+        $delegatingEngine = new DelegatingEngine($container, ['engine.first', 'engine.second']);
 
         $this->assertSame($secondEngine, $delegatingEngine->getEngine('template.php'));
     }
@@ -51,12 +51,12 @@ public function testGetInvalidEngine()
     {
         $firstEngine = $this->getEngineMock('template.php', false);
         $secondEngine = $this->getEngineMock('template.php', false);
-        $container = $this->getContainerMock(array(
+        $container = $this->getContainerMock([
             'engine.first' => $firstEngine,
             'engine.second' => $secondEngine,
-        ));
+        ]);
 
-        $delegatingEngine = new DelegatingEngine($container, array('engine.first', 'engine.second'));
+        $delegatingEngine = new DelegatingEngine($container, ['engine.first', 'engine.second']);
         $delegatingEngine->getEngine('template.php');
     }
 
@@ -66,22 +66,22 @@ public function testRenderResponseWithFrameworkEngine()
         $engine = $this->getFrameworkEngineMock('template.php', true);
         $engine->expects($this->once())
             ->method('renderResponse')
-            ->with('template.php', array('foo' => 'bar'))
+            ->with('template.php', ['foo' => 'bar'])
             ->will($this->returnValue($response));
-        $container = $this->getContainerMock(array('engine' => $engine));
+        $container = $this->getContainerMock(['engine' => $engine]);
 
-        $delegatingEngine = new DelegatingEngine($container, array('engine'));
+        $delegatingEngine = new DelegatingEngine($container, ['engine']);
 
-        $this->assertSame($response, $delegatingEngine->renderResponse('template.php', array('foo' => 'bar')));
+        $this->assertSame($response, $delegatingEngine->renderResponse('template.php', ['foo' => 'bar']));
     }
 
     public function testRenderResponseWithTemplatingEngine()
     {
         $engine = $this->getEngineMock('template.php', true);
-        $container = $this->getContainerMock(array('engine' => $engine));
-        $delegatingEngine = new DelegatingEngine($container, array('engine'));
+        $container = $this->getContainerMock(['engine' => $engine]);
+        $delegatingEngine = new DelegatingEngine($container, ['engine']);
 
-        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $delegatingEngine->renderResponse('template.php', array('foo' => 'bar')));
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $delegatingEngine->renderResponse('template.php', ['foo' => 'bar']));
     }
 
     private function getEngineMock($template, $supports)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php
index 348820b321225..d6c6b299ebc62 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php
@@ -93,14 +93,14 @@ public function getUserProvider()
         $std = new \stdClass();
         $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
 
-        return array(
-            array($user, $user),
-            array($std, $std),
-            array($token, $token),
-            array('Anon.', null),
-            array(null, null),
-            array(10, null),
-            array(true, null),
-        );
+        return [
+            [$user, $user],
+            [$std, $std],
+            [$token, $token],
+            ['Anon.', null],
+            [null, null],
+            [10, null],
+            [true, null],
+        ];
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/AssetsHelperTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/AssetsHelperTest.php
index 01fac959db90b..83df0640bfaee 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/AssetsHelperTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/AssetsHelperTest.php
@@ -26,7 +26,7 @@ protected function setUp()
         $fooPackage = new Package(new StaticVersionStrategy('42', '%s?v=%s'));
         $barPackage = new Package(new StaticVersionStrategy('22', '%s?%s'));
 
-        $packages = new Packages($fooPackage, array('bar' => $barPackage));
+        $packages = new Packages($fooPackage, ['bar' => $barPackage]);
 
         $this->helper = new AssetsHelper($packages);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
index e655250dbfd72..f46afb5dca45c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
@@ -35,19 +35,19 @@ protected function getExtensions()
         $root = realpath(\dirname($reflClass->getFileName()).'/Resources/views');
         $rootTheme = realpath(__DIR__.'/Resources');
         $templateNameParser = new StubTemplateNameParser($root, $rootTheme);
-        $loader = new FilesystemLoader(array());
+        $loader = new FilesystemLoader([]);
 
         $this->engine = new PhpEngine($templateNameParser, $loader);
         $this->engine->addGlobal('global', '');
-        $this->engine->setHelpers(array(
+        $this->engine->setHelpers([
             new TranslatorHelper(new StubTranslator()),
-        ));
+        ]);
 
-        return array_merge(parent::getExtensions(), array(
-            new TemplatingExtension($this->engine, $this->csrfTokenManager, array(
+        return array_merge(parent::getExtensions(), [
+            new TemplatingExtension($this->engine, $this->csrfTokenManager, [
                 'FrameworkBundle:Form',
-            )),
-        ));
+            ]),
+        ]);
     }
 
     protected function tearDown()
@@ -59,10 +59,10 @@ protected function tearDown()
 
     public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'get',
             'action' => '',
-        ));
+        ]);
 
         $html = $this->renderStart($form->createView());
 
@@ -71,10 +71,10 @@ public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
 
     public function testStartTagHasActionAttributeWhenActionIsZero()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'get',
             'action' => '0',
-        ));
+        ]);
 
         $html = $this->renderStart($form->createView());
 
@@ -98,7 +98,7 @@ protected function renderForm(FormView $view, array $vars = array())
         return (string) $this->engine->get('form')->form($view, $vars);
     }
 
-    protected function renderLabel(FormView $view, $label = null, array $vars = array())
+    protected function renderLabel(FormView $view, $label = null, array $vars = [])
     {
         return (string) $this->engine->get('form')->label($view, $label, $vars);
     }
@@ -108,27 +108,27 @@ protected function renderErrors(FormView $view)
         return (string) $this->engine->get('form')->errors($view);
     }
 
-    protected function renderWidget(FormView $view, array $vars = array())
+    protected function renderWidget(FormView $view, array $vars = [])
     {
         return (string) $this->engine->get('form')->widget($view, $vars);
     }
 
-    protected function renderRow(FormView $view, array $vars = array())
+    protected function renderRow(FormView $view, array $vars = [])
     {
         return (string) $this->engine->get('form')->row($view, $vars);
     }
 
-    protected function renderRest(FormView $view, array $vars = array())
+    protected function renderRest(FormView $view, array $vars = [])
     {
         return (string) $this->engine->get('form')->rest($view, $vars);
     }
 
-    protected function renderStart(FormView $view, array $vars = array())
+    protected function renderStart(FormView $view, array $vars = [])
     {
         return (string) $this->engine->get('form')->start($view, $vars);
     }
 
-    protected function renderEnd(FormView $view, array $vars = array())
+    protected function renderEnd(FormView $view, array $vars = [])
     {
         return (string) $this->engine->get('form')->end($view, $vars);
     }
@@ -140,15 +140,15 @@ protected function setTheme(FormView $view, array $themes, $useDefaultThemes = t
 
     public static function themeBlockInheritanceProvider()
     {
-        return array(
-            array(array('TestBundle:Parent')),
-        );
+        return [
+            [['TestBundle:Parent']],
+        ];
     }
 
     public static function themeInheritanceProvider()
     {
-        return array(
-            array(array('TestBundle:Parent'), array('TestBundle:Child')),
-        );
+        return [
+            [['TestBundle:Parent'], ['TestBundle:Child']],
+        ];
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
index 46c20110c7f09..fc5e7d17f3786 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
@@ -29,10 +29,10 @@ class FormHelperTableLayoutTest extends AbstractTableLayoutTest
 
     public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'get',
             'action' => '',
-        ));
+        ]);
 
         $html = $this->renderStart($form->createView());
 
@@ -41,10 +41,10 @@ public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
 
     public function testStartTagHasActionAttributeWhenActionIsZero()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'get',
             'action' => '0',
-        ));
+        ]);
 
         $html = $this->renderStart($form->createView());
 
@@ -59,20 +59,20 @@ protected function getExtensions()
         $root = realpath(\dirname($reflClass->getFileName()).'/Resources/views');
         $rootTheme = realpath(__DIR__.'/Resources');
         $templateNameParser = new StubTemplateNameParser($root, $rootTheme);
-        $loader = new FilesystemLoader(array());
+        $loader = new FilesystemLoader([]);
 
         $this->engine = new PhpEngine($templateNameParser, $loader);
         $this->engine->addGlobal('global', '');
-        $this->engine->setHelpers(array(
+        $this->engine->setHelpers([
             new TranslatorHelper(new StubTranslator()),
-        ));
+        ]);
 
-        return array_merge(parent::getExtensions(), array(
-            new TemplatingExtension($this->engine, $this->csrfTokenManager, array(
+        return array_merge(parent::getExtensions(), [
+            new TemplatingExtension($this->engine, $this->csrfTokenManager, [
                 'FrameworkBundle:Form',
                 'FrameworkBundle:FormTable',
-            )),
-        ));
+            ]),
+        ]);
     }
 
     protected function tearDown()
@@ -82,12 +82,12 @@ protected function tearDown()
         parent::tearDown();
     }
 
-    protected function renderForm(FormView $view, array $vars = array())
+    protected function renderForm(FormView $view, array $vars = [])
     {
         return (string) $this->engine->get('form')->form($view, $vars);
     }
 
-    protected function renderLabel(FormView $view, $label = null, array $vars = array())
+    protected function renderLabel(FormView $view, $label = null, array $vars = [])
     {
         return (string) $this->engine->get('form')->label($view, $label, $vars);
     }
@@ -97,27 +97,27 @@ protected function renderErrors(FormView $view)
         return (string) $this->engine->get('form')->errors($view);
     }
 
-    protected function renderWidget(FormView $view, array $vars = array())
+    protected function renderWidget(FormView $view, array $vars = [])
     {
         return (string) $this->engine->get('form')->widget($view, $vars);
     }
 
-    protected function renderRow(FormView $view, array $vars = array())
+    protected function renderRow(FormView $view, array $vars = [])
     {
         return (string) $this->engine->get('form')->row($view, $vars);
     }
 
-    protected function renderRest(FormView $view, array $vars = array())
+    protected function renderRest(FormView $view, array $vars = [])
     {
         return (string) $this->engine->get('form')->rest($view, $vars);
     }
 
-    protected function renderStart(FormView $view, array $vars = array())
+    protected function renderStart(FormView $view, array $vars = [])
     {
         return (string) $this->engine->get('form')->start($view, $vars);
     }
 
-    protected function renderEnd(FormView $view, array $vars = array())
+    protected function renderEnd(FormView $view, array $vars = [])
     {
         return (string) $this->engine->get('form')->end($view, $vars);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/RequestHelperTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/RequestHelperTest.php
index 6795bc1a598fb..a2068ae757741 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/RequestHelperTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/RequestHelperTest.php
@@ -24,7 +24,7 @@ protected function setUp()
     {
         $this->requestStack = new RequestStack();
         $request = new Request();
-        $request->initialize(array('foobar' => 'bar'));
+        $request->initialize(['foobar' => 'bar']);
         $this->requestStack->push($request);
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_c_entry_label.html.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_c_entry_label.html.php
index 05240035c023d..4ad7e75ddcc12 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_c_entry_label.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_c_entry_label.html.php
@@ -1,2 +1,2 @@
 <?php if (!$label) { $label = $view['form']->humanize($name); } ?>
-<label>Custom name label: <?php echo $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?></label>
+<label>Custom name label: <?php echo $view->escape($view['translator']->trans($label, [], $translation_domain)) ?></label>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_names_entry_label.html.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_names_entry_label.html.php
index e165a429a5ff8..71de9d4631de7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_names_entry_label.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_names_entry_label.html.php
@@ -1,4 +1,4 @@
 <?php if (!$label) {
     $label = $view['form']->humanize($name);
 } ?>
-<label>Custom label: <?php echo $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?></label>
+<label>Custom label: <?php echo $view->escape($view['translator']->trans($label, [], $translation_domain)) ?></label>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/SessionHelperTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/SessionHelperTest.php
index c0fc0ba0bbc6a..06984095f1a4b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/SessionHelperTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/SessionHelperTest.php
@@ -47,13 +47,13 @@ public function testFlash()
 
         $this->assertTrue($helper->hasFlash('notice'));
 
-        $this->assertEquals(array('bar'), $helper->getFlash('notice'));
+        $this->assertEquals(['bar'], $helper->getFlash('notice'));
     }
 
     public function testGetFlashes()
     {
         $helper = new SessionHelper($this->requestStack);
-        $this->assertEquals(array('notice' => array('bar')), $helper->getFlashes());
+        $this->assertEquals(['notice' => ['bar']], $helper->getFlashes());
     }
 
     public function testGet()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Loader/TemplateLocatorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Loader/TemplateLocatorTest.php
index 96d75e3c3e0c0..774ac5ddfdbf6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Loader/TemplateLocatorTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Loader/TemplateLocatorTest.php
@@ -90,8 +90,8 @@ protected function getFileLocator()
     {
         return $this
             ->getMockBuilder('Symfony\Component\Config\FileLocator')
-            ->setMethods(array('locate'))
-            ->setConstructorArgs(array('/path/to/fallback'))
+            ->setMethods(['locate'])
+            ->setConstructorArgs(['/path/to/fallback'])
             ->getMock()
         ;
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateFilenameParserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateFilenameParserTest.php
index eedbcd27df3a9..3c44612b87631 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateFilenameParserTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateFilenameParserTest.php
@@ -45,12 +45,12 @@ public function testParseFromFilename($file, $ref)
 
     public function getFilenameToTemplateProvider()
     {
-        return array(
-            array('/path/to/section/name.format.engine', new TemplateReference('', '/path/to/section', 'name', 'format', 'engine')),
-            array('\\path\\to\\section\\name.format.engine', new TemplateReference('', '/path/to/section', 'name', 'format', 'engine')),
-            array('name.format.engine', new TemplateReference('', '', 'name', 'format', 'engine')),
-            array('name.format', false),
-            array('name', false),
-        );
+        return [
+            ['/path/to/section/name.format.engine', new TemplateReference('', '/path/to/section', 'name', 'format', 'engine')],
+            ['\\path\\to\\section\\name.format.engine', new TemplateReference('', '/path/to/section', 'name', 'format', 'engine')],
+            ['name.format.engine', new TemplateReference('', '', 'name', 'format', 'engine')],
+            ['name.format', false],
+            ['name', false],
+        ];
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php
index e5958e2dd14bd..824ecf61ebd73 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php
@@ -27,7 +27,7 @@ protected function setUp()
             ->expects($this->any())
             ->method('getBundle')
             ->will($this->returnCallback(function ($bundle) {
-                if (\in_array($bundle, array('SensioFooBundle', 'SensioCmsFooBundle', 'FooBundle'))) {
+                if (\in_array($bundle, ['SensioFooBundle', 'SensioCmsFooBundle', 'FooBundle'])) {
                     return true;
                 }
 
@@ -56,22 +56,22 @@ public function testParse($name, $logicalName, $path, $ref)
 
     public function parseProvider()
     {
-        return array(
-            array('FooBundle:Post:index.html.php', 'FooBundle:Post:index.html.php', '@FooBundle/Resources/views/Post/index.html.php', new TemplateReference('FooBundle', 'Post', 'index', 'html', 'php')),
-            array('FooBundle:Post:index.html.twig', 'FooBundle:Post:index.html.twig', '@FooBundle/Resources/views/Post/index.html.twig', new TemplateReference('FooBundle', 'Post', 'index', 'html', 'twig')),
-            array('FooBundle:Post:index.xml.php', 'FooBundle:Post:index.xml.php', '@FooBundle/Resources/views/Post/index.xml.php', new TemplateReference('FooBundle', 'Post', 'index', 'xml', 'php')),
-            array('SensioFooBundle:Post:index.html.php', 'SensioFooBundle:Post:index.html.php', '@SensioFooBundle/Resources/views/Post/index.html.php', new TemplateReference('SensioFooBundle', 'Post', 'index', 'html', 'php')),
-            array('SensioCmsFooBundle:Post:index.html.php', 'SensioCmsFooBundle:Post:index.html.php', '@SensioCmsFooBundle/Resources/views/Post/index.html.php', new TemplateReference('SensioCmsFooBundle', 'Post', 'index', 'html', 'php')),
-            array(':Post:index.html.php', ':Post:index.html.php', 'views/Post/index.html.php', new TemplateReference('', 'Post', 'index', 'html', 'php')),
-            array('::index.html.php', '::index.html.php', 'views/index.html.php', new TemplateReference('', '', 'index', 'html', 'php')),
-            array('index.html.php', '::index.html.php', 'views/index.html.php', new TemplateReference('', '', 'index', 'html', 'php')),
-            array('FooBundle:Post:foo.bar.index.html.php', 'FooBundle:Post:foo.bar.index.html.php', '@FooBundle/Resources/views/Post/foo.bar.index.html.php', new TemplateReference('FooBundle', 'Post', 'foo.bar.index', 'html', 'php')),
-            array('@FooBundle/Resources/views/layout.html.twig', '@FooBundle/Resources/views/layout.html.twig', '@FooBundle/Resources/views/layout.html.twig', new BaseTemplateReference('@FooBundle/Resources/views/layout.html.twig', 'twig')),
-            array('@FooBundle/Foo/layout.html.twig', '@FooBundle/Foo/layout.html.twig', '@FooBundle/Foo/layout.html.twig', new BaseTemplateReference('@FooBundle/Foo/layout.html.twig', 'twig')),
-            array('name.twig', 'name.twig', 'name.twig', new BaseTemplateReference('name.twig', 'twig')),
-            array('name', 'name', 'name', new BaseTemplateReference('name')),
-            array('default/index.html.php', '::default/index.html.php', 'views/default/index.html.php', new TemplateReference(null, null, 'default/index', 'html', 'php')),
-        );
+        return [
+            ['FooBundle:Post:index.html.php', 'FooBundle:Post:index.html.php', '@FooBundle/Resources/views/Post/index.html.php', new TemplateReference('FooBundle', 'Post', 'index', 'html', 'php')],
+            ['FooBundle:Post:index.html.twig', 'FooBundle:Post:index.html.twig', '@FooBundle/Resources/views/Post/index.html.twig', new TemplateReference('FooBundle', 'Post', 'index', 'html', 'twig')],
+            ['FooBundle:Post:index.xml.php', 'FooBundle:Post:index.xml.php', '@FooBundle/Resources/views/Post/index.xml.php', new TemplateReference('FooBundle', 'Post', 'index', 'xml', 'php')],
+            ['SensioFooBundle:Post:index.html.php', 'SensioFooBundle:Post:index.html.php', '@SensioFooBundle/Resources/views/Post/index.html.php', new TemplateReference('SensioFooBundle', 'Post', 'index', 'html', 'php')],
+            ['SensioCmsFooBundle:Post:index.html.php', 'SensioCmsFooBundle:Post:index.html.php', '@SensioCmsFooBundle/Resources/views/Post/index.html.php', new TemplateReference('SensioCmsFooBundle', 'Post', 'index', 'html', 'php')],
+            [':Post:index.html.php', ':Post:index.html.php', 'views/Post/index.html.php', new TemplateReference('', 'Post', 'index', 'html', 'php')],
+            ['::index.html.php', '::index.html.php', 'views/index.html.php', new TemplateReference('', '', 'index', 'html', 'php')],
+            ['index.html.php', '::index.html.php', 'views/index.html.php', new TemplateReference('', '', 'index', 'html', 'php')],
+            ['FooBundle:Post:foo.bar.index.html.php', 'FooBundle:Post:foo.bar.index.html.php', '@FooBundle/Resources/views/Post/foo.bar.index.html.php', new TemplateReference('FooBundle', 'Post', 'foo.bar.index', 'html', 'php')],
+            ['@FooBundle/Resources/views/layout.html.twig', '@FooBundle/Resources/views/layout.html.twig', '@FooBundle/Resources/views/layout.html.twig', new BaseTemplateReference('@FooBundle/Resources/views/layout.html.twig', 'twig')],
+            ['@FooBundle/Foo/layout.html.twig', '@FooBundle/Foo/layout.html.twig', '@FooBundle/Foo/layout.html.twig', new BaseTemplateReference('@FooBundle/Foo/layout.html.twig', 'twig')],
+            ['name.twig', 'name.twig', 'name.twig', new BaseTemplateReference('name.twig', 'twig')],
+            ['name', 'name', 'name', new BaseTemplateReference('name')],
+            ['default/index.html.php', '::default/index.html.php', 'views/default/index.html.php', new TemplateReference(null, null, 'default/index', 'html', 'php')],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
index 08b4407a8a52f..eda4b2766b0b8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
@@ -198,7 +198,7 @@ public function testTransWithoutCaching()
     {
         $translator = $this->getTranslator($this->getLoader());
         $translator->setLocale('fr');
-        $translator->setFallbackLocales(array('en', 'es', 'pt-PT', 'pt_BR', 'fr.UTF-8', 'sr@latin'));
+        $translator->setFallbackLocales(['en', 'es', 'pt-PT', 'pt_BR', 'fr.UTF-8', 'sr@latin']);
 
         $this->assertEquals('foo (FR)', $translator->trans('foo'));
         $this->assertEquals('bar (EN)', $translator->trans('bar'));
@@ -214,9 +214,9 @@ public function testTransWithoutCaching()
     public function testTransWithCaching()
     {
         // prime the cache
-        $translator = $this->getTranslator($this->getLoader(), array('cache_dir' => $this->tmpDir));
+        $translator = $this->getTranslator($this->getLoader(), ['cache_dir' => $this->tmpDir]);
         $translator->setLocale('fr');
-        $translator->setFallbackLocales(array('en', 'es', 'pt-PT', 'pt_BR', 'fr.UTF-8', 'sr@latin'));
+        $translator->setFallbackLocales(['en', 'es', 'pt-PT', 'pt_BR', 'fr.UTF-8', 'sr@latin']);
 
         $this->assertEquals('foo (FR)', $translator->trans('foo'));
         $this->assertEquals('bar (EN)', $translator->trans('bar'));
@@ -232,9 +232,9 @@ public function testTransWithCaching()
         $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
         $loader->expects($this->never())->method('load');
 
-        $translator = $this->getTranslator($loader, array('cache_dir' => $this->tmpDir));
+        $translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir]);
         $translator->setLocale('fr');
-        $translator->setFallbackLocales(array('en', 'es', 'pt-PT', 'pt_BR', 'fr.UTF-8', 'sr@latin'));
+        $translator->setFallbackLocales(['en', 'es', 'pt-PT', 'pt_BR', 'fr.UTF-8', 'sr@latin']);
 
         $this->assertEquals('foo (FR)', $translator->trans('foo'));
         $this->assertEquals('bar (EN)', $translator->trans('bar'));
@@ -254,7 +254,7 @@ public function testTransWithCaching()
     public function testTransWithCachingWithInvalidLocale()
     {
         $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
-        $translator = $this->getTranslator($loader, array('cache_dir' => $this->tmpDir), 'loader', '\Symfony\Bundle\FrameworkBundle\Tests\Translation\TranslatorWithInvalidLocale');
+        $translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir], 'loader', '\Symfony\Bundle\FrameworkBundle\Tests\Translation\TranslatorWithInvalidLocale');
 
         $translator->trans('foo');
     }
@@ -262,13 +262,13 @@ public function testTransWithCachingWithInvalidLocale()
     public function testLoadResourcesWithoutCaching()
     {
         $loader = new \Symfony\Component\Translation\Loader\YamlFileLoader();
-        $resourceFiles = array(
-            'fr' => array(
+        $resourceFiles = [
+            'fr' => [
                 __DIR__.'/../Fixtures/Resources/translations/messages.fr.yml',
-            ),
-        );
+            ],
+        ];
 
-        $translator = $this->getTranslator($loader, array('resource_files' => $resourceFiles), 'yml');
+        $translator = $this->getTranslator($loader, ['resource_files' => $resourceFiles], 'yml');
         $translator->setLocale('fr');
 
         $this->assertEquals('répertoire', $translator->trans('folder'));
@@ -290,13 +290,13 @@ public function testInvalidOptions()
     {
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
 
-        (new Translator($container, new MessageFormatter(), 'en', array(), array('foo' => 'bar')));
+        (new Translator($container, new MessageFormatter(), 'en', [], ['foo' => 'bar']));
     }
 
     /** @dataProvider getDebugModeAndCacheDirCombinations */
     public function testResourceFilesOptionLoadsBeforeOtherAddedResources($debug, $enableCache)
     {
-        $someCatalogue = $this->getCatalogue('some_locale', array());
+        $someCatalogue = $this->getCatalogue('some_locale', []);
 
         $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
 
@@ -312,10 +312,10 @@ public function testResourceFilesOptionLoadsBeforeOtherAddedResources($debug, $e
             ->with('second_resource.some_locale.loader', 'some_locale', 'messages')
             ->willReturn($someCatalogue);
 
-        $options = array(
-            'resource_files' => array('some_locale' => array('messages.some_locale.loader')),
+        $options = [
+            'resource_files' => ['some_locale' => ['messages.some_locale.loader']],
             'debug' => $debug,
-        );
+        ];
 
         if ($enableCache) {
             $options['cache_dir'] = $this->tmpDir;
@@ -325,20 +325,20 @@ public function testResourceFilesOptionLoadsBeforeOtherAddedResources($debug, $e
         $translator = $this->createTranslator($loader, $options);
         $translator->addResource('loader', 'second_resource.some_locale.loader', 'some_locale', 'messages');
 
-        $translator->trans('some_message', array(), null, 'some_locale');
+        $translator->trans('some_message', [], null, 'some_locale');
     }
 
     public function getDebugModeAndCacheDirCombinations()
     {
-        return array(
-            array(false, false),
-            array(true, false),
-            array(false, true),
-            array(true, true),
-        );
+        return [
+            [false, false],
+            [true, false],
+            [false, true],
+            [true, true],
+        ];
     }
 
-    protected function getCatalogue($locale, $messages, $resources = array())
+    protected function getCatalogue($locale, $messages, $resources = [])
     {
         $catalogue = new MessageCatalogue($locale);
         foreach ($messages as $key => $translation) {
@@ -357,53 +357,53 @@ protected function getLoader()
         $loader
             ->expects($this->at(0))
             ->method('load')
-            ->will($this->returnValue($this->getCatalogue('fr', array(
+            ->will($this->returnValue($this->getCatalogue('fr', [
                 'foo' => 'foo (FR)',
-            ))))
+            ])))
         ;
         $loader
             ->expects($this->at(1))
             ->method('load')
-            ->will($this->returnValue($this->getCatalogue('en', array(
+            ->will($this->returnValue($this->getCatalogue('en', [
                 'foo' => 'foo (EN)',
                 'bar' => 'bar (EN)',
                 'choice' => '{0} choice 0 (EN)|{1} choice 1 (EN)|]1,Inf] choice inf (EN)',
-            ))))
+            ])))
         ;
         $loader
             ->expects($this->at(2))
             ->method('load')
-            ->will($this->returnValue($this->getCatalogue('es', array(
+            ->will($this->returnValue($this->getCatalogue('es', [
                 'foobar' => 'foobar (ES)',
-            ))))
+            ])))
         ;
         $loader
             ->expects($this->at(3))
             ->method('load')
-            ->will($this->returnValue($this->getCatalogue('pt-PT', array(
+            ->will($this->returnValue($this->getCatalogue('pt-PT', [
                 'foobarfoo' => 'foobarfoo (PT-PT)',
-            ))))
+            ])))
         ;
         $loader
             ->expects($this->at(4))
             ->method('load')
-            ->will($this->returnValue($this->getCatalogue('pt_BR', array(
+            ->will($this->returnValue($this->getCatalogue('pt_BR', [
                 'other choice' => '{0} other choice 0 (PT-BR)|{1} other choice 1 (PT-BR)|]1,Inf] other choice inf (PT-BR)',
-            ))))
+            ])))
         ;
         $loader
             ->expects($this->at(5))
             ->method('load')
-            ->will($this->returnValue($this->getCatalogue('fr.UTF-8', array(
+            ->will($this->returnValue($this->getCatalogue('fr.UTF-8', [
                 'foobarbaz' => 'foobarbaz (fr.UTF-8)',
-            ))))
+            ])))
         ;
         $loader
             ->expects($this->at(6))
             ->method('load')
-            ->will($this->returnValue($this->getCatalogue('sr@latin', array(
+            ->will($this->returnValue($this->getCatalogue('sr@latin', [
                 'foobarbax' => 'foobarbax (sr@latin)',
-            ))))
+            ])))
         ;
 
         return $loader;
@@ -421,7 +421,7 @@ protected function getContainer($loader)
         return $container;
     }
 
-    public function getTranslator($loader, $options = array(), $loaderFomat = 'loader', $translatorClass = '\Symfony\Bundle\FrameworkBundle\Translation\Translator', $defaultLocale = 'en')
+    public function getTranslator($loader, $options = [], $loaderFomat = 'loader', $translatorClass = '\Symfony\Bundle\FrameworkBundle\Translation\Translator', $defaultLocale = 'en')
     {
         $translator = $this->createTranslator($loader, $options, $translatorClass, $loaderFomat, $defaultLocale);
 
@@ -441,15 +441,15 @@ public function getTranslator($loader, $options = array(), $loaderFomat = 'loade
     public function testWarmup()
     {
         $loader = new \Symfony\Component\Translation\Loader\YamlFileLoader();
-        $resourceFiles = array(
-            'fr' => array(
+        $resourceFiles = [
+            'fr' => [
                 __DIR__.'/../Fixtures/Resources/translations/messages.fr.yml',
-            ),
-        );
+            ],
+        ];
 
         // prime the cache
-        $translator = $this->getTranslator($loader, array('cache_dir' => $this->tmpDir, 'resource_files' => $resourceFiles), 'yml');
-        $translator->setFallbackLocales(array('fr'));
+        $translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir, 'resource_files' => $resourceFiles], 'yml');
+        $translator->setFallbackLocales(['fr']);
         $translator->warmup($this->tmpDir);
 
         $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
@@ -457,9 +457,9 @@ public function testWarmup()
             ->expects($this->never())
             ->method('load');
 
-        $translator = $this->getTranslator($loader, array('cache_dir' => $this->tmpDir, 'resource_files' => $resourceFiles), 'yml');
+        $translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir, 'resource_files' => $resourceFiles], 'yml');
         $translator->setLocale('fr');
-        $translator->setFallbackLocales(array('fr'));
+        $translator->setFallbackLocales(['fr']);
         $this->assertEquals('répertoire', $translator->trans('folder'));
     }
 
@@ -469,7 +469,7 @@ private function createTranslator($loader, $options, $translatorClass = '\Symfon
             return new $translatorClass(
                 $this->getContainer($loader),
                 new MessageFormatter(),
-                array($loaderFomat => array($loaderFomat)),
+                [$loaderFomat => [$loaderFomat]],
                 $options
             );
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
index a1438f60ec639..47f4482ef2d01 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -28,11 +28,11 @@ class Translator extends BaseTranslator implements WarmableInterface
     protected $container;
     protected $loaderIds;
 
-    protected $options = array(
+    protected $options = [
         'cache_dir' => null,
         'debug' => false,
-        'resource_files' => array(),
-    );
+        'resource_files' => [],
+    ];
 
     /**
      * @var array
@@ -45,7 +45,7 @@ class Translator extends BaseTranslator implements WarmableInterface
      *
      * @var array
      */
-    private $resources = array();
+    private $resources = [];
 
     /**
      * Constructor.
@@ -103,7 +103,7 @@ public function warmUp($cacheDir)
             return;
         }
 
-        $locales = array_merge($this->getFallbackLocales(), array($this->getLocale()), $this->resourceLocales);
+        $locales = array_merge($this->getFallbackLocales(), [$this->getLocale()], $this->resourceLocales);
         foreach (array_unique($locales) as $locale) {
             // reset catalogue in case it's already loaded during the dump of the other locales.
             if (isset($this->catalogues[$locale])) {
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php
index 9173a32a6d91c..369e7a3f874b5 100644
--- a/src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php
+++ b/src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php
@@ -152,14 +152,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $encodedPassword = $encoder->encodePassword($password, $salt);
 
-        $rows = array(
-            array('Encoder used', \get_class($encoder)),
-            array('Encoded password', $encodedPassword),
-        );
+        $rows = [
+            ['Encoder used', \get_class($encoder)],
+            ['Encoded password', $encodedPassword],
+        ];
         if (!$emptySalt) {
-            $rows[] = array('Generated salt', $salt);
+            $rows[] = ['Generated salt', $salt];
         }
-        $io->table(array('Key', 'Value'), $rows);
+        $io->table(['Key', 'Value'], $rows);
 
         if (!$emptySalt) {
             $errorIo->note(sprintf('Make sure that your salt storage field fits the salt length: %s chars', \strlen($salt)));
diff --git a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
index 7e06440bd3f7b..6b1aa89a169f9 100644
--- a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
+++ b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
@@ -60,7 +60,7 @@ public function __construct(TokenStorageInterface $tokenStorage = null, RoleHier
     public function collect(Request $request, Response $response, \Exception $exception = null)
     {
         if (null === $this->tokenStorage) {
-            $this->data = array(
+            $this->data = [
                 'enabled' => false,
                 'authenticated' => false,
                 'impersonated' => false,
@@ -70,12 +70,12 @@ public function collect(Request $request, Response $response, \Exception $except
                 'token_class' => null,
                 'logout_url' => null,
                 'user' => '',
-                'roles' => array(),
-                'inherited_roles' => array(),
+                'roles' => [],
+                'inherited_roles' => [],
                 'supports_role_hierarchy' => null !== $this->roleHierarchy,
-            );
+            ];
         } elseif (null === $token = $this->tokenStorage->getToken()) {
-            $this->data = array(
+            $this->data = [
                 'enabled' => true,
                 'authenticated' => false,
                 'impersonated' => false,
@@ -85,12 +85,12 @@ public function collect(Request $request, Response $response, \Exception $except
                 'token_class' => null,
                 'logout_url' => null,
                 'user' => '',
-                'roles' => array(),
-                'inherited_roles' => array(),
+                'roles' => [],
+                'inherited_roles' => [],
                 'supports_role_hierarchy' => null !== $this->roleHierarchy,
-            );
+            ];
         } else {
-            $inheritedRoles = array();
+            $inheritedRoles = [];
             $assignedRoles = $token->getRoles();
 
             $impersonatorUser = null;
@@ -152,9 +152,9 @@ public function collect(Request $request, Response $response, \Exception $except
                 $this->data['voters'][] = $this->hasVarDumper ? new ClassStub(\get_class($voter)) : \get_class($voter);
             }
         } else {
-            $this->data['access_decision_log'] = array();
+            $this->data['access_decision_log'] = [];
             $this->data['voter_strategy'] = 'unknown';
-            $this->data['voters'] = array();
+            $this->data['voters'] = [];
         }
 
         // collect firewall context information
@@ -162,7 +162,7 @@ public function collect(Request $request, Response $response, \Exception $except
         if ($this->firewallMap instanceof FirewallMap) {
             $firewallConfig = $this->firewallMap->getFirewallConfig($request);
             if (null !== $firewallConfig) {
-                $this->data['firewall'] = array(
+                $this->data['firewall'] = [
                     'name' => $firewallConfig->getName(),
                     'allows_anonymous' => $firewallConfig->allowsAnonymous(),
                     'request_matcher' => $firewallConfig->getRequestMatcher(),
@@ -175,7 +175,7 @@ public function collect(Request $request, Response $response, \Exception $except
                     'access_denied_url' => $firewallConfig->getAccessDeniedUrl(),
                     'user_checker' => $firewallConfig->getUserChecker(),
                     'listeners' => $firewallConfig->getListeners(),
-                );
+                ];
 
                 // generate exit impersonation path from current request
                 if ($this->data['impersonated'] && null !== $switchUserConfig = $firewallConfig->getSwitchUser()) {
@@ -189,7 +189,7 @@ public function collect(Request $request, Response $response, \Exception $except
         }
 
         // collect firewall listeners information
-        $this->data['listeners'] = array();
+        $this->data['listeners'] = [];
         if ($this->firewall) {
             $this->data['listeners'] = $this->firewall->getWrappedListeners();
         }
@@ -200,7 +200,7 @@ public function collect(Request $request, Response $response, \Exception $except
      */
     public function reset()
     {
-        $this->data = array();
+        $this->data = [];
     }
 
     public function lateCollect()
diff --git a/src/Symfony/Bundle/SecurityBundle/Debug/WrappedListener.php b/src/Symfony/Bundle/SecurityBundle/Debug/WrappedListener.php
index cdc3f1d57ea36..bb6f875863695 100644
--- a/src/Symfony/Bundle/SecurityBundle/Debug/WrappedListener.php
+++ b/src/Symfony/Bundle/SecurityBundle/Debug/WrappedListener.php
@@ -67,10 +67,10 @@ public function getInfo()
             $this->stub = self::$hasVarDumper ? new ClassStub(\get_class($this->listener)) : \get_class($this->listener);
         }
 
-        return array(
+        return [
             'response' => $this->response,
             'time' => $this->time,
             'stub' => $this->stub,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterCsrfTokenClearingLogoutHandlerPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterCsrfTokenClearingLogoutHandlerPass.php
index d4d28ecc4eb35..0d7527c26bb79 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterCsrfTokenClearingLogoutHandlerPass.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterCsrfTokenClearingLogoutHandlerPass.php
@@ -37,6 +37,6 @@ public function process(ContainerBuilder $container)
             ->addArgument(new Reference('security.csrf.token_storage'))
             ->setPublic(false);
 
-        $container->findDefinition('security.logout_listener')->addMethodCall('addHandler', array(new Reference('security.logout.handler.csrf_token_clearing')));
+        $container->findDefinition('security.logout_listener')->addMethodCall('addHandler', [new Reference('security.logout.handler.csrf_token_clearing')]);
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
index 6cdb9deb8f93f..236eab1b88c32 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -74,7 +74,7 @@ public function getConfigTreeBuilder()
             ->children()
                 ->scalarNode('access_denied_url')->defaultNull()->example('/foo/error403')->end()
                 ->enumNode('session_fixation_strategy')
-                    ->values(array(SessionAuthenticationStrategy::NONE, SessionAuthenticationStrategy::MIGRATE, SessionAuthenticationStrategy::INVALIDATE))
+                    ->values([SessionAuthenticationStrategy::NONE, SessionAuthenticationStrategy::MIGRATE, SessionAuthenticationStrategy::INVALIDATE])
                     ->defaultValue(SessionAuthenticationStrategy::MIGRATE)
                 ->end()
                 ->booleanNode('hide_user_not_found')->defaultTrue()->end()
@@ -84,7 +84,7 @@ public function getConfigTreeBuilder()
                     ->addDefaultsIfNotSet()
                     ->children()
                         ->enumNode('strategy')
-                            ->values(array(AccessDecisionManager::STRATEGY_AFFIRMATIVE, AccessDecisionManager::STRATEGY_CONSENSUS, AccessDecisionManager::STRATEGY_UNANIMOUS))
+                            ->values([AccessDecisionManager::STRATEGY_AFFIRMATIVE, AccessDecisionManager::STRATEGY_CONSENSUS, AccessDecisionManager::STRATEGY_UNANIMOUS])
                         ->end()
                         ->scalarNode('service')->end()
                         ->booleanNode('allow_if_all_abstain')->defaultFalse()->end()
@@ -158,7 +158,7 @@ private function addRoleHierarchySection(ArrayNodeDefinition $rootNode)
                     ->useAttributeAsKey('id')
                     ->prototype('array')
                         ->performNoDeepMerging()
-                        ->beforeNormalization()->ifString()->then(function ($v) { return array('value' => $v); })->end()
+                        ->beforeNormalization()->ifString()->then(function ($v) { return ['value' => $v]; })->end()
                         ->beforeNormalization()
                             ->ifTrue(function ($v) { return \is_array($v) && isset($v['value']); })
                             ->then(function ($v) { return preg_split('/\s*,\s*/', $v['value']); })
@@ -189,7 +189,7 @@ private function addAccessControlSection(ArrayNodeDefinition $rootNode)
                             ->end()
                             ->scalarNode('host')->defaultNull()->end()
                             ->arrayNode('ips')
-                                ->beforeNormalization()->ifString()->then(function ($v) { return array($v); })->end()
+                                ->beforeNormalization()->ifString()->then(function ($v) { return [$v]; })->end()
                                 ->prototype('scalar')->end()
                             ->end()
                             ->arrayNode('methods')
@@ -250,7 +250,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
                 ->info('When true, it will trigger a logout for the user if something has changed. This will be the default behavior as of Syfmony 4.0.')
             ->end()
             ->arrayNode('logout')
-                ->treatTrueLike(array())
+                ->treatTrueLike([])
                 ->canBeUnset()
                 ->children()
                     ->scalarNode('csrf_parameter')->defaultValue('_csrf_token')->end()
@@ -266,7 +266,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
                     ->arrayNode('delete_cookies')
                         ->beforeNormalization()
                             ->ifTrue(function ($v) { return \is_array($v) && \is_int(key($v)); })
-                            ->then(function ($v) { return array_map(function ($v) { return array('name' => $v); }, $v); })
+                            ->then(function ($v) { return array_map(function ($v) { return ['name' => $v]; }, $v); })
                         ->end()
                         ->useAttributeAsKey('name')
                         ->prototype('array')
@@ -301,7 +301,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
             ->end()
         ;
 
-        $abstractFactoryKeys = array();
+        $abstractFactoryKeys = [];
         foreach ($factories as $factoriesAtPosition) {
             foreach ($factoriesAtPosition as $factory) {
                 $name = str_replace('-', '_', $factory->getKey());
@@ -407,19 +407,19 @@ private function addEncodersSection(ArrayNodeDefinition $rootNode)
             ->fixXmlConfig('encoder')
             ->children()
                 ->arrayNode('encoders')
-                    ->example(array(
+                    ->example([
                         'App\Entity\User1' => 'bcrypt',
-                        'App\Entity\User2' => array(
+                        'App\Entity\User2' => [
                             'algorithm' => 'bcrypt',
                             'cost' => 13,
-                        ),
-                    ))
+                        ],
+                    ])
                     ->requiresAtLeastOneElement()
                     ->useAttributeAsKey('class')
                     ->prototype('array')
                         ->canBeUnset()
                         ->performNoDeepMerging()
-                        ->beforeNormalization()->ifString()->then(function ($v) { return array('algorithm' => $v); })->end()
+                        ->beforeNormalization()->ifString()->then(function ($v) { return ['algorithm' => $v]; })->end()
                         ->children()
                             ->scalarNode('algorithm')->cannotBeEmpty()->end()
                             ->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()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
index 195ef4c23a4d6..00bb451e0ef02 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
@@ -26,26 +26,26 @@
  */
 abstract class AbstractFactory implements SecurityFactoryInterface
 {
-    protected $options = array(
+    protected $options = [
         'check_path' => '/login_check',
         'use_forward' => false,
         'require_previous_session' => false,
-    );
+    ];
 
-    protected $defaultSuccessHandlerOptions = array(
+    protected $defaultSuccessHandlerOptions = [
         'always_use_default_target_path' => false,
         'default_target_path' => '/',
         'login_path' => '/login',
         'target_path_parameter' => '_target_path',
         'use_referer' => false,
-    );
+    ];
 
-    protected $defaultFailureHandlerOptions = array(
+    protected $defaultFailureHandlerOptions = [
         'failure_path' => null,
         'failure_forward' => false,
         'login_path' => '/login',
         'failure_path_parameter' => '_failure_path',
-    );
+    ];
 
     public function create(ContainerBuilder $container, $id, $config, $userProviderId, $defaultEntryPointId)
     {
@@ -59,14 +59,14 @@ public function create(ContainerBuilder $container, $id, $config, $userProviderI
         if ($this->isRememberMeAware($config)) {
             $container
                 ->getDefinition($listenerId)
-                ->addTag('security.remember_me_aware', array('id' => $id, 'provider' => $userProviderId))
+                ->addTag('security.remember_me_aware', ['id' => $id, 'provider' => $userProviderId])
             ;
         }
 
         // create entry point if applicable (optional)
         $entryPointId = $this->createEntryPoint($container, $id, $config, $defaultEntryPointId);
 
-        return array($authProviderId, $listenerId, $entryPointId);
+        return [$authProviderId, $listenerId, $entryPointId];
     }
 
     public function addConfiguration(NodeDefinition $node)
@@ -178,8 +178,8 @@ protected function createAuthenticationSuccessHandler($container, $id, $config)
             $successHandler->replaceArgument(2, $id);
         } else {
             $successHandler = $container->setDefinition($successHandlerId, new ChildDefinition('security.authentication.success_handler'));
-            $successHandler->addMethodCall('setOptions', array($options));
-            $successHandler->addMethodCall('setProviderKey', array($id));
+            $successHandler->addMethodCall('setOptions', [$options]);
+            $successHandler->addMethodCall('setProviderKey', [$id]);
         }
 
         return $successHandlerId;
@@ -196,7 +196,7 @@ protected function createAuthenticationFailureHandler($container, $id, $config)
             $failureHandler->replaceArgument(1, $options);
         } else {
             $failureHandler = $container->setDefinition($id, new ChildDefinition('security.authentication.failure_handler'));
-            $failureHandler->addMethodCall('setOptions', array($options));
+            $failureHandler->addMethodCall('setOptions', [$options]);
         }
 
         return $id;
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php
index 8bd389dc95b4c..3d9d4b2186315 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php
@@ -37,7 +37,7 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $config,
         ;
 
         if (!empty($config['query_string'])) {
-            $definition->addMethodCall('setQueryString', array($config['query_string']));
+            $definition->addMethodCall('setQueryString', [$config['query_string']]);
         }
 
         return $provider;
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php
index 03b299e50d24a..8384c42da7e66 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php
@@ -58,7 +58,7 @@ public function addConfiguration(NodeDefinition $node)
     public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
     {
         $authenticatorIds = $config['authenticators'];
-        $authenticatorReferences = array();
+        $authenticatorReferences = [];
         foreach ($authenticatorIds as $authenticatorId) {
             $authenticatorReferences[] = new Reference($authenticatorId);
         }
@@ -87,9 +87,9 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
         // this is always injected - then the listener decides if it should be used
         $container
             ->getDefinition($listenerId)
-            ->addTag('security.remember_me_aware', array('id' => $id, 'provider' => $userProvider));
+            ->addTag('security.remember_me_aware', ['id' => $id, 'provider' => $userProvider]);
 
-        return array($providerId, $listenerId, $entryPointId);
+        return [$providerId, $listenerId, $entryPointId];
     }
 
     private function determineEntryPoint($defaultEntryPointId, array $config)
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php
index 7c90ef620572a..f3b5bc167e64e 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php
@@ -41,9 +41,9 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
         $listener = $container->setDefinition($listenerId, new ChildDefinition('security.authentication.listener.basic'));
         $listener->replaceArgument(2, $id);
         $listener->replaceArgument(3, new Reference($entryPointId));
-        $listener->addMethodCall('setSessionAuthenticationStrategy', array(new Reference('security.authentication.session_strategy.'.$id)));
+        $listener->addMethodCall('setSessionAuthenticationStrategy', [new Reference('security.authentication.session_strategy.'.$id)]);
 
-        return array($provider, $listenerId, $entryPointId);
+        return [$provider, $listenerId, $entryPointId];
     }
 
     public function getPosition()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php
index ce3cdda96eafd..de8dc097285ad 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php
@@ -41,7 +41,7 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
         $entryPointId = $this->createEntryPoint($container, $id, $config, $defaultEntryPoint);
 
         if (!empty($config['query_string'])) {
-            $definition->addMethodCall('setQueryString', array($config['query_string']));
+            $definition->addMethodCall('setQueryString', [$config['query_string']]);
         }
 
         // listener
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginFactory.php
index 6c7adb032395b..a660401dbea34 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginFactory.php
@@ -26,8 +26,8 @@ public function __construct()
     {
         $this->addOption('username_path', 'username');
         $this->addOption('password_path', 'password');
-        $this->defaultFailureHandlerOptions = array();
-        $this->defaultSuccessHandlerOptions = array();
+        $this->defaultFailureHandlerOptions = [];
+        $this->defaultSuccessHandlerOptions = [];
     }
 
     /**
@@ -89,7 +89,7 @@ protected function createListener($container, $id, $config, $userProvider)
         $listener->replaceArgument(4, isset($config['success_handler']) ? new Reference($this->createAuthenticationSuccessHandler($container, $id, $config)) : null);
         $listener->replaceArgument(5, isset($config['failure_handler']) ? new Reference($this->createAuthenticationFailureHandler($container, $id, $config)) : null);
         $listener->replaceArgument(6, array_intersect_key($config, $this->options));
-        $listener->addMethodCall('setSessionAuthenticationStrategy', array(new Reference('security.authentication.session_strategy.'.$id)));
+        $listener->addMethodCall('setSessionAuthenticationStrategy', [new Reference('security.authentication.session_strategy.'.$id)]);
 
         $listenerId .= '.'.$id;
         $container->setDefinition($listenerId, $listener);
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
index 89b428a27d404..34de3d6701470 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
@@ -18,7 +18,7 @@
 
 class RememberMeFactory implements SecurityFactoryInterface
 {
-    protected $options = array(
+    protected $options = [
         'name' => 'REMEMBERME',
         'lifetime' => 31536000,
         'path' => '/',
@@ -27,7 +27,7 @@ class RememberMeFactory implements SecurityFactoryInterface
         'httponly' => true,
         'always_remember_me' => false,
         'remember_me_parameter' => '_remember_me',
-    );
+    ];
 
     public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
     {
@@ -52,7 +52,7 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
         if ($container->hasDefinition('security.logout_listener.'.$id)) {
             $container
                 ->getDefinition('security.logout_listener.'.$id)
-                ->addMethodCall('addHandler', array(new Reference($rememberMeServicesId)))
+                ->addMethodCall('addHandler', [new Reference($rememberMeServicesId)])
             ;
         }
 
@@ -61,16 +61,16 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
         $rememberMeServices->replaceArgument(2, $id);
 
         if (isset($config['token_provider'])) {
-            $rememberMeServices->addMethodCall('setTokenProvider', array(
+            $rememberMeServices->addMethodCall('setTokenProvider', [
                 new Reference($config['token_provider']),
-            ));
+            ]);
         }
 
         // remember-me options
         $rememberMeServices->replaceArgument(3, array_intersect_key($config, $this->options));
 
         // attach to remember-me aware listeners
-        $userProviders = array();
+        $userProviders = [];
         foreach ($container->findTaggedServiceIds('security.remember_me_aware') as $serviceId => $attributes) {
             foreach ($attributes as $attribute) {
                 if (!isset($attribute['id']) || $attribute['id'] !== $id) {
@@ -84,12 +84,12 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
                 $userProviders[] = new Reference($attribute['provider']);
                 $container
                     ->getDefinition($serviceId)
-                    ->addMethodCall('setRememberMeServices', array(new Reference($rememberMeServicesId)))
+                    ->addMethodCall('setRememberMeServices', [new Reference($rememberMeServicesId)])
                 ;
             }
         }
         if ($config['user_providers']) {
-            $userProviders = array();
+            $userProviders = [];
             foreach ($config['user_providers'] as $providerName) {
                 $userProviders[] = new Reference('security.user.provider.concrete.'.$providerName);
             }
@@ -106,7 +106,7 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
         $listener->replaceArgument(1, new Reference($rememberMeServicesId));
         $listener->replaceArgument(5, $config['catch_exceptions']);
 
-        return array($authProviderId, $listenerId, $defaultEntryPoint);
+        return [$authProviderId, $listenerId, $defaultEntryPoint];
     }
 
     public function getPosition()
@@ -131,7 +131,7 @@ public function addConfiguration(NodeDefinition $node)
             ->scalarNode('token_provider')->end()
             ->arrayNode('user_providers')
                 ->beforeNormalization()
-                    ->ifString()->then(function ($v) { return array($v); })
+                    ->ifString()->then(function ($v) { return [$v]; })
                 ->end()
                 ->prototype('scalar')->end()
             ->end()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RemoteUserFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RemoteUserFactory.php
index 654816e50e737..176f65b13578a 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RemoteUserFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RemoteUserFactory.php
@@ -38,9 +38,9 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
         $listener = $container->setDefinition($listenerId, new ChildDefinition('security.authentication.listener.remote_user'));
         $listener->replaceArgument(2, $id);
         $listener->replaceArgument(3, $config['user']);
-        $listener->addMethodCall('setSessionAuthenticationStrategy', array(new Reference('security.authentication.session_strategy.'.$id)));
+        $listener->addMethodCall('setSessionAuthenticationStrategy', [new Reference('security.authentication.session_strategy.'.$id)]);
 
-        return array($providerId, $listenerId, $defaultEntryPoint);
+        return [$providerId, $listenerId, $defaultEntryPoint];
     }
 
     public function getPosition()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SimplePreAuthenticationFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SimplePreAuthenticationFactory.php
index de0df6868f3fa..f92796d58a492 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SimplePreAuthenticationFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SimplePreAuthenticationFactory.php
@@ -57,8 +57,8 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
         $listener = $container->setDefinition($listenerId, new ChildDefinition('security.authentication.listener.simple_preauth'));
         $listener->replaceArgument(2, $id);
         $listener->replaceArgument(3, new Reference($config['authenticator']));
-        $listener->addMethodCall('setSessionAuthenticationStrategy', array(new Reference('security.authentication.session_strategy.'.$id)));
+        $listener->addMethodCall('setSessionAuthenticationStrategy', [new Reference('security.authentication.session_strategy.'.$id)]);
 
-        return array($provider, $listenerId, null);
+        return [$provider, $listenerId, null];
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/X509Factory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/X509Factory.php
index 17390f4b828f4..35879ee4956b9 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/X509Factory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/X509Factory.php
@@ -39,9 +39,9 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
         $listener->replaceArgument(2, $id);
         $listener->replaceArgument(3, $config['user']);
         $listener->replaceArgument(4, $config['credentials']);
-        $listener->addMethodCall('setSessionAuthenticationStrategy', array(new Reference('security.authentication.session_strategy.'.$id)));
+        $listener->addMethodCall('setSessionAuthenticationStrategy', [new Reference('security.authentication.session_strategy.'.$id)]);
 
-        return array($providerId, $listenerId, $defaultEntryPoint);
+        return [$providerId, $listenerId, $defaultEntryPoint];
     }
 
     public function getPosition()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
index 6b0800953b4ec..1e76601105022 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
@@ -28,10 +28,10 @@ public function create(ContainerBuilder $container, $id, $config)
     {
         $definition = $container->setDefinition($id, new ChildDefinition('security.user.provider.in_memory'));
         $defaultPassword = new Parameter('container.build_id');
-        $users = array();
+        $users = [];
 
         foreach ($config['users'] as $username => $user) {
-            $users[$username] = array('password' => null !== $user['password'] ? (string) $user['password'] : $defaultPassword, 'roles' => $user['roles']);
+            $users[$username] = ['password' => null !== $user['password'] ? (string) $user['password'] : $defaultPassword, 'roles' => $user['roles']];
         }
 
         $definition->addArgument($users);
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index bcc4c5f26a881..608fc0abac996 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -249,7 +249,7 @@ private function createAuthorization($config, ContainerBuilder $container)
             }
 
             $container->getDefinition('security.access_map')
-                      ->addMethodCall('add', array($matcher, $attributes, $access['requires_channel']));
+                      ->addMethodCall('add', [$matcher, $attributes, $access['requires_channel']]);
         }
     }
 
@@ -265,7 +265,7 @@ private function createFirewalls($config, ContainerBuilder $container)
         // make the ContextListener aware of the configured user providers
         $contextListenerDefinition = $container->getDefinition('security.context_listener');
         $arguments = $contextListenerDefinition->getArguments();
-        $userProviders = array();
+        $userProviders = [];
         foreach ($providerIds as $userProviderId) {
             $userProviders[] = new Reference($userProviderId);
         }
@@ -276,7 +276,7 @@ private function createFirewalls($config, ContainerBuilder $container)
 
         // load firewall map
         $mapDef = $container->getDefinition('security.firewall.map');
-        $map = $authenticationProviders = $contextRefs = array();
+        $map = $authenticationProviders = $contextRefs = [];
         foreach ($firewalls as $name => $firewall) {
             if (isset($firewall['user_checker']) && 'security.user_checker' !== $firewall['user_checker']) {
                 $customUserChecker = true;
@@ -338,7 +338,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
 
         // Security disabled?
         if (false === $firewall['security']) {
-            return array($matcher, array(), null, null);
+            return [$matcher, [], null, null];
         }
 
         $config->replaceArgument(4, $firewall['stateless']);
@@ -357,8 +357,8 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
         $config->replaceArgument(5, $defaultProvider);
 
         // Register listeners
-        $listeners = array();
-        $listenerKeys = array();
+        $listeners = [];
+        $listenerKeys = [];
 
         // Channel listener
         $listeners[] = new Reference('security.channel_listener');
@@ -395,11 +395,11 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
         if (isset($firewall['logout'])) {
             $logoutListenerId = 'security.logout_listener.'.$id;
             $logoutListener = $container->setDefinition($logoutListenerId, new ChildDefinition('security.logout_listener'));
-            $logoutListener->replaceArgument(3, array(
+            $logoutListener->replaceArgument(3, [
                 'csrf_parameter' => $firewall['logout']['csrf_parameter'],
                 'csrf_token_id' => $firewall['logout']['csrf_token_id'],
                 'logout_path' => $firewall['logout']['path'],
-            ));
+            ]);
 
             // add logout success handler
             if (isset($firewall['logout']['success_handler'])) {
@@ -418,7 +418,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
 
             // add session logout handler
             if (true === $firewall['logout']['invalidate_session'] && false === $firewall['stateless']) {
-                $logoutListener->addMethodCall('addHandler', array(new Reference('security.logout.handler.session')));
+                $logoutListener->addMethodCall('addHandler', [new Reference('security.logout.handler.session')]);
             }
 
             // add cookie logout handler
@@ -427,25 +427,25 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
                 $cookieHandler = $container->setDefinition($cookieHandlerId, new ChildDefinition('security.logout.handler.cookie_clearing'));
                 $cookieHandler->addArgument($firewall['logout']['delete_cookies']);
 
-                $logoutListener->addMethodCall('addHandler', array(new Reference($cookieHandlerId)));
+                $logoutListener->addMethodCall('addHandler', [new Reference($cookieHandlerId)]);
             }
 
             // add custom handlers
             foreach ($firewall['logout']['handlers'] as $handlerId) {
-                $logoutListener->addMethodCall('addHandler', array(new Reference($handlerId)));
+                $logoutListener->addMethodCall('addHandler', [new Reference($handlerId)]);
             }
 
             // register with LogoutUrlGenerator
             $container
                 ->getDefinition('security.logout_url_generator')
-                ->addMethodCall('registerListener', array(
+                ->addMethodCall('registerListener', [
                     $id,
                     $firewall['logout']['path'],
                     $firewall['logout']['csrf_token_id'],
                     $firewall['logout']['csrf_parameter'],
                     isset($firewall['logout']['csrf_token_generator']) ? new Reference($firewall['logout']['csrf_token_generator']) : null,
                     false === $firewall['stateless'] && isset($firewall['context']) ? $firewall['context'] : null,
-                ))
+                ])
             ;
         }
 
@@ -492,7 +492,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
         $config->replaceArgument(10, $listenerKeys);
         $config->replaceArgument(11, isset($firewall['switch_user']) ? $firewall['switch_user'] : null);
 
-        return array($matcher, $listeners, $exceptionListener, null !== $logoutListenerId ? new Reference($logoutListenerId) : null);
+        return [$matcher, $listeners, $exceptionListener, null !== $logoutListenerId ? new Reference($logoutListenerId) : null];
     }
 
     private function createContextListener($container, $contextKey, $logoutUserOnChange)
@@ -568,19 +568,19 @@ private function createAuthenticationListeners($container, $id, $firewall, &$aut
             throw new InvalidConfigurationException(sprintf('No authentication listener registered for firewall "%s".', $id));
         }
 
-        return array($listeners, $defaultEntryPoint);
+        return [$listeners, $defaultEntryPoint];
     }
 
     private function createEncoders($encoders, ContainerBuilder $container)
     {
-        $encoderMap = array();
+        $encoderMap = [];
         foreach ($encoders as $class => $encoder) {
             $encoderMap[$class] = $this->createEncoder($encoder, $container);
         }
 
         $container
             ->getDefinition('security.encoder_factory.generic')
-            ->setArguments(array($encoderMap))
+            ->setArguments([$encoderMap])
         ;
     }
 
@@ -593,33 +593,33 @@ private function createEncoder($config, ContainerBuilder $container)
 
         // plaintext encoder
         if ('plaintext' === $config['algorithm']) {
-            $arguments = array($config['ignore_case']);
+            $arguments = [$config['ignore_case']];
 
-            return array(
+            return [
                 'class' => 'Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder',
                 'arguments' => $arguments,
-            );
+            ];
         }
 
         // pbkdf2 encoder
         if ('pbkdf2' === $config['algorithm']) {
-            return array(
+            return [
                 'class' => 'Symfony\Component\Security\Core\Encoder\Pbkdf2PasswordEncoder',
-                'arguments' => array(
+                'arguments' => [
                     $config['hash_algorithm'],
                     $config['encode_as_base64'],
                     $config['iterations'],
                     $config['key_length'],
-                ),
-            );
+                ],
+            ];
         }
 
         // bcrypt encoder
         if ('bcrypt' === $config['algorithm']) {
-            return array(
+            return [
                 'class' => 'Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder',
-                'arguments' => array($config['cost']),
-            );
+                'arguments' => [$config['cost']],
+            ];
         }
 
         // Argon2i encoder
@@ -641,7 +641,7 @@ private function createEncoder($config, ContainerBuilder $container)
     // Parses user providers and returns an array of their ids
     private function createUserProviders($config, ContainerBuilder $container)
     {
-        $providerIds = array();
+        $providerIds = [];
         foreach ($config['providers'] as $name => $provider) {
             $id = $this->createUserDaoProvider($name, $provider, $container);
             $providerIds[str_replace('-', '_', $name)] = $id;
@@ -675,7 +675,7 @@ private function createUserDaoProvider($name, $provider, ContainerBuilder $conta
 
         // Chain provider
         if (isset($provider['chain'])) {
-            $providers = array();
+            $providers = [];
             foreach ($provider['chain']['providers'] as $providerName) {
                 $providers[] = new Reference($this->getUserProviderId($providerName));
             }
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
index 79ad2ef65c8a3..599f9050aff9b 100644
--- a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
+++ b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
@@ -121,10 +121,10 @@ public function getListeners(Request $request)
         $context = $this->getFirewallContext($request);
 
         if (null === $context) {
-            return array(array(), null, null);
+            return [[], null, null];
         }
 
-        return array($context->getListeners(), $context->getExceptionListener(), $context->getLogoutListener());
+        return [$context->getListeners(), $context->getExceptionListener(), $context->getLogoutListener()];
     }
 
     /**
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
index 5e71ac6d8ae2a..3a7a2cd5ebe78 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
@@ -92,12 +92,12 @@ public function testCollectAuthenticationTokenAndRoles(array $roles, array $norm
 
     public function testCollectImpersonatedToken()
     {
-        $adminToken = new UsernamePasswordToken('yceruto', 'P4$$w0rD', 'provider', array('ROLE_ADMIN'));
+        $adminToken = new UsernamePasswordToken('yceruto', 'P4$$w0rD', 'provider', ['ROLE_ADMIN']);
 
-        $userRoles = array(
+        $userRoles = [
             'ROLE_USER',
             new SwitchUserRole('ROLE_PREVIOUS_ADMIN', $adminToken),
-        );
+        ];
 
         $tokenStorage = new TokenStorage();
         $tokenStorage->setToken(new UsernamePasswordToken('hhamon', 'P4$$w0rD', 'provider', $userRoles));
@@ -112,8 +112,8 @@ public function testCollectImpersonatedToken()
         $this->assertSame('yceruto', $collector->getImpersonatorUser());
         $this->assertSame('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken', $collector->getTokenClass()->getValue());
         $this->assertTrue($collector->supportsRoleHierarchy());
-        $this->assertSame(array('ROLE_USER', 'ROLE_PREVIOUS_ADMIN'), $collector->getRoles()->getValue(true));
-        $this->assertSame(array(), $collector->getInheritedRoles()->getValue(true));
+        $this->assertSame(['ROLE_USER', 'ROLE_PREVIOUS_ADMIN'], $collector->getRoles()->getValue(true));
+        $this->assertSame([], $collector->getInheritedRoles()->getValue(true));
         $this->assertSame('hhamon', $collector->getUser());
     }
 
@@ -223,43 +223,43 @@ public function testGetListeners()
 
     public function provideRoles()
     {
-        return array(
+        return [
             // Basic roles
-            array(
-                array('ROLE_USER'),
-                array('ROLE_USER'),
-                array(),
-            ),
-            array(
-                array(new Role('ROLE_USER')),
-                array('ROLE_USER'),
-                array(),
-            ),
+            [
+                ['ROLE_USER'],
+                ['ROLE_USER'],
+                [],
+            ],
+            [
+                [new Role('ROLE_USER')],
+                ['ROLE_USER'],
+                [],
+            ],
             // Inherited roles
-            array(
-                array('ROLE_ADMIN'),
-                array('ROLE_ADMIN'),
-                array('ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'),
-            ),
-            array(
-                array(new Role('ROLE_ADMIN')),
-                array('ROLE_ADMIN'),
-                array('ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'),
-            ),
-            array(
-                array('ROLE_ADMIN', 'ROLE_OPERATOR'),
-                array('ROLE_ADMIN', 'ROLE_OPERATOR'),
-                array('ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'),
-            ),
-        );
+            [
+                ['ROLE_ADMIN'],
+                ['ROLE_ADMIN'],
+                ['ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'],
+            ],
+            [
+                [new Role('ROLE_ADMIN')],
+                ['ROLE_ADMIN'],
+                ['ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'],
+            ],
+            [
+                ['ROLE_ADMIN', 'ROLE_OPERATOR'],
+                ['ROLE_ADMIN', 'ROLE_OPERATOR'],
+                ['ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'],
+            ],
+        ];
     }
 
     private function getRoleHierarchy()
     {
-        return new RoleHierarchy(array(
-            'ROLE_ADMIN' => array('ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'),
-            'ROLE_OPERATOR' => array('ROLE_USER'),
-        ));
+        return new RoleHierarchy([
+            'ROLE_ADMIN' => ['ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'],
+            'ROLE_OPERATOR' => ['ROLE_USER'],
+        ]);
     }
 
     private function getRequest()
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSecurityVotersPassTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSecurityVotersPassTest.php
index 5eae4388dc2f8..aea4a45879fb3 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSecurityVotersPassTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSecurityVotersPassTest.php
@@ -29,7 +29,7 @@ public function testNoVoters()
         $container = new ContainerBuilder();
         $container
             ->register('security.access.decision_manager', AccessDecisionManager::class)
-            ->addArgument(array())
+            ->addArgument([])
         ;
 
         $compilerPass = new AddSecurityVotersPass();
@@ -49,15 +49,15 @@ public function testThatSecurityVotersAreProcessedInPriorityOrder()
         ;
         $container
             ->register('lowest_prio_service', Voter::class)
-            ->addTag('security.voter', array('priority' => 100))
+            ->addTag('security.voter', ['priority' => 100])
         ;
         $container
             ->register('highest_prio_service', Voter::class)
-            ->addTag('security.voter', array('priority' => 200))
+            ->addTag('security.voter', ['priority' => 200])
         ;
         $container
             ->register('zero_prio_service', Voter::class)
-            ->addTag('security.voter', array('priority' => 0))
+            ->addTag('security.voter', ['priority' => 0])
         ;
         $compilerPass = new AddSecurityVotersPass();
         $compilerPass->process($container);
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSessionDomainConstraintPassTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSessionDomainConstraintPassTest.php
index 382bdebe018fa..7fcc30243908e 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSessionDomainConstraintPassTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSessionDomainConstraintPassTest.php
@@ -22,7 +22,7 @@ class AddSessionDomainConstraintPassTest extends TestCase
 {
     public function testSessionCookie()
     {
-        $container = $this->createContainer(array('cookie_domain' => '.symfony.com.', 'cookie_secure' => true));
+        $container = $this->createContainer(['cookie_domain' => '.symfony.com.', 'cookie_secure' => true]);
 
         $utils = $container->get('security.http_utils');
         $request = Request::create('/', 'get');
@@ -37,7 +37,7 @@ public function testSessionCookie()
 
     public function testSessionNoDomain()
     {
-        $container = $this->createContainer(array('cookie_secure' => true));
+        $container = $this->createContainer(['cookie_secure' => true]);
 
         $utils = $container->get('security.http_utils');
         $request = Request::create('/', 'get');
@@ -52,7 +52,7 @@ public function testSessionNoDomain()
 
     public function testSessionNoSecure()
     {
-        $container = $this->createContainer(array('cookie_domain' => '.symfony.com.'));
+        $container = $this->createContainer(['cookie_domain' => '.symfony.com.']);
 
         $utils = $container->get('security.http_utils');
         $request = Request::create('/', 'get');
@@ -67,7 +67,7 @@ public function testSessionNoSecure()
 
     public function testSessionNoSecureAndNoDomain()
     {
-        $container = $this->createContainer(array());
+        $container = $this->createContainer([]);
 
         $utils = $container->get('security.http_utils');
         $request = Request::create('/', 'get');
@@ -99,7 +99,7 @@ public function testNoSession()
     private function createContainer($sessionStorageOptions)
     {
         $container = new ContainerBuilder();
-        $container->setParameter('kernel.bundles_metadata', array());
+        $container->setParameter('kernel.bundles_metadata', []);
         $container->setParameter('kernel.cache_dir', __DIR__);
         $container->setParameter('kernel.charset', 'UTF-8');
         $container->setParameter('kernel.container_class', 'cc');
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
index 15b43bede956a..149c5e4817c9e 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -56,30 +56,30 @@ public function testUserProviders()
 
         $providers = array_values(array_filter($container->getServiceIds(), function ($key) { return 0 === strpos($key, 'security.user.provider.concrete'); }));
 
-        $expectedProviders = array(
+        $expectedProviders = [
             'security.user.provider.concrete.default',
             'security.user.provider.concrete.digest',
             'security.user.provider.concrete.basic',
             'security.user.provider.concrete.service',
             'security.user.provider.concrete.chain',
-        );
+        ];
 
-        $this->assertEquals(array(), array_diff($expectedProviders, $providers));
-        $this->assertEquals(array(), array_diff($providers, $expectedProviders));
+        $this->assertEquals([], array_diff($expectedProviders, $providers));
+        $this->assertEquals([], array_diff($providers, $expectedProviders));
 
         // chain provider
-        $this->assertEquals(array(new IteratorArgument(array(
+        $this->assertEquals([new IteratorArgument([
             new Reference('security.user.provider.concrete.service'),
             new Reference('security.user.provider.concrete.basic'),
-        ))), $container->getDefinition('security.user.provider.concrete.chain')->getArguments());
+        ])], $container->getDefinition('security.user.provider.concrete.chain')->getArguments());
     }
 
     public function testFirewalls()
     {
         $container = $this->getContainer('container1');
         $arguments = $container->getDefinition('security.firewall.map')->getArguments();
-        $listeners = array();
-        $configs = array();
+        $listeners = [];
+        $configs = [];
         foreach (array_keys($arguments[1]->getValues()) as $contextId) {
             $contextDef = $container->getDefinition($contextId);
             $arguments = $contextDef->getArguments();
@@ -350,7 +350,7 @@ public function testFirewallRequestMatchers()
         $container = $this->getContainer('container1');
 
         $arguments = $container->getDefinition('security.firewall.map')->getArguments();
-        $matchers = array();
+        $matchers = [];
 
         foreach ($arguments[1]->getValues() as $reference) {
             if ($reference instanceof Reference) {
@@ -359,16 +359,16 @@ public function testFirewallRequestMatchers()
             }
         }
 
-        $this->assertEquals(array(
-            array(
+        $this->assertEquals([
+            [
                 '/login',
-            ),
-            array(
+            ],
+            [
                 '/test',
                 'foo\\.example\\.org',
-                array('GET', 'POST'),
-            ),
-        ), $matchers);
+                ['GET', 'POST'],
+            ],
+        ], $matchers);
     }
 
     public function testUserCheckerAliasIsRegistered()
@@ -383,14 +383,14 @@ public function testAccess()
     {
         $container = $this->getContainer('container1');
 
-        $rules = array();
+        $rules = [];
         foreach ($container->getDefinition('security.access_map')->getMethodCalls() as $call) {
             if ('add' == $call[0]) {
-                $rules[] = array((string) $call[1][0], $call[1][1], $call[1][2]);
+                $rules[] = [(string) $call[1][0], $call[1][1], $call[1][2]];
             }
         }
 
-        $matcherIds = array();
+        $matcherIds = [];
         foreach ($rules as list($matcherId, $attributes, $channel)) {
             $requestMatcher = $container->getDefinition($matcherId);
 
@@ -424,10 +424,10 @@ public function testMerge()
     {
         $container = $this->getContainer('merge');
 
-        $this->assertEquals(array(
-            'FOO' => array('MOO'),
-            'ADMIN' => array('USER'),
-        ), $container->getParameter('security.role_hierarchy.roles'));
+        $this->assertEquals([
+            'FOO' => ['MOO'],
+            'ADMIN' => ['USER'],
+        ], $container->getParameter('security.role_hierarchy.roles'));
     }
 
     public function testEncoders()
@@ -435,10 +435,10 @@ public function testEncoders()
         $container = $this->getContainer('container1');
 
         $this->assertEquals(array(array(
-            'JMS\FooBundle\Entity\User1' => array(
+            'JMS\FooBundle\Entity\User1' => [
                 'class' => 'Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder',
-                'arguments' => array(false),
-            ),
+                'arguments' => [false],
+            ],
             'JMS\FooBundle\Entity\User2' => array(
                 'algorithm' => 'sha1',
                 'encode_as_base64' => false,
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/access_decision_manager_customized_config.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/access_decision_manager_customized_config.php
index cd3cc1200075f..1d0a090f3f589 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/access_decision_manager_customized_config.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/access_decision_manager_customized_config.php
@@ -1,20 +1,20 @@
 <?php
 
-$container->loadFromExtension('security', array(
-    'access_decision_manager' => array(
+$container->loadFromExtension('security', [
+    'access_decision_manager' => [
         'allow_if_all_abstain' => true,
         'allow_if_equal_granted_denied' => false,
-    ),
-    'providers' => array(
-        'default' => array(
-            'memory' => array(
-                'users' => array(
-                    'foo' => array('password' => 'foo', 'roles' => 'ROLE_USER'),
-                ),
-            ),
-        ),
-    ),
-    'firewalls' => array(
-        'simple' => array('pattern' => '/login', 'security' => false),
-    ),
-));
+    ],
+    'providers' => [
+        'default' => [
+            'memory' => [
+                'users' => [
+                    'foo' => ['password' => 'foo', 'roles' => 'ROLE_USER'],
+                ],
+            ],
+        ],
+    ],
+    'firewalls' => [
+        'simple' => ['pattern' => '/login', 'security' => false],
+    ],
+]);
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/access_decision_manager_default_strategy.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/access_decision_manager_default_strategy.php
index d06fc3e686af2..1f0adbf3010f1 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/access_decision_manager_default_strategy.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/access_decision_manager_default_strategy.php
@@ -1,16 +1,16 @@
 <?php
 
-$container->loadFromExtension('security', array(
-    'providers' => array(
-        'default' => array(
-            'memory' => array(
-                'users' => array(
-                    'foo' => array('password' => 'foo', 'roles' => 'ROLE_USER'),
-                ),
-            ),
-        ),
-    ),
-    'firewalls' => array(
-        'simple' => array('pattern' => '/login', 'security' => false),
-    ),
-));
+$container->loadFromExtension('security', [
+    'providers' => [
+        'default' => [
+            'memory' => [
+                'users' => [
+                    'foo' => ['password' => 'foo', 'roles' => 'ROLE_USER'],
+                ],
+            ],
+        ],
+    ],
+    'firewalls' => [
+        'simple' => ['pattern' => '/login', 'security' => false],
+    ],
+]);
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/access_decision_manager_service.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/access_decision_manager_service.php
index 29db539362649..8f615904ddf0d 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/access_decision_manager_service.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/access_decision_manager_service.php
@@ -1,19 +1,19 @@
 <?php
 
-$container->loadFromExtension('security', array(
-    'access_decision_manager' => array(
+$container->loadFromExtension('security', [
+    'access_decision_manager' => [
         'service' => 'app.access_decision_manager',
-    ),
-    'providers' => array(
-        'default' => array(
-            'memory' => array(
-                'users' => array(
-                    'foo' => array('password' => 'foo', 'roles' => 'ROLE_USER'),
-                ),
-            ),
-        ),
-    ),
-    'firewalls' => array(
-        'simple' => array('pattern' => '/login', 'security' => false),
-    ),
-));
+    ],
+    'providers' => [
+        'default' => [
+            'memory' => [
+                'users' => [
+                    'foo' => ['password' => 'foo', 'roles' => 'ROLE_USER'],
+                ],
+            ],
+        ],
+    ],
+    'firewalls' => [
+        'simple' => ['pattern' => '/login', 'security' => false],
+    ],
+]);
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/access_decision_manager_service_and_strategy.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/access_decision_manager_service_and_strategy.php
index f7175e21f6fc8..bd78bdf24d578 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/access_decision_manager_service_and_strategy.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/access_decision_manager_service_and_strategy.php
@@ -1,20 +1,20 @@
 <?php
 
-$container->loadFromExtension('security', array(
-    'access_decision_manager' => array(
+$container->loadFromExtension('security', [
+    'access_decision_manager' => [
         'service' => 'app.access_decision_manager',
         'strategy' => 'affirmative',
-    ),
-    'providers' => array(
-        'default' => array(
-            'memory' => array(
-                'users' => array(
-                    'foo' => array('password' => 'foo', 'roles' => 'ROLE_USER'),
-                ),
-            ),
-        ),
-    ),
-    'firewalls' => array(
-        'simple' => array('pattern' => '/login', 'security' => false),
-    ),
-));
+    ],
+    'providers' => [
+        'default' => [
+            'memory' => [
+                'users' => [
+                    'foo' => ['password' => 'foo', 'roles' => 'ROLE_USER'],
+                ],
+            ],
+        ],
+    ],
+    'firewalls' => [
+        'simple' => ['pattern' => '/login', 'security' => false],
+    ],
+]);
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php
index a367a67682304..ca82e805c3cd1 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php
@@ -19,13 +19,13 @@ class AbstractFactoryTest extends TestCase
 {
     public function testCreate()
     {
-        list($container, $authProviderId, $listenerId, $entryPointId) = $this->callFactory('foo', array(
+        list($container, $authProviderId, $listenerId, $entryPointId) = $this->callFactory('foo', [
             'use_forward' => true,
             'failure_path' => '/foo',
             'success_handler' => 'custom_success_handler',
             'failure_handler' => 'custom_failure_handler',
             'remember_me' => true,
-        ), 'user_provider', 'entry_point');
+        ], 'user_provider', 'entry_point');
 
         // auth provider
         $this->assertEquals('auth_provider', $authProviderId);
@@ -34,14 +34,14 @@ public function testCreate()
         $this->assertEquals('abstract_listener.foo', $listenerId);
         $this->assertTrue($container->hasDefinition('abstract_listener.foo'));
         $definition = $container->getDefinition('abstract_listener.foo');
-        $this->assertEquals(array(
+        $this->assertEquals([
             'index_4' => 'foo',
             'index_5' => new Reference('security.authentication.success_handler.foo.abstract_factory'),
             'index_6' => new Reference('security.authentication.failure_handler.foo.abstract_factory'),
-            'index_7' => array(
+            'index_7' => [
                 'use_forward' => true,
-            ),
-        ), $definition->getArguments());
+            ],
+        ], $definition->getArguments());
 
         // entry point
         $this->assertEquals('entry_point', $entryPointId, '->create() does not change the default entry point.');
@@ -52,10 +52,10 @@ public function testCreate()
      */
     public function testDefaultFailureHandler($serviceId, $defaultHandlerInjection)
     {
-        $options = array(
+        $options = [
             'remember_me' => true,
             'login_path' => '/bar',
-        );
+        ];
 
         if ($serviceId) {
             $options['failure_handler'] = $serviceId;
@@ -71,7 +71,7 @@ public function testDefaultFailureHandler($serviceId, $defaultHandlerInjection)
         $methodCalls = $failureHandler->getMethodCalls();
         if ($defaultHandlerInjection) {
             $this->assertEquals('setOptions', $methodCalls[0][0]);
-            $this->assertEquals(array('login_path' => '/bar'), $methodCalls[0][1][0]);
+            $this->assertEquals(['login_path' => '/bar'], $methodCalls[0][1][0]);
         } else {
             $this->assertCount(0, $methodCalls);
         }
@@ -79,10 +79,10 @@ public function testDefaultFailureHandler($serviceId, $defaultHandlerInjection)
 
     public function getFailureHandlers()
     {
-        return array(
-            array(null, true),
-            array('custom_failure_handler', false),
-        );
+        return [
+            [null, true],
+            ['custom_failure_handler', false],
+        ];
     }
 
     /**
@@ -90,10 +90,10 @@ public function getFailureHandlers()
      */
     public function testDefaultSuccessHandler($serviceId, $defaultHandlerInjection)
     {
-        $options = array(
+        $options = [
             'remember_me' => true,
             'default_target_path' => '/bar',
-        );
+        ];
 
         if ($serviceId) {
             $options['success_handler'] = $serviceId;
@@ -109,9 +109,9 @@ public function testDefaultSuccessHandler($serviceId, $defaultHandlerInjection)
 
         if ($defaultHandlerInjection) {
             $this->assertEquals('setOptions', $methodCalls[0][0]);
-            $this->assertEquals(array('default_target_path' => '/bar'), $methodCalls[0][1][0]);
+            $this->assertEquals(['default_target_path' => '/bar'], $methodCalls[0][1][0]);
             $this->assertEquals('setProviderKey', $methodCalls[1][0]);
-            $this->assertEquals(array('foo'), $methodCalls[1][1]);
+            $this->assertEquals(['foo'], $methodCalls[1][1]);
         } else {
             $this->assertCount(0, $methodCalls);
         }
@@ -119,15 +119,15 @@ public function testDefaultSuccessHandler($serviceId, $defaultHandlerInjection)
 
     public function getSuccessHandlers()
     {
-        return array(
-            array(null, true),
-            array('custom_success_handler', false),
-        );
+        return [
+            [null, true],
+            ['custom_success_handler', false],
+        ];
     }
 
     protected function callFactory($id, $config, $userProviderId, $defaultEntryPointId)
     {
-        $factory = $this->getMockForAbstractClass('Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AbstractFactory', array());
+        $factory = $this->getMockForAbstractClass('Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AbstractFactory', []);
 
         $factory
             ->expects($this->once())
@@ -152,6 +152,6 @@ protected function callFactory($id, $config, $userProviderId, $defaultEntryPoint
 
         list($authProviderId, $listenerId, $entryPointId) = $factory->create($container, $id, $config, $userProviderId, $defaultEntryPointId);
 
-        return array($container, $authProviderId, $listenerId, $entryPointId);
+        return [$container, $authProviderId, $listenerId, $entryPointId];
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/GuardAuthenticationFactoryTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/GuardAuthenticationFactoryTest.php
index 55a3ad387c224..81db40412a30f 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/GuardAuthenticationFactoryTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/GuardAuthenticationFactoryTest.php
@@ -54,44 +54,44 @@ public function testAddInvalidConfiguration(array $inputConfig)
 
     public function getValidConfigurationTests()
     {
-        $tests = array();
+        $tests = [];
 
         // completely basic
-        $tests[] = array(
-            array(
-                'authenticators' => array('authenticator1', 'authenticator2'),
+        $tests[] = [
+            [
+                'authenticators' => ['authenticator1', 'authenticator2'],
                 'provider' => 'some_provider',
                 'entry_point' => 'the_entry_point',
-            ),
-            array(
-                'authenticators' => array('authenticator1', 'authenticator2'),
+            ],
+            [
+                'authenticators' => ['authenticator1', 'authenticator2'],
                 'provider' => 'some_provider',
                 'entry_point' => 'the_entry_point',
-            ),
-        );
+            ],
+        ];
 
         // testing xml config fix: authenticator -> authenticators
-        $tests[] = array(
-            array(
-                'authenticator' => array('authenticator1', 'authenticator2'),
-            ),
-            array(
-                'authenticators' => array('authenticator1', 'authenticator2'),
+        $tests[] = [
+            [
+                'authenticator' => ['authenticator1', 'authenticator2'],
+            ],
+            [
+                'authenticators' => ['authenticator1', 'authenticator2'],
                 'entry_point' => null,
-            ),
-        );
+            ],
+        ];
 
         return $tests;
     }
 
     public function getInvalidConfigurationTests()
     {
-        $tests = array();
+        $tests = [];
 
         // testing not empty
-        $tests[] = array(
-            array('authenticators' => array()),
-        );
+        $tests[] = [
+            ['authenticators' => []],
+        ];
 
         return $tests;
     }
@@ -99,33 +99,33 @@ public function getInvalidConfigurationTests()
     public function testBasicCreate()
     {
         // simple configuration
-        $config = array(
-            'authenticators' => array('authenticator123'),
+        $config = [
+            'authenticators' => ['authenticator123'],
             'entry_point' => null,
-        );
+        ];
         list($container, $entryPointId) = $this->executeCreate($config, null);
         $this->assertEquals('authenticator123', $entryPointId);
 
         $providerDefinition = $container->getDefinition('security.authentication.provider.guard.my_firewall');
-        $this->assertEquals(array(
-            'index_0' => new IteratorArgument(array(new Reference('authenticator123'))),
+        $this->assertEquals([
+            'index_0' => new IteratorArgument([new Reference('authenticator123')]),
             'index_1' => new Reference('my_user_provider'),
             'index_2' => 'my_firewall',
             'index_3' => new Reference('security.user_checker.my_firewall'),
-        ), $providerDefinition->getArguments());
+        ], $providerDefinition->getArguments());
 
         $listenerDefinition = $container->getDefinition('security.authentication.listener.guard.my_firewall');
         $this->assertEquals('my_firewall', $listenerDefinition->getArgument(2));
-        $this->assertEquals(array(new Reference('authenticator123')), $listenerDefinition->getArgument(3)->getValues());
+        $this->assertEquals([new Reference('authenticator123')], $listenerDefinition->getArgument(3)->getValues());
     }
 
     public function testExistingDefaultEntryPointUsed()
     {
         // any existing default entry point is used
-        $config = array(
-            'authenticators' => array('authenticator123'),
+        $config = [
+            'authenticators' => ['authenticator123'],
             'entry_point' => null,
-        );
+        ];
         list(, $entryPointId) = $this->executeCreate($config, 'some_default_entry_point');
         $this->assertEquals('some_default_entry_point', $entryPointId);
     }
@@ -136,10 +136,10 @@ public function testExistingDefaultEntryPointUsed()
     public function testCannotOverrideDefaultEntryPoint()
     {
         // any existing default entry point is used
-        $config = array(
-            'authenticators' => array('authenticator123'),
+        $config = [
+            'authenticators' => ['authenticator123'],
             'entry_point' => 'authenticator123',
-        );
+        ];
         $this->executeCreate($config, 'some_default_entry_point');
     }
 
@@ -149,20 +149,20 @@ public function testCannotOverrideDefaultEntryPoint()
     public function testMultipleAuthenticatorsRequiresEntryPoint()
     {
         // any existing default entry point is used
-        $config = array(
-            'authenticators' => array('authenticator123', 'authenticatorABC'),
+        $config = [
+            'authenticators' => ['authenticator123', 'authenticatorABC'],
             'entry_point' => null,
-        );
+        ];
         $this->executeCreate($config, null);
     }
 
     public function testCreateWithEntryPoint()
     {
         // any existing default entry point is used
-        $config = array(
-            'authenticators' => array('authenticator123', 'authenticatorABC'),
+        $config = [
+            'authenticators' => ['authenticator123', 'authenticatorABC'],
             'entry_point' => 'authenticatorABC',
-        );
+        ];
         list($container, $entryPointId) = $this->executeCreate($config, null);
         $this->assertEquals('authenticatorABC', $entryPointId);
     }
@@ -178,6 +178,6 @@ private function executeCreate(array $config, $defaultEntryPointId)
         $factory = new GuardAuthenticationFactory();
         list($providerId, $listenerId, $entryPointId) = $factory->create($container, $id, $config, $userProviderId, $defaultEntryPointId);
 
-        return array($container, $entryPointId);
+        return [$container, $entryPointId];
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
index 45354b15fdd9f..1fad20ed90758 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -319,8 +319,8 @@ protected function getRawContainer()
         $bundle = new SecurityBundle();
         $bundle->build($container);
 
-        $container->getCompilerPassConfig()->setOptimizationPasses(array());
-        $container->getCompilerPassConfig()->setRemovingPasses(array());
+        $container->getCompilerPassConfig()->setOptimizationPasses([]);
+        $container->getCompilerPassConfig()->setRemovingPasses([]);
 
         return $container;
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AuthenticationCommencingTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AuthenticationCommencingTest.php
index 6ac0e6a3af772..2a31f2a27a5f2 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AuthenticationCommencingTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AuthenticationCommencingTest.php
@@ -15,7 +15,7 @@ class AuthenticationCommencingTest extends WebTestCase
 {
     public function testAuthenticationIsCommencingIfAccessDeniedExceptionIsWrapped()
     {
-        $client = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => 'config.yml'));
+        $client = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => 'config.yml']);
 
         $client->request('GET', '/secure-but-not-covered-by-access-control');
         $this->assertRedirect($client->getResponse(), '/login');
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Controller/LoginController.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Controller/LoginController.php
index 90f4d355a4871..bafa0f68ce33d 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Controller/LoginController.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Controller/LoginController.php
@@ -24,9 +24,9 @@ public function loginAction()
     {
         $form = $this->container->get('form.factory')->create('Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBundle\Form\UserLoginType');
 
-        return new Response($this->container->get('twig')->render('@CsrfFormLogin/Login/login.html.twig', array(
+        return new Response($this->container->get('twig')->render('@CsrfFormLogin/Login/login.html.twig', [
             'form' => $form->createView(),
-        )));
+        ]));
     }
 
     public function afterLoginAction()
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php
index 2f4f20df3a65c..63b27512d5d27 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php
@@ -65,9 +65,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 $event->getForm()->addError(new FormError($error->getMessage()));
             }
 
-            $event->setData(array_replace((array) $event->getData(), array(
+            $event->setData(array_replace((array) $event->getData(), [
                 'username' => $request->getSession()->get(Security::LAST_USERNAME),
-            )));
+            ]));
         });
     }
 
@@ -80,8 +80,8 @@ public function configureOptions(OptionsResolver $resolver)
          * listener in order for the CSRF token to validate successfully.
          */
 
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'csrf_token_id' => 'authenticate',
-        ));
+        ]);
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php
index 33d70ef7df066..3bf2a7767c833 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php
@@ -30,11 +30,11 @@ public function loginAction(Request $request)
             $error = $request->getSession()->get(Security::AUTHENTICATION_ERROR);
         }
 
-        return new Response($this->container->get('twig')->render('@FormLogin/Localized/login.html.twig', array(
+        return new Response($this->container->get('twig')->render('@FormLogin/Localized/login.html.twig', [
             // last username entered by the user
             'last_username' => $request->getSession()->get(Security::LAST_USERNAME),
             'error' => $error,
-        )));
+        ]));
     }
 
     public function loginCheckAction()
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php
index 04fe49055bef2..60eef86718775 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php
@@ -32,16 +32,16 @@ public function loginAction(Request $request, UserInterface $user = null)
             $error = $request->getSession()->get(Security::AUTHENTICATION_ERROR);
         }
 
-        return new Response($this->container->get('twig')->render('@FormLogin/Login/login.html.twig', array(
+        return new Response($this->container->get('twig')->render('@FormLogin/Login/login.html.twig', [
             // last username entered by the user
             'last_username' => $request->getSession()->get(Security::LAST_USERNAME),
             'error' => $error,
-        )));
+        ]));
     }
 
     public function afterLoginAction(UserInterface $user)
     {
-        return new Response($this->container->get('twig')->render('@FormLogin/Login/after_login.html.twig', array('user' => $user)));
+        return new Response($this->container->get('twig')->render('@FormLogin/Login/after_login.html.twig', ['user' => $user]));
     }
 
     public function loginCheckAction()
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Security/LocalizedFormFailureHandler.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Security/LocalizedFormFailureHandler.php
index 7b971990657eb..f8f1c450d3963 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Security/LocalizedFormFailureHandler.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Security/LocalizedFormFailureHandler.php
@@ -29,6 +29,6 @@ public function __construct(RouterInterface $router)
 
     public function onAuthenticationFailure(Request $request, AuthenticationException $exception)
     {
-        return new RedirectResponse($this->router->generate('localized_login_path', array(), UrlGeneratorInterface::ABSOLUTE_URL));
+        return new RedirectResponse($this->router->generate('localized_login_path', [], UrlGeneratorInterface::ABSOLUTE_URL));
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/JsonLoginBundle/Controller/TestController.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/JsonLoginBundle/Controller/TestController.php
index 3effab9b59913..cba75a1526ace 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/JsonLoginBundle/Controller/TestController.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/JsonLoginBundle/Controller/TestController.php
@@ -21,6 +21,6 @@ class TestController
 {
     public function loginCheckAction(UserInterface $user)
     {
-        return new JsonResponse(array('message' => sprintf('Welcome @%s!', $user->getUsername())));
+        return new JsonResponse(['message' => sprintf('Welcome @%s!', $user->getUsername())]);
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/JsonLoginBundle/Security/Http/JsonAuthenticationFailureHandler.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/JsonLoginBundle/Security/Http/JsonAuthenticationFailureHandler.php
index fbd482ddffeb0..737c5a5abec00 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/JsonLoginBundle/Security/Http/JsonAuthenticationFailureHandler.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/JsonLoginBundle/Security/Http/JsonAuthenticationFailureHandler.php
@@ -20,6 +20,6 @@ class JsonAuthenticationFailureHandler implements AuthenticationFailureHandlerIn
 {
     public function onAuthenticationFailure(Request $request, AuthenticationException $exception)
     {
-        return new JsonResponse(array('message' => 'Something went wrong'), 500);
+        return new JsonResponse(['message' => 'Something went wrong'], 500);
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/JsonLoginBundle/Security/Http/JsonAuthenticationSuccessHandler.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/JsonLoginBundle/Security/Http/JsonAuthenticationSuccessHandler.php
index 0e65bbb56b98a..0390eb8e35eba 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/JsonLoginBundle/Security/Http/JsonAuthenticationSuccessHandler.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/JsonLoginBundle/Security/Http/JsonAuthenticationSuccessHandler.php
@@ -20,6 +20,6 @@ class JsonAuthenticationSuccessHandler implements AuthenticationSuccessHandlerIn
 {
     public function onAuthenticationSuccess(Request $request, TokenInterface $token)
     {
-        return new JsonResponse(array('message' => sprintf('Good game @%s!', $token->getUsername())));
+        return new JsonResponse(['message' => sprintf('Good game @%s!', $token->getUsername())]);
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/CsrfFormLoginTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/CsrfFormLoginTest.php
index 2d95d35065137..98b52a5f05058 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/CsrfFormLoginTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/CsrfFormLoginTest.php
@@ -18,7 +18,7 @@ class CsrfFormLoginTest extends WebTestCase
      */
     public function testFormLoginAndLogoutWithCsrfTokens($config)
     {
-        $client = $this->createClient(array('test_case' => 'CsrfFormLogin', 'root_config' => $config));
+        $client = $this->createClient(['test_case' => 'CsrfFormLogin', 'root_config' => $config]);
 
         $form = $client->request('GET', '/login')->selectButton('login')->form();
         $form['user_login[username]'] = 'johannes';
@@ -48,7 +48,7 @@ public function testFormLoginAndLogoutWithCsrfTokens($config)
      */
     public function testFormLoginWithInvalidCsrfToken($config)
     {
-        $client = $this->createClient(array('test_case' => 'CsrfFormLogin', 'root_config' => $config));
+        $client = $this->createClient(['test_case' => 'CsrfFormLogin', 'root_config' => $config]);
 
         $form = $client->request('GET', '/login')->selectButton('login')->form();
         $form['user_login[_token]'] = '';
@@ -65,7 +65,7 @@ public function testFormLoginWithInvalidCsrfToken($config)
      */
     public function testFormLoginWithCustomTargetPath($config)
     {
-        $client = $this->createClient(array('test_case' => 'CsrfFormLogin', 'root_config' => $config));
+        $client = $this->createClient(['test_case' => 'CsrfFormLogin', 'root_config' => $config]);
 
         $form = $client->request('GET', '/login')->selectButton('login')->form();
         $form['user_login[username]'] = 'johannes';
@@ -85,7 +85,7 @@ public function testFormLoginWithCustomTargetPath($config)
      */
     public function testFormLoginRedirectsToProtectedResourceAfterLogin($config)
     {
-        $client = $this->createClient(array('test_case' => 'CsrfFormLogin', 'root_config' => $config));
+        $client = $this->createClient(['test_case' => 'CsrfFormLogin', 'root_config' => $config]);
 
         $client->request('GET', '/protected-resource');
         $this->assertRedirect($client->getResponse(), '/login');
@@ -103,9 +103,9 @@ public function testFormLoginRedirectsToProtectedResourceAfterLogin($config)
 
     public function getConfigs()
     {
-        return array(
-            array('config.yml'),
-            array('routes_as_path.yml'),
-        );
+        return [
+            ['config.yml'],
+            ['routes_as_path.yml'],
+        ];
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/FirewallEntryPointTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/FirewallEntryPointTest.php
index 8179c2e942a6c..8afedc42e44d3 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/FirewallEntryPointTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/FirewallEntryPointTest.php
@@ -17,12 +17,12 @@ class FirewallEntryPointTest extends WebTestCase
 {
     public function testItUsesTheConfiguredEntryPointWhenUsingUnknownCredentials()
     {
-        $client = $this->createClient(array('test_case' => 'FirewallEntryPoint'));
+        $client = $this->createClient(['test_case' => 'FirewallEntryPoint']);
 
-        $client->request('GET', '/secure/resource', array(), array(), array(
+        $client->request('GET', '/secure/resource', [], [], [
             'PHP_AUTH_USER' => 'unknown',
             'PHP_AUTH_PW' => 'credentials',
-        ));
+        ]);
 
         $this->assertEquals(
             EntryPointStub::RESPONSE_TEXT,
@@ -33,7 +33,7 @@ public function testItUsesTheConfiguredEntryPointWhenUsingUnknownCredentials()
 
     public function testItUsesTheConfiguredEntryPointFromTheExceptionListenerWithFormLoginAndNoCredentials()
     {
-        $client = $this->createClient(array('test_case' => 'FirewallEntryPoint', 'root_config' => 'config_form_login.yml'));
+        $client = $this->createClient(['test_case' => 'FirewallEntryPoint', 'root_config' => 'config_form_login.yml']);
 
         $client->request('GET', '/secure/resource');
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/FormLoginTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/FormLoginTest.php
index c2e766e9acca1..ec1722188af25 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/FormLoginTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/FormLoginTest.php
@@ -18,7 +18,7 @@ class FormLoginTest extends WebTestCase
      */
     public function testFormLogin($config)
     {
-        $client = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config));
+        $client = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => $config]);
 
         $form = $client->request('GET', '/login')->selectButton('login')->form();
         $form['_username'] = 'johannes';
@@ -37,7 +37,7 @@ public function testFormLogin($config)
      */
     public function testFormLogout($config)
     {
-        $client = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config));
+        $client = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => $config]);
 
         $form = $client->request('GET', '/login')->selectButton('login')->form();
         $form['_username'] = 'johannes';
@@ -70,7 +70,7 @@ public function testFormLogout($config)
      */
     public function testFormLoginWithCustomTargetPath($config)
     {
-        $client = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config));
+        $client = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => $config]);
 
         $form = $client->request('GET', '/login')->selectButton('login')->form();
         $form['_username'] = 'johannes';
@@ -90,7 +90,7 @@ public function testFormLoginWithCustomTargetPath($config)
      */
     public function testFormLoginRedirectsToProtectedResourceAfterLogin($config)
     {
-        $client = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config));
+        $client = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => $config]);
 
         $client->request('GET', '/protected_resource');
         $this->assertRedirect($client->getResponse(), '/login');
@@ -108,9 +108,9 @@ public function testFormLoginRedirectsToProtectedResourceAfterLogin($config)
 
     public function getConfigs()
     {
-        return array(
-            array('config.yml'),
-            array('routes_as_path.yml'),
-        );
+        return [
+            ['config.yml'],
+            ['routes_as_path.yml'],
+        ];
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/JsonLoginTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/JsonLoginTest.php
index 7ee4c9b25dd45..c7e9e2aab71b1 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/JsonLoginTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/JsonLoginTest.php
@@ -20,56 +20,56 @@ class JsonLoginTest extends WebTestCase
 {
     public function testDefaultJsonLoginSuccess()
     {
-        $client = $this->createClient(array('test_case' => 'JsonLogin', 'root_config' => 'config.yml'));
-        $client->request('POST', '/chk', array(), array(), array('CONTENT_TYPE' => 'application/json'), '{"user": {"login": "dunglas", "password": "foo"}}');
+        $client = $this->createClient(['test_case' => 'JsonLogin', 'root_config' => 'config.yml']);
+        $client->request('POST', '/chk', [], [], ['CONTENT_TYPE' => 'application/json'], '{"user": {"login": "dunglas", "password": "foo"}}');
         $response = $client->getResponse();
 
         $this->assertInstanceOf(JsonResponse::class, $response);
         $this->assertSame(200, $response->getStatusCode());
-        $this->assertSame(array('message' => 'Welcome @dunglas!'), json_decode($response->getContent(), true));
+        $this->assertSame(['message' => 'Welcome @dunglas!'], json_decode($response->getContent(), true));
     }
 
     public function testDefaultJsonLoginFailure()
     {
-        $client = $this->createClient(array('test_case' => 'JsonLogin', 'root_config' => 'config.yml'));
-        $client->request('POST', '/chk', array(), array(), array('CONTENT_TYPE' => 'application/json'), '{"user": {"login": "dunglas", "password": "bad"}}');
+        $client = $this->createClient(['test_case' => 'JsonLogin', 'root_config' => 'config.yml']);
+        $client->request('POST', '/chk', [], [], ['CONTENT_TYPE' => 'application/json'], '{"user": {"login": "dunglas", "password": "bad"}}');
         $response = $client->getResponse();
 
         $this->assertInstanceOf(JsonResponse::class, $response);
         $this->assertSame(401, $response->getStatusCode());
-        $this->assertSame(array('error' => 'Invalid credentials.'), json_decode($response->getContent(), true));
+        $this->assertSame(['error' => 'Invalid credentials.'], json_decode($response->getContent(), true));
     }
 
     public function testCustomJsonLoginSuccess()
     {
-        $client = $this->createClient(array('test_case' => 'JsonLogin', 'root_config' => 'custom_handlers.yml'));
-        $client->request('POST', '/chk', array(), array(), array('CONTENT_TYPE' => 'application/json'), '{"user": {"login": "dunglas", "password": "foo"}}');
+        $client = $this->createClient(['test_case' => 'JsonLogin', 'root_config' => 'custom_handlers.yml']);
+        $client->request('POST', '/chk', [], [], ['CONTENT_TYPE' => 'application/json'], '{"user": {"login": "dunglas", "password": "foo"}}');
         $response = $client->getResponse();
 
         $this->assertInstanceOf(JsonResponse::class, $response);
         $this->assertSame(200, $response->getStatusCode());
-        $this->assertSame(array('message' => 'Good game @dunglas!'), json_decode($response->getContent(), true));
+        $this->assertSame(['message' => 'Good game @dunglas!'], json_decode($response->getContent(), true));
     }
 
     public function testCustomJsonLoginFailure()
     {
-        $client = $this->createClient(array('test_case' => 'JsonLogin', 'root_config' => 'custom_handlers.yml'));
-        $client->request('POST', '/chk', array(), array(), array('CONTENT_TYPE' => 'application/json'), '{"user": {"login": "dunglas", "password": "bad"}}');
+        $client = $this->createClient(['test_case' => 'JsonLogin', 'root_config' => 'custom_handlers.yml']);
+        $client->request('POST', '/chk', [], [], ['CONTENT_TYPE' => 'application/json'], '{"user": {"login": "dunglas", "password": "bad"}}');
         $response = $client->getResponse();
 
         $this->assertInstanceOf(JsonResponse::class, $response);
         $this->assertSame(500, $response->getStatusCode());
-        $this->assertSame(array('message' => 'Something went wrong'), json_decode($response->getContent(), true));
+        $this->assertSame(['message' => 'Something went wrong'], json_decode($response->getContent(), true));
     }
 
     public function testDefaultJsonLoginBadRequest()
     {
-        $client = $this->createClient(array('test_case' => 'JsonLogin', 'root_config' => 'config.yml'));
-        $client->request('POST', '/chk', array(), array(), array('CONTENT_TYPE' => 'application/json'), 'Not a json content');
+        $client = $this->createClient(['test_case' => 'JsonLogin', 'root_config' => 'config.yml']);
+        $client->request('POST', '/chk', [], [], ['CONTENT_TYPE' => 'application/json'], 'Not a json content');
         $response = $client->getResponse();
 
         $this->assertSame(400, $response->getStatusCode());
         $this->assertSame('application/json', $response->headers->get('Content-Type'));
-        $this->assertArraySubset(array('error' => array('code' => 400, 'message' => 'Bad Request')), json_decode($response->getContent(), true));
+        $this->assertArraySubset(['error' => ['code' => 400, 'message' => 'Bad Request']], json_decode($response->getContent(), true));
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php
index cb600764eaf42..c874ada34a4e3 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php
@@ -18,7 +18,7 @@ class LocalizedRoutesAsPathTest extends WebTestCase
      */
     public function testLoginLogoutProcedure($locale)
     {
-        $client = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => 'localized_routes.yml'));
+        $client = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => 'localized_routes.yml']);
 
         $crawler = $client->request('GET', '/'.$locale.'/login');
         $form = $crawler->selectButton('login')->form();
@@ -39,7 +39,7 @@ public function testLoginLogoutProcedure($locale)
      */
     public function testLoginFailureWithLocalizedFailurePath($locale)
     {
-        $client = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => 'localized_form_failure_handler.yml'));
+        $client = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => 'localized_form_failure_handler.yml']);
 
         $crawler = $client->request('GET', '/'.$locale.'/login');
         $form = $crawler->selectButton('login')->form();
@@ -55,7 +55,7 @@ public function testLoginFailureWithLocalizedFailurePath($locale)
      */
     public function testAccessRestrictedResource($locale)
     {
-        $client = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => 'localized_routes.yml'));
+        $client = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => 'localized_routes.yml']);
 
         $client->request('GET', '/'.$locale.'/secure/');
         $this->assertRedirect($client->getResponse(), '/'.$locale.'/login');
@@ -66,7 +66,7 @@ public function testAccessRestrictedResource($locale)
      */
     public function testAccessRestrictedResourceWithForward($locale)
     {
-        $client = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => 'localized_routes_with_forward.yml'));
+        $client = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => 'localized_routes_with_forward.yml']);
 
         $crawler = $client->request('GET', '/'.$locale.'/secure/');
         $this->assertCount(1, $crawler->selectButton('login'), (string) $client->getResponse());
@@ -74,6 +74,6 @@ public function testAccessRestrictedResourceWithForward($locale)
 
     public function getLocales()
     {
-        return array(array('en'), array('de'));
+        return [['en'], ['de']];
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/LogoutTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/LogoutTest.php
index a3f73cfc35fa7..244856a889557 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/LogoutTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/LogoutTest.php
@@ -15,12 +15,12 @@ class LogoutTest extends WebTestCase
 {
     public function testSessionLessRememberMeLogout()
     {
-        $client = $this->createClient(array('test_case' => 'RememberMeLogout', 'root_config' => 'config.yml'));
+        $client = $this->createClient(['test_case' => 'RememberMeLogout', 'root_config' => 'config.yml']);
 
-        $client->request('POST', '/login', array(
+        $client->request('POST', '/login', [
             '_username' => 'johannes',
             '_password' => 'test',
-        ));
+        ]);
 
         $cookieJar = $client->getCookieJar();
         $cookieJar->expire(session_name());
@@ -52,9 +52,9 @@ public function testCsrfTokensAreClearedOnLogout()
 
     public function testAccessControlDoesNotApplyOnLogout()
     {
-        $client = $this->createClient(array('test_case' => 'LogoutAccess', 'root_config' => 'config.yml'));
+        $client = $this->createClient(['test_case' => 'LogoutAccess', 'root_config' => 'config.yml']);
 
-        $client->request('POST', '/login', array('_username' => 'johannes', '_password' => 'test'));
+        $client->request('POST', '/login', ['_username' => 'johannes', '_password' => 'test']);
         $client->request('GET', '/logout');
 
         $this->assertRedirect($client->getResponse(), '/');
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityRoutingIntegrationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityRoutingIntegrationTest.php
index 5996415e10a64..0d2d6da0cfc51 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityRoutingIntegrationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityRoutingIntegrationTest.php
@@ -18,7 +18,7 @@ class SecurityRoutingIntegrationTest extends WebTestCase
      */
     public function testRoutingErrorIsNotExposedForProtectedResourceWhenAnonymous($config)
     {
-        $client = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config));
+        $client = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => $config]);
         $client->request('GET', '/protected_resource');
 
         $this->assertRedirect($client->getResponse(), '/login');
@@ -29,7 +29,7 @@ public function testRoutingErrorIsNotExposedForProtectedResourceWhenAnonymous($c
      */
     public function testRoutingErrorIsExposedWhenNotProtected($config)
     {
-        $client = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config));
+        $client = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => $config]);
         $client->request('GET', '/unprotected_resource');
 
         $this->assertEquals(404, $client->getResponse()->getStatusCode(), (string) $client->getResponse());
@@ -40,7 +40,7 @@ public function testRoutingErrorIsExposedWhenNotProtected($config)
      */
     public function testRoutingErrorIsNotExposedForProtectedResourceWhenLoggedInWithInsufficientRights($config)
     {
-        $client = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config));
+        $client = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => $config]);
 
         $form = $client->request('GET', '/login')->selectButton('login')->form();
         $form['_username'] = 'johannes';
@@ -57,8 +57,8 @@ public function testRoutingErrorIsNotExposedForProtectedResourceWhenLoggedInWith
      */
     public function testSecurityConfigurationForSingleIPAddress($config)
     {
-        $allowedClient = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array('REMOTE_ADDR' => '10.10.10.10'));
-        $barredClient = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array('REMOTE_ADDR' => '10.10.20.10'));
+        $allowedClient = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => $config], ['REMOTE_ADDR' => '10.10.10.10']);
+        $barredClient = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => $config], ['REMOTE_ADDR' => '10.10.20.10']);
 
         $this->assertAllowed($allowedClient, '/secured-by-one-ip');
         $this->assertRestricted($barredClient, '/secured-by-one-ip');
@@ -69,9 +69,9 @@ public function testSecurityConfigurationForSingleIPAddress($config)
      */
     public function testSecurityConfigurationForMultipleIPAddresses($config)
     {
-        $allowedClientA = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array('REMOTE_ADDR' => '1.1.1.1'));
-        $allowedClientB = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array('REMOTE_ADDR' => '2.2.2.2'));
-        $barredClient = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array('REMOTE_ADDR' => '192.168.1.1'));
+        $allowedClientA = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => $config], ['REMOTE_ADDR' => '1.1.1.1']);
+        $allowedClientB = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => $config], ['REMOTE_ADDR' => '2.2.2.2']);
+        $barredClient = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => $config], ['REMOTE_ADDR' => '192.168.1.1']);
 
         $this->assertAllowed($allowedClientA, '/secured-by-two-ips');
         $this->assertAllowed($allowedClientB, '/secured-by-two-ips');
@@ -83,13 +83,13 @@ public function testSecurityConfigurationForMultipleIPAddresses($config)
      */
     public function testSecurityConfigurationForExpression($config)
     {
-        $allowedClient = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array('HTTP_USER_AGENT' => 'Firefox 1.0'));
+        $allowedClient = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => $config], ['HTTP_USER_AGENT' => 'Firefox 1.0']);
         $this->assertAllowed($allowedClient, '/protected-via-expression');
 
-        $barredClient = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array());
+        $barredClient = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => $config], []);
         $this->assertRestricted($barredClient, '/protected-via-expression');
 
-        $allowedClient = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => $config), array());
+        $allowedClient = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => $config], []);
 
         $allowedClient->request('GET', '/protected-via-expression');
         $form = $allowedClient->followRedirect()->selectButton('login')->form();
@@ -114,6 +114,6 @@ private function assertRestricted($client, $path)
 
     public function getConfigs()
     {
-        return array(array('config.yml'), array('routes_as_path.yml'));
+        return [['config.yml'], ['routes_as_path.yml']];
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php
index 97b0a559193c4..ddbfd629c8fb7 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php
@@ -53,29 +53,29 @@ public function testSwitchedUserExit()
 
     public function testSwitchUserStateless()
     {
-        $client = $this->createClient(array('test_case' => 'JsonLogin', 'root_config' => 'switchuser_stateless.yml'));
-        $client->request('POST', '/chk', array(), array(), array('HTTP_X_SWITCH_USER' => 'dunglas', 'CONTENT_TYPE' => 'application/json'), '{"user": {"login": "user_can_switch", "password": "test"}}');
+        $client = $this->createClient(['test_case' => 'JsonLogin', 'root_config' => 'switchuser_stateless.yml']);
+        $client->request('POST', '/chk', [], [], ['HTTP_X_SWITCH_USER' => 'dunglas', 'CONTENT_TYPE' => 'application/json'], '{"user": {"login": "user_can_switch", "password": "test"}}');
         $response = $client->getResponse();
 
         $this->assertInstanceOf(JsonResponse::class, $response);
         $this->assertSame(200, $response->getStatusCode());
-        $this->assertSame(array('message' => 'Welcome @dunglas!'), json_decode($response->getContent(), true));
+        $this->assertSame(['message' => 'Welcome @dunglas!'], json_decode($response->getContent(), true));
         $this->assertSame('dunglas', $client->getProfile()->getCollector('security')->getUser());
     }
 
     public function getTestParameters()
     {
-        return array(
-            'unauthorized_user_cannot_switch' => array('user_cannot_switch_1', 'user_cannot_switch_1', 'user_cannot_switch_1', 403),
-            'authorized_user_can_switch' => array('user_can_switch', 'user_cannot_switch_1', 'user_cannot_switch_1', 200),
-            'authorized_user_cannot_switch_to_non_existent' => array('user_can_switch', 'user_does_not_exist', 'user_can_switch', 500),
-            'authorized_user_can_switch_to_himself' => array('user_can_switch', 'user_can_switch', 'user_can_switch', 200),
-        );
+        return [
+            'unauthorized_user_cannot_switch' => ['user_cannot_switch_1', 'user_cannot_switch_1', 'user_cannot_switch_1', 403],
+            'authorized_user_can_switch' => ['user_can_switch', 'user_cannot_switch_1', 'user_cannot_switch_1', 200],
+            'authorized_user_cannot_switch_to_non_existent' => ['user_can_switch', 'user_does_not_exist', 'user_can_switch', 500],
+            'authorized_user_can_switch_to_himself' => ['user_can_switch', 'user_can_switch', 'user_can_switch', 200],
+        ];
     }
 
     protected function createAuthenticatedClient($username)
     {
-        $client = $this->createClient(array('test_case' => 'StandardFormLogin', 'root_config' => 'switchuser.yml'));
+        $client = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => 'switchuser.yml']);
         $client->followRedirects(true);
 
         $form = $client->request('GET', '/login')->selectButton('login')->form();
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
index 659260ff6bdbe..65ebc88c938b2 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
@@ -32,12 +32,12 @@ class UserPasswordEncoderCommandTest extends WebTestCase
 
     public function testEncodePasswordEmptySalt()
     {
-        $this->passwordEncoderCommandTester->execute(array(
+        $this->passwordEncoderCommandTester->execute([
             'command' => 'security:encode-password',
             'password' => 'password',
             'user-class' => 'Symfony\Component\Security\Core\User\User',
             '--empty-salt' => true,
-        ), array('decorated' => false));
+        ], ['decorated' => false]);
         $expected = str_replace("\n", PHP_EOL, file_get_contents(__DIR__.'/app/PasswordEncode/emptysalt.txt'));
 
         $this->assertEquals($expected, $this->passwordEncoderCommandTester->getDisplay());
@@ -45,9 +45,9 @@ public function testEncodePasswordEmptySalt()
 
     public function testEncodeNoPasswordNoInteraction()
     {
-        $statusCode = $this->passwordEncoderCommandTester->execute(array(
+        $statusCode = $this->passwordEncoderCommandTester->execute([
             'command' => 'security:encode-password',
-        ), array('interactive' => false));
+        ], ['interactive' => false]);
 
         $this->assertContains('[ERROR] The password must not be empty.', $this->passwordEncoderCommandTester->getDisplay());
         $this->assertEquals($statusCode, 1);
@@ -55,11 +55,11 @@ public function testEncodeNoPasswordNoInteraction()
 
     public function testEncodePasswordBcrypt()
     {
-        $this->passwordEncoderCommandTester->execute(array(
+        $this->passwordEncoderCommandTester->execute([
             'command' => 'security:encode-password',
             'password' => 'password',
             'user-class' => 'Custom\Class\Bcrypt\User',
-        ), array('interactive' => false));
+        ], ['interactive' => false]);
 
         $output = $this->passwordEncoderCommandTester->getDisplay();
         $this->assertContains('Password encoding succeeded', $output);
@@ -76,11 +76,11 @@ public function testEncodePasswordArgon2i()
             $this->markTestSkipped('Argon2i algorithm not available.');
         }
         $this->setupArgon2i();
-        $this->passwordEncoderCommandTester->execute(array(
+        $this->passwordEncoderCommandTester->execute([
             'command' => 'security:encode-password',
             'password' => 'password',
             'user-class' => 'Custom\Class\Argon2i\User',
-        ), array('interactive' => false));
+        ], ['interactive' => false]);
 
         $output = $this->passwordEncoderCommandTester->getDisplay();
         $this->assertContains('Password encoding succeeded', $output);
@@ -93,11 +93,11 @@ public function testEncodePasswordArgon2i()
 
     public function testEncodePasswordPbkdf2()
     {
-        $this->passwordEncoderCommandTester->execute(array(
+        $this->passwordEncoderCommandTester->execute([
             'command' => 'security:encode-password',
             'password' => 'password',
             'user-class' => 'Custom\Class\Pbkdf2\User',
-        ), array('interactive' => false));
+        ], ['interactive' => false]);
 
         $output = $this->passwordEncoderCommandTester->getDisplay();
         $this->assertContains('Password encoding succeeded', $output);
@@ -113,10 +113,10 @@ public function testEncodePasswordPbkdf2()
     public function testEncodePasswordOutput()
     {
         $this->passwordEncoderCommandTester->execute(
-            array(
+            [
                 'command' => 'security:encode-password',
                 'password' => 'p@ssw0rd',
-            ), array('interactive' => false)
+            ], ['interactive' => false]
         );
 
         $this->assertContains('Password encoding succeeded', $this->passwordEncoderCommandTester->getDisplay());
@@ -127,12 +127,12 @@ public function testEncodePasswordOutput()
     public function testEncodePasswordEmptySaltOutput()
     {
         $this->passwordEncoderCommandTester->execute(
-            array(
+            [
                 'command' => 'security:encode-password',
                 'password' => 'p@ssw0rd',
                 'user-class' => 'Symfony\Component\Security\Core\User\User',
                 '--empty-salt' => true,
-            )
+            ]
         );
 
         $this->assertContains('Password encoding succeeded', $this->passwordEncoderCommandTester->getDisplay());
@@ -142,11 +142,11 @@ public function testEncodePasswordEmptySaltOutput()
 
     public function testEncodePasswordBcryptOutput()
     {
-        $this->passwordEncoderCommandTester->execute(array(
+        $this->passwordEncoderCommandTester->execute([
             'command' => 'security:encode-password',
             'password' => 'p@ssw0rd',
             'user-class' => 'Custom\Class\Bcrypt\User',
-        ), array('interactive' => false));
+        ], ['interactive' => false]);
 
         $this->assertNotContains(' Generated salt ', $this->passwordEncoderCommandTester->getDisplay());
     }
@@ -158,11 +158,11 @@ public function testEncodePasswordArgon2iOutput()
         }
 
         $this->setupArgon2i();
-        $this->passwordEncoderCommandTester->execute(array(
+        $this->passwordEncoderCommandTester->execute([
             'command' => 'security:encode-password',
             'password' => 'p@ssw0rd',
             'user-class' => 'Custom\Class\Argon2i\User',
-        ), array('interactive' => false));
+        ], ['interactive' => false]);
 
         $this->assertNotContains(' Generated salt ', $this->passwordEncoderCommandTester->getDisplay());
     }
@@ -176,20 +176,20 @@ public function testEncodePasswordNoConfigForGivenUserClass()
             $this->setExpectedException('\RuntimeException', 'No encoder has been configured for account "Foo\Bar\User".');
         }
 
-        $this->passwordEncoderCommandTester->execute(array(
+        $this->passwordEncoderCommandTester->execute([
             'command' => 'security:encode-password',
             'password' => 'password',
             'user-class' => 'Foo\Bar\User',
-        ), array('interactive' => false));
+        ], ['interactive' => false]);
     }
 
     public function testEncodePasswordAsksNonProvidedUserClass()
     {
-        $this->passwordEncoderCommandTester->setInputs(array('Custom\Class\Pbkdf2\User', "\n"));
-        $this->passwordEncoderCommandTester->execute(array(
+        $this->passwordEncoderCommandTester->setInputs(['Custom\Class\Pbkdf2\User', "\n"]);
+        $this->passwordEncoderCommandTester->execute([
             'command' => 'security:encode-password',
             'password' => 'password',
-        ), array('decorated' => false));
+        ], ['decorated' => false]);
 
         $this->assertContains(<<<EOTXT
  For which user class would you like to encode a password? [Custom\Class\Bcrypt\User]:
@@ -203,10 +203,10 @@ public function testEncodePasswordAsksNonProvidedUserClass()
 
     public function testNonInteractiveEncodePasswordUsesFirstUserClass()
     {
-        $this->passwordEncoderCommandTester->execute(array(
+        $this->passwordEncoderCommandTester->execute([
             'command' => 'security:encode-password',
             'password' => 'password',
-        ), array('interactive' => false));
+        ], ['interactive' => false]);
 
         $this->assertContains('Encoder used       Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder', $this->passwordEncoderCommandTester->getDisplay());
     }
@@ -218,15 +218,15 @@ public function testNonInteractiveEncodePasswordUsesFirstUserClass()
     public function testThrowsExceptionOnNoConfiguredEncoders()
     {
         $application = new ConsoleApplication();
-        $application->add(new UserPasswordEncoderCommand($this->getMockBuilder(EncoderFactoryInterface::class)->getMock(), array()));
+        $application->add(new UserPasswordEncoderCommand($this->getMockBuilder(EncoderFactoryInterface::class)->getMock(), []));
 
         $passwordEncoderCommand = $application->find('security:encode-password');
 
         $tester = new CommandTester($passwordEncoderCommand);
-        $tester->execute(array(
+        $tester->execute([
             'command' => 'security:encode-password',
             'password' => 'password',
-        ), array('interactive' => false));
+        ], ['interactive' => false]);
     }
 
     /**
@@ -254,7 +254,7 @@ public function testLegacy()
     protected function setUp()
     {
         putenv('COLUMNS='.(119 + \strlen(PHP_EOL)));
-        $kernel = $this->createKernel(array('test_case' => 'PasswordEncode'));
+        $kernel = $this->createKernel(['test_case' => 'PasswordEncode']);
         $kernel->boot();
 
         $application = new Application($kernel);
@@ -272,7 +272,7 @@ protected function tearDown()
     private function setupArgon2i()
     {
         putenv('COLUMNS='.(119 + \strlen(PHP_EOL)));
-        $kernel = $this->createKernel(array('test_case' => 'PasswordEncode', 'root_config' => 'argon2i.yml'));
+        $kernel = $this->createKernel(['test_case' => 'PasswordEncode', 'root_config' => 'argon2i.yml']);
         $kernel->boot();
 
         $application = new Application($kernel);
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php
index 82c8ad4aa6c60..a57cf0b2e81e8 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php
@@ -92,7 +92,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
 
     public function serialize()
     {
-        return serialize(array($this->varDir, $this->testCase, $this->rootConfig, $this->getEnvironment(), $this->isDebug()));
+        return serialize([$this->varDir, $this->testCase, $this->rootConfig, $this->getEnvironment(), $this->isDebug()]);
     }
 
     public function unserialize($str)
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AutowiringTypes/bundles.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AutowiringTypes/bundles.php
index 68e5afb125f85..535a4bf517b80 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AutowiringTypes/bundles.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AutowiringTypes/bundles.php
@@ -9,8 +9,8 @@
  * file that was distributed with this source code.
  */
 
-return array(
+return [
     new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
     new Symfony\Bundle\SecurityBundle\SecurityBundle(),
     new Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\AutowiringBundle\AutowiringBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/bundles.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/bundles.php
index c16ab12f65850..65a38200e759c 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/bundles.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/bundles.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-return array(
+return [
     new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
     new Symfony\Bundle\SecurityBundle\SecurityBundle(),
     new Symfony\Bundle\TwigBundle\TwigBundle(),
     new Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBundle\CsrfFormLoginBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/FirewallEntryPoint/bundles.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/FirewallEntryPoint/bundles.php
index 412e1c5d09e1d..7928a468da7f6 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/FirewallEntryPoint/bundles.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/FirewallEntryPoint/bundles.php
@@ -9,8 +9,8 @@
  * file that was distributed with this source code.
  */
 
-return array(
+return [
     new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
     new Symfony\Bundle\SecurityBundle\SecurityBundle(),
     new Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FirewallEntryPointBundle\FirewallEntryPointBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/JsonLogin/bundles.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/JsonLogin/bundles.php
index 470ffff088cd9..7dbd6e438072f 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/JsonLogin/bundles.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/JsonLogin/bundles.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-return array(
+return [
     new Symfony\Bundle\SecurityBundle\SecurityBundle(),
     new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
     new Symfony\Bundle\TwigBundle\TwigBundle(),
     new Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\JsonLoginBundle\JsonLoginBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/LogoutAccess/bundles.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/LogoutAccess/bundles.php
index c934b52aee7c0..9a26fb163a77d 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/LogoutAccess/bundles.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/LogoutAccess/bundles.php
@@ -12,7 +12,7 @@
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
 
-return array(
+return [
     new FrameworkBundle(),
     new SecurityBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/LogoutWithoutSessionInvalidation/bundles.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/LogoutWithoutSessionInvalidation/bundles.php
index c934b52aee7c0..9a26fb163a77d 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/LogoutWithoutSessionInvalidation/bundles.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/LogoutWithoutSessionInvalidation/bundles.php
@@ -12,7 +12,7 @@
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
 
-return array(
+return [
     new FrameworkBundle(),
     new SecurityBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/bundles.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/bundles.php
index 2e9243712c8d6..bcfd17425cfd1 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/bundles.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/bundles.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-return array(
+return [
     new Symfony\Bundle\SecurityBundle\SecurityBundle(),
     new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/RememberMeLogout/bundles.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/RememberMeLogout/bundles.php
index c934b52aee7c0..9a26fb163a77d 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/RememberMeLogout/bundles.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/RememberMeLogout/bundles.php
@@ -12,7 +12,7 @@
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
 
-return array(
+return [
     new FrameworkBundle(),
     new SecurityBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SecurityHelper/bundles.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SecurityHelper/bundles.php
index 05df5ef6802ff..181618ba99e45 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SecurityHelper/bundles.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SecurityHelper/bundles.php
@@ -13,8 +13,8 @@
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
 use Symfony\Bundle\TwigBundle\TwigBundle;
 
-return array(
+return [
     new FrameworkBundle(),
     new SecurityBundle(),
     new TwigBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/bundles.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/bundles.php
index 3424c1eed1abd..95041e7ad465e 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/bundles.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/bundles.php
@@ -14,9 +14,9 @@
 use Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\FormLoginBundle;
 use Symfony\Bundle\TwigBundle\TwigBundle;
 
-return array(
+return [
     new FrameworkBundle(),
     new SecurityBundle(),
     new TwigBundle(),
     new FormLoginBundle(),
-);
+];
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallConfigTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallConfigTest.php
index 4abf33e276694..99e897aa8ff20 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallConfigTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallConfigTest.php
@@ -18,8 +18,8 @@ class FirewallConfigTest extends TestCase
 {
     public function testGetters()
     {
-        $listeners = array('logout', 'remember_me', 'anonymous');
-        $options = array(
+        $listeners = ['logout', 'remember_me', 'anonymous'];
+        $options = [
             'request_matcher' => 'foo_request_matcher',
             'security' => false,
             'stateless' => false,
@@ -29,8 +29,8 @@ public function testGetters()
             'access_denied_url' => 'foo_access_denied_url',
             'access_denied_handler' => 'foo_access_denied_handler',
             'user_checker' => 'foo_user_checker',
-            'switch_user' => array('provider' => null, 'parameter' => '_switch_user', 'role' => 'ROLE_ALLOWED_TO_SWITCH'),
-        );
+            'switch_user' => ['provider' => null, 'parameter' => '_switch_user', 'role' => 'ROLE_ALLOWED_TO_SWITCH'],
+        ];
 
         $config = new FirewallConfig(
             'foo_firewall',
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallContextTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallContextTest.php
index 8466d9f06f702..7fddc6744d580 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallContextTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallContextTest.php
@@ -25,12 +25,12 @@ public function testGetters()
         $config = new FirewallConfig('main', 'user_checker', 'request_matcher');
         $exceptionListener = $this->getExceptionListenerMock();
         $logoutListener = $this->getLogoutListenerMock();
-        $listeners = array(
+        $listeners = [
             $this
                 ->getMockBuilder(ListenerInterface::class)
                 ->disableOriginalConstructor()
                 ->getMock(),
-        );
+        ];
 
         $context = new FirewallContext($listeners, $exceptionListener, $logoutListener, $config);
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php
index 76a0db23e916f..365e64572b0ef 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php
@@ -31,13 +31,13 @@ public function testGetListenersWithEmptyMap()
     {
         $request = new Request();
 
-        $map = array();
+        $map = [];
         $container = $this->getMockBuilder(Container::class)->getMock();
         $container->expects($this->never())->method('get');
 
         $firewallMap = new FirewallMap($container, $map);
 
-        $this->assertEquals(array(array(), null, null), $firewallMap->getListeners($request));
+        $this->assertEquals([[], null, null], $firewallMap->getListeners($request));
         $this->assertNull($firewallMap->getFirewallConfig($request));
         $this->assertFalse($request->attributes->has(self::ATTRIBUTE_FIREWALL_CONTEXT));
     }
@@ -47,13 +47,13 @@ public function testGetListenersWithInvalidParameter()
         $request = new Request();
         $request->attributes->set(self::ATTRIBUTE_FIREWALL_CONTEXT, 'foo');
 
-        $map = array();
+        $map = [];
         $container = $this->getMockBuilder(Container::class)->getMock();
         $container->expects($this->never())->method('get');
 
         $firewallMap = new FirewallMap($container, $map);
 
-        $this->assertEquals(array(array(), null, null), $firewallMap->getListeners($request));
+        $this->assertEquals([[], null, null], $firewallMap->getListeners($request));
         $this->assertNull($firewallMap->getFirewallConfig($request));
         $this->assertFalse($request->attributes->has(self::ATTRIBUTE_FIREWALL_CONTEXT));
     }
@@ -68,7 +68,7 @@ public function testGetListeners()
         $firewallContext->expects($this->once())->method('getConfig')->willReturn($firewallConfig);
 
         $listener = $this->getMockBuilder(ListenerInterface::class)->getMock();
-        $firewallContext->expects($this->once())->method('getListeners')->willReturn(array($listener));
+        $firewallContext->expects($this->once())->method('getListeners')->willReturn([$listener]);
 
         $exceptionListener = $this->getMockBuilder(ExceptionListener::class)->disableOriginalConstructor()->getMock();
         $firewallContext->expects($this->once())->method('getExceptionListener')->willReturn($exceptionListener);
@@ -85,9 +85,9 @@ public function testGetListeners()
         $container = $this->getMockBuilder(Container::class)->getMock();
         $container->expects($this->exactly(2))->method('get')->willReturn($firewallContext);
 
-        $firewallMap = new FirewallMap($container, array('security.firewall.map.context.foo' => $matcher));
+        $firewallMap = new FirewallMap($container, ['security.firewall.map.context.foo' => $matcher]);
 
-        $this->assertEquals(array(array($listener), $exceptionListener, $logoutListener), $firewallMap->getListeners($request));
+        $this->assertEquals([[$listener], $exceptionListener, $logoutListener], $firewallMap->getListeners($request));
         $this->assertEquals($firewallConfig, $firewallMap->getFirewallConfig($request));
         $this->assertEquals('security.firewall.map.context.foo', $request->attributes->get(self::ATTRIBUTE_FIREWALL_CONTEXT));
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/SecurityUserValueResolverTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/SecurityUserValueResolverTest.php
index c479e62c2e36e..90f31f0b31902 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/SecurityUserValueResolverTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/SecurityUserValueResolverTest.php
@@ -66,7 +66,7 @@ public function testResolve()
         $metadata = new ArgumentMetadata('foo', UserInterface::class, false, false, null);
 
         $this->assertTrue($resolver->supports(Request::create('/'), $metadata));
-        $this->assertSame(array($user), iterator_to_array($resolver->resolve(Request::create('/'), $metadata)));
+        $this->assertSame([$user], iterator_to_array($resolver->resolve(Request::create('/'), $metadata)));
     }
 
     public function testIntegration()
@@ -77,8 +77,8 @@ public function testIntegration()
         $tokenStorage = new TokenStorage();
         $tokenStorage->setToken($token);
 
-        $argumentResolver = new ArgumentResolver(null, array(new SecurityUserValueResolver($tokenStorage)));
-        $this->assertSame(array($user), $argumentResolver->getArguments(Request::create('/'), function (UserInterface $user) {}));
+        $argumentResolver = new ArgumentResolver(null, [new SecurityUserValueResolver($tokenStorage)]);
+        $this->assertSame([$user], $argumentResolver->getArguments(Request::create('/'), function (UserInterface $user) {}));
     }
 
     public function testIntegrationNoUser()
@@ -87,8 +87,8 @@ public function testIntegrationNoUser()
         $tokenStorage = new TokenStorage();
         $tokenStorage->setToken($token);
 
-        $argumentResolver = new ArgumentResolver(null, array(new SecurityUserValueResolver($tokenStorage), new DefaultValueResolver()));
-        $this->assertSame(array(null), $argumentResolver->getArguments(Request::create('/'), function (UserInterface $user = null) {}));
+        $argumentResolver = new ArgumentResolver(null, [new SecurityUserValueResolver($tokenStorage), new DefaultValueResolver()]);
+        $this->assertSame([null], $argumentResolver->getArguments(Request::create('/'), function (UserInterface $user = null) {}));
     }
 }
 
diff --git a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php
index 00964322e95e3..03233c59859c3 100644
--- a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php
+++ b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php
@@ -37,7 +37,7 @@ class TemplateCacheCacheWarmer implements CacheWarmerInterface, ServiceSubscribe
     /**
      * @param array $paths Additional twig paths to warm
      */
-    public function __construct(ContainerInterface $container, TemplateFinderInterface $finder = null, array $paths = array())
+    public function __construct(ContainerInterface $container, TemplateFinderInterface $finder = null, array $paths = [])
     {
         // We don't inject the Twig environment directly as it depends on the
         // template locator (via the loader) which might be a cached one.
@@ -96,9 +96,9 @@ public function isOptional()
      */
     public static function getSubscribedServices()
     {
-        return array(
+        return [
             'twig' => Environment::class,
-        );
+        ];
     }
 
     /**
@@ -112,10 +112,10 @@ public static function getSubscribedServices()
     private function findTemplatesInFolder($namespace, $dir)
     {
         if (!is_dir($dir)) {
-            return array();
+            return [];
         }
 
-        $templates = array();
+        $templates = [];
         $finder = new Finder();
 
         foreach ($finder->files()->followLinks()->in($dir) as $file) {
diff --git a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
index 65867ffa97853..874bed33e9ff9 100644
--- a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
+++ b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
@@ -81,8 +81,8 @@ public function isOptional()
      */
     public static function getSubscribedServices()
     {
-        return array(
+        return [
             'twig' => Environment::class,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
index a74a54c4d4def..ff47c3d2bab42 100644
--- a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
+++ b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
@@ -61,14 +61,14 @@ public function showAction(Request $request, FlattenException $exception, DebugL
 
         return new Response($this->twig->render(
             (string) $this->findTemplate($request, $request->getRequestFormat(), $code, $showException),
-            array(
+            [
                 'status_code' => $code,
                 'status_text' => isset(Response::$statusTexts[$code]) ? Response::$statusTexts[$code] : '',
                 'exception' => $exception,
                 'logger' => $logger,
                 'currentContent' => $currentContent,
-            )
-        ), 200, array('Content-Type' => $request->getMimeType($request->getRequestFormat()) ?: 'text/html'));
+            ]
+        ), 200, ['Content-Type' => $request->getMimeType($request->getRequestFormat()) ?: 'text/html']);
     }
 
     /**
diff --git a/src/Symfony/Bundle/TwigBundle/Controller/PreviewErrorController.php b/src/Symfony/Bundle/TwigBundle/Controller/PreviewErrorController.php
index a8b25adcf0162..c529cfbb46d83 100644
--- a/src/Symfony/Bundle/TwigBundle/Controller/PreviewErrorController.php
+++ b/src/Symfony/Bundle/TwigBundle/Controller/PreviewErrorController.php
@@ -43,13 +43,13 @@ public function previewErrorPageAction(Request $request, $code)
          * the additional "showException" flag.
          */
 
-        $subRequest = $request->duplicate(null, null, array(
+        $subRequest = $request->duplicate(null, null, [
             '_controller' => $this->controller,
             'exception' => $exception,
             'logger' => null,
             'format' => $request->getRequestFormat(),
             'showException' => false,
-        ));
+        ]);
 
         return $this->kernel->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
     }
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
index 5089fc0651b91..79a6ad9ae8505 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -45,7 +45,7 @@ public function process(ContainerBuilder $container)
             $reflClass = new \ReflectionClass('Symfony\Bridge\Twig\Extension\FormExtension');
 
             $coreThemePath = \dirname(\dirname($reflClass->getFileName())).'/Resources/views/Form';
-            $container->getDefinition('twig.loader.native_filesystem')->addMethodCall('addPath', array($coreThemePath));
+            $container->getDefinition('twig.loader.native_filesystem')->addMethodCall('addPath', [$coreThemePath]);
 
             $paths = $container->getDefinition('twig.template_iterator')->getArgument(2);
             $paths[$coreThemePath] = null;
@@ -67,9 +67,9 @@ public function process(ContainerBuilder $container)
             $container->getDefinition('twig.runtime.httpkernel')->addTag('twig.runtime');
 
             // inject Twig in the hinclude service if Twig is the only registered templating engine
-            if ((!$container->hasParameter('templating.engines') || array('twig') == $container->getParameter('templating.engines')) && $container->hasDefinition('fragment.renderer.hinclude')) {
+            if ((!$container->hasParameter('templating.engines') || ['twig'] == $container->getParameter('templating.engines')) && $container->hasDefinition('fragment.renderer.hinclude')) {
                 $container->getDefinition('fragment.renderer.hinclude')
-                    ->addTag('kernel.fragment_renderer', array('alias' => 'hinclude'))
+                    ->addTag('kernel.fragment_renderer', ['alias' => 'hinclude'])
                     ->replaceArgument(0, new Reference('twig'))
                 ;
             }
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php
index bd6393bc9ceac..82cf1c145a312 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php
@@ -28,7 +28,7 @@ public function process(ContainerBuilder $container)
         }
 
         $definition = $container->getDefinition('twig.runtime_loader');
-        $mapping = array();
+        $mapping = [];
         foreach ($container->findTaggedServiceIds('twig.runtime', true) as $id => $attributes) {
             $def = $container->getDefinition($id);
             $mapping[$def->getClass()] = new Reference($id);
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
index 3fc2696904be2..51b6d9b4f022f 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
@@ -29,7 +29,7 @@ public function process(ContainerBuilder $container)
             return;
         }
 
-        $prioritizedLoaders = array();
+        $prioritizedLoaders = [];
         $found = 0;
 
         foreach ($container->findTaggedServiceIds('twig.loader', true) as $id => $attributes) {
@@ -50,7 +50,7 @@ public function process(ContainerBuilder $container)
 
             foreach ($prioritizedLoaders as $loaders) {
                 foreach ($loaders as $loader) {
-                    $chainLoader->addMethodCall('addLoader', array(new Reference($loader)));
+                    $chainLoader->addMethodCall('addLoader', [new Reference($loader)]);
                 }
             }
 
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
index bfe4047b83687..ca5d231218b00 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
@@ -74,7 +74,7 @@ private function addGlobalsSection(ArrayNodeDefinition $rootNode)
                 ->arrayNode('globals')
                     ->normalizeKeys(false)
                     ->useAttributeAsKey('key')
-                    ->example(array('foo' => '"@bar"', 'pi' => 3.14))
+                    ->example(['foo' => '"@bar"', 'pi' => 3.14])
                     ->prototype('array')
                         ->beforeNormalization()
                             ->ifTrue(function ($v) { return \is_string($v) && 0 === strpos($v, '@'); })
@@ -83,7 +83,7 @@ private function addGlobalsSection(ArrayNodeDefinition $rootNode)
                                     return substr($v, 1);
                                 }
 
-                                return array('id' => substr($v, 1), 'type' => 'service');
+                                return ['id' => substr($v, 1), 'type' => 'service'];
                             })
                         ->end()
                         ->beforeNormalization()
@@ -92,18 +92,18 @@ private function addGlobalsSection(ArrayNodeDefinition $rootNode)
                                     $keys = array_keys($v);
                                     sort($keys);
 
-                                    return $keys !== array('id', 'type') && $keys !== array('value');
+                                    return $keys !== ['id', 'type'] && $keys !== ['value'];
                                 }
 
                                 return true;
                             })
-                            ->then(function ($v) { return array('value' => $v); })
+                            ->then(function ($v) { return ['value' => $v]; })
                         ->end()
                         ->children()
                             ->scalarNode('id')->end()
                             ->scalarNode('type')
                                 ->validate()
-                                    ->ifNotInArray(array('service'))
+                                    ->ifNotInArray(['service'])
                                     ->thenInvalid('The %s type is not supported')
                                 ->end()
                             ->end()
@@ -140,7 +140,7 @@ private function addTwigOptions(ArrayNodeDefinition $rootNode)
                     ->beforeNormalization()
                         ->always()
                         ->then(function ($paths) {
-                            $normalized = array();
+                            $normalized = [];
                             foreach ($paths as $path => $namespace) {
                                 if (\is_array($namespace)) {
                                     // xml
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
index ed4f46c0b6407..defd65716928f 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -65,10 +65,10 @@ public function load(array $configs, ContainerBuilder $container)
             if (isset($config['globals'])) {
                 foreach ($config['globals'] as $name => $value) {
                     if (\is_array($value) && isset($value['key'])) {
-                        $configs[$key]['globals'][$name] = array(
+                        $configs[$key]['globals'][$name] = [
                             'key' => $name,
                             'value' => $value,
-                        );
+                        ];
                     }
                 }
             }
@@ -96,9 +96,9 @@ public function load(array $configs, ContainerBuilder $container)
         // register user-configured paths
         foreach ($config['paths'] as $path => $namespace) {
             if (!$namespace) {
-                $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($path));
+                $twigFilesystemLoaderDefinition->addMethodCall('addPath', [$path]);
             } else {
-                $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($path, $namespace));
+                $twigFilesystemLoaderDefinition->addMethodCall('addPath', [$path, $namespace]);
             }
         }
 
@@ -143,9 +143,9 @@ public function load(array $configs, ContainerBuilder $container)
             $def = $container->getDefinition('twig');
             foreach ($config['globals'] as $key => $global) {
                 if (isset($global['type']) && 'service' === $global['type']) {
-                    $def->addMethodCall('addGlobal', array($key, new Reference($global['id'])));
+                    $def->addMethodCall('addGlobal', [$key, new Reference($global['id'])]);
                 } else {
-                    $def->addMethodCall('addGlobal', array($key, $global['value']));
+                    $def->addMethodCall('addGlobal', [$key, $global['value']]);
                 }
             }
         }
@@ -157,7 +157,7 @@ public function load(array $configs, ContainerBuilder $container)
         );
 
         if (isset($config['autoescape_service']) && isset($config['autoescape_service_method'])) {
-            $config['autoescape'] = array(new Reference($config['autoescape_service']), $config['autoescape_service_method']);
+            $config['autoescape'] = [new Reference($config['autoescape_service']), $config['autoescape_service_method']];
         }
         unset($config['autoescape_service'], $config['autoescape_service_method']);
 
diff --git a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
index a938cb01d9e05..61dadacc670fc 100644
--- a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
+++ b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
@@ -33,7 +33,7 @@ class FilesystemLoader extends BaseFilesystemLoader
      */
     public function __construct(FileLocatorInterface $locator, TemplateNameParserInterface $parser, $rootPath = null)
     {
-        parent::__construct(array(), $rootPath);
+        parent::__construct([], $rootPath);
 
         $this->locator = $locator;
         $this->parser = $parser;
diff --git a/src/Symfony/Bundle/TwigBundle/TemplateIterator.php b/src/Symfony/Bundle/TwigBundle/TemplateIterator.php
index 01262e015ba75..72db91c54ddac 100644
--- a/src/Symfony/Bundle/TwigBundle/TemplateIterator.php
+++ b/src/Symfony/Bundle/TwigBundle/TemplateIterator.php
@@ -52,7 +52,7 @@ public function getIterator()
 
         $this->templates = array_merge(
             $this->findTemplatesInDirectory($this->rootDir.'/Resources/views'),
-            $this->findTemplatesInDirectory($this->defaultPath, null, array('bundles'))
+            $this->findTemplatesInDirectory($this->defaultPath, null, ['bundles'])
         );
         foreach ($this->kernel->getBundles() as $bundle) {
             $name = $bundle->getName();
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php
index c58cf686f0b0c..800da68c9b2f6 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php
@@ -22,7 +22,7 @@ class ExceptionControllerTest extends TestCase
 {
     public function testShowActionCanBeForcedToShowErrorPage()
     {
-        $twig = $this->createTwigEnv(array('@Twig/Exception/error404.html.twig' => '<html>not found</html>'));
+        $twig = $this->createTwigEnv(['@Twig/Exception/error404.html.twig' => '<html>not found</html>']);
 
         $request = $this->createRequest('html');
         $request->attributes->set('showException', false);
@@ -37,7 +37,7 @@ public function testShowActionCanBeForcedToShowErrorPage()
 
     public function testFallbackToHtmlIfNoTemplateForRequestedFormat()
     {
-        $twig = $this->createTwigEnv(array('@Twig/Exception/error.html.twig' => '<html></html>'));
+        $twig = $this->createTwigEnv(['@Twig/Exception/error.html.twig' => '<html></html>']);
 
         $request = $this->createRequest('txt');
         $exception = FlattenException::create(new \Exception());
@@ -50,7 +50,7 @@ public function testFallbackToHtmlIfNoTemplateForRequestedFormat()
 
     public function testFallbackToHtmlWithFullExceptionIfNoTemplateForRequestedFormatAndExceptionsShouldBeShown()
     {
-        $twig = $this->createTwigEnv(array('@Twig/Exception/exception_full.html.twig' => '<html></html>'));
+        $twig = $this->createTwigEnv(['@Twig/Exception/exception_full.html.twig' => '<html></html>']);
 
         $request = $this->createRequest('txt');
         $request->attributes->set('showException', true);
@@ -64,7 +64,7 @@ public function testFallbackToHtmlWithFullExceptionIfNoTemplateForRequestedForma
 
     public function testResponseHasRequestedMimeType()
     {
-        $twig = $this->createTwigEnv(array('@Twig/Exception/error.json.twig' => '{}'));
+        $twig = $this->createTwigEnv(['@Twig/Exception/error.json.twig' => '{}']);
 
         $request = $this->createRequest('json');
         $exception = FlattenException::create(new \Exception());
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/ExtensionPassTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/ExtensionPassTest.php
index 00c2217f07b3a..539a952a607ab 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/ExtensionPassTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/ExtensionPassTest.php
@@ -30,12 +30,12 @@ public function testProcessDoesNotDropExistingFileLoaderMethodCalls()
         $container->register('twig.extension.expression');
 
         $nativeTwigLoader = new Definition('\Twig\Loader\FilesystemLoader');
-        $nativeTwigLoader->addMethodCall('addPath', array());
+        $nativeTwigLoader->addMethodCall('addPath', []);
         $container->setDefinition('twig.loader.native_filesystem', $nativeTwigLoader);
 
         $filesystemLoader = new Definition('\Symfony\Bundle\TwigBundle\Loader\FilesystemLoader');
-        $filesystemLoader->setArguments(array(null, null, null));
-        $filesystemLoader->addMethodCall('addPath', array());
+        $filesystemLoader->setArguments([null, null, null]);
+        $filesystemLoader->addMethodCall('addPath', []);
         $container->setDefinition('twig.loader.filesystem', $filesystemLoader);
 
         $extensionPass = new ExtensionPass();
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php
index 621967a596dfd..3b65273d6d731 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php
@@ -72,9 +72,9 @@ public function testMapperPassWithTwoTaggedLoadersWithPriority()
     {
         $this->builder->setDefinition('twig.loader.chain', $this->chainLoader);
         $this->builder->register('test_loader_1')
-            ->addTag('twig.loader', array('priority' => 100));
+            ->addTag('twig.loader', ['priority' => 100]);
         $this->builder->register('test_loader_2')
-            ->addTag('twig.loader', array('priority' => 200));
+            ->addTag('twig.loader', ['priority' => 200]);
 
         $this->pass->process($this->builder);
 
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php
index 47b9e5d835e7e..8dd2be40960b1 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php
@@ -1,15 +1,15 @@
 <?php
 
-$container->loadFromExtension('twig', array(
-    'form_themes' => array(
+$container->loadFromExtension('twig', [
+    'form_themes' => [
         'MyBundle::form.html.twig',
-    ),
-    'globals' => array(
+    ],
+    'globals' => [
         'foo' => '@bar',
         'baz' => '@@qux',
         'pi' => 3.14,
-        'bad' => array('key' => 'foo'),
-    ),
+        'bad' => ['key' => 'foo'],
+    ],
     'auto_reload' => true,
     'autoescape' => true,
     'base_template_class' => 'stdClass',
@@ -18,10 +18,10 @@
     'debug' => true,
     'strict_variables' => true,
     'default_path' => '%kernel.project_dir%/Fixtures/templates',
-    'paths' => array(
+    'paths' => [
         'path1',
         'path2',
         'namespaced_path1' => 'namespace1',
         'namespaced_path2' => 'namespace2',
-    ),
-));
+    ],
+]);
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
index 112d00d4f65c9..dd86529850caf 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -72,9 +72,9 @@ public function testLoadFullConfiguration($format)
         $this->assertEquals(3.14, $calls[4][1][1], '->load() registers variables as Twig globals');
 
         // Yaml and Php specific configs
-        if (\in_array($format, array('yml', 'php'))) {
+        if (\in_array($format, ['yml', 'php'])) {
             $this->assertEquals('bad', $calls[5][1][0], '->load() registers variables as Twig globals');
-            $this->assertEquals(array('key' => 'foo'), $calls[5][1][1], '->load() registers variables as Twig globals');
+            $this->assertEquals(['key' => 'foo'], $calls[5][1][1], '->load() registers variables as Twig globals');
         }
 
         // Twig options
@@ -99,7 +99,7 @@ public function testLoadCustomTemplateEscapingGuesserConfiguration($format)
         $this->compileContainer($container);
 
         $options = $container->getDefinition('twig')->getArgument(1);
-        $this->assertEquals(array(new Reference('my_project.some_bundle.template_escaping_guesser'), 'guess'), $options['autoescape']);
+        $this->assertEquals([new Reference('my_project.some_bundle.template_escaping_guesser'), 'guess'], $options['autoescape']);
     }
 
     /**
@@ -139,7 +139,7 @@ public function testLoadCustomDateFormats($fileFormat)
     public function testGlobalsWithDifferentTypesAndValues()
     {
         $globals = array(
-            'array' => array(),
+            'array' => [],
             'false' => false,
             'float' => 2.0,
             'integer' => 3,
@@ -265,7 +265,7 @@ public function testRuntimeLoader()
         $container->register('templating.name_parser', 'FooClass');
         $container->register('foo', '%foo%')->addTag('twig.runtime');
         $container->addCompilerPass(new RuntimeLoaderPass(), PassConfig::TYPE_BEFORE_REMOVING);
-        $container->getCompilerPassConfig()->setRemovingPasses(array());
+        $container->getCompilerPassConfig()->setRemovingPasses([]);
         $container->compile();
 
         $loader = $container->getDefinition('twig.runtime_loader');
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Functional/EmptyAppTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Functional/EmptyAppTest.php
index b25d6ad6502e8..86d933b558220 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/Functional/EmptyAppTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/Functional/EmptyAppTest.php
@@ -32,7 +32,7 @@ class EmptyAppKernel extends Kernel
 {
     public function registerBundles()
     {
-        return array(new TwigBundle());
+        return [new TwigBundle()];
     }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php b/src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php
index 04eb5e1878384..33a873dba88d7 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php
@@ -22,22 +22,22 @@ public function testGetIterator()
         $bundle->expects($this->any())->method('getPath')->will($this->returnValue(__DIR__.'/Fixtures/templates/BarBundle'));
 
         $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\Kernel')->disableOriginalConstructor()->getMock();
-        $kernel->expects($this->any())->method('getBundles')->will($this->returnValue(array(
+        $kernel->expects($this->any())->method('getBundles')->will($this->returnValue([
             $bundle,
-        )));
-        $iterator = new TemplateIterator($kernel, __DIR__.'/Fixtures/templates', array(__DIR__.'/Fixtures/templates/Foo' => 'Foo'), __DIR__.'/DependencyInjection/Fixtures/templates');
+        ]));
+        $iterator = new TemplateIterator($kernel, __DIR__.'/Fixtures/templates', [__DIR__.'/Fixtures/templates/Foo' => 'Foo'], __DIR__.'/DependencyInjection/Fixtures/templates');
 
         $sorted = iterator_to_array($iterator);
         sort($sorted);
         $this->assertEquals(
-            array(
+            [
                 '@Bar/base.html.twig',
                 '@Bar/index.html.twig',
                 '@Bar/layout.html.twig',
                 '@Foo/index.html.twig',
                 'layout.html.twig',
                 'sub/sub.html.twig',
-            ),
+            ],
             $sorted
         );
     }
diff --git a/src/Symfony/Bundle/TwigBundle/TwigEngine.php b/src/Symfony/Bundle/TwigBundle/TwigEngine.php
index 1ac56a6f59ca6..39115199e5ddd 100644
--- a/src/Symfony/Bundle/TwigBundle/TwigEngine.php
+++ b/src/Symfony/Bundle/TwigBundle/TwigEngine.php
@@ -39,7 +39,7 @@ public function __construct(Environment $environment, TemplateNameParserInterfac
     /**
      * {@inheritdoc}
      */
-    public function render($name, array $parameters = array())
+    public function render($name, array $parameters = [])
     {
         try {
             return parent::render($name, $parameters);
@@ -63,7 +63,7 @@ public function render($name, array $parameters = array())
      *
      * @throws Error if something went wrong like a thrown exception while rendering the template
      */
-    public function renderResponse($view, array $parameters = array(), Response $response = null)
+    public function renderResponse($view, array $parameters = [], Response $response = null)
     {
         if (null === $response) {
             $response = new Response();
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php
index 0fedee13de199..4ae1afcf8324f 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php
@@ -63,21 +63,21 @@ public function showAction($token)
         if (!$this->twig->getLoader()->exists($template)) {
             $handler = new ExceptionHandler($this->debug, $this->twig->getCharset(), $this->fileLinkFormat);
 
-            return new Response($handler->getContent($exception), 200, array('Content-Type' => 'text/html'));
+            return new Response($handler->getContent($exception), 200, ['Content-Type' => 'text/html']);
         }
 
         $code = $exception->getStatusCode();
 
         return new Response($this->twig->render(
             $template,
-            array(
+            [
                 'status_code' => $code,
                 'status_text' => Response::$statusTexts[$code],
                 'exception' => $exception,
                 'logger' => null,
                 'currentContent' => '',
-            )
-        ), 200, array('Content-Type' => 'text/html'));
+            ]
+        ), 200, ['Content-Type' => 'text/html']);
     }
 
     /**
@@ -103,10 +103,10 @@ public function cssAction($token)
         if (!$this->templateExists($template)) {
             $handler = new ExceptionHandler($this->debug, $this->twig->getCharset(), $this->fileLinkFormat);
 
-            return new Response($handler->getStylesheet($exception), 200, array('Content-Type' => 'text/css'));
+            return new Response($handler->getStylesheet($exception), 200, ['Content-Type' => 'text/css']);
         }
 
-        return new Response($this->twig->render('@WebProfiler/Collector/exception.css.twig'), 200, array('Content-Type' => 'text/css'));
+        return new Response($this->twig->render('@WebProfiler/Collector/exception.css.twig'), 200, ['Content-Type' => 'text/css']);
     }
 
     protected function getTemplate()
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
index afcf3f73de0b1..4333c74d2ff82 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -71,7 +71,7 @@ public function homeAction()
 
         $this->profiler->disable();
 
-        return new RedirectResponse($this->generator->generate('_profiler_search_results', array('token' => 'empty', 'limit' => 10)), 302, array('Content-Type' => 'text/html'));
+        return new RedirectResponse($this->generator->generate('_profiler_search_results', ['token' => 'empty', 'limit' => 10]), 302, ['Content-Type' => 'text/html']);
     }
 
     /**
@@ -104,14 +104,14 @@ public function panelAction(Request $request, $token)
         }
 
         if (!$profile = $this->profiler->loadProfile($token)) {
-            return new Response($this->twig->render('@WebProfiler/Profiler/info.html.twig', array('about' => 'no_token', 'token' => $token, 'request' => $request)), 200, array('Content-Type' => 'text/html'));
+            return new Response($this->twig->render('@WebProfiler/Profiler/info.html.twig', ['about' => 'no_token', 'token' => $token, 'request' => $request]), 200, ['Content-Type' => 'text/html']);
         }
 
         if (!$profile->hasCollector($panel)) {
             throw new NotFoundHttpException(sprintf('Panel "%s" is not available for token "%s".', $panel, $token));
         }
 
-        return new Response($this->twig->render($this->getTemplateManager()->getName($profile, $panel), array(
+        return new Response($this->twig->render($this->getTemplateManager()->getName($profile, $panel), [
             'token' => $token,
             'profile' => $profile,
             'collector' => $profile->getCollector($panel),
@@ -121,7 +121,7 @@ public function panelAction(Request $request, $token)
             'templates' => $this->getTemplateManager()->getNames($profile),
             'is_ajax' => $request->isXmlHttpRequest(),
             'profiler_markup_version' => 2, // 1 = original profiler, 2 = Symfony 2.8+ profiler
-        )), 200, array('Content-Type' => 'text/html'));
+        ]), 200, ['Content-Type' => 'text/html']);
     }
 
     /**
@@ -148,13 +148,13 @@ public function toolbarAction(Request $request, $token)
         }
 
         if ('empty' === $token || null === $token) {
-            return new Response('', 200, array('Content-Type' => 'text/html'));
+            return new Response('', 200, ['Content-Type' => 'text/html']);
         }
 
         $this->profiler->disable();
 
         if (!$profile = $this->profiler->loadProfile($token)) {
-            return new Response('', 404, array('Content-Type' => 'text/html'));
+            return new Response('', 404, ['Content-Type' => 'text/html']);
         }
 
         // the toolbar position (top, bottom, normal, or null -- use the configuration)
@@ -164,12 +164,12 @@ public function toolbarAction(Request $request, $token)
 
         $url = null;
         try {
-            $url = $this->generator->generate('_profiler', array('token' => $token));
+            $url = $this->generator->generate('_profiler', ['token' => $token]);
         } catch (\Exception $e) {
             // the profiler is not enabled
         }
 
-        return $this->renderWithCspNonces($request, '@WebProfiler/Profiler/toolbar.html.twig', array(
+        return $this->renderWithCspNonces($request, '@WebProfiler/Profiler/toolbar.html.twig', [
             'request' => $request,
             'position' => $position,
             'profile' => $profile,
@@ -177,7 +177,7 @@ public function toolbarAction(Request $request, $token)
             'profiler_url' => $url,
             'token' => $token,
             'profiler_markup_version' => 2, // 1 = original toolbar, 2 = Symfony 2.8+ toolbar
-        ));
+        ]);
     }
 
     /**
@@ -220,7 +220,7 @@ public function searchBarAction(Request $request)
         }
 
         return new Response(
-            $this->twig->render('@WebProfiler/Profiler/search.html.twig', array(
+            $this->twig->render('@WebProfiler/Profiler/search.html.twig', [
                 'token' => $token,
                 'ip' => $ip,
                 'method' => $method,
@@ -230,9 +230,9 @@ public function searchBarAction(Request $request)
                 'end' => $end,
                 'limit' => $limit,
                 'request' => $request,
-            )),
+            ]),
             200,
-            array('Content-Type' => 'text/html')
+            ['Content-Type' => 'text/html']
         );
     }
 
@@ -268,7 +268,7 @@ public function searchResultsAction(Request $request, $token)
         $end = $request->query->get('end', null);
         $limit = $request->query->get('limit');
 
-        return new Response($this->twig->render('@WebProfiler/Profiler/results.html.twig', array(
+        return new Response($this->twig->render('@WebProfiler/Profiler/results.html.twig', [
             'request' => $request,
             'token' => $token,
             'profile' => $profile,
@@ -281,7 +281,7 @@ public function searchResultsAction(Request $request, $token)
             'end' => $end,
             'limit' => $limit,
             'panel' => null,
-        )), 200, array('Content-Type' => 'text/html'));
+        ]), 200, ['Content-Type' => 'text/html']);
     }
 
     /**
@@ -320,12 +320,12 @@ public function searchAction(Request $request)
         }
 
         if (!empty($token)) {
-            return new RedirectResponse($this->generator->generate('_profiler', array('token' => $token)), 302, array('Content-Type' => 'text/html'));
+            return new RedirectResponse($this->generator->generate('_profiler', ['token' => $token]), 302, ['Content-Type' => 'text/html']);
         }
 
         $tokens = $this->profiler->find($ip, $url, $limit, $method, $start, $end, $statusCode);
 
-        return new RedirectResponse($this->generator->generate('_profiler_search_results', array(
+        return new RedirectResponse($this->generator->generate('_profiler_search_results', [
             'token' => $tokens ? $tokens[0]['token'] : 'empty',
             'ip' => $ip,
             'method' => $method,
@@ -334,7 +334,7 @@ public function searchAction(Request $request)
             'start' => $start,
             'end' => $end,
             'limit' => $limit,
-        )), 302, array('Content-Type' => 'text/html'));
+        ]), 302, ['Content-Type' => 'text/html']);
     }
 
     /**
@@ -360,7 +360,7 @@ public function phpinfoAction()
         phpinfo();
         $phpinfo = ob_get_clean();
 
-        return new Response($phpinfo, 200, array('Content-Type' => 'text/html'));
+        return new Response($phpinfo, 200, ['Content-Type' => 'text/html']);
     }
 
     /**
@@ -389,11 +389,11 @@ public function openAction(Request $request)
             throw new NotFoundHttpException(sprintf('The file "%s" cannot be opened.', $file));
         }
 
-        return new Response($this->twig->render('@WebProfiler/Profiler/open.html.twig', array(
+        return new Response($this->twig->render('@WebProfiler/Profiler/open.html.twig', [
             'filename' => $filename,
             'file' => $file,
             'line' => $line,
-         )), 200, array('Content-Type' => 'text/html'));
+         ]), 200, ['Content-Type' => 'text/html']);
     }
 
     /**
@@ -410,11 +410,11 @@ protected function getTemplateManager()
         return $this->templateManager;
     }
 
-    private function renderWithCspNonces(Request $request, $template, $variables, $code = 200, $headers = array('Content-Type' => 'text/html'))
+    private function renderWithCspNonces(Request $request, $template, $variables, $code = 200, $headers = ['Content-Type' => 'text/html'])
     {
         $response = new Response('', $code, $headers);
 
-        $nonces = $this->cspHandler ? $this->cspHandler->getNonces($request, $response) : array();
+        $nonces = $this->cspHandler ? $this->cspHandler->getNonces($request, $response) : [];
 
         $variables['csp_script_nonce'] = isset($nonces['csp_script_nonce']) ? $nonces['csp_script_nonce'] : null;
         $variables['csp_style_nonce'] = isset($nonces['csp_style_nonce']) ? $nonces['csp_style_nonce'] : null;
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php
index 1c60340ffd393..bd4c945b1da19 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php
@@ -60,7 +60,7 @@ public function panelAction($token)
         $this->profiler->disable();
 
         if (null === $this->matcher || null === $this->routes) {
-            return new Response('The Router is not enabled.', 200, array('Content-Type' => 'text/html'));
+            return new Response('The Router is not enabled.', 200, ['Content-Type' => 'text/html']);
         }
 
         $profile = $this->profiler->loadProfile($token);
@@ -68,11 +68,11 @@ public function panelAction($token)
         /** @var RequestDataCollector $request */
         $request = $profile->getCollector('request');
 
-        return new Response($this->twig->render('@WebProfiler/Router/panel.html.twig', array(
+        return new Response($this->twig->render('@WebProfiler/Router/panel.html.twig', [
             'request' => $request,
             'router' => $profile->getCollector('router'),
             'traces' => $this->getTraces($request, $profile->getMethod()),
-        )), 200, array('Content-Type' => 'text/html'));
+        ]), 200, ['Content-Type' => 'text/html']);
     }
 
     /**
@@ -88,9 +88,9 @@ private function getTraces(RequestDataCollector $request, $method)
         $traceRequest = Request::create(
             $request->getPathInfo(),
             $request->getRequestServer(true)->get('REQUEST_METHOD'),
-            array(),
+            [],
             $request->getRequestCookies(true)->all(),
-            array(),
+            [],
             $request->getRequestServer(true)->all()
         );
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php b/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
index df4458474b05e..a38e7c686fd0a 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
@@ -44,23 +44,23 @@ public function __construct(NonceGenerator $nonceGenerator)
     public function getNonces(Request $request, Response $response)
     {
         if ($request->headers->has('X-SymfonyProfiler-Script-Nonce') && $request->headers->has('X-SymfonyProfiler-Style-Nonce')) {
-            return array(
+            return [
                 'csp_script_nonce' => $request->headers->get('X-SymfonyProfiler-Script-Nonce'),
                 'csp_style_nonce' => $request->headers->get('X-SymfonyProfiler-Style-Nonce'),
-            );
+            ];
         }
 
         if ($response->headers->has('X-SymfonyProfiler-Script-Nonce') && $response->headers->has('X-SymfonyProfiler-Style-Nonce')) {
-            return array(
+            return [
                 'csp_script_nonce' => $response->headers->get('X-SymfonyProfiler-Script-Nonce'),
                 'csp_style_nonce' => $response->headers->get('X-SymfonyProfiler-Style-Nonce'),
-            );
+            ];
         }
 
-        $nonces = array(
+        $nonces = [
             'csp_script_nonce' => $this->generateNonce(),
             'csp_style_nonce' => $this->generateNonce(),
-        );
+        ];
 
         $response->headers->set('X-SymfonyProfiler-Script-Nonce', $nonces['csp_script_nonce']);
         $response->headers->set('X-SymfonyProfiler-Style-Nonce', $nonces['csp_style_nonce']);
@@ -88,7 +88,7 @@ public function updateResponseHeaders(Request $request, Response $response)
         if ($this->cspDisabled) {
             $this->removeCspHeaders($response);
 
-            return array();
+            return [];
         }
 
         $nonces = $this->getNonces($request, $response);
@@ -116,19 +116,19 @@ private function removeCspHeaders(Response $response)
      *
      * @return array
      */
-    private function updateCspHeaders(Response $response, array $nonces = array())
+    private function updateCspHeaders(Response $response, array $nonces = [])
     {
-        $nonces = array_replace(array(
+        $nonces = array_replace([
             'csp_script_nonce' => $this->generateNonce(),
             'csp_style_nonce' => $this->generateNonce(),
-        ), $nonces);
+        ], $nonces);
 
         $ruleIsSet = false;
 
         $headers = $this->getCspHeaders($response);
 
         foreach ($headers as $header => $directives) {
-            foreach (array('script-src' => 'csp_script_nonce', 'style-src' => 'csp_style_nonce') as $type => $tokenName) {
+            foreach (['script-src' => 'csp_script_nonce', 'style-src' => 'csp_style_nonce'] as $type => $tokenName) {
                 if ($this->authorizesInline($directives, $type)) {
                     continue;
                 }
@@ -192,7 +192,7 @@ private function generateCspHeader(array $directives)
      */
     private function parseDirectives($header)
     {
-        $directives = array();
+        $directives = [];
 
         foreach (explode(';', $header) as $directive) {
             $parts = explode(' ', trim($directive));
@@ -236,7 +236,7 @@ private function hasHashOrNonce(array $directives)
             if ('\'nonce-' === substr($directive, 0, 7)) {
                 return true;
             }
-            if (\in_array(substr($directive, 0, 8), array('\'sha256-', '\'sha384-', '\'sha512-'), true)) {
+            if (\in_array(substr($directive, 0, 8), ['\'sha256-', '\'sha384-', '\'sha512-'], true)) {
                 return true;
             }
         }
@@ -252,7 +252,7 @@ private function hasHashOrNonce(array $directives)
      */
     private function getCspHeaders(Response $response)
     {
-        $headers = array();
+        $headers = [];
 
         if ($response->headers->has('Content-Security-Policy')) {
             $headers['Content-Security-Policy'] = $this->parseDirectives($response->headers->get('Content-Security-Policy'));
diff --git a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
index e01fb791307fc..e145efcc829d0 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
@@ -69,7 +69,7 @@ public function onKernelResponse(FilterResponseEvent $event)
             try {
                 $response->headers->set(
                     'X-Debug-Token-Link',
-                    $this->urlGenerator->generate('_profiler', array('token' => $response->headers->get('X-Debug-Token')), UrlGeneratorInterface::ABSOLUTE_URL)
+                    $this->urlGenerator->generate('_profiler', ['token' => $response->headers->get('X-Debug-Token')], UrlGeneratorInterface::ABSOLUTE_URL)
                 );
             } catch (\Exception $e) {
                 $response->headers->set('X-Debug-Error', \get_class($e).': '.preg_replace('/\s+/', ' ', $e->getMessage()));
@@ -80,7 +80,7 @@ public function onKernelResponse(FilterResponseEvent $event)
             return;
         }
 
-        $nonces = $this->cspHandler ? $this->cspHandler->updateResponseHeaders($request, $response) : array();
+        $nonces = $this->cspHandler ? $this->cspHandler->updateResponseHeaders($request, $response) : [];
 
         // do not capture redirects or modify XML HTTP Requests
         if ($request->isXmlHttpRequest()) {
@@ -94,7 +94,7 @@ public function onKernelResponse(FilterResponseEvent $event)
                 $session->getFlashBag()->setAll($session->getFlashBag()->peekAll());
             }
 
-            $response->setContent($this->twig->render('@WebProfiler/Profiler/toolbar_redirect.html.twig', array('location' => $response->headers->get('Location'))));
+            $response->setContent($this->twig->render('@WebProfiler/Profiler/toolbar_redirect.html.twig', ['location' => $response->headers->get('Location')]));
             $response->setStatusCode(200);
             $response->headers->remove('Location');
         }
@@ -139,8 +139,8 @@ protected function injectToolbar(Response $response, Request $request, array $no
 
     public static function getSubscribedEvents()
     {
-        return array(
-            KernelEvents::RESPONSE => array('onKernelResponse', -128),
-        );
+        return [
+            KernelEvents::RESPONSE => ['onKernelResponse', -128],
+        ];
     }
 }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php b/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
index 2b98fdd59f4ce..630de0c8b1af7 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
@@ -87,7 +87,7 @@ public function getTemplates(Profile $profile)
      */
     public function getNames(Profile $profile)
     {
-        $templates = array();
+        $templates = [];
 
         foreach ($this->templates as $arguments) {
             if (null === $arguments) {
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
index e0f299330f070..99c40213b5175 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
@@ -32,7 +32,7 @@ public function testEmptyToken($token)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $controller = new ProfilerController($urlGenerator, $profiler, $twig, array());
+        $controller = new ProfilerController($urlGenerator, $profiler, $twig, []);
 
         $response = $controller->toolbarAction(Request::create('/_wdt/empty'), $token);
         $this->assertEquals(200, $response->getStatusCode());
@@ -40,11 +40,11 @@ public function testEmptyToken($token)
 
     public function getEmptyTokenCases()
     {
-        return array(
-            array(null),
+        return [
+            [null],
             // "empty" is also a valid empty token case, see https://github.com/symfony/symfony/issues/10806
-            array('empty'),
-        );
+            ['empty'],
+        ];
     }
 
     /**
@@ -72,15 +72,15 @@ public function testOpeningDisallowedPaths($path, $isAllowed)
 
     public function getOpenFileCases()
     {
-        return array(
-            array('README.md', true),
-            array('composer.json', true),
-            array('Controller/ProfilerController.php', true),
-            array('.gitignore', false),
-            array('../TwigBundle/README.md', false),
-            array('Controller/../README.md', false),
-            array('Controller/./ProfilerController.php', false),
-        );
+        return [
+            ['README.md', true],
+            ['composer.json', true],
+            ['Controller/ProfilerController.php', true],
+            ['.gitignore', false],
+            ['../TwigBundle/README.md', false],
+            ['Controller/../README.md', false],
+            ['Controller/./ProfilerController.php', false],
+        ];
     }
 
     /**
@@ -126,8 +126,8 @@ public function testSearchResult($withCsp)
 
         $controller = $this->createController($profiler, $twig, $withCsp);
 
-        $tokens = array(
-            array(
+        $tokens = [
+            [
                 'token' => 'token1',
                 'ip' => '127.0.0.1',
                 'method' => 'GET',
@@ -135,8 +135,8 @@ public function testSearchResult($withCsp)
                 'time' => 0,
                 'parent' => null,
                 'status_code' => 200,
-            ),
-            array(
+            ],
+            [
                 'token' => 'token2',
                 'ip' => '127.0.0.1',
                 'method' => 'GET',
@@ -144,23 +144,23 @@ public function testSearchResult($withCsp)
                 'time' => 0,
                 'parent' => null,
                 'status_code' => 404,
-            ),
-        );
+            ],
+        ];
         $profiler
             ->expects($this->once())
             ->method('find')
             ->will($this->returnValue($tokens));
 
-        $request = Request::create('/_profiler/empty/search/results', 'GET', array(
+        $request = Request::create('/_profiler/empty/search/results', 'GET', [
             'limit' => 2,
             'ip' => '127.0.0.1',
             'method' => 'GET',
             'url' => 'http://example.com/',
-        ));
+        ]);
 
         $twig->expects($this->once())
             ->method('render')
-            ->with($this->stringEndsWith('results.html.twig'), $this->equalTo(array(
+            ->with($this->stringEndsWith('results.html.twig'), $this->equalTo([
                 'token' => 'empty',
                 'profile' => null,
                 'tokens' => $tokens,
@@ -173,7 +173,7 @@ public function testSearchResult($withCsp)
                 'limit' => 2,
                 'panel' => null,
                 'request' => $request,
-            )));
+            ]));
 
         $response = $controller->searchResultsAction($request, 'empty');
         $this->assertEquals(200, $response->getStatusCode());
@@ -181,10 +181,10 @@ public function testSearchResult($withCsp)
 
     public function provideCspVariants()
     {
-        return array(
-            array(true),
-            array(false),
-        );
+        return [
+            [true],
+            [false],
+        ];
     }
 
     private function createController($profiler, $twig, $withCSP)
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Csp/ContentSecurityPolicyHandlerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Csp/ContentSecurityPolicyHandlerTest.php
index 51397783699ea..bbf96c3b2b344 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Csp/ContentSecurityPolicyHandlerTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Csp/ContentSecurityPolicyHandlerTest.php
@@ -55,21 +55,21 @@ public function provideRequestAndResponses()
         $responseScriptNonce = 'response-with-headers-script-nonce';
         $responseStyleNonce = 'response-with-headers-style-nonce';
 
-        $requestNonceHeaders = array(
+        $requestNonceHeaders = [
             'X-SymfonyProfiler-Script-Nonce' => $requestScriptNonce,
             'X-SymfonyProfiler-Style-Nonce' => $requestStyleNonce,
-        );
-        $responseNonceHeaders = array(
+        ];
+        $responseNonceHeaders = [
             'X-SymfonyProfiler-Script-Nonce' => $responseScriptNonce,
             'X-SymfonyProfiler-Style-Nonce' => $responseStyleNonce,
-        );
-
-        return array(
-            array($nonce, array('csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce), $this->createRequest(), $this->createResponse()),
-            array($nonce, array('csp_script_nonce' => $requestScriptNonce, 'csp_style_nonce' => $requestStyleNonce), $this->createRequest($requestNonceHeaders), $this->createResponse($responseNonceHeaders)),
-            array($nonce, array('csp_script_nonce' => $requestScriptNonce, 'csp_style_nonce' => $requestStyleNonce), $this->createRequest($requestNonceHeaders), $this->createResponse()),
-            array($nonce, array('csp_script_nonce' => $responseScriptNonce, 'csp_style_nonce' => $responseStyleNonce), $this->createRequest(), $this->createResponse($responseNonceHeaders)),
-        );
+        ];
+
+        return [
+            [$nonce, ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce], $this->createRequest(), $this->createResponse()],
+            [$nonce, ['csp_script_nonce' => $requestScriptNonce, 'csp_style_nonce' => $requestStyleNonce], $this->createRequest($requestNonceHeaders), $this->createResponse($responseNonceHeaders)],
+            [$nonce, ['csp_script_nonce' => $requestScriptNonce, 'csp_style_nonce' => $requestStyleNonce], $this->createRequest($requestNonceHeaders), $this->createResponse()],
+            [$nonce, ['csp_script_nonce' => $responseScriptNonce, 'csp_style_nonce' => $responseStyleNonce], $this->createRequest(), $this->createResponse($responseNonceHeaders)],
+        ];
     }
 
     public function provideRequestAndResponsesForOnKernelResponse()
@@ -82,103 +82,103 @@ public function provideRequestAndResponsesForOnKernelResponse()
         $responseScriptNonce = 'response-with-headers-script-nonce';
         $responseStyleNonce = 'response-with-headers-style-nonce';
 
-        $requestNonceHeaders = array(
+        $requestNonceHeaders = [
             'X-SymfonyProfiler-Script-Nonce' => $requestScriptNonce,
             'X-SymfonyProfiler-Style-Nonce' => $requestStyleNonce,
-        );
-        $responseNonceHeaders = array(
+        ];
+        $responseNonceHeaders = [
             'X-SymfonyProfiler-Script-Nonce' => $responseScriptNonce,
             'X-SymfonyProfiler-Style-Nonce' => $responseStyleNonce,
-        );
+        ];
 
-        return array(
-            array(
+        return [
+            [
                 $nonce,
-                array('csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce),
+                ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
                 $this->createRequest(),
                 $this->createResponse(),
-                array('Content-Security-Policy' => null, 'Content-Security-Policy-Report-Only' => null, 'X-Content-Security-Policy' => null),
-            ),
-            array(
-                $nonce, array('csp_script_nonce' => $requestScriptNonce, 'csp_style_nonce' => $requestStyleNonce),
+                ['Content-Security-Policy' => null, 'Content-Security-Policy-Report-Only' => null, 'X-Content-Security-Policy' => null],
+            ],
+            [
+                $nonce, ['csp_script_nonce' => $requestScriptNonce, 'csp_style_nonce' => $requestStyleNonce],
                 $this->createRequest($requestNonceHeaders),
                 $this->createResponse($responseNonceHeaders),
-                array('Content-Security-Policy' => null, 'Content-Security-Policy-Report-Only' => null, 'X-Content-Security-Policy' => null),
-            ),
-            array(
+                ['Content-Security-Policy' => null, 'Content-Security-Policy-Report-Only' => null, 'X-Content-Security-Policy' => null],
+            ],
+            [
                 $nonce,
-                array('csp_script_nonce' => $requestScriptNonce, 'csp_style_nonce' => $requestStyleNonce),
+                ['csp_script_nonce' => $requestScriptNonce, 'csp_style_nonce' => $requestStyleNonce],
                 $this->createRequest($requestNonceHeaders),
                 $this->createResponse(),
-                array('Content-Security-Policy' => null, 'Content-Security-Policy-Report-Only' => null, 'X-Content-Security-Policy' => null),
-            ),
-            array(
+                ['Content-Security-Policy' => null, 'Content-Security-Policy-Report-Only' => null, 'X-Content-Security-Policy' => null],
+            ],
+            [
                 $nonce,
-                array('csp_script_nonce' => $responseScriptNonce, 'csp_style_nonce' => $responseStyleNonce),
+                ['csp_script_nonce' => $responseScriptNonce, 'csp_style_nonce' => $responseStyleNonce],
                 $this->createRequest(),
                 $this->createResponse($responseNonceHeaders),
-                array('Content-Security-Policy' => null, 'Content-Security-Policy-Report-Only' => null, 'X-Content-Security-Policy' => null),
-            ),
-            array(
+                ['Content-Security-Policy' => null, 'Content-Security-Policy-Report-Only' => null, 'X-Content-Security-Policy' => null],
+            ],
+            [
                 $nonce,
-                array('csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce),
+                ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
                 $this->createRequest(),
-                $this->createResponse(array('Content-Security-Policy' => 'frame-ancestors https: ; form-action: https:', 'Content-Security-Policy-Report-Only' => 'frame-ancestors http: ; form-action: http:')),
-                array('Content-Security-Policy' => 'frame-ancestors https: ; form-action: https:', 'Content-Security-Policy-Report-Only' => 'frame-ancestors http: ; form-action: http:', 'X-Content-Security-Policy' => null),
-            ),
-            array(
+                $this->createResponse(['Content-Security-Policy' => 'frame-ancestors https: ; form-action: https:', 'Content-Security-Policy-Report-Only' => 'frame-ancestors http: ; form-action: http:']),
+                ['Content-Security-Policy' => 'frame-ancestors https: ; form-action: https:', 'Content-Security-Policy-Report-Only' => 'frame-ancestors http: ; form-action: http:', 'X-Content-Security-Policy' => null],
+            ],
+            [
                 $nonce,
-                array('csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce),
+                ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
                 $this->createRequest(),
-                $this->createResponse(array('Content-Security-Policy' => 'default-src \'self\' domain.com; script-src \'self\' \'unsafe-inline\'', 'Content-Security-Policy-Report-Only' => 'default-src \'self\' domain-report-only.com; script-src \'self\' \'unsafe-inline\'')),
-                array('Content-Security-Policy' => 'default-src \'self\' domain.com; script-src \'self\' \'unsafe-inline\'; style-src \'self\' domain.com \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy-Report-Only' => 'default-src \'self\' domain-report-only.com; script-src \'self\' \'unsafe-inline\'; style-src \'self\' domain-report-only.com \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'X-Content-Security-Policy' => null),
-            ),
-            array(
+                $this->createResponse(['Content-Security-Policy' => 'default-src \'self\' domain.com; script-src \'self\' \'unsafe-inline\'', 'Content-Security-Policy-Report-Only' => 'default-src \'self\' domain-report-only.com; script-src \'self\' \'unsafe-inline\'']),
+                ['Content-Security-Policy' => 'default-src \'self\' domain.com; script-src \'self\' \'unsafe-inline\'; style-src \'self\' domain.com \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy-Report-Only' => 'default-src \'self\' domain-report-only.com; script-src \'self\' \'unsafe-inline\'; style-src \'self\' domain-report-only.com \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'X-Content-Security-Policy' => null],
+            ],
+            [
                 $nonce,
-                array('csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce),
+                ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
                 $this->createRequest(),
-                $this->createResponse(array('Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'')),
-                array('Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'', 'X-Content-Security-Policy' => null),
-            ),
-            array(
+                $this->createResponse(['Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'']),
+                ['Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'', 'X-Content-Security-Policy' => null],
+            ],
+            [
                 $nonce,
-                array('csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce),
+                ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
                 $this->createRequest(),
-                $this->createResponse(array('Content-Security-Policy' => 'script-src \'self\'; style-src \'self\'')),
-                array('Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'; style-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'X-Content-Security-Policy' => null),
-            ),
-            array(
+                $this->createResponse(['Content-Security-Policy' => 'script-src \'self\'; style-src \'self\'']),
+                ['Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'; style-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'X-Content-Security-Policy' => null],
+            ],
+            [
                 $nonce,
-                array('csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce),
+                ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
                 $this->createRequest(),
-                $this->createResponse(array('X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'')),
-                array('X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'', 'Content-Security-Policy' => null),
-            ),
-            array(
+                $this->createResponse(['X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'']),
+                ['X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'', 'Content-Security-Policy' => null],
+            ],
+            [
                 $nonce,
-                array('csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce),
+                ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
                 $this->createRequest(),
-                $this->createResponse(array('X-Content-Security-Policy' => 'script-src \'self\'')),
-                array('X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy' => null),
-            ),
-            array(
+                $this->createResponse(['X-Content-Security-Policy' => 'script-src \'self\'']),
+                ['X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy' => null],
+            ],
+            [
                 $nonce,
-                array('csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce),
+                ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
                 $this->createRequest(),
-                $this->createResponse(array('X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'sha384-LALALALALAAL\'')),
-                array('X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'sha384-LALALALALAAL\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy' => null),
-            ),
-            array(
+                $this->createResponse(['X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'sha384-LALALALALAAL\'']),
+                ['X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'sha384-LALALALALAAL\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy' => null],
+            ],
+            [
                 $nonce,
-                array('csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce),
+                ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
                 $this->createRequest(),
-                $this->createResponse(array('Content-Security-Policy' => 'script-src \'self\'; style-src \'self\'', 'X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'; style-src \'self\'')),
-                array('Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'; style-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'; style-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\''),
-            ),
-        );
+                $this->createResponse(['Content-Security-Policy' => 'script-src \'self\'; style-src \'self\'', 'X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'; style-src \'self\'']),
+                ['Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'; style-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'; style-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\''],
+            ],
+        ];
     }
 
-    private function createRequest(array $headers = array())
+    private function createRequest(array $headers = [])
     {
         $request = new Request();
         $request->headers->add($headers);
@@ -186,7 +186,7 @@ private function createRequest(array $headers = array())
         return $request;
     }
 
-    private function createResponse(array $headers = array())
+    private function createResponse(array $headers = [])
     {
         $response = new Response();
         $response->headers->add($headers);
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/ConfigurationTest.php
index 8028c2cd4bd1a..38610ab1ef02f 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -24,7 +24,7 @@ public function testConfigTree($options, $results)
     {
         $processor = new Processor();
         $configuration = new Configuration();
-        $config = $processor->processConfiguration($configuration, array($options));
+        $config = $processor->processConfiguration($configuration, [$options]);
 
         $this->assertEquals($results, $config);
     }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
index e00f98b163416..7ec5f7dc2d550 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
@@ -28,9 +28,9 @@ class WebProfilerExtensionTest extends TestCase
      */
     private $container;
 
-    public static function assertSaneContainer(Container $container, $message = '', $knownPrivates = array())
+    public static function assertSaneContainer(Container $container, $message = '', $knownPrivates = [])
     {
-        $errors = array();
+        $errors = [];
         $knownPrivates[] = 'debug.file_link_formatter.url_format';
         foreach ($container->getServiceIds() as $id) {
             if (\in_array($id, $knownPrivates, true)) { // to be removed in 4.0
@@ -43,7 +43,7 @@ public static function assertSaneContainer(Container $container, $message = '',
             }
         }
 
-        self::assertEquals(array(), $errors, $message);
+        self::assertEquals([], $errors, $message);
     }
 
     protected function setUp()
@@ -56,19 +56,19 @@ protected function setUp()
         $this->container->register('event_dispatcher', EventDispatcher::class)->setPublic(true);
         $this->container->register('router', $this->getMockClass('Symfony\\Component\\Routing\\RouterInterface'))->setPublic(true);
         $this->container->register('twig', 'Twig\Environment')->setPublic(true);
-        $this->container->register('twig_loader', 'Twig\Loader\ArrayLoader')->addArgument(array())->setPublic(true);
+        $this->container->register('twig_loader', 'Twig\Loader\ArrayLoader')->addArgument([])->setPublic(true);
         $this->container->register('twig', 'Twig\Environment')->addArgument(new Reference('twig_loader'))->setPublic(true);
-        $this->container->setParameter('kernel.bundles', array());
+        $this->container->setParameter('kernel.bundles', []);
         $this->container->setParameter('kernel.cache_dir', __DIR__);
         $this->container->setParameter('kernel.debug', false);
         $this->container->setParameter('kernel.project_dir', __DIR__);
         $this->container->setParameter('kernel.charset', 'UTF-8');
         $this->container->setParameter('debug.file_link_format', null);
-        $this->container->setParameter('profiler.class', array('Symfony\\Component\\HttpKernel\\Profiler\\Profiler'));
+        $this->container->setParameter('profiler.class', ['Symfony\\Component\\HttpKernel\\Profiler\\Profiler']);
         $this->container->register('profiler', $this->getMockClass('Symfony\\Component\\HttpKernel\\Profiler\\Profiler'))
             ->setPublic(true)
             ->addArgument(new Definition($this->getMockClass('Symfony\\Component\\HttpKernel\\Profiler\\ProfilerStorageInterface')));
-        $this->container->setParameter('data_collector.templates', array());
+        $this->container->setParameter('data_collector.templates', []);
         $this->container->set('kernel', $this->kernel);
         $this->container->addCompilerPass(new RegisterListenersPass());
     }
@@ -89,7 +89,7 @@ public function testDefaultConfig($debug)
         $this->container->setParameter('kernel.debug', $debug);
 
         $extension = new WebProfilerExtension();
-        $extension->load(array(array()), $this->container);
+        $extension->load([[]], $this->container);
 
         $this->assertFalse($this->container->has('web_profiler.debug_toolbar'));
 
@@ -102,11 +102,11 @@ public function testDefaultConfig($debug)
     public function testToolbarConfig($toolbarEnabled, $interceptRedirects, $listenerInjected, $listenerEnabled)
     {
         $extension = new WebProfilerExtension();
-        $extension->load(array(array('toolbar' => $toolbarEnabled, 'intercept_redirects' => $interceptRedirects)), $this->container);
+        $extension->load([['toolbar' => $toolbarEnabled, 'intercept_redirects' => $interceptRedirects]], $this->container);
 
         $this->assertSame($listenerInjected, $this->container->has('web_profiler.debug_toolbar'));
 
-        $this->assertSaneContainer($this->getCompiledContainer(), '', array('web_profiler.csp.handler'));
+        $this->assertSaneContainer($this->getCompiledContainer(), '', ['web_profiler.csp.handler']);
 
         if ($listenerInjected) {
             $this->assertSame($listenerEnabled, $this->container->get('web_profiler.debug_toolbar')->isEnabled());
@@ -115,12 +115,12 @@ public function testToolbarConfig($toolbarEnabled, $interceptRedirects, $listene
 
     public function getDebugModes()
     {
-        return array(
-            array(false, false, false, false),
-            array(true,  false, true,  true),
-            array(false, true,  true,  false),
-            array(true,  true,  true,  true),
-        );
+        return [
+            [false, false, false, false],
+            [true,  false, true,  true],
+            [false, true,  true,  false],
+            [true,  true,  true,  true],
+        ];
     }
 
     private function getCompiledContainer()
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
index ec420107dfd05..5a6f7f08d467c 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
@@ -33,15 +33,15 @@ public function testInjectToolbar($content, $expected)
 
         $response = new Response($content);
 
-        $m->invoke($listener, $response, Request::create('/'), array('csp_script_nonce' => 'scripto', 'csp_style_nonce' => 'stylo'));
+        $m->invoke($listener, $response, Request::create('/'), ['csp_script_nonce' => 'scripto', 'csp_style_nonce' => 'stylo']);
         $this->assertEquals($expected, $response->getContent());
     }
 
     public function getInjectToolbarTests()
     {
-        return array(
-            array('<html><head></head><body></body></html>', "<html><head></head><body>\nWDT\n</body></html>"),
-            array('<html>
+        return [
+            ['<html><head></head><body></body></html>', "<html><head></head><body>\nWDT\n</body></html>"],
+            ['<html>
             <head></head>
             <body>
             <textarea><html><head></head><body></body></html></textarea>
@@ -51,8 +51,8 @@ public function getInjectToolbarTests()
             <body>
             <textarea><html><head></head><body></body></html></textarea>
             \nWDT\n</body>
-            </html>"),
-        );
+            </html>"],
+        ];
     }
 
     /**
@@ -134,12 +134,12 @@ public function testToolbarIsNotInjectedOnRedirection($statusCode, $hasSession)
 
     public function provideRedirects()
     {
-        return array(
-            array(301, true),
-            array(302, true),
-            array(301, false),
-            array(302, false),
-        );
+        return [
+            [301, true],
+            [302, true],
+            [301, false],
+            [302, false],
+        ];
     }
 
     /**
@@ -230,7 +230,7 @@ public function testXDebugUrlHeader()
         $urlGenerator
             ->expects($this->once())
             ->method('generate')
-            ->with('_profiler', array('token' => 'xxxxxxxx'), UrlGeneratorInterface::ABSOLUTE_URL)
+            ->with('_profiler', ['token' => 'xxxxxxxx'], UrlGeneratorInterface::ABSOLUTE_URL)
             ->will($this->returnValue('http://mydomain.com/_profiler/xxxxxxxx'))
         ;
 
@@ -251,7 +251,7 @@ public function testThrowingUrlGenerator()
         $urlGenerator
             ->expects($this->once())
             ->method('generate')
-            ->with('_profiler', array('token' => 'xxxxxxxx'))
+            ->with('_profiler', ['token' => 'xxxxxxxx'])
             ->will($this->throwException(new \Exception('foo')))
         ;
 
@@ -272,7 +272,7 @@ public function testThrowingErrorCleanup()
         $urlGenerator
             ->expects($this->once())
             ->method('generate')
-            ->with('_profiler', array('token' => 'xxxxxxxx'))
+            ->with('_profiler', ['token' => 'xxxxxxxx'])
             ->will($this->throwException(new \Exception("This\nmultiline\r\ntabbed text should\tcome out\r on\n \ta single plain\r\nline")))
         ;
 
@@ -286,7 +286,7 @@ public function testThrowingErrorCleanup()
 
     protected function getRequestMock($isXmlHttpRequest = false, $requestFormat = 'html', $hasSession = true)
     {
-        $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->setMethods(array('getSession', 'isXmlHttpRequest', 'getRequestFormat'))->disableOriginalConstructor()->getMock();
+        $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->setMethods(['getSession', 'isXmlHttpRequest', 'getRequestFormat'])->disableOriginalConstructor()->getMock();
         $request->expects($this->any())
             ->method('isXmlHttpRequest')
             ->will($this->returnValue($isXmlHttpRequest));
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php
index a65a389923d74..c27774cc4ad8e 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php
@@ -43,11 +43,11 @@ protected function setUp()
 
         $profiler = $this->mockProfiler();
         $twigEnvironment = $this->mockTwigEnvironment();
-        $templates = array(
-            'data_collector.foo' => array('foo', 'FooBundle:Collector:foo'),
-            'data_collector.bar' => array('bar', 'FooBundle:Collector:bar'),
-            'data_collector.baz' => array('baz', 'FooBundle:Collector:baz'),
-        );
+        $templates = [
+            'data_collector.foo' => ['foo', 'FooBundle:Collector:foo'],
+            'data_collector.bar' => ['bar', 'FooBundle:Collector:bar'],
+            'data_collector.baz' => ['baz', 'FooBundle:Collector:baz'],
+        ];
 
         $this->templateManager = new TemplateManager($profiler, $twigEnvironment, $templates);
     }
@@ -69,12 +69,12 @@ public function testGetNameValidTemplate()
         $this->profiler->expects($this->any())
             ->method('has')
             ->withAnyParameters()
-            ->will($this->returnCallback(array($this, 'profilerHasCallback')));
+            ->will($this->returnCallback([$this, 'profilerHasCallback']));
 
         $profile = $this->mockProfile();
         $profile->expects($this->any())
             ->method('hasCollector')
-            ->will($this->returnCallback(array($this, 'profileHasCollectorCallback')));
+            ->will($this->returnCallback([$this, 'profileHasCollectorCallback']));
 
         $this->assertEquals('FooBundle:Collector:foo.html.twig', $this->templateManager->getName($profile, 'foo'));
     }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php b/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php
index 61d0781542a5b..e3d8f0ca4e14a 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php
@@ -102,7 +102,7 @@ public function dumpLog(Environment $env, $message, Data $context = null)
             return '<span class="dump-inline">'.$message.'</span>';
         }
 
-        $replacements = array();
+        $replacements = [];
         foreach ($context as $k => $v) {
             $k = '{'.twig_escape_filter($env, $k).'}';
             $replacements['&quot;<b>'.$k.'</b>&quot;'] = $replacements['&quot;'.$k.'&quot;'] = $replacements[$k] = $this->dumpData($env, $v);
diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerLogCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerLogCommand.php
index a9c62c99c61d2..73c51cc8e09e4 100644
--- a/src/Symfony/Bundle/WebServerBundle/Command/ServerLogCommand.php
+++ b/src/Symfony/Bundle/WebServerBundle/Command/ServerLogCommand.php
@@ -27,7 +27,7 @@
  */
 class ServerLogCommand extends Command
 {
-    private static $bgColor = array('black', 'blue', 'cyan', 'green', 'magenta', 'red', 'white', 'yellow');
+    private static $bgColor = ['black', 'blue', 'cyan', 'green', 'magenta', 'red', 'white', 'yellow'];
 
     private $el;
     private $handler;
@@ -87,12 +87,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $this->handler = new ConsoleHandler($output);
 
-        $this->handler->setFormatter(new ConsoleFormatter(array(
+        $this->handler->setFormatter(new ConsoleFormatter([
             'format' => str_replace('\n', "\n", $input->getOption('format')),
             'date_format' => $input->getOption('date-format'),
             'colors' => $output->isDecorated(),
             'multiline' => OutputInterface::VERBOSITY_DEBUG <= $output->getVerbosity(),
-        )));
+        ]));
 
         if (false === strpos($host = $input->getOption('host'), '://')) {
             $host = 'tcp://'.$host;
@@ -120,8 +120,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
     private function getLogs($socket)
     {
-        $sockets = array((int) $socket => $socket);
-        $write = array();
+        $sockets = [(int) $socket => $socket];
+        $write = [];
 
         while (true) {
             $read = $sockets;
diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php
index 634ef2c28aa49..c5b0973320424 100644
--- a/src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php
+++ b/src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php
@@ -47,11 +47,11 @@ public function __construct($documentRoot = null, $environment = null)
     protected function configure()
     {
         $this
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('addressport', InputArgument::OPTIONAL, 'The address to listen to (can be address:port, address, or port)'),
                 new InputOption('docroot', 'd', InputOption::VALUE_REQUIRED, 'Document root, usually where your front controllers are stored'),
                 new InputOption('router', 'r', InputOption::VALUE_REQUIRED, 'Path to custom router script'),
-            ))
+            ])
             ->setDescription('Runs a local web server')
             ->setHelp(<<<'EOF'
 <info>%command.name%</info> runs a local web server: By default, the server
diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php
index 591a7e8fbb107..22447c66d9d26 100644
--- a/src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php
+++ b/src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php
@@ -47,12 +47,12 @@ public function __construct($documentRoot = null, $environment = null)
     protected function configure()
     {
         $this
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('addressport', InputArgument::OPTIONAL, 'The address to listen to (can be address:port, address, or port)'),
                 new InputOption('docroot', 'd', InputOption::VALUE_REQUIRED, 'Document root'),
                 new InputOption('router', 'r', InputOption::VALUE_REQUIRED, 'Path to custom router script'),
                 new InputOption('pidfile', null, InputOption::VALUE_REQUIRED, 'PID file'),
-            ))
+            ])
             ->setDescription('Starts a local web server in the background')
             ->setHelp(<<<'EOF'
 <info>%command.name%</info> runs a local web server: By default, the server
@@ -90,10 +90,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $io = new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output);
 
         if (!\extension_loaded('pcntl')) {
-            $io->error(array(
+            $io->error([
                 'This command needs the pcntl extension to run.',
                 'You can either install it or use the "server:run" command instead.',
-            ));
+            ]);
 
             if ($io->confirm('Do you want to execute <info>server:run</info> immediately?', false)) {
                 return $this->getApplication()->find('server:run')->run($input, $output);
diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerStatusCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerStatusCommand.php
index 907f69f1c43ae..36d6d290e6435 100644
--- a/src/Symfony/Bundle/WebServerBundle/Command/ServerStatusCommand.php
+++ b/src/Symfony/Bundle/WebServerBundle/Command/ServerStatusCommand.php
@@ -35,10 +35,10 @@ class ServerStatusCommand extends ServerCommand
     protected function configure()
     {
         $this
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputOption('pidfile', null, InputOption::VALUE_REQUIRED, 'PID file'),
                 new InputOption('filter', null, InputOption::VALUE_REQUIRED, 'The value to display (one of port, host, or address)'),
-            ))
+            ])
             ->setDescription('Outputs the status of the local web server')
             ->setHelp(<<<'EOF'
 <info>%command.name%</info> shows the details of the given local web
diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerStopCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerStopCommand.php
index 5f9189d3e62e4..c4edd3700326a 100644
--- a/src/Symfony/Bundle/WebServerBundle/Command/ServerStopCommand.php
+++ b/src/Symfony/Bundle/WebServerBundle/Command/ServerStopCommand.php
@@ -33,9 +33,9 @@ class ServerStopCommand extends ServerCommand
     protected function configure()
     {
         $this
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputOption('pidfile', null, InputOption::VALUE_REQUIRED, 'PID file'),
-            ))
+            ])
             ->setDescription('Stops the local web server that was started with the server:start command')
             ->setHelp(<<<'EOF'
 <info>%command.name%</info> stops the local web server:
diff --git a/src/Symfony/Bundle/WebServerBundle/Tests/DependencyInjection/WebServerExtensionTest.php b/src/Symfony/Bundle/WebServerBundle/Tests/DependencyInjection/WebServerExtensionTest.php
index ebc0c9421fdb9..a57be186de8d7 100644
--- a/src/Symfony/Bundle/WebServerBundle/Tests/DependencyInjection/WebServerExtensionTest.php
+++ b/src/Symfony/Bundle/WebServerBundle/Tests/DependencyInjection/WebServerExtensionTest.php
@@ -21,7 +21,7 @@ class WebServerExtensionTest extends TestCase
     public function testLoad()
     {
         $container = new ContainerBuilder();
-        (new WebServerExtension())->load(array(), $container);
+        (new WebServerExtension())->load([], $container);
 
         $this->assertTrue($container->hasDefinition('web_server.command.server_run'));
         $this->assertTrue($container->hasDefinition('web_server.command.server_start'));
diff --git a/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php b/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
index 8b88eaecad654..059ea3beb5590 100644
--- a/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
+++ b/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
@@ -114,7 +114,7 @@ private function findFrontController($documentRoot, $env)
 
     private function getFrontControllerFileNames($env)
     {
-        return array('app_'.$env.'.php', 'app.php', 'index_'.$env.'.php', 'index.php');
+        return ['app_'.$env.'.php', 'app.php', 'index_'.$env.'.php', 'index.php'];
     }
 
     private function findBestPort()
diff --git a/src/Symfony/Component/Asset/Packages.php b/src/Symfony/Component/Asset/Packages.php
index 63808d90786c0..3e82dcdcd407e 100644
--- a/src/Symfony/Component/Asset/Packages.php
+++ b/src/Symfony/Component/Asset/Packages.php
@@ -23,13 +23,13 @@
 class Packages
 {
     private $defaultPackage;
-    private $packages = array();
+    private $packages = [];
 
     /**
      * @param PackageInterface   $defaultPackage The default package
      * @param PackageInterface[] $packages       Additional packages indexed by name
      */
-    public function __construct(PackageInterface $defaultPackage = null, array $packages = array())
+    public function __construct(PackageInterface $defaultPackage = null, array $packages = [])
     {
         $this->defaultPackage = $defaultPackage;
 
diff --git a/src/Symfony/Component/Asset/Tests/PackageTest.php b/src/Symfony/Component/Asset/Tests/PackageTest.php
index a5da219b59b54..8f6626ae4d2ad 100644
--- a/src/Symfony/Component/Asset/Tests/PackageTest.php
+++ b/src/Symfony/Component/Asset/Tests/PackageTest.php
@@ -29,22 +29,22 @@ public function testGetUrl($version, $format, $path, $expected)
 
     public function getConfigs()
     {
-        return array(
-            array('v1', '', 'http://example.com/foo', 'http://example.com/foo'),
-            array('v1', '', 'https://example.com/foo', 'https://example.com/foo'),
-            array('v1', '', '//example.com/foo', '//example.com/foo'),
-
-            array('v1', '', '/foo', '/foo?v1'),
-            array('v1', '', 'foo', 'foo?v1'),
-
-            array(null, '', '/foo', '/foo'),
-            array(null, '', 'foo', 'foo'),
-
-            array('v1', 'version-%2$s/%1$s', '/foo', '/version-v1/foo'),
-            array('v1', 'version-%2$s/%1$s', 'foo', 'version-v1/foo'),
-            array('v1', 'version-%2$s/%1$s', 'foo/', 'version-v1/foo/'),
-            array('v1', 'version-%2$s/%1$s', '/foo/', '/version-v1/foo/'),
-        );
+        return [
+            ['v1', '', 'http://example.com/foo', 'http://example.com/foo'],
+            ['v1', '', 'https://example.com/foo', 'https://example.com/foo'],
+            ['v1', '', '//example.com/foo', '//example.com/foo'],
+
+            ['v1', '', '/foo', '/foo?v1'],
+            ['v1', '', 'foo', 'foo?v1'],
+
+            [null, '', '/foo', '/foo'],
+            [null, '', 'foo', 'foo'],
+
+            ['v1', 'version-%2$s/%1$s', '/foo', '/version-v1/foo'],
+            ['v1', 'version-%2$s/%1$s', 'foo', 'version-v1/foo'],
+            ['v1', 'version-%2$s/%1$s', 'foo/', 'version-v1/foo/'],
+            ['v1', 'version-%2$s/%1$s', '/foo/', '/version-v1/foo/'],
+        ];
     }
 
     public function testGetVersion()
diff --git a/src/Symfony/Component/Asset/Tests/PackagesTest.php b/src/Symfony/Component/Asset/Tests/PackagesTest.php
index 4b0872f7f2699..b751986d48dd0 100644
--- a/src/Symfony/Component/Asset/Tests/PackagesTest.php
+++ b/src/Symfony/Component/Asset/Tests/PackagesTest.php
@@ -27,7 +27,7 @@ public function testGetterSetters()
         $this->assertEquals($default, $packages->getPackage());
         $this->assertEquals($a, $packages->getPackage('a'));
 
-        $packages = new Packages($default, array('a' => $a));
+        $packages = new Packages($default, ['a' => $a]);
 
         $this->assertEquals($default, $packages->getPackage());
         $this->assertEquals($a, $packages->getPackage('a'));
@@ -37,7 +37,7 @@ public function testGetVersion()
     {
         $packages = new Packages(
             new Package(new StaticVersionStrategy('default')),
-            array('a' => new Package(new StaticVersionStrategy('a')))
+            ['a' => new Package(new StaticVersionStrategy('a'))]
         );
 
         $this->assertEquals('default', $packages->getVersion('/foo'));
@@ -48,7 +48,7 @@ public function testGetUrl()
     {
         $packages = new Packages(
             new Package(new StaticVersionStrategy('default')),
-            array('a' => new Package(new StaticVersionStrategy('a')))
+            ['a' => new Package(new StaticVersionStrategy('a'))]
         );
 
         $this->assertEquals('/foo?default', $packages->getUrl('/foo'));
diff --git a/src/Symfony/Component/Asset/Tests/PathPackageTest.php b/src/Symfony/Component/Asset/Tests/PathPackageTest.php
index 4a9f90df90a11..c6edc8de61a7d 100644
--- a/src/Symfony/Component/Asset/Tests/PathPackageTest.php
+++ b/src/Symfony/Component/Asset/Tests/PathPackageTest.php
@@ -28,24 +28,24 @@ public function testGetUrl($basePath, $format, $path, $expected)
 
     public function getConfigs()
     {
-        return array(
-            array('/foo', '', 'http://example.com/foo', 'http://example.com/foo'),
-            array('/foo', '', 'https://example.com/foo', 'https://example.com/foo'),
-            array('/foo', '', '//example.com/foo', '//example.com/foo'),
-
-            array('', '', '/foo', '/foo?v1'),
-
-            array('/foo', '', '/bar', '/bar?v1'),
-            array('/foo', '', 'bar', '/foo/bar?v1'),
-            array('foo', '', 'bar', '/foo/bar?v1'),
-            array('foo/', '', 'bar', '/foo/bar?v1'),
-            array('/foo/', '', 'bar', '/foo/bar?v1'),
-
-            array('/foo', 'version-%2$s/%1$s', '/bar', '/version-v1/bar'),
-            array('/foo', 'version-%2$s/%1$s', 'bar', '/foo/version-v1/bar'),
-            array('/foo', 'version-%2$s/%1$s', 'bar/', '/foo/version-v1/bar/'),
-            array('/foo', 'version-%2$s/%1$s', '/bar/', '/version-v1/bar/'),
-        );
+        return [
+            ['/foo', '', 'http://example.com/foo', 'http://example.com/foo'],
+            ['/foo', '', 'https://example.com/foo', 'https://example.com/foo'],
+            ['/foo', '', '//example.com/foo', '//example.com/foo'],
+
+            ['', '', '/foo', '/foo?v1'],
+
+            ['/foo', '', '/bar', '/bar?v1'],
+            ['/foo', '', 'bar', '/foo/bar?v1'],
+            ['foo', '', 'bar', '/foo/bar?v1'],
+            ['foo/', '', 'bar', '/foo/bar?v1'],
+            ['/foo/', '', 'bar', '/foo/bar?v1'],
+
+            ['/foo', 'version-%2$s/%1$s', '/bar', '/version-v1/bar'],
+            ['/foo', 'version-%2$s/%1$s', 'bar', '/foo/version-v1/bar'],
+            ['/foo', 'version-%2$s/%1$s', 'bar/', '/foo/version-v1/bar/'],
+            ['/foo', 'version-%2$s/%1$s', '/bar/', '/version-v1/bar/'],
+        ];
     }
 
     /**
@@ -60,19 +60,19 @@ public function testGetUrlWithContext($basePathRequest, $basePath, $format, $pat
 
     public function getContextConfigs()
     {
-        return array(
-            array('', '/foo', '', '/baz', '/baz?v1'),
-            array('', '/foo', '', 'baz', '/foo/baz?v1'),
-            array('', 'foo', '', 'baz', '/foo/baz?v1'),
-            array('', 'foo/', '', 'baz', '/foo/baz?v1'),
-            array('', '/foo/', '', 'baz', '/foo/baz?v1'),
-
-            array('/bar', '/foo', '', '/baz', '/baz?v1'),
-            array('/bar', '/foo', '', 'baz', '/bar/foo/baz?v1'),
-            array('/bar', 'foo', '', 'baz', '/bar/foo/baz?v1'),
-            array('/bar', 'foo/', '', 'baz', '/bar/foo/baz?v1'),
-            array('/bar', '/foo/', '', 'baz', '/bar/foo/baz?v1'),
-        );
+        return [
+            ['', '/foo', '', '/baz', '/baz?v1'],
+            ['', '/foo', '', 'baz', '/foo/baz?v1'],
+            ['', 'foo', '', 'baz', '/foo/baz?v1'],
+            ['', 'foo/', '', 'baz', '/foo/baz?v1'],
+            ['', '/foo/', '', 'baz', '/foo/baz?v1'],
+
+            ['/bar', '/foo', '', '/baz', '/baz?v1'],
+            ['/bar', '/foo', '', 'baz', '/bar/foo/baz?v1'],
+            ['/bar', 'foo', '', 'baz', '/bar/foo/baz?v1'],
+            ['/bar', 'foo/', '', 'baz', '/bar/foo/baz?v1'],
+            ['/bar', '/foo/', '', 'baz', '/bar/foo/baz?v1'],
+        ];
     }
 
     public function testVersionStrategyGivesAbsoluteURL()
diff --git a/src/Symfony/Component/Asset/Tests/UrlPackageTest.php b/src/Symfony/Component/Asset/Tests/UrlPackageTest.php
index d37ba0126c5a0..e4d6b920947e4 100644
--- a/src/Symfony/Component/Asset/Tests/UrlPackageTest.php
+++ b/src/Symfony/Component/Asset/Tests/UrlPackageTest.php
@@ -63,18 +63,18 @@ public function testGetUrlWithContext($secure, $baseUrls, $format, $path, $expec
 
     public function getContextConfigs()
     {
-        return array(
-            array(false, 'http://example.com', '', 'foo', 'http://example.com/foo?v1'),
-            array(false, array('http://example.com'), '', 'foo', 'http://example.com/foo?v1'),
-            array(false, array('http://example.com', 'https://example.com'), '', 'foo', 'http://example.com/foo?v1'),
-            array(false, array('http://example.com', 'https://example.com'), '', 'fooa', 'https://example.com/fooa?v1'),
-            array(false, array('http://example.com/bar'), '', 'foo', 'http://example.com/bar/foo?v1'),
-            array(false, array('http://example.com/bar/'), '', 'foo', 'http://example.com/bar/foo?v1'),
-            array(false, array('//example.com/bar/'), '', 'foo', '//example.com/bar/foo?v1'),
-
-            array(true, array('http://example.com'), '', 'foo', 'http://example.com/foo?v1'),
-            array(true, array('http://example.com', 'https://example.com'), '', 'foo', 'https://example.com/foo?v1'),
-        );
+        return [
+            [false, 'http://example.com', '', 'foo', 'http://example.com/foo?v1'],
+            [false, ['http://example.com'], '', 'foo', 'http://example.com/foo?v1'],
+            [false, ['http://example.com', 'https://example.com'], '', 'foo', 'http://example.com/foo?v1'],
+            [false, ['http://example.com', 'https://example.com'], '', 'fooa', 'https://example.com/fooa?v1'],
+            [false, ['http://example.com/bar'], '', 'foo', 'http://example.com/bar/foo?v1'],
+            [false, ['http://example.com/bar/'], '', 'foo', 'http://example.com/bar/foo?v1'],
+            [false, ['//example.com/bar/'], '', 'foo', '//example.com/bar/foo?v1'],
+
+            [true, ['http://example.com'], '', 'foo', 'http://example.com/foo?v1'],
+            [true, ['http://example.com', 'https://example.com'], '', 'foo', 'https://example.com/foo?v1'],
+        ];
     }
 
     public function testVersionStrategyGivesAbsoluteURL()
@@ -93,7 +93,7 @@ public function testVersionStrategyGivesAbsoluteURL()
      */
     public function testNoBaseUrls()
     {
-        new UrlPackage(array(), new EmptyVersionStrategy());
+        new UrlPackage([], new EmptyVersionStrategy());
     }
 
     /**
diff --git a/src/Symfony/Component/Asset/Tests/VersionStrategy/StaticVersionStrategyTest.php b/src/Symfony/Component/Asset/Tests/VersionStrategy/StaticVersionStrategyTest.php
index 7b5a3e8d5cec1..c56a8726a8459 100644
--- a/src/Symfony/Component/Asset/Tests/VersionStrategy/StaticVersionStrategyTest.php
+++ b/src/Symfony/Component/Asset/Tests/VersionStrategy/StaticVersionStrategyTest.php
@@ -36,9 +36,9 @@ public function testApplyVersion($path, $version, $format)
 
     public function getConfigs()
     {
-        return array(
-            array('test-path', 'v1', null),
-            array('test-path', 'v2', '%s?test%s'),
-        );
+        return [
+            ['test-path', 'v1', null],
+            ['test-path', 'v2', '%s?test%s'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Asset/UrlPackage.php b/src/Symfony/Component/Asset/UrlPackage.php
index 77055e43db372..23809a55fdf23 100644
--- a/src/Symfony/Component/Asset/UrlPackage.php
+++ b/src/Symfony/Component/Asset/UrlPackage.php
@@ -35,7 +35,7 @@
  */
 class UrlPackage extends Package
 {
-    private $baseUrls = array();
+    private $baseUrls = [];
     private $sslPackage;
 
     /**
@@ -125,7 +125,7 @@ protected function chooseBaseUrl($path)
 
     private function getSslUrls($urls)
     {
-        $sslUrls = array();
+        $sslUrls = [];
         foreach ($urls as $url) {
             if ('https://' === substr($url, 0, 8) || '//' === substr($url, 0, 2)) {
                 $sslUrls[] = $url;
diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
index 5eef4d0a4c08a..bdc772be24707 100644
--- a/src/Symfony/Component/BrowserKit/Client.php
+++ b/src/Symfony/Component/BrowserKit/Client.php
@@ -30,7 +30,7 @@ abstract class Client
 {
     protected $history;
     protected $cookieJar;
-    protected $server = array();
+    protected $server = [];
     protected $internalRequest;
     protected $request;
     protected $internalResponse;
@@ -42,7 +42,7 @@ abstract class Client
 
     private $maxRedirects = -1;
     private $redirectCount = 0;
-    private $redirects = array();
+    private $redirects = [];
     private $isMainRequest = true;
 
     /**
@@ -50,7 +50,7 @@ abstract class Client
      * @param History   $history   A History instance to store the browser history
      * @param CookieJar $cookieJar A CookieJar instance to store the cookies
      */
-    public function __construct(array $server = array(), History $history = null, CookieJar $cookieJar = null)
+    public function __construct(array $server = [], History $history = null, CookieJar $cookieJar = null)
     {
         $this->setServerParameters($server);
         $this->history = $history ?: new History();
@@ -121,9 +121,9 @@ public function insulate($insulated = true)
      */
     public function setServerParameters(array $server)
     {
-        $this->server = array_merge(array(
+        $this->server = array_merge([
             'HTTP_USER_AGENT' => 'Symfony BrowserKit',
-        ), $server);
+        ], $server);
     }
 
     /**
@@ -359,7 +359,7 @@ protected function doRequestInProcess($request)
         if (file_exists($deprecationsFile)) {
             $deprecations = file_get_contents($deprecationsFile);
             unlink($deprecationsFile);
-            foreach ($deprecations ? unserialize($deprecations) : array() as $deprecation) {
+            foreach ($deprecations ? unserialize($deprecations) : [] as $deprecation) {
                 if ($deprecation[0]) {
                     @trigger_error($deprecation[1], E_USER_DEPRECATED);
                 } else {
@@ -503,9 +503,9 @@ public function followRedirect()
 
         $request = $this->internalRequest;
 
-        if (\in_array($this->internalResponse->getStatus(), array(301, 302, 303))) {
+        if (\in_array($this->internalResponse->getStatus(), [301, 302, 303])) {
             $method = 'GET';
-            $files = array();
+            $files = [];
             $content = null;
         } else {
             $method = $request->getMethod();
@@ -515,7 +515,7 @@ public function followRedirect()
 
         if ('GET' === strtoupper($method)) {
             // Don't forward parameters for GET request as it should reach the redirection URI
-            $parameters = array();
+            $parameters = [];
         } else {
             $parameters = $request->getParameters();
         }
diff --git a/src/Symfony/Component/BrowserKit/Cookie.php b/src/Symfony/Component/BrowserKit/Cookie.php
index 8857b62317b42..41f420ac64b77 100644
--- a/src/Symfony/Component/BrowserKit/Cookie.php
+++ b/src/Symfony/Component/BrowserKit/Cookie.php
@@ -22,7 +22,7 @@ class Cookie
      * Handles dates as defined by RFC 2616 section 3.3.1, and also some other
      * non-standard, but common formats.
      */
-    private static $dateFormats = array(
+    private static $dateFormats = [
         'D, d M Y H:i:s T',
         'D, d-M-y H:i:s T',
         'D, d-M-Y H:i:s T',
@@ -30,7 +30,7 @@ class Cookie
         'D, d-m-Y H:i:s T',
         'D M j G:i:s Y',
         'D M d H:i:s Y T',
-    );
+    ];
 
     protected $name;
     protected $value;
diff --git a/src/Symfony/Component/BrowserKit/CookieJar.php b/src/Symfony/Component/BrowserKit/CookieJar.php
index 24eb9abeddbf0..bce66197d3703 100644
--- a/src/Symfony/Component/BrowserKit/CookieJar.php
+++ b/src/Symfony/Component/BrowserKit/CookieJar.php
@@ -18,7 +18,7 @@
  */
 class CookieJar
 {
-    protected $cookieJar = array();
+    protected $cookieJar = [];
 
     public function set(Cookie $cookie)
     {
@@ -84,7 +84,7 @@ public function expire($name, $path = '/', $domain = null)
             // this should never happen but it allows for a better BC
             $domains = array_keys($this->cookieJar);
         } else {
-            $domains = array($domain);
+            $domains = [$domain];
         }
 
         foreach ($domains as $domain) {
@@ -105,7 +105,7 @@ public function expire($name, $path = '/', $domain = null)
      */
     public function clear()
     {
-        $this->cookieJar = array();
+        $this->cookieJar = [];
     }
 
     /**
@@ -116,7 +116,7 @@ public function clear()
      */
     public function updateFromSetCookie(array $setCookies, $uri = null)
     {
-        $cookies = array();
+        $cookies = [];
 
         foreach ($setCookies as $cookie) {
             foreach (explode(',', $cookie) as $i => $part) {
@@ -157,7 +157,7 @@ public function all()
     {
         $this->flushExpiredCookies();
 
-        $flattenedCookies = array();
+        $flattenedCookies = [];
         foreach ($this->cookieJar as $path) {
             foreach ($path as $cookies) {
                 foreach ($cookies as $cookie) {
@@ -181,8 +181,8 @@ public function allValues($uri, $returnsRawValue = false)
     {
         $this->flushExpiredCookies();
 
-        $parts = array_replace(array('path' => '/'), parse_url($uri));
-        $cookies = array();
+        $parts = array_replace(['path' => '/'], parse_url($uri));
+        $cookies = [];
         foreach ($this->cookieJar as $domain => $pathCookies) {
             if ($domain) {
                 $domain = '.'.ltrim($domain, '.');
diff --git a/src/Symfony/Component/BrowserKit/History.php b/src/Symfony/Component/BrowserKit/History.php
index beec17c6b4d92..8ed3fd17fee15 100644
--- a/src/Symfony/Component/BrowserKit/History.php
+++ b/src/Symfony/Component/BrowserKit/History.php
@@ -18,7 +18,7 @@
  */
 class History
 {
-    protected $stack = array();
+    protected $stack = [];
     protected $position = -1;
 
     /**
@@ -26,7 +26,7 @@ class History
      */
     public function clear()
     {
-        $this->stack = array();
+        $this->stack = [];
         $this->position = -1;
     }
 
diff --git a/src/Symfony/Component/BrowserKit/Response.php b/src/Symfony/Component/BrowserKit/Response.php
index 766a87e4d6d62..f69f84171dee9 100644
--- a/src/Symfony/Component/BrowserKit/Response.php
+++ b/src/Symfony/Component/BrowserKit/Response.php
@@ -116,10 +116,10 @@ public function getHeader($header, $first = true)
                     return \is_array($value) ? (\count($value) ? $value[0] : '') : $value;
                 }
 
-                return \is_array($value) ? $value : array($value);
+                return \is_array($value) ? $value : [$value];
             }
         }
 
-        return $first ? null : array();
+        return $first ? null : [];
     }
 }
diff --git a/src/Symfony/Component/BrowserKit/Tests/ClientTest.php b/src/Symfony/Component/BrowserKit/Tests/ClientTest.php
index a5c72943aec31..ab6d118589c11 100644
--- a/src/Symfony/Component/BrowserKit/Tests/ClientTest.php
+++ b/src/Symfony/Component/BrowserKit/Tests/ClientTest.php
@@ -76,13 +76,13 @@ class ClientTest extends TestCase
 {
     public function testGetHistory()
     {
-        $client = new TestClient(array(), $history = new History());
+        $client = new TestClient([], $history = new History());
         $this->assertSame($history, $client->getHistory(), '->getHistory() returns the History');
     }
 
     public function testGetCookieJar()
     {
-        $client = new TestClient(array(), null, $cookieJar = new CookieJar());
+        $client = new TestClient([], null, $cookieJar = new CookieJar());
         $this->assertSame($cookieJar, $client->getCookieJar(), '->getCookieJar() returns the CookieJar');
     }
 
@@ -97,7 +97,7 @@ public function testGetRequest()
     public function testGetRequestWithIpAsHttpHost()
     {
         $client = new TestClient();
-        $client->request('GET', 'https://example.com/foo', array(), array(), array('HTTP_HOST' => '127.0.0.1'));
+        $client->request('GET', 'https://example.com/foo', [], [], ['HTTP_HOST' => '127.0.0.1']);
 
         $this->assertEquals('https://example.com/foo', $client->getRequest()->getUri());
         $headers = $client->getRequest()->getServer();
@@ -130,7 +130,7 @@ public function testGetContent()
         $json = '{"jsonrpc":"2.0","method":"echo","id":7,"params":["Hello World"]}';
 
         $client = new TestClient();
-        $client->request('POST', 'http://example.com/jsonrpc', array(), array(), array(), $json);
+        $client->request('POST', 'http://example.com/jsonrpc', [], [], [], $json);
         $this->assertEquals($json, $client->getRequest()->getContent());
     }
 
@@ -246,18 +246,18 @@ public function testRequestHistory()
     public function testRequestCookies()
     {
         $client = new TestClient();
-        $client->setNextResponse(new Response('<html><a href="/foo">foo</a></html>', 200, array('Set-Cookie' => 'foo=bar')));
+        $client->setNextResponse(new Response('<html><a href="/foo">foo</a></html>', 200, ['Set-Cookie' => 'foo=bar']));
         $client->request('GET', 'http://www.example.com/foo/foobar');
-        $this->assertEquals(array('foo' => 'bar'), $client->getCookieJar()->allValues('http://www.example.com/foo/foobar'), '->request() updates the CookieJar');
+        $this->assertEquals(['foo' => 'bar'], $client->getCookieJar()->allValues('http://www.example.com/foo/foobar'), '->request() updates the CookieJar');
 
         $client->request('GET', 'bar');
-        $this->assertEquals(array('foo' => 'bar'), $client->getCookieJar()->allValues('http://www.example.com/foo/foobar'), '->request() updates the CookieJar');
+        $this->assertEquals(['foo' => 'bar'], $client->getCookieJar()->allValues('http://www.example.com/foo/foobar'), '->request() updates the CookieJar');
     }
 
     public function testRequestSecureCookies()
     {
         $client = new TestClient();
-        $client->setNextResponse(new Response('<html><a href="/foo">foo</a></html>', 200, array('Set-Cookie' => 'foo=bar; path=/; secure')));
+        $client->setNextResponse(new Response('<html><a href="/foo">foo</a></html>', 200, ['Set-Cookie' => 'foo=bar; path=/; secure']));
         $client->request('GET', 'https://www.example.com/foo/foobar');
 
         $this->assertTrue($client->getCookieJar()->get('foo', '/', 'www.example.com')->isSecure());
@@ -298,7 +298,7 @@ public function testSubmit()
 
     public function testSubmitPreserveAuth()
     {
-        $client = new TestClient(array('PHP_AUTH_USER' => 'foo', 'PHP_AUTH_PW' => 'bar'));
+        $client = new TestClient(['PHP_AUTH_USER' => 'foo', 'PHP_AUTH_PW' => 'bar']);
         $client->setNextResponse(new Response('<html><form action="/foo"><input type="submit" /></form></html>'));
         $crawler = $client->request('GET', 'http://www.example.com/foo/foobar');
 
@@ -332,26 +332,26 @@ public function testFollowRedirect()
             $this->assertInstanceOf('LogicException', $e, '->followRedirect() throws a \LogicException if the request was not redirected');
         }
 
-        $client->setNextResponse(new Response('', 302, array('Location' => 'http://www.example.com/redirected')));
+        $client->setNextResponse(new Response('', 302, ['Location' => 'http://www.example.com/redirected']));
         $client->request('GET', 'http://www.example.com/foo/foobar');
         $client->followRedirect();
 
         $this->assertEquals('http://www.example.com/redirected', $client->getRequest()->getUri(), '->followRedirect() follows a redirect if any');
 
         $client = new TestClient();
-        $client->setNextResponse(new Response('', 302, array('Location' => 'http://www.example.com/redirected')));
+        $client->setNextResponse(new Response('', 302, ['Location' => 'http://www.example.com/redirected']));
         $client->request('GET', 'http://www.example.com/foo/foobar');
 
         $this->assertEquals('http://www.example.com/redirected', $client->getRequest()->getUri(), '->followRedirect() automatically follows redirects if followRedirects is true');
 
         $client = new TestClient();
-        $client->setNextResponse(new Response('', 201, array('Location' => 'http://www.example.com/redirected')));
+        $client->setNextResponse(new Response('', 201, ['Location' => 'http://www.example.com/redirected']));
         $client->request('GET', 'http://www.example.com/foo/foobar');
 
         $this->assertEquals('http://www.example.com/foo/foobar', $client->getRequest()->getUri(), '->followRedirect() does not follow redirect if HTTP Code is not 30x');
 
         $client = new TestClient();
-        $client->setNextResponse(new Response('', 201, array('Location' => 'http://www.example.com/redirected')));
+        $client->setNextResponse(new Response('', 201, ['Location' => 'http://www.example.com/redirected']));
         $client->followRedirects(false);
         $client->request('GET', 'http://www.example.com/foo/foobar');
 
@@ -366,12 +366,12 @@ public function testFollowRedirect()
     public function testFollowRelativeRedirect()
     {
         $client = new TestClient();
-        $client->setNextResponse(new Response('', 302, array('Location' => '/redirected')));
+        $client->setNextResponse(new Response('', 302, ['Location' => '/redirected']));
         $client->request('GET', 'http://www.example.com/foo/foobar');
         $this->assertEquals('http://www.example.com/redirected', $client->getRequest()->getUri(), '->followRedirect() follows a redirect if any');
 
         $client = new TestClient();
-        $client->setNextResponse(new Response('', 302, array('Location' => '/redirected:1234')));
+        $client->setNextResponse(new Response('', 302, ['Location' => '/redirected:1234']));
         $client->request('GET', 'http://www.example.com/foo/foobar');
         $this->assertEquals('http://www.example.com/redirected:1234', $client->getRequest()->getUri(), '->followRedirect() follows relative urls');
     }
@@ -380,11 +380,11 @@ public function testFollowRedirectWithMaxRedirects()
     {
         $client = new TestClient();
         $client->setMaxRedirects(1);
-        $client->setNextResponse(new Response('', 302, array('Location' => 'http://www.example.com/redirected')));
+        $client->setNextResponse(new Response('', 302, ['Location' => 'http://www.example.com/redirected']));
         $client->request('GET', 'http://www.example.com/foo/foobar');
         $this->assertEquals('http://www.example.com/redirected', $client->getRequest()->getUri(), '->followRedirect() follows a redirect if any');
 
-        $client->setNextResponse(new Response('', 302, array('Location' => 'http://www.example.com/redirected2')));
+        $client->setNextResponse(new Response('', 302, ['Location' => 'http://www.example.com/redirected2']));
         try {
             $client->followRedirect();
             $this->fail('->followRedirect() throws a \LogicException if the request was redirected and limit of redirections was reached');
@@ -392,60 +392,60 @@ public function testFollowRedirectWithMaxRedirects()
             $this->assertInstanceOf('LogicException', $e, '->followRedirect() throws a \LogicException if the request was redirected and limit of redirections was reached');
         }
 
-        $client->setNextResponse(new Response('', 302, array('Location' => 'http://www.example.com/redirected')));
+        $client->setNextResponse(new Response('', 302, ['Location' => 'http://www.example.com/redirected']));
         $client->request('GET', 'http://www.example.com/foo/foobar');
         $this->assertEquals('http://www.example.com/redirected', $client->getRequest()->getUri(), '->followRedirect() follows a redirect if any');
 
-        $client->setNextResponse(new Response('', 302, array('Location' => '/redirected')));
+        $client->setNextResponse(new Response('', 302, ['Location' => '/redirected']));
         $client->request('GET', 'http://www.example.com/foo/foobar');
 
         $this->assertEquals('http://www.example.com/redirected', $client->getRequest()->getUri(), '->followRedirect() follows relative URLs');
 
         $client = new TestClient();
-        $client->setNextResponse(new Response('', 302, array('Location' => '//www.example.org/')));
+        $client->setNextResponse(new Response('', 302, ['Location' => '//www.example.org/']));
         $client->request('GET', 'https://www.example.com/');
 
         $this->assertEquals('https://www.example.org/', $client->getRequest()->getUri(), '->followRedirect() follows protocol-relative URLs');
 
         $client = new TestClient();
-        $client->setNextResponse(new Response('', 302, array('Location' => 'http://www.example.com/redirected')));
-        $client->request('POST', 'http://www.example.com/foo/foobar', array('name' => 'bar'));
+        $client->setNextResponse(new Response('', 302, ['Location' => 'http://www.example.com/redirected']));
+        $client->request('POST', 'http://www.example.com/foo/foobar', ['name' => 'bar']);
 
         $this->assertEquals('GET', $client->getRequest()->getMethod(), '->followRedirect() uses a GET for 302');
-        $this->assertEquals(array(), $client->getRequest()->getParameters(), '->followRedirect() does not submit parameters when changing the method');
+        $this->assertEquals([], $client->getRequest()->getParameters(), '->followRedirect() does not submit parameters when changing the method');
     }
 
     public function testFollowRedirectWithCookies()
     {
         $client = new TestClient();
         $client->followRedirects(false);
-        $client->setNextResponse(new Response('', 302, array(
+        $client->setNextResponse(new Response('', 302, [
             'Location' => 'http://www.example.com/redirected',
             'Set-Cookie' => 'foo=bar',
-        )));
+        ]));
         $client->request('GET', 'http://www.example.com/');
-        $this->assertEquals(array(), $client->getRequest()->getCookies());
+        $this->assertEquals([], $client->getRequest()->getCookies());
         $client->followRedirect();
-        $this->assertEquals(array('foo' => 'bar'), $client->getRequest()->getCookies());
+        $this->assertEquals(['foo' => 'bar'], $client->getRequest()->getCookies());
     }
 
     public function testFollowRedirectWithHeaders()
     {
-        $headers = array(
+        $headers = [
             'HTTP_HOST' => 'www.example.com',
             'HTTP_USER_AGENT' => 'Symfony BrowserKit',
             'CONTENT_TYPE' => 'application/vnd.custom+xml',
             'HTTPS' => false,
-        );
+        ];
 
         $client = new TestClient();
         $client->followRedirects(false);
-        $client->setNextResponse(new Response('', 302, array(
+        $client->setNextResponse(new Response('', 302, [
             'Location' => 'http://www.example.com/redirected',
-        )));
-        $client->request('GET', 'http://www.example.com/', array(), array(), array(
+        ]));
+        $client->request('GET', 'http://www.example.com/', [], [], [
             'CONTENT_TYPE' => 'application/vnd.custom+xml',
-        ));
+        ]);
 
         $this->assertEquals($headers, $client->getRequest()->getServer());
 
@@ -458,17 +458,17 @@ public function testFollowRedirectWithHeaders()
 
     public function testFollowRedirectWithPort()
     {
-        $headers = array(
+        $headers = [
             'HTTP_HOST' => 'www.example.com:8080',
             'HTTP_USER_AGENT' => 'Symfony BrowserKit',
             'HTTPS' => false,
             'HTTP_REFERER' => 'http://www.example.com:8080/',
-        );
+        ];
 
         $client = new TestClient();
-        $client->setNextResponse(new Response('', 302, array(
+        $client->setNextResponse(new Response('', 302, [
             'Location' => 'http://www.example.com:8080/redirected',
-        )));
+        ]));
         $client->request('GET', 'http://www.example.com:8080/');
 
         $this->assertEquals($headers, $client->getRequest()->getServer());
@@ -492,14 +492,14 @@ public function testGetMaxRedirects()
 
     public function testFollowRedirectWithPostMethod()
     {
-        $parameters = array('foo' => 'bar');
-        $files = array('myfile.foo' => 'baz');
-        $server = array('X_TEST_FOO' => 'bazbar');
+        $parameters = ['foo' => 'bar'];
+        $files = ['myfile.foo' => 'baz'];
+        $server = ['X_TEST_FOO' => 'bazbar'];
         $content = 'foobarbaz';
 
         $client = new TestClient();
 
-        $client->setNextResponse(new Response('', 307, array('Location' => 'http://www.example.com/redirected')));
+        $client->setNextResponse(new Response('', 307, ['Location' => 'http://www.example.com/redirected']));
         $client->request('POST', 'http://www.example.com/foo/foobar', $parameters, $files, $server, $content);
 
         $this->assertEquals('http://www.example.com/redirected', $client->getRequest()->getUri(), '->followRedirect() follows a redirect with POST method');
@@ -512,15 +512,15 @@ public function testFollowRedirectWithPostMethod()
 
     public function testFollowRedirectDropPostMethod()
     {
-        $parameters = array('foo' => 'bar');
-        $files = array('myfile.foo' => 'baz');
-        $server = array('X_TEST_FOO' => 'bazbar');
+        $parameters = ['foo' => 'bar'];
+        $files = ['myfile.foo' => 'baz'];
+        $server = ['X_TEST_FOO' => 'bazbar'];
         $content = 'foobarbaz';
 
         $client = new TestClient();
 
-        foreach (array(301, 302, 303) as $code) {
-            $client->setNextResponse(new Response('', $code, array('Location' => 'http://www.example.com/redirected')));
+        foreach ([301, 302, 303] as $code) {
+            $client->setNextResponse(new Response('', $code, ['Location' => 'http://www.example.com/redirected']));
             $client->request('POST', 'http://www.example.com/foo/foobar', $parameters, $files, $server, $content);
 
             $this->assertEquals('http://www.example.com/redirected', $client->getRequest()->getUri(), '->followRedirect() follows a redirect with POST method on response code: '.$code.'.');
@@ -536,9 +536,9 @@ public function testBack()
     {
         $client = new TestClient();
 
-        $parameters = array('foo' => 'bar');
-        $files = array('myfile.foo' => 'baz');
-        $server = array('X_TEST_FOO' => 'bazbar');
+        $parameters = ['foo' => 'bar'];
+        $files = ['myfile.foo' => 'baz'];
+        $server = ['X_TEST_FOO' => 'bazbar'];
         $content = 'foobarbaz';
 
         $client->request('GET', 'http://www.example.com/foo/foobar', $parameters, $files, $server, $content);
@@ -556,9 +556,9 @@ public function testForward()
     {
         $client = new TestClient();
 
-        $parameters = array('foo' => 'bar');
-        $files = array('myfile.foo' => 'baz');
-        $server = array('X_TEST_FOO' => 'bazbar');
+        $parameters = ['foo' => 'bar'];
+        $files = ['myfile.foo' => 'baz'];
+        $server = ['X_TEST_FOO' => 'bazbar'];
         $content = 'foobarbaz';
 
         $client->request('GET', 'http://www.example.com/foo/foobar');
@@ -578,7 +578,7 @@ public function testBackAndFrowardWithRedirects()
         $client = new TestClient();
 
         $client->request('GET', 'http://www.example.com/foo');
-        $client->setNextResponse(new Response('', 301, array('Location' => 'http://www.example.com/redirected')));
+        $client->setNextResponse(new Response('', 301, ['Location' => 'http://www.example.com/redirected']));
         $client->request('GET', 'http://www.example.com/bar');
 
         $this->assertEquals('http://www.example.com/redirected', $client->getRequest()->getUri(), 'client followed redirect');
@@ -596,9 +596,9 @@ public function testReload()
     {
         $client = new TestClient();
 
-        $parameters = array('foo' => 'bar');
-        $files = array('myfile.foo' => 'baz');
-        $server = array('X_TEST_FOO' => 'bazbar');
+        $parameters = ['foo' => 'bar'];
+        $files = ['myfile.foo' => 'baz'];
+        $server = ['X_TEST_FOO' => 'bazbar'];
         $content = 'foobarbaz';
 
         $client->request('GET', 'http://www.example.com/foo/foobar', $parameters, $files, $server, $content);
@@ -618,7 +618,7 @@ public function testRestart()
         $client->restart();
 
         $this->assertTrue($client->getHistory()->isEmpty(), '->restart() clears the history');
-        $this->assertEquals(array(), $client->getCookieJar()->all(), '->restart() clears the cookies');
+        $this->assertEquals([], $client->getCookieJar()->all(), '->restart() clears the cookies');
     }
 
     public function testInsulatedRequests()
@@ -669,12 +669,12 @@ public function testSetServerParameterInRequest()
         $this->assertEquals('', $client->getServerParameter('HTTP_HOST'));
         $this->assertEquals('Symfony BrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
 
-        $client->request('GET', 'https://www.example.com/https/www.example.com', array(), array(), array(
+        $client->request('GET', 'https://www.example.com/https/www.example.com', [], [], [
             'HTTP_HOST' => 'testhost',
             'HTTP_USER_AGENT' => 'testua',
             'HTTPS' => false,
             'NEW_SERVER_KEY' => 'new-server-key-value',
-        ));
+        ]);
 
         $this->assertEquals('', $client->getServerParameter('HTTP_HOST'));
         $this->assertEquals('Symfony BrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
@@ -700,16 +700,16 @@ public function testRequestWithRelativeUri()
     {
         $client = new TestClient();
 
-        $client->request('GET', '/', array(), array(), array(
+        $client->request('GET', '/', [], [], [
             'HTTP_HOST' => 'testhost',
             'HTTPS' => true,
-        ));
+        ]);
         $this->assertEquals('https://testhost/', $client->getRequest()->getUri());
 
-        $client->request('GET', 'https://www.example.com/', array(), array(), array(
+        $client->request('GET', 'https://www.example.com/', [], [], [
             'HTTP_HOST' => 'testhost',
             'HTTPS' => false,
-        ));
+        ]);
         $this->assertEquals('https://www.example.com/', $client->getRequest()->getUri());
     }
 
@@ -717,12 +717,12 @@ public function testInternalRequest()
     {
         $client = new TestClient();
 
-        $client->request('GET', 'https://www.example.com/https/www.example.com', array(), array(), array(
+        $client->request('GET', 'https://www.example.com/https/www.example.com', [], [], [
             'HTTP_HOST' => 'testhost',
             'HTTP_USER_AGENT' => 'testua',
             'HTTPS' => false,
             'NEW_SERVER_KEY' => 'new-server-key-value',
-        ));
+        ]);
 
         $this->assertInstanceOf('Symfony\Component\BrowserKit\Request', $client->getInternalRequest());
     }
diff --git a/src/Symfony/Component/BrowserKit/Tests/CookieJarTest.php b/src/Symfony/Component/BrowserKit/Tests/CookieJarTest.php
index 3117e5ce47326..d88f0234c6d29 100644
--- a/src/Symfony/Component/BrowserKit/Tests/CookieJarTest.php
+++ b/src/Symfony/Component/BrowserKit/Tests/CookieJarTest.php
@@ -45,7 +45,7 @@ public function testAll()
         $cookieJar->set($cookie1 = new Cookie('foo', 'bar'));
         $cookieJar->set($cookie2 = new Cookie('bar', 'foo'));
 
-        $this->assertEquals(array($cookie1, $cookie2), $cookieJar->all(), '->all() returns all cookies in the jar');
+        $this->assertEquals([$cookie1, $cookie2], $cookieJar->all(), '->all() returns all cookies in the jar');
     }
 
     public function testClear()
@@ -56,12 +56,12 @@ public function testClear()
 
         $cookieJar->clear();
 
-        $this->assertEquals(array(), $cookieJar->all(), '->clear() expires all cookies');
+        $this->assertEquals([], $cookieJar->all(), '->clear() expires all cookies');
     }
 
     public function testUpdateFromResponse()
     {
-        $response = new Response('', 200, array('Set-Cookie' => 'foo=foo'));
+        $response = new Response('', 200, ['Set-Cookie' => 'foo=foo']);
 
         $cookieJar = new CookieJar();
         $cookieJar->updateFromResponse($response);
@@ -71,7 +71,7 @@ public function testUpdateFromResponse()
 
     public function testUpdateFromSetCookie()
     {
-        $setCookies = array('foo=foo');
+        $setCookies = ['foo=foo'];
 
         $cookieJar = new CookieJar();
         $cookieJar->set(new Cookie('bar', 'bar'));
@@ -86,15 +86,15 @@ public function testUpdateFromSetCookie()
     public function testUpdateFromEmptySetCookie()
     {
         $cookieJar = new CookieJar();
-        $cookieJar->updateFromSetCookie(array(''));
-        $this->assertEquals(array(), $cookieJar->all());
+        $cookieJar->updateFromSetCookie(['']);
+        $this->assertEquals([], $cookieJar->all());
     }
 
     public function testUpdateFromSetCookieWithMultipleCookies()
     {
         $timestamp = time() + 3600;
         $date = gmdate('D, d M Y H:i:s \G\M\T', $timestamp);
-        $setCookies = array(sprintf('foo=foo; expires=%s; domain=.symfony.com; path=/, bar=bar; domain=.blog.symfony.com, PHPSESSID=id; expires=%1$s', $date));
+        $setCookies = [sprintf('foo=foo; expires=%s; domain=.symfony.com; path=/, bar=bar; domain=.blog.symfony.com, PHPSESSID=id; expires=%1$s', $date)];
 
         $cookieJar = new CookieJar();
         $cookieJar->updateFromSetCookie($setCookies);
@@ -132,15 +132,15 @@ public function testAllValues($uri, $values)
 
     public function provideAllValuesValues()
     {
-        return array(
-            array('http://www.example.com', array('foo_nothing', 'foo_domain')),
-            array('http://www.example.com/', array('foo_nothing', 'foo_domain')),
-            array('http://foo.example.com/', array('foo_nothing', 'foo_domain')),
-            array('http://foo.example1.com/', array('foo_nothing')),
-            array('https://foo.example.com/', array('foo_nothing', 'foo_secure', 'foo_domain')),
-            array('http://www.example.com/foo/bar', array('foo_nothing', 'foo_path', 'foo_domain')),
-            array('http://www4.example.com/', array('foo_nothing', 'foo_domain', 'foo_strict_domain')),
-        );
+        return [
+            ['http://www.example.com', ['foo_nothing', 'foo_domain']],
+            ['http://www.example.com/', ['foo_nothing', 'foo_domain']],
+            ['http://foo.example.com/', ['foo_nothing', 'foo_domain']],
+            ['http://foo.example1.com/', ['foo_nothing']],
+            ['https://foo.example.com/', ['foo_nothing', 'foo_secure', 'foo_domain']],
+            ['http://www.example.com/foo/bar', ['foo_nothing', 'foo_path', 'foo_domain']],
+            ['http://www4.example.com/', ['foo_nothing', 'foo_domain', 'foo_strict_domain']],
+        ];
     }
 
     public function testEncodedValues()
@@ -148,8 +148,8 @@ public function testEncodedValues()
         $cookieJar = new CookieJar();
         $cookieJar->set($cookie = new Cookie('foo', 'bar%3Dbaz', null, '/', '', false, true, true));
 
-        $this->assertEquals(array('foo' => 'bar=baz'), $cookieJar->allValues('/'));
-        $this->assertEquals(array('foo' => 'bar%3Dbaz'), $cookieJar->allRawValues('/'));
+        $this->assertEquals(['foo' => 'bar=baz'], $cookieJar->allValues('/'));
+        $this->assertEquals(['foo' => 'bar%3Dbaz'], $cookieJar->allRawValues('/'));
     }
 
     public function testCookieExpireWithSameNameButDifferentPaths()
@@ -160,9 +160,9 @@ public function testCookieExpireWithSameNameButDifferentPaths()
         $cookieJar->expire('foo', '/foo');
 
         $this->assertNull($cookieJar->get('foo'), '->get() returns null if the cookie is expired');
-        $this->assertEquals(array(), array_keys($cookieJar->allValues('http://example.com/')));
-        $this->assertEquals(array(), $cookieJar->allValues('http://example.com/foo'));
-        $this->assertEquals(array('foo' => 'bar2'), $cookieJar->allValues('http://example.com/bar'));
+        $this->assertEquals([], array_keys($cookieJar->allValues('http://example.com/')));
+        $this->assertEquals([], $cookieJar->allValues('http://example.com/foo'));
+        $this->assertEquals(['foo' => 'bar2'], $cookieJar->allValues('http://example.com/bar'));
     }
 
     public function testCookieExpireWithNullPaths()
@@ -172,7 +172,7 @@ public function testCookieExpireWithNullPaths()
         $cookieJar->expire('foo', null);
 
         $this->assertNull($cookieJar->get('foo'), '->get() returns null if the cookie is expired');
-        $this->assertEquals(array(), array_keys($cookieJar->allValues('http://example.com/')));
+        $this->assertEquals([], array_keys($cookieJar->allValues('http://example.com/')));
     }
 
     public function testCookieExpireWithDomain()
@@ -182,7 +182,7 @@ public function testCookieExpireWithDomain()
         $cookieJar->expire('foo', '/foo', 'http://example2.com/');
 
         $this->assertNull($cookieJar->get('foo'), '->get() returns null if the cookie is expired');
-        $this->assertEquals(array(), array_keys($cookieJar->allValues('http://example2.com/')));
+        $this->assertEquals([], array_keys($cookieJar->allValues('http://example2.com/')));
     }
 
     public function testCookieWithSameNameButDifferentPaths()
@@ -191,9 +191,9 @@ public function testCookieWithSameNameButDifferentPaths()
         $cookieJar->set($cookie1 = new Cookie('foo', 'bar1', null, '/foo'));
         $cookieJar->set($cookie2 = new Cookie('foo', 'bar2', null, '/bar'));
 
-        $this->assertEquals(array(), array_keys($cookieJar->allValues('http://example.com/')));
-        $this->assertEquals(array('foo' => 'bar1'), $cookieJar->allValues('http://example.com/foo'));
-        $this->assertEquals(array('foo' => 'bar2'), $cookieJar->allValues('http://example.com/bar'));
+        $this->assertEquals([], array_keys($cookieJar->allValues('http://example.com/')));
+        $this->assertEquals(['foo' => 'bar1'], $cookieJar->allValues('http://example.com/foo'));
+        $this->assertEquals(['foo' => 'bar2'], $cookieJar->allValues('http://example.com/bar'));
     }
 
     public function testCookieWithSameNameButDifferentDomains()
@@ -202,9 +202,9 @@ public function testCookieWithSameNameButDifferentDomains()
         $cookieJar->set($cookie1 = new Cookie('foo', 'bar1', null, '/', 'foo.example.com'));
         $cookieJar->set($cookie2 = new Cookie('foo', 'bar2', null, '/', 'bar.example.com'));
 
-        $this->assertEquals(array(), array_keys($cookieJar->allValues('http://example.com/')));
-        $this->assertEquals(array('foo' => 'bar1'), $cookieJar->allValues('http://foo.example.com/'));
-        $this->assertEquals(array('foo' => 'bar2'), $cookieJar->allValues('http://bar.example.com/'));
+        $this->assertEquals([], array_keys($cookieJar->allValues('http://example.com/')));
+        $this->assertEquals(['foo' => 'bar1'], $cookieJar->allValues('http://foo.example.com/'));
+        $this->assertEquals(['foo' => 'bar2'], $cookieJar->allValues('http://bar.example.com/'));
     }
 
     public function testCookieGetWithSubdomain()
@@ -246,7 +246,7 @@ public function testCookieWithWildcardDomain()
         $cookieJar = new CookieJar();
         $cookieJar->set(new Cookie('foo', 'bar', null, '/', '.example.com'));
 
-        $this->assertEquals(array('foo' => 'bar'), $cookieJar->allValues('http://www.example.com'));
+        $this->assertEquals(['foo' => 'bar'], $cookieJar->allValues('http://www.example.com'));
         $this->assertEmpty($cookieJar->allValues('http://wwwexample.com'));
     }
 }
diff --git a/src/Symfony/Component/BrowserKit/Tests/CookieTest.php b/src/Symfony/Component/BrowserKit/Tests/CookieTest.php
index 2f5a08d104143..1ffa1d87ed3b6 100644
--- a/src/Symfony/Component/BrowserKit/Tests/CookieTest.php
+++ b/src/Symfony/Component/BrowserKit/Tests/CookieTest.php
@@ -41,16 +41,16 @@ public function testToFromString($cookie, $url = null)
 
     public function getTestsForToFromString()
     {
-        return array(
-            array('foo=bar; path=/'),
-            array('foo=bar; path=/foo'),
-            array('foo=bar; domain=google.com; path=/'),
-            array('foo=bar; domain=example.com; path=/; secure', 'https://example.com/'),
-            array('foo=bar; path=/; httponly'),
-            array('foo=bar; domain=google.com; path=/foo; secure; httponly', 'https://google.com/'),
-            array('foo=bar=baz; path=/'),
-            array('foo=bar%3Dbaz; path=/'),
-        );
+        return [
+            ['foo=bar; path=/'],
+            ['foo=bar; path=/foo'],
+            ['foo=bar; domain=google.com; path=/'],
+            ['foo=bar; domain=example.com; path=/; secure', 'https://example.com/'],
+            ['foo=bar; path=/; httponly'],
+            ['foo=bar; domain=google.com; path=/foo; secure; httponly', 'https://google.com/'],
+            ['foo=bar=baz; path=/'],
+            ['foo=bar%3Dbaz; path=/'],
+        ];
     }
 
     public function testFromStringIgnoreSecureFlag()
@@ -69,16 +69,16 @@ public function testFromStringAcceptsSeveralExpiresDateFormats($cookie)
 
     public function getExpireCookieStrings()
     {
-        return array(
-            array('foo=bar; expires=Fri, 31-Jul-2020 08:49:37 GMT'),
-            array('foo=bar; expires=Fri, 31 Jul 2020 08:49:37 GMT'),
-            array('foo=bar; expires=Fri, 31-07-2020 08:49:37 GMT'),
-            array('foo=bar; expires=Fri, 31-07-20 08:49:37 GMT'),
-            array('foo=bar; expires=Friday, 31-Jul-20 08:49:37 GMT'),
-            array('foo=bar; expires=Fri Jul 31 08:49:37 2020'),
-            array('foo=bar; expires=\'Fri Jul 31 08:49:37 2020\''),
-            array('foo=bar; expires=Friday July 31st 2020, 08:49:37 GMT'),
-        );
+        return [
+            ['foo=bar; expires=Fri, 31-Jul-2020 08:49:37 GMT'],
+            ['foo=bar; expires=Fri, 31 Jul 2020 08:49:37 GMT'],
+            ['foo=bar; expires=Fri, 31-07-2020 08:49:37 GMT'],
+            ['foo=bar; expires=Fri, 31-07-20 08:49:37 GMT'],
+            ['foo=bar; expires=Friday, 31-Jul-20 08:49:37 GMT'],
+            ['foo=bar; expires=Fri Jul 31 08:49:37 2020'],
+            ['foo=bar; expires=\'Fri Jul 31 08:49:37 2020\''],
+            ['foo=bar; expires=Friday July 31st 2020, 08:49:37 GMT'],
+        ];
     }
 
     public function testFromStringWithCapitalization()
diff --git a/src/Symfony/Component/BrowserKit/Tests/RequestTest.php b/src/Symfony/Component/BrowserKit/Tests/RequestTest.php
index f163de9674378..e7718eef87ad6 100644
--- a/src/Symfony/Component/BrowserKit/Tests/RequestTest.php
+++ b/src/Symfony/Component/BrowserKit/Tests/RequestTest.php
@@ -30,25 +30,25 @@ public function testGetMethod()
 
     public function testGetParameters()
     {
-        $request = new Request('http://www.example.com/', 'get', array('foo' => 'bar'));
-        $this->assertEquals(array('foo' => 'bar'), $request->getParameters(), '->getParameters() returns the parameters of the request');
+        $request = new Request('http://www.example.com/', 'get', ['foo' => 'bar']);
+        $this->assertEquals(['foo' => 'bar'], $request->getParameters(), '->getParameters() returns the parameters of the request');
     }
 
     public function testGetFiles()
     {
-        $request = new Request('http://www.example.com/', 'get', array(), array('foo' => 'bar'));
-        $this->assertEquals(array('foo' => 'bar'), $request->getFiles(), '->getFiles() returns the uploaded files of the request');
+        $request = new Request('http://www.example.com/', 'get', [], ['foo' => 'bar']);
+        $this->assertEquals(['foo' => 'bar'], $request->getFiles(), '->getFiles() returns the uploaded files of the request');
     }
 
     public function testGetCookies()
     {
-        $request = new Request('http://www.example.com/', 'get', array(), array(), array('foo' => 'bar'));
-        $this->assertEquals(array('foo' => 'bar'), $request->getCookies(), '->getCookies() returns the cookies of the request');
+        $request = new Request('http://www.example.com/', 'get', [], [], ['foo' => 'bar']);
+        $this->assertEquals(['foo' => 'bar'], $request->getCookies(), '->getCookies() returns the cookies of the request');
     }
 
     public function testGetServer()
     {
-        $request = new Request('http://www.example.com/', 'get', array(), array(), array(), array('foo' => 'bar'));
-        $this->assertEquals(array('foo' => 'bar'), $request->getServer(), '->getServer() returns the server parameters of the request');
+        $request = new Request('http://www.example.com/', 'get', [], [], [], ['foo' => 'bar']);
+        $this->assertEquals(['foo' => 'bar'], $request->getServer(), '->getServer() returns the server parameters of the request');
     }
 }
diff --git a/src/Symfony/Component/BrowserKit/Tests/ResponseTest.php b/src/Symfony/Component/BrowserKit/Tests/ResponseTest.php
index 0ba4e3b3a71d9..56f49aee19463 100644
--- a/src/Symfony/Component/BrowserKit/Tests/ResponseTest.php
+++ b/src/Symfony/Component/BrowserKit/Tests/ResponseTest.php
@@ -30,40 +30,40 @@ public function testGetStatus()
 
     public function testGetHeaders()
     {
-        $response = new Response('foo', 200, array('foo' => 'bar'));
-        $this->assertEquals(array('foo' => 'bar'), $response->getHeaders(), '->getHeaders() returns the headers of the response');
+        $response = new Response('foo', 200, ['foo' => 'bar']);
+        $this->assertEquals(['foo' => 'bar'], $response->getHeaders(), '->getHeaders() returns the headers of the response');
     }
 
     public function testGetHeader()
     {
-        $response = new Response('foo', 200, array(
+        $response = new Response('foo', 200, [
             'Content-Type' => 'text/html',
-            'Set-Cookie' => array('foo=bar', 'bar=foo'),
-        ));
+            'Set-Cookie' => ['foo=bar', 'bar=foo'],
+        ]);
 
         $this->assertEquals('text/html', $response->getHeader('Content-Type'), '->getHeader() returns a header of the response');
         $this->assertEquals('text/html', $response->getHeader('content-type'), '->getHeader() returns a header of the response');
         $this->assertEquals('text/html', $response->getHeader('content_type'), '->getHeader() returns a header of the response');
         $this->assertEquals('foo=bar', $response->getHeader('Set-Cookie'), '->getHeader() returns the first header value');
-        $this->assertEquals(array('foo=bar', 'bar=foo'), $response->getHeader('Set-Cookie', false), '->getHeader() returns all header values if first is false');
+        $this->assertEquals(['foo=bar', 'bar=foo'], $response->getHeader('Set-Cookie', false), '->getHeader() returns all header values if first is false');
 
         $this->assertNull($response->getHeader('foo'), '->getHeader() returns null if the header is not defined');
-        $this->assertEquals(array(), $response->getHeader('foo', false), '->getHeader() returns an empty array if the header is not defined and first is set to false');
+        $this->assertEquals([], $response->getHeader('foo', false), '->getHeader() returns an empty array if the header is not defined and first is set to false');
     }
 
     public function testMagicToString()
     {
-        $response = new Response('foo', 304, array('foo' => 'bar'));
+        $response = new Response('foo', 304, ['foo' => 'bar']);
 
         $this->assertEquals("foo: bar\n\nfoo", $response->__toString(), '->__toString() returns the headers and the content as a string');
     }
 
     public function testMagicToStringWithMultipleSetCookieHeader()
     {
-        $headers = array(
+        $headers = [
             'content-type' => 'text/html; charset=utf-8',
-            'set-cookie' => array('foo=bar', 'bar=foo'),
-        );
+            'set-cookie' => ['foo=bar', 'bar=foo'],
+        ];
 
         $expected = 'content-type: text/html; charset=utf-8'."\n";
         $expected .= 'set-cookie: foo=bar'."\n";
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
index 6ea4ce7acb3c2..5e334001cfef4 100644
--- a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -156,11 +156,11 @@ public function getItem($key)
         $value = null;
 
         try {
-            foreach ($this->doFetch(array($id)) as $value) {
+            foreach ($this->doFetch([$id]) as $value) {
                 $isHit = true;
             }
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch key "{key}"', array('key' => $key, 'exception' => $e));
+            CacheItem::log($this->logger, 'Failed to fetch key "{key}"', ['key' => $key, 'exception' => $e]);
         }
 
         return $f($key, $value, $isHit);
@@ -169,12 +169,12 @@ public function getItem($key)
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
         if ($this->deferred) {
             $this->commit();
         }
-        $ids = array();
+        $ids = [];
 
         foreach ($keys as $key) {
             $ids[] = $this->getId($key);
@@ -182,8 +182,8 @@ public function getItems(array $keys = array())
         try {
             $items = $this->doFetch($ids);
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch requested items', array('keys' => $keys, 'exception' => $e));
-            $items = array();
+            CacheItem::log($this->logger, 'Failed to fetch requested items', ['keys' => $keys, 'exception' => $e]);
+            $items = [];
         }
         $ids = array_combine($ids, $keys);
 
@@ -224,7 +224,7 @@ public function commit()
         $ok = true;
         $byLifetime = $this->mergeByLifetime;
         $byLifetime = $byLifetime($this->deferred, $this->namespace, $expiredIds);
-        $retry = $this->deferred = array();
+        $retry = $this->deferred = [];
 
         if ($expiredIds) {
             $this->doDelete($expiredIds);
@@ -234,7 +234,7 @@ public function commit()
                 $e = $this->doSave($values, $lifetime);
             } catch (\Exception $e) {
             }
-            if (true === $e || array() === $e) {
+            if (true === $e || [] === $e) {
                 continue;
             }
             if (\is_array($e) || 1 === \count($values)) {
@@ -242,7 +242,7 @@ public function commit()
                     $ok = false;
                     $v = $values[$id];
                     $type = \is_object($v) ? \get_class($v) : \gettype($v);
-                    CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', array('key' => substr($id, \strlen($this->namespace)), 'type' => $type, 'exception' => $e instanceof \Exception ? $e : null));
+                    CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', ['key' => substr($id, \strlen($this->namespace)), 'type' => $type, 'exception' => $e instanceof \Exception ? $e : null]);
                 }
             } else {
                 foreach ($values as $id => $v) {
@@ -256,15 +256,15 @@ public function commit()
             foreach ($ids as $id) {
                 try {
                     $v = $byLifetime[$lifetime][$id];
-                    $e = $this->doSave(array($id => $v), $lifetime);
+                    $e = $this->doSave([$id => $v], $lifetime);
                 } catch (\Exception $e) {
                 }
-                if (true === $e || array() === $e) {
+                if (true === $e || [] === $e) {
                     continue;
                 }
                 $ok = false;
                 $type = \is_object($v) ? \get_class($v) : \gettype($v);
-                CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', array('key' => substr($id, \strlen($this->namespace)), 'type' => $type, 'exception' => $e instanceof \Exception ? $e : null));
+                CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', ['key' => substr($id, \strlen($this->namespace)), 'type' => $type, 'exception' => $e instanceof \Exception ? $e : null]);
             }
         }
 
@@ -292,7 +292,7 @@ private function generateItems($items, &$keys)
                 yield $key => $f($key, $value, true);
             }
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch requested items', array('keys' => array_values($keys), 'exception' => $e));
+            CacheItem::log($this->logger, 'Failed to fetch requested items', ['keys' => array_values($keys), 'exception' => $e]);
         }
 
         foreach ($keys as $key) {
diff --git a/src/Symfony/Component/Cache/Adapter/AdapterInterface.php b/src/Symfony/Component/Cache/Adapter/AdapterInterface.php
index 41222c1ab57ce..85fe07684fb3c 100644
--- a/src/Symfony/Component/Cache/Adapter/AdapterInterface.php
+++ b/src/Symfony/Component/Cache/Adapter/AdapterInterface.php
@@ -33,5 +33,5 @@ public function getItem($key);
      *
      * @return \Traversable|CacheItem[]
      */
-    public function getItems(array $keys = array());
+    public function getItems(array $keys = []);
 }
diff --git a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
index 9c4332058c70e..9b15c456f6ae6 100644
--- a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
@@ -78,7 +78,7 @@ public function getItem($key)
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
         foreach ($keys as $key) {
             CacheItem::validateKey($key);
diff --git a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
index 72ff4c19fb501..0c10d9e3b8037 100644
--- a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
@@ -81,7 +81,7 @@ function ($sourceItem, $item) use ($defaultLifetime) {
     public function getItem($key)
     {
         $syncItem = $this->syncItem;
-        $misses = array();
+        $misses = [];
 
         foreach ($this->adapters as $i => $adapter) {
             $item = $adapter->getItem($key);
@@ -103,15 +103,15 @@ public function getItem($key)
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
         return $this->generateItems($this->adapters[0]->getItems($keys), 0);
     }
 
     private function generateItems($items, $adapterIndex)
     {
-        $missing = array();
-        $misses = array();
+        $missing = [];
+        $misses = [];
         $nextAdapterIndex = $adapterIndex + 1;
         $nextAdapter = isset($this->adapters[$nextAdapterIndex]) ? $this->adapters[$nextAdapterIndex] : null;
 
diff --git a/src/Symfony/Component/Cache/Adapter/NullAdapter.php b/src/Symfony/Component/Cache/Adapter/NullAdapter.php
index f58f81e5b8960..c81a1cd646610 100644
--- a/src/Symfony/Component/Cache/Adapter/NullAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/NullAdapter.php
@@ -49,7 +49,7 @@ public function getItem($key)
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
         return $this->generateItems($keys);
     }
diff --git a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
index 4bd0da8c43967..42a4142099385 100644
--- a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
@@ -120,7 +120,7 @@ public function getItem($key)
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
         foreach ($keys as $key) {
             if (!\is_string($key)) {
@@ -170,7 +170,7 @@ public function deleteItem($key)
     public function deleteItems(array $keys)
     {
         $deleted = true;
-        $fallbackKeys = array();
+        $fallbackKeys = [];
 
         foreach ($keys as $key) {
             if (!\is_string($key)) {
@@ -232,7 +232,7 @@ public function commit()
     private function generateItems(array $keys)
     {
         $f = $this->createCacheItem;
-        $fallbackKeys = array();
+        $fallbackKeys = [];
 
         foreach ($keys as $key) {
             if (isset($this->values[$key])) {
@@ -272,10 +272,10 @@ public static function throwOnRequiredClass($class)
     {
         $e = new \ReflectionException("Class $class does not exist");
         $trace = $e->getTrace();
-        $autoloadFrame = array(
+        $autoloadFrame = [
             'function' => 'spl_autoload_call',
-            'args' => array($class),
-        );
+            'args' => [$class],
+        ];
         $i = 1 + array_search($autoloadFrame, $trace, true);
 
         if (isset($trace[$i]['function']) && !isset($trace[$i]['class'])) {
diff --git a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
index 7682c72474724..9060523609159 100644
--- a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
@@ -73,7 +73,7 @@ public function getItem($key)
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
         if ($this->namespaceLen) {
             foreach ($keys as $i => $key) {
diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
index 62f815e0171ad..d453e271aef4c 100644
--- a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
@@ -27,13 +27,13 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
 
     use ProxyTrait;
 
-    private $deferred = array();
+    private $deferred = [];
     private $createCacheItem;
     private $setCacheItemTags;
     private $getTagsByKey;
     private $invalidateTags;
     private $tags;
-    private $knownTagVersions = array();
+    private $knownTagVersions = [];
     private $knownTagVersionsTtl;
 
     public function __construct(AdapterInterface $itemsPool, AdapterInterface $tagsPool = null, $knownTagVersionsTtl = 0.15)
@@ -78,7 +78,7 @@ function (CacheItem $item, $key, array &$itemTags) {
         );
         $this->getTagsByKey = \Closure::bind(
             function ($deferred) {
-                $tagsByKey = array();
+                $tagsByKey = [];
                 foreach ($deferred as $key => $item) {
                     $tagsByKey[$key] = $item->tags;
                 }
@@ -109,8 +109,8 @@ function (AdapterInterface $tagsAdapter, array $tags) {
     public function invalidateTags(array $tags)
     {
         $ok = true;
-        $tagsByKey = array();
-        $invalidatedTags = array();
+        $tagsByKey = [];
+        $invalidatedTags = [];
         foreach ($tags as $tag) {
             CacheItem::validateKey($tag);
             $invalidatedTags[$tag] = 0;
@@ -127,7 +127,7 @@ public function invalidateTags(array $tags)
 
             $f = $this->getTagsByKey;
             $tagsByKey = $f($items);
-            $this->deferred = array();
+            $this->deferred = [];
         }
 
         $tagVersions = $this->getTagVersions($tagsByKey, $invalidatedTags);
@@ -161,7 +161,7 @@ public function hasItem($key)
             return true;
         }
 
-        foreach ($this->getTagVersions(array($itemTags)) as $tag => $version) {
+        foreach ($this->getTagVersions([$itemTags]) as $tag => $version) {
             if ($itemTags[$tag] !== $version && 1 !== $itemTags[$tag] - $version) {
                 return false;
             }
@@ -175,7 +175,7 @@ public function hasItem($key)
      */
     public function getItem($key)
     {
-        foreach ($this->getItems(array($key)) as $item) {
+        foreach ($this->getItems([$key]) as $item) {
             return $item;
         }
     }
@@ -183,12 +183,12 @@ public function getItem($key)
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
         if ($this->deferred) {
             $this->commit();
         }
-        $tagKeys = array();
+        $tagKeys = [];
 
         foreach ($keys as $key) {
             if ('' !== $key && \is_string($key)) {
@@ -213,7 +213,7 @@ public function getItems(array $keys = array())
      */
     public function clear()
     {
-        $this->deferred = array();
+        $this->deferred = [];
 
         return $this->pool->clear();
     }
@@ -223,7 +223,7 @@ public function clear()
      */
     public function deleteItem($key)
     {
-        return $this->deleteItems(array($key));
+        return $this->deleteItems([$key]);
     }
 
     /**
@@ -271,7 +271,7 @@ public function saveDeferred(CacheItemInterface $item)
      */
     public function commit()
     {
-        return $this->invalidateTags(array());
+        return $this->invalidateTags([]);
     }
 
     public function __destruct()
@@ -281,7 +281,7 @@ public function __destruct()
 
     private function generateItems($items, array $tagKeys)
     {
-        $bufferedItems = $itemTags = array();
+        $bufferedItems = $itemTags = [];
         $f = $this->setCacheItemTags;
 
         foreach ($items as $key => $item) {
@@ -295,7 +295,7 @@ private function generateItems($items, array $tagKeys)
             }
 
             unset($tagKeys[$key]);
-            $itemTags[$key] = $item->get() ?: array();
+            $itemTags[$key] = $item->get() ?: [];
 
             if (!$tagKeys) {
                 $tagVersions = $this->getTagVersions($itemTags);
@@ -318,7 +318,7 @@ private function generateItems($items, array $tagKeys)
         }
     }
 
-    private function getTagVersions(array $tagsByKey, array &$invalidatedTags = array())
+    private function getTagVersions(array $tagsByKey, array &$invalidatedTags = [])
     {
         $tagVersions = $invalidatedTags;
 
@@ -327,7 +327,7 @@ private function getTagVersions(array $tagsByKey, array &$invalidatedTags = arra
         }
 
         if (!$tagVersions) {
-            return array();
+            return [];
         }
 
         if (!$fetchTagVersions = 1 !== \func_num_args()) {
@@ -341,7 +341,7 @@ private function getTagVersions(array $tagsByKey, array &$invalidatedTags = arra
         }
 
         $now = microtime(true);
-        $tags = array();
+        $tags = [];
         foreach ($tagVersions as $tag => $version) {
             $tags[$tag.static::TAGS_PREFIX] = $tag;
             if ($fetchTagVersions || !isset($this->knownTagVersions[$tag])) {
@@ -366,7 +366,7 @@ private function getTagVersions(array $tagsByKey, array &$invalidatedTags = arra
             if (isset($invalidatedTags[$tag])) {
                 $invalidatedTags[$tag] = $version->set(++$tagVersions[$tag]);
             }
-            $this->knownTagVersions[$tag] = array($now, $tagVersions[$tag]);
+            $this->knownTagVersions[$tag] = [$now, $tagVersions[$tag]];
         }
 
         return $tagVersions;
diff --git a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
index 98d0e526933b9..4aed2d7181f83 100644
--- a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
@@ -25,7 +25,7 @@
 class TraceableAdapter implements AdapterInterface, PruneableInterface, ResettableInterface
 {
     protected $pool;
-    private $calls = array();
+    private $calls = [];
 
     public function __construct(AdapterInterface $pool)
     {
@@ -107,7 +107,7 @@ public function saveDeferred(CacheItemInterface $item)
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
         $event = $this->start(__FUNCTION__);
         try {
@@ -116,7 +116,7 @@ public function getItems(array $keys = array())
             $event->end = microtime(true);
         }
         $f = function () use ($result, $event) {
-            $event->result = array();
+            $event->result = [];
             foreach ($result as $key => $item) {
                 if ($event->result[$key] = $item->isHit()) {
                     ++$event->hits;
@@ -209,7 +209,7 @@ public function getCalls()
 
     public function clearCalls()
     {
-        $this->calls = array();
+        $this->calls = [];
     }
 
     protected function start($name)
diff --git a/src/Symfony/Component/Cache/CacheItem.php b/src/Symfony/Component/Cache/CacheItem.php
index 58ecad82d2d4b..57348c2c8a54d 100644
--- a/src/Symfony/Component/Cache/CacheItem.php
+++ b/src/Symfony/Component/Cache/CacheItem.php
@@ -170,12 +170,12 @@ public static function validateKey($key)
      *
      * @internal
      */
-    public static function log(LoggerInterface $logger = null, $message, $context = array())
+    public static function log(LoggerInterface $logger = null, $message, $context = [])
     {
         if ($logger) {
             $logger->warning($message, $context);
         } else {
-            $replace = array();
+            $replace = [];
             foreach ($context as $k => $v) {
                 if (is_scalar($v)) {
                     $replace['{'.$k.'}'] = $v;
diff --git a/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php b/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php
index ac5c36d2fd83a..a2f826d705622 100644
--- a/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php
+++ b/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php
@@ -27,7 +27,7 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
     /**
      * @var TraceableAdapter[]
      */
-    private $instances = array();
+    private $instances = [];
 
     /**
      * @param string           $name
@@ -43,8 +43,8 @@ public function addInstance($name, TraceableAdapter $instance)
      */
     public function collect(Request $request, Response $response, \Exception $exception = null)
     {
-        $empty = array('calls' => array(), 'config' => array(), 'options' => array(), 'statistics' => array());
-        $this->data = array('instances' => $empty, 'total' => $empty);
+        $empty = ['calls' => [], 'config' => [], 'options' => [], 'statistics' => []];
+        $this->data = ['instances' => $empty, 'total' => $empty];
         foreach ($this->instances as $name => $instance) {
             $this->data['instances']['calls'][$name] = $instance->getCalls();
         }
@@ -55,7 +55,7 @@ public function collect(Request $request, Response $response, \Exception $except
 
     public function reset()
     {
-        $this->data = array();
+        $this->data = [];
         foreach ($this->instances as $instance) {
             $instance->clearCalls();
         }
@@ -109,9 +109,9 @@ public function getCalls()
      */
     private function calculateStatistics()
     {
-        $statistics = array();
+        $statistics = [];
         foreach ($this->data['instances']['calls'] as $name => $calls) {
-            $statistics[$name] = array(
+            $statistics[$name] = [
                 'calls' => 0,
                 'time' => 0,
                 'reads' => 0,
@@ -119,7 +119,7 @@ private function calculateStatistics()
                 'deletes' => 0,
                 'hits' => 0,
                 'misses' => 0,
-            );
+            ];
             /** @var TraceableAdapterEvent $call */
             foreach ($calls as $call) {
                 ++$statistics[$name]['calls'];
@@ -164,7 +164,7 @@ private function calculateStatistics()
     private function calculateTotalStatistics()
     {
         $statistics = $this->getStatistics();
-        $totals = array(
+        $totals = [
             'calls' => 0,
             'time' => 0,
             'reads' => 0,
@@ -172,7 +172,7 @@ private function calculateTotalStatistics()
             'deletes' => 0,
             'hits' => 0,
             'misses' => 0,
-        );
+        ];
         foreach ($statistics as $name => $values) {
             foreach ($totals as $key => $value) {
                 $totals[$key] += $statistics[$name][$key];
diff --git a/src/Symfony/Component/Cache/Simple/AbstractCache.php b/src/Symfony/Component/Cache/Simple/AbstractCache.php
index f29eb69c9b8ef..0d715e48d2232 100644
--- a/src/Symfony/Component/Cache/Simple/AbstractCache.php
+++ b/src/Symfony/Component/Cache/Simple/AbstractCache.php
@@ -52,11 +52,11 @@ public function get($key, $default = null)
         $id = $this->getId($key);
 
         try {
-            foreach ($this->doFetch(array($id)) as $value) {
+            foreach ($this->doFetch([$id]) as $value) {
                 return $value;
             }
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch key "{key}"', array('key' => $key, 'exception' => $e));
+            CacheItem::log($this->logger, 'Failed to fetch key "{key}"', ['key' => $key, 'exception' => $e]);
         }
 
         return $default;
@@ -69,7 +69,7 @@ public function set($key, $value, $ttl = null)
     {
         CacheItem::validateKey($key);
 
-        return $this->setMultiple(array($key => $value), $ttl);
+        return $this->setMultiple([$key => $value], $ttl);
     }
 
     /**
@@ -82,7 +82,7 @@ public function getMultiple($keys, $default = null)
         } elseif (!\is_array($keys)) {
             throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
         }
-        $ids = array();
+        $ids = [];
 
         foreach ($keys as $key) {
             $ids[] = $this->getId($key);
@@ -90,8 +90,8 @@ public function getMultiple($keys, $default = null)
         try {
             $values = $this->doFetch($ids);
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch requested values', array('keys' => $keys, 'exception' => $e));
-            $values = array();
+            CacheItem::log($this->logger, 'Failed to fetch requested values', ['keys' => $keys, 'exception' => $e]);
+            $values = [];
         }
         $ids = array_combine($ids, $keys);
 
@@ -106,7 +106,7 @@ public function setMultiple($values, $ttl = null)
         if (!\is_array($values) && !$values instanceof \Traversable) {
             throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', \is_object($values) ? \get_class($values) : \gettype($values)));
         }
-        $valuesById = array();
+        $valuesById = [];
 
         foreach ($values as $key => $value) {
             if (\is_int($key)) {
@@ -122,14 +122,14 @@ public function setMultiple($values, $ttl = null)
             $e = $this->doSave($valuesById, $ttl);
         } catch (\Exception $e) {
         }
-        if (true === $e || array() === $e) {
+        if (true === $e || [] === $e) {
             return true;
         }
-        $keys = array();
+        $keys = [];
         foreach (\is_array($e) ? $e : array_keys($valuesById) as $id) {
             $keys[] = substr($id, \strlen($this->namespace));
         }
-        CacheItem::log($this->logger, 'Failed to save values', array('keys' => $keys, 'exception' => $e instanceof \Exception ? $e : null));
+        CacheItem::log($this->logger, 'Failed to save values', ['keys' => $keys, 'exception' => $e instanceof \Exception ? $e : null]);
 
         return false;
     }
@@ -175,7 +175,7 @@ private function generateValues($values, &$keys, $default)
                 yield $key => $value;
             }
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch requested values', array('keys' => array_values($keys), 'exception' => $e));
+            CacheItem::log($this->logger, 'Failed to fetch requested values', ['keys' => array_values($keys), 'exception' => $e]);
         }
 
         foreach ($keys as $key) {
diff --git a/src/Symfony/Component/Cache/Simple/ArrayCache.php b/src/Symfony/Component/Cache/Simple/ArrayCache.php
index ca45c93a55a1a..143ed05ea139b 100644
--- a/src/Symfony/Component/Cache/Simple/ArrayCache.php
+++ b/src/Symfony/Component/Cache/Simple/ArrayCache.php
@@ -89,7 +89,7 @@ public function set($key, $value, $ttl = null)
     {
         CacheItem::validateKey($key);
 
-        return $this->setMultiple(array($key => $value), $ttl);
+        return $this->setMultiple([$key => $value], $ttl);
     }
 
     /**
@@ -100,7 +100,7 @@ public function setMultiple($values, $ttl = null)
         if (!\is_array($values) && !$values instanceof \Traversable) {
             throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', \is_object($values) ? \get_class($values) : \gettype($values)));
         }
-        $valuesArray = array();
+        $valuesArray = [];
 
         foreach ($values as $key => $value) {
             \is_int($key) || CacheItem::validateKey($key);
diff --git a/src/Symfony/Component/Cache/Simple/ChainCache.php b/src/Symfony/Component/Cache/Simple/ChainCache.php
index 47ac9c62c3137..2e6c7277d78e4 100644
--- a/src/Symfony/Component/Cache/Simple/ChainCache.php
+++ b/src/Symfony/Component/Cache/Simple/ChainCache.php
@@ -27,7 +27,7 @@
 class ChainCache implements CacheInterface, PruneableInterface, ResettableInterface
 {
     private $miss;
-    private $caches = array();
+    private $caches = [];
     private $defaultLifetime;
     private $cacheCount;
 
@@ -87,7 +87,7 @@ public function getMultiple($keys, $default = null)
 
     private function generateItems($values, $cacheIndex, $miss, $default)
     {
-        $missing = array();
+        $missing = [];
         $nextCacheIndex = $cacheIndex + 1;
         $nextCache = isset($this->caches[$nextCacheIndex]) ? $this->caches[$nextCacheIndex] : null;
 
@@ -201,7 +201,7 @@ public function setMultiple($values, $ttl = null)
         if ($values instanceof \Traversable) {
             $valuesIterator = $values;
             $values = function () use ($valuesIterator, &$values) {
-                $generatedValues = array();
+                $generatedValues = [];
 
                 foreach ($valuesIterator as $key => $value) {
                     yield $key => $value;
diff --git a/src/Symfony/Component/Cache/Simple/PhpArrayCache.php b/src/Symfony/Component/Cache/Simple/PhpArrayCache.php
index 728d2bd7e5b4e..607555e93b660 100644
--- a/src/Symfony/Component/Cache/Simple/PhpArrayCache.php
+++ b/src/Symfony/Component/Cache/Simple/PhpArrayCache.php
@@ -154,7 +154,7 @@ public function deleteMultiple($keys)
         }
 
         $deleted = true;
-        $fallbackKeys = array();
+        $fallbackKeys = [];
 
         foreach ($keys as $key) {
             if (!\is_string($key)) {
@@ -203,7 +203,7 @@ public function setMultiple($values, $ttl = null)
         }
 
         $saved = true;
-        $fallbackValues = array();
+        $fallbackValues = [];
 
         foreach ($values as $key => $value) {
             if (!\is_string($key) && !\is_int($key)) {
@@ -226,7 +226,7 @@ public function setMultiple($values, $ttl = null)
 
     private function generateItems(array $keys, $default)
     {
-        $fallbackKeys = array();
+        $fallbackKeys = [];
 
         foreach ($keys as $key) {
             if (isset($this->values[$key])) {
diff --git a/src/Symfony/Component/Cache/Simple/Psr6Cache.php b/src/Symfony/Component/Cache/Simple/Psr6Cache.php
index 853d46e26b8e9..85d75becbe588 100644
--- a/src/Symfony/Component/Cache/Simple/Psr6Cache.php
+++ b/src/Symfony/Component/Cache/Simple/Psr6Cache.php
@@ -145,7 +145,7 @@ public function getMultiple($keys, $default = null)
         } catch (Psr6CacheException $e) {
             throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
         }
-        $values = array();
+        $values = [];
 
         foreach ($items as $key => $item) {
             $values[$key] = $item->isHit() ? $item->get() : $default;
@@ -163,7 +163,7 @@ public function setMultiple($values, $ttl = null)
         if (!$valuesIsArray && !$values instanceof \Traversable) {
             throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', \is_object($values) ? \get_class($values) : \gettype($values)));
         }
-        $items = array();
+        $items = [];
 
         try {
             if (null !== $f = $this->createCacheItem) {
@@ -172,7 +172,7 @@ public function setMultiple($values, $ttl = null)
                     $items[$key] = $f($key, $value, true);
                 }
             } elseif ($valuesIsArray) {
-                $items = array();
+                $items = [];
                 foreach ($values as $key => $value) {
                     $items[] = (string) $key;
                 }
diff --git a/src/Symfony/Component/Cache/Simple/TraceableCache.php b/src/Symfony/Component/Cache/Simple/TraceableCache.php
index 181934eff5012..61b22963eb329 100644
--- a/src/Symfony/Component/Cache/Simple/TraceableCache.php
+++ b/src/Symfony/Component/Cache/Simple/TraceableCache.php
@@ -24,7 +24,7 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
 {
     private $pool;
     private $miss;
-    private $calls = array();
+    private $calls = [];
 
     public function __construct(CacheInterface $pool)
     {
@@ -99,7 +99,7 @@ public function set($key, $value, $ttl = null)
     public function setMultiple($values, $ttl = null)
     {
         $event = $this->start(__FUNCTION__);
-        $event->result['keys'] = array();
+        $event->result['keys'] = [];
 
         if ($values instanceof \Traversable) {
             $values = function () use ($values, $event) {
@@ -133,7 +133,7 @@ public function getMultiple($keys, $default = null)
             $event->end = microtime(true);
         }
         $f = function () use ($result, $event, $miss, $default) {
-            $event->result = array();
+            $event->result = [];
             foreach ($result as $key => $value) {
                 if ($event->result[$key] = $miss !== $value) {
                     ++$event->hits;
@@ -216,7 +216,7 @@ public function getCalls()
         try {
             return $this->calls;
         } finally {
-            $this->calls = array();
+            $this->calls = [];
         }
     }
 
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php
index 147dfcd15346c..5fcec9a26311b 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php
@@ -15,11 +15,11 @@
 
 abstract class AbstractRedisAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testExpiration' => 'Testing expiration slows down the test suite',
         'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    );
+    ];
 
     protected static $redis;
 
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php b/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
index d3175adc77bbb..482751f620c64 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
@@ -85,11 +85,11 @@ public function testNotUnserializable()
         $item = $cache->getItem('foo');
         $this->assertFalse($item->isHit());
 
-        foreach ($cache->getItems(array('foo')) as $item) {
+        foreach ($cache->getItems(['foo']) as $item) {
         }
         $cache->save($item->set(new NotUnserializable()));
 
-        foreach ($cache->getItems(array('foo')) as $item) {
+        foreach ($cache->getItems(['foo']) as $item) {
         }
         $this->assertFalse($item->isHit());
     }
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php
index a17b42bce4989..5cca73f56189d 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php
@@ -16,11 +16,11 @@
 
 class ApcuAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testExpiration' => 'Testing expiration slows down the test suite',
         'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    );
+    ];
 
     public function createCachePool($defaultLifetime = 0)
     {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php
index a47058f513a4f..825efdd1a57df 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php
@@ -35,7 +35,7 @@ public function createCachePool($defaultLifetime = 0)
      */
     public function testEmptyAdaptersException()
     {
-        new ChainAdapter(array());
+        new ChainAdapter([]);
     }
 
     /**
@@ -44,7 +44,7 @@ public function testEmptyAdaptersException()
      */
     public function testInvalidAdapterException()
     {
-        new ChainAdapter(array(new \stdClass()));
+        new ChainAdapter([new \stdClass()]);
     }
 
     public function testPrune()
@@ -53,18 +53,18 @@ public function testPrune()
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
 
-        $cache = new ChainAdapter(array(
+        $cache = new ChainAdapter([
             $this->getPruneableMock(),
             $this->getNonPruneableMock(),
             $this->getPruneableMock(),
-        ));
+        ]);
         $this->assertTrue($cache->prune());
 
-        $cache = new ChainAdapter(array(
+        $cache = new ChainAdapter([
             $this->getPruneableMock(),
             $this->getFailingPruneableMock(),
             $this->getPruneableMock(),
-        ));
+        ]);
         $this->assertFalse($cache->prune());
     }
 
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/DoctrineAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/DoctrineAdapterTest.php
index 8d4dfe285821e..8f520cb59a616 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/DoctrineAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/DoctrineAdapterTest.php
@@ -19,11 +19,11 @@
  */
 class DoctrineAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayCache is not.',
         'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayCache is not.',
         'testNotUnserializable' => 'ArrayCache does not use serialize/unserialize',
-    );
+    ];
 
     public function createCachePool($defaultLifetime = 0)
     {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/MaxIdLengthAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/MaxIdLengthAdapterTest.php
index 5e301f250986c..fed88b46f54f1 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/MaxIdLengthAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/MaxIdLengthAdapterTest.php
@@ -37,7 +37,7 @@ public function testLongKey()
     public function testLongKeyVersioning()
     {
         $cache = $this->getMockBuilder(MaxIdLengthAdapter::class)
-            ->setConstructorArgs(array(str_repeat('-', 26)))
+            ->setConstructorArgs([str_repeat('-', 26)])
             ->getMock();
 
         $reflectionClass = new \ReflectionClass(AbstractAdapter::class);
@@ -69,7 +69,7 @@ public function testLongKeyVersioning()
     public function testTooLongNamespace()
     {
         $cache = $this->getMockBuilder(MaxIdLengthAdapter::class)
-            ->setConstructorArgs(array(str_repeat('-', 40)))
+            ->setConstructorArgs([str_repeat('-', 40)])
             ->getMock();
     }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php
index 1f2f4d40acfa0..2a88fea18bbe8 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php
@@ -16,10 +16,10 @@
 
 class MemcachedAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    );
+    ];
 
     protected static $client;
 
@@ -28,7 +28,7 @@ public static function setupBeforeClass()
         if (!MemcachedAdapter::isSupported()) {
             self::markTestSkipped('Extension memcached >=2.2.0 required.');
         }
-        self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), array('binary_protocol' => false));
+        self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]);
         self::$client->get('foo');
         $code = self::$client->getResultCode();
 
@@ -46,13 +46,13 @@ public function createCachePool($defaultLifetime = 0)
 
     public function testOptions()
     {
-        $client = MemcachedAdapter::createConnection(array(), array(
+        $client = MemcachedAdapter::createConnection([], [
             'libketama_compatible' => false,
             'distribution' => 'modula',
             'compression' => true,
             'serializer' => 'php',
             'hash' => 'md5',
-        ));
+        ]);
 
         $this->assertSame(\Memcached::SERIALIZER_PHP, $client->getOption(\Memcached::OPT_SERIALIZER));
         $this->assertSame(\Memcached::HASH_MD5, $client->getOption(\Memcached::OPT_HASH));
@@ -68,24 +68,24 @@ public function testOptions()
      */
     public function testBadOptions($name, $value)
     {
-        MemcachedAdapter::createConnection(array(), array($name => $value));
+        MemcachedAdapter::createConnection([], [$name => $value]);
     }
 
     public function provideBadOptions()
     {
-        return array(
-            array('foo', 'bar'),
-            array('hash', 'zyx'),
-            array('serializer', 'zyx'),
-            array('distribution', 'zyx'),
-        );
+        return [
+            ['foo', 'bar'],
+            ['hash', 'zyx'],
+            ['serializer', 'zyx'],
+            ['distribution', 'zyx'],
+        ];
     }
 
     public function testDefaultOptions()
     {
         $this->assertTrue(MemcachedAdapter::isSupported());
 
-        $client = MemcachedAdapter::createConnection(array());
+        $client = MemcachedAdapter::createConnection([]);
 
         $this->assertTrue($client->getOption(\Memcached::OPT_COMPRESSION));
         $this->assertSame(1, $client->getOption(\Memcached::OPT_BINARY_PROTOCOL));
@@ -103,7 +103,7 @@ public function testOptionSerializer()
             $this->markTestSkipped('Memcached::HAVE_JSON required');
         }
 
-        new MemcachedAdapter(MemcachedAdapter::createConnection(array(), array('serializer' => 'json')));
+        new MemcachedAdapter(MemcachedAdapter::createConnection([], ['serializer' => 'json']));
     }
 
     /**
@@ -112,54 +112,54 @@ public function testOptionSerializer()
     public function testServersSetting($dsn, $host, $port)
     {
         $client1 = MemcachedAdapter::createConnection($dsn);
-        $client2 = MemcachedAdapter::createConnection(array($dsn));
-        $client3 = MemcachedAdapter::createConnection(array(array($host, $port)));
-        $expect = array(
+        $client2 = MemcachedAdapter::createConnection([$dsn]);
+        $client3 = MemcachedAdapter::createConnection([[$host, $port]]);
+        $expect = [
             'host' => $host,
             'port' => $port,
-        );
+        ];
 
-        $f = function ($s) { return array('host' => $s['host'], 'port' => $s['port']); };
-        $this->assertSame(array($expect), array_map($f, $client1->getServerList()));
-        $this->assertSame(array($expect), array_map($f, $client2->getServerList()));
-        $this->assertSame(array($expect), array_map($f, $client3->getServerList()));
+        $f = function ($s) { return ['host' => $s['host'], 'port' => $s['port']]; };
+        $this->assertSame([$expect], array_map($f, $client1->getServerList()));
+        $this->assertSame([$expect], array_map($f, $client2->getServerList()));
+        $this->assertSame([$expect], array_map($f, $client3->getServerList()));
     }
 
     public function provideServersSetting()
     {
-        yield array(
+        yield [
             'memcached://127.0.0.1/50',
             '127.0.0.1',
             11211,
-        );
-        yield array(
+        ];
+        yield [
             'memcached://localhost:11222?weight=25',
             'localhost',
             11222,
-        );
+        ];
         if (filter_var(ini_get('memcached.use_sasl'), FILTER_VALIDATE_BOOLEAN)) {
-            yield array(
+            yield [
                 'memcached://user:password@127.0.0.1?weight=50',
                 '127.0.0.1',
                 11211,
-            );
+            ];
         }
-        yield array(
+        yield [
             'memcached:///var/run/memcached.sock?weight=25',
             '/var/run/memcached.sock',
             0,
-        );
-        yield array(
+        ];
+        yield [
             'memcached:///var/local/run/memcached.socket?weight=25',
             '/var/local/run/memcached.socket',
             0,
-        );
+        ];
         if (filter_var(ini_get('memcached.use_sasl'), FILTER_VALIDATE_BOOLEAN)) {
-            yield array(
+            yield [
                 'memcached://user:password@/var/local/run/memcached.socket?weight=25',
                 '/var/local/run/memcached.socket',
                 0,
-            );
+            ];
         }
     }
 
@@ -181,16 +181,16 @@ public function provideDsnWithOptions()
             self::markTestSkipped('Extension memcached required.');
         }
 
-        yield array(
+        yield [
             'memcached://localhost:11222?retry_timeout=10',
-            array(\Memcached::OPT_RETRY_TIMEOUT => 8),
-            array(\Memcached::OPT_RETRY_TIMEOUT => 10),
-        );
-        yield array(
+            [\Memcached::OPT_RETRY_TIMEOUT => 8],
+            [\Memcached::OPT_RETRY_TIMEOUT => 10],
+        ];
+        yield [
             'memcached://localhost:11222?socket_recv_size=1&socket_send_size=2',
-            array(\Memcached::OPT_RETRY_TIMEOUT => 8),
-            array(\Memcached::OPT_SOCKET_RECV_SIZE => 1, \Memcached::OPT_SOCKET_SEND_SIZE => 2, \Memcached::OPT_RETRY_TIMEOUT => 8),
-        );
+            [\Memcached::OPT_RETRY_TIMEOUT => 8],
+            [\Memcached::OPT_SOCKET_RECV_SIZE => 1, \Memcached::OPT_SOCKET_SEND_SIZE => 2, \Memcached::OPT_RETRY_TIMEOUT => 8],
+        ];
     }
 
     public function testClear()
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/NullAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/NullAdapterTest.php
index 73e5cad5529a9..b771fa0ed83dc 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/NullAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/NullAdapterTest.php
@@ -43,7 +43,7 @@ public function testGetItems()
     {
         $adapter = $this->createCachePool();
 
-        $keys = array('foo', 'bar', 'baz', 'biz');
+        $keys = ['foo', 'bar', 'baz', 'biz'];
 
         /** @var CacheItemInterface[] $items */
         $items = $adapter->getItems($keys);
@@ -89,7 +89,7 @@ public function testDeleteItem()
 
     public function testDeleteItems()
     {
-        $this->assertTrue($this->createCachePool()->deleteItems(array('key', 'foo', 'bar')));
+        $this->assertTrue($this->createCachePool()->deleteItems(['key', 'foo', 'bar']));
     }
 
     public function testSave()
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php
index f89a27ce64829..7602539e0243e 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php
@@ -43,6 +43,6 @@ public static function tearDownAfterClass()
 
     public function createCachePool($defaultLifetime = 0)
     {
-        return new PdoAdapter(DriverManager::getConnection(array('driver' => 'pdo_sqlite', 'path' => self::$dbFile)), '', $defaultLifetime);
+        return new PdoAdapter(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]), '', $defaultLifetime);
     }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php
index 930594fb92a8f..95558cd72b204 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php
@@ -74,22 +74,22 @@ public function createCachePool()
 
     public function testStore()
     {
-        $arrayWithRefs = array();
+        $arrayWithRefs = [];
         $arrayWithRefs[0] = 123;
         $arrayWithRefs[1] = &$arrayWithRefs[0];
 
-        $object = (object) array(
+        $object = (object) [
             'foo' => 'bar',
             'foo2' => 'bar2',
-        );
+        ];
 
-        $expected = array(
+        $expected = [
             'null' => null,
             'serializedString' => serialize($object),
             'arrayWithRefs' => $arrayWithRefs,
             'object' => $object,
-            'arrayWithObject' => array('bar' => $object),
-        );
+            'arrayWithObject' => ['bar' => $object],
+        ];
 
         $adapter = $this->createCachePool();
         $adapter->warmUp($expected);
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
index 1a23198c2f98d..a7feced4ea167 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
@@ -19,14 +19,14 @@
  */
 class PhpArrayAdapterWithFallbackTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testGetItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
         'testGetItemsInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
         'testHasItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
         'testDeleteItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
         'testDeleteItemsInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
         'testPrune' => 'PhpArrayAdapter just proxies',
-    );
+    ];
 
     protected static $file;
 
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PhpFilesAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PhpFilesAdapterTest.php
index 8e93c937f6a65..247160d53c268 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PhpFilesAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PhpFilesAdapterTest.php
@@ -19,9 +19,9 @@
  */
 class PhpFilesAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testDefaultLifeTime' => 'PhpFilesAdapter does not allow configuring a default lifetime.',
-    );
+    ];
 
     public function createCachePool()
     {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterTest.php
index c005d64abf1ca..045f8a8cb30c7 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterTest.php
@@ -19,14 +19,14 @@ class PredisAdapterTest extends AbstractRedisAdapterTest
     public static function setupBeforeClass()
     {
         parent::setupBeforeClass();
-        self::$redis = new \Predis\Client(array('host' => getenv('REDIS_HOST')));
+        self::$redis = new \Predis\Client(['host' => getenv('REDIS_HOST')]);
     }
 
     public function testCreateConnection()
     {
         $redisHost = getenv('REDIS_HOST');
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'/1', array('class' => \Predis\Client::class, 'timeout' => 3));
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'/1', ['class' => \Predis\Client::class, 'timeout' => 3]);
         $this->assertInstanceOf(\Predis\Client::class, $redis);
 
         $connection = $redis->getConnection();
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php
index 38915397da993..f723dc4468572 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php
@@ -16,7 +16,7 @@ class PredisClusterAdapterTest extends AbstractRedisAdapterTest
     public static function setupBeforeClass()
     {
         parent::setupBeforeClass();
-        self::$redis = new \Predis\Client(array(array('host' => getenv('REDIS_HOST'))));
+        self::$redis = new \Predis\Client([['host' => getenv('REDIS_HOST')]]);
     }
 
     public static function tearDownAfterClass()
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php
index ff4b9d34bcbaf..f69ad67939f79 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php
@@ -21,11 +21,11 @@
  */
 class ProxyAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayAdapter is not.',
         'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayAdapter is not.',
         'testPrune' => 'ProxyAdapter just proxies',
-    );
+    ];
 
     public function createCachePool($defaultLifetime = 0)
     {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php
index 28c310fb18daa..eb2cbd46fd957 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php
@@ -20,7 +20,7 @@ class RedisAdapterTest extends AbstractRedisAdapterTest
     public static function setupBeforeClass()
     {
         parent::setupBeforeClass();
-        self::$redis = AbstractAdapter::createConnection('redis://'.getenv('REDIS_HOST'), array('lazy' => true));
+        self::$redis = AbstractAdapter::createConnection('redis://'.getenv('REDIS_HOST'), ['lazy' => true]);
     }
 
     public function createCachePool($defaultLifetime = 0)
@@ -43,13 +43,13 @@ public function testCreateConnection()
         $redis = RedisAdapter::createConnection('redis://'.$redisHost.'/2');
         $this->assertSame(2, $redis->getDbNum());
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost, array('timeout' => 3));
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['timeout' => 3]);
         $this->assertEquals(3, $redis->getTimeout());
 
         $redis = RedisAdapter::createConnection('redis://'.$redisHost.'?timeout=4');
         $this->assertEquals(4, $redis->getTimeout());
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost, array('read_timeout' => 5));
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['read_timeout' => 5]);
         $this->assertEquals(5, $redis->getReadTimeout());
     }
 
@@ -65,11 +65,11 @@ public function testFailedCreateConnection($dsn)
 
     public function provideFailedCreateConnection()
     {
-        return array(
-            array('redis://localhost:1234'),
-            array('redis://foo@localhost'),
-            array('redis://localhost/123'),
-        );
+        return [
+            ['redis://localhost:1234'],
+            ['redis://foo@localhost'],
+            ['redis://localhost/123'],
+        ];
     }
 
     /**
@@ -84,9 +84,9 @@ public function testInvalidCreateConnection($dsn)
 
     public function provideInvalidCreateConnection()
     {
-        return array(
-            array('foo://localhost'),
-            array('redis://'),
-        );
+        return [
+            ['foo://localhost'],
+            ['redis://'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisArrayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisArrayAdapterTest.php
index bef3eb88729f5..749b039a030dc 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/RedisArrayAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisArrayAdapterTest.php
@@ -19,6 +19,6 @@ public static function setupBeforeClass()
         if (!class_exists('RedisArray')) {
             self::markTestSkipped('The RedisArray class is required.');
         }
-        self::$redis = new \RedisArray(array(getenv('REDIS_HOST')), array('lazy_connect' => true));
+        self::$redis = new \RedisArray([getenv('REDIS_HOST')], ['lazy_connect' => true]);
     }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/SimpleCacheAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/SimpleCacheAdapterTest.php
index 460f3b09541b2..84713416cdea5 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/SimpleCacheAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/SimpleCacheAdapterTest.php
@@ -19,9 +19,9 @@
  */
 class SimpleCacheAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testPrune' => 'SimpleCache just proxies',
-    );
+    ];
 
     public function createCachePool($defaultLifetime = 0)
     {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
index 7074299e7ac34..d0a1e5daf77be 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
@@ -56,7 +56,7 @@ public function testInvalidateTags()
         $pool->save($i3->tag('foo')->tag('baz'));
         $pool->save($foo);
 
-        $pool->invalidateTags(array('bar'));
+        $pool->invalidateTags(['bar']);
 
         $this->assertFalse($pool->getItem('i0')->isHit());
         $this->assertTrue($pool->getItem('i1')->isHit());
@@ -64,7 +64,7 @@ public function testInvalidateTags()
         $this->assertTrue($pool->getItem('i3')->isHit());
         $this->assertTrue($pool->getItem('foo')->isHit());
 
-        $pool->invalidateTags(array('foo'));
+        $pool->invalidateTags(['foo']);
 
         $this->assertFalse($pool->getItem('i1')->isHit());
         $this->assertFalse($pool->getItem('i3')->isHit());
@@ -85,7 +85,7 @@ public function testInvalidateCommits()
         $foo->tag('tag');
 
         $pool1->saveDeferred($foo->set('foo'));
-        $pool1->invalidateTags(array('tag'));
+        $pool1->invalidateTags(['tag']);
 
         $pool2 = $this->createCachePool();
         $foo = $pool2->getItem('foo');
@@ -103,7 +103,7 @@ public function testTagsAreCleanedOnSave()
         $i = $pool->getItem('k');
         $pool->save($i->tag('bar'));
 
-        $pool->invalidateTags(array('foo'));
+        $pool->invalidateTags(['foo']);
         $this->assertTrue($pool->getItem('k')->isHit());
     }
 
@@ -116,7 +116,7 @@ public function testTagsAreCleanedOnDelete()
         $pool->deleteItem('k');
 
         $pool->save($pool->getItem('k'));
-        $pool->invalidateTags(array('foo'));
+        $pool->invalidateTags(['foo']);
 
         $this->assertTrue($pool->getItem('k')->isHit());
     }
@@ -126,11 +126,11 @@ public function testTagItemExpiry()
         $pool = $this->createCachePool(10);
 
         $item = $pool->getItem('foo');
-        $item->tag(array('baz'));
+        $item->tag(['baz']);
         $item->expiresAfter(100);
 
         $pool->save($item);
-        $pool->invalidateTags(array('baz'));
+        $pool->invalidateTags(['baz']);
         $this->assertFalse($pool->getItem('foo')->isHit());
 
         sleep(20);
@@ -146,7 +146,7 @@ public function testGetPreviousTags()
         $pool->save($i->tag('foo'));
 
         $i = $pool->getItem('k');
-        $this->assertSame(array('foo' => 'foo'), $i->getPreviousTags());
+        $this->assertSame(['foo' => 'foo'], $i->getPreviousTags());
     }
 
     public function testPrune()
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TraceableAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TraceableAdapterTest.php
index 3755e88db5f15..35eba7d77bec6 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/TraceableAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/TraceableAdapterTest.php
@@ -19,9 +19,9 @@
  */
 class TraceableAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testPrune' => 'TraceableAdapter just proxies',
-    );
+    ];
 
     public function createCachePool($defaultLifetime = 0)
     {
@@ -37,7 +37,7 @@ public function testGetItemMissTrace()
 
         $call = $calls[0];
         $this->assertSame('getItem', $call->name);
-        $this->assertSame(array('k' => false), $call->result);
+        $this->assertSame(['k' => false], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(1, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -61,7 +61,7 @@ public function testGetItemHitTrace()
     public function testGetItemsMissTrace()
     {
         $pool = $this->createCachePool();
-        $arg = array('k0', 'k1');
+        $arg = ['k0', 'k1'];
         $items = $pool->getItems($arg);
         foreach ($items as $item) {
         }
@@ -70,7 +70,7 @@ public function testGetItemsMissTrace()
 
         $call = $calls[0];
         $this->assertSame('getItems', $call->name);
-        $this->assertSame(array('k0' => false, 'k1' => false), $call->result);
+        $this->assertSame(['k0' => false, 'k1' => false], $call->result);
         $this->assertSame(2, $call->misses);
         $this->assertNotEmpty($call->start);
         $this->assertNotEmpty($call->end);
@@ -85,7 +85,7 @@ public function testHasItemMissTrace()
 
         $call = $calls[0];
         $this->assertSame('hasItem', $call->name);
-        $this->assertSame(array('k' => false), $call->result);
+        $this->assertSame(['k' => false], $call->result);
         $this->assertNotEmpty($call->start);
         $this->assertNotEmpty($call->end);
     }
@@ -101,7 +101,7 @@ public function testHasItemHitTrace()
 
         $call = $calls[2];
         $this->assertSame('hasItem', $call->name);
-        $this->assertSame(array('k' => true), $call->result);
+        $this->assertSame(['k' => true], $call->result);
         $this->assertNotEmpty($call->start);
         $this->assertNotEmpty($call->end);
     }
@@ -115,7 +115,7 @@ public function testDeleteItemTrace()
 
         $call = $calls[0];
         $this->assertSame('deleteItem', $call->name);
-        $this->assertSame(array('k' => true), $call->result);
+        $this->assertSame(['k' => true], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -125,14 +125,14 @@ public function testDeleteItemTrace()
     public function testDeleteItemsTrace()
     {
         $pool = $this->createCachePool();
-        $arg = array('k0', 'k1');
+        $arg = ['k0', 'k1'];
         $pool->deleteItems($arg);
         $calls = $pool->getCalls();
         $this->assertCount(1, $calls);
 
         $call = $calls[0];
         $this->assertSame('deleteItems', $call->name);
-        $this->assertSame(array('keys' => $arg, 'result' => true), $call->result);
+        $this->assertSame(['keys' => $arg, 'result' => true], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -149,7 +149,7 @@ public function testSaveTrace()
 
         $call = $calls[1];
         $this->assertSame('save', $call->name);
-        $this->assertSame(array('k' => true), $call->result);
+        $this->assertSame(['k' => true], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -166,7 +166,7 @@ public function testSaveDeferredTrace()
 
         $call = $calls[1];
         $this->assertSame('saveDeferred', $call->name);
-        $this->assertSame(array('k' => true), $call->result);
+        $this->assertSame(['k' => true], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TraceableTagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TraceableTagAwareAdapterTest.php
index 9b50bfabe65b7..5cd4185cb0971 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/TraceableTagAwareAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/TraceableTagAwareAdapterTest.php
@@ -23,7 +23,7 @@ class TraceableTagAwareAdapterTest extends TraceableAdapterTest
     public function testInvalidateTags()
     {
         $pool = new TraceableTagAwareAdapter(new TagAwareAdapter(new FilesystemAdapter()));
-        $pool->invalidateTags(array('foo'));
+        $pool->invalidateTags(['foo']);
         $calls = $pool->getCalls();
         $this->assertCount(1, $calls);
 
diff --git a/src/Symfony/Component/Cache/Tests/CacheItemTest.php b/src/Symfony/Component/Cache/Tests/CacheItemTest.php
index 4aae16b63ca44..4c5df64ad21da 100644
--- a/src/Symfony/Component/Cache/Tests/CacheItemTest.php
+++ b/src/Symfony/Component/Cache/Tests/CacheItemTest.php
@@ -33,23 +33,23 @@ public function testInvalidKey($key)
 
     public function provideInvalidKey()
     {
-        return array(
-            array(''),
-            array('{'),
-            array('}'),
-            array('('),
-            array(')'),
-            array('/'),
-            array('\\'),
-            array('@'),
-            array(':'),
-            array(true),
-            array(null),
-            array(1),
-            array(1.1),
-            array(array(array())),
-            array(new \Exception('foo')),
-        );
+        return [
+            [''],
+            ['{'],
+            ['}'],
+            ['('],
+            [')'],
+            ['/'],
+            ['\\'],
+            ['@'],
+            [':'],
+            [true],
+            [null],
+            [1],
+            [1.1],
+            [[[]]],
+            [new \Exception('foo')],
+        ];
     }
 
     public function testTag()
diff --git a/src/Symfony/Component/Cache/Tests/Fixtures/ArrayCache.php b/src/Symfony/Component/Cache/Tests/Fixtures/ArrayCache.php
index 7cdcafd8e5453..003b59448be9e 100644
--- a/src/Symfony/Component/Cache/Tests/Fixtures/ArrayCache.php
+++ b/src/Symfony/Component/Cache/Tests/Fixtures/ArrayCache.php
@@ -6,7 +6,7 @@
 
 class ArrayCache extends CacheProvider
 {
-    private $data = array();
+    private $data = [];
 
     protected function doFetch($id)
     {
@@ -40,7 +40,7 @@ protected function doDelete($id)
 
     protected function doFlush()
     {
-        $this->data = array();
+        $this->data = [];
 
         return true;
     }
diff --git a/src/Symfony/Component/Cache/Tests/Fixtures/ExternalAdapter.php b/src/Symfony/Component/Cache/Tests/Fixtures/ExternalAdapter.php
index 493906ea0cccc..779a374ec7ab8 100644
--- a/src/Symfony/Component/Cache/Tests/Fixtures/ExternalAdapter.php
+++ b/src/Symfony/Component/Cache/Tests/Fixtures/ExternalAdapter.php
@@ -34,7 +34,7 @@ public function getItem($key)
         return $this->cache->getItem($key);
     }
 
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
         return $this->cache->getItems($keys);
     }
diff --git a/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php
index 3e668fdd123bb..dd5e1509c1bcc 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php
@@ -15,11 +15,11 @@
 
 abstract class AbstractRedisCacheTest extends CacheTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testSetTtl' => 'Testing expiration slows down the test suite',
         'testSetMultipleTtl' => 'Testing expiration slows down the test suite',
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    );
+    ];
 
     protected static $redis;
 
diff --git a/src/Symfony/Component/Cache/Tests/Simple/ApcuCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/ApcuCacheTest.php
index 3df32c1c5e689..f37b95a093fad 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/ApcuCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/ApcuCacheTest.php
@@ -15,11 +15,11 @@
 
 class ApcuCacheTest extends CacheTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testSetTtl' => 'Testing expiration slows down the test suite',
         'testSetMultipleTtl' => 'Testing expiration slows down the test suite',
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    );
+    ];
 
     public function createSimpleCache($defaultLifetime = 0)
     {
diff --git a/src/Symfony/Component/Cache/Tests/Simple/CacheTestCase.php b/src/Symfony/Component/Cache/Tests/Simple/CacheTestCase.php
index d0d85735989c9..1ba5ac470a7e6 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/CacheTestCase.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/CacheTestCase.php
@@ -68,9 +68,9 @@ public function testNotUnserializable()
 
         $this->assertNull($cache->get('foo'));
 
-        $cache->setMultiple(array('foo' => new NotUnserializable()));
+        $cache->setMultiple(['foo' => new NotUnserializable()]);
 
-        foreach ($cache->getMultiple(array('foo')) as $value) {
+        foreach ($cache->getMultiple(['foo']) as $value) {
         }
         $this->assertNull($value);
 
diff --git a/src/Symfony/Component/Cache/Tests/Simple/ChainCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/ChainCacheTest.php
index ab28e3bce7b9b..e6f7c7cc63229 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/ChainCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/ChainCacheTest.php
@@ -24,7 +24,7 @@ class ChainCacheTest extends CacheTestCase
 {
     public function createSimpleCache($defaultLifetime = 0)
     {
-        return new ChainCache(array(new ArrayCache($defaultLifetime), new FilesystemCache('', $defaultLifetime)), $defaultLifetime);
+        return new ChainCache([new ArrayCache($defaultLifetime), new FilesystemCache('', $defaultLifetime)], $defaultLifetime);
     }
 
     /**
@@ -33,7 +33,7 @@ public function createSimpleCache($defaultLifetime = 0)
      */
     public function testEmptyCachesException()
     {
-        new ChainCache(array());
+        new ChainCache([]);
     }
 
     /**
@@ -42,7 +42,7 @@ public function testEmptyCachesException()
      */
     public function testInvalidCacheException()
     {
-        new ChainCache(array(new \stdClass()));
+        new ChainCache([new \stdClass()]);
     }
 
     public function testPrune()
@@ -51,18 +51,18 @@ public function testPrune()
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
 
-        $cache = new ChainCache(array(
+        $cache = new ChainCache([
             $this->getPruneableMock(),
             $this->getNonPruneableMock(),
             $this->getPruneableMock(),
-        ));
+        ]);
         $this->assertTrue($cache->prune());
 
-        $cache = new ChainCache(array(
+        $cache = new ChainCache([
             $this->getPruneableMock(),
             $this->getFailingPruneableMock(),
             $this->getPruneableMock(),
-        ));
+        ]);
         $this->assertFalse($cache->prune());
     }
 
diff --git a/src/Symfony/Component/Cache/Tests/Simple/DoctrineCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/DoctrineCacheTest.php
index 127c96858cbe3..af4331d69b5a0 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/DoctrineCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/DoctrineCacheTest.php
@@ -19,10 +19,10 @@
  */
 class DoctrineCacheTest extends CacheTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testObjectDoesNotChangeInCache' => 'ArrayCache does not use serialize/unserialize',
         'testNotUnserializable' => 'ArrayCache does not use serialize/unserialize',
-    );
+    ];
 
     public function createSimpleCache($defaultLifetime = 0)
     {
diff --git a/src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php
index ee9e49d3dd403..f83f0a2e34527 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php
@@ -16,11 +16,11 @@
 
 class MemcachedCacheTest extends CacheTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testSetTtl' => 'Testing expiration slows down the test suite',
         'testSetMultipleTtl' => 'Testing expiration slows down the test suite',
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    );
+    ];
 
     protected static $client;
 
@@ -40,29 +40,29 @@ public static function setupBeforeClass()
 
     public function createSimpleCache($defaultLifetime = 0)
     {
-        $client = $defaultLifetime ? AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), array('binary_protocol' => false)) : self::$client;
+        $client = $defaultLifetime ? AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]) : self::$client;
 
         return new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
     }
 
     public function testCreatePersistentConnectionShouldNotDupServerList()
     {
-        $instance = MemcachedCache::createConnection('memcached://'.getenv('MEMCACHED_HOST'), array('persistent_id' => 'persistent'));
+        $instance = MemcachedCache::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['persistent_id' => 'persistent']);
         $this->assertCount(1, $instance->getServerList());
 
-        $instance = MemcachedCache::createConnection('memcached://'.getenv('MEMCACHED_HOST'), array('persistent_id' => 'persistent'));
+        $instance = MemcachedCache::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['persistent_id' => 'persistent']);
         $this->assertCount(1, $instance->getServerList());
     }
 
     public function testOptions()
     {
-        $client = MemcachedCache::createConnection(array(), array(
+        $client = MemcachedCache::createConnection([], [
             'libketama_compatible' => false,
             'distribution' => 'modula',
             'compression' => true,
             'serializer' => 'php',
             'hash' => 'md5',
-        ));
+        ]);
 
         $this->assertSame(\Memcached::SERIALIZER_PHP, $client->getOption(\Memcached::OPT_SERIALIZER));
         $this->assertSame(\Memcached::HASH_MD5, $client->getOption(\Memcached::OPT_HASH));
@@ -78,24 +78,24 @@ public function testOptions()
      */
     public function testBadOptions($name, $value)
     {
-        MemcachedCache::createConnection(array(), array($name => $value));
+        MemcachedCache::createConnection([], [$name => $value]);
     }
 
     public function provideBadOptions()
     {
-        return array(
-            array('foo', 'bar'),
-            array('hash', 'zyx'),
-            array('serializer', 'zyx'),
-            array('distribution', 'zyx'),
-        );
+        return [
+            ['foo', 'bar'],
+            ['hash', 'zyx'],
+            ['serializer', 'zyx'],
+            ['distribution', 'zyx'],
+        ];
     }
 
     public function testDefaultOptions()
     {
         $this->assertTrue(MemcachedCache::isSupported());
 
-        $client = MemcachedCache::createConnection(array());
+        $client = MemcachedCache::createConnection([]);
 
         $this->assertTrue($client->getOption(\Memcached::OPT_COMPRESSION));
         $this->assertSame(1, $client->getOption(\Memcached::OPT_BINARY_PROTOCOL));
@@ -112,7 +112,7 @@ public function testOptionSerializer()
             $this->markTestSkipped('Memcached::HAVE_JSON required');
         }
 
-        new MemcachedCache(MemcachedCache::createConnection(array(), array('serializer' => 'json')));
+        new MemcachedCache(MemcachedCache::createConnection([], ['serializer' => 'json']));
     }
 
     /**
@@ -121,54 +121,54 @@ public function testOptionSerializer()
     public function testServersSetting($dsn, $host, $port)
     {
         $client1 = MemcachedCache::createConnection($dsn);
-        $client2 = MemcachedCache::createConnection(array($dsn));
-        $client3 = MemcachedCache::createConnection(array(array($host, $port)));
-        $expect = array(
+        $client2 = MemcachedCache::createConnection([$dsn]);
+        $client3 = MemcachedCache::createConnection([[$host, $port]]);
+        $expect = [
             'host' => $host,
             'port' => $port,
-        );
+        ];
 
-        $f = function ($s) { return array('host' => $s['host'], 'port' => $s['port']); };
-        $this->assertSame(array($expect), array_map($f, $client1->getServerList()));
-        $this->assertSame(array($expect), array_map($f, $client2->getServerList()));
-        $this->assertSame(array($expect), array_map($f, $client3->getServerList()));
+        $f = function ($s) { return ['host' => $s['host'], 'port' => $s['port']]; };
+        $this->assertSame([$expect], array_map($f, $client1->getServerList()));
+        $this->assertSame([$expect], array_map($f, $client2->getServerList()));
+        $this->assertSame([$expect], array_map($f, $client3->getServerList()));
     }
 
     public function provideServersSetting()
     {
-        yield array(
+        yield [
             'memcached://127.0.0.1/50',
             '127.0.0.1',
             11211,
-        );
-        yield array(
+        ];
+        yield [
             'memcached://localhost:11222?weight=25',
             'localhost',
             11222,
-        );
+        ];
         if (filter_var(ini_get('memcached.use_sasl'), FILTER_VALIDATE_BOOLEAN)) {
-            yield array(
+            yield [
                 'memcached://user:password@127.0.0.1?weight=50',
                 '127.0.0.1',
                 11211,
-            );
+            ];
         }
-        yield array(
+        yield [
             'memcached:///var/run/memcached.sock?weight=25',
             '/var/run/memcached.sock',
             0,
-        );
-        yield array(
+        ];
+        yield [
             'memcached:///var/local/run/memcached.socket?weight=25',
             '/var/local/run/memcached.socket',
             0,
-        );
+        ];
         if (filter_var(ini_get('memcached.use_sasl'), FILTER_VALIDATE_BOOLEAN)) {
-            yield array(
+            yield [
                 'memcached://user:password@/var/local/run/memcached.socket?weight=25',
                 '/var/local/run/memcached.socket',
                 0,
-            );
+            ];
         }
     }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTextModeTest.php b/src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTextModeTest.php
index 43cadf9034846..13865a6098e17 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTextModeTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTextModeTest.php
@@ -18,7 +18,7 @@ class MemcachedCacheTextModeTest extends MemcachedCacheTest
 {
     public function createSimpleCache($defaultLifetime = 0)
     {
-        $client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), array('binary_protocol' => false));
+        $client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]);
 
         return new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
     }
diff --git a/src/Symfony/Component/Cache/Tests/Simple/NullCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/NullCacheTest.php
index 7b760fd3bddaa..31f42c32b6a8c 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/NullCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/NullCacheTest.php
@@ -40,7 +40,7 @@ public function testGetMultiple()
     {
         $cache = $this->createCachePool();
 
-        $keys = array('foo', 'bar', 'baz', 'biz');
+        $keys = ['foo', 'bar', 'baz', 'biz'];
 
         $default = new \stdClass();
         $items = $cache->getMultiple($keys, $default);
@@ -75,7 +75,7 @@ public function testDelete()
 
     public function testDeleteMultiple()
     {
-        $this->assertTrue($this->createCachePool()->deleteMultiple(array('key', 'foo', 'bar')));
+        $this->assertTrue($this->createCachePool()->deleteMultiple(['key', 'foo', 'bar']));
     }
 
     public function testSet()
@@ -90,7 +90,7 @@ public function testSetMultiple()
     {
         $cache = $this->createCachePool();
 
-        $this->assertFalse($cache->setMultiple(array('key' => 'val')));
+        $this->assertFalse($cache->setMultiple(['key' => 'val']));
         $this->assertNull($cache->get('key'));
     }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Simple/PdoDbalCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/PdoDbalCacheTest.php
index 158e2c892490e..ce1a9ae4f8c6e 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/PdoDbalCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/PdoDbalCacheTest.php
@@ -32,7 +32,7 @@ public static function setupBeforeClass()
 
         self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
 
-        $pool = new PdoCache(DriverManager::getConnection(array('driver' => 'pdo_sqlite', 'path' => self::$dbFile)));
+        $pool = new PdoCache(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));
         $pool->createTable();
     }
 
@@ -43,6 +43,6 @@ public static function tearDownAfterClass()
 
     public function createSimpleCache($defaultLifetime = 0)
     {
-        return new PdoCache(DriverManager::getConnection(array('driver' => 'pdo_sqlite', 'path' => self::$dbFile)), '', $defaultLifetime);
+        return new PdoCache(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]), '', $defaultLifetime);
     }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheTest.php
index b4862c61bd93b..43d0d380b2771 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheTest.php
@@ -20,7 +20,7 @@
  */
 class PhpArrayCacheTest extends CacheTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testBasicUsageWithLongKey' => 'PhpArrayCache does no writes',
 
         'testDelete' => 'PhpArrayCache does no writes',
@@ -45,7 +45,7 @@ class PhpArrayCacheTest extends CacheTestCase
 
         'testDefaultLifeTime' => 'PhpArrayCache does not allow configuring a default lifetime.',
         'testPrune' => 'PhpArrayCache just proxies',
-    );
+    ];
 
     protected static $file;
 
@@ -68,22 +68,22 @@ public function createSimpleCache()
 
     public function testStore()
     {
-        $arrayWithRefs = array();
+        $arrayWithRefs = [];
         $arrayWithRefs[0] = 123;
         $arrayWithRefs[1] = &$arrayWithRefs[0];
 
-        $object = (object) array(
+        $object = (object) [
             'foo' => 'bar',
             'foo2' => 'bar2',
-        );
+        ];
 
-        $expected = array(
+        $expected = [
             'null' => null,
             'serializedString' => serialize($object),
             'arrayWithRefs' => $arrayWithRefs,
             'object' => $object,
-            'arrayWithObject' => array('bar' => $object),
-        );
+            'arrayWithObject' => ['bar' => $object],
+        ];
 
         $cache = new PhpArrayCache(self::$file, new NullCache());
         $cache->warmUp($expected);
diff --git a/src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php b/src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
index 4b6a94f709b6d..abee5e7872164 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
@@ -20,7 +20,7 @@
  */
 class PhpArrayCacheWithFallbackTest extends CacheTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testGetInvalidKeys' => 'PhpArrayCache does no validation',
         'testGetMultipleInvalidKeys' => 'PhpArrayCache does no validation',
         'testDeleteInvalidKeys' => 'PhpArrayCache does no validation',
@@ -32,7 +32,7 @@ class PhpArrayCacheWithFallbackTest extends CacheTestCase
         'testSetMultipleInvalidTtl' => 'PhpArrayCache does no validation',
         'testHasInvalidKeys' => 'PhpArrayCache does no validation',
         'testPrune' => 'PhpArrayCache just proxies',
-    );
+    ];
 
     protected static $file;
 
diff --git a/src/Symfony/Component/Cache/Tests/Simple/PhpFilesCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/PhpFilesCacheTest.php
index 7a402682ae247..936f29a436f0b 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/PhpFilesCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/PhpFilesCacheTest.php
@@ -19,9 +19,9 @@
  */
 class PhpFilesCacheTest extends CacheTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testDefaultLifeTime' => 'PhpFilesCache does not allow configuring a default lifetime.',
-    );
+    ];
 
     public function createSimpleCache()
     {
diff --git a/src/Symfony/Component/Cache/Tests/Simple/Psr6CacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/Psr6CacheTest.php
index 78582894fbe1e..1bc75c906035e 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/Psr6CacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/Psr6CacheTest.php
@@ -19,9 +19,9 @@
  */
 class Psr6CacheTest extends CacheTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testPrune' => 'Psr6Cache just proxies',
-    );
+    ];
 
     public function createSimpleCache($defaultLifetime = 0)
     {
diff --git a/src/Symfony/Component/Cache/Tests/Simple/RedisArrayCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/RedisArrayCacheTest.php
index 3c903c8a9b4a6..bda39d990bcb3 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/RedisArrayCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/RedisArrayCacheTest.php
@@ -19,6 +19,6 @@ public static function setupBeforeClass()
         if (!class_exists('RedisArray')) {
             self::markTestSkipped('The RedisArray class is required.');
         }
-        self::$redis = new \RedisArray(array(getenv('REDIS_HOST')), array('lazy_connect' => true));
+        self::$redis = new \RedisArray([getenv('REDIS_HOST')], ['lazy_connect' => true]);
     }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Simple/RedisCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/RedisCacheTest.php
index d33421f9aae46..407d916c7317c 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/RedisCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/RedisCacheTest.php
@@ -33,13 +33,13 @@ public function testCreateConnection()
         $redis = RedisCache::createConnection('redis://'.$redisHost.'/2');
         $this->assertSame(2, $redis->getDbNum());
 
-        $redis = RedisCache::createConnection('redis://'.$redisHost, array('timeout' => 3));
+        $redis = RedisCache::createConnection('redis://'.$redisHost, ['timeout' => 3]);
         $this->assertEquals(3, $redis->getTimeout());
 
         $redis = RedisCache::createConnection('redis://'.$redisHost.'?timeout=4');
         $this->assertEquals(4, $redis->getTimeout());
 
-        $redis = RedisCache::createConnection('redis://'.$redisHost, array('read_timeout' => 5));
+        $redis = RedisCache::createConnection('redis://'.$redisHost, ['read_timeout' => 5]);
         $this->assertEquals(5, $redis->getReadTimeout());
     }
 
@@ -55,11 +55,11 @@ public function testFailedCreateConnection($dsn)
 
     public function provideFailedCreateConnection()
     {
-        return array(
-            array('redis://localhost:1234'),
-            array('redis://foo@localhost'),
-            array('redis://localhost/123'),
-        );
+        return [
+            ['redis://localhost:1234'],
+            ['redis://foo@localhost'],
+            ['redis://localhost/123'],
+        ];
     }
 
     /**
@@ -74,9 +74,9 @@ public function testInvalidCreateConnection($dsn)
 
     public function provideInvalidCreateConnection()
     {
-        return array(
-            array('foo://localhost'),
-            array('redis://'),
-        );
+        return [
+            ['foo://localhost'],
+            ['redis://'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Simple/TraceableCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/TraceableCacheTest.php
index 535f93da4be5a..e684caf36e8f9 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/TraceableCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/TraceableCacheTest.php
@@ -19,9 +19,9 @@
  */
 class TraceableCacheTest extends CacheTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testPrune' => 'TraceableCache just proxies',
-    );
+    ];
 
     public function createSimpleCache($defaultLifetime = 0)
     {
@@ -37,7 +37,7 @@ public function testGetMissTrace()
 
         $call = $calls[0];
         $this->assertSame('get', $call->name);
-        $this->assertSame(array('k' => false), $call->result);
+        $this->assertSame(['k' => false], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(1, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -61,7 +61,7 @@ public function testGetMultipleMissTrace()
     {
         $pool = $this->createSimpleCache();
         $pool->set('k1', 123);
-        $values = $pool->getMultiple(array('k0', 'k1'));
+        $values = $pool->getMultiple(['k0', 'k1']);
         foreach ($values as $value) {
         }
         $calls = $pool->getCalls();
@@ -69,7 +69,7 @@ public function testGetMultipleMissTrace()
 
         $call = $calls[1];
         $this->assertSame('getMultiple', $call->name);
-        $this->assertSame(array('k1' => true, 'k0' => false), $call->result);
+        $this->assertSame(['k1' => true, 'k0' => false], $call->result);
         $this->assertSame(1, $call->misses);
         $this->assertNotEmpty($call->start);
         $this->assertNotEmpty($call->end);
@@ -84,7 +84,7 @@ public function testHasMissTrace()
 
         $call = $calls[0];
         $this->assertSame('has', $call->name);
-        $this->assertSame(array('k' => false), $call->result);
+        $this->assertSame(['k' => false], $call->result);
         $this->assertNotEmpty($call->start);
         $this->assertNotEmpty($call->end);
     }
@@ -99,7 +99,7 @@ public function testHasHitTrace()
 
         $call = $calls[1];
         $this->assertSame('has', $call->name);
-        $this->assertSame(array('k' => true), $call->result);
+        $this->assertSame(['k' => true], $call->result);
         $this->assertNotEmpty($call->start);
         $this->assertNotEmpty($call->end);
     }
@@ -113,7 +113,7 @@ public function testDeleteTrace()
 
         $call = $calls[0];
         $this->assertSame('delete', $call->name);
-        $this->assertSame(array('k' => true), $call->result);
+        $this->assertSame(['k' => true], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -123,14 +123,14 @@ public function testDeleteTrace()
     public function testDeleteMultipleTrace()
     {
         $pool = $this->createSimpleCache();
-        $arg = array('k0', 'k1');
+        $arg = ['k0', 'k1'];
         $pool->deleteMultiple($arg);
         $calls = $pool->getCalls();
         $this->assertCount(1, $calls);
 
         $call = $calls[0];
         $this->assertSame('deleteMultiple', $call->name);
-        $this->assertSame(array('keys' => $arg, 'result' => true), $call->result);
+        $this->assertSame(['keys' => $arg, 'result' => true], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -146,7 +146,7 @@ public function testTraceSetTrace()
 
         $call = $calls[0];
         $this->assertSame('set', $call->name);
-        $this->assertSame(array('k' => true), $call->result);
+        $this->assertSame(['k' => true], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -156,13 +156,13 @@ public function testTraceSetTrace()
     public function testSetMultipleTrace()
     {
         $pool = $this->createSimpleCache();
-        $pool->setMultiple(array('k' => 'foo'));
+        $pool->setMultiple(['k' => 'foo']);
         $calls = $pool->getCalls();
         $this->assertCount(1, $calls);
 
         $call = $calls[0];
         $this->assertSame('setMultiple', $call->name);
-        $this->assertSame(array('keys' => array('k'), 'result' => true), $call->result);
+        $this->assertSame(['keys' => ['k'], 'result' => true], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
diff --git a/src/Symfony/Component/Cache/Traits/AbstractTrait.php b/src/Symfony/Component/Cache/Traits/AbstractTrait.php
index 441eddbde3cd5..25ae302deadc4 100644
--- a/src/Symfony/Component/Cache/Traits/AbstractTrait.php
+++ b/src/Symfony/Component/Cache/Traits/AbstractTrait.php
@@ -93,7 +93,7 @@ public function hasItem($key)
         try {
             return $this->doHave($id);
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to check if key "{key}" is cached', array('key' => $key, 'exception' => $e));
+            CacheItem::log($this->logger, 'Failed to check if key "{key}" is cached', ['key' => $key, 'exception' => $e]);
 
             return false;
         }
@@ -120,7 +120,7 @@ public function clear()
         try {
             return $this->doClear($this->namespace) || $cleared;
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to clear the cache', array('exception' => $e));
+            CacheItem::log($this->logger, 'Failed to clear the cache', ['exception' => $e]);
 
             return false;
         }
@@ -131,7 +131,7 @@ public function clear()
      */
     public function deleteItem($key)
     {
-        return $this->deleteItems(array($key));
+        return $this->deleteItems([$key]);
     }
 
     /**
@@ -139,7 +139,7 @@ public function deleteItem($key)
      */
     public function deleteItems(array $keys)
     {
-        $ids = array();
+        $ids = [];
 
         foreach ($keys as $key) {
             $ids[$key] = $this->getId($key);
@@ -159,12 +159,12 @@ public function deleteItems(array $keys)
         foreach ($ids as $key => $id) {
             try {
                 $e = null;
-                if ($this->doDelete(array($id))) {
+                if ($this->doDelete([$id])) {
                     continue;
                 }
             } catch (\Exception $e) {
             }
-            CacheItem::log($this->logger, 'Failed to delete key "{key}"', array('key' => $key, 'exception' => $e));
+            CacheItem::log($this->logger, 'Failed to delete key "{key}"', ['key' => $key, 'exception' => $e]);
             $ok = false;
         }
 
diff --git a/src/Symfony/Component/Cache/Traits/ArrayTrait.php b/src/Symfony/Component/Cache/Traits/ArrayTrait.php
index 88385ed480f34..f196400d59ca8 100644
--- a/src/Symfony/Component/Cache/Traits/ArrayTrait.php
+++ b/src/Symfony/Component/Cache/Traits/ArrayTrait.php
@@ -24,8 +24,8 @@ trait ArrayTrait
     use LoggerAwareTrait;
 
     private $storeSerialized;
-    private $values = array();
-    private $expiries = array();
+    private $values = [];
+    private $expiries = [];
 
     /**
      * Returns all cached values, with cache miss as null.
@@ -52,7 +52,7 @@ public function hasItem($key)
      */
     public function clear()
     {
-        $this->values = $this->expiries = array();
+        $this->values = $this->expiries = [];
 
         return true;
     }
diff --git a/src/Symfony/Component/Cache/Traits/FilesystemTrait.php b/src/Symfony/Component/Cache/Traits/FilesystemTrait.php
index 23974b3bc5487..3e0dc86bd1cfd 100644
--- a/src/Symfony/Component/Cache/Traits/FilesystemTrait.php
+++ b/src/Symfony/Component/Cache/Traits/FilesystemTrait.php
@@ -52,7 +52,7 @@ public function prune()
      */
     protected function doFetch(array $ids)
     {
-        $values = array();
+        $values = [];
         $now = time();
 
         foreach ($ids as $id) {
@@ -83,7 +83,7 @@ protected function doHave($id)
     {
         $file = $this->getFile($id);
 
-        return file_exists($file) && (@filemtime($file) > time() || $this->doFetch(array($id)));
+        return file_exists($file) && (@filemtime($file) > time() || $this->doFetch([$id]));
     }
 
     /**
diff --git a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php
index 8160f14116162..b679d041940fd 100644
--- a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php
+++ b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php
@@ -22,12 +22,12 @@
  */
 trait MemcachedTrait
 {
-    private static $defaultClientOptions = array(
+    private static $defaultClientOptions = [
         'persistent_id' => null,
         'username' => null,
         'password' => null,
         'serializer' => 'php',
-    );
+    ];
 
     private $client;
     private $lazyClient;
@@ -73,10 +73,10 @@ private function init(\Memcached $client, $namespace, $defaultLifetime)
      *
      * @throws \ErrorException When invalid options or servers are provided
      */
-    public static function createConnection($servers, array $options = array())
+    public static function createConnection($servers, array $options = [])
     {
         if (\is_string($servers)) {
-            $servers = array($servers);
+            $servers = [$servers];
         } elseif (!\is_array($servers)) {
             throw new InvalidArgumentException(sprintf('MemcachedAdapter::createClient() expects array or string as first argument, %s given.', \gettype($servers)));
         }
@@ -154,12 +154,12 @@ public static function createConnection($servers, array $options = array())
 
             // set client's servers, taking care of persistent connections
             if (!$client->isPristine()) {
-                $oldServers = array();
+                $oldServers = [];
                 foreach ($client->getServerList() as $server) {
-                    $oldServers[] = array($server['host'], $server['port']);
+                    $oldServers[] = [$server['host'], $server['port']];
                 }
 
-                $newServers = array();
+                $newServers = [];
                 foreach ($servers as $server) {
                     if (1 < \count($server)) {
                         $server = array_values($server);
@@ -199,7 +199,7 @@ protected function doSave(array $values, $lifetime)
             $lifetime += time();
         }
 
-        $encodedValues = array();
+        $encodedValues = [];
         foreach ($values as $key => $value) {
             $encodedValues[rawurlencode($key)] = $value;
         }
@@ -218,7 +218,7 @@ protected function doFetch(array $ids)
 
             $encodedResult = $this->checkResultCode($this->getClient()->getMulti($encodedIds));
 
-            $result = array();
+            $result = [];
             foreach ($encodedResult as $key => $value) {
                 $result[rawurldecode($key)] = $value;
             }
diff --git a/src/Symfony/Component/Cache/Traits/PdoTrait.php b/src/Symfony/Component/Cache/Traits/PdoTrait.php
index a22714c80ff60..5a99e3c6abf3b 100644
--- a/src/Symfony/Component/Cache/Traits/PdoTrait.php
+++ b/src/Symfony/Component/Cache/Traits/PdoTrait.php
@@ -33,7 +33,7 @@ trait PdoTrait
     private $timeCol = 'item_time';
     private $username = '';
     private $password = '';
-    private $connectionOptions = array();
+    private $connectionOptions = [];
     private $namespace;
 
     private function init($connOrDsn, $namespace, $defaultLifetime, array $options)
@@ -85,24 +85,24 @@ public function createTable()
         $conn = $this->getConnection();
 
         if ($conn instanceof Connection) {
-            $types = array(
+            $types = [
                 'mysql' => 'binary',
                 'sqlite' => 'text',
                 'pgsql' => 'string',
                 'oci' => 'string',
                 'sqlsrv' => 'string',
-            );
+            ];
             if (!isset($types[$this->driver])) {
                 throw new \DomainException(sprintf('Creating the cache table is currently not implemented for PDO driver "%s".', $this->driver));
             }
 
             $schema = new Schema();
             $table = $schema->createTable($this->table);
-            $table->addColumn($this->idCol, $types[$this->driver], array('length' => 255));
-            $table->addColumn($this->dataCol, 'blob', array('length' => 16777215));
-            $table->addColumn($this->lifetimeCol, 'integer', array('unsigned' => true, 'notnull' => false));
-            $table->addColumn($this->timeCol, 'integer', array('unsigned' => true));
-            $table->setPrimaryKey(array($this->idCol));
+            $table->addColumn($this->idCol, $types[$this->driver], ['length' => 255]);
+            $table->addColumn($this->dataCol, 'blob', ['length' => 16777215]);
+            $table->addColumn($this->lifetimeCol, 'integer', ['unsigned' => true, 'notnull' => false]);
+            $table->addColumn($this->timeCol, 'integer', ['unsigned' => true]);
+            $table->setPrimaryKey([$this->idCol]);
 
             foreach ($schema->toSql($conn->getDatabasePlatform()) as $sql) {
                 $conn->exec($sql);
@@ -166,7 +166,7 @@ public function prune()
     protected function doFetch(array $ids)
     {
         $now = time();
-        $expired = array();
+        $expired = [];
 
         $sql = str_pad('', (\count($ids) << 1) - 1, '?,');
         $sql = "SELECT $this->idCol, CASE WHEN $this->lifetimeCol IS NULL OR $this->lifetimeCol + $this->timeCol > ? THEN $this->dataCol ELSE NULL END FROM $this->table WHERE $this->idCol IN ($sql)";
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
index 77e3decf50a05..828cb224c6c51 100644
--- a/src/Symfony/Component/Cache/Traits/RedisTrait.php
+++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -73,7 +73,7 @@ private function init($redisClient, $namespace = '', $defaultLifetime = 0)
      *
      * @return \Redis|\Predis\Client According to the "class" option
      */
-    public static function createConnection($dsn, array $options = array())
+    public static function createConnection($dsn, array $options = [])
     {
         if (0 !== strpos($dsn, 'redis://')) {
             throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s does not start with "redis://"', $dsn));
@@ -172,7 +172,7 @@ protected function doFetch(array $ids)
         if ($ids) {
             $values = $this->pipeline(function () use ($ids) {
                 foreach ($ids as $id) {
-                    yield 'get' => array($id);
+                    yield 'get' => [$id];
                 }
             });
             foreach ($values as $id => $v) {
@@ -216,7 +216,7 @@ protected function doClear($namespace)
                 return false;
             }
         } elseif ($this->redis instanceof \RedisArray) {
-            $hosts = array();
+            $hosts = [];
             foreach ($this->redis->_hosts() as $host) {
                 $hosts[] = $this->redis->_instance($host);
             }
@@ -291,9 +291,9 @@ protected function doSave(array $values, $lifetime)
         $results = $this->pipeline(function () use ($serialized, $lifetime) {
             foreach ($serialized as $id => $value) {
                 if (0 >= $lifetime) {
-                    yield 'set' => array($id, $value);
+                    yield 'set' => [$id, $value];
                 } else {
-                    yield 'setEx' => array($id, $lifetime, $value);
+                    yield 'setEx' => [$id, $lifetime, $value];
                 }
             }
         });
diff --git a/src/Symfony/Component/Config/ConfigCache.php b/src/Symfony/Component/Config/ConfigCache.php
index 591c89bc4ff02..b2a39076f9d4a 100644
--- a/src/Symfony/Component/Config/ConfigCache.php
+++ b/src/Symfony/Component/Config/ConfigCache.php
@@ -35,9 +35,9 @@ public function __construct($file, $debug)
     {
         $this->debug = (bool) $debug;
 
-        $checkers = array();
+        $checkers = [];
         if (true === $this->debug) {
-            $checkers = array(new SelfCheckingResourceChecker());
+            $checkers = [new SelfCheckingResourceChecker()];
         }
 
         parent::__construct($file, $checkers);
diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php
index 25d9cfc5e416f..4e39ea769904a 100644
--- a/src/Symfony/Component/Config/Definition/ArrayNode.php
+++ b/src/Symfony/Component/Config/Definition/ArrayNode.php
@@ -22,8 +22,8 @@
  */
 class ArrayNode extends BaseNode implements PrototypeNodeInterface
 {
-    protected $xmlRemappings = array();
-    protected $children = array();
+    protected $xmlRemappings = [];
+    protected $children = [];
     protected $allowFalse = false;
     protected $allowNewKeys = true;
     protected $addIfNotSet = false;
@@ -56,7 +56,7 @@ protected function preNormalize($value)
             return $value;
         }
 
-        $normalized = array();
+        $normalized = [];
 
         foreach ($value as $k => $v) {
             if (false !== strpos($k, '-') && false === strpos($k, '_') && !array_key_exists($normalizedKey = str_replace('-', '_', $k), $value)) {
@@ -177,7 +177,7 @@ public function getDefaultValue()
             throw new \RuntimeException(sprintf('The node at path "%s" has no default value.', $this->getPath()));
         }
 
-        $defaults = array();
+        $defaults = [];
         foreach ($this->children as $name => $child) {
             if ($child->hasDefaultValue()) {
                 $defaults[$name] = $child->getDefaultValue();
@@ -289,7 +289,7 @@ protected function normalizeValue($value)
 
         $value = $this->remapXml($value);
 
-        $normalized = array();
+        $normalized = [];
         foreach ($value as $name => $val) {
             if (isset($this->children[$name])) {
                 try {
diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
index d3f0f96e3360d..22ebb4297388a 100644
--- a/src/Symfony/Component/Config/Definition/BaseNode.php
+++ b/src/Symfony/Component/Config/Definition/BaseNode.php
@@ -127,7 +127,7 @@ public function getExample()
      */
     public function addEquivalentValue($originalValue, $equivalentValue)
     {
-        $this->equivalentValues[] = array($originalValue, $equivalentValue);
+        $this->equivalentValues[] = [$originalValue, $equivalentValue];
     }
 
     /**
@@ -211,7 +211,7 @@ public function isDeprecated()
      */
     public function getDeprecationMessage($node, $path)
     {
-        return strtr($this->deprecationMessage, array('%node%' => $node, '%path%' => $path));
+        return strtr($this->deprecationMessage, ['%node%' => $node, '%path%' => $path]);
     }
 
     /**
diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
index 28a00be091100..55d695c7cb4d6 100644
--- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
+++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
@@ -25,7 +25,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
     protected $performDeepMerging = true;
     protected $ignoreExtraKeys = false;
     protected $removeExtraKeys = true;
-    protected $children = array();
+    protected $children = [];
     protected $prototype;
     protected $atLeastOne = false;
     protected $allowNewKeys = true;
@@ -43,8 +43,8 @@ public function __construct($name, NodeParentInterface $parent = null)
     {
         parent::__construct($name, $parent);
 
-        $this->nullEquivalent = array();
-        $this->trueEquivalent = array();
+        $this->nullEquivalent = [];
+        $this->trueEquivalent = [];
     }
 
     /**
@@ -275,9 +275,9 @@ public function canBeEnabled()
     {
         $this
             ->addDefaultsIfNotSet()
-            ->treatFalseLike(array('enabled' => false))
-            ->treatTrueLike(array('enabled' => true))
-            ->treatNullLike(array('enabled' => true))
+            ->treatFalseLike(['enabled' => false])
+            ->treatTrueLike(['enabled' => true])
+            ->treatNullLike(['enabled' => true])
             ->beforeNormalization()
                 ->ifArray()
                 ->then(function ($v) {
@@ -305,9 +305,9 @@ public function canBeDisabled()
     {
         $this
             ->addDefaultsIfNotSet()
-            ->treatFalseLike(array('enabled' => false))
-            ->treatTrueLike(array('enabled' => true))
-            ->treatNullLike(array('enabled' => true))
+            ->treatFalseLike(['enabled' => false])
+            ->treatTrueLike(['enabled' => true])
+            ->treatNullLike(['enabled' => true])
             ->children()
                 ->booleanNode('enabled')
                     ->defaultTrue()
diff --git a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
index 7ba19515b82d1..05949d2b5a3b1 100644
--- a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
+++ b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
@@ -144,7 +144,7 @@ public function ifNotInArray(array $array)
     public function castToArray()
     {
         $this->ifPart = function ($v) { return !\is_array($v); };
-        $this->thenPart = function ($v) { return array($v); };
+        $this->thenPart = function ($v) { return [$v]; };
 
         return $this;
     }
@@ -168,7 +168,7 @@ public function then(\Closure $closure)
      */
     public function thenEmptyArray()
     {
-        $this->thenPart = function ($v) { return array(); };
+        $this->thenPart = function ($v) { return []; };
 
         return $this;
     }
diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
index 95863d68f9bba..63c0d696b4fa0 100644
--- a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
+++ b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
@@ -23,7 +23,7 @@ class NodeBuilder implements NodeParentInterface
 
     public function __construct()
     {
-        $this->nodeMapping = array(
+        $this->nodeMapping = [
             'variable' => __NAMESPACE__.'\\VariableNodeDefinition',
             'scalar' => __NAMESPACE__.'\\ScalarNodeDefinition',
             'boolean' => __NAMESPACE__.'\\BooleanNodeDefinition',
@@ -31,7 +31,7 @@ public function __construct()
             'float' => __NAMESPACE__.'\\FloatNodeDefinition',
             'array' => __NAMESPACE__.'\\ArrayNodeDefinition',
             'enum' => __NAMESPACE__.'\\EnumNodeDefinition',
-        );
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php
index 3a4d2cdf07fdd..cc245d7489b0d 100644
--- a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php
+++ b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php
@@ -34,7 +34,7 @@ abstract class NodeDefinition implements NodeParentInterface
     protected $trueEquivalent = true;
     protected $falseEquivalent = false;
     protected $parent;
-    protected $attributes = array();
+    protected $attributes = [];
 
     /**
      * @param string|null              $name   The name of the node
diff --git a/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php
index 35e30487a60eb..d3cdca90df1c3 100644
--- a/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php
+++ b/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php
@@ -19,8 +19,8 @@
 class NormalizationBuilder
 {
     protected $node;
-    public $before = array();
-    public $remappings = array();
+    public $before = [];
+    public $remappings = [];
 
     public function __construct(NodeDefinition $node)
     {
@@ -37,7 +37,7 @@ public function __construct(NodeDefinition $node)
      */
     public function remap($key, $plural = null)
     {
-        $this->remappings[] = array($key, null === $plural ? $key.'s' : $plural);
+        $this->remappings[] = [$key, null === $plural ? $key.'s' : $plural];
 
         return $this;
     }
diff --git a/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php
index bb2b9eb33924b..4efc726c0cf2d 100644
--- a/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php
+++ b/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php
@@ -19,7 +19,7 @@
 class ValidationBuilder
 {
     protected $node;
-    public $rules = array();
+    public $rules = [];
 
     public function __construct(NodeDefinition $node)
     {
diff --git a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
index 881457c923446..da05530acfdd3 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
@@ -65,10 +65,10 @@ private function writeNode(NodeInterface $node, $depth = 0, $root = false, $name
         }
         $rootName = str_replace('_', '-', $rootName);
 
-        $rootAttributes = array();
-        $rootAttributeComments = array();
-        $rootChildren = array();
-        $rootComments = array();
+        $rootAttributes = [];
+        $rootAttributeComments = [];
+        $rootChildren = [];
+        $rootComments = [];
 
         if ($node instanceof ArrayNode) {
             $children = $node->getChildren();
@@ -98,7 +98,7 @@ private function writeNode(NodeInterface $node, $depth = 0, $root = false, $name
 
                 if ($prototype instanceof PrototypedArrayNode) {
                     $prototype->setName($key);
-                    $children = array($key => $prototype);
+                    $children = [$key => $prototype];
                 } elseif ($prototype instanceof ArrayNode) {
                     $children = $prototype->getChildren();
                 } else {
@@ -140,7 +140,7 @@ private function writeNode(NodeInterface $node, $depth = 0, $root = false, $name
                     $value = '%%%%not_defined%%%%'; // use a string which isn't used in the normal world
 
                     // comments
-                    $comments = array();
+                    $comments = [];
                     if ($info = $child->getInfo()) {
                         $comments[] = $info;
                     }
diff --git a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
index fc5d20a2e7040..7aa97909f3e2f 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
@@ -77,7 +77,7 @@ public function dumpNode(NodeInterface $node)
      */
     private function writeNode(NodeInterface $node, NodeInterface $parentNode = null, $depth = 0, $prototypedArray = false)
     {
-        $comments = array();
+        $comments = [];
         $default = '';
         $defaultArray = null;
         $children = null;
@@ -251,6 +251,6 @@ private function getPrototypeChildren(PrototypedArrayNode $node)
         }
         $keyNode->setInfo($info);
 
-        return array($key => $keyNode);
+        return [$key => $keyNode];
     }
 }
diff --git a/src/Symfony/Component/Config/Definition/Processor.php b/src/Symfony/Component/Config/Definition/Processor.php
index 3e0feab8693e1..0a935eeb7ff1d 100644
--- a/src/Symfony/Component/Config/Definition/Processor.php
+++ b/src/Symfony/Component/Config/Definition/Processor.php
@@ -28,7 +28,7 @@ class Processor
      */
     public function process(NodeInterface $configTree, array $configs)
     {
-        $currentConfig = array();
+        $currentConfig = [];
         foreach ($configs as $config) {
             $config = $configTree->normalize($config);
             $currentConfig = $configTree->merge($currentConfig, $config);
@@ -86,12 +86,12 @@ public static function normalizeConfig($config, $key, $plural = null)
         if (isset($config[$key])) {
             if (\is_string($config[$key]) || !\is_int(key($config[$key]))) {
                 // only one
-                return  array($config[$key]);
+                return  [$config[$key]];
             }
 
             return  $config[$key];
         }
 
-        return array();
+        return [];
     }
 }
diff --git a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
index eddcb32a77871..15769a34f1285 100644
--- a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
+++ b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
@@ -27,12 +27,12 @@ class PrototypedArrayNode extends ArrayNode
     protected $keyAttribute;
     protected $removeKeyAttribute = false;
     protected $minNumberOfElements = 0;
-    protected $defaultValue = array();
+    protected $defaultValue = [];
     protected $defaultChildren;
     /**
      * @var NodeInterface[] An array of the prototypes of the simplified value children
      */
-    private $valuePrototypes = array();
+    private $valuePrototypes = [];
 
     /**
      * Sets the minimum number of elements that a prototype based node must
@@ -114,10 +114,10 @@ public function hasDefaultValue()
      *
      * @param int|string|array|null $children The number of children|The child name|The children names to be added
      */
-    public function setAddChildrenIfNoneSet($children = array('defaults'))
+    public function setAddChildrenIfNoneSet($children = ['defaults'])
     {
         if (null === $children) {
-            $this->defaultChildren = array('defaults');
+            $this->defaultChildren = ['defaults'];
         } else {
             $this->defaultChildren = \is_int($children) && $children > 0 ? range(1, $children) : (array) $children;
         }
@@ -132,8 +132,8 @@ public function setAddChildrenIfNoneSet($children = array('defaults'))
     public function getDefaultValue()
     {
         if (null !== $this->defaultChildren) {
-            $default = $this->prototype->hasDefaultValue() ? $this->prototype->getDefaultValue() : array();
-            $defaults = array();
+            $default = $this->prototype->hasDefaultValue() ? $this->prototype->getDefaultValue() : [];
+            $defaults = [];
             foreach (array_values($this->defaultChildren) as $i => $name) {
                 $defaults[null === $this->keyAttribute ? $i : $name] = $default;
             }
@@ -226,7 +226,7 @@ protected function normalizeValue($value)
         $value = $this->remapXml($value);
 
         $isAssoc = array_keys($value) !== range(0, \count($value) - 1);
-        $normalized = array();
+        $normalized = [];
         foreach ($value as $k => $v) {
             if (null !== $this->keyAttribute && \is_array($v)) {
                 if (!isset($v[$this->keyAttribute]) && \is_int($k) && !$isAssoc) {
@@ -243,7 +243,7 @@ protected function normalizeValue($value)
                     }
 
                     // if only "value" is left
-                    if (array_keys($v) === array('value')) {
+                    if (array_keys($v) === ['value']) {
                         $v = $v['value'];
                         if ($this->prototype instanceof ArrayNode && ($children = $this->prototype->getChildren()) && array_key_exists('value', $children)) {
                             $valuePrototype = current($this->valuePrototypes) ?: clone $children['value'];
diff --git a/src/Symfony/Component/Config/Exception/FileLoaderLoadException.php b/src/Symfony/Component/Config/Exception/FileLoaderLoadException.php
index e74bd673d5476..82d90eb39b6ef 100644
--- a/src/Symfony/Component/Config/Exception/FileLoaderLoadException.php
+++ b/src/Symfony/Component/Config/Exception/FileLoaderLoadException.php
@@ -80,7 +80,7 @@ protected function varToString($var)
         }
 
         if (\is_array($var)) {
-            $a = array();
+            $a = [];
             foreach ($var as $k => $v) {
                 $a[] = sprintf('%s => %s', $k, $this->varToString($v));
             }
diff --git a/src/Symfony/Component/Config/FileLocator.php b/src/Symfony/Component/Config/FileLocator.php
index 2c9cea047c2a4..1314cc3486e81 100644
--- a/src/Symfony/Component/Config/FileLocator.php
+++ b/src/Symfony/Component/Config/FileLocator.php
@@ -25,7 +25,7 @@ class FileLocator implements FileLocatorInterface
     /**
      * @param string|array $paths A path or an array of paths where to look for resources
      */
-    public function __construct($paths = array())
+    public function __construct($paths = [])
     {
         $this->paths = (array) $paths;
     }
@@ -41,7 +41,7 @@ public function locate($name, $currentPath = null, $first = true)
 
         if ($this->isAbsolutePath($name)) {
             if (!file_exists($name)) {
-                throw new FileLocatorFileNotFoundException(sprintf('The file "%s" does not exist.', $name), 0, null, array($name));
+                throw new FileLocatorFileNotFoundException(sprintf('The file "%s" does not exist.', $name), 0, null, [$name]);
             }
 
             return $name;
@@ -54,7 +54,7 @@ public function locate($name, $currentPath = null, $first = true)
         }
 
         $paths = array_unique($paths);
-        $filepaths = $notfound = array();
+        $filepaths = $notfound = [];
 
         foreach ($paths as $path) {
             if (@file_exists($file = $path.\DIRECTORY_SEPARATOR.$name)) {
diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php
index 016ac4120fc9d..abaf1767d90a4 100644
--- a/src/Symfony/Component/Config/Loader/FileLoader.php
+++ b/src/Symfony/Component/Config/Loader/FileLoader.php
@@ -25,7 +25,7 @@
  */
 abstract class FileLoader extends Loader
 {
-    protected static $loading = array();
+    protected static $loading = [];
 
     protected $locator;
 
@@ -73,7 +73,7 @@ public function getLocator()
     public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null)
     {
         if (\is_string($resource) && \strlen($resource) !== $i = strcspn($resource, '*?{[')) {
-            $ret = array();
+            $ret = [];
             $isSubpath = 0 !== $i && false !== strpos(substr($resource, 0, $i), '/');
             foreach ($this->glob($resource, false, $_, $ignoreErrors || !$isSubpath) as $path => $info) {
                 if (null !== $res = $this->doImport($path, $type, $ignoreErrors, $sourceResource)) {
@@ -113,7 +113,7 @@ protected function glob($pattern, $recursive, &$resource = null, $ignoreErrors =
                 throw $e;
             }
 
-            $resource = array();
+            $resource = [];
             foreach ($e->getPaths() as $path) {
                 $resource[] = new FileExistenceResource($path);
             }
@@ -136,7 +136,7 @@ private function doImport($resource, $type = null, $ignoreErrors = false, $sourc
                 $resource = $loader->getLocator()->locate($resource, $this->currentDir, false);
             }
 
-            $resources = \is_array($resource) ? $resource : array($resource);
+            $resources = \is_array($resource) ? $resource : [$resource];
             for ($i = 0; $i < $resourcesCount = \count($resources); ++$i) {
                 if (isset(self::$loading[$resources[$i]])) {
                     if ($i == $resourcesCount - 1) {
diff --git a/src/Symfony/Component/Config/Loader/LoaderResolver.php b/src/Symfony/Component/Config/Loader/LoaderResolver.php
index 9299bc000f5f4..c99efda4fd365 100644
--- a/src/Symfony/Component/Config/Loader/LoaderResolver.php
+++ b/src/Symfony/Component/Config/Loader/LoaderResolver.php
@@ -24,12 +24,12 @@ class LoaderResolver implements LoaderResolverInterface
     /**
      * @var LoaderInterface[] An array of LoaderInterface objects
      */
-    private $loaders = array();
+    private $loaders = [];
 
     /**
      * @param LoaderInterface[] $loaders An array of loaders
      */
-    public function __construct(array $loaders = array())
+    public function __construct(array $loaders = [])
     {
         foreach ($loaders as $loader) {
             $this->addLoader($loader);
diff --git a/src/Symfony/Component/Config/Resource/ClassExistenceResource.php b/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
index 9a1d7ba57b2ca..9f904a881e07d 100644
--- a/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
+++ b/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
@@ -26,7 +26,7 @@ class ClassExistenceResource implements SelfCheckingResourceInterface, \Serializ
 
     private static $autoloadLevel = 0;
     private static $autoloadedClass;
-    private static $existsCache = array();
+    private static $existsCache = [];
 
     /**
      * @param string    $resource The fully-qualified class name
@@ -105,7 +105,7 @@ public function serialize()
             $this->isFresh(0);
         }
 
-        return serialize(array($this->resource, $this->exists));
+        return serialize([$this->resource, $this->exists]);
     }
 
     /**
@@ -126,10 +126,10 @@ private static function throwOnRequiredClass($class)
         }
         $e = new \ReflectionException("Class $class not found");
         $trace = $e->getTrace();
-        $autoloadFrame = array(
+        $autoloadFrame = [
             'function' => 'spl_autoload_call',
-            'args' => array($class),
-        );
+            'args' => [$class],
+        ];
         $i = 1 + array_search($autoloadFrame, $trace, true);
 
         if (isset($trace[$i]['function']) && !isset($trace[$i]['class'])) {
@@ -151,11 +151,11 @@ private static function throwOnRequiredClass($class)
                     return;
             }
 
-            $props = array(
+            $props = [
                 'file' => $trace[$i]['file'],
                 'line' => $trace[$i]['line'],
                 'trace' => \array_slice($trace, 1 + $i),
-            );
+            ];
 
             foreach ($props as $p => $v) {
                 $r = new \ReflectionProperty('Exception', $p);
diff --git a/src/Symfony/Component/Config/Resource/ComposerResource.php b/src/Symfony/Component/Config/Resource/ComposerResource.php
index 9c170c077509a..85ac555295c8f 100644
--- a/src/Symfony/Component/Config/Resource/ComposerResource.php
+++ b/src/Symfony/Component/Config/Resource/ComposerResource.php
@@ -63,7 +63,7 @@ public function unserialize($serialized)
 
     private static function refresh()
     {
-        self::$runtimeVendors = array();
+        self::$runtimeVendors = [];
 
         foreach (get_declared_classes() as $class) {
             if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
diff --git a/src/Symfony/Component/Config/Resource/DirectoryResource.php b/src/Symfony/Component/Config/Resource/DirectoryResource.php
index b1786397d1865..7b314dd9b01f9 100644
--- a/src/Symfony/Component/Config/Resource/DirectoryResource.php
+++ b/src/Symfony/Component/Config/Resource/DirectoryResource.php
@@ -42,7 +42,7 @@ public function __construct($resource, $pattern = null)
      */
     public function __toString()
     {
-        return md5(serialize(array($this->resource, $this->pattern)));
+        return md5(serialize([$this->resource, $this->pattern]));
     }
 
     /**
@@ -106,7 +106,7 @@ public function isFresh($timestamp)
 
     public function serialize()
     {
-        return serialize(array($this->resource, $this->pattern));
+        return serialize([$this->resource, $this->pattern]);
     }
 
     public function unserialize($serialized)
diff --git a/src/Symfony/Component/Config/Resource/FileExistenceResource.php b/src/Symfony/Component/Config/Resource/FileExistenceResource.php
index 6396ddd524852..cbdf1b0c5ae04 100644
--- a/src/Symfony/Component/Config/Resource/FileExistenceResource.php
+++ b/src/Symfony/Component/Config/Resource/FileExistenceResource.php
@@ -63,7 +63,7 @@ public function isFresh($timestamp)
      */
     public function serialize()
     {
-        return serialize(array($this->resource, $this->exists));
+        return serialize([$this->resource, $this->exists]);
     }
 
     /**
diff --git a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
index 65156a06de779..c8190307af46f 100644
--- a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
+++ b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
@@ -64,7 +64,7 @@ public function serialize()
             $this->loadFiles($this->classReflector);
         }
 
-        return serialize(array($this->files, $this->className, $this->hash));
+        return serialize([$this->files, $this->className, $this->hash]);
     }
 
     public function unserialize($serialized)
diff --git a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
index 91feed6228329..f7518147a8fc6 100644
--- a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
+++ b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
@@ -158,7 +158,7 @@ private function safelyUnserialize($file)
         $meta = false;
         $signalingException = new \UnexpectedValueException();
         $prevUnserializeHandler = ini_set('unserialize_callback_func', '');
-        $prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = array()) use (&$prevErrorHandler, $signalingException) {
+        $prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$prevErrorHandler, $signalingException) {
             if (E_WARNING === $type && 'Class __PHP_Incomplete_Class has no unserializer' === $msg) {
                 throw $signalingException;
             }
diff --git a/src/Symfony/Component/Config/Tests/ConfigCacheTest.php b/src/Symfony/Component/Config/Tests/ConfigCacheTest.php
index bf8131d514bda..d0b70899b513a 100644
--- a/src/Symfony/Component/Config/Tests/ConfigCacheTest.php
+++ b/src/Symfony/Component/Config/Tests/ConfigCacheTest.php
@@ -26,7 +26,7 @@ protected function setUp()
 
     protected function tearDown()
     {
-        $files = array($this->cacheFile, $this->cacheFile.'.meta');
+        $files = [$this->cacheFile, $this->cacheFile.'.meta'];
 
         foreach ($files as $file) {
             if (file_exists($file)) {
@@ -52,7 +52,7 @@ public function testIsAlwaysFreshInProduction()
         $staleResource->setFresh(false);
 
         $cache = new ConfigCache($this->cacheFile, false);
-        $cache->write('', array($staleResource));
+        $cache->write('', [$staleResource]);
 
         $this->assertTrue($cache->isFresh());
     }
@@ -63,7 +63,7 @@ public function testIsAlwaysFreshInProduction()
     public function testIsFreshWhenNoResourceProvided($debug)
     {
         $cache = new ConfigCache($this->cacheFile, $debug);
-        $cache->write('', array());
+        $cache->write('', []);
         $this->assertTrue($cache->isFresh());
     }
 
@@ -73,7 +73,7 @@ public function testFreshResourceInDebug()
         $freshResource->setFresh(true);
 
         $cache = new ConfigCache($this->cacheFile, true);
-        $cache->write('', array($freshResource));
+        $cache->write('', [$freshResource]);
 
         $this->assertTrue($cache->isFresh());
     }
@@ -84,16 +84,16 @@ public function testStaleResourceInDebug()
         $staleResource->setFresh(false);
 
         $cache = new ConfigCache($this->cacheFile, true);
-        $cache->write('', array($staleResource));
+        $cache->write('', [$staleResource]);
 
         $this->assertFalse($cache->isFresh());
     }
 
     public function debugModes()
     {
-        return array(
-            array(true),
-            array(false),
-        );
+        return [
+            [true],
+            [false],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php
index 089cb56638d35..f5386ad35d77a 100644
--- a/src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php
@@ -64,7 +64,7 @@ public function testIgnoreAndRemoveBehaviors($ignore, $remove, $expected, $messa
         }
         $node = new ArrayNode('root');
         $node->setIgnoreExtraKeys($ignore, $remove);
-        $result = $node->normalize(array('foo' => 'bar'));
+        $result = $node->normalize(['foo' => 'bar']);
         $this->assertSame($expected, $result, $message);
     }
 
@@ -83,24 +83,24 @@ public function testPreNormalize($denormalized, $normalized)
 
     public function getPreNormalizationTests()
     {
-        return array(
-            array(
-                array('foo-bar' => 'foo'),
-                array('foo_bar' => 'foo'),
-            ),
-            array(
-                array('foo-bar_moo' => 'foo'),
-                array('foo-bar_moo' => 'foo'),
-            ),
-            array(
-                array('anything-with-dash-and-no-underscore' => 'first', 'no_dash' => 'second'),
-                array('anything_with_dash_and_no_underscore' => 'first', 'no_dash' => 'second'),
-            ),
-            array(
-                array('foo-bar' => null, 'foo_bar' => 'foo'),
-                array('foo-bar' => null, 'foo_bar' => 'foo'),
-            ),
-        );
+        return [
+            [
+                ['foo-bar' => 'foo'],
+                ['foo_bar' => 'foo'],
+            ],
+            [
+                ['foo-bar_moo' => 'foo'],
+                ['foo-bar_moo' => 'foo'],
+            ],
+            [
+                ['anything-with-dash-and-no-underscore' => 'first', 'no_dash' => 'second'],
+                ['anything_with_dash_and_no_underscore' => 'first', 'no_dash' => 'second'],
+            ],
+            [
+                ['foo-bar' => null, 'foo_bar' => 'foo'],
+                ['foo-bar' => null, 'foo_bar' => 'foo'],
+            ],
+        ];
     }
 
     /**
@@ -125,30 +125,30 @@ public function testNodeNameCanBeZero($denormalized, $normalized)
 
     public function getZeroNamedNodeExamplesData()
     {
-        return array(
-            array(
-                array(
-                    0 => array(
+        return [
+            [
+                [
+                    0 => [
                         'name' => 'something',
-                    ),
-                    5 => array(
+                    ],
+                    5 => [
                         0 => 'this won\'t work too',
                         'new_key' => 'some other value',
-                    ),
+                    ],
                     'string_key' => 'just value',
-                ),
-                array(
-                    0 => array(
+                ],
+                [
+                    0 => [
                         'name' => 'something',
-                    ),
-                    5 => array(
+                    ],
+                    5 => [
                         0 => 'this won\'t work too',
                         'new_key' => 'some other value',
-                    ),
+                    ],
                     'string_key' => 'just value',
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
     }
 
     /**
@@ -172,12 +172,12 @@ public function testChildrenOrderIsMaintainedOnNormalizeValue($prenormalized, $n
 
     public function getPreNormalizedNormalizedOrderedData()
     {
-        return array(
-            array(
-                array('2' => 'two', '1' => 'one', '3' => 'three'),
-                array('2' => 'two', '1' => 'one', '3' => 'three'),
-            ),
-        );
+        return [
+            [
+                ['2' => 'two', '1' => 'one', '3' => 'three'],
+                ['2' => 'two', '1' => 'one', '3' => 'three'],
+            ],
+        ];
     }
 
     /**
@@ -238,13 +238,13 @@ public function testSetDeprecated()
         };
 
         $prevErrorHandler = set_error_handler($deprecationHandler);
-        $node->finalize(array());
+        $node->finalize([]);
         restore_error_handler();
 
         $this->assertFalse($deprecationTriggered, '->finalize() should not trigger if the deprecated node is not set');
 
         $prevErrorHandler = set_error_handler($deprecationHandler);
-        $node->finalize(array('foo' => array()));
+        $node->finalize(['foo' => []]);
         restore_error_handler();
         $this->assertTrue($deprecationTriggered, '->finalize() should trigger if the deprecated node is set');
     }
diff --git a/src/Symfony/Component/Config/Tests/Definition/BooleanNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/BooleanNodeTest.php
index ab1d3164145d0..bfa2fd3e287ec 100644
--- a/src/Symfony/Component/Config/Tests/Definition/BooleanNodeTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/BooleanNodeTest.php
@@ -40,10 +40,10 @@ public function testValidNonEmptyValues($value)
 
     public function getValidValues()
     {
-        return array(
-            array(false),
-            array(true),
-        );
+        return [
+            [false],
+            [true],
+        ];
     }
 
     /**
@@ -58,17 +58,17 @@ public function testNormalizeThrowsExceptionOnInvalidValues($value)
 
     public function getInvalidValues()
     {
-        return array(
-            array(null),
-            array(''),
-            array('foo'),
-            array(0),
-            array(1),
-            array(0.0),
-            array(0.1),
-            array(array()),
-            array(array('foo' => 'bar')),
-            array(new \stdClass()),
-        );
+        return [
+            [null],
+            [''],
+            ['foo'],
+            [0],
+            [1],
+            [0.0],
+            [0.1],
+            [[]],
+            [['foo' => 'bar']],
+            [new \stdClass()],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
index ae3fd06788897..9bd6373d8c161 100644
--- a/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
@@ -78,7 +78,7 @@ public function testPrototypeNodesCantHaveADefaultValueWhenUsingDefaultChildren(
     {
         $node = new ArrayNodeDefinition('root');
         $node
-            ->defaultValue(array())
+            ->defaultValue([])
             ->addDefaultChildrenIfNoneSet('foo')
             ->prototype('array')
         ;
@@ -93,7 +93,7 @@ public function testPrototypedArrayNodeDefaultWhenUsingDefaultChildren()
             ->prototype('array')
         ;
         $tree = $node->getNode();
-        $this->assertEquals(array(array()), $tree->getDefaultValue());
+        $this->assertEquals([[]], $tree->getDefaultValue());
     }
 
     /**
@@ -133,14 +133,14 @@ public function testPrototypedArrayNodeDefault($args, $shouldThrowWhenUsingAttrA
 
     public function providePrototypedArrayNodeDefaults()
     {
-        return array(
-            array(null, true, false, array(array())),
-            array(2, true, false, array(array(), array())),
-            array('2', false, true, array('2' => array())),
-            array('foo', false, true, array('foo' => array())),
-            array(array('foo'), false, true, array('foo' => array())),
-            array(array('foo', 'bar'), false, true, array('foo' => array(), 'bar' => array())),
-        );
+        return [
+            [null, true, false, [[]]],
+            [2, true, false, [[], []]],
+            ['2', false, true, ['2' => []]],
+            ['foo', false, true, ['foo' => []]],
+            [['foo'], false, true, ['foo' => []]],
+            [['foo', 'bar'], false, true, ['foo' => [], 'bar' => []]],
+        ];
     }
 
     public function testNestedPrototypedArrayNodes()
@@ -166,7 +166,7 @@ public function testEnabledNodeDefaults()
                 ->scalarNode('foo')->defaultValue('bar')->end()
         ;
 
-        $this->assertEquals(array('enabled' => false, 'foo' => 'bar'), $node->getNode()->getDefaultValue());
+        $this->assertEquals(['enabled' => false, 'foo' => 'bar'], $node->getNode()->getDefaultValue());
     }
 
     /**
@@ -195,9 +195,9 @@ public function testCanBeDisabled()
         $node->canBeDisabled();
 
         $this->assertTrue($this->getField($node, 'addDefaults'));
-        $this->assertEquals(array('enabled' => false), $this->getField($node, 'falseEquivalent'));
-        $this->assertEquals(array('enabled' => true), $this->getField($node, 'trueEquivalent'));
-        $this->assertEquals(array('enabled' => true), $this->getField($node, 'nullEquivalent'));
+        $this->assertEquals(['enabled' => false], $this->getField($node, 'falseEquivalent'));
+        $this->assertEquals(['enabled' => true], $this->getField($node, 'trueEquivalent'));
+        $this->assertEquals(['enabled' => true], $this->getField($node, 'nullEquivalent'));
 
         $nodeChildren = $this->getField($node, 'children');
         $this->assertArrayHasKey('enabled', $nodeChildren);
@@ -247,7 +247,7 @@ public function testUnsetChild()
             ->end()
         ;
 
-        $this->assertSame(array(), $node->getNode()->normalize(array('value' => null)));
+        $this->assertSame([], $node->getNode()->normalize(['value' => null]));
     }
 
     public function testPrototypeVariable()
@@ -294,14 +294,14 @@ public function testPrototypeEnum()
 
     public function getEnableableNodeFixtures()
     {
-        return array(
-            array(array('enabled' => true, 'foo' => 'bar'), array(true), 'true enables an enableable node'),
-            array(array('enabled' => true, 'foo' => 'bar'), array(null), 'null enables an enableable node'),
-            array(array('enabled' => true, 'foo' => 'bar'), array(array('enabled' => true)), 'An enableable node can be enabled'),
-            array(array('enabled' => true, 'foo' => 'baz'), array(array('foo' => 'baz')), 'any configuration enables an enableable node'),
-            array(array('enabled' => false, 'foo' => 'baz'), array(array('foo' => 'baz', 'enabled' => false)), 'An enableable node can be disabled'),
-            array(array('enabled' => false, 'foo' => 'bar'), array(false), 'false disables an enableable node'),
-        );
+        return [
+            [['enabled' => true, 'foo' => 'bar'], [true], 'true enables an enableable node'],
+            [['enabled' => true, 'foo' => 'bar'], [null], 'null enables an enableable node'],
+            [['enabled' => true, 'foo' => 'bar'], [['enabled' => true]], 'An enableable node can be enabled'],
+            [['enabled' => true, 'foo' => 'baz'], [['foo' => 'baz']], 'any configuration enables an enableable node'],
+            [['enabled' => false, 'foo' => 'baz'], [['foo' => 'baz', 'enabled' => false]], 'An enableable node can be disabled'],
+            [['enabled' => false, 'foo' => 'bar'], [false], 'false disables an enableable node'],
+        ];
     }
 
     public function testRequiresAtLeastOneElement()
@@ -311,7 +311,7 @@ public function testRequiresAtLeastOneElement()
             ->requiresAtLeastOneElement()
             ->integerPrototype();
 
-        $node->getNode()->finalize(array(1));
+        $node->getNode()->finalize([1]);
 
         $this->addToAssertionCount(1);
     }
@@ -327,7 +327,7 @@ public function testCannotBeEmpty()
             ->cannotBeEmpty()
             ->integerPrototype();
 
-        $node->getNode()->finalize(array());
+        $node->getNode()->finalize([]);
     }
 
     public function testSetDeprecated()
@@ -353,7 +353,7 @@ public function testCannotBeEmptyOnConcreteNode()
         $node = new ArrayNodeDefinition('root');
         $node->cannotBeEmpty();
 
-        $node->getNode()->finalize(array());
+        $node->getNode()->finalize([]);
     }
 
     protected function getField($object, $field)
diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/EnumNodeDefinitionTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/EnumNodeDefinitionTest.php
index 9c0aa0e11cf97..26f8586dcb578 100644
--- a/src/Symfony/Component/Config/Tests/Definition/Builder/EnumNodeDefinitionTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/Builder/EnumNodeDefinitionTest.php
@@ -19,19 +19,19 @@ class EnumNodeDefinitionTest extends TestCase
     public function testWithOneValue()
     {
         $def = new EnumNodeDefinition('foo');
-        $def->values(array('foo'));
+        $def->values(['foo']);
 
         $node = $def->getNode();
-        $this->assertEquals(array('foo'), $node->getValues());
+        $this->assertEquals(['foo'], $node->getValues());
     }
 
     public function testWithOneDistinctValue()
     {
         $def = new EnumNodeDefinition('foo');
-        $def->values(array('foo', 'foo'));
+        $def->values(['foo', 'foo']);
 
         $node = $def->getNode();
-        $this->assertEquals(array('foo'), $node->getValues());
+        $this->assertEquals(['foo'], $node->getValues());
     }
 
     /**
@@ -51,22 +51,22 @@ public function testNoValuesPassed()
     public function testWithNoValues()
     {
         $def = new EnumNodeDefinition('foo');
-        $def->values(array());
+        $def->values([]);
     }
 
     public function testGetNode()
     {
         $def = new EnumNodeDefinition('foo');
-        $def->values(array('foo', 'bar'));
+        $def->values(['foo', 'bar']);
 
         $node = $def->getNode();
-        $this->assertEquals(array('foo', 'bar'), $node->getValues());
+        $this->assertEquals(['foo', 'bar'], $node->getValues());
     }
 
     public function testSetDeprecated()
     {
         $def = new EnumNodeDefinition('foo');
-        $def->values(array('foo', 'bar'));
+        $def->values(['foo', 'bar']);
         $def->setDeprecated('The "%path%" node is deprecated.');
 
         $node = $def->getNode();
diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php
index 99a10413768b4..d58d42e0a3057 100644
--- a/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php
@@ -31,7 +31,7 @@ public function testIfTrueExpression()
             ->ifTrue()
             ->then($this->returnClosure('new_value'))
         ->end();
-        $this->assertFinalizedValueIs('new_value', $test, array('key' => true));
+        $this->assertFinalizedValueIs('new_value', $test, ['key' => true]);
 
         $test = $this->getTestBuilder()
             ->ifTrue(function ($v) { return true; })
@@ -58,7 +58,7 @@ public function testIfStringExpression()
             ->ifString()
             ->then($this->returnClosure('new_value'))
         ->end();
-        $this->assertFinalizedValueIs(45, $test, array('key' => 45));
+        $this->assertFinalizedValueIs(45, $test, ['key' => 45]);
     }
 
     public function testIfNullExpression()
@@ -67,7 +67,7 @@ public function testIfNullExpression()
             ->ifNull()
             ->then($this->returnClosure('new_value'))
         ->end();
-        $this->assertFinalizedValueIs('new_value', $test, array('key' => null));
+        $this->assertFinalizedValueIs('new_value', $test, ['key' => null]);
 
         $test = $this->getTestBuilder()
             ->ifNull()
@@ -82,7 +82,7 @@ public function testIfEmptyExpression()
             ->ifEmpty()
             ->then($this->returnClosure('new_value'))
         ->end();
-        $this->assertFinalizedValueIs('new_value', $test, array('key' => array()));
+        $this->assertFinalizedValueIs('new_value', $test, ['key' => []]);
 
         $test = $this->getTestBuilder()
             ->ifEmpty()
@@ -97,7 +97,7 @@ public function testIfArrayExpression()
             ->ifArray()
             ->then($this->returnClosure('new_value'))
         ->end();
-        $this->assertFinalizedValueIs('new_value', $test, array('key' => array()));
+        $this->assertFinalizedValueIs('new_value', $test, ['key' => []]);
 
         $test = $this->getTestBuilder()
             ->ifArray()
@@ -109,13 +109,13 @@ public function testIfArrayExpression()
     public function testIfInArrayExpression()
     {
         $test = $this->getTestBuilder()
-            ->ifInArray(array('foo', 'bar', 'value'))
+            ->ifInArray(['foo', 'bar', 'value'])
             ->then($this->returnClosure('new_value'))
         ->end();
         $this->assertFinalizedValueIs('new_value', $test);
 
         $test = $this->getTestBuilder()
-            ->ifInArray(array('foo', 'bar'))
+            ->ifInArray(['foo', 'bar'])
             ->then($this->returnClosure('new_value'))
         ->end();
         $this->assertFinalizedValueIs('value', $test);
@@ -124,13 +124,13 @@ public function testIfInArrayExpression()
     public function testIfNotInArrayExpression()
     {
         $test = $this->getTestBuilder()
-            ->ifNotInArray(array('foo', 'bar'))
+            ->ifNotInArray(['foo', 'bar'])
             ->then($this->returnClosure('new_value'))
         ->end();
         $this->assertFinalizedValueIs('new_value', $test);
 
         $test = $this->getTestBuilder()
-            ->ifNotInArray(array('foo', 'bar', 'value_from_config'))
+            ->ifNotInArray(['foo', 'bar', 'value_from_config'])
             ->then($this->returnClosure('new_value'))
         ->end();
         $this->assertFinalizedValueIs('new_value', $test);
@@ -142,7 +142,7 @@ public function testThenEmptyArrayExpression()
             ->ifString()
             ->thenEmptyArray()
         ->end();
-        $this->assertFinalizedValueIs(array(), $test);
+        $this->assertFinalizedValueIs([], $test);
     }
 
     /**
@@ -153,15 +153,15 @@ public function testcastToArrayExpression($configValue, $expectedValue)
         $test = $this->getTestBuilder()
             ->castToArray()
         ->end();
-        $this->assertFinalizedValueIs($expectedValue, $test, array('key' => $configValue));
+        $this->assertFinalizedValueIs($expectedValue, $test, ['key' => $configValue]);
     }
 
     public function castToArrayValues()
     {
-        yield array('value', array('value'));
-        yield array(-3.14, array(-3.14));
-        yield array(null, array(null));
-        yield array(array('value'), array('value'));
+        yield ['value', ['value']];
+        yield [-3.14, [-3.14]];
+        yield [null, [null]];
+        yield [['value'], ['value']];
     }
 
     /**
@@ -182,7 +182,7 @@ public function testThenUnsetExpression()
             ->ifString()
             ->thenUnset()
         ->end();
-        $this->assertEquals(array(), $this->finalizeTestBuilder($test));
+        $this->assertEquals([], $this->finalizeTestBuilder($test));
     }
 
     /**
@@ -238,7 +238,7 @@ protected function finalizeTestBuilder($testBuilder, $config = null)
             ->end()
             ->end()
             ->buildTree()
-            ->finalize(null === $config ? array('key' => 'value') : $config)
+            ->finalize(null === $config ? ['key' => 'value'] : $config)
         ;
     }
 
@@ -265,6 +265,6 @@ protected function returnClosure($val)
      */
     protected function assertFinalizedValueIs($value, $treeBuilder, $config = null)
     {
-        $this->assertEquals(array('key' => $value), $this->finalizeTestBuilder($treeBuilder, $config));
+        $this->assertEquals(['key' => $value], $this->finalizeTestBuilder($treeBuilder, $config));
     }
 }
diff --git a/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php b/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
index bf4db95f41543..3cb9121ba6022 100644
--- a/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
@@ -28,12 +28,12 @@ public function testDumper()
 
     public function provideDumpAtPath()
     {
-        return array(
-            'Regular node' => array('scalar_true', <<<EOL
+        return [
+            'Regular node' => ['scalar_true', <<<EOL
 scalar_true:          true
 EOL
-            ),
-            'Array node' => array('array', <<<EOL
+            ],
+            'Array node' => ['array', <<<EOL
 # some info
 array:
     child1:               ~
@@ -44,12 +44,12 @@ public function provideDumpAtPath()
     # which should be indented
     child3:               ~ # Example: example setting
 EOL
-            ),
-            'Regular nested' => array('array.child2', <<<EOL
+            ],
+            'Regular nested' => ['array.child2', <<<EOL
 child2:               ~
 EOL
-            ),
-            'Prototype' => array('cms_pages.page', <<<EOL
+            ],
+            'Prototype' => ['cms_pages.page', <<<EOL
 # Prototype
 page:
 
@@ -58,15 +58,15 @@ public function provideDumpAtPath()
         title:                ~ # Required
         path:                 ~ # Required
 EOL
-            ),
-            'Nested prototype' => array('cms_pages.page.locale', <<<EOL
+            ],
+            'Nested prototype' => ['cms_pages.page.locale', <<<EOL
 # Prototype
 locale:
     title:                ~ # Required
     path:                 ~ # Required
 EOL
-            ),
-        );
+            ],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Config/Tests/Definition/EnumNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/EnumNodeTest.php
index e3e7ef05946fc..206bfdd5b98ff 100644
--- a/src/Symfony/Component/Config/Tests/Definition/EnumNodeTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/EnumNodeTest.php
@@ -18,7 +18,7 @@ class EnumNodeTest extends TestCase
 {
     public function testFinalizeValue()
     {
-        $node = new EnumNode('foo', null, array('foo', 'bar'));
+        $node = new EnumNode('foo', null, ['foo', 'bar']);
         $this->assertSame('foo', $node->finalize('foo'));
     }
 
@@ -28,18 +28,18 @@ public function testFinalizeValue()
      */
     public function testConstructionWithNoValues()
     {
-        new EnumNode('foo', null, array());
+        new EnumNode('foo', null, []);
     }
 
     public function testConstructionWithOneValue()
     {
-        $node = new EnumNode('foo', null, array('foo'));
+        $node = new EnumNode('foo', null, ['foo']);
         $this->assertSame('foo', $node->finalize('foo'));
     }
 
     public function testConstructionWithOneDistinctValue()
     {
-        $node = new EnumNode('foo', null, array('foo', 'foo'));
+        $node = new EnumNode('foo', null, ['foo', 'foo']);
         $this->assertSame('foo', $node->finalize('foo'));
     }
 
@@ -49,7 +49,7 @@ public function testConstructionWithOneDistinctValue()
      */
     public function testFinalizeWithInvalidValue()
     {
-        $node = new EnumNode('foo', null, array('foo', 'bar'));
+        $node = new EnumNode('foo', null, ['foo', 'bar']);
         $node->finalize('foobar');
     }
 }
diff --git a/src/Symfony/Component/Config/Tests/Definition/FinalizationTest.php b/src/Symfony/Component/Config/Tests/Definition/FinalizationTest.php
index d19fbd69ae88d..be68a27c6906c 100644
--- a/src/Symfony/Component/Config/Tests/Definition/FinalizationTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/FinalizationTest.php
@@ -42,27 +42,27 @@ public function testUnsetKeyWithDeepHierarchy()
             ->buildTree()
         ;
 
-        $a = array(
-            'level1' => array(
-                'level2' => array(
+        $a = [
+            'level1' => [
+                'level2' => [
                     'somevalue' => 'foo',
                     'anothervalue' => 'bar',
-                ),
+                ],
                 'level1_scalar' => 'foo',
-            ),
-        );
+            ],
+        ];
 
-        $b = array(
-            'level1' => array(
+        $b = [
+            'level1' => [
                 'level2' => false,
-            ),
-        );
+            ],
+        ];
 
-        $this->assertEquals(array(
-            'level1' => array(
+        $this->assertEquals([
+            'level1' => [
                 'level1_scalar' => 'foo',
-            ),
-        ), $this->process($tree, array($a, $b)));
+            ],
+        ], $this->process($tree, [$a, $b]));
     }
 
     protected function process(NodeInterface $tree, array $configs)
diff --git a/src/Symfony/Component/Config/Tests/Definition/FloatNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/FloatNodeTest.php
index b7ec12fa739af..8268fe83ba7be 100644
--- a/src/Symfony/Component/Config/Tests/Definition/FloatNodeTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/FloatNodeTest.php
@@ -40,16 +40,16 @@ public function testValidNonEmptyValues($value)
 
     public function getValidValues()
     {
-        return array(
-            array(1798.0),
-            array(-678.987),
-            array(12.56E45),
-            array(0.0),
+        return [
+            [1798.0],
+            [-678.987],
+            [12.56E45],
+            [0.0],
             // Integer are accepted too, they will be cast
-            array(17),
-            array(-10),
-            array(0),
-        );
+            [17],
+            [-10],
+            [0],
+        ];
     }
 
     /**
@@ -64,15 +64,15 @@ public function testNormalizeThrowsExceptionOnInvalidValues($value)
 
     public function getInvalidValues()
     {
-        return array(
-            array(null),
-            array(''),
-            array('foo'),
-            array(true),
-            array(false),
-            array(array()),
-            array(array('foo' => 'bar')),
-            array(new \stdClass()),
-        );
+        return [
+            [null],
+            [''],
+            ['foo'],
+            [true],
+            [false],
+            [[]],
+            [['foo' => 'bar']],
+            [new \stdClass()],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Config/Tests/Definition/IntegerNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/IntegerNodeTest.php
index 55e8a137b648a..b4c17e1cb9a35 100644
--- a/src/Symfony/Component/Config/Tests/Definition/IntegerNodeTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/IntegerNodeTest.php
@@ -40,11 +40,11 @@ public function testValidNonEmptyValues($value)
 
     public function getValidValues()
     {
-        return array(
-            array(1798),
-            array(-678),
-            array(0),
-        );
+        return [
+            [1798],
+            [-678],
+            [0],
+        ];
     }
 
     /**
@@ -59,17 +59,17 @@ public function testNormalizeThrowsExceptionOnInvalidValues($value)
 
     public function getInvalidValues()
     {
-        return array(
-            array(null),
-            array(''),
-            array('foo'),
-            array(true),
-            array(false),
-            array(0.0),
-            array(0.1),
-            array(array()),
-            array(array('foo' => 'bar')),
-            array(new \stdClass()),
-        );
+        return [
+            [null],
+            [''],
+            ['foo'],
+            [true],
+            [false],
+            [0.0],
+            [0.1],
+            [[]],
+            [['foo' => 'bar']],
+            [new \stdClass()],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Config/Tests/Definition/MergeTest.php b/src/Symfony/Component/Config/Tests/Definition/MergeTest.php
index e539e25f3d02f..5d37e137bd764 100644
--- a/src/Symfony/Component/Config/Tests/Definition/MergeTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/MergeTest.php
@@ -33,13 +33,13 @@ public function testForbiddenOverwrite()
             ->buildTree()
         ;
 
-        $a = array(
+        $a = [
             'foo' => 'bar',
-        );
+        ];
 
-        $b = array(
+        $b = [
             'foo' => 'moo',
-        );
+        ];
 
         $tree->merge($a, $b);
     }
@@ -68,28 +68,28 @@ public function testUnsetKey()
             ->buildTree()
         ;
 
-        $a = array(
+        $a = [
             'foo' => 'bar',
-            'unsettable' => array(
+            'unsettable' => [
                 'foo' => 'a',
                 'bar' => 'b',
-            ),
+            ],
             'unsetted' => false,
-        );
+        ];
 
-        $b = array(
+        $b = [
             'foo' => 'moo',
             'bar' => 'b',
             'unsettable' => false,
-            'unsetted' => array('a', 'b'),
-        );
+            'unsetted' => ['a', 'b'],
+        ];
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'foo' => 'moo',
             'bar' => 'b',
             'unsettable' => false,
-            'unsetted' => array('a', 'b'),
-        ), $tree->merge($a, $b));
+            'unsetted' => ['a', 'b'],
+        ], $tree->merge($a, $b));
     }
 
     /**
@@ -114,17 +114,17 @@ public function testDoesNotAllowNewKeysInSubsequentConfigs()
             ->end()
             ->buildTree();
 
-        $a = array(
-            'test' => array(
-                'a' => array('value' => 'foo'),
-            ),
-        );
+        $a = [
+            'test' => [
+                'a' => ['value' => 'foo'],
+            ],
+        ];
 
-        $b = array(
-            'test' => array(
-                'b' => array('value' => 'foo'),
-            ),
-        );
+        $b = [
+            'test' => [
+                'b' => ['value' => 'foo'],
+            ],
+        ];
 
         $tree->merge($a, $b);
     }
@@ -148,24 +148,24 @@ public function testPerformsNoDeepMerging()
             ->buildTree()
         ;
 
-        $a = array(
-            'no_deep_merging' => array(
+        $a = [
+            'no_deep_merging' => [
                 'foo' => 'a',
                 'bar' => 'b',
-            ),
-        );
+            ],
+        ];
 
-        $b = array(
-            'no_deep_merging' => array(
+        $b = [
+            'no_deep_merging' => [
                 'c' => 'd',
-            ),
-        );
+            ],
+        ];
 
-        $this->assertEquals(array(
-            'no_deep_merging' => array(
+        $this->assertEquals([
+            'no_deep_merging' => [
                 'c' => 'd',
-            ),
-        ), $tree->merge($a, $b));
+            ],
+        ], $tree->merge($a, $b));
     }
 
     public function testPrototypeWithoutAKeyAttribute()
@@ -183,14 +183,14 @@ public function testPrototypeWithoutAKeyAttribute()
             ->buildTree()
         ;
 
-        $a = array(
-            'append_elements' => array('a', 'b'),
-        );
+        $a = [
+            'append_elements' => ['a', 'b'],
+        ];
 
-        $b = array(
-            'append_elements' => array('c', 'd'),
-        );
+        $b = [
+            'append_elements' => ['c', 'd'],
+        ];
 
-        $this->assertEquals(array('append_elements' => array('a', 'b', 'c', 'd')), $tree->merge($a, $b));
+        $this->assertEquals(['append_elements' => ['a', 'b', 'c', 'd']], $tree->merge($a, $b));
     }
 }
diff --git a/src/Symfony/Component/Config/Tests/Definition/NormalizationTest.php b/src/Symfony/Component/Config/Tests/Definition/NormalizationTest.php
index 3273c78668f13..d6544ccc817eb 100644
--- a/src/Symfony/Component/Config/Tests/Definition/NormalizationTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/NormalizationTest.php
@@ -30,7 +30,7 @@ public function testNormalizeEncoders($denormalized)
                     ->node('encoders', 'array')
                         ->useAttributeAsKey('class')
                         ->prototype('array')
-                            ->beforeNormalization()->ifString()->then(function ($v) { return array('algorithm' => $v); })->end()
+                            ->beforeNormalization()->ifString()->then(function ($v) { return ['algorithm' => $v]; })->end()
                             ->children()
                                 ->node('algorithm', 'scalar')->end()
                             ->end()
@@ -41,54 +41,54 @@ public function testNormalizeEncoders($denormalized)
             ->buildTree()
         ;
 
-        $normalized = array(
-            'encoders' => array(
-                'foo' => array('algorithm' => 'plaintext'),
-            ),
-        );
+        $normalized = [
+            'encoders' => [
+                'foo' => ['algorithm' => 'plaintext'],
+            ],
+        ];
 
         $this->assertNormalized($tree, $denormalized, $normalized);
     }
 
     public function getEncoderTests()
     {
-        $configs = array();
+        $configs = [];
 
         // XML
-        $configs[] = array(
-            'encoder' => array(
-                array('class' => 'foo', 'algorithm' => 'plaintext'),
-            ),
-        );
+        $configs[] = [
+            'encoder' => [
+                ['class' => 'foo', 'algorithm' => 'plaintext'],
+            ],
+        ];
 
         // XML when only one element of this type
-        $configs[] = array(
-            'encoder' => array('class' => 'foo', 'algorithm' => 'plaintext'),
-        );
+        $configs[] = [
+            'encoder' => ['class' => 'foo', 'algorithm' => 'plaintext'],
+        ];
 
         // YAML/PHP
-        $configs[] = array(
-            'encoders' => array(
-                array('class' => 'foo', 'algorithm' => 'plaintext'),
-            ),
-        );
+        $configs[] = [
+            'encoders' => [
+                ['class' => 'foo', 'algorithm' => 'plaintext'],
+            ],
+        ];
 
         // YAML/PHP
-        $configs[] = array(
-            'encoders' => array(
+        $configs[] = [
+            'encoders' => [
                 'foo' => 'plaintext',
-            ),
-        );
+            ],
+        ];
 
         // YAML/PHP
-        $configs[] = array(
-            'encoders' => array(
-                'foo' => array('algorithm' => 'plaintext'),
-            ),
-        );
+        $configs[] = [
+            'encoders' => [
+                'foo' => ['algorithm' => 'plaintext'],
+            ],
+        ];
 
         return array_map(function ($v) {
-            return array($v);
+            return [$v];
         }, $configs);
     }
 
@@ -114,28 +114,28 @@ public function testAnonymousKeysArray($denormalized)
             ->buildTree()
         ;
 
-        $normalized = array('logout' => array('handlers' => array('a', 'b', 'c')));
+        $normalized = ['logout' => ['handlers' => ['a', 'b', 'c']]];
 
         $this->assertNormalized($tree, $denormalized, $normalized);
     }
 
     public function getAnonymousKeysTests()
     {
-        $configs = array();
+        $configs = [];
 
-        $configs[] = array(
-            'logout' => array(
-                'handlers' => array('a', 'b', 'c'),
-            ),
-        );
+        $configs[] = [
+            'logout' => [
+                'handlers' => ['a', 'b', 'c'],
+            ],
+        ];
 
-        $configs[] = array(
-            'logout' => array(
-                'handler' => array('a', 'b', 'c'),
-            ),
-        );
+        $configs[] = [
+            'logout' => [
+                'handler' => ['a', 'b', 'c'],
+            ],
+        ];
 
-        return array_map(function ($v) { return array($v); }, $configs);
+        return array_map(function ($v) { return [$v]; }, $configs);
     }
 
     /**
@@ -143,30 +143,30 @@ public function getAnonymousKeysTests()
      */
     public function testNumericKeysAsAttributes($denormalized)
     {
-        $normalized = array(
-            'thing' => array(42 => array('foo', 'bar'), 1337 => array('baz', 'qux')),
-        );
+        $normalized = [
+            'thing' => [42 => ['foo', 'bar'], 1337 => ['baz', 'qux']],
+        ];
 
         $this->assertNormalized($this->getNumericKeysTestTree(), $denormalized, $normalized);
     }
 
     public function getNumericKeysTests()
     {
-        $configs = array();
+        $configs = [];
 
-        $configs[] = array(
-            'thing' => array(
-                42 => array('foo', 'bar'), 1337 => array('baz', 'qux'),
-            ),
-        );
+        $configs[] = [
+            'thing' => [
+                42 => ['foo', 'bar'], 1337 => ['baz', 'qux'],
+            ],
+        ];
 
-        $configs[] = array(
-            'thing' => array(
-                array('foo', 'bar', 'id' => 42), array('baz', 'qux', 'id' => 1337),
-            ),
-        );
+        $configs[] = [
+            'thing' => [
+                ['foo', 'bar', 'id' => 42], ['baz', 'qux', 'id' => 1337],
+            ],
+        ];
 
-        return array_map(function ($v) { return array($v); }, $configs);
+        return array_map(function ($v) { return [$v]; }, $configs);
     }
 
     /**
@@ -175,13 +175,13 @@ public function getNumericKeysTests()
      */
     public function testNonAssociativeArrayThrowsExceptionIfAttributeNotSet()
     {
-        $denormalized = array(
-            'thing' => array(
-                array('foo', 'bar'), array('baz', 'qux'),
-            ),
-        );
+        $denormalized = [
+            'thing' => [
+                ['foo', 'bar'], ['baz', 'qux'],
+            ],
+        ];
 
-        $this->assertNormalized($this->getNumericKeysTestTree(), $denormalized, array());
+        $this->assertNormalized($this->getNumericKeysTestTree(), $denormalized, []);
     }
 
     public function testAssociativeArrayPreserveKeys()
@@ -198,7 +198,7 @@ public function testAssociativeArrayPreserveKeys()
             ->buildTree()
         ;
 
-        $data = array('first' => array('foo' => 'bar'));
+        $data = ['first' => ['foo' => 'bar']];
 
         $this->assertNormalized($tree, $data, $data);
     }
diff --git a/src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php
index 731d7af25fa71..485b1321c8206 100644
--- a/src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php
@@ -32,8 +32,8 @@ public function testGetDefaultValueReturnsDefaultValueForPrototypes()
         $node = new PrototypedArrayNode('root');
         $prototype = new ArrayNode(null, $node);
         $node->setPrototype($prototype);
-        $node->setDefaultValue(array('test'));
-        $this->assertEquals(array('test'), $node->getDefaultValue());
+        $node->setDefaultValue(['test']);
+        $this->assertEquals(['test'], $node->getDefaultValue());
     }
 
     // a remapped key (e.g. "mapping" -> "mappings") should be unset after being used
@@ -47,12 +47,12 @@ public function testRemappedKeysAreUnset()
         $prototype = new ScalarNode(null, $mappingsNode);
         $mappingsNode->setPrototype($prototype);
 
-        $remappings = array();
-        $remappings[] = array('mapping', 'mappings');
+        $remappings = [];
+        $remappings[] = ['mapping', 'mappings'];
         $node->setXmlRemappings($remappings);
 
-        $normalized = $node->normalize(array('mapping' => array('foo', 'bar')));
-        $this->assertEquals(array('mappings' => array('foo', 'bar')), $normalized);
+        $normalized = $node->normalize(['mapping' => ['foo', 'bar']]);
+        $this->assertEquals(['mappings' => ['foo', 'bar']], $normalized);
     }
 
     /**
@@ -83,12 +83,12 @@ public function testMappedAttributeKeyIsRemoved()
         $prototype->addChild(new ScalarNode('foo'));
         $node->setPrototype($prototype);
 
-        $children = array();
-        $children[] = array('id' => 'item_name', 'foo' => 'bar');
+        $children = [];
+        $children[] = ['id' => 'item_name', 'foo' => 'bar'];
         $normalized = $node->normalize($children);
 
-        $expected = array();
-        $expected['item_name'] = array('foo' => 'bar');
+        $expected = [];
+        $expected['item_name'] = ['foo' => 'bar'];
         $this->assertEquals($expected, $normalized);
     }
 
@@ -107,12 +107,12 @@ public function testMappedAttributeKeyNotRemoved()
         $prototype->addChild(new ScalarNode('id')); // the key attribute will remain
         $node->setPrototype($prototype);
 
-        $children = array();
-        $children[] = array('id' => 'item_name', 'foo' => 'bar');
+        $children = [];
+        $children[] = ['id' => 'item_name', 'foo' => 'bar'];
         $normalized = $node->normalize($children);
 
-        $expected = array();
-        $expected['item_name'] = array('id' => 'item_name', 'foo' => 'bar');
+        $expected = [];
+        $expected['item_name'] = ['id' => 'item_name', 'foo' => 'bar'];
         $this->assertEquals($expected, $normalized);
     }
 
@@ -121,50 +121,50 @@ public function testAddDefaultChildren()
         $node = $this->getPrototypeNodeWithDefaultChildren();
         $node->setAddChildrenIfNoneSet();
         $this->assertTrue($node->hasDefaultValue());
-        $this->assertEquals(array(array('foo' => 'bar')), $node->getDefaultValue());
+        $this->assertEquals([['foo' => 'bar']], $node->getDefaultValue());
 
         $node = $this->getPrototypeNodeWithDefaultChildren();
         $node->setKeyAttribute('foobar');
         $node->setAddChildrenIfNoneSet();
         $this->assertTrue($node->hasDefaultValue());
-        $this->assertEquals(array('defaults' => array('foo' => 'bar')), $node->getDefaultValue());
+        $this->assertEquals(['defaults' => ['foo' => 'bar']], $node->getDefaultValue());
 
         $node = $this->getPrototypeNodeWithDefaultChildren();
         $node->setKeyAttribute('foobar');
         $node->setAddChildrenIfNoneSet('defaultkey');
         $this->assertTrue($node->hasDefaultValue());
-        $this->assertEquals(array('defaultkey' => array('foo' => 'bar')), $node->getDefaultValue());
+        $this->assertEquals(['defaultkey' => ['foo' => 'bar']], $node->getDefaultValue());
 
         $node = $this->getPrototypeNodeWithDefaultChildren();
         $node->setKeyAttribute('foobar');
-        $node->setAddChildrenIfNoneSet(array('defaultkey'));
+        $node->setAddChildrenIfNoneSet(['defaultkey']);
         $this->assertTrue($node->hasDefaultValue());
-        $this->assertEquals(array('defaultkey' => array('foo' => 'bar')), $node->getDefaultValue());
+        $this->assertEquals(['defaultkey' => ['foo' => 'bar']], $node->getDefaultValue());
 
         $node = $this->getPrototypeNodeWithDefaultChildren();
         $node->setKeyAttribute('foobar');
-        $node->setAddChildrenIfNoneSet(array('dk1', 'dk2'));
+        $node->setAddChildrenIfNoneSet(['dk1', 'dk2']);
         $this->assertTrue($node->hasDefaultValue());
-        $this->assertEquals(array('dk1' => array('foo' => 'bar'), 'dk2' => array('foo' => 'bar')), $node->getDefaultValue());
+        $this->assertEquals(['dk1' => ['foo' => 'bar'], 'dk2' => ['foo' => 'bar']], $node->getDefaultValue());
 
         $node = $this->getPrototypeNodeWithDefaultChildren();
-        $node->setAddChildrenIfNoneSet(array(5, 6));
+        $node->setAddChildrenIfNoneSet([5, 6]);
         $this->assertTrue($node->hasDefaultValue());
-        $this->assertEquals(array(0 => array('foo' => 'bar'), 1 => array('foo' => 'bar')), $node->getDefaultValue());
+        $this->assertEquals([0 => ['foo' => 'bar'], 1 => ['foo' => 'bar']], $node->getDefaultValue());
 
         $node = $this->getPrototypeNodeWithDefaultChildren();
         $node->setAddChildrenIfNoneSet(2);
         $this->assertTrue($node->hasDefaultValue());
-        $this->assertEquals(array(array('foo' => 'bar'), array('foo' => 'bar')), $node->getDefaultValue());
+        $this->assertEquals([['foo' => 'bar'], ['foo' => 'bar']], $node->getDefaultValue());
     }
 
     public function testDefaultChildrenWinsOverDefaultValue()
     {
         $node = $this->getPrototypeNodeWithDefaultChildren();
         $node->setAddChildrenIfNoneSet();
-        $node->setDefaultValue(array('bar' => 'foo'));
+        $node->setDefaultValue(['bar' => 'foo']);
         $this->assertTrue($node->hasDefaultValue());
-        $this->assertEquals(array(array('foo' => 'bar')), $node->getDefaultValue());
+        $this->assertEquals([['foo' => 'bar']], $node->getDefaultValue());
     }
 
     protected function getPrototypeNodeWithDefaultChildren()
@@ -291,52 +291,52 @@ public function getDataForKeyRemovedLeftValueOnly()
 
         $variableValue = new VariableNode('value');
 
-        return array(
-           array(
+        return [
+           [
                $scalarValue,
-               array(
-                   array('id' => 'option1', 'value' => 'value1'),
-               ),
-               array('option1' => 'value1'),
-           ),
+               [
+                   ['id' => 'option1', 'value' => 'value1'],
+               ],
+               ['option1' => 'value1'],
+           ],
 
-           array(
+           [
                $scalarValue,
-               array(
-                   array('id' => 'option1', 'value' => 'value1'),
-                   array('id' => 'option2', 'value' => 'value2', 'foo' => 'foo2'),
-               ),
-               array(
+               [
+                   ['id' => 'option1', 'value' => 'value1'],
+                   ['id' => 'option2', 'value' => 'value2', 'foo' => 'foo2'],
+               ],
+               [
                    'option1' => 'value1',
-                   'option2' => array('value' => 'value2', 'foo' => 'foo2'),
-               ),
-           ),
+                   'option2' => ['value' => 'value2', 'foo' => 'foo2'],
+               ],
+           ],
 
-           array(
+           [
                $arrayValue,
-               array(
-                   array(
+               [
+                   [
                        'id' => 'option1',
-                       'value' => array('foo' => 'foo1', 'bar' => 'bar1'),
-                   ),
-               ),
-               array(
-                   'option1' => array('foo' => 'foo1', 'bar' => 'bar1'),
-               ),
-           ),
-
-           array($variableValue,
-               array(
-                   array(
-                       'id' => 'option1', 'value' => array('foo' => 'foo1', 'bar' => 'bar1'),
-                   ),
-                   array('id' => 'option2', 'value' => 'value2'),
-               ),
-               array(
-                   'option1' => array('foo' => 'foo1', 'bar' => 'bar1'),
+                       'value' => ['foo' => 'foo1', 'bar' => 'bar1'],
+                   ],
+               ],
+               [
+                   'option1' => ['foo' => 'foo1', 'bar' => 'bar1'],
+               ],
+           ],
+
+           [$variableValue,
+               [
+                   [
+                       'id' => 'option1', 'value' => ['foo' => 'foo1', 'bar' => 'bar1'],
+                   ],
+                   ['id' => 'option2', 'value' => 'value2'],
+               ],
+               [
+                   'option1' => ['foo' => 'foo1', 'bar' => 'bar1'],
                    'option2' => 'value2',
-               ),
-           ),
-        );
+               ],
+           ],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Config/Tests/Definition/ScalarNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/ScalarNodeTest.php
index 481ef3f4969cf..b42d2443d7d96 100644
--- a/src/Symfony/Component/Config/Tests/Definition/ScalarNodeTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/ScalarNodeTest.php
@@ -28,17 +28,17 @@ public function testNormalize($value)
 
     public function getValidValues()
     {
-        return array(
-            array(false),
-            array(true),
-            array(null),
-            array(''),
-            array('foo'),
-            array(0),
-            array(1),
-            array(0.0),
-            array(0.1),
-        );
+        return [
+            [false],
+            [true],
+            [null],
+            [''],
+            ['foo'],
+            [0],
+            [1],
+            [0.0],
+            [0.1],
+        ];
     }
 
     public function testSetDeprecated()
@@ -62,12 +62,12 @@ public function testSetDeprecated()
         };
 
         $prevErrorHandler = set_error_handler($deprecationHandler);
-        $node->finalize(array());
+        $node->finalize([]);
         restore_error_handler();
         $this->assertSame(0, $deprecationTriggered, '->finalize() should not trigger if the deprecated node is not set');
 
         $prevErrorHandler = set_error_handler($deprecationHandler);
-        $node->finalize(array('foo' => ''));
+        $node->finalize(['foo' => '']);
         restore_error_handler();
         $this->assertSame(1, $deprecationTriggered, '->finalize() should trigger if the deprecated node is set');
     }
@@ -84,11 +84,11 @@ public function testNormalizeThrowsExceptionOnInvalidValues($value)
 
     public function getInvalidValues()
     {
-        return array(
-            array(array()),
-            array(array('foo' => 'bar')),
-            array(new \stdClass()),
-        );
+        return [
+            [[]],
+            [['foo' => 'bar']],
+            [new \stdClass()],
+        ];
     }
 
     public function testNormalizeThrowsExceptionWithoutHint()
@@ -102,7 +102,7 @@ public function testNormalizeThrowsExceptionWithoutHint()
             $this->setExpectedException('Symfony\Component\Config\Definition\Exception\InvalidTypeException', 'Invalid type for path "test". Expected scalar, but got array.');
         }
 
-        $node->normalize(array());
+        $node->normalize([]);
     }
 
     public function testNormalizeThrowsExceptionWithErrorMessage()
@@ -117,7 +117,7 @@ public function testNormalizeThrowsExceptionWithErrorMessage()
             $this->setExpectedException('Symfony\Component\Config\Definition\Exception\InvalidTypeException', "Invalid type for path \"test\". Expected scalar, but got array.\nHint: \"the test value\"");
         }
 
-        $node->normalize(array());
+        $node->normalize([]);
     }
 
     /**
@@ -135,15 +135,15 @@ public function testValidNonEmptyValues($value)
 
     public function getValidNonEmptyValues()
     {
-        return array(
-            array(false),
-            array(true),
-            array('foo'),
-            array(0),
-            array(1),
-            array(0.0),
-            array(0.1),
-        );
+        return [
+            [false],
+            [true],
+            ['foo'],
+            [0],
+            [1],
+            [0.0],
+            [0.1],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Config/Tests/FileLocatorTest.php b/src/Symfony/Component/Config/Tests/FileLocatorTest.php
index 7120504131525..0bd97f7d8a38e 100644
--- a/src/Symfony/Component/Config/Tests/FileLocatorTest.php
+++ b/src/Symfony/Component/Config/Tests/FileLocatorTest.php
@@ -21,7 +21,7 @@ class FileLocatorTest extends TestCase
      */
     public function testIsAbsolutePath($path)
     {
-        $loader = new FileLocator(array());
+        $loader = new FileLocator([]);
         $r = new \ReflectionObject($loader);
         $m = $r->getMethod('isAbsolutePath');
         $m->setAccessible(true);
@@ -31,14 +31,14 @@ public function testIsAbsolutePath($path)
 
     public function getIsAbsolutePathTests()
     {
-        return array(
-            array('/foo.xml'),
-            array('c:\\\\foo.xml'),
-            array('c:/foo.xml'),
-            array('\\server\\foo.xml'),
-            array('https://server/foo.xml'),
-            array('phar://server/foo.xml'),
-        );
+        return [
+            ['/foo.xml'],
+            ['c:\\\\foo.xml'],
+            ['c:/foo.xml'],
+            ['\\server\\foo.xml'],
+            ['https://server/foo.xml'],
+            ['phar://server/foo.xml'],
+        ];
     }
 
     public function testLocate()
@@ -63,16 +63,16 @@ public function testLocate()
             '->locate() returns the absolute filename if the file exists in one of the paths given in the constructor'
         );
 
-        $loader = new FileLocator(array(__DIR__.'/Fixtures', __DIR__.'/Fixtures/Again'));
+        $loader = new FileLocator([__DIR__.'/Fixtures', __DIR__.'/Fixtures/Again']);
 
         $this->assertEquals(
-            array(__DIR__.'/Fixtures'.\DIRECTORY_SEPARATOR.'foo.xml', __DIR__.'/Fixtures/Again'.\DIRECTORY_SEPARATOR.'foo.xml'),
+            [__DIR__.'/Fixtures'.\DIRECTORY_SEPARATOR.'foo.xml', __DIR__.'/Fixtures/Again'.\DIRECTORY_SEPARATOR.'foo.xml'],
             $loader->locate('foo.xml', __DIR__, false),
             '->locate() returns an array of absolute filenames'
         );
 
         $this->assertEquals(
-            array(__DIR__.'/Fixtures'.\DIRECTORY_SEPARATOR.'foo.xml', __DIR__.'/Fixtures/Again'.\DIRECTORY_SEPARATOR.'foo.xml'),
+            [__DIR__.'/Fixtures'.\DIRECTORY_SEPARATOR.'foo.xml', __DIR__.'/Fixtures/Again'.\DIRECTORY_SEPARATOR.'foo.xml'],
             $loader->locate('foo.xml', __DIR__.'/Fixtures', false),
             '->locate() returns an array of absolute filenames'
         );
@@ -80,7 +80,7 @@ public function testLocate()
         $loader = new FileLocator(__DIR__.'/Fixtures/Again');
 
         $this->assertEquals(
-            array(__DIR__.'/Fixtures'.\DIRECTORY_SEPARATOR.'foo.xml', __DIR__.'/Fixtures/Again'.\DIRECTORY_SEPARATOR.'foo.xml'),
+            [__DIR__.'/Fixtures'.\DIRECTORY_SEPARATOR.'foo.xml', __DIR__.'/Fixtures/Again'.\DIRECTORY_SEPARATOR.'foo.xml'],
             $loader->locate('foo.xml', __DIR__.'/Fixtures', false),
             '->locate() returns an array of absolute filenames'
         );
@@ -92,7 +92,7 @@ public function testLocate()
      */
     public function testLocateThrowsAnExceptionIfTheFileDoesNotExists()
     {
-        $loader = new FileLocator(array(__DIR__.'/Fixtures'));
+        $loader = new FileLocator([__DIR__.'/Fixtures']);
 
         $loader->locate('foobar.xml', __DIR__);
     }
@@ -102,7 +102,7 @@ public function testLocateThrowsAnExceptionIfTheFileDoesNotExists()
      */
     public function testLocateThrowsAnExceptionIfTheFileDoesNotExistsInAbsolutePath()
     {
-        $loader = new FileLocator(array(__DIR__.'/Fixtures'));
+        $loader = new FileLocator([__DIR__.'/Fixtures']);
 
         $loader->locate(__DIR__.'/Fixtures/foobar.xml', __DIR__);
     }
@@ -113,7 +113,7 @@ public function testLocateThrowsAnExceptionIfTheFileDoesNotExistsInAbsolutePath(
      */
     public function testLocateEmpty()
     {
-        $loader = new FileLocator(array(__DIR__.'/Fixtures'));
+        $loader = new FileLocator([__DIR__.'/Fixtures']);
 
         $loader->locate(null, __DIR__);
     }
diff --git a/src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php b/src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php
index d44b67cc1997f..3f02700a18185 100644
--- a/src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php
+++ b/src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php
@@ -32,14 +32,14 @@ public function getConfigTreeBuilder()
                 ->scalarNode('scalar_true')->defaultTrue()->end()
                 ->scalarNode('scalar_false')->defaultFalse()->end()
                 ->scalarNode('scalar_default')->defaultValue('default')->end()
-                ->scalarNode('scalar_array_empty')->defaultValue(array())->end()
-                ->scalarNode('scalar_array_defaults')->defaultValue(array('elem1', 'elem2'))->end()
+                ->scalarNode('scalar_array_empty')->defaultValue([])->end()
+                ->scalarNode('scalar_array_defaults')->defaultValue(['elem1', 'elem2'])->end()
                 ->scalarNode('scalar_required')->isRequired()->end()
                 ->scalarNode('scalar_deprecated')->setDeprecated()->end()
                 ->scalarNode('scalar_deprecated_with_message')->setDeprecated('Deprecation custom message for "%node%" at "%path%"')->end()
                 ->scalarNode('node_with_a_looong_name')->end()
-                ->enumNode('enum_with_default')->values(array('this', 'that'))->defaultValue('this')->end()
-                ->enumNode('enum')->values(array('this', 'that'))->end()
+                ->enumNode('enum_with_default')->values(['this', 'that'])->defaultValue('this')->end()
+                ->enumNode('enum')->values(['this', 'that'])->end()
                 ->arrayNode('array')
                     ->info('some info')
                     ->canBeUnset()
diff --git a/src/Symfony/Component/Config/Tests/Loader/DelegatingLoaderTest.php b/src/Symfony/Component/Config/Tests/Loader/DelegatingLoaderTest.php
index 3f4b21f34b090..6e2a6ba2229d7 100644
--- a/src/Symfony/Component/Config/Tests/Loader/DelegatingLoaderTest.php
+++ b/src/Symfony/Component/Config/Tests/Loader/DelegatingLoaderTest.php
@@ -36,12 +36,12 @@ public function testSupports()
     {
         $loader1 = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
         $loader1->expects($this->once())->method('supports')->will($this->returnValue(true));
-        $loader = new DelegatingLoader(new LoaderResolver(array($loader1)));
+        $loader = new DelegatingLoader(new LoaderResolver([$loader1]));
         $this->assertTrue($loader->supports('foo.xml'), '->supports() returns true if the resource is loadable');
 
         $loader1 = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
         $loader1->expects($this->once())->method('supports')->will($this->returnValue(false));
-        $loader = new DelegatingLoader(new LoaderResolver(array($loader1)));
+        $loader = new DelegatingLoader(new LoaderResolver([$loader1]));
         $this->assertFalse($loader->supports('foo.foo'), '->supports() returns false if the resource is not loadable');
     }
 
@@ -50,7 +50,7 @@ public function testLoad()
         $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
         $loader->expects($this->once())->method('supports')->will($this->returnValue(true));
         $loader->expects($this->once())->method('load');
-        $resolver = new LoaderResolver(array($loader));
+        $resolver = new LoaderResolver([$loader]);
         $loader = new DelegatingLoader($resolver);
 
         $loader->load('foo');
@@ -63,7 +63,7 @@ public function testLoadThrowsAnExceptionIfTheResourceCannotBeLoaded()
     {
         $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
         $loader->expects($this->once())->method('supports')->will($this->returnValue(false));
-        $resolver = new LoaderResolver(array($loader));
+        $resolver = new LoaderResolver([$loader]);
         $loader = new DelegatingLoader($resolver);
 
         $loader->load('foo');
diff --git a/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php
index f8409df9d7430..b59ace46f937a 100644
--- a/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php
+++ b/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php
@@ -24,11 +24,11 @@ public function testImportWithFileLocatorDelegation()
 
         $locatorMockForAdditionalLoader = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
         $locatorMockForAdditionalLoader->expects($this->any())->method('locate')->will($this->onConsecutiveCalls(
-                array('path/to/file1'),                    // Default
-                array('path/to/file1', 'path/to/file2'),   // First is imported
-                array('path/to/file1', 'path/to/file2'),   // Second is imported
-                array('path/to/file1'),                    // Exception
-                array('path/to/file1', 'path/to/file2')    // Exception
+                ['path/to/file1'],                    // Default
+                ['path/to/file1', 'path/to/file2'],   // First is imported
+                ['path/to/file1', 'path/to/file2'],   // Second is imported
+                ['path/to/file1'],                    // Exception
+                ['path/to/file1', 'path/to/file2']    // Exception
                 ));
 
         $fileLoader = new TestFileLoader($locatorMock);
@@ -38,7 +38,7 @@ public function testImportWithFileLocatorDelegation()
         $additionalLoader = new TestFileLoader($locatorMockForAdditionalLoader);
         $additionalLoader->setCurrentDir('.');
 
-        $fileLoader->setResolver($loaderResolver = new LoaderResolver(array($fileLoader, $additionalLoader)));
+        $fileLoader->setResolver($loaderResolver = new LoaderResolver([$fileLoader, $additionalLoader]));
 
         // Default case
         $this->assertSame('path/to/file1', $fileLoader->import('my_resource'));
@@ -118,7 +118,7 @@ public function removeLoading($resource)
 
     public function clearLoading()
     {
-        self::$loading = array();
+        self::$loading = [];
     }
 
     public function setSupports($supports)
diff --git a/src/Symfony/Component/Config/Tests/Loader/LoaderResolverTest.php b/src/Symfony/Component/Config/Tests/Loader/LoaderResolverTest.php
index 0bf56b610ebdc..487dc43adc310 100644
--- a/src/Symfony/Component/Config/Tests/Loader/LoaderResolverTest.php
+++ b/src/Symfony/Component/Config/Tests/Loader/LoaderResolverTest.php
@@ -18,22 +18,22 @@ class LoaderResolverTest extends TestCase
 {
     public function testConstructor()
     {
-        $resolver = new LoaderResolver(array(
+        $resolver = new LoaderResolver([
             $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock(),
-        ));
+        ]);
 
-        $this->assertEquals(array($loader), $resolver->getLoaders(), '__construct() takes an array of loaders as its first argument');
+        $this->assertEquals([$loader], $resolver->getLoaders(), '__construct() takes an array of loaders as its first argument');
     }
 
     public function testResolve()
     {
         $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
-        $resolver = new LoaderResolver(array($loader));
+        $resolver = new LoaderResolver([$loader]);
         $this->assertFalse($resolver->resolve('foo.foo'), '->resolve() returns false if no loader is able to load the resource');
 
         $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
         $loader->expects($this->once())->method('supports')->will($this->returnValue(true));
-        $resolver = new LoaderResolver(array($loader));
+        $resolver = new LoaderResolver([$loader]);
         $this->assertEquals($loader, $resolver->resolve(function () {}), '->resolve() returns the loader for the given resource');
     }
 
@@ -42,6 +42,6 @@ public function testLoaders()
         $resolver = new LoaderResolver();
         $resolver->addLoader($loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock());
 
-        $this->assertEquals(array($loader), $resolver->getLoaders(), 'addLoader() adds a loader');
+        $this->assertEquals([$loader], $resolver->getLoaders(), 'addLoader() adds a loader');
     }
 }
diff --git a/src/Symfony/Component/Config/Tests/Resource/DirectoryResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/DirectoryResourceTest.php
index cf20e43b50027..85f6c02ee6ee8 100644
--- a/src/Symfony/Component/Config/Tests/Resource/DirectoryResourceTest.php
+++ b/src/Symfony/Component/Config/Tests/Resource/DirectoryResourceTest.php
@@ -178,6 +178,6 @@ public function testResourcesWithDifferentPatternsAreDifferent()
         $resourceA = new DirectoryResource($this->directory, '/.xml$/');
         $resourceB = new DirectoryResource($this->directory, '/.yaml$/');
 
-        $this->assertCount(2, array_unique(array($resourceA, $resourceB)));
+        $this->assertCount(2, array_unique([$resourceA, $resourceB]));
     }
 }
diff --git a/src/Symfony/Component/Config/Tests/Resource/GlobResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/GlobResourceTest.php
index c66770c3051c2..cfbfd2b4554e2 100644
--- a/src/Symfony/Component/Config/Tests/Resource/GlobResourceTest.php
+++ b/src/Symfony/Component/Config/Tests/Resource/GlobResourceTest.php
@@ -33,7 +33,7 @@ public function testIterator()
         $paths = iterator_to_array($resource);
 
         $file = $dir.'/Resource'.\DIRECTORY_SEPARATOR.'ConditionalClass.php';
-        $this->assertEquals(array($file => new \SplFileInfo($file)), $paths);
+        $this->assertEquals([$file => new \SplFileInfo($file)], $paths);
         $this->assertInstanceOf('SplFileInfo', current($paths));
         $this->assertSame($dir, $resource->getPrefix());
 
@@ -42,7 +42,7 @@ public function testIterator()
         $paths = iterator_to_array($resource);
 
         $file = $dir.\DIRECTORY_SEPARATOR.'Resource'.\DIRECTORY_SEPARATOR.'ConditionalClass.php';
-        $this->assertEquals(array($file => $file), $paths);
+        $this->assertEquals([$file => $file], $paths);
         $this->assertInstanceOf('SplFileInfo', current($paths));
         $this->assertSame($dir, $resource->getPrefix());
     }
diff --git a/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php
index 61b0fdf7345b1..da44d11e7ef5c 100644
--- a/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php
+++ b/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php
@@ -144,7 +144,7 @@ public function testEventSubscriber()
         $res = new ReflectionClassResource(new \ReflectionClass(TestEventSubscriber::class));
         $this->assertTrue($res->isFresh(0));
 
-        TestEventSubscriber::$subscribedEvents = array(123);
+        TestEventSubscriber::$subscribedEvents = [123];
         $this->assertFalse($res->isFresh(0));
 
         $res = new ReflectionClassResource(new \ReflectionClass(TestEventSubscriber::class));
@@ -156,7 +156,7 @@ public function testServiceSubscriber()
         $res = new ReflectionClassResource(new \ReflectionClass(TestServiceSubscriber::class));
         $this->assertTrue($res->isFresh(0));
 
-        TestServiceSubscriber::$subscribedServices = array(123);
+        TestServiceSubscriber::$subscribedServices = [123];
         $this->assertFalse($res->isFresh(0));
 
         $res = new ReflectionClassResource(new \ReflectionClass(TestServiceSubscriber::class));
@@ -170,7 +170,7 @@ interface DummyInterface
 
 class TestEventSubscriber implements EventSubscriberInterface
 {
-    public static $subscribedEvents = array();
+    public static $subscribedEvents = [];
 
     public static function getSubscribedEvents()
     {
@@ -180,7 +180,7 @@ public static function getSubscribedEvents()
 
 class TestServiceSubscriber implements ServiceSubscriberInterface
 {
-    public static $subscribedServices = array();
+    public static $subscribedServices = [];
 
     public static function getSubscribedServices()
     {
diff --git a/src/Symfony/Component/Config/Tests/ResourceCheckerConfigCacheTest.php b/src/Symfony/Component/Config/Tests/ResourceCheckerConfigCacheTest.php
index bb29ac02a4efe..a2c2eeb811b20 100644
--- a/src/Symfony/Component/Config/Tests/ResourceCheckerConfigCacheTest.php
+++ b/src/Symfony/Component/Config/Tests/ResourceCheckerConfigCacheTest.php
@@ -27,7 +27,7 @@ protected function setUp()
 
     protected function tearDown()
     {
-        $files = array($this->cacheFile, "{$this->cacheFile}.meta");
+        $files = [$this->cacheFile, "{$this->cacheFile}.meta"];
 
         foreach ($files as $file) {
             if (file_exists($file)) {
@@ -52,7 +52,7 @@ public function testCacheIsNotFreshIfEmpty()
             It does not matter if you provide checkers or not. */
 
         unlink($this->cacheFile); // remove tempnam() side effect
-        $cache = new ResourceCheckerConfigCache($this->cacheFile, array($checker));
+        $cache = new ResourceCheckerConfigCache($this->cacheFile, [$checker]);
 
         $this->assertFalse($cache->isFresh());
     }
@@ -67,7 +67,7 @@ public function testCacheIsFreshIfNoCheckerProvided()
 
     public function testCacheIsFreshIfEmptyCheckerIteratorProvided()
     {
-        $cache = new ResourceCheckerConfigCache($this->cacheFile, new \ArrayIterator(array()));
+        $cache = new ResourceCheckerConfigCache($this->cacheFile, new \ArrayIterator([]));
         $this->assertTrue($cache->isFresh());
     }
 
@@ -75,7 +75,7 @@ public function testResourcesWithoutcheckersAreIgnoredAndConsideredFresh()
     {
         /* As in the previous test, but this time we have a resource. */
         $cache = new ResourceCheckerConfigCache($this->cacheFile);
-        $cache->write('', array(new ResourceStub()));
+        $cache->write('', [new ResourceStub()]);
 
         $this->assertTrue($cache->isFresh()); // no (matching) ResourceChecker passed
     }
@@ -92,8 +92,8 @@ public function testIsFreshWithchecker()
                   ->method('isFresh')
                   ->willReturn(true);
 
-        $cache = new ResourceCheckerConfigCache($this->cacheFile, array($checker));
-        $cache->write('', array(new ResourceStub()));
+        $cache = new ResourceCheckerConfigCache($this->cacheFile, [$checker]);
+        $cache->write('', [new ResourceStub()]);
 
         $this->assertTrue($cache->isFresh());
     }
@@ -110,8 +110,8 @@ public function testIsNotFreshWithchecker()
                   ->method('isFresh')
                   ->willReturn(false);
 
-        $cache = new ResourceCheckerConfigCache($this->cacheFile, array($checker));
-        $cache->write('', array(new ResourceStub()));
+        $cache = new ResourceCheckerConfigCache($this->cacheFile, [$checker]);
+        $cache->write('', [new ResourceStub()]);
 
         $this->assertFalse($cache->isFresh());
     }
@@ -119,8 +119,8 @@ public function testIsNotFreshWithchecker()
     public function testCacheIsNotFreshWhenUnserializeFails()
     {
         $checker = $this->getMockBuilder('\Symfony\Component\Config\ResourceCheckerInterface')->getMock();
-        $cache = new ResourceCheckerConfigCache($this->cacheFile, array($checker));
-        $cache->write('foo', array(new FileResource(__FILE__)));
+        $cache = new ResourceCheckerConfigCache($this->cacheFile, [$checker]);
+        $cache->write('foo', [new FileResource(__FILE__)]);
 
         $metaFile = "{$this->cacheFile}.meta";
         file_put_contents($metaFile, str_replace('FileResource', 'ClassNotHere', file_get_contents($metaFile)));
@@ -139,8 +139,8 @@ public function testCacheKeepsContent()
     public function testCacheIsNotFreshIfNotExistsMetaFile()
     {
         $checker = $this->getMockBuilder('\Symfony\Component\Config\ResourceCheckerInterface')->getMock();
-        $cache = new ResourceCheckerConfigCache($this->cacheFile, array($checker));
-        $cache->write('foo', array(new FileResource(__FILE__)));
+        $cache = new ResourceCheckerConfigCache($this->cacheFile, [$checker]);
+        $cache->write('foo', [new FileResource(__FILE__)]);
 
         $metaFile = "{$this->cacheFile}.meta";
         unlink($metaFile);
diff --git a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
index 10b4a7a9b4dc7..0a6637f78536c 100644
--- a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
+++ b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
@@ -52,14 +52,14 @@ public function testLoadFile()
         $mock->expects($this->exactly(2))->method('validate')->will($this->onConsecutiveCalls(false, true));
 
         try {
-            XmlUtils::loadFile($fixtures.'valid.xml', array($mock, 'validate'));
+            XmlUtils::loadFile($fixtures.'valid.xml', [$mock, 'validate']);
             $this->fail();
         } catch (\InvalidArgumentException $e) {
             $this->assertRegExp('/The XML file ".+" is not valid\./', $e->getMessage());
         }
 
-        $this->assertInstanceOf('DOMDocument', XmlUtils::loadFile($fixtures.'valid.xml', array($mock, 'validate')));
-        $this->assertSame(array(), libxml_get_errors());
+        $this->assertInstanceOf('DOMDocument', XmlUtils::loadFile($fixtures.'valid.xml', [$mock, 'validate']));
+        $this->assertSame([], libxml_get_errors());
     }
 
     /**
@@ -73,16 +73,16 @@ public function testParseWithInvalidValidatorCallable()
         $mock = $this->getMockBuilder(__NAMESPACE__.'\Validator')->getMock();
         $mock->expects($this->once())->method('validate')->willReturn(false);
 
-        XmlUtils::parse(file_get_contents($fixtures.'valid.xml'), array($mock, 'validate'));
+        XmlUtils::parse(file_get_contents($fixtures.'valid.xml'), [$mock, 'validate']);
     }
 
     public function testLoadFileWithInternalErrorsEnabled()
     {
         $internalErrors = libxml_use_internal_errors(true);
 
-        $this->assertSame(array(), libxml_get_errors());
+        $this->assertSame([], libxml_get_errors());
         $this->assertInstanceOf('DOMDocument', XmlUtils::loadFile(__DIR__.'/../Fixtures/Util/invalid_schema.xml'));
-        $this->assertSame(array(), libxml_get_errors());
+        $this->assertSame([], libxml_get_errors());
 
         libxml_clear_errors();
         libxml_use_internal_errors($internalErrors);
@@ -101,25 +101,25 @@ public function testConvertDomToArray($expected, $xml, $root = false, $checkPref
 
     public function getDataForConvertDomToArray()
     {
-        return array(
-            array(null, ''),
-            array('bar', 'bar'),
-            array(array('bar' => 'foobar'), '<foo bar="foobar" />', true),
-            array(array('foo' => null), '<foo />'),
-            array(array('foo' => 'bar'), '<foo>bar</foo>'),
-            array(array('foo' => array('foo' => 'bar')), '<foo foo="bar"/>'),
-            array(array('foo' => array('foo' => 0)), '<foo><foo>0</foo></foo>'),
-            array(array('foo' => array('foo' => 'bar')), '<foo><foo>bar</foo></foo>'),
-            array(array('foo' => array('foo' => 'bar', 'value' => 'text')), '<foo foo="bar">text</foo>'),
-            array(array('foo' => array('attr' => 'bar', 'foo' => 'text')), '<foo attr="bar"><foo>text</foo></foo>'),
-            array(array('foo' => array('bar', 'text')), '<foo>bar</foo><foo>text</foo>'),
-            array(array('foo' => array(array('foo' => 'bar'), array('foo' => 'text'))), '<foo foo="bar"/><foo foo="text" />'),
-            array(array('foo' => array('foo' => array('bar', 'text'))), '<foo foo="bar"><foo>text</foo></foo>'),
-            array(array('foo' => 'bar'), '<foo><!-- Comment -->bar</foo>'),
-            array(array('foo' => 'text'), '<foo xmlns:h="http://www.example.org/bar" h:bar="bar">text</foo>'),
-            array(array('foo' => array('bar' => 'bar', 'value' => 'text')), '<foo xmlns:h="http://www.example.org/bar" h:bar="bar">text</foo>', false, false),
-            array(array('attr' => 1, 'b' => 'hello'), '<foo:a xmlns:foo="http://www.example.org/foo" xmlns:h="http://www.example.org/bar" attr="1" h:bar="bar"><foo:b>hello</foo:b><h:c>2</h:c></foo:a>', true),
-        );
+        return [
+            [null, ''],
+            ['bar', 'bar'],
+            [['bar' => 'foobar'], '<foo bar="foobar" />', true],
+            [['foo' => null], '<foo />'],
+            [['foo' => 'bar'], '<foo>bar</foo>'],
+            [['foo' => ['foo' => 'bar']], '<foo foo="bar"/>'],
+            [['foo' => ['foo' => 0]], '<foo><foo>0</foo></foo>'],
+            [['foo' => ['foo' => 'bar']], '<foo><foo>bar</foo></foo>'],
+            [['foo' => ['foo' => 'bar', 'value' => 'text']], '<foo foo="bar">text</foo>'],
+            [['foo' => ['attr' => 'bar', 'foo' => 'text']], '<foo attr="bar"><foo>text</foo></foo>'],
+            [['foo' => ['bar', 'text']], '<foo>bar</foo><foo>text</foo>'],
+            [['foo' => [['foo' => 'bar'], ['foo' => 'text']]], '<foo foo="bar"/><foo foo="text" />'],
+            [['foo' => ['foo' => ['bar', 'text']]], '<foo foo="bar"><foo>text</foo></foo>'],
+            [['foo' => 'bar'], '<foo><!-- Comment -->bar</foo>'],
+            [['foo' => 'text'], '<foo xmlns:h="http://www.example.org/bar" h:bar="bar">text</foo>'],
+            [['foo' => ['bar' => 'bar', 'value' => 'text']], '<foo xmlns:h="http://www.example.org/bar" h:bar="bar">text</foo>', false, false],
+            [['attr' => 1, 'b' => 'hello'], '<foo:a xmlns:foo="http://www.example.org/foo" xmlns:h="http://www.example.org/bar" attr="1" h:bar="bar"><foo:b>hello</foo:b><h:c>2</h:c></foo:a>', true],
+        ];
     }
 
     /**
@@ -132,34 +132,34 @@ public function testPhpize($expected, $value)
 
     public function getDataForPhpize()
     {
-        return array(
-            array('', ''),
-            array(null, 'null'),
-            array(true, 'true'),
-            array(false, 'false'),
-            array(null, 'Null'),
-            array(true, 'True'),
-            array(false, 'False'),
-            array(0, '0'),
-            array(1, '1'),
-            array(-1, '-1'),
-            array(0777, '0777'),
-            array(255, '0xFF'),
-            array(100.0, '1e2'),
-            array(-120.0, '-1.2E2'),
-            array(-10100.1, '-10100.1'),
-            array('-10,100.1', '-10,100.1'),
-            array('1234 5678 9101 1121 3141', '1234 5678 9101 1121 3141'),
-            array('1,2,3,4', '1,2,3,4'),
-            array('11,22,33,44', '11,22,33,44'),
-            array('11,222,333,4', '11,222,333,4'),
-            array('1,222,333,444', '1,222,333,444'),
-            array('11,222,333,444', '11,222,333,444'),
-            array('111,222,333,444', '111,222,333,444'),
-            array('1111,2222,3333,4444,5555', '1111,2222,3333,4444,5555'),
-            array('foo', 'foo'),
-            array(6, '0b0110'),
-        );
+        return [
+            ['', ''],
+            [null, 'null'],
+            [true, 'true'],
+            [false, 'false'],
+            [null, 'Null'],
+            [true, 'True'],
+            [false, 'False'],
+            [0, '0'],
+            [1, '1'],
+            [-1, '-1'],
+            [0777, '0777'],
+            [255, '0xFF'],
+            [100.0, '1e2'],
+            [-120.0, '-1.2E2'],
+            [-10100.1, '-10100.1'],
+            ['-10,100.1', '-10,100.1'],
+            ['1234 5678 9101 1121 3141', '1234 5678 9101 1121 3141'],
+            ['1,2,3,4', '1,2,3,4'],
+            ['11,22,33,44', '11,22,33,44'],
+            ['11,222,333,4', '11,222,333,4'],
+            ['1,222,333,444', '1,222,333,444'],
+            ['11,222,333,444', '11,222,333,444'],
+            ['111,222,333,444', '111,222,333,444'],
+            ['1111,2222,3333,4444,5555', '1111,2222,3333,4444,5555'],
+            ['foo', 'foo'],
+            [6, '0b0110'],
+        ];
     }
 
     public function testLoadEmptyXmlFile()
diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
index 8ad58d61e6ab4..df1edd68bd79e 100644
--- a/src/Symfony/Component/Config/Util/XmlUtils.php
+++ b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -158,9 +158,9 @@ public static function convertDomElementToArray(\DOMElement $element, $checkPref
     {
         $prefix = (string) $element->prefix;
         $empty = true;
-        $config = array();
+        $config = [];
         foreach ($element->attributes as $name => $node) {
-            if ($checkPrefix && !\in_array((string) $node->prefix, array('', $prefix), true)) {
+            if ($checkPrefix && !\in_array((string) $node->prefix, ['', $prefix], true)) {
                 continue;
             }
             $config[$name] = static::phpize($node->value);
@@ -182,7 +182,7 @@ public static function convertDomElementToArray(\DOMElement $element, $checkPref
                 $key = $node->localName;
                 if (isset($config[$key])) {
                     if (!\is_array($config[$key]) || !\is_int(key($config[$key]))) {
-                        $config[$key] = array($config[$key]);
+                        $config[$key] = [$config[$key]];
                     }
                     $config[$key][] = $value;
                 } else {
@@ -249,7 +249,7 @@ public static function phpize($value)
 
     protected static function getXmlErrors($internalErrors)
     {
-        $errors = array();
+        $errors = [];
         foreach (libxml_get_errors() as $error) {
             $errors[] = sprintf('[%s %s] %s (in %s - line %d, column %d)',
                 LIBXML_ERR_WARNING == $error->level ? 'WARNING' : 'ERROR',
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 680036041019b..c4d391c225f7e 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -61,7 +61,7 @@
  */
 class Application
 {
-    private $commands = array();
+    private $commands = [];
     private $wantHelps = false;
     private $runningCommand;
     private $name;
@@ -196,17 +196,17 @@ public function run(InputInterface $input = null, OutputInterface $output = null
      */
     public function doRun(InputInterface $input, OutputInterface $output)
     {
-        if (true === $input->hasParameterOption(array('--version', '-V'), true)) {
+        if (true === $input->hasParameterOption(['--version', '-V'], true)) {
             $output->writeln($this->getLongVersion());
 
             return 0;
         }
 
         $name = $this->getCommandName($input);
-        if (true === $input->hasParameterOption(array('--help', '-h'), true)) {
+        if (true === $input->hasParameterOption(['--help', '-h'], true)) {
             if (!$name) {
                 $name = 'help';
-                $input = new ArrayInput(array('command_name' => $this->defaultCommand));
+                $input = new ArrayInput(['command_name' => $this->defaultCommand]);
             } else {
                 $this->wantHelps = true;
             }
@@ -217,9 +217,9 @@ public function doRun(InputInterface $input, OutputInterface $output)
             $definition = $this->getDefinition();
             $definition->setArguments(array_merge(
                 $definition->getArguments(),
-                array(
+                [
                     'command' => new InputArgument('command', InputArgument::OPTIONAL, $definition->getArgument('command')->getDescription(), $name),
-                )
+                ]
             ));
         }
 
@@ -521,7 +521,7 @@ public function has($name)
      */
     public function getNamespaces()
     {
-        $namespaces = array();
+        $namespaces = [];
         foreach ($this->all() as $command) {
             $namespaces = array_merge($namespaces, $this->extractAllNamespaces($command->getName()));
 
@@ -588,7 +588,7 @@ public function find($name)
     {
         $this->init();
 
-        $aliases = array();
+        $aliases = [];
         $allCommands = $this->commandLoader ? array_merge($this->commandLoader->getNames(), array_keys($this->commands)) : array_keys($this->commands);
         $expr = preg_replace_callback('{([^:]+|)}', function ($matches) { return preg_quote($matches[1]).'[^:]*'; }, $name);
         $commands = preg_grep('{^'.$expr.'}', $allCommands);
@@ -681,7 +681,7 @@ public function all($namespace = null)
             return $commands;
         }
 
-        $commands = array();
+        $commands = [];
         foreach ($this->commands as $name => $command) {
             if ($namespace === $this->extractNamespace($name, substr_count($namespace, ':') + 1)) {
                 $commands[$name] = $command;
@@ -708,7 +708,7 @@ public function all($namespace = null)
      */
     public static function getAbbreviations($names)
     {
-        $abbrevs = array();
+        $abbrevs = [];
         foreach ($names as $name) {
             for ($len = \strlen($name); $len > 0; --$len) {
                 $abbrev = substr($name, 0, $len);
@@ -783,12 +783,12 @@ protected function doRenderException(\Exception $e, OutputInterface $output)
                 // exception related properties
                 $trace = $e->getTrace();
 
-                array_unshift($trace, array(
+                array_unshift($trace, [
                     'function' => '',
                     'file' => $e->getFile() ?: 'n/a',
                     'line' => $e->getLine() ?: 'n/a',
-                    'args' => array(),
-                ));
+                    'args' => [],
+                ]);
 
                 for ($i = 0, $count = \count($trace); $i < $count; ++$i) {
                     $class = isset($trace[$i]['class']) ? $trace[$i]['class'] : '';
@@ -874,13 +874,13 @@ public function setTerminalDimensions($width, $height)
      */
     protected function configureIO(InputInterface $input, OutputInterface $output)
     {
-        if (true === $input->hasParameterOption(array('--ansi'), true)) {
+        if (true === $input->hasParameterOption(['--ansi'], true)) {
             $output->setDecorated(true);
-        } elseif (true === $input->hasParameterOption(array('--no-ansi'), true)) {
+        } elseif (true === $input->hasParameterOption(['--no-ansi'], true)) {
             $output->setDecorated(false);
         }
 
-        if (true === $input->hasParameterOption(array('--no-interaction', '-n'), true)) {
+        if (true === $input->hasParameterOption(['--no-interaction', '-n'], true)) {
             $input->setInteractive(false);
         } elseif (\function_exists('posix_isatty')) {
             $inputStream = null;
@@ -908,7 +908,7 @@ protected function configureIO(InputInterface $input, OutputInterface $output)
             default: $shellVerbosity = 0; break;
         }
 
-        if (true === $input->hasParameterOption(array('--quiet', '-q'), true)) {
+        if (true === $input->hasParameterOption(['--quiet', '-q'], true)) {
             $output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
             $shellVerbosity = -1;
         } else {
@@ -1021,7 +1021,7 @@ protected function getCommandName(InputInterface $input)
      */
     protected function getDefaultInputDefinition()
     {
-        return new InputDefinition(array(
+        return new InputDefinition([
             new InputArgument('command', InputArgument::REQUIRED, 'The command to execute'),
 
             new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Display this help message'),
@@ -1031,7 +1031,7 @@ protected function getDefaultInputDefinition()
             new InputOption('--ansi', '', InputOption::VALUE_NONE, 'Force ANSI output'),
             new InputOption('--no-ansi', '', InputOption::VALUE_NONE, 'Disable ANSI output'),
             new InputOption('--no-interaction', '-n', InputOption::VALUE_NONE, 'Do not ask any interactive question'),
-        ));
+        ]);
     }
 
     /**
@@ -1041,7 +1041,7 @@ protected function getDefaultInputDefinition()
      */
     protected function getDefaultCommands()
     {
-        return array(new HelpCommand(), new ListCommand());
+        return [new HelpCommand(), new ListCommand()];
     }
 
     /**
@@ -1051,12 +1051,12 @@ protected function getDefaultCommands()
      */
     protected function getDefaultHelperSet()
     {
-        return new HelperSet(array(
+        return new HelperSet([
             new FormatterHelper(),
             new DebugFormatterHelper(),
             new ProcessHelper(),
             new QuestionHelper(),
-        ));
+        ]);
     }
 
     /**
@@ -1101,9 +1101,9 @@ public function extractNamespace($name, $limit = null)
     private function findAlternatives($name, $collection)
     {
         $threshold = 1e3;
-        $alternatives = array();
+        $alternatives = [];
 
-        $collectionParts = array();
+        $collectionParts = [];
         foreach ($collection as $item) {
             $collectionParts[$item] = explode(':', $item);
         }
@@ -1172,7 +1172,7 @@ private function splitStringByWidth($string, $width)
         }
 
         $utf8String = mb_convert_encoding($string, 'utf8', $encoding);
-        $lines = array();
+        $lines = [];
         $line = '';
         foreach (preg_split('//u', $utf8String) as $char) {
             // test if $char could be appended to current line
@@ -1203,7 +1203,7 @@ private function extractAllNamespaces($name)
     {
         // -1 as third argument is needed to skip the command short name when exploding
         $parts = explode(':', $name, -1);
-        $namespaces = array();
+        $namespaces = [];
 
         foreach ($parts as $part) {
             if (\count($namespaces)) {
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index c8dcf3befef88..25c0a2baf6ad1 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -37,7 +37,7 @@ class Command
     private $application;
     private $name;
     private $processTitle;
-    private $aliases = array();
+    private $aliases = [];
     private $definition;
     private $hidden = false;
     private $help;
@@ -46,8 +46,8 @@ class Command
     private $applicationDefinitionMerged = false;
     private $applicationDefinitionMergedWithArgs = false;
     private $code;
-    private $synopsis = array();
-    private $usages = array();
+    private $synopsis = [];
+    private $usages = [];
     private $helperSet;
 
     /**
@@ -534,14 +534,14 @@ public function getProcessedHelp()
     {
         $name = $this->name;
 
-        $placeholders = array(
+        $placeholders = [
             '%command.name%',
             '%command.full_name%',
-        );
-        $replacements = array(
+        ];
+        $replacements = [
             $name,
             $_SERVER['PHP_SELF'].' '.$name,
-        );
+        ];
 
         return str_replace($placeholders, $replacements, $this->getHelp() ?: $this->getDescription());
     }
diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php
index 1e20b008aab09..23847766b6fdc 100644
--- a/src/Symfony/Component/Console/Command/HelpCommand.php
+++ b/src/Symfony/Component/Console/Command/HelpCommand.php
@@ -35,11 +35,11 @@ protected function configure()
 
         $this
             ->setName('help')
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', 'help'),
                 new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt, xml, json, or md)', 'txt'),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command help'),
-            ))
+            ])
             ->setDescription('Displays help for a command')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command displays help for a given command:
@@ -71,10 +71,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $helper = new DescriptorHelper();
-        $helper->describe($output, $this->command, array(
+        $helper->describe($output, $this->command, [
             'format' => $input->getOption('format'),
             'raw_text' => $input->getOption('raw'),
-        ));
+        ]);
 
         $this->command = null;
     }
diff --git a/src/Symfony/Component/Console/Command/ListCommand.php b/src/Symfony/Component/Console/Command/ListCommand.php
index 5d932338c6ed0..7259b1263bcd1 100644
--- a/src/Symfony/Component/Console/Command/ListCommand.php
+++ b/src/Symfony/Component/Console/Command/ListCommand.php
@@ -69,11 +69,11 @@ public function getNativeDefinition()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $helper = new DescriptorHelper();
-        $helper->describe($output, $this->getApplication(), array(
+        $helper->describe($output, $this->getApplication(), [
             'format' => $input->getOption('format'),
             'raw_text' => $input->getOption('raw'),
             'namespace' => $input->getArgument('namespace'),
-        ));
+        ]);
     }
 
     /**
@@ -81,10 +81,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
      */
     private function createDefinition()
     {
-        return new InputDefinition(array(
+        return new InputDefinition([
             new InputArgument('namespace', InputArgument::OPTIONAL, 'The namespace name'),
             new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list'),
             new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt, xml, json, or md)', 'txt'),
-        ));
+        ]);
     }
 }
diff --git a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
index 39d53ef8e37d3..d9bdab09639de 100644
--- a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
+++ b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
@@ -79,7 +79,7 @@ public function process(ContainerBuilder $container)
             unset($tags[0]);
             $lazyCommandMap[$commandName] = $id;
             $lazyCommandRefs[$id] = new TypedReference($id, $class);
-            $aliases = array();
+            $aliases = [];
 
             foreach ($tags as $tag) {
                 if (isset($tag['command'])) {
@@ -88,17 +88,17 @@ public function process(ContainerBuilder $container)
                 }
             }
 
-            $definition->addMethodCall('setName', array($commandName));
+            $definition->addMethodCall('setName', [$commandName]);
 
             if ($aliases) {
-                $definition->addMethodCall('setAliases', array($aliases));
+                $definition->addMethodCall('setAliases', [$aliases]);
             }
         }
 
         $container
             ->register($this->commandLoaderServiceId, ContainerCommandLoader::class)
             ->setPublic(true)
-            ->setArguments(array(ServiceLocatorTagPass::register($container, $lazyCommandRefs), $lazyCommandMap));
+            ->setArguments([ServiceLocatorTagPass::register($container, $lazyCommandRefs), $lazyCommandMap]);
 
         $container->setParameter('console.command.ids', $serviceIds);
         $container->setParameter('console.lazy_command.ids', $lazyServiceIds);
diff --git a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
index ef4c673b7bcf3..79a358fb32ee1 100644
--- a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
+++ b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
@@ -97,12 +97,12 @@ public function getCommand($name)
 
     private function inspectApplication()
     {
-        $this->commands = array();
-        $this->namespaces = array();
+        $this->commands = [];
+        $this->namespaces = [];
 
         $all = $this->application->all($this->namespace ? $this->application->findNamespace($this->namespace) : null);
         foreach ($this->sortCommands($all) as $namespace => $commands) {
-            $names = array();
+            $names = [];
 
             /** @var Command $command */
             foreach ($commands as $name => $command) {
@@ -119,7 +119,7 @@ private function inspectApplication()
                 $names[] = $name;
             }
 
-            $this->namespaces[$namespace] = array('id' => $namespace, 'commands' => $names);
+            $this->namespaces[$namespace] = ['id' => $namespace, 'commands' => $names];
         }
     }
 
@@ -128,8 +128,8 @@ private function inspectApplication()
      */
     private function sortCommands(array $commands)
     {
-        $namespacedCommands = array();
-        $globalCommands = array();
+        $namespacedCommands = [];
+        $globalCommands = [];
         foreach ($commands as $name => $command) {
             $key = $this->application->extractNamespace($name, 1);
             if (!$key) {
diff --git a/src/Symfony/Component/Console/Descriptor/Descriptor.php b/src/Symfony/Component/Console/Descriptor/Descriptor.php
index 151d84f72abf0..d25a708e479ee 100644
--- a/src/Symfony/Component/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Descriptor.php
@@ -34,7 +34,7 @@ abstract class Descriptor implements DescriptorInterface
     /**
      * {@inheritdoc}
      */
-    public function describe(OutputInterface $output, $object, array $options = array())
+    public function describe(OutputInterface $output, $object, array $options = [])
     {
         $this->output = $output;
 
@@ -75,33 +75,33 @@ protected function write($content, $decorated = false)
      *
      * @return string|mixed
      */
-    abstract protected function describeInputArgument(InputArgument $argument, array $options = array());
+    abstract protected function describeInputArgument(InputArgument $argument, array $options = []);
 
     /**
      * Describes an InputOption instance.
      *
      * @return string|mixed
      */
-    abstract protected function describeInputOption(InputOption $option, array $options = array());
+    abstract protected function describeInputOption(InputOption $option, array $options = []);
 
     /**
      * Describes an InputDefinition instance.
      *
      * @return string|mixed
      */
-    abstract protected function describeInputDefinition(InputDefinition $definition, array $options = array());
+    abstract protected function describeInputDefinition(InputDefinition $definition, array $options = []);
 
     /**
      * Describes a Command instance.
      *
      * @return string|mixed
      */
-    abstract protected function describeCommand(Command $command, array $options = array());
+    abstract protected function describeCommand(Command $command, array $options = []);
 
     /**
      * Describes an Application instance.
      *
      * @return string|mixed
      */
-    abstract protected function describeApplication(Application $application, array $options = array());
+    abstract protected function describeApplication(Application $application, array $options = []);
 }
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
index 5d3339a9e608a..fbc07df879aba 100644
--- a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
@@ -27,5 +27,5 @@ interface DescriptorInterface
      * @param object          $object
      * @param array           $options
      */
-    public function describe(OutputInterface $output, $object, array $options = array());
+    public function describe(OutputInterface $output, $object, array $options = []);
 }
diff --git a/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
index f60323becd88e..197b843d4b76c 100644
--- a/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
@@ -29,7 +29,7 @@ class JsonDescriptor extends Descriptor
     /**
      * {@inheritdoc}
      */
-    protected function describeInputArgument(InputArgument $argument, array $options = array())
+    protected function describeInputArgument(InputArgument $argument, array $options = [])
     {
         $this->writeData($this->getInputArgumentData($argument), $options);
     }
@@ -37,7 +37,7 @@ protected function describeInputArgument(InputArgument $argument, array $options
     /**
      * {@inheritdoc}
      */
-    protected function describeInputOption(InputOption $option, array $options = array())
+    protected function describeInputOption(InputOption $option, array $options = [])
     {
         $this->writeData($this->getInputOptionData($option), $options);
     }
@@ -45,7 +45,7 @@ protected function describeInputOption(InputOption $option, array $options = arr
     /**
      * {@inheritdoc}
      */
-    protected function describeInputDefinition(InputDefinition $definition, array $options = array())
+    protected function describeInputDefinition(InputDefinition $definition, array $options = [])
     {
         $this->writeData($this->getInputDefinitionData($definition), $options);
     }
@@ -53,7 +53,7 @@ protected function describeInputDefinition(InputDefinition $definition, array $o
     /**
      * {@inheritdoc}
      */
-    protected function describeCommand(Command $command, array $options = array())
+    protected function describeCommand(Command $command, array $options = [])
     {
         $this->writeData($this->getCommandData($command), $options);
     }
@@ -61,17 +61,17 @@ protected function describeCommand(Command $command, array $options = array())
     /**
      * {@inheritdoc}
      */
-    protected function describeApplication(Application $application, array $options = array())
+    protected function describeApplication(Application $application, array $options = [])
     {
         $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
         $description = new ApplicationDescription($application, $describedNamespace, true);
-        $commands = array();
+        $commands = [];
 
         foreach ($description->getCommands() as $command) {
             $commands[] = $this->getCommandData($command);
         }
 
-        $data = array();
+        $data = [];
         if ('UNKNOWN' !== $application->getName()) {
             $data['application']['name'] = $application->getName();
             if ('UNKNOWN' !== $application->getVersion()) {
@@ -105,13 +105,13 @@ private function writeData(array $data, array $options)
      */
     private function getInputArgumentData(InputArgument $argument)
     {
-        return array(
+        return [
             'name' => $argument->getName(),
             'is_required' => $argument->isRequired(),
             'is_array' => $argument->isArray(),
             'description' => preg_replace('/\s*[\r\n]\s*/', ' ', $argument->getDescription()),
             'default' => INF === $argument->getDefault() ? 'INF' : $argument->getDefault(),
-        );
+        ];
     }
 
     /**
@@ -119,7 +119,7 @@ private function getInputArgumentData(InputArgument $argument)
      */
     private function getInputOptionData(InputOption $option)
     {
-        return array(
+        return [
             'name' => '--'.$option->getName(),
             'shortcut' => $option->getShortcut() ? '-'.str_replace('|', '|-', $option->getShortcut()) : '',
             'accept_value' => $option->acceptValue(),
@@ -127,7 +127,7 @@ private function getInputOptionData(InputOption $option)
             'is_multiple' => $option->isArray(),
             'description' => preg_replace('/\s*[\r\n]\s*/', ' ', $option->getDescription()),
             'default' => INF === $option->getDefault() ? 'INF' : $option->getDefault(),
-        );
+        ];
     }
 
     /**
@@ -135,17 +135,17 @@ private function getInputOptionData(InputOption $option)
      */
     private function getInputDefinitionData(InputDefinition $definition)
     {
-        $inputArguments = array();
+        $inputArguments = [];
         foreach ($definition->getArguments() as $name => $argument) {
             $inputArguments[$name] = $this->getInputArgumentData($argument);
         }
 
-        $inputOptions = array();
+        $inputOptions = [];
         foreach ($definition->getOptions() as $name => $option) {
             $inputOptions[$name] = $this->getInputOptionData($option);
         }
 
-        return array('arguments' => $inputArguments, 'options' => $inputOptions);
+        return ['arguments' => $inputArguments, 'options' => $inputOptions];
     }
 
     /**
@@ -156,13 +156,13 @@ private function getCommandData(Command $command)
         $command->getSynopsis();
         $command->mergeApplicationDefinition(false);
 
-        return array(
+        return [
             'name' => $command->getName(),
-            'usage' => array_merge(array($command->getSynopsis()), $command->getUsages(), $command->getAliases()),
+            'usage' => array_merge([$command->getSynopsis()], $command->getUsages(), $command->getAliases()),
             'description' => $command->getDescription(),
             'help' => $command->getProcessedHelp(),
             'definition' => $this->getInputDefinitionData($command->getNativeDefinition()),
             'hidden' => $command->isHidden(),
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
index 6d8399f922136..e6245778f58d5 100644
--- a/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
@@ -31,7 +31,7 @@ class MarkdownDescriptor extends Descriptor
     /**
      * {@inheritdoc}
      */
-    public function describe(OutputInterface $output, $object, array $options = array())
+    public function describe(OutputInterface $output, $object, array $options = [])
     {
         $decorated = $output->isDecorated();
         $output->setDecorated(false);
@@ -52,7 +52,7 @@ protected function write($content, $decorated = true)
     /**
      * {@inheritdoc}
      */
-    protected function describeInputArgument(InputArgument $argument, array $options = array())
+    protected function describeInputArgument(InputArgument $argument, array $options = [])
     {
         $this->write(
             '#### `'.($argument->getName() ?: '<none>')."`\n\n"
@@ -66,7 +66,7 @@ protected function describeInputArgument(InputArgument $argument, array $options
     /**
      * {@inheritdoc}
      */
-    protected function describeInputOption(InputOption $option, array $options = array())
+    protected function describeInputOption(InputOption $option, array $options = [])
     {
         $name = '--'.$option->getName();
         if ($option->getShortcut()) {
@@ -86,7 +86,7 @@ protected function describeInputOption(InputOption $option, array $options = arr
     /**
      * {@inheritdoc}
      */
-    protected function describeInputDefinition(InputDefinition $definition, array $options = array())
+    protected function describeInputDefinition(InputDefinition $definition, array $options = [])
     {
         if ($showArguments = \count($definition->getArguments()) > 0) {
             $this->write('### Arguments');
@@ -112,7 +112,7 @@ protected function describeInputDefinition(InputDefinition $definition, array $o
     /**
      * {@inheritdoc}
      */
-    protected function describeCommand(Command $command, array $options = array())
+    protected function describeCommand(Command $command, array $options = [])
     {
         $command->getSynopsis();
         $command->mergeApplicationDefinition(false);
@@ -122,7 +122,7 @@ protected function describeCommand(Command $command, array $options = array())
             .str_repeat('-', Helper::strlen($command->getName()) + 2)."\n\n"
             .($command->getDescription() ? $command->getDescription()."\n\n" : '')
             .'### Usage'."\n\n"
-            .array_reduce(array_merge(array($command->getSynopsis()), $command->getAliases(), $command->getUsages()), function ($carry, $usage) {
+            .array_reduce(array_merge([$command->getSynopsis()], $command->getAliases(), $command->getUsages()), function ($carry, $usage) {
                 return $carry.'* `'.$usage.'`'."\n";
             })
         );
@@ -141,7 +141,7 @@ protected function describeCommand(Command $command, array $options = array())
     /**
      * {@inheritdoc}
      */
-    protected function describeApplication(Application $application, array $options = array())
+    protected function describeApplication(Application $application, array $options = [])
     {
         $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
         $description = new ApplicationDescription($application, $describedNamespace);
diff --git a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
index 04dd22598d6e0..94e88fcdc301c 100644
--- a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
@@ -31,7 +31,7 @@ class TextDescriptor extends Descriptor
     /**
      * {@inheritdoc}
      */
-    protected function describeInputArgument(InputArgument $argument, array $options = array())
+    protected function describeInputArgument(InputArgument $argument, array $options = [])
     {
         if (null !== $argument->getDefault() && (!\is_array($argument->getDefault()) || \count($argument->getDefault()))) {
             $default = sprintf('<comment> [default: %s]</comment>', $this->formatDefaultValue($argument->getDefault()));
@@ -54,7 +54,7 @@ protected function describeInputArgument(InputArgument $argument, array $options
     /**
      * {@inheritdoc}
      */
-    protected function describeInputOption(InputOption $option, array $options = array())
+    protected function describeInputOption(InputOption $option, array $options = [])
     {
         if ($option->acceptValue() && null !== $option->getDefault() && (!\is_array($option->getDefault()) || \count($option->getDefault()))) {
             $default = sprintf('<comment> [default: %s]</comment>', $this->formatDefaultValue($option->getDefault()));
@@ -71,7 +71,7 @@ protected function describeInputOption(InputOption $option, array $options = arr
             }
         }
 
-        $totalWidth = isset($options['total_width']) ? $options['total_width'] : $this->calculateTotalWidthForOptions(array($option));
+        $totalWidth = isset($options['total_width']) ? $options['total_width'] : $this->calculateTotalWidthForOptions([$option]);
         $synopsis = sprintf('%s%s',
             $option->getShortcut() ? sprintf('-%s, ', $option->getShortcut()) : '    ',
             sprintf('--%s%s', $option->getName(), $value)
@@ -92,7 +92,7 @@ protected function describeInputOption(InputOption $option, array $options = arr
     /**
      * {@inheritdoc}
      */
-    protected function describeInputDefinition(InputDefinition $definition, array $options = array())
+    protected function describeInputDefinition(InputDefinition $definition, array $options = [])
     {
         $totalWidth = $this->calculateTotalWidthForOptions($definition->getOptions());
         foreach ($definition->getArguments() as $argument) {
@@ -103,7 +103,7 @@ protected function describeInputDefinition(InputDefinition $definition, array $o
             $this->writeText('<comment>Arguments:</comment>', $options);
             $this->writeText("\n");
             foreach ($definition->getArguments() as $argument) {
-                $this->describeInputArgument($argument, array_merge($options, array('total_width' => $totalWidth)));
+                $this->describeInputArgument($argument, array_merge($options, ['total_width' => $totalWidth]));
                 $this->writeText("\n");
             }
         }
@@ -113,7 +113,7 @@ protected function describeInputDefinition(InputDefinition $definition, array $o
         }
 
         if ($definition->getOptions()) {
-            $laterOptions = array();
+            $laterOptions = [];
 
             $this->writeText('<comment>Options:</comment>', $options);
             foreach ($definition->getOptions() as $option) {
@@ -122,11 +122,11 @@ protected function describeInputDefinition(InputDefinition $definition, array $o
                     continue;
                 }
                 $this->writeText("\n");
-                $this->describeInputOption($option, array_merge($options, array('total_width' => $totalWidth)));
+                $this->describeInputOption($option, array_merge($options, ['total_width' => $totalWidth]));
             }
             foreach ($laterOptions as $option) {
                 $this->writeText("\n");
-                $this->describeInputOption($option, array_merge($options, array('total_width' => $totalWidth)));
+                $this->describeInputOption($option, array_merge($options, ['total_width' => $totalWidth]));
             }
         }
     }
@@ -166,7 +166,7 @@ protected function describeCommand(Command $command, array $options = array())
     /**
      * {@inheritdoc}
      */
-    protected function describeApplication(Application $application, array $options = array())
+    protected function describeApplication(Application $application, array $options = [])
     {
         $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
         $description = new ApplicationDescription($application, $describedNamespace);
@@ -242,7 +242,7 @@ protected function describeApplication(Application $application, array $options
     /**
      * {@inheritdoc}
      */
-    private function writeText($content, array $options = array())
+    private function writeText($content, array $options = [])
     {
         $this->write(
             isset($options['raw_text']) && $options['raw_text'] ? strip_tags($content) : $content,
@@ -300,7 +300,7 @@ private function formatDefaultValue($default)
      */
     private function getColumnWidth(array $commands)
     {
-        $widths = array();
+        $widths = [];
 
         foreach ($commands as $command) {
             if ($command instanceof Command) {
diff --git a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
index 1a12a1dd67b47..0cc0c9901f193 100644
--- a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
@@ -64,7 +64,7 @@ public function getCommandDocument(Command $command)
 
         $commandXML->appendChild($usagesXML = $dom->createElement('usages'));
 
-        foreach (array_merge(array($command->getSynopsis()), $command->getAliases(), $command->getUsages()) as $usage) {
+        foreach (array_merge([$command->getSynopsis()], $command->getAliases(), $command->getUsages()) as $usage) {
             $usagesXML->appendChild($dom->createElement('usage', $usage));
         }
 
@@ -130,7 +130,7 @@ public function getApplicationDocument(Application $application, $namespace = nu
     /**
      * {@inheritdoc}
      */
-    protected function describeInputArgument(InputArgument $argument, array $options = array())
+    protected function describeInputArgument(InputArgument $argument, array $options = [])
     {
         $this->writeDocument($this->getInputArgumentDocument($argument));
     }
@@ -138,7 +138,7 @@ protected function describeInputArgument(InputArgument $argument, array $options
     /**
      * {@inheritdoc}
      */
-    protected function describeInputOption(InputOption $option, array $options = array())
+    protected function describeInputOption(InputOption $option, array $options = [])
     {
         $this->writeDocument($this->getInputOptionDocument($option));
     }
@@ -146,7 +146,7 @@ protected function describeInputOption(InputOption $option, array $options = arr
     /**
      * {@inheritdoc}
      */
-    protected function describeInputDefinition(InputDefinition $definition, array $options = array())
+    protected function describeInputDefinition(InputDefinition $definition, array $options = [])
     {
         $this->writeDocument($this->getInputDefinitionDocument($definition));
     }
@@ -154,7 +154,7 @@ protected function describeInputDefinition(InputDefinition $definition, array $o
     /**
      * {@inheritdoc}
      */
-    protected function describeCommand(Command $command, array $options = array())
+    protected function describeCommand(Command $command, array $options = [])
     {
         $this->writeDocument($this->getCommandDocument($command));
     }
@@ -162,7 +162,7 @@ protected function describeCommand(Command $command, array $options = array())
     /**
      * {@inheritdoc}
      */
-    protected function describeApplication(Application $application, array $options = array())
+    protected function describeApplication(Application $application, array $options = [])
     {
         $this->writeDocument($this->getApplicationDocument($application, isset($options['namespace']) ? $options['namespace'] : null));
     }
@@ -203,7 +203,7 @@ private function getInputArgumentDocument(InputArgument $argument)
         $descriptionXML->appendChild($dom->createTextNode($argument->getDescription()));
 
         $objectXML->appendChild($defaultsXML = $dom->createElement('defaults'));
-        $defaults = \is_array($argument->getDefault()) ? $argument->getDefault() : (\is_bool($argument->getDefault()) ? array(var_export($argument->getDefault(), true)) : ($argument->getDefault() ? array($argument->getDefault()) : array()));
+        $defaults = \is_array($argument->getDefault()) ? $argument->getDefault() : (\is_bool($argument->getDefault()) ? [var_export($argument->getDefault(), true)] : ($argument->getDefault() ? [$argument->getDefault()] : []));
         foreach ($defaults as $default) {
             $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
             $defaultXML->appendChild($dom->createTextNode($default));
@@ -235,7 +235,7 @@ private function getInputOptionDocument(InputOption $option)
         $descriptionXML->appendChild($dom->createTextNode($option->getDescription()));
 
         if ($option->acceptValue()) {
-            $defaults = \is_array($option->getDefault()) ? $option->getDefault() : (\is_bool($option->getDefault()) ? array(var_export($option->getDefault(), true)) : ($option->getDefault() ? array($option->getDefault()) : array()));
+            $defaults = \is_array($option->getDefault()) ? $option->getDefault() : (\is_bool($option->getDefault()) ? [var_export($option->getDefault(), true)] : ($option->getDefault() ? [$option->getDefault()] : []));
             $objectXML->appendChild($defaultsXML = $dom->createElement('defaults'));
 
             if (!empty($defaults)) {
diff --git a/src/Symfony/Component/Console/EventListener/ErrorListener.php b/src/Symfony/Component/Console/EventListener/ErrorListener.php
index 909d6ea3a1ddb..212ad1d96ff4f 100644
--- a/src/Symfony/Component/Console/EventListener/ErrorListener.php
+++ b/src/Symfony/Component/Console/EventListener/ErrorListener.php
@@ -40,10 +40,10 @@ public function onConsoleError(ConsoleErrorEvent $event)
         $error = $event->getError();
 
         if (!$inputString = $this->getInputString($event)) {
-            return $this->logger->error('An error occurred while using the console. Message: "{message}"', array('exception' => $error, 'message' => $error->getMessage()));
+            return $this->logger->error('An error occurred while using the console. Message: "{message}"', ['exception' => $error, 'message' => $error->getMessage()]);
         }
 
-        $this->logger->error('Error thrown while running command "{command}". Message: "{message}"', array('exception' => $error, 'command' => $inputString, 'message' => $error->getMessage()));
+        $this->logger->error('Error thrown while running command "{command}". Message: "{message}"', ['exception' => $error, 'command' => $inputString, 'message' => $error->getMessage()]);
     }
 
     public function onConsoleTerminate(ConsoleTerminateEvent $event)
@@ -59,18 +59,18 @@ public function onConsoleTerminate(ConsoleTerminateEvent $event)
         }
 
         if (!$inputString = $this->getInputString($event)) {
-            return $this->logger->debug('The console exited with code "{code}"', array('code' => $exitCode));
+            return $this->logger->debug('The console exited with code "{code}"', ['code' => $exitCode]);
         }
 
-        $this->logger->debug('Command "{command}" exited with code "{code}"', array('command' => $inputString, 'code' => $exitCode));
+        $this->logger->debug('Command "{command}" exited with code "{code}"', ['command' => $inputString, 'code' => $exitCode]);
     }
 
     public static function getSubscribedEvents()
     {
-        return array(
-            ConsoleEvents::ERROR => array('onConsoleError', -128),
-            ConsoleEvents::TERMINATE => array('onConsoleTerminate', -128),
-        );
+        return [
+            ConsoleEvents::ERROR => ['onConsoleError', -128],
+            ConsoleEvents::TERMINATE => ['onConsoleTerminate', -128],
+        ];
     }
 
     private static function getInputString(ConsoleEvent $event)
@@ -80,7 +80,7 @@ private static function getInputString(ConsoleEvent $event)
 
         if (method_exists($input, '__toString')) {
             if ($commandName) {
-                return str_replace(array("'$commandName'", "\"$commandName\""), $commandName, (string) $input);
+                return str_replace(["'$commandName'", "\"$commandName\""], $commandName, (string) $input);
             }
 
             return (string) $input;
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatter.php b/src/Symfony/Component/Console/Formatter/OutputFormatter.php
index 57b95eb14035f..57476a3cf8495 100644
--- a/src/Symfony/Component/Console/Formatter/OutputFormatter.php
+++ b/src/Symfony/Component/Console/Formatter/OutputFormatter.php
@@ -21,7 +21,7 @@
 class OutputFormatter implements OutputFormatterInterface
 {
     private $decorated;
-    private $styles = array();
+    private $styles = [];
     private $styleStack;
 
     /**
@@ -169,7 +169,7 @@ public function format($message)
         $output .= $this->applyCurrentStyle(substr($message, $offset));
 
         if (false !== strpos($output, "\0")) {
-            return strtr($output, array("\0" => '\\', '\\<' => '<'));
+            return strtr($output, ["\0" => '\\', '\\<' => '<']);
         }
 
         return str_replace('\\<', '<', $output);
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
index b884d71343804..f36b30bd27777 100644
--- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
+++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
@@ -160,7 +160,7 @@ public function unsetOption($option)
      */
     public function setOptions(array $options)
     {
-        $this->options = array();
+        $this->options = [];
 
         foreach ($options as $option) {
             $this->setOption($option);
@@ -176,8 +176,8 @@ public function setOptions(array $options)
      */
     public function apply($text)
     {
-        $setCodes = array();
-        $unsetCodes = array();
+        $setCodes = [];
+        $unsetCodes = [];
 
         if (null !== $this->foreground) {
             $setCodes[] = $this->foreground['set'];
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php
index 9e7283c2f84ca..5066649912bc8 100644
--- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php
+++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php
@@ -36,7 +36,7 @@ public function __construct(OutputFormatterStyleInterface $emptyStyle = null)
      */
     public function reset()
     {
-        $this->styles = array();
+        $this->styles = [];
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Helper/DebugFormatterHelper.php b/src/Symfony/Component/Console/Helper/DebugFormatterHelper.php
index f5393edee3d9a..16d117553a1cb 100644
--- a/src/Symfony/Component/Console/Helper/DebugFormatterHelper.php
+++ b/src/Symfony/Component/Console/Helper/DebugFormatterHelper.php
@@ -20,8 +20,8 @@
  */
 class DebugFormatterHelper extends Helper
 {
-    private $colors = array('black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white', 'default');
-    private $started = array();
+    private $colors = ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white', 'default'];
+    private $started = [];
     private $count = -1;
 
     /**
@@ -35,7 +35,7 @@ class DebugFormatterHelper extends Helper
      */
     public function start($id, $message, $prefix = 'RUN')
     {
-        $this->started[$id] = array('border' => ++$this->count % \count($this->colors));
+        $this->started[$id] = ['border' => ++$this->count % \count($this->colors)];
 
         return sprintf("%s<bg=blue;fg=white> %s </> <fg=blue>%s</>\n", $this->getBorder($id), $prefix, $message);
     }
diff --git a/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
index 54d3b1afc1a45..f8a3847b49c6e 100644
--- a/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
@@ -29,7 +29,7 @@ class DescriptorHelper extends Helper
     /**
      * @var DescriptorInterface[]
      */
-    private $descriptors = array();
+    private $descriptors = [];
 
     public function __construct()
     {
@@ -54,12 +54,12 @@ public function __construct()
      *
      * @throws InvalidArgumentException when the given format is not supported
      */
-    public function describe(OutputInterface $output, $object, array $options = array())
+    public function describe(OutputInterface $output, $object, array $options = [])
     {
-        $options = array_merge(array(
+        $options = array_merge([
             'raw_text' => false,
             'format' => 'txt',
-        ), $options);
+        ], $options);
 
         if (!isset($this->descriptors[$options['format']])) {
             throw new InvalidArgumentException(sprintf('Unsupported format "%s".', $options['format']));
diff --git a/src/Symfony/Component/Console/Helper/FormatterHelper.php b/src/Symfony/Component/Console/Helper/FormatterHelper.php
index 79ab2849e51a4..4ad63856dcd5c 100644
--- a/src/Symfony/Component/Console/Helper/FormatterHelper.php
+++ b/src/Symfony/Component/Console/Helper/FormatterHelper.php
@@ -46,18 +46,18 @@ public function formatSection($section, $message, $style = 'info')
     public function formatBlock($messages, $style, $large = false)
     {
         if (!\is_array($messages)) {
-            $messages = array($messages);
+            $messages = [$messages];
         }
 
         $len = 0;
-        $lines = array();
+        $lines = [];
         foreach ($messages as $message) {
             $message = OutputFormatter::escape($message);
             $lines[] = sprintf($large ? '  %s  ' : ' %s ', $message);
             $len = max($this->strlen($message) + ($large ? 4 : 2), $len);
         }
 
-        $messages = $large ? array(str_repeat(' ', $len)) : array();
+        $messages = $large ? [str_repeat(' ', $len)] : [];
         for ($i = 0; isset($lines[$i]); ++$i) {
             $messages[] = $lines[$i].str_repeat(' ', $len - $this->strlen($lines[$i]));
         }
diff --git a/src/Symfony/Component/Console/Helper/Helper.php b/src/Symfony/Component/Console/Helper/Helper.php
index 509018552626a..0ddddf6bc5023 100644
--- a/src/Symfony/Component/Console/Helper/Helper.php
+++ b/src/Symfony/Component/Console/Helper/Helper.php
@@ -74,17 +74,17 @@ public static function substr($string, $from, $length = null)
 
     public static function formatTime($secs)
     {
-        static $timeFormats = array(
-            array(0, '< 1 sec'),
-            array(1, '1 sec'),
-            array(2, 'secs', 1),
-            array(60, '1 min'),
-            array(120, 'mins', 60),
-            array(3600, '1 hr'),
-            array(7200, 'hrs', 3600),
-            array(86400, '1 day'),
-            array(172800, 'days', 86400),
-        );
+        static $timeFormats = [
+            [0, '< 1 sec'],
+            [1, '1 sec'],
+            [2, 'secs', 1],
+            [60, '1 min'],
+            [120, 'mins', 60],
+            [3600, '1 hr'],
+            [7200, 'hrs', 3600],
+            [86400, '1 day'],
+            [172800, 'days', 86400],
+        ];
 
         foreach ($timeFormats as $index => $format) {
             if ($secs >= $format[0]) {
diff --git a/src/Symfony/Component/Console/Helper/HelperSet.php b/src/Symfony/Component/Console/Helper/HelperSet.php
index 4c44b05f562ce..c73fecd4751e3 100644
--- a/src/Symfony/Component/Console/Helper/HelperSet.php
+++ b/src/Symfony/Component/Console/Helper/HelperSet.php
@@ -24,13 +24,13 @@ class HelperSet implements \IteratorAggregate
     /**
      * @var Helper[]
      */
-    private $helpers = array();
+    private $helpers = [];
     private $command;
 
     /**
      * @param Helper[] $helpers An array of helper
      */
-    public function __construct(array $helpers = array())
+    public function __construct(array $helpers = [])
     {
         foreach ($helpers as $alias => $helper) {
             $this->set($helper, \is_int($alias) ? null : $alias);
diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php
index bea03e31ba8a0..0c4f5b71f35e4 100644
--- a/src/Symfony/Component/Console/Helper/ProgressBar.php
+++ b/src/Symfony/Component/Console/Helper/ProgressBar.php
@@ -38,7 +38,7 @@ final class ProgressBar
     private $stepWidth;
     private $percent = 0.0;
     private $formatLineCount;
-    private $messages = array();
+    private $messages = [];
     private $overwrite = true;
     private $terminal;
     private $firstRun = true;
diff --git a/src/Symfony/Component/Console/Helper/ProgressIndicator.php b/src/Symfony/Component/Console/Helper/ProgressIndicator.php
index 9de766a24689a..88e7c56937235 100644
--- a/src/Symfony/Component/Console/Helper/ProgressIndicator.php
+++ b/src/Symfony/Component/Console/Helper/ProgressIndicator.php
@@ -48,7 +48,7 @@ public function __construct(OutputInterface $output, $format = null, $indicatorC
         }
 
         if (null === $indicatorValues) {
-            $indicatorValues = array('-', '\\', '|', '/');
+            $indicatorValues = ['-', '\\', '|', '/'];
         }
 
         $indicatorValues = array_values($indicatorValues);
@@ -239,7 +239,7 @@ private function getCurrentTimeInMilliseconds()
 
     private static function initPlaceholderFormatters()
     {
-        return array(
+        return [
             'indicator' => function (ProgressIndicator $indicator) {
                 return $indicator->indicatorValues[$indicator->indicatorCurrent % \count($indicator->indicatorValues)];
             },
@@ -252,12 +252,12 @@ private static function initPlaceholderFormatters()
             'memory' => function () {
                 return Helper::formatMemory(memory_get_usage(true));
             },
-        );
+        ];
     }
 
     private static function initFormats()
     {
-        return array(
+        return [
             'normal' => ' %indicator% %message%',
             'normal_no_ansi' => ' %message%',
 
@@ -266,6 +266,6 @@ private static function initFormats()
 
             'very_verbose' => ' %indicator% %message% (%elapsed:6s%, %memory:6s%)',
             'very_verbose_no_ansi' => ' %message% (%elapsed:6s%, %memory:6s%)',
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
index bdf10f0cec405..d3188897f37c8 100644
--- a/src/Symfony/Component/Console/Helper/QuestionHelper.php
+++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -191,7 +191,7 @@ protected function writePrompt(OutputInterface $output, Question $question)
         $message = $question->getQuestion();
 
         if ($question instanceof ChoiceQuestion) {
-            $maxWidth = max(array_map(array($this, 'strlen'), array_keys($question->getChoices())));
+            $maxWidth = max(array_map([$this, 'strlen'], array_keys($question->getChoices())));
 
             $messages = (array) $question->getQuestion();
             foreach ($question->getChoices() as $key => $value) {
@@ -448,7 +448,7 @@ private function getShell()
         if (file_exists('/usr/bin/env')) {
             // handle other OSs with bash/zsh/ksh/csh if available to hide the answer
             $test = "/usr/bin/env %s -c 'echo OK' 2> /dev/null";
-            foreach (array('bash', 'zsh', 'ksh', 'csh') as $sh) {
+            foreach (['bash', 'zsh', 'ksh', 'csh'] as $sh) {
                 if ('OK' === rtrim(shell_exec(sprintf($test, $sh)))) {
                     self::$shell = $sh;
                     break;
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
index c15e5ab23c25a..e4baa13e6fd0e 100644
--- a/src/Symfony/Component/Console/Helper/Table.php
+++ b/src/Symfony/Component/Console/Helper/Table.php
@@ -27,17 +27,17 @@ class Table
     /**
      * Table headers.
      */
-    private $headers = array();
+    private $headers = [];
 
     /**
      * Table rows.
      */
-    private $rows = array();
+    private $rows = [];
 
     /**
      * Column widths cache.
      */
-    private $effectiveColumnWidths = array();
+    private $effectiveColumnWidths = [];
 
     /**
      * Number of columns cache.
@@ -199,7 +199,7 @@ public function setColumnWidth($columnIndex, $width)
      */
     public function setColumnWidths(array $widths)
     {
-        $this->columnWidths = array();
+        $this->columnWidths = [];
         foreach ($widths as $index => $width) {
             $this->setColumnWidth($index, $width);
         }
@@ -211,7 +211,7 @@ public function setHeaders(array $headers)
     {
         $headers = array_values($headers);
         if (!empty($headers) && !\is_array($headers[0])) {
-            $headers = array($headers);
+            $headers = [$headers];
         }
 
         $this->headers = $headers;
@@ -221,7 +221,7 @@ public function setHeaders(array $headers)
 
     public function setRows(array $rows)
     {
-        $this->rows = array();
+        $this->rows = [];
 
         return $this->addRows($rows);
     }
@@ -428,7 +428,7 @@ private function buildTableRows($rows)
                 $lines = explode("\n", str_replace("\n", "<fg=default;bg=default>\n</>", $cell));
                 foreach ($lines as $lineKey => $line) {
                     if ($cell instanceof TableCell) {
-                        $line = new TableCell($line, array('colspan' => $cell->getColspan()));
+                        $line = new TableCell($line, ['colspan' => $cell->getColspan()]);
                     }
                     if (0 === $lineKey) {
                         $rows[$rowKey][$column] = $line;
@@ -462,27 +462,27 @@ private function buildTableRows($rows)
      */
     private function fillNextRows(array $rows, $line)
     {
-        $unmergedRows = array();
+        $unmergedRows = [];
         foreach ($rows[$line] as $column => $cell) {
             if (null !== $cell && !$cell instanceof TableCell && !is_scalar($cell) && !(\is_object($cell) && method_exists($cell, '__toString'))) {
                 throw new InvalidArgumentException(sprintf('A cell must be a TableCell, a scalar or an object implementing __toString, %s given.', \gettype($cell)));
             }
             if ($cell instanceof TableCell && $cell->getRowspan() > 1) {
                 $nbLines = $cell->getRowspan() - 1;
-                $lines = array($cell);
+                $lines = [$cell];
                 if (strstr($cell, "\n")) {
                     $lines = explode("\n", str_replace("\n", "<fg=default;bg=default>\n</>", $cell));
                     $nbLines = \count($lines) > $nbLines ? substr_count($cell, "\n") : $nbLines;
 
-                    $rows[$line][$column] = new TableCell($lines[0], array('colspan' => $cell->getColspan()));
+                    $rows[$line][$column] = new TableCell($lines[0], ['colspan' => $cell->getColspan()]);
                     unset($lines[0]);
                 }
 
                 // create a two dimensional array (rowspan x colspan)
-                $unmergedRows = array_replace_recursive(array_fill($line + 1, $nbLines, array()), $unmergedRows);
+                $unmergedRows = array_replace_recursive(array_fill($line + 1, $nbLines, []), $unmergedRows);
                 foreach ($unmergedRows as $unmergedRowKey => $unmergedRow) {
                     $value = isset($lines[$unmergedRowKey - $line]) ? $lines[$unmergedRowKey - $line] : '';
-                    $unmergedRows[$unmergedRowKey][$column] = new TableCell($value, array('colspan' => $cell->getColspan()));
+                    $unmergedRows[$unmergedRowKey][$column] = new TableCell($value, ['colspan' => $cell->getColspan()]);
                     if ($nbLines === $unmergedRowKey - $line) {
                         break;
                     }
@@ -495,7 +495,7 @@ private function fillNextRows(array $rows, $line)
             if (isset($rows[$unmergedRowKey]) && \is_array($rows[$unmergedRowKey]) && ($this->getNumberOfColumns($rows[$unmergedRowKey]) + $this->getNumberOfColumns($unmergedRows[$unmergedRowKey]) <= $this->numberOfColumns)) {
                 foreach ($unmergedRow as $cellKey => $cell) {
                     // insert cell into row at cellKey position
-                    array_splice($rows[$unmergedRowKey], $cellKey, 0, array($cell));
+                    array_splice($rows[$unmergedRowKey], $cellKey, 0, [$cell]);
                 }
             } else {
                 $row = $this->copyRow($rows, $unmergedRowKey - 1);
@@ -504,7 +504,7 @@ private function fillNextRows(array $rows, $line)
                         $row[$column] = $unmergedRow[$column];
                     }
                 }
-                array_splice($rows, $unmergedRowKey, 0, array($row));
+                array_splice($rows, $unmergedRowKey, 0, [$row]);
             }
         }
 
@@ -518,7 +518,7 @@ private function fillNextRows(array $rows, $line)
      */
     private function fillCells($row)
     {
-        $newRow = array();
+        $newRow = [];
         foreach ($row as $column => $cell) {
             $newRow[] = $cell;
             if ($cell instanceof TableCell && $cell->getColspan() > 1) {
@@ -544,7 +544,7 @@ private function copyRow(array $rows, $line)
         foreach ($row as $cellKey => $cellValue) {
             $row[$cellKey] = '';
             if ($cellValue instanceof TableCell) {
-                $row[$cellKey] = new TableCell('', array('colspan' => $cellValue->getColspan()));
+                $row[$cellKey] = new TableCell('', ['colspan' => $cellValue->getColspan()]);
             }
         }
 
@@ -590,7 +590,7 @@ private function getRowColumns(array $row)
     private function calculateColumnsWidth(array $rows)
     {
         for ($column = 0; $column < $this->numberOfColumns; ++$column) {
-            $lengths = array();
+            $lengths = [];
             foreach ($rows as $row) {
                 if ($row instanceof TableSeparator) {
                     continue;
@@ -653,7 +653,7 @@ private function getCellWidth(array $row, $column)
      */
     private function cleanup()
     {
-        $this->effectiveColumnWidths = array();
+        $this->effectiveColumnWidths = [];
         $this->numberOfColumns = null;
     }
 
diff --git a/src/Symfony/Component/Console/Helper/TableSeparator.php b/src/Symfony/Component/Console/Helper/TableSeparator.php
index c7b8dc9c22339..e541c53156017 100644
--- a/src/Symfony/Component/Console/Helper/TableSeparator.php
+++ b/src/Symfony/Component/Console/Helper/TableSeparator.php
@@ -18,7 +18,7 @@
  */
 class TableSeparator extends TableCell
 {
-    public function __construct(array $options = array())
+    public function __construct(array $options = [])
     {
         parent::__construct('', $options);
     }
diff --git a/src/Symfony/Component/Console/Helper/TableStyle.php b/src/Symfony/Component/Console/Helper/TableStyle.php
index 0ee9dd16710c0..bc9c7e94dbbd9 100644
--- a/src/Symfony/Component/Console/Helper/TableStyle.php
+++ b/src/Symfony/Component/Console/Helper/TableStyle.php
@@ -237,7 +237,7 @@ public function getBorderFormat()
      */
     public function setPadType($padType)
     {
-        if (!\in_array($padType, array(STR_PAD_LEFT, STR_PAD_RIGHT, STR_PAD_BOTH), true)) {
+        if (!\in_array($padType, [STR_PAD_LEFT, STR_PAD_RIGHT, STR_PAD_BOTH], true)) {
             throw new InvalidArgumentException('Invalid padding type. Expected one of (STR_PAD_LEFT, STR_PAD_RIGHT, STR_PAD_BOTH).');
         }
 
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
index 516fd87fd2e62..142096ae62793 100644
--- a/src/Symfony/Component/Console/Input/ArgvInput.php
+++ b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -174,7 +174,7 @@ private function parseArgument($token)
         // if input is expecting another argument, add it
         if ($this->definition->hasArgument($c)) {
             $arg = $this->definition->getArgument($c);
-            $this->arguments[$arg->getName()] = $arg->isArray() ? array($token) : $token;
+            $this->arguments[$arg->getName()] = $arg->isArray() ? [$token] : $token;
 
         // if last argument isArray(), append token to last argument
         } elseif ($this->definition->hasArgument($c - 1) && $this->definition->getArgument($c - 1)->isArray()) {
@@ -229,11 +229,11 @@ private function addLongOption($name, $value)
             throw new RuntimeException(sprintf('The "--%s" option does not accept a value.', $name));
         }
 
-        if (\in_array($value, array('', null), true) && $option->acceptValue() && \count($this->parsed)) {
+        if (\in_array($value, ['', null], true) && $option->acceptValue() && \count($this->parsed)) {
             // if option accepts an optional or mandatory argument
             // let's see if there is one provided
             $next = array_shift($this->parsed);
-            if ((isset($next[0]) && '-' !== $next[0]) || \in_array($next, array('', null), true)) {
+            if ((isset($next[0]) && '-' !== $next[0]) || \in_array($next, ['', null], true)) {
                 $value = $next;
             } else {
                 array_unshift($this->parsed, $next);
diff --git a/src/Symfony/Component/Console/Input/ArrayInput.php b/src/Symfony/Component/Console/Input/ArrayInput.php
index 8b6917fc7c09d..72706ddbbf140 100644
--- a/src/Symfony/Component/Console/Input/ArrayInput.php
+++ b/src/Symfony/Component/Console/Input/ArrayInput.php
@@ -103,7 +103,7 @@ public function getParameterOption($values, $default = false, $onlyParams = fals
      */
     public function __toString()
     {
-        $params = array();
+        $params = [];
         foreach ($this->parameters as $param => $val) {
             if ($param && '-' === $param[0]) {
                 if (\is_array($val)) {
@@ -114,7 +114,7 @@ public function __toString()
                     $params[] = $param.('' != $val ? '='.$this->escapeToken($val) : '');
                 }
             } else {
-                $params[] = \is_array($val) ? implode(' ', array_map(array($this, 'escapeToken'), $val)) : $this->escapeToken($val);
+                $params[] = \is_array($val) ? implode(' ', array_map([$this, 'escapeToken'], $val)) : $this->escapeToken($val);
             }
         }
 
diff --git a/src/Symfony/Component/Console/Input/Input.php b/src/Symfony/Component/Console/Input/Input.php
index fa5644d1fdbaf..7a16e0ee4b9f2 100644
--- a/src/Symfony/Component/Console/Input/Input.php
+++ b/src/Symfony/Component/Console/Input/Input.php
@@ -29,8 +29,8 @@ abstract class Input implements InputInterface, StreamableInputInterface
 {
     protected $definition;
     protected $stream;
-    protected $options = array();
-    protected $arguments = array();
+    protected $options = [];
+    protected $arguments = [];
     protected $interactive = true;
 
     public function __construct(InputDefinition $definition = null)
@@ -48,8 +48,8 @@ public function __construct(InputDefinition $definition = null)
      */
     public function bind(InputDefinition $definition)
     {
-        $this->arguments = array();
-        $this->options = array();
+        $this->arguments = [];
+        $this->options = [];
         $this->definition = $definition;
 
         $this->parse();
diff --git a/src/Symfony/Component/Console/Input/InputArgument.php b/src/Symfony/Component/Console/Input/InputArgument.php
index 5b3b98ba707e0..4c2b6a66cac1d 100644
--- a/src/Symfony/Component/Console/Input/InputArgument.php
+++ b/src/Symfony/Component/Console/Input/InputArgument.php
@@ -98,7 +98,7 @@ public function setDefault($default = null)
 
         if ($this->isArray()) {
             if (null === $default) {
-                $default = array();
+                $default = [];
             } elseif (!\is_array($default)) {
                 throw new LogicException('A default value for an array argument must be an array.');
             }
diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php
index 19f8db33dac76..65860e460d087 100644
--- a/src/Symfony/Component/Console/Input/InputDefinition.php
+++ b/src/Symfony/Component/Console/Input/InputDefinition.php
@@ -38,7 +38,7 @@ class InputDefinition
     /**
      * @param array $definition An array of InputArgument and InputOption instance
      */
-    public function __construct(array $definition = array())
+    public function __construct(array $definition = [])
     {
         $this->setDefinition($definition);
     }
@@ -48,8 +48,8 @@ public function __construct(array $definition = array())
      */
     public function setDefinition(array $definition)
     {
-        $arguments = array();
-        $options = array();
+        $arguments = [];
+        $options = [];
         foreach ($definition as $item) {
             if ($item instanceof InputOption) {
                 $options[] = $item;
@@ -67,9 +67,9 @@ public function setDefinition(array $definition)
      *
      * @param InputArgument[] $arguments An array of InputArgument objects
      */
-    public function setArguments($arguments = array())
+    public function setArguments($arguments = [])
     {
-        $this->arguments = array();
+        $this->arguments = [];
         $this->requiredCount = 0;
         $this->hasOptional = false;
         $this->hasAnArrayArgument = false;
@@ -81,7 +81,7 @@ public function setArguments($arguments = array())
      *
      * @param InputArgument[] $arguments An array of InputArgument objects
      */
-    public function addArguments($arguments = array())
+    public function addArguments($arguments = [])
     {
         if (null !== $arguments) {
             foreach ($arguments as $argument) {
@@ -191,7 +191,7 @@ public function getArgumentRequiredCount()
      */
     public function getArgumentDefaults()
     {
-        $values = array();
+        $values = [];
         foreach ($this->arguments as $argument) {
             $values[$argument->getName()] = $argument->getDefault();
         }
@@ -204,10 +204,10 @@ public function getArgumentDefaults()
      *
      * @param InputOption[] $options An array of InputOption objects
      */
-    public function setOptions($options = array())
+    public function setOptions($options = [])
     {
-        $this->options = array();
-        $this->shortcuts = array();
+        $this->options = [];
+        $this->shortcuts = [];
         $this->addOptions($options);
     }
 
@@ -216,7 +216,7 @@ public function setOptions($options = array())
      *
      * @param InputOption[] $options An array of InputOption objects
      */
-    public function addOptions($options = array())
+    public function addOptions($options = [])
     {
         foreach ($options as $option) {
             $this->addOption($option);
@@ -322,7 +322,7 @@ public function getOptionForShortcut($shortcut)
      */
     public function getOptionDefaults()
     {
-        $values = array();
+        $values = [];
         foreach ($this->options as $option) {
             $values[$option->getName()] = $option->getDefault();
         }
@@ -357,7 +357,7 @@ private function shortcutToName($shortcut)
      */
     public function getSynopsis($short = false)
     {
-        $elements = array();
+        $elements = [];
 
         if ($short && $this->getOptions()) {
             $elements[] = '[options]';
diff --git a/src/Symfony/Component/Console/Input/InputOption.php b/src/Symfony/Component/Console/Input/InputOption.php
index 20c9d2ea5929b..e9cdb14fcf2e8 100644
--- a/src/Symfony/Component/Console/Input/InputOption.php
+++ b/src/Symfony/Component/Console/Input/InputOption.php
@@ -161,7 +161,7 @@ public function setDefault($default = null)
 
         if ($this->isArray()) {
             if (null === $default) {
-                $default = array();
+                $default = [];
             } elseif (!\is_array($default)) {
                 throw new LogicException('A default value for an array option must be an array.');
             }
diff --git a/src/Symfony/Component/Console/Input/StringInput.php b/src/Symfony/Component/Console/Input/StringInput.php
index eb39ad6927786..32d270faf1838 100644
--- a/src/Symfony/Component/Console/Input/StringInput.php
+++ b/src/Symfony/Component/Console/Input/StringInput.php
@@ -32,7 +32,7 @@ class StringInput extends ArgvInput
      */
     public function __construct($input)
     {
-        parent::__construct(array());
+        parent::__construct([]);
 
         $this->setTokens($this->tokenize($input));
     }
@@ -48,13 +48,13 @@ public function __construct($input)
      */
     private function tokenize($input)
     {
-        $tokens = array();
+        $tokens = [];
         $length = \strlen($input);
         $cursor = 0;
         while ($cursor < $length) {
             if (preg_match('/\s+/A', $input, $match, null, $cursor)) {
             } elseif (preg_match('/([^="\'\s]+?)(=?)('.self::REGEX_QUOTED_STRING.'+)/A', $input, $match, null, $cursor)) {
-                $tokens[] = $match[1].$match[2].stripcslashes(str_replace(array('"\'', '\'"', '\'\'', '""'), '', substr($match[3], 1, \strlen($match[3]) - 2)));
+                $tokens[] = $match[1].$match[2].stripcslashes(str_replace(['"\'', '\'"', '\'\'', '""'], '', substr($match[3], 1, \strlen($match[3]) - 2)));
             } elseif (preg_match('/'.self::REGEX_QUOTED_STRING.'/A', $input, $match, null, $cursor)) {
                 $tokens[] = stripcslashes(substr($match[0], 1, \strlen($match[0]) - 2));
             } elseif (preg_match('/'.self::REGEX_STRING.'/A', $input, $match, null, $cursor)) {
diff --git a/src/Symfony/Component/Console/Logger/ConsoleLogger.php b/src/Symfony/Component/Console/Logger/ConsoleLogger.php
index ea7f9bf250d54..e531bb1ca56ce 100644
--- a/src/Symfony/Component/Console/Logger/ConsoleLogger.php
+++ b/src/Symfony/Component/Console/Logger/ConsoleLogger.php
@@ -30,7 +30,7 @@ class ConsoleLogger extends AbstractLogger
     const ERROR = 'error';
 
     private $output;
-    private $verbosityLevelMap = array(
+    private $verbosityLevelMap = [
         LogLevel::EMERGENCY => OutputInterface::VERBOSITY_NORMAL,
         LogLevel::ALERT => OutputInterface::VERBOSITY_NORMAL,
         LogLevel::CRITICAL => OutputInterface::VERBOSITY_NORMAL,
@@ -39,8 +39,8 @@ class ConsoleLogger extends AbstractLogger
         LogLevel::NOTICE => OutputInterface::VERBOSITY_VERBOSE,
         LogLevel::INFO => OutputInterface::VERBOSITY_VERY_VERBOSE,
         LogLevel::DEBUG => OutputInterface::VERBOSITY_DEBUG,
-    );
-    private $formatLevelMap = array(
+    ];
+    private $formatLevelMap = [
         LogLevel::EMERGENCY => self::ERROR,
         LogLevel::ALERT => self::ERROR,
         LogLevel::CRITICAL => self::ERROR,
@@ -49,10 +49,10 @@ class ConsoleLogger extends AbstractLogger
         LogLevel::NOTICE => self::INFO,
         LogLevel::INFO => self::INFO,
         LogLevel::DEBUG => self::INFO,
-    );
+    ];
     private $errored = false;
 
-    public function __construct(OutputInterface $output, array $verbosityLevelMap = array(), array $formatLevelMap = array())
+    public function __construct(OutputInterface $output, array $verbosityLevelMap = [], array $formatLevelMap = [])
     {
         $this->output = $output;
         $this->verbosityLevelMap = $verbosityLevelMap + $this->verbosityLevelMap;
@@ -62,7 +62,7 @@ public function __construct(OutputInterface $output, array $verbosityLevelMap =
     /**
      * {@inheritdoc}
      */
-    public function log($level, $message, array $context = array())
+    public function log($level, $message, array $context = [])
     {
         if (!isset($this->verbosityLevelMap[$level])) {
             throw new InvalidArgumentException(sprintf('The log level "%s" does not exist.', $level));
@@ -111,7 +111,7 @@ private function interpolate($message, array $context)
             return $message;
         }
 
-        $replacements = array();
+        $replacements = [];
         foreach ($context as $key => $val) {
             if (null === $val || is_scalar($val) || (\is_object($val) && method_exists($val, '__toString'))) {
                 $replacements["{{$key}}"] = $val;
diff --git a/src/Symfony/Component/Console/Output/ConsoleOutput.php b/src/Symfony/Component/Console/Output/ConsoleOutput.php
index 3cb0fb1aeb4f3..61dc7cbdca932 100644
--- a/src/Symfony/Component/Console/Output/ConsoleOutput.php
+++ b/src/Symfony/Component/Console/Output/ConsoleOutput.php
@@ -121,11 +121,11 @@ protected function hasStderrSupport()
      */
     private function isRunningOS400()
     {
-        $checks = array(
+        $checks = [
             \function_exists('php_uname') ? php_uname('s') : '',
             getenv('OSTYPE'),
             PHP_OS,
-        );
+        ];
 
         return false !== stripos(implode(';', $checks), 'OS400');
     }
diff --git a/src/Symfony/Component/Console/Question/ChoiceQuestion.php b/src/Symfony/Component/Console/Question/ChoiceQuestion.php
index 0a45d74932522..5cb5056903e43 100644
--- a/src/Symfony/Component/Console/Question/ChoiceQuestion.php
+++ b/src/Symfony/Component/Console/Question/ChoiceQuestion.php
@@ -144,12 +144,12 @@ private function getDefaultValidator()
                 }
                 $selectedChoices = explode(',', $selectedChoices);
             } else {
-                $selectedChoices = array($selected);
+                $selectedChoices = [$selected];
             }
 
-            $multiselectChoices = array();
+            $multiselectChoices = [];
             foreach ($selectedChoices as $value) {
-                $results = array();
+                $results = [];
                 foreach ($choices as $key => $choice) {
                     if ($choice === $value) {
                         $results[] = $key;
diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
index e74ab66270a14..58e8ccb392e3b 100644
--- a/src/Symfony/Component/Console/Style/SymfonyStyle.php
+++ b/src/Symfony/Component/Console/Style/SymfonyStyle.php
@@ -63,7 +63,7 @@ public function __construct(InputInterface $input, OutputInterface $output)
      */
     public function block($messages, $type = null, $style = null, $prefix = ' ', $padding = false, $escape = true)
     {
-        $messages = \is_array($messages) ? array_values($messages) : array($messages);
+        $messages = \is_array($messages) ? array_values($messages) : [$messages];
 
         $this->autoPrependBlock();
         $this->writeln($this->createBlock($messages, $type, $style, $prefix, $padding, $escape));
@@ -76,10 +76,10 @@ public function block($messages, $type = null, $style = null, $prefix = ' ', $pa
     public function title($message)
     {
         $this->autoPrependBlock();
-        $this->writeln(array(
+        $this->writeln([
             sprintf('<comment>%s</>', OutputFormatter::escapeTrailingBackslash($message)),
             sprintf('<comment>%s</>', str_repeat('=', Helper::strlenWithoutDecoration($this->getFormatter(), $message))),
-        ));
+        ]);
         $this->newLine();
     }
 
@@ -89,10 +89,10 @@ public function title($message)
     public function section($message)
     {
         $this->autoPrependBlock();
-        $this->writeln(array(
+        $this->writeln([
             sprintf('<comment>%s</>', OutputFormatter::escapeTrailingBackslash($message)),
             sprintf('<comment>%s</>', str_repeat('-', Helper::strlenWithoutDecoration($this->getFormatter(), $message))),
-        ));
+        ]);
         $this->newLine();
     }
 
@@ -117,7 +117,7 @@ public function text($message)
     {
         $this->autoPrependText();
 
-        $messages = \is_array($message) ? array_values($message) : array($message);
+        $messages = \is_array($message) ? array_values($message) : [$message];
         foreach ($messages as $message) {
             $this->writeln(sprintf(' %s', $message));
         }
diff --git a/src/Symfony/Component/Console/Terminal.php b/src/Symfony/Component/Console/Terminal.php
index 3930ca0cdc8e2..456cca11ca8a6 100644
--- a/src/Symfony/Component/Console/Terminal.php
+++ b/src/Symfony/Component/Console/Terminal.php
@@ -91,11 +91,11 @@ private static function getConsoleMode()
             return;
         }
 
-        $descriptorspec = array(
-            1 => array('pipe', 'w'),
-            2 => array('pipe', 'w'),
-        );
-        $process = proc_open('mode CON', $descriptorspec, $pipes, null, null, array('suppress_errors' => true));
+        $descriptorspec = [
+            1 => ['pipe', 'w'],
+            2 => ['pipe', 'w'],
+        ];
+        $process = proc_open('mode CON', $descriptorspec, $pipes, null, null, ['suppress_errors' => true]);
         if (\is_resource($process)) {
             $info = stream_get_contents($pipes[1]);
             fclose($pipes[1]);
@@ -103,7 +103,7 @@ private static function getConsoleMode()
             proc_close($process);
 
             if (preg_match('/--------+\r?\n.+?(\d+)\r?\n.+?(\d+)\r?\n/', $info, $matches)) {
-                return array((int) $matches[2], (int) $matches[1]);
+                return [(int) $matches[2], (int) $matches[1]];
             }
         }
     }
@@ -119,12 +119,12 @@ private static function getSttyColumns()
             return;
         }
 
-        $descriptorspec = array(
-            1 => array('pipe', 'w'),
-            2 => array('pipe', 'w'),
-        );
+        $descriptorspec = [
+            1 => ['pipe', 'w'],
+            2 => ['pipe', 'w'],
+        ];
 
-        $process = proc_open('stty -a | grep columns', $descriptorspec, $pipes, null, null, array('suppress_errors' => true));
+        $process = proc_open('stty -a | grep columns', $descriptorspec, $pipes, null, null, ['suppress_errors' => true]);
         if (\is_resource($process)) {
             $info = stream_get_contents($pipes[1]);
             fclose($pipes[1]);
diff --git a/src/Symfony/Component/Console/Tester/ApplicationTester.php b/src/Symfony/Component/Console/Tester/ApplicationTester.php
index c0f8c7207f2a8..bcf91d640b7df 100644
--- a/src/Symfony/Component/Console/Tester/ApplicationTester.php
+++ b/src/Symfony/Component/Console/Tester/ApplicationTester.php
@@ -59,7 +59,7 @@ public function __construct(Application $application)
      *
      * @return int The command exit code
      */
-    public function run(array $input, $options = array())
+    public function run(array $input, $options = [])
     {
         $this->input = new ArrayInput($input);
         if (isset($options['interactive'])) {
diff --git a/src/Symfony/Component/Console/Tester/CommandTester.php b/src/Symfony/Component/Console/Tester/CommandTester.php
index 131ca9b160e9d..9ba6a1c31cf37 100644
--- a/src/Symfony/Component/Console/Tester/CommandTester.php
+++ b/src/Symfony/Component/Console/Tester/CommandTester.php
@@ -50,7 +50,7 @@ public function __construct(Command $command)
      *
      * @return int The command exit code
      */
-    public function execute(array $input, array $options = array())
+    public function execute(array $input, array $options = [])
     {
         // set the command name automatically if the application requires
         // this argument and no command name was passed
@@ -58,7 +58,7 @@ public function execute(array $input, array $options = array())
             && (null !== $application = $this->command->getApplication())
             && $application->getDefinition()->hasArgument('command')
         ) {
-            $input = array_merge(array('command' => $this->command->getName()), $input);
+            $input = array_merge(['command' => $this->command->getName()], $input);
         }
 
         $this->input = new ArrayInput($input);
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index 7922ce273bbd6..ba4721403c7f7 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -83,7 +83,7 @@ public function testConstructor()
         $application = new Application('foo', 'bar');
         $this->assertEquals('foo', $application->getName(), '__construct() takes the application name as its first argument');
         $this->assertEquals('bar', $application->getVersion(), '__construct() takes the application version as its second argument');
-        $this->assertEquals(array('help', 'list'), array_keys($application->all()), '__construct() registered the help and list commands by default');
+        $this->assertEquals(['help', 'list'], array_keys($application->all()), '__construct() registered the help and list commands by default');
     }
 
     public function testSetGetName()
@@ -133,9 +133,9 @@ public function testAllWithCommandLoader()
         $commands = $application->all('foo');
         $this->assertCount(1, $commands, '->all() takes a namespace as its first argument');
 
-        $application->setCommandLoader(new FactoryCommandLoader(array(
+        $application->setCommandLoader(new FactoryCommandLoader([
             'foo:bar1' => function () { return new \Foo1Command(); },
-        )));
+        ]));
         $commands = $application->all('foo');
         $this->assertCount(2, $commands, '->all() takes a namespace as its first argument');
         $this->assertInstanceOf(\FooCommand::class, $commands['foo:bar'], '->all() returns the registered commands');
@@ -157,9 +157,9 @@ public function testAdd()
         $this->assertEquals($foo, $commands['foo:bar'], '->add() registers a command');
 
         $application = new Application();
-        $application->addCommands(array($foo = new \FooCommand(), $foo1 = new \Foo1Command()));
+        $application->addCommands([$foo = new \FooCommand(), $foo1 = new \Foo1Command()]);
         $commands = $application->all();
-        $this->assertEquals(array($foo, $foo1), array($commands['foo:bar'], $commands['foo:bar1']), '->addCommands() registers an array of commands');
+        $this->assertEquals([$foo, $foo1], [$commands['foo:bar'], $commands['foo:bar1']], '->addCommands() registers an array of commands');
     }
 
     /**
@@ -205,9 +205,9 @@ public function testHasGetWithCommandLoader()
         $this->assertEquals($foo, $application->get('foo:bar'), '->get() returns a command by name');
         $this->assertEquals($foo, $application->get('afoobar'), '->get() returns a command by alias');
 
-        $application->setCommandLoader(new FactoryCommandLoader(array(
+        $application->setCommandLoader(new FactoryCommandLoader([
             'foo:bar1' => function () { return new \Foo1Command(); },
-        )));
+        ]));
 
         $this->assertTrue($application->has('afoobar'), '->has() returns true if an instance is registered for an alias even with command loader');
         $this->assertEquals($foo, $application->get('foo:bar'), '->get() returns an instance by name even with command loader');
@@ -225,7 +225,7 @@ public function testSilentHelp()
         $application->setCatchExceptions(false);
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('-h' => true, '-q' => true), array('decorated' => false));
+        $tester->run(['-h' => true, '-q' => true], ['decorated' => false]);
 
         $this->assertEmpty($tester->getDisplay(true));
     }
@@ -245,7 +245,7 @@ public function testGetNamespaces()
         $application = new Application();
         $application->add(new \FooCommand());
         $application->add(new \Foo1Command());
-        $this->assertEquals(array('foo'), $application->getNamespaces(), '->getNamespaces() returns an array of unique used namespaces');
+        $this->assertEquals(['foo'], $application->getNamespaces(), '->getNamespaces() returns an array of unique used namespaces');
     }
 
     public function testFindNamespace()
@@ -367,9 +367,9 @@ public function testFindCaseInsensitiveSuggestions()
     public function testFindWithCommandLoader()
     {
         $application = new Application();
-        $application->setCommandLoader(new FactoryCommandLoader(array(
+        $application->setCommandLoader(new FactoryCommandLoader([
             'foo:bar' => $f = function () { return new \FooCommand(); },
-        )));
+        ]));
 
         $this->assertInstanceOf('FooCommand', $application->find('foo:bar'), '->find() returns a command if its name exists');
         $this->assertInstanceOf('Symfony\Component\Console\Command\HelpCommand', $application->find('h'), '->find() returns a command if its name exists');
@@ -400,23 +400,23 @@ public function testFindWithAmbiguousAbbreviations($abbreviation, $expectedExcep
 
     public function provideAmbiguousAbbreviations()
     {
-        return array(
-            array('f', 'Command "f" is not defined.'),
-            array(
+        return [
+            ['f', 'Command "f" is not defined.'],
+            [
                 'a',
                 "Command \"a\" is ambiguous.\nDid you mean one of these?\n".
                 "    afoobar  The foo:bar command\n".
                 "    afoobar1 The foo:bar1 command\n".
                 '    afoobar2 The foo1:bar command',
-            ),
-            array(
+            ],
+            [
                 'foo:b',
                 "Command \"foo:b\" is ambiguous.\nDid you mean one of these?\n".
                 "    foo:bar  The foo:bar command\n".
                 "    foo:bar1 The foo:bar1 command\n".
                 '    foo1:bar The foo1:bar command',
-            ),
-        );
+            ],
+        ];
     }
 
     public function testFindCommandEqualNamespace()
@@ -460,10 +460,10 @@ public function testFindAlternativeExceptionMessageSingle($name)
 
     public function provideInvalidCommandNamesSingle()
     {
-        return array(
-            array('foo3:barr'),
-            array('fooo3:bar'),
-        );
+        return [
+            ['foo3:barr'],
+            ['fooo3:bar'],
+        ];
     }
 
     public function testFindAlternativeExceptionMessageMultiple()
@@ -521,7 +521,7 @@ public function testFindAlternativeCommands()
             $this->fail('->find() throws a CommandNotFoundException if command does not exist');
         } catch (\Exception $e) {
             $this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e, '->find() throws a CommandNotFoundException if command does not exist');
-            $this->assertSame(array(), $e->getAlternatives());
+            $this->assertSame([], $e->getAlternatives());
             $this->assertEquals(sprintf('Command "%s" is not defined.', $commandName), $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, without alternatives');
         }
 
@@ -532,7 +532,7 @@ public function testFindAlternativeCommands()
             $this->fail('->find() throws a CommandNotFoundException if command does not exist');
         } catch (\Exception $e) {
             $this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e, '->find() throws a CommandNotFoundException if command does not exist');
-            $this->assertSame(array('afoobar1', 'foo:bar1'), $e->getAlternatives());
+            $this->assertSame(['afoobar1', 'foo:bar1'], $e->getAlternatives());
             $this->assertRegExp(sprintf('/Command "%s" is not defined./', $commandName), $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternatives');
             $this->assertRegExp('/afoobar1/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternative : "afoobar1"');
             $this->assertRegExp('/foo:bar1/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternative : "foo:bar1"');
@@ -543,7 +543,7 @@ public function testFindAlternativeCommands()
     public function testFindAlternativeCommandsWithAnAlias()
     {
         $fooCommand = new \FooCommand();
-        $fooCommand->setAliases(array('foo2'));
+        $fooCommand->setAliases(['foo2']);
 
         $application = new Application();
         $application->add($fooCommand);
@@ -567,7 +567,7 @@ public function testFindAlternativeNamespace()
             $this->fail('->find() throws a CommandNotFoundException if namespace does not exist');
         } catch (\Exception $e) {
             $this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e, '->find() throws a CommandNotFoundException if namespace does not exist');
-            $this->assertSame(array(), $e->getAlternatives());
+            $this->assertSame([], $e->getAlternatives());
             $this->assertEquals('There are no commands defined in the "Unknown-namespace" namespace.', $e->getMessage(), '->find() throws a CommandNotFoundException if namespace does not exist, without alternatives');
         }
 
@@ -596,7 +596,7 @@ public function testFindAlternativesOutput()
         $application->add(new \Foo2Command());
         $application->add(new \Foo3Command());
 
-        $expectedAlternatives = array(
+        $expectedAlternatives = [
             'afoobar',
             'afoobar1',
             'afoobar2',
@@ -604,7 +604,7 @@ public function testFindAlternativesOutput()
             'foo3:bar',
             'foo:bar',
             'foo:bar1',
-        );
+        ];
 
         try {
             $application->find('foo');
@@ -619,10 +619,10 @@ public function testFindAlternativesOutput()
 
     public function testFindNamespaceDoesNotFailOnDeepSimilarNamespaces()
     {
-        $application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(array('getNamespaces'))->getMock();
+        $application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(['getNamespaces'])->getMock();
         $application->expects($this->once())
             ->method('getNamespaces')
-            ->will($this->returnValue(array('foo:sublong', 'bar:sub')));
+            ->will($this->returnValue(['foo:sublong', 'bar:sub']));
 
         $this->assertEquals('foo:sublong', $application->findNamespace('f:sub'));
     }
@@ -649,16 +649,16 @@ public function testSetCatchExceptions()
         $application->setCatchExceptions(true);
         $this->assertTrue($application->areExceptionsCaught());
 
-        $tester->run(array('command' => 'foo'), array('decorated' => false));
+        $tester->run(['command' => 'foo'], ['decorated' => false]);
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception1.txt', $tester->getDisplay(true), '->setCatchExceptions() sets the catch exception flag');
 
-        $tester->run(array('command' => 'foo'), array('decorated' => false, 'capture_stderr_separately' => true));
+        $tester->run(['command' => 'foo'], ['decorated' => false, 'capture_stderr_separately' => true]);
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception1.txt', $tester->getErrorOutput(true), '->setCatchExceptions() sets the catch exception flag');
         $this->assertSame('', $tester->getDisplay(true));
 
         $application->setCatchExceptions(false);
         try {
-            $tester->run(array('command' => 'foo'), array('decorated' => false));
+            $tester->run(['command' => 'foo'], ['decorated' => false]);
             $this->fail('->setCatchExceptions() sets the catch exception flag');
         } catch (\Exception $e) {
             $this->assertInstanceOf('\Exception', $e, '->setCatchExceptions() sets the catch exception flag');
@@ -682,29 +682,29 @@ public function testRenderException()
         putenv('COLUMNS=120');
         $tester = new ApplicationTester($application);
 
-        $tester->run(array('command' => 'foo'), array('decorated' => false, 'capture_stderr_separately' => true));
+        $tester->run(['command' => 'foo'], ['decorated' => false, 'capture_stderr_separately' => true]);
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception1.txt', $tester->getErrorOutput(true), '->renderException() renders a pretty exception');
 
-        $tester->run(array('command' => 'foo'), array('decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE, 'capture_stderr_separately' => true));
+        $tester->run(['command' => 'foo'], ['decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE, 'capture_stderr_separately' => true]);
         $this->assertContains('Exception trace', $tester->getErrorOutput(), '->renderException() renders a pretty exception with a stack trace when verbosity is verbose');
 
-        $tester->run(array('command' => 'list', '--foo' => true), array('decorated' => false, 'capture_stderr_separately' => true));
+        $tester->run(['command' => 'list', '--foo' => true], ['decorated' => false, 'capture_stderr_separately' => true]);
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception2.txt', $tester->getErrorOutput(true), '->renderException() renders the command synopsis when an exception occurs in the context of a command');
 
         $application->add(new \Foo3Command());
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'foo3:bar'), array('decorated' => false, 'capture_stderr_separately' => true));
+        $tester->run(['command' => 'foo3:bar'], ['decorated' => false, 'capture_stderr_separately' => true]);
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception3.txt', $tester->getErrorOutput(true), '->renderException() renders a pretty exceptions with previous exceptions');
 
-        $tester->run(array('command' => 'foo3:bar'), array('decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE));
+        $tester->run(['command' => 'foo3:bar'], ['decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE]);
         $this->assertRegExp('/\[Exception\]\s*First exception/', $tester->getDisplay(), '->renderException() renders a pretty exception without code exception when code exception is default and verbosity is verbose');
         $this->assertRegExp('/\[Exception\]\s*Second exception/', $tester->getDisplay(), '->renderException() renders a pretty exception without code exception when code exception is 0 and verbosity is verbose');
         $this->assertRegExp('/\[Exception \(404\)\]\s*Third exception/', $tester->getDisplay(), '->renderException() renders a pretty exception with code exception when code exception is 404 and verbosity is verbose');
 
-        $tester->run(array('command' => 'foo3:bar'), array('decorated' => true));
+        $tester->run(['command' => 'foo3:bar'], ['decorated' => true]);
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception3decorated.txt', $tester->getDisplay(true), '->renderException() renders a pretty exceptions with previous exceptions');
 
-        $tester->run(array('command' => 'foo3:bar'), array('decorated' => true, 'capture_stderr_separately' => true));
+        $tester->run(['command' => 'foo3:bar'], ['decorated' => true, 'capture_stderr_separately' => true]);
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception3decorated.txt', $tester->getErrorOutput(true), '->renderException() renders a pretty exceptions with previous exceptions');
 
         $application = new Application();
@@ -712,7 +712,7 @@ public function testRenderException()
         putenv('COLUMNS=32');
         $tester = new ApplicationTester($application);
 
-        $tester->run(array('command' => 'foo'), array('decorated' => false,  'capture_stderr_separately' => true));
+        $tester->run(['command' => 'foo'], ['decorated' => false,  'capture_stderr_separately' => true]);
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception4.txt', $tester->getErrorOutput(true), '->renderException() wraps messages when they are bigger than the terminal');
         putenv('COLUMNS=120');
     }
@@ -727,10 +727,10 @@ public function testRenderExceptionWithDoubleWidthCharacters()
         });
         $tester = new ApplicationTester($application);
 
-        $tester->run(array('command' => 'foo'), array('decorated' => false, 'capture_stderr_separately' => true));
+        $tester->run(['command' => 'foo'], ['decorated' => false, 'capture_stderr_separately' => true]);
         $this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_renderexception_doublewidth1.txt', $tester->getErrorOutput(true), '->renderException() renders a pretty exceptions with previous exceptions');
 
-        $tester->run(array('command' => 'foo'), array('decorated' => true, 'capture_stderr_separately' => true));
+        $tester->run(['command' => 'foo'], ['decorated' => true, 'capture_stderr_separately' => true]);
         $this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_renderexception_doublewidth1decorated.txt', $tester->getErrorOutput(true), '->renderException() renders a pretty exceptions with previous exceptions');
 
         $application = new Application();
@@ -740,7 +740,7 @@ public function testRenderExceptionWithDoubleWidthCharacters()
             throw new \Exception('コマンドの実行中にエラーが発生しました。');
         });
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'foo'), array('decorated' => false, 'capture_stderr_separately' => true));
+        $tester->run(['command' => 'foo'], ['decorated' => false, 'capture_stderr_separately' => true]);
         $this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_renderexception_doublewidth2.txt', $tester->getErrorOutput(true), '->renderException() wraps messages when they are bigger than the terminal');
         putenv('COLUMNS=120');
     }
@@ -755,14 +755,14 @@ public function testRenderExceptionEscapesLines()
         });
         $tester = new ApplicationTester($application);
 
-        $tester->run(array('command' => 'foo'), array('decorated' => false));
+        $tester->run(['command' => 'foo'], ['decorated' => false]);
         $this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_renderexception_escapeslines.txt', $tester->getDisplay(true), '->renderException() escapes lines containing formatting');
         putenv('COLUMNS=120');
     }
 
     public function testRenderExceptionLineBreaks()
     {
-        $application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(array('getTerminalWidth'))->getMock();
+        $application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(['getTerminalWidth'])->getMock();
         $application->setAutoExit(false);
         $application->expects($this->any())
             ->method('getTerminalWidth')
@@ -772,7 +772,7 @@ public function testRenderExceptionLineBreaks()
         });
         $tester = new ApplicationTester($application);
 
-        $tester->run(array('command' => 'foo'), array('decorated' => false));
+        $tester->run(['command' => 'foo'], ['decorated' => false]);
         $this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_renderexception_linebreaks.txt', $tester->getDisplay(true), '->renderException() keep multiple line breaks');
     }
 
@@ -796,7 +796,7 @@ public function testRun()
         $application->setAutoExit(false);
         $application->setCatchExceptions(false);
         $application->add($command = new \Foo1Command());
-        $_SERVER['argv'] = array('cli.php', 'foo:bar1');
+        $_SERVER['argv'] = ['cli.php', 'foo:bar1'];
 
         ob_start();
         $application->run();
@@ -812,63 +812,63 @@ public function testRun()
         $this->ensureStaticCommandHelp($application);
         $tester = new ApplicationTester($application);
 
-        $tester->run(array(), array('decorated' => false));
+        $tester->run([], ['decorated' => false]);
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_run1.txt', $tester->getDisplay(true), '->run() runs the list command if no argument is passed');
 
-        $tester->run(array('--help' => true), array('decorated' => false));
+        $tester->run(['--help' => true], ['decorated' => false]);
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_run2.txt', $tester->getDisplay(true), '->run() runs the help command if --help is passed');
 
-        $tester->run(array('-h' => true), array('decorated' => false));
+        $tester->run(['-h' => true], ['decorated' => false]);
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_run2.txt', $tester->getDisplay(true), '->run() runs the help command if -h is passed');
 
-        $tester->run(array('command' => 'list', '--help' => true), array('decorated' => false));
+        $tester->run(['command' => 'list', '--help' => true], ['decorated' => false]);
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_run3.txt', $tester->getDisplay(true), '->run() displays the help if --help is passed');
 
-        $tester->run(array('command' => 'list', '-h' => true), array('decorated' => false));
+        $tester->run(['command' => 'list', '-h' => true], ['decorated' => false]);
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_run3.txt', $tester->getDisplay(true), '->run() displays the help if -h is passed');
 
-        $tester->run(array('--ansi' => true));
+        $tester->run(['--ansi' => true]);
         $this->assertTrue($tester->getOutput()->isDecorated(), '->run() forces color output if --ansi is passed');
 
-        $tester->run(array('--no-ansi' => true));
+        $tester->run(['--no-ansi' => true]);
         $this->assertFalse($tester->getOutput()->isDecorated(), '->run() forces color output to be disabled if --no-ansi is passed');
 
-        $tester->run(array('--version' => true), array('decorated' => false));
+        $tester->run(['--version' => true], ['decorated' => false]);
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_run4.txt', $tester->getDisplay(true), '->run() displays the program version if --version is passed');
 
-        $tester->run(array('-V' => true), array('decorated' => false));
+        $tester->run(['-V' => true], ['decorated' => false]);
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_run4.txt', $tester->getDisplay(true), '->run() displays the program version if -v is passed');
 
-        $tester->run(array('command' => 'list', '--quiet' => true));
+        $tester->run(['command' => 'list', '--quiet' => true]);
         $this->assertSame('', $tester->getDisplay(), '->run() removes all output if --quiet is passed');
         $this->assertFalse($tester->getInput()->isInteractive(), '->run() sets off the interactive mode if --quiet is passed');
 
-        $tester->run(array('command' => 'list', '-q' => true));
+        $tester->run(['command' => 'list', '-q' => true]);
         $this->assertSame('', $tester->getDisplay(), '->run() removes all output if -q is passed');
         $this->assertFalse($tester->getInput()->isInteractive(), '->run() sets off the interactive mode if -q is passed');
 
-        $tester->run(array('command' => 'list', '--verbose' => true));
+        $tester->run(['command' => 'list', '--verbose' => true]);
         $this->assertSame(Output::VERBOSITY_VERBOSE, $tester->getOutput()->getVerbosity(), '->run() sets the output to verbose if --verbose is passed');
 
-        $tester->run(array('command' => 'list', '--verbose' => 1));
+        $tester->run(['command' => 'list', '--verbose' => 1]);
         $this->assertSame(Output::VERBOSITY_VERBOSE, $tester->getOutput()->getVerbosity(), '->run() sets the output to verbose if --verbose=1 is passed');
 
-        $tester->run(array('command' => 'list', '--verbose' => 2));
+        $tester->run(['command' => 'list', '--verbose' => 2]);
         $this->assertSame(Output::VERBOSITY_VERY_VERBOSE, $tester->getOutput()->getVerbosity(), '->run() sets the output to very verbose if --verbose=2 is passed');
 
-        $tester->run(array('command' => 'list', '--verbose' => 3));
+        $tester->run(['command' => 'list', '--verbose' => 3]);
         $this->assertSame(Output::VERBOSITY_DEBUG, $tester->getOutput()->getVerbosity(), '->run() sets the output to debug if --verbose=3 is passed');
 
-        $tester->run(array('command' => 'list', '--verbose' => 4));
+        $tester->run(['command' => 'list', '--verbose' => 4]);
         $this->assertSame(Output::VERBOSITY_VERBOSE, $tester->getOutput()->getVerbosity(), '->run() sets the output to verbose if unknown --verbose level is passed');
 
-        $tester->run(array('command' => 'list', '-v' => true));
+        $tester->run(['command' => 'list', '-v' => true]);
         $this->assertSame(Output::VERBOSITY_VERBOSE, $tester->getOutput()->getVerbosity(), '->run() sets the output to verbose if -v is passed');
 
-        $tester->run(array('command' => 'list', '-vv' => true));
+        $tester->run(['command' => 'list', '-vv' => true]);
         $this->assertSame(Output::VERBOSITY_VERY_VERBOSE, $tester->getOutput()->getVerbosity(), '->run() sets the output to verbose if -v is passed');
 
-        $tester->run(array('command' => 'list', '-vvv' => true));
+        $tester->run(['command' => 'list', '-vvv' => true]);
         $this->assertSame(Output::VERBOSITY_DEBUG, $tester->getOutput()->getVerbosity(), '->run() sets the output to verbose if -v is passed');
 
         $application = new Application();
@@ -877,10 +877,10 @@ public function testRun()
         $application->add(new \FooCommand());
         $tester = new ApplicationTester($application);
 
-        $tester->run(array('command' => 'foo:bar', '--no-interaction' => true), array('decorated' => false));
+        $tester->run(['command' => 'foo:bar', '--no-interaction' => true], ['decorated' => false]);
         $this->assertSame('called'.PHP_EOL, $tester->getDisplay(), '->run() does not call interact() if --no-interaction is passed');
 
-        $tester->run(array('command' => 'foo:bar', '-n' => true), array('decorated' => false));
+        $tester->run(['command' => 'foo:bar', '-n' => true], ['decorated' => false]);
         $this->assertSame('called'.PHP_EOL, $tester->getDisplay(), '->run() does not call interact() if -n is passed');
     }
 
@@ -900,12 +900,12 @@ public function testVerboseValueNotBreakArguments()
 
         $output = new StreamOutput(fopen('php://memory', 'w', false));
 
-        $input = new ArgvInput(array('cli.php', '-v', 'foo:bar'));
+        $input = new ArgvInput(['cli.php', '-v', 'foo:bar']);
         $application->run($input, $output);
 
         $this->addToAssertionCount(1);
 
-        $input = new ArgvInput(array('cli.php', '--verbose', 'foo:bar'));
+        $input = new ArgvInput(['cli.php', '--verbose', 'foo:bar']);
         $application->run($input, $output);
 
         $this->addToAssertionCount(1);
@@ -915,13 +915,13 @@ public function testRunReturnsIntegerExitCode()
     {
         $exception = new \Exception('', 4);
 
-        $application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(array('doRun'))->getMock();
+        $application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(['doRun'])->getMock();
         $application->setAutoExit(false);
         $application->expects($this->once())
             ->method('doRun')
             ->will($this->throwException($exception));
 
-        $exitCode = $application->run(new ArrayInput(array()), new NullOutput());
+        $exitCode = $application->run(new ArrayInput([]), new NullOutput());
 
         $this->assertSame(4, $exitCode, '->run() returns integer exit code extracted from raised exception');
     }
@@ -945,7 +945,7 @@ public function testRunDispatchesIntegerExitCode()
         });
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'test'));
+        $tester->run(['command' => 'test']);
 
         $this->assertTrue($passedRightValue, '-> exit code 4 was passed in the console.terminate event');
     }
@@ -954,13 +954,13 @@ public function testRunReturnsExitCodeOneForExceptionCodeZero()
     {
         $exception = new \Exception('', 0);
 
-        $application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(array('doRun'))->getMock();
+        $application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(['doRun'])->getMock();
         $application->setAutoExit(false);
         $application->expects($this->once())
             ->method('doRun')
             ->will($this->throwException($exception));
 
-        $exitCode = $application->run(new ArrayInput(array()), new NullOutput());
+        $exitCode = $application->run(new ArrayInput([]), new NullOutput());
 
         $this->assertSame(1, $exitCode, '->run() returns exit code 1 when exception code is 0');
     }
@@ -984,7 +984,7 @@ public function testRunDispatchesExitCodeOneForExceptionCodeZero()
         });
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'test'));
+        $tester->run(['command' => 'test']);
 
         $this->assertTrue($passedRightValue, '-> exit code 1 was passed in the console.terminate event');
     }
@@ -1005,12 +1005,12 @@ public function testAddingOptionWithDuplicateShortcut()
 
         $application
             ->register('foo')
-            ->setAliases(array('f'))
-            ->setDefinition(array(new InputOption('survey', 'e', InputOption::VALUE_REQUIRED, 'My option with a shortcut.')))
+            ->setAliases(['f'])
+            ->setDefinition([new InputOption('survey', 'e', InputOption::VALUE_REQUIRED, 'My option with a shortcut.')])
             ->setCode(function (InputInterface $input, OutputInterface $output) {})
         ;
 
-        $input = new ArrayInput(array('command' => 'foo'));
+        $input = new ArrayInput(['command' => 'foo']);
         $output = new NullOutput();
 
         $application->run($input, $output);
@@ -1027,22 +1027,22 @@ public function testAddingAlreadySetDefinitionElementData($def)
         $application->setCatchExceptions(false);
         $application
             ->register('foo')
-            ->setDefinition(array($def))
+            ->setDefinition([$def])
             ->setCode(function (InputInterface $input, OutputInterface $output) {})
         ;
 
-        $input = new ArrayInput(array('command' => 'foo'));
+        $input = new ArrayInput(['command' => 'foo']);
         $output = new NullOutput();
         $application->run($input, $output);
     }
 
     public function getAddingAlreadySetDefinitionElementData()
     {
-        return array(
-            array(new InputArgument('command', InputArgument::REQUIRED)),
-            array(new InputOption('quiet', '', InputOption::VALUE_NONE)),
-            array(new InputOption('query', 'q', InputOption::VALUE_NONE)),
-        );
+        return [
+            [new InputArgument('command', InputArgument::REQUIRED)],
+            [new InputOption('quiet', '', InputOption::VALUE_NONE)],
+            [new InputOption('query', 'q', InputOption::VALUE_NONE)],
+        ];
     }
 
     public function testGetDefaultHelperSetReturnsDefaultValues()
@@ -1062,7 +1062,7 @@ public function testAddingSingleHelperSetOverwritesDefaultValues()
         $application->setAutoExit(false);
         $application->setCatchExceptions(false);
 
-        $application->setHelperSet(new HelperSet(array(new FormatterHelper())));
+        $application->setHelperSet(new HelperSet([new FormatterHelper()]));
 
         $helperSet = $application->getHelperSet();
 
@@ -1079,7 +1079,7 @@ public function testOverwritingDefaultHelperSetOverwritesDefaultValues()
         $application->setAutoExit(false);
         $application->setCatchExceptions(false);
 
-        $application->setHelperSet(new HelperSet(array(new FormatterHelper())));
+        $application->setHelperSet(new HelperSet([new FormatterHelper()]));
 
         $helperSet = $application->getHelperSet();
 
@@ -1137,7 +1137,7 @@ public function testSettingCustomInputDefinitionOverwritesDefaultValues()
         $application->setAutoExit(false);
         $application->setCatchExceptions(false);
 
-        $application->setDefinition(new InputDefinition(array(new InputOption('--custom', '-c', InputOption::VALUE_NONE, 'Set the custom input definition.'))));
+        $application->setDefinition(new InputDefinition([new InputOption('--custom', '-c', InputOption::VALUE_NONE, 'Set the custom input definition.')]));
 
         $inputDefinition = $application->getDefinition();
 
@@ -1166,7 +1166,7 @@ public function testRunWithDispatcher()
         });
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'foo'));
+        $tester->run(['command' => 'foo']);
         $this->assertEquals('before.foo.after.'.PHP_EOL, $tester->getDisplay());
     }
 
@@ -1186,7 +1186,7 @@ public function testRunWithExceptionAndDispatcher()
         });
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'foo'));
+        $tester->run(['command' => 'foo']);
     }
 
     public function testRunDispatchesAllEventsWithException()
@@ -1202,7 +1202,7 @@ public function testRunDispatchesAllEventsWithException()
         });
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'foo'));
+        $tester->run(['command' => 'foo']);
         $this->assertContains('before.foo.error.after.', $tester->getDisplay());
     }
 
@@ -1222,7 +1222,7 @@ public function testRunDispatchesAllEventsWithExceptionInListener()
         });
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'foo'));
+        $tester->run(['command' => 'foo']);
         $this->assertContains('before.error.after.', $tester->getDisplay());
     }
 
@@ -1244,7 +1244,7 @@ public function testRunWithError()
         $tester = new ApplicationTester($application);
 
         try {
-            $tester->run(array('command' => 'dym'));
+            $tester->run(['command' => 'dym']);
             $this->fail('Error expected.');
         } catch (\Error $e) {
             $this->assertSame('dymerr', $e->getMessage());
@@ -1273,7 +1273,7 @@ public function testRunAllowsErrorListenersToSilenceTheException()
         });
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'foo'));
+        $tester->run(['command' => 'foo']);
         $this->assertContains('before.error.silenced.after.', $tester->getDisplay());
         $this->assertEquals(ConsoleCommandEvent::RETURN_CODE_DISABLED, $tester->getStatusCode());
     }
@@ -1292,7 +1292,7 @@ public function testConsoleErrorEventIsTriggeredOnCommandNotFound()
         $application->setAutoExit(false);
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'unknown'));
+        $tester->run(['command' => 'unknown']);
         $this->assertContains('silenced command not found', $tester->getDisplay());
         $this->assertEquals(1, $tester->getStatusCode());
     }
@@ -1341,7 +1341,7 @@ public function testErrorIsRethrownIfNotHandledByConsoleErrorEvent()
         $tester = new ApplicationTester($application);
 
         try {
-            $tester->run(array('command' => 'dym'));
+            $tester->run(['command' => 'dym']);
             $this->fail('->run() should rethrow PHP errors if not handled via ConsoleErrorEvent.');
         } catch (\Error $e) {
             $this->assertSame($e->getMessage(), 'Class \'UnknownClass\' not found');
@@ -1367,7 +1367,7 @@ public function testRunWithErrorAndDispatcher()
         });
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'dym'));
+        $tester->run(['command' => 'dym']);
         $this->assertContains('before.dym.error.after.', $tester->getDisplay(), 'The PHP Error did not dispached events');
     }
 
@@ -1387,7 +1387,7 @@ public function testRunDispatchesAllEventsWithError()
         });
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'dym'));
+        $tester->run(['command' => 'dym']);
         $this->assertContains('before.dym.error.after.', $tester->getDisplay(), 'The PHP Error did not dispached events');
     }
 
@@ -1407,7 +1407,7 @@ public function testRunWithErrorFailingStatusCode()
         });
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'dus'));
+        $tester->run(['command' => 'dus']);
         $this->assertSame(1, $tester->getStatusCode(), 'Status code should be 1');
     }
 
@@ -1422,7 +1422,7 @@ public function testRunWithDispatcherSkippingCommand()
         });
 
         $tester = new ApplicationTester($application);
-        $exitCode = $tester->run(array('command' => 'foo'));
+        $exitCode = $tester->run(['command' => 'foo']);
         $this->assertContains('before.after.', $tester->getDisplay());
         $this->assertEquals(ConsoleCommandEvent::RETURN_CODE_DISABLED, $exitCode);
     }
@@ -1449,7 +1449,7 @@ public function testRunWithDispatcherAccessingInputOptions()
         });
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'foo', '--no-interaction' => true));
+        $tester->run(['command' => 'foo', '--no-interaction' => true]);
 
         $this->assertTrue($noInteractionValue);
         $this->assertFalse($quietValue);
@@ -1479,7 +1479,7 @@ public function testRunWithDispatcherAddingInputOptions()
         });
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'foo', '--extra' => 'some test value'));
+        $tester->run(['command' => 'foo', '--extra' => 'some test value']);
 
         $this->assertEquals('some test value', $extraValue);
     }
@@ -1512,14 +1512,14 @@ public function testSetRunCustomDefaultCommand()
         $application->setDefaultCommand($command->getName());
 
         $tester = new ApplicationTester($application);
-        $tester->run(array(), array('interactive' => false));
+        $tester->run([], ['interactive' => false]);
         $this->assertEquals('called'.PHP_EOL, $tester->getDisplay(), 'Application runs the default set command if different from \'list\' command');
 
         $application = new CustomDefaultCommandApplication();
         $application->setAutoExit(false);
 
         $tester = new ApplicationTester($application);
-        $tester->run(array(), array('interactive' => false));
+        $tester->run([], ['interactive' => false]);
 
         $this->assertEquals('called'.PHP_EOL, $tester->getDisplay(), 'Application runs the default set command if different from \'list\' command');
     }
@@ -1534,7 +1534,7 @@ public function testSetRunCustomDefaultCommandWithOption()
         $application->setDefaultCommand($command->getName());
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('--fooopt' => 'opt'), array('interactive' => false));
+        $tester->run(['--fooopt' => 'opt'], ['interactive' => false]);
 
         $this->assertEquals('called'.PHP_EOL.'opt'.PHP_EOL, $tester->getDisplay(), 'Application runs the default set command if different from \'list\' command');
     }
@@ -1550,10 +1550,10 @@ public function testSetRunCustomSingleCommand()
 
         $tester = new ApplicationTester($application);
 
-        $tester->run(array());
+        $tester->run([]);
         $this->assertContains('called', $tester->getDisplay());
 
-        $tester->run(array('--help' => true));
+        $tester->run(['--help' => true]);
         $this->assertContains('The foo:bar command', $tester->getDisplay());
     }
 
@@ -1566,9 +1566,9 @@ public function testCanCheckIfTerminalIsInteractive()
         $application->setAutoExit(false);
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'help'));
+        $tester->run(['command' => 'help']);
 
-        $this->assertFalse($tester->getInput()->hasParameterOption(array('--no-interaction', '-n')));
+        $this->assertFalse($tester->getInput()->hasParameterOption(['--no-interaction', '-n']));
 
         $inputStream = $tester->getInput()->getStream();
         $this->assertEquals($tester->getInput()->isInteractive(), @posix_isatty($inputStream));
@@ -1580,9 +1580,9 @@ public function testRunLazyCommandService()
         $container->addCompilerPass(new AddConsoleCommandPass());
         $container
             ->register('lazy-command', LazyCommand::class)
-            ->addTag('console.command', array('command' => 'lazy:command'))
-            ->addTag('console.command', array('command' => 'lazy:alias'))
-            ->addTag('console.command', array('command' => 'lazy:alias2'));
+            ->addTag('console.command', ['command' => 'lazy:command'])
+            ->addTag('console.command', ['command' => 'lazy:alias'])
+            ->addTag('console.command', ['command' => 'lazy:alias2']);
         $container->compile();
 
         $application = new Application();
@@ -1591,17 +1591,17 @@ public function testRunLazyCommandService()
 
         $tester = new ApplicationTester($application);
 
-        $tester->run(array('command' => 'lazy:command'));
+        $tester->run(['command' => 'lazy:command']);
         $this->assertSame("lazy-command called\n", $tester->getDisplay(true));
 
-        $tester->run(array('command' => 'lazy:alias'));
+        $tester->run(['command' => 'lazy:alias']);
         $this->assertSame("lazy-command called\n", $tester->getDisplay(true));
 
-        $tester->run(array('command' => 'lazy:alias2'));
+        $tester->run(['command' => 'lazy:alias2']);
         $this->assertSame("lazy-command called\n", $tester->getDisplay(true));
 
         $command = $application->get('lazy:command');
-        $this->assertSame(array('lazy:alias', 'lazy:alias2'), $command->getAliases());
+        $this->assertSame(['lazy:alias', 'lazy:alias2'], $command->getAliases());
     }
 
     /**
@@ -1610,21 +1610,21 @@ public function testRunLazyCommandService()
     public function testGetDisabledLazyCommand()
     {
         $application = new Application();
-        $application->setCommandLoader(new FactoryCommandLoader(array('disabled' => function () { return new DisabledCommand(); })));
+        $application->setCommandLoader(new FactoryCommandLoader(['disabled' => function () { return new DisabledCommand(); }]));
         $application->get('disabled');
     }
 
     public function testHasReturnsFalseForDisabledLazyCommand()
     {
         $application = new Application();
-        $application->setCommandLoader(new FactoryCommandLoader(array('disabled' => function () { return new DisabledCommand(); })));
+        $application->setCommandLoader(new FactoryCommandLoader(['disabled' => function () { return new DisabledCommand(); }]));
         $this->assertFalse($application->has('disabled'));
     }
 
     public function testAllExcludesDisabledLazyCommand()
     {
         $application = new Application();
-        $application->setCommandLoader(new FactoryCommandLoader(array('disabled' => function () { return new DisabledCommand(); })));
+        $application->setCommandLoader(new FactoryCommandLoader(['disabled' => function () { return new DisabledCommand(); }]));
         $this->assertArrayNotHasKey('disabled', $application->all());
     }
 
@@ -1670,7 +1670,7 @@ public function testErrorIsRethrownIfNotHandledByConsoleErrorEventWithCatchingEn
         $tester = new ApplicationTester($application);
 
         try {
-            $tester->run(array('command' => 'dym'));
+            $tester->run(['command' => 'dym']);
             $this->fail('->run() should rethrow PHP errors if not handled via ConsoleErrorEvent.');
         } catch (\Error $e) {
             $this->assertSame($e->getMessage(), 'Class \'UnknownClass\' not found');
@@ -1694,7 +1694,7 @@ class CustomApplication extends Application
      */
     protected function getDefaultInputDefinition()
     {
-        return new InputDefinition(array(new InputOption('--custom', '-c', InputOption::VALUE_NONE, 'Set the custom input definition.')));
+        return new InputDefinition([new InputOption('--custom', '-c', InputOption::VALUE_NONE, 'Set the custom input definition.')]);
     }
 
     /**
@@ -1704,7 +1704,7 @@ protected function getDefaultInputDefinition()
      */
     protected function getDefaultHelperSet()
     {
-        return new HelperSet(array(new FormatterHelper()));
+        return new HelperSet([new FormatterHelper()]);
     }
 }
 
diff --git a/src/Symfony/Component/Console/Tests/Command/CommandTest.php b/src/Symfony/Component/Console/Tests/Command/CommandTest.php
index 6bc3f75b932a6..32af0eb0478f8 100644
--- a/src/Symfony/Component/Console/Tests/Command/CommandTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/CommandTest.php
@@ -71,7 +71,7 @@ public function testSetGetDefinition()
         $ret = $command->setDefinition($definition = new InputDefinition());
         $this->assertEquals($command, $ret, '->setDefinition() implements a fluent interface');
         $this->assertEquals($definition, $command->getDefinition(), '->setDefinition() sets the current InputDefinition instance');
-        $command->setDefinition(array(new InputArgument('foo'), new InputOption('bar')));
+        $command->setDefinition([new InputArgument('foo'), new InputOption('bar')]);
         $this->assertTrue($command->getDefinition()->hasArgument('foo'), '->setDefinition() also takes an array of InputArguments and InputOptions as an argument');
         $this->assertTrue($command->getDefinition()->hasOption('bar'), '->setDefinition() also takes an array of InputArguments and InputOptions as an argument');
         $command->setDefinition(new InputDefinition());
@@ -130,10 +130,10 @@ public function testInvalidCommandNames($name)
 
     public function provideInvalidCommandNames()
     {
-        return array(
-            array(''),
-            array('foo:'),
-        );
+        return [
+            [''],
+            ['foo:'],
+        ];
     }
 
     public function testGetSetDescription()
@@ -171,10 +171,10 @@ public function testGetProcessedHelp()
     public function testGetSetAliases()
     {
         $command = new \TestCommand();
-        $this->assertEquals(array('name'), $command->getAliases(), '->getAliases() returns the aliases');
-        $ret = $command->setAliases(array('name1'));
+        $this->assertEquals(['name'], $command->getAliases(), '->getAliases() returns the aliases');
+        $ret = $command->setAliases(['name1']);
         $this->assertEquals($command, $ret, '->setAliases() implements a fluent interface');
-        $this->assertEquals(array('name1'), $command->getAliases(), '->setAliases() sets the aliases');
+        $this->assertEquals(['name1'], $command->getAliases(), '->setAliases() sets the aliases');
     }
 
     public function testSetAliasesNull()
@@ -223,11 +223,11 @@ public function testGetHelperWithoutHelperSet()
     public function testMergeApplicationDefinition()
     {
         $application1 = new Application();
-        $application1->getDefinition()->addArguments(array(new InputArgument('foo')));
-        $application1->getDefinition()->addOptions(array(new InputOption('bar')));
+        $application1->getDefinition()->addArguments([new InputArgument('foo')]);
+        $application1->getDefinition()->addOptions([new InputOption('bar')]);
         $command = new \TestCommand();
         $command->setApplication($application1);
-        $command->setDefinition($definition = new InputDefinition(array(new InputArgument('bar'), new InputOption('foo'))));
+        $command->setDefinition($definition = new InputDefinition([new InputArgument('bar'), new InputOption('foo')]));
 
         $r = new \ReflectionObject($command);
         $m = $r->getMethod('mergeApplicationDefinition');
@@ -245,11 +245,11 @@ public function testMergeApplicationDefinition()
     public function testMergeApplicationDefinitionWithoutArgsThenWithArgsAddsArgs()
     {
         $application1 = new Application();
-        $application1->getDefinition()->addArguments(array(new InputArgument('foo')));
-        $application1->getDefinition()->addOptions(array(new InputOption('bar')));
+        $application1->getDefinition()->addArguments([new InputArgument('foo')]);
+        $application1->getDefinition()->addOptions([new InputOption('bar')]);
         $command = new \TestCommand();
         $command->setApplication($application1);
-        $command->setDefinition($definition = new InputDefinition(array()));
+        $command->setDefinition($definition = new InputDefinition([]));
 
         $r = new \ReflectionObject($command);
         $m = $r->getMethod('mergeApplicationDefinition');
@@ -269,7 +269,7 @@ public function testRunInteractive()
     {
         $tester = new CommandTester(new \TestCommand());
 
-        $tester->execute(array(), array('interactive' => true));
+        $tester->execute([], ['interactive' => true]);
 
         $this->assertEquals('interact called'.PHP_EOL.'execute called'.PHP_EOL, $tester->getDisplay(), '->run() calls the interact() method if the input is interactive');
     }
@@ -278,7 +278,7 @@ public function testRunNonInteractive()
     {
         $tester = new CommandTester(new \TestCommand());
 
-        $tester->execute(array(), array('interactive' => false));
+        $tester->execute([], ['interactive' => false]);
 
         $this->assertEquals('execute called'.PHP_EOL, $tester->getDisplay(), '->run() does not call the interact() method if the input is not interactive');
     }
@@ -301,7 +301,7 @@ public function testRunWithInvalidOption()
     {
         $command = new \TestCommand();
         $tester = new CommandTester($command);
-        $tester->execute(array('--bar' => true));
+        $tester->execute(['--bar' => true]);
     }
 
     public function testRunReturnsIntegerExitCode()
@@ -310,7 +310,7 @@ public function testRunReturnsIntegerExitCode()
         $exitCode = $command->run(new StringInput(''), new NullOutput());
         $this->assertSame(0, $exitCode, '->run() returns integer exit code (treats null as 0)');
 
-        $command = $this->getMockBuilder('TestCommand')->setMethods(array('execute'))->getMock();
+        $command = $this->getMockBuilder('TestCommand')->setMethods(['execute'])->getMock();
         $command->expects($this->once())
             ->method('execute')
             ->will($this->returnValue('2.3'));
@@ -356,16 +356,16 @@ public function testSetCode()
         });
         $this->assertEquals($command, $ret, '->setCode() implements a fluent interface');
         $tester = new CommandTester($command);
-        $tester->execute(array());
+        $tester->execute([]);
         $this->assertEquals('interact called'.PHP_EOL.'from the code...'.PHP_EOL, $tester->getDisplay());
     }
 
     public function getSetCodeBindToClosureTests()
     {
-        return array(
-            array(true, 'not bound to the command'),
-            array(false, 'bound to the command'),
-        );
+        return [
+            [true, 'not bound to the command'],
+            [false, 'bound to the command'],
+        ];
     }
 
     /**
@@ -381,7 +381,7 @@ public function testSetCodeBindToClosure($previouslyBound, $expected)
         $command = new \TestCommand();
         $command->setCode($code);
         $tester = new CommandTester($command);
-        $tester->execute(array());
+        $tester->execute([]);
         $this->assertEquals('interact called'.PHP_EOL.$expected.PHP_EOL, $tester->getDisplay());
     }
 
@@ -390,7 +390,7 @@ public function testSetCodeWithStaticClosure()
         $command = new \TestCommand();
         $command->setCode(self::createClosure());
         $tester = new CommandTester($command);
-        $tester->execute(array());
+        $tester->execute([]);
 
         if (\PHP_VERSION_ID < 70000) {
             // Cannot bind static closures in PHP 5
@@ -411,10 +411,10 @@ private static function createClosure()
     public function testSetCodeWithNonClosureCallable()
     {
         $command = new \TestCommand();
-        $ret = $command->setCode(array($this, 'callableMethodCommand'));
+        $ret = $command->setCode([$this, 'callableMethodCommand']);
         $this->assertEquals($command, $ret, '->setCode() implements a fluent interface');
         $tester = new CommandTester($command);
-        $tester->execute(array());
+        $tester->execute([]);
         $this->assertEquals('interact called'.PHP_EOL.'from the code...'.PHP_EOL, $tester->getDisplay());
     }
 
diff --git a/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php b/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
index 30fe2b6e7f8b7..ce9d8d4fe4ccb 100644
--- a/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
@@ -24,7 +24,7 @@ public function testExecuteForCommandAlias()
         $command = new HelpCommand();
         $command->setApplication(new Application());
         $commandTester = new CommandTester($command);
-        $commandTester->execute(array('command_name' => 'li'), array('decorated' => false));
+        $commandTester->execute(['command_name' => 'li'], ['decorated' => false]);
         $this->assertContains('list [options] [--] [<namespace>]', $commandTester->getDisplay(), '->execute() returns a text help for the given command alias');
         $this->assertContains('format=FORMAT', $commandTester->getDisplay(), '->execute() returns a text help for the given command alias');
         $this->assertContains('raw', $commandTester->getDisplay(), '->execute() returns a text help for the given command alias');
@@ -35,7 +35,7 @@ public function testExecuteForCommand()
         $command = new HelpCommand();
         $commandTester = new CommandTester($command);
         $command->setCommand(new ListCommand());
-        $commandTester->execute(array(), array('decorated' => false));
+        $commandTester->execute([], ['decorated' => false]);
         $this->assertContains('list [options] [--] [<namespace>]', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
         $this->assertContains('format=FORMAT', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
         $this->assertContains('raw', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
@@ -46,7 +46,7 @@ public function testExecuteForCommandWithXmlOption()
         $command = new HelpCommand();
         $commandTester = new CommandTester($command);
         $command->setCommand(new ListCommand());
-        $commandTester->execute(array('--format' => 'xml'));
+        $commandTester->execute(['--format' => 'xml']);
         $this->assertContains('<command', $commandTester->getDisplay(), '->execute() returns an XML help text if --xml is passed');
     }
 
@@ -54,7 +54,7 @@ public function testExecuteForApplicationCommand()
     {
         $application = new Application();
         $commandTester = new CommandTester($application->get('help'));
-        $commandTester->execute(array('command_name' => 'list'));
+        $commandTester->execute(['command_name' => 'list']);
         $this->assertContains('list [options] [--] [<namespace>]', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
         $this->assertContains('format=FORMAT', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
         $this->assertContains('raw', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
@@ -64,7 +64,7 @@ public function testExecuteForApplicationCommandWithXmlOption()
     {
         $application = new Application();
         $commandTester = new CommandTester($application->get('help'));
-        $commandTester->execute(array('command_name' => 'list', '--format' => 'xml'));
+        $commandTester->execute(['command_name' => 'list', '--format' => 'xml']);
         $this->assertContains('list [--raw] [--format FORMAT] [--] [&lt;namespace&gt;]', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
         $this->assertContains('<command', $commandTester->getDisplay(), '->execute() returns an XML help text if --format=xml is passed');
     }
diff --git a/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php b/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php
index b39f7ec5454ec..57687d4c60342 100644
--- a/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php
@@ -21,7 +21,7 @@ public function testExecuteListsCommands()
     {
         $application = new Application();
         $commandTester = new CommandTester($command = $application->get('list'));
-        $commandTester->execute(array('command' => $command->getName()), array('decorated' => false));
+        $commandTester->execute(['command' => $command->getName()], ['decorated' => false]);
 
         $this->assertRegExp('/help\s{2,}Displays help for a command/', $commandTester->getDisplay(), '->execute() returns a list of available commands');
     }
@@ -30,7 +30,7 @@ public function testExecuteListsCommandsWithXmlOption()
     {
         $application = new Application();
         $commandTester = new CommandTester($command = $application->get('list'));
-        $commandTester->execute(array('command' => $command->getName(), '--format' => 'xml'));
+        $commandTester->execute(['command' => $command->getName(), '--format' => 'xml']);
         $this->assertRegExp('/<command id="list" name="list" hidden="0">/', $commandTester->getDisplay(), '->execute() returns a list of available commands in XML if --xml is passed');
     }
 
@@ -38,7 +38,7 @@ public function testExecuteListsCommandsWithRawOption()
     {
         $application = new Application();
         $commandTester = new CommandTester($command = $application->get('list'));
-        $commandTester->execute(array('command' => $command->getName(), '--raw' => true));
+        $commandTester->execute(['command' => $command->getName(), '--raw' => true]);
         $output = <<<'EOF'
 help   Displays help for a command
 list   Lists commands
@@ -54,7 +54,7 @@ public function testExecuteListsCommandsWithNamespaceArgument()
         $application = new Application();
         $application->add(new \FooCommand());
         $commandTester = new CommandTester($command = $application->get('list'));
-        $commandTester->execute(array('command' => $command->getName(), 'namespace' => 'foo', '--raw' => true));
+        $commandTester->execute(['command' => $command->getName(), 'namespace' => 'foo', '--raw' => true]);
         $output = <<<'EOF'
 foo:bar   The foo:bar command
 
@@ -69,7 +69,7 @@ public function testExecuteListsCommandsOrder()
         $application = new Application();
         $application->add(new \Foo6Command());
         $commandTester = new CommandTester($command = $application->get('list'));
-        $commandTester->execute(array('command' => $command->getName()), array('decorated' => false));
+        $commandTester->execute(['command' => $command->getName()], ['decorated' => false]);
         $output = <<<'EOF'
 Console Tool
 
@@ -101,7 +101,7 @@ public function testExecuteListsCommandsOrderRaw()
         $application = new Application();
         $application->add(new \Foo6Command());
         $commandTester = new CommandTester($command = $application->get('list'));
-        $commandTester->execute(array('command' => $command->getName(), '--raw' => true));
+        $commandTester->execute(['command' => $command->getName(), '--raw' => true]);
         $output = <<<'EOF'
 help       Displays help for a command
 list       Lists commands
diff --git a/src/Symfony/Component/Console/Tests/Command/LockableTraitTest.php b/src/Symfony/Component/Console/Tests/Command/LockableTraitTest.php
index a622d1b4895f5..6a72706ee457f 100644
--- a/src/Symfony/Component/Console/Tests/Command/LockableTraitTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/LockableTraitTest.php
@@ -33,8 +33,8 @@ public function testLockIsReleased()
         $command = new \FooLockCommand();
 
         $tester = new CommandTester($command);
-        $this->assertSame(2, $tester->execute(array()));
-        $this->assertSame(2, $tester->execute(array()));
+        $this->assertSame(2, $tester->execute([]));
+        $this->assertSame(2, $tester->execute([]));
     }
 
     public function testLockReturnsFalseIfAlreadyLockedByAnotherCommand()
@@ -51,10 +51,10 @@ public function testLockReturnsFalseIfAlreadyLockedByAnotherCommand()
         $lock->acquire();
 
         $tester = new CommandTester($command);
-        $this->assertSame(1, $tester->execute(array()));
+        $this->assertSame(1, $tester->execute([]));
 
         $lock->release();
-        $this->assertSame(2, $tester->execute(array()));
+        $this->assertSame(2, $tester->execute([]));
     }
 
     public function testMultipleLockCallsThrowLogicException()
@@ -62,6 +62,6 @@ public function testMultipleLockCallsThrowLogicException()
         $command = new \FooLock2Command();
 
         $tester = new CommandTester($command);
-        $this->assertSame(1, $tester->execute(array()));
+        $this->assertSame(1, $tester->execute([]));
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/CommandLoader/ContainerCommandLoaderTest.php b/src/Symfony/Component/Console/Tests/CommandLoader/ContainerCommandLoaderTest.php
index 78eefd24f1b3d..18d6e77bfba42 100644
--- a/src/Symfony/Component/Console/Tests/CommandLoader/ContainerCommandLoaderTest.php
+++ b/src/Symfony/Component/Console/Tests/CommandLoader/ContainerCommandLoaderTest.php
@@ -20,10 +20,10 @@ class ContainerCommandLoaderTest extends TestCase
 {
     public function testHas()
     {
-        $loader = new ContainerCommandLoader(new ServiceLocator(array(
+        $loader = new ContainerCommandLoader(new ServiceLocator([
             'foo-service' => function () { return new Command('foo'); },
             'bar-service' => function () { return new Command('bar'); },
-        )), array('foo' => 'foo-service', 'bar' => 'bar-service'));
+        ]), ['foo' => 'foo-service', 'bar' => 'bar-service']);
 
         $this->assertTrue($loader->has('foo'));
         $this->assertTrue($loader->has('bar'));
@@ -32,10 +32,10 @@ public function testHas()
 
     public function testGet()
     {
-        $loader = new ContainerCommandLoader(new ServiceLocator(array(
+        $loader = new ContainerCommandLoader(new ServiceLocator([
             'foo-service' => function () { return new Command('foo'); },
             'bar-service' => function () { return new Command('bar'); },
-        )), array('foo' => 'foo-service', 'bar' => 'bar-service'));
+        ]), ['foo' => 'foo-service', 'bar' => 'bar-service']);
 
         $this->assertInstanceOf(Command::class, $loader->get('foo'));
         $this->assertInstanceOf(Command::class, $loader->get('bar'));
@@ -46,16 +46,16 @@ public function testGet()
      */
     public function testGetUnknownCommandThrows()
     {
-        (new ContainerCommandLoader(new ServiceLocator(array()), array()))->get('unknown');
+        (new ContainerCommandLoader(new ServiceLocator([]), []))->get('unknown');
     }
 
     public function testGetCommandNames()
     {
-        $loader = new ContainerCommandLoader(new ServiceLocator(array(
+        $loader = new ContainerCommandLoader(new ServiceLocator([
             'foo-service' => function () { return new Command('foo'); },
             'bar-service' => function () { return new Command('bar'); },
-        )), array('foo' => 'foo-service', 'bar' => 'bar-service'));
+        ]), ['foo' => 'foo-service', 'bar' => 'bar-service']);
 
-        $this->assertSame(array('foo', 'bar'), $loader->getNames());
+        $this->assertSame(['foo', 'bar'], $loader->getNames());
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/CommandLoader/FactoryCommandLoaderTest.php b/src/Symfony/Component/Console/Tests/CommandLoader/FactoryCommandLoaderTest.php
index 5ee6cd1ec36fd..7b9ec837e624f 100644
--- a/src/Symfony/Component/Console/Tests/CommandLoader/FactoryCommandLoaderTest.php
+++ b/src/Symfony/Component/Console/Tests/CommandLoader/FactoryCommandLoaderTest.php
@@ -19,10 +19,10 @@ class FactoryCommandLoaderTest extends TestCase
 {
     public function testHas()
     {
-        $loader = new FactoryCommandLoader(array(
+        $loader = new FactoryCommandLoader([
             'foo' => function () { return new Command('foo'); },
             'bar' => function () { return new Command('bar'); },
-        ));
+        ]);
 
         $this->assertTrue($loader->has('foo'));
         $this->assertTrue($loader->has('bar'));
@@ -31,10 +31,10 @@ public function testHas()
 
     public function testGet()
     {
-        $loader = new FactoryCommandLoader(array(
+        $loader = new FactoryCommandLoader([
             'foo' => function () { return new Command('foo'); },
             'bar' => function () { return new Command('bar'); },
-        ));
+        ]);
 
         $this->assertInstanceOf(Command::class, $loader->get('foo'));
         $this->assertInstanceOf(Command::class, $loader->get('bar'));
@@ -45,16 +45,16 @@ public function testGet()
      */
     public function testGetUnknownCommandThrows()
     {
-        (new FactoryCommandLoader(array()))->get('unknown');
+        (new FactoryCommandLoader([]))->get('unknown');
     }
 
     public function testGetCommandNames()
     {
-        $loader = new FactoryCommandLoader(array(
+        $loader = new FactoryCommandLoader([
             'foo' => function () { return new Command('foo'); },
             'bar' => function () { return new Command('bar'); },
-        ));
+        ]);
 
-        $this->assertSame(array('foo', 'bar'), $loader->getNames());
+        $this->assertSame(['foo', 'bar'], $loader->getNames());
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php b/src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
index 67fbb98643f1e..4f1dd0f163b90 100644
--- a/src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
+++ b/src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
@@ -63,8 +63,8 @@ public function testProcessRegistersLazyCommands()
         $command = $container
             ->register('my-command', MyCommand::class)
             ->setPublic(false)
-            ->addTag('console.command', array('command' => 'my:command'))
-            ->addTag('console.command', array('command' => 'my:alias'))
+            ->addTag('console.command', ['command' => 'my:command'])
+            ->addTag('console.command', ['command' => 'my:alias'])
         ;
 
         (new AddConsoleCommandPass())->process($container);
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
index 3686e7543b6bb..320a4fb9f46b6 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
@@ -89,19 +89,19 @@ abstract protected function getFormat();
 
     protected function getDescriptionTestData(array $objects)
     {
-        $data = array();
+        $data = [];
         foreach ($objects as $name => $object) {
             $description = file_get_contents(sprintf('%s/../Fixtures/%s.%s', __DIR__, $name, $this->getFormat()));
-            $data[] = array($object, $description);
+            $data[] = [$object, $description];
         }
 
         return $data;
     }
 
-    protected function assertDescription($expectedDescription, $describedObject, array $options = array())
+    protected function assertDescription($expectedDescription, $describedObject, array $options = [])
     {
         $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true);
-        $this->getDescriptor()->describe($output, $describedObject, $options + array('raw_output' => true));
+        $this->getDescriptor()->describe($output, $describedObject, $options + ['raw_output' => true]);
         $this->assertEquals(trim($expectedDescription), trim(str_replace(PHP_EOL, "\n", $output->fetch())));
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php
index dffcaf6648cef..fb596b8d7adaf 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php
@@ -26,10 +26,10 @@ protected function getFormat()
         return 'json';
     }
 
-    protected function assertDescription($expectedDescription, $describedObject, array $options = array())
+    protected function assertDescription($expectedDescription, $describedObject, array $options = [])
     {
         $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true);
-        $this->getDescriptor()->describe($output, $describedObject, $options + array('raw_output' => true));
+        $this->getDescriptor()->describe($output, $describedObject, $options + ['raw_output' => true]);
         $this->assertEquals(json_decode(trim($expectedDescription), true), json_decode(trim(str_replace(PHP_EOL, "\n", $output->fetch())), true));
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php
index eb80f58b1cc58..a8f11cb4aeb46 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php
@@ -21,7 +21,7 @@ public function getDescribeCommandTestData()
     {
         return $this->getDescriptionTestData(array_merge(
             ObjectsProvider::getCommands(),
-            array('command_mbstring' => new DescriptorCommandMbString())
+            ['command_mbstring' => new DescriptorCommandMbString()]
         ));
     }
 
@@ -29,7 +29,7 @@ public function getDescribeApplicationTestData()
     {
         return $this->getDescriptionTestData(array_merge(
             ObjectsProvider::getApplications(),
-            array('application_mbstring' => new DescriptorApplicationMbString())
+            ['application_mbstring' => new DescriptorApplicationMbString()]
         ));
     }
 
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php b/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php
index b4f34ada19ec6..d46d6f18baad8 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php
@@ -26,57 +26,57 @@ class ObjectsProvider
 {
     public static function getInputArguments()
     {
-        return array(
+        return [
             'input_argument_1' => new InputArgument('argument_name', InputArgument::REQUIRED),
             'input_argument_2' => new InputArgument('argument_name', InputArgument::IS_ARRAY, 'argument description'),
             'input_argument_3' => new InputArgument('argument_name', InputArgument::OPTIONAL, 'argument description', 'default_value'),
             'input_argument_4' => new InputArgument('argument_name', InputArgument::REQUIRED, "multiline\nargument description"),
             'input_argument_with_style' => new InputArgument('argument_name', InputArgument::OPTIONAL, 'argument description', '<comment>style</>'),
             'input_argument_with_default_inf_value' => new InputArgument('argument_name', InputArgument::OPTIONAL, 'argument description', INF),
-        );
+        ];
     }
 
     public static function getInputOptions()
     {
-        return array(
+        return [
             'input_option_1' => new InputOption('option_name', 'o', InputOption::VALUE_NONE),
             'input_option_2' => new InputOption('option_name', 'o', InputOption::VALUE_OPTIONAL, 'option description', 'default_value'),
             'input_option_3' => new InputOption('option_name', 'o', InputOption::VALUE_REQUIRED, 'option description'),
-            'input_option_4' => new InputOption('option_name', 'o', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL, 'option description', array()),
+            'input_option_4' => new InputOption('option_name', 'o', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL, 'option description', []),
             'input_option_5' => new InputOption('option_name', 'o', InputOption::VALUE_REQUIRED, "multiline\noption description"),
-            'input_option_6' => new InputOption('option_name', array('o', 'O'), InputOption::VALUE_REQUIRED, 'option with multiple shortcuts'),
+            'input_option_6' => new InputOption('option_name', ['o', 'O'], InputOption::VALUE_REQUIRED, 'option with multiple shortcuts'),
             'input_option_with_style' => new InputOption('option_name', 'o', InputOption::VALUE_REQUIRED, 'option description', '<comment>style</>'),
-            'input_option_with_style_array' => new InputOption('option_name', 'o', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'option description', array('<comment>Hello</comment>', '<info>world</info>')),
+            'input_option_with_style_array' => new InputOption('option_name', 'o', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'option description', ['<comment>Hello</comment>', '<info>world</info>']),
             'input_option_with_default_inf_value' => new InputOption('option_name', 'o', InputOption::VALUE_OPTIONAL, 'option description', INF),
-        );
+        ];
     }
 
     public static function getInputDefinitions()
     {
-        return array(
+        return [
             'input_definition_1' => new InputDefinition(),
-            'input_definition_2' => new InputDefinition(array(new InputArgument('argument_name', InputArgument::REQUIRED))),
-            'input_definition_3' => new InputDefinition(array(new InputOption('option_name', 'o', InputOption::VALUE_NONE))),
-            'input_definition_4' => new InputDefinition(array(
+            'input_definition_2' => new InputDefinition([new InputArgument('argument_name', InputArgument::REQUIRED)]),
+            'input_definition_3' => new InputDefinition([new InputOption('option_name', 'o', InputOption::VALUE_NONE)]),
+            'input_definition_4' => new InputDefinition([
                 new InputArgument('argument_name', InputArgument::REQUIRED),
                 new InputOption('option_name', 'o', InputOption::VALUE_NONE),
-            )),
-        );
+            ]),
+        ];
     }
 
     public static function getCommands()
     {
-        return array(
+        return [
             'command_1' => new DescriptorCommand1(),
             'command_2' => new DescriptorCommand2(),
-        );
+        ];
     }
 
     public static function getApplications()
     {
-        return array(
+        return [
             'application_1' => new DescriptorApplication1(),
             'application_2' => new DescriptorApplication2(),
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php
index c024a522efad9..26bbd907a73dd 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php
@@ -22,7 +22,7 @@ public function getDescribeCommandTestData()
     {
         return $this->getDescriptionTestData(array_merge(
             ObjectsProvider::getCommands(),
-            array('command_mbstring' => new DescriptorCommandMbString())
+            ['command_mbstring' => new DescriptorCommandMbString()]
         ));
     }
 
@@ -30,7 +30,7 @@ public function getDescribeApplicationTestData()
     {
         return $this->getDescriptionTestData(array_merge(
             ObjectsProvider::getApplications(),
-            array('application_mbstring' => new DescriptorApplicationMbString())
+            ['application_mbstring' => new DescriptorApplicationMbString()]
         ));
     }
 
@@ -38,7 +38,7 @@ public function testDescribeApplicationWithFilteredNamespace()
     {
         $application = new DescriptorApplication2();
 
-        $this->assertDescription(file_get_contents(__DIR__.'/../Fixtures/application_filtered_namespace.txt'), $application, array('namespace' => 'command4'));
+        $this->assertDescription(file_get_contents(__DIR__.'/../Fixtures/application_filtered_namespace.txt'), $application, ['namespace' => 'command4']);
     }
 
     protected function getDescriptor()
diff --git a/src/Symfony/Component/Console/Tests/EventListener/ErrorListenerTest.php b/src/Symfony/Component/Console/Tests/EventListener/ErrorListenerTest.php
index b3f3fb4546d80..39766db3d8059 100644
--- a/src/Symfony/Component/Console/Tests/EventListener/ErrorListenerTest.php
+++ b/src/Symfony/Component/Console/Tests/EventListener/ErrorListenerTest.php
@@ -34,11 +34,11 @@ public function testOnConsoleError()
         $logger
             ->expects($this->once())
             ->method('error')
-            ->with('Error thrown while running command "{command}". Message: "{message}"', array('exception' => $error, 'command' => 'test:run --foo=baz buzz', 'message' => 'An error occurred'))
+            ->with('Error thrown while running command "{command}". Message: "{message}"', ['exception' => $error, 'command' => 'test:run --foo=baz buzz', 'message' => 'An error occurred'])
         ;
 
         $listener = new ErrorListener($logger);
-        $listener->onConsoleError(new ConsoleErrorEvent(new ArgvInput(array('console.php', 'test:run', '--foo=baz', 'buzz')), $this->getOutput(), $error, new Command('test:run')));
+        $listener->onConsoleError(new ConsoleErrorEvent(new ArgvInput(['console.php', 'test:run', '--foo=baz', 'buzz']), $this->getOutput(), $error, new Command('test:run')));
     }
 
     public function testOnConsoleErrorWithNoCommandAndNoInputString()
@@ -49,7 +49,7 @@ public function testOnConsoleErrorWithNoCommandAndNoInputString()
         $logger
             ->expects($this->once())
             ->method('error')
-            ->with('An error occurred while using the console. Message: "{message}"', array('exception' => $error, 'message' => 'An error occurred'))
+            ->with('An error occurred while using the console. Message: "{message}"', ['exception' => $error, 'message' => 'An error occurred'])
         ;
 
         $listener = new ErrorListener($logger);
@@ -62,11 +62,11 @@ public function testOnConsoleTerminateForNonZeroExitCodeWritesToLog()
         $logger
             ->expects($this->once())
             ->method('debug')
-            ->with('Command "{command}" exited with code "{code}"', array('command' => 'test:run', 'code' => 255))
+            ->with('Command "{command}" exited with code "{code}"', ['command' => 'test:run', 'code' => 255])
         ;
 
         $listener = new ErrorListener($logger);
-        $listener->onConsoleTerminate($this->getConsoleTerminateEvent(new ArgvInput(array('console.php', 'test:run')), 255));
+        $listener->onConsoleTerminate($this->getConsoleTerminateEvent(new ArgvInput(['console.php', 'test:run']), 255));
     }
 
     public function testOnConsoleTerminateForZeroExitCodeDoesNotWriteToLog()
@@ -78,16 +78,16 @@ public function testOnConsoleTerminateForZeroExitCodeDoesNotWriteToLog()
         ;
 
         $listener = new ErrorListener($logger);
-        $listener->onConsoleTerminate($this->getConsoleTerminateEvent(new ArgvInput(array('console.php', 'test:run')), 0));
+        $listener->onConsoleTerminate($this->getConsoleTerminateEvent(new ArgvInput(['console.php', 'test:run']), 0));
     }
 
     public function testGetSubscribedEvents()
     {
         $this->assertEquals(
-            array(
-                'console.error' => array('onConsoleError', -128),
-                'console.terminate' => array('onConsoleTerminate', -128),
-            ),
+            [
+                'console.error' => ['onConsoleError', -128],
+                'console.terminate' => ['onConsoleTerminate', -128],
+            ],
             ErrorListener::getSubscribedEvents()
         );
     }
@@ -98,12 +98,12 @@ public function testAllKindsOfInputCanBeLogged()
         $logger
             ->expects($this->exactly(3))
             ->method('debug')
-            ->with('Command "{command}" exited with code "{code}"', array('command' => 'test:run --foo=bar', 'code' => 255))
+            ->with('Command "{command}" exited with code "{code}"', ['command' => 'test:run --foo=bar', 'code' => 255])
         ;
 
         $listener = new ErrorListener($logger);
-        $listener->onConsoleTerminate($this->getConsoleTerminateEvent(new ArgvInput(array('console.php', 'test:run', '--foo=bar')), 255));
-        $listener->onConsoleTerminate($this->getConsoleTerminateEvent(new ArrayInput(array('name' => 'test:run', '--foo' => 'bar')), 255));
+        $listener->onConsoleTerminate($this->getConsoleTerminateEvent(new ArgvInput(['console.php', 'test:run', '--foo=bar']), 255));
+        $listener->onConsoleTerminate($this->getConsoleTerminateEvent(new ArrayInput(['name' => 'test:run', '--foo' => 'bar']), 255));
         $listener->onConsoleTerminate($this->getConsoleTerminateEvent(new StringInput('test:run --foo=bar'), 255));
     }
 
@@ -113,7 +113,7 @@ public function testCommandNameIsDisplayedForNonStringableInput()
         $logger
             ->expects($this->once())
             ->method('debug')
-            ->with('Command "{command}" exited with code "{code}"', array('command' => 'test:run', 'code' => 255))
+            ->with('Command "{command}" exited with code "{code}"', ['command' => 'test:run', 'code' => 255])
         ;
 
         $listener = new ErrorListener($logger);
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand1.php b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand1.php
index ede05d7a73c0f..14bb20486e8d5 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand1.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand1.php
@@ -19,7 +19,7 @@ protected function configure()
     {
         $this
             ->setName('descriptor:command1')
-            ->setAliases(array('alias1', 'alias2'))
+            ->setAliases(['alias1', 'alias2'])
             ->setDescription('command 1 description')
             ->setHelp('command 1 help')
         ;
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand4.php b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand4.php
index 13e8e5ba049f6..22dcae0e3c10e 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand4.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand4.php
@@ -19,7 +19,7 @@ protected function configure()
     {
         $this
             ->setName('descriptor:command4')
-            ->setAliases(array('descriptor:alias_command4', 'command4:descriptor'))
+            ->setAliases(['descriptor:alias_command4', 'command4:descriptor'])
         ;
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/DummyOutput.php b/src/Symfony/Component/Console/Tests/Fixtures/DummyOutput.php
index 866e21437177a..e9cf6ce7dae8b 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/DummyOutput.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/DummyOutput.php
@@ -25,7 +25,7 @@ class DummyOutput extends BufferedOutput
      */
     public function getLogs()
     {
-        $logs = array();
+        $logs = [];
         foreach (explode(PHP_EOL, trim($this->fetch())) as $message) {
             preg_match('/^\[(.*)\] (.*)/', $message, $matches);
             $logs[] = sprintf('%s %s', $matches[1], $matches[2]);
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Foo1Command.php b/src/Symfony/Component/Console/Tests/Fixtures/Foo1Command.php
index 254162f320dd7..6069576d1540d 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/Foo1Command.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Foo1Command.php
@@ -14,7 +14,7 @@ protected function configure()
         $this
             ->setName('foo:bar1')
             ->setDescription('The foo:bar1 command')
-            ->setAliases(array('afoobar1'))
+            ->setAliases(['afoobar1'])
         ;
     }
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Foo2Command.php b/src/Symfony/Component/Console/Tests/Fixtures/Foo2Command.php
index 8071dc8fb3d86..0d9884013ebd7 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/Foo2Command.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Foo2Command.php
@@ -11,7 +11,7 @@ protected function configure()
         $this
             ->setName('foo1:bar')
             ->setDescription('The foo1:bar command')
-            ->setAliases(array('afoobar2'))
+            ->setAliases(['afoobar2'])
         ;
     }
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/FooCommand.php b/src/Symfony/Component/Console/Tests/Fixtures/FooCommand.php
index 355e0ad6d63f9..314460044789d 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/FooCommand.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/FooCommand.php
@@ -14,7 +14,7 @@ protected function configure()
         $this
             ->setName('foo:bar')
             ->setDescription('The foo:bar command')
-            ->setAliases(array('afoobar'))
+            ->setAliases(['afoobar'])
         ;
     }
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/FooOptCommand.php b/src/Symfony/Component/Console/Tests/Fixtures/FooOptCommand.php
index 9043aa483c20f..c9054671f94c5 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/FooOptCommand.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/FooOptCommand.php
@@ -15,7 +15,7 @@ protected function configure()
         $this
             ->setName('foo:bar')
             ->setDescription('The foo:bar command')
-            ->setAliases(array('afoobar'))
+            ->setAliases(['afoobar'])
             ->addOption('fooopt', 'fo', InputOption::VALUE_OPTIONAL, 'fooopt description')
         ;
     }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/FooSubnamespaced1Command.php b/src/Symfony/Component/Console/Tests/Fixtures/FooSubnamespaced1Command.php
index fc50c72bfcf87..95a4e6152484f 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/FooSubnamespaced1Command.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/FooSubnamespaced1Command.php
@@ -14,7 +14,7 @@ protected function configure()
         $this
             ->setName('foo:bar:baz')
             ->setDescription('The foo:bar:baz command')
-            ->setAliases(array('foobarbaz'))
+            ->setAliases(['foobarbaz'])
         ;
     }
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/FooSubnamespaced2Command.php b/src/Symfony/Component/Console/Tests/Fixtures/FooSubnamespaced2Command.php
index 1cf31ff110c9c..08c5ff725fe0d 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/FooSubnamespaced2Command.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/FooSubnamespaced2Command.php
@@ -14,7 +14,7 @@ protected function configure()
         $this
             ->setName('foo:go:bret')
             ->setDescription('The foo:bar:go command')
-            ->setAliases(array('foobargo'))
+            ->setAliases(['foobargo'])
         ;
     }
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_4.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_4.php
index 0c5d3fb26ceff..b2f3d99546afb 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_4.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_4.php
@@ -20,12 +20,12 @@
 
     //Ensure edge case by appending empty strings to history:
     $output->write('Lorem ipsum dolor sit amet');
-    $output->write(array('', '', ''));
+    $output->write(['', '', '']);
     $output->title('Fourth title');
 
     //Ensure have manual control over number of blank lines:
     $output->writeln('Lorem ipsum dolor sit amet');
-    $output->writeln(array('', '')); //Should append an extra blank line
+    $output->writeln(['', '']); //Should append an extra blank line
     $output->title('Fifth title');
 
     $output->writeln('Lorem ipsum dolor sit amet');
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_5.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_5.php
index 96433ed5b32d2..6fba5737fce39 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_5.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_5.php
@@ -9,29 +9,29 @@
     $output = new SymfonyStyle($input, $output);
 
     $output->writeln('Lorem ipsum dolor sit amet');
-    $output->listing(array(
+    $output->listing([
         'Lorem ipsum dolor sit amet',
         'consectetur adipiscing elit',
-    ));
+    ]);
 
     //Even using write:
     $output->write('Lorem ipsum dolor sit amet');
-    $output->listing(array(
+    $output->listing([
         'Lorem ipsum dolor sit amet',
         'consectetur adipiscing elit',
-    ));
+    ]);
 
     $output->write('Lorem ipsum dolor sit amet');
-    $output->text(array(
+    $output->text([
         'Lorem ipsum dolor sit amet',
         'consectetur adipiscing elit',
-    ));
+    ]);
 
     $output->newLine();
 
     $output->write('Lorem ipsum dolor sit amet');
-    $output->comment(array(
+    $output->comment([
         'Lorem ipsum dolor sit amet',
         'consectetur adipiscing elit',
-    ));
+    ]);
 };
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_6.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_6.php
index 8031ec9c30e5a..3278f6ea05b12 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_6.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_6.php
@@ -8,9 +8,9 @@
 return function (InputInterface $input, OutputInterface $output) {
     $output = new SymfonyStyle($input, $output);
 
-    $output->listing(array(
+    $output->listing([
         'Lorem ipsum dolor sit amet',
         'consectetur adipiscing elit',
-    ));
+    ]);
     $output->success('Lorem ipsum dolor sit amet');
 };
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_7.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_7.php
index 203eb5b12e6b0..037c6ab6b3fe5 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_7.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_7.php
@@ -9,7 +9,7 @@
     $output = new SymfonyStyle($input, $output);
     $output->title('Title');
     $output->askHidden('Hidden question');
-    $output->choice('Choice question with default', array('choice1', 'choice2'), 'choice1');
+    $output->choice('Choice question with default', ['choice1', 'choice2'], 'choice1');
     $output->confirm('Confirmation with yes default', true);
     $output->text('Duis aute irure dolor in reprehenderit in voluptate velit esse');
 };
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_8.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_8.php
index 16b26b523f2d4..fe9d484d252b3 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_8.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_8.php
@@ -7,19 +7,19 @@
 
 //Ensure formatting tables when using multiple headers with TableCell
 return function (InputInterface $input, OutputInterface $output) {
-    $headers = array(
-        array(new TableCell('Main table title', array('colspan' => 3))),
-        array('ISBN', 'Title', 'Author'),
-    );
+    $headers = [
+        [new TableCell('Main table title', ['colspan' => 3])],
+        ['ISBN', 'Title', 'Author'],
+    ];
 
-    $rows = array(
-        array(
+    $rows = [
+        [
             '978-0521567817',
             'De Monarchia',
-            new TableCell("Dante Alighieri\nspans multiple rows", array('rowspan' => 2)),
-        ),
-        array('978-0804169127', 'Divine Comedy'),
-    );
+            new TableCell("Dante Alighieri\nspans multiple rows", ['rowspan' => 2]),
+        ],
+        ['978-0804169127', 'Divine Comedy'],
+    ];
 
     $output = new SymfonyStyle($input, $output);
     $output->table($headers, $rows);
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php
index 57afdf06b43f0..73af4ae1e2614 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php
@@ -7,5 +7,5 @@
 //Ensure that all lines are aligned to the begin of the first line in a multi-line block
 return function (InputInterface $input, OutputInterface $output) {
     $output = new SymfonyStyle($input, $output);
-    $output->block(array('Custom block', 'Second custom block line'), 'CUSTOM', 'fg=white;bg=green', 'X ', true);
+    $output->block(['Custom block', 'Second custom block line'], 'CUSTOM', 'fg=white;bg=green', 'X ', true);
 };
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/TestCommand.php b/src/Symfony/Component/Console/Tests/Fixtures/TestCommand.php
index dcd32739c4c36..eb7ccb33f6ca5 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/TestCommand.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/TestCommand.php
@@ -10,7 +10,7 @@ protected function configure()
     {
         $this
             ->setName('namespace:name')
-            ->setAliases(array('name'))
+            ->setAliases(['name'])
             ->setDescription('description')
             ->setHelp('help')
         ;
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/TestToto.php b/src/Symfony/Component/Console/Tests/Fixtures/TestToto.php
index f14805db68e6c..2e6a8195938bb 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/TestToto.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/TestToto.php
@@ -11,7 +11,7 @@ protected function configure()
         $this
             ->setName('test-toto')
             ->setDescription('The test-toto command')
-            ->setAliases(array('test'))
+            ->setAliases(['test'])
         ;
     }
 
diff --git a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php
index ddf77902c90e9..d47760fe4e3e7 100644
--- a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php
+++ b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php
@@ -18,10 +18,10 @@ class OutputFormatterStyleTest extends TestCase
 {
     public function testConstructor()
     {
-        $style = new OutputFormatterStyle('green', 'black', array('bold', 'underscore'));
+        $style = new OutputFormatterStyle('green', 'black', ['bold', 'underscore']);
         $this->assertEquals("\033[32;40;1;4mfoo\033[39;49;22;24m", $style->apply('foo'));
 
-        $style = new OutputFormatterStyle('red', null, array('blink'));
+        $style = new OutputFormatterStyle('red', null, ['blink']);
         $this->assertEquals("\033[31;5mfoo\033[39;25m", $style->apply('foo'));
 
         $style = new OutputFormatterStyle(null, 'white');
@@ -66,7 +66,7 @@ public function testOptions()
     {
         $style = new OutputFormatterStyle();
 
-        $style->setOptions(array('reverse', 'conceal'));
+        $style->setOptions(['reverse', 'conceal']);
         $this->assertEquals("\033[7;8mfoo\033[27;28m", $style->apply('foo'));
 
         $style->setOption('bold');
@@ -78,7 +78,7 @@ public function testOptions()
         $style->setOption('bold');
         $this->assertEquals("\033[8;1mfoo\033[28;22m", $style->apply('foo'));
 
-        $style->setOptions(array('bold'));
+        $style->setOptions(['bold']);
         $this->assertEquals("\033[1mfoo\033[22m", $style->apply('foo'));
 
         try {
diff --git a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php
index 4b715c680d3d3..c5c2daed25d99 100644
--- a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php
+++ b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php
@@ -184,16 +184,16 @@ public function testInlineStyleOptions($tag, $expected = null, $input = null)
 
     public function provideInlineStyleOptionsCases()
     {
-        return array(
-            array('<unknown=_unknown_>'),
-            array('<unknown=_unknown_;a=1;b>'),
-            array('<fg=green;>', "\033[32m[test]\033[39m", '[test]'),
-            array('<fg=green;bg=blue;>', "\033[32;44ma\033[39;49m", 'a'),
-            array('<fg=green;options=bold>', "\033[32;1mb\033[39;22m", 'b'),
-            array('<fg=green;options=reverse;>', "\033[32;7m<a>\033[39;27m", '<a>'),
-            array('<fg=green;options=bold,underscore>', "\033[32;1;4mz\033[39;22;24m", 'z'),
-            array('<fg=green;options=bold,underscore,reverse;>', "\033[32;1;4;7md\033[39;22;24;27m", 'd'),
-        );
+        return [
+            ['<unknown=_unknown_>'],
+            ['<unknown=_unknown_;a=1;b>'],
+            ['<fg=green;>', "\033[32m[test]\033[39m", '[test]'],
+            ['<fg=green;bg=blue;>', "\033[32;44ma\033[39;49m", 'a'],
+            ['<fg=green;options=bold>', "\033[32;1mb\033[39;22m", 'b'],
+            ['<fg=green;options=reverse;>', "\033[32;7m<a>\033[39;27m", '<a>'],
+            ['<fg=green;options=bold,underscore>', "\033[32;1;4mz\033[39;22;24m", 'z'],
+            ['<fg=green;options=bold,underscore,reverse;>', "\033[32;1;4;7md\033[39;22;24;27m", 'd'],
+        ];
     }
 
     /**
@@ -209,12 +209,12 @@ public function testInlineStyleOptionsUnknownAreDeprecated($tag, $option)
 
     public function provideInlineStyleTagsWithUnknownOptions()
     {
-        return array(
-            array('<options=abc;>', 'abc'),
-            array('<options=abc,def;>', 'abc'),
-            array('<fg=green;options=xyz;>', 'xyz'),
-            array('<fg=green;options=efg,abc>', 'efg'),
-        );
+        return [
+            ['<options=abc;>', 'abc'],
+            ['<options=abc,def;>', 'abc'],
+            ['<fg=green;options=xyz;>', 'xyz'],
+            ['<fg=green;options=efg,abc>', 'efg'],
+        ];
     }
 
     public function testNonStyleTag()
diff --git a/src/Symfony/Component/Console/Tests/Helper/FormatterHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/FormatterHelperTest.php
index f5d891a1a3acc..934e11ac1b0a3 100644
--- a/src/Symfony/Component/Console/Tests/Helper/FormatterHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/FormatterHelperTest.php
@@ -40,7 +40,7 @@ public function testFormatBlock()
         $this->assertEquals(
             '<error> Some text to display </error>'."\n".
             '<error> foo bar              </error>',
-            $formatter->formatBlock(array('Some text to display', 'foo bar'), 'error'),
+            $formatter->formatBlock(['Some text to display', 'foo bar'], 'error'),
             '::formatBlock() formats a message in a block'
         );
 
diff --git a/src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php b/src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php
index 0fdb2cefbe421..826bc51dcd62b 100644
--- a/src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php
@@ -20,7 +20,7 @@ class HelperSetTest extends TestCase
     public function testConstructor()
     {
         $mock_helper = $this->getGenericMockHelper('fake_helper');
-        $helperset = new HelperSet(array('fake_helper_alias' => $mock_helper));
+        $helperset = new HelperSet(['fake_helper_alias' => $mock_helper]);
 
         $this->assertEquals($mock_helper, $helperset->get('fake_helper_alias'), '__construct sets given helper to helpers');
         $this->assertTrue($helperset->has('fake_helper_alias'), '__construct sets helper alias for given helper');
@@ -46,7 +46,7 @@ public function testSet()
 
     public function testHas()
     {
-        $helperset = new HelperSet(array('fake_helper_alias' => $this->getGenericMockHelper('fake_helper')));
+        $helperset = new HelperSet(['fake_helper_alias' => $this->getGenericMockHelper('fake_helper')]);
         $this->assertTrue($helperset->has('fake_helper'), '->has() finds set helper');
         $this->assertTrue($helperset->has('fake_helper_alias'), '->has() finds set helper by alias');
     }
@@ -55,7 +55,7 @@ public function testGet()
     {
         $helper_01 = $this->getGenericMockHelper('fake_helper_01');
         $helper_02 = $this->getGenericMockHelper('fake_helper_02');
-        $helperset = new HelperSet(array('fake_helper_01_alias' => $helper_01, 'fake_helper_02_alias' => $helper_02));
+        $helperset = new HelperSet(['fake_helper_01_alias' => $helper_01, 'fake_helper_02_alias' => $helper_02]);
         $this->assertEquals($helper_01, $helperset->get('fake_helper_01'), '->get() returns correct helper by name');
         $this->assertEquals($helper_01, $helperset->get('fake_helper_01_alias'), '->get() returns correct helper by alias');
         $this->assertEquals($helper_02, $helperset->get('fake_helper_02'), '->get() returns correct helper by name');
@@ -101,7 +101,7 @@ public function testIteration()
         $helperset->set($this->getGenericMockHelper('fake_helper_01', $helperset));
         $helperset->set($this->getGenericMockHelper('fake_helper_02', $helperset));
 
-        $helpers = array('fake_helper_01', 'fake_helper_02');
+        $helpers = ['fake_helper_01', 'fake_helper_02'];
         $i = 0;
 
         foreach ($helperset as $helper) {
diff --git a/src/Symfony/Component/Console/Tests/Helper/HelperTest.php b/src/Symfony/Component/Console/Tests/Helper/HelperTest.php
index 1847582444d1f..184d86e092aba 100644
--- a/src/Symfony/Component/Console/Tests/Helper/HelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/HelperTest.php
@@ -18,28 +18,28 @@ class HelperTest extends TestCase
 {
     public function formatTimeProvider()
     {
-        return array(
-            array(0,      '< 1 sec'),
-            array(1,      '1 sec'),
-            array(2,      '2 secs'),
-            array(59,     '59 secs'),
-            array(60,     '1 min'),
-            array(61,     '1 min'),
-            array(119,    '1 min'),
-            array(120,    '2 mins'),
-            array(121,    '2 mins'),
-            array(3599,   '59 mins'),
-            array(3600,   '1 hr'),
-            array(7199,   '1 hr'),
-            array(7200,   '2 hrs'),
-            array(7201,   '2 hrs'),
-            array(86399,  '23 hrs'),
-            array(86400,  '1 day'),
-            array(86401,  '1 day'),
-            array(172799, '1 day'),
-            array(172800, '2 days'),
-            array(172801, '2 days'),
-        );
+        return [
+            [0,      '< 1 sec'],
+            [1,      '1 sec'],
+            [2,      '2 secs'],
+            [59,     '59 secs'],
+            [60,     '1 min'],
+            [61,     '1 min'],
+            [119,    '1 min'],
+            [120,    '2 mins'],
+            [121,    '2 mins'],
+            [3599,   '59 mins'],
+            [3600,   '1 hr'],
+            [7199,   '1 hr'],
+            [7200,   '2 hrs'],
+            [7201,   '2 hrs'],
+            [86399,  '23 hrs'],
+            [86400,  '1 day'],
+            [86401,  '1 day'],
+            [172799, '1 day'],
+            [172800, '2 days'],
+            [172801, '2 days'],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/Helper/ProcessHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/ProcessHelperTest.php
index 382c9f4c17627..0c9fac401d2f7 100644
--- a/src/Symfony/Component/Console/Tests/Helper/ProcessHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/ProcessHelperTest.php
@@ -26,7 +26,7 @@ class ProcessHelperTest extends TestCase
     public function testVariousProcessRuns($expected, $cmd, $verbosity, $error)
     {
         $helper = new ProcessHelper();
-        $helper->setHelperSet(new HelperSet(array(new DebugFormatterHelper())));
+        $helper->setHelperSet(new HelperSet([new DebugFormatterHelper()]));
         $output = $this->getOutputStream($verbosity);
         $helper->run($output, $cmd, $error);
         $this->assertEquals($expected, $this->getOutput($output));
@@ -35,7 +35,7 @@ public function testVariousProcessRuns($expected, $cmd, $verbosity, $error)
     public function testPassedCallbackIsExecuted()
     {
         $helper = new ProcessHelper();
-        $helper->setHelperSet(new HelperSet(array(new DebugFormatterHelper())));
+        $helper->setHelperSet(new HelperSet([new DebugFormatterHelper()]));
         $output = $this->getOutputStream(StreamOutput::VERBOSITY_NORMAL);
 
         $executed = false;
diff --git a/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php b/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
index 4c2de26a8638f..e352311ccad09 100644
--- a/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
@@ -752,12 +752,12 @@ public function testFormatsWithoutMax($format)
      */
     public function provideFormat()
     {
-        return array(
-            array('normal'),
-            array('verbose'),
-            array('very_verbose'),
-            array('debug'),
-        );
+        return [
+            ['normal'],
+            ['verbose'],
+            ['very_verbose'],
+            ['debug'],
+        ];
     }
 
     protected function getOutputStream($decorated = true, $verbosity = StreamOutput::VERBOSITY_NORMAL)
diff --git a/src/Symfony/Component/Console/Tests/Helper/ProgressIndicatorTest.php b/src/Symfony/Component/Console/Tests/Helper/ProgressIndicatorTest.php
index c85018dece7ef..6c6f86f36e3f9 100644
--- a/src/Symfony/Component/Console/Tests/Helper/ProgressIndicatorTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/ProgressIndicatorTest.php
@@ -79,7 +79,7 @@ public function testNonDecoratedOutput()
 
     public function testCustomIndicatorValues()
     {
-        $bar = new ProgressIndicator($output = $this->getOutputStream(), null, 100, array('a', 'b', 'c'));
+        $bar = new ProgressIndicator($output = $this->getOutputStream(), null, 100, ['a', 'b', 'c']);
 
         $bar->start('Starting...');
         usleep(101000);
@@ -106,7 +106,7 @@ public function testCustomIndicatorValues()
      */
     public function testCannotSetInvalidIndicatorCharacters()
     {
-        $bar = new ProgressIndicator($this->getOutputStream(), null, 100, array('1'));
+        $bar = new ProgressIndicator($this->getOutputStream(), null, 100, ['1']);
     }
 
     /**
@@ -161,12 +161,12 @@ public function testFormats($format)
      */
     public function provideFormat()
     {
-        return array(
-            array('normal'),
-            array('verbose'),
-            array('very_verbose'),
-            array('debug'),
-        );
+        return [
+            ['normal'],
+            ['verbose'],
+            ['very_verbose'],
+            ['debug'],
+        ];
     }
 
     protected function getOutputStream($decorated = true, $verbosity = StreamOutput::VERBOSITY_NORMAL)
diff --git a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
index 76fe45ba24160..15d367b355d42 100644
--- a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
@@ -29,10 +29,10 @@ public function testAskChoice()
     {
         $questionHelper = new QuestionHelper();
 
-        $helperSet = new HelperSet(array(new FormatterHelper()));
+        $helperSet = new HelperSet([new FormatterHelper()]);
         $questionHelper->setHelperSet($helperSet);
 
-        $heroes = array('Superman', 'Batman', 'Spiderman');
+        $heroes = ['Superman', 'Batman', 'Spiderman'];
 
         $inputStream = $this->getInputStream("\n1\n  1  \nFabien\n1\nFabien\n1\n0,2\n 0 , 2  \n\n\n");
 
@@ -68,21 +68,21 @@ public function testAskChoice()
         $question->setMaxAttempts(1);
         $question->setMultiselect(true);
 
-        $this->assertEquals(array('Batman'), $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
-        $this->assertEquals(array('Superman', 'Spiderman'), $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
-        $this->assertEquals(array('Superman', 'Spiderman'), $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals(['Batman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals(['Superman', 'Spiderman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals(['Superman', 'Spiderman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
 
         $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, '0,1');
         $question->setMaxAttempts(1);
         $question->setMultiselect(true);
 
-        $this->assertEquals(array('Superman', 'Batman'), $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals(['Superman', 'Batman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
 
         $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, ' 0 , 1 ');
         $question->setMaxAttempts(1);
         $question->setMultiselect(true);
 
-        $this->assertEquals(array('Superman', 'Batman'), $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals(['Superman', 'Batman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
 
         $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, 0);
         // We are supposed to get the default value since we are not in interactive mode
@@ -93,11 +93,11 @@ public function testAskChoiceNonInteractive()
     {
         $questionHelper = new QuestionHelper();
 
-        $helperSet = new HelperSet(array(new FormatterHelper()));
+        $helperSet = new HelperSet([new FormatterHelper()]);
         $questionHelper->setHelperSet($helperSet);
         $inputStream = $this->getInputStream("\n1\n  1  \nFabien\n1\nFabien\n1\n0,2\n 0 , 2  \n\n\n");
 
-        $heroes = array('Superman', 'Batman', 'Spiderman');
+        $heroes = ['Superman', 'Batman', 'Spiderman'];
 
         $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, '0');
 
@@ -122,16 +122,16 @@ public function testAskChoiceNonInteractive()
 
         $question = new ChoiceQuestion('Who are your favorite superheros?', $heroes, '0, 1');
         $question->setMultiselect(true);
-        $this->assertSame(array('Superman', 'Batman'), $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream, false), $this->createOutputInterface(), $question));
+        $this->assertSame(['Superman', 'Batman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream, false), $this->createOutputInterface(), $question));
 
         $question = new ChoiceQuestion('Who are your favorite superheros?', $heroes, '0, 1');
         $question->setMultiselect(true);
         $question->setValidator(null);
-        $this->assertSame(array('Superman', 'Batman'), $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream, false), $this->createOutputInterface(), $question));
+        $this->assertSame(['Superman', 'Batman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream, false), $this->createOutputInterface(), $question));
 
         $question = new ChoiceQuestion('Who are your favorite superheros?', $heroes, '0, Batman');
         $question->setMultiselect(true);
-        $this->assertSame(array('Superman', 'Batman'), $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream, false), $this->createOutputInterface(), $question));
+        $this->assertSame(['Superman', 'Batman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream, false), $this->createOutputInterface(), $question));
 
         $question = new ChoiceQuestion('Who are your favorite superheros?', $heroes, null);
         $question->setMultiselect(true);
@@ -179,11 +179,11 @@ public function testAskWithAutocomplete()
         $inputStream = $this->getInputStream("Acm\nAc\177\177s\tTest\n\n\033[A\033[A\n\033[A\033[A\033[A\033[A\033[A\tTest\n\033[B\nS\177\177\033[B\033[B\nF00\177\177oo\t\n");
 
         $dialog = new QuestionHelper();
-        $helperSet = new HelperSet(array(new FormatterHelper()));
+        $helperSet = new HelperSet([new FormatterHelper()]);
         $dialog->setHelperSet($helperSet);
 
         $question = new Question('Please select a bundle', 'FrameworkBundle');
-        $question->setAutocompleterValues(array('AcmeDemoBundle', 'AsseticBundle', 'SecurityBundle', 'FooBundle'));
+        $question->setAutocompleterValues(['AcmeDemoBundle', 'AsseticBundle', 'SecurityBundle', 'FooBundle']);
 
         $this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
         $this->assertEquals('AsseticBundleTest', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
@@ -205,9 +205,9 @@ public function testAskWithAutocompleteWithNonSequentialKeys()
         $inputStream = $this->getInputStream("\033[A\033[A\n\033[B\033[B\n");
 
         $dialog = new QuestionHelper();
-        $dialog->setHelperSet(new HelperSet(array(new FormatterHelper())));
+        $dialog->setHelperSet(new HelperSet([new FormatterHelper()]));
 
-        $question = new ChoiceQuestion('Please select a bundle', array(1 => 'AcmeDemoBundle', 4 => 'AsseticBundle'));
+        $question = new ChoiceQuestion('Please select a bundle', [1 => 'AcmeDemoBundle', 4 => 'AsseticBundle']);
         $question->setMaxAttempts(1);
 
         $this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
@@ -222,14 +222,14 @@ public function testAskWithAutocompleteWithExactMatch()
 
         $inputStream = $this->getInputStream("b\n");
 
-        $possibleChoices = array(
+        $possibleChoices = [
             'a' => 'berlin',
             'b' => 'copenhagen',
             'c' => 'amsterdam',
-        );
+        ];
 
         $dialog = new QuestionHelper();
-        $dialog->setHelperSet(new HelperSet(array(new FormatterHelper())));
+        $dialog->setHelperSet(new HelperSet([new FormatterHelper()]));
 
         $question = new ChoiceQuestion('Please select a city', $possibleChoices);
         $question->setMaxAttempts(1);
@@ -246,12 +246,12 @@ public function testAutocompleteWithTrailingBackslash()
         $inputStream = $this->getInputStream('E');
 
         $dialog = new QuestionHelper();
-        $helperSet = new HelperSet(array(new FormatterHelper()));
+        $helperSet = new HelperSet([new FormatterHelper()]);
         $dialog->setHelperSet($helperSet);
 
         $question = new Question('');
         $expectedCompletion = 'ExampleNamespace\\';
-        $question->setAutocompleterValues(array($expectedCompletion));
+        $question->setAutocompleterValues([$expectedCompletion]);
 
         $output = $this->createOutputInterface();
         $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $output, $question);
@@ -262,11 +262,11 @@ public function testAutocompleteWithTrailingBackslash()
 
         // Shell control (esc) sequences are not so important: we only care that
         // <hl> tag is interpreted correctly and replaced
-        $irrelevantEscSequences = array(
+        $irrelevantEscSequences = [
             "\0337" => '', // Save cursor position
             "\0338" => '', // Restore cursor position
             "\033[K" => '', // Clear line from cursor till the end
-        );
+        ];
 
         $importantActualOutput = strtr($actualOutput, $irrelevantEscSequences);
 
@@ -304,14 +304,14 @@ public function testAskConfirmation($question, $expected, $default = true)
 
     public function getAskConfirmationData()
     {
-        return array(
-            array('', true),
-            array('', false, false),
-            array('y', true),
-            array('yes', true),
-            array('n', false),
-            array('no', false),
-        );
+        return [
+            ['', true],
+            ['', false, false],
+            ['y', true],
+            ['yes', true],
+            ['n', false],
+            ['no', false],
+        ];
     }
 
     public function testAskConfirmationWithCustomTrueAnswer()
@@ -328,12 +328,12 @@ public function testAskConfirmationWithCustomTrueAnswer()
     public function testAskAndValidate()
     {
         $dialog = new QuestionHelper();
-        $helperSet = new HelperSet(array(new FormatterHelper()));
+        $helperSet = new HelperSet([new FormatterHelper()]);
         $dialog->setHelperSet($helperSet);
 
         $error = 'This is not a color!';
         $validator = function ($color) use ($error) {
-            if (!\in_array($color, array('white', 'black'))) {
+            if (!\in_array($color, ['white', 'black'])) {
                 throw new \InvalidArgumentException($error);
             }
 
@@ -361,14 +361,14 @@ public function testAskAndValidate()
      */
     public function testSelectChoiceFromSimpleChoices($providedAnswer, $expectedValue)
     {
-        $possibleChoices = array(
+        $possibleChoices = [
             'My environment 1',
             'My environment 2',
             'My environment 3',
-        );
+        ];
 
         $dialog = new QuestionHelper();
-        $helperSet = new HelperSet(array(new FormatterHelper()));
+        $helperSet = new HelperSet([new FormatterHelper()]);
         $dialog->setHelperSet($helperSet);
 
         $question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
@@ -380,14 +380,14 @@ public function testSelectChoiceFromSimpleChoices($providedAnswer, $expectedValu
 
     public function simpleAnswerProvider()
     {
-        return array(
-            array(0, 'My environment 1'),
-            array(1, 'My environment 2'),
-            array(2, 'My environment 3'),
-            array('My environment 1', 'My environment 1'),
-            array('My environment 2', 'My environment 2'),
-            array('My environment 3', 'My environment 3'),
-        );
+        return [
+            [0, 'My environment 1'],
+            [1, 'My environment 2'],
+            [2, 'My environment 3'],
+            ['My environment 1', 'My environment 1'],
+            ['My environment 2', 'My environment 2'],
+            ['My environment 3', 'My environment 3'],
+        ];
     }
 
     /**
@@ -395,14 +395,14 @@ public function simpleAnswerProvider()
      */
     public function testSpecialCharacterChoiceFromMultipleChoiceList($providedAnswer, $expectedValue)
     {
-        $possibleChoices = array(
+        $possibleChoices = [
             '.',
             'src',
-        );
+        ];
 
         $dialog = new QuestionHelper();
         $inputStream = $this->getInputStream($providedAnswer."\n");
-        $helperSet = new HelperSet(array(new FormatterHelper()));
+        $helperSet = new HelperSet([new FormatterHelper()]);
         $dialog->setHelperSet($helperSet);
 
         $question = new ChoiceQuestion('Please select the directory', $possibleChoices);
@@ -415,10 +415,10 @@ public function testSpecialCharacterChoiceFromMultipleChoiceList($providedAnswer
 
     public function specialCharacterInMultipleChoice()
     {
-        return array(
-            array('.', array('.')),
-            array('., src', array('.', 'src')),
-        );
+        return [
+            ['.', ['.']],
+            ['., src', ['.', 'src']],
+        ];
     }
 
     /**
@@ -426,15 +426,15 @@ public function specialCharacterInMultipleChoice()
      */
     public function testChoiceFromChoicelistWithMixedKeys($providedAnswer, $expectedValue)
     {
-        $possibleChoices = array(
+        $possibleChoices = [
             '0' => 'No environment',
             '1' => 'My environment 1',
             'env_2' => 'My environment 2',
             3 => 'My environment 3',
-        );
+        ];
 
         $dialog = new QuestionHelper();
-        $helperSet = new HelperSet(array(new FormatterHelper()));
+        $helperSet = new HelperSet([new FormatterHelper()]);
         $dialog->setHelperSet($helperSet);
 
         $question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
@@ -446,14 +446,14 @@ public function testChoiceFromChoicelistWithMixedKeys($providedAnswer, $expected
 
     public function mixedKeysChoiceListAnswerProvider()
     {
-        return array(
-            array('0', '0'),
-            array('No environment', '0'),
-            array('1', '1'),
-            array('env_2', 'env_2'),
-            array(3, '3'),
-            array('My environment 1', '1'),
-        );
+        return [
+            ['0', '0'],
+            ['No environment', '0'],
+            ['1', '1'],
+            ['env_2', 'env_2'],
+            [3, '3'],
+            ['My environment 1', '1'],
+        ];
     }
 
     /**
@@ -461,14 +461,14 @@ public function mixedKeysChoiceListAnswerProvider()
      */
     public function testSelectChoiceFromChoiceList($providedAnswer, $expectedValue)
     {
-        $possibleChoices = array(
+        $possibleChoices = [
             'env_1' => 'My environment 1',
             'env_2' => 'My environment',
             'env_3' => 'My environment',
-        );
+        ];
 
         $dialog = new QuestionHelper();
-        $helperSet = new HelperSet(array(new FormatterHelper()));
+        $helperSet = new HelperSet([new FormatterHelper()]);
         $dialog->setHelperSet($helperSet);
 
         $question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
@@ -484,14 +484,14 @@ public function testSelectChoiceFromChoiceList($providedAnswer, $expectedValue)
      */
     public function testAmbiguousChoiceFromChoicelist()
     {
-        $possibleChoices = array(
+        $possibleChoices = [
             'env_1' => 'My first environment',
             'env_2' => 'My environment',
             'env_3' => 'My environment',
-        );
+        ];
 
         $dialog = new QuestionHelper();
-        $helperSet = new HelperSet(array(new FormatterHelper()));
+        $helperSet = new HelperSet([new FormatterHelper()]);
         $dialog->setHelperSet($helperSet);
 
         $question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
@@ -502,12 +502,12 @@ public function testAmbiguousChoiceFromChoicelist()
 
     public function answerProvider()
     {
-        return array(
-            array('env_1', 'env_1'),
-            array('env_2', 'env_2'),
-            array('env_3', 'env_3'),
-            array('My environment 1', 'env_1'),
-        );
+        return [
+            ['env_1', 'env_1'],
+            ['env_2', 'env_2'],
+            ['env_3', 'env_3'],
+            ['My environment 1', 'env_1'],
+        ];
     }
 
     public function testNoInteraction()
@@ -523,22 +523,22 @@ public function testNoInteraction()
     public function testChoiceOutputFormattingQuestionForUtf8Keys()
     {
         $question = 'Lorem ipsum?';
-        $possibleChoices = array(
+        $possibleChoices = [
             'foo' => 'foo',
             'żółw' => 'bar',
             'łabądź' => 'baz',
-        );
-        $outputShown = array(
+        ];
+        $outputShown = [
             $question,
             '  [<info>foo   </info>] foo',
             '  [<info>żółw  </info>] bar',
             '  [<info>łabądź</info>] baz',
-        );
+        ];
         $output = $this->getMockBuilder('\Symfony\Component\Console\Output\OutputInterface')->getMock();
         $output->method('getFormatter')->willReturn(new OutputFormatter());
 
         $dialog = new QuestionHelper();
-        $helperSet = new HelperSet(array(new FormatterHelper()));
+        $helperSet = new HelperSet([new FormatterHelper()]);
         $dialog->setHelperSet($helperSet);
 
         $output->expects($this->once())->method('writeln')->with($this->equalTo($outputShown));
@@ -932,7 +932,7 @@ public function testAskThrowsExceptionOnMissingInputWithValidator()
      */
     public function testEmptyChoices()
     {
-        new ChoiceQuestion('Question', array(), 'irrelevant');
+        new ChoiceQuestion('Question', [], 'irrelevant');
     }
 
     public function testTraversableAutocomplete()
@@ -952,11 +952,11 @@ public function testTraversableAutocomplete()
         $inputStream = $this->getInputStream("Acm\nAc\177\177s\tTest\n\n\033[A\033[A\n\033[A\033[A\033[A\033[A\033[A\tTest\n\033[B\nS\177\177\033[B\033[B\nF00\177\177oo\t\n");
 
         $dialog = new QuestionHelper();
-        $helperSet = new HelperSet(array(new FormatterHelper()));
+        $helperSet = new HelperSet([new FormatterHelper()]);
         $dialog->setHelperSet($helperSet);
 
         $question = new Question('Please select a bundle', 'FrameworkBundle');
-        $question->setAutocompleterValues(new AutocompleteValues(array('irrelevant' => 'AcmeDemoBundle', 'AsseticBundle', 'SecurityBundle', 'FooBundle')));
+        $question->setAutocompleterValues(new AutocompleteValues(['irrelevant' => 'AcmeDemoBundle', 'AsseticBundle', 'SecurityBundle', 'FooBundle']));
 
         $this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
         $this->assertEquals('AsseticBundleTest', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
diff --git a/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php
index 9406e5b863d06..e7fd806064d2c 100644
--- a/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php
@@ -18,10 +18,10 @@ public function testAskChoice()
     {
         $questionHelper = new SymfonyQuestionHelper();
 
-        $helperSet = new HelperSet(array(new FormatterHelper()));
+        $helperSet = new HelperSet([new FormatterHelper()]);
         $questionHelper->setHelperSet($helperSet);
 
-        $heroes = array('Superman', 'Batman', 'Spiderman');
+        $heroes = ['Superman', 'Batman', 'Spiderman'];
 
         $inputStream = $this->getInputStream("\n1\n  1  \nFabien\n1\nFabien\n1\n0,2\n 0 , 2  \n\n\n");
 
@@ -55,31 +55,31 @@ public function testAskChoice()
         $question->setMaxAttempts(1);
         $question->setMultiselect(true);
 
-        $this->assertEquals(array('Batman'), $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
-        $this->assertEquals(array('Superman', 'Spiderman'), $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
-        $this->assertEquals(array('Superman', 'Spiderman'), $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals(['Batman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals(['Superman', 'Spiderman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+        $this->assertEquals(['Superman', 'Spiderman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
 
         $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, '0,1');
         $question->setMaxAttempts(1);
         $question->setMultiselect(true);
 
-        $this->assertEquals(array('Superman', 'Batman'), $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $output = $this->createOutputInterface(), $question));
+        $this->assertEquals(['Superman', 'Batman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $output = $this->createOutputInterface(), $question));
         $this->assertOutputContains('What is your favorite superhero? [Superman, Batman]', $output);
 
         $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, ' 0 , 1 ');
         $question->setMaxAttempts(1);
         $question->setMultiselect(true);
 
-        $this->assertEquals(array('Superman', 'Batman'), $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $output = $this->createOutputInterface(), $question));
+        $this->assertEquals(['Superman', 'Batman'], $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $output = $this->createOutputInterface(), $question));
         $this->assertOutputContains('What is your favorite superhero? [Superman, Batman]', $output);
     }
 
     public function testAskChoiceWithChoiceValueAsDefault()
     {
         $questionHelper = new SymfonyQuestionHelper();
-        $helperSet = new HelperSet(array(new FormatterHelper()));
+        $helperSet = new HelperSet([new FormatterHelper()]);
         $questionHelper->setHelperSet($helperSet);
-        $question = new ChoiceQuestion('What is your favorite superhero?', array('Superman', 'Batman', 'Spiderman'), 'Batman');
+        $question = new ChoiceQuestion('What is your favorite superhero?', ['Superman', 'Batman', 'Spiderman'], 'Batman');
         $question->setMaxAttempts(1);
 
         $this->assertSame('Batman', $questionHelper->ask($this->createStreamableInputInterfaceMock($this->getInputStream("Batman\n")), $output = $this->createOutputInterface(), $question));
diff --git a/src/Symfony/Component/Console/Tests/Helper/TableTest.php b/src/Symfony/Component/Console/Tests/Helper/TableTest.php
index b6a9d3b78bd87..787b7c2d02111 100644
--- a/src/Symfony/Component/Console/Tests/Helper/TableTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/TableTest.php
@@ -85,16 +85,16 @@ public function testRenderAddRowsOneByOne($headers, $rows, $style, $expected, $d
 
     public function renderProvider()
     {
-        $books = array(
-            array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'),
-            array('9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens'),
-            array('960-425-059-0', 'The Lord of the Rings', 'J. R. R. Tolkien'),
-            array('80-902734-1-6', 'And Then There Were None', 'Agatha Christie'),
-        );
-
-        return array(
-            array(
-                array('ISBN', 'Title', 'Author'),
+        $books = [
+            ['99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'],
+            ['9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens'],
+            ['960-425-059-0', 'The Lord of the Rings', 'J. R. R. Tolkien'],
+            ['80-902734-1-6', 'And Then There Were None', 'Agatha Christie'],
+        ];
+
+        return [
+            [
+                ['ISBN', 'Title', 'Author'],
                 $books,
                 'default',
 <<<'TABLE'
@@ -108,9 +108,9 @@ public function renderProvider()
 +---------------+--------------------------+------------------+
 
 TABLE
-            ),
-            array(
-                array('ISBN', 'Title', 'Author'),
+            ],
+            [
+                ['ISBN', 'Title', 'Author'],
                 $books,
                 'compact',
 <<<'TABLE'
@@ -121,9 +121,9 @@ public function renderProvider()
  80-902734-1-6 And Then There Were None Agatha Christie  
 
 TABLE
-            ),
-            array(
-                array('ISBN', 'Title', 'Author'),
+            ],
+            [
+                ['ISBN', 'Title', 'Author'],
                 $books,
                 'borderless',
 <<<'TABLE'
@@ -137,15 +137,15 @@ public function renderProvider()
  =============== ========================== ================== 
 
 TABLE
-            ),
+            ],
             array(
                 array('ISBN', 'Title'),
-                array(
-                    array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'),
-                    array('9971-5-0210-0'),
-                    array('960-425-059-0', 'The Lord of the Rings', 'J. R. R. Tolkien'),
-                    array('80-902734-1-6', 'And Then There Were None', 'Agatha Christie'),
-                ),
+                [
+                    ['99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'],
+                    ['9971-5-0210-0'],
+                    ['960-425-059-0', 'The Lord of the Rings', 'J. R. R. Tolkien'],
+                    ['80-902734-1-6', 'And Then There Were None', 'Agatha Christie'],
+                ],
                 'default',
 <<<'TABLE'
 +---------------+--------------------------+------------------+
@@ -159,14 +159,14 @@ public function renderProvider()
 
 TABLE
             ),
-            array(
-                array(),
-                array(
-                    array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'),
-                    array('9971-5-0210-0'),
-                    array('960-425-059-0', 'The Lord of the Rings', 'J. R. R. Tolkien'),
-                    array('80-902734-1-6', 'And Then There Were None', 'Agatha Christie'),
-                ),
+            [
+                [],
+                [
+                    ['99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'],
+                    ['9971-5-0210-0'],
+                    ['960-425-059-0', 'The Lord of the Rings', 'J. R. R. Tolkien'],
+                    ['80-902734-1-6', 'And Then There Were None', 'Agatha Christie'],
+                ],
                 'default',
 <<<'TABLE'
 +---------------+--------------------------+------------------+
@@ -177,15 +177,15 @@ public function renderProvider()
 +---------------+--------------------------+------------------+
 
 TABLE
-            ),
-            array(
-                array('ISBN', 'Title', 'Author'),
-                array(
-                    array('99921-58-10-7', "Divine\nComedy", 'Dante Alighieri'),
-                    array('9971-5-0210-2', "Harry Potter\nand the Chamber of Secrets", "Rowling\nJoanne K."),
-                    array('9971-5-0210-2', "Harry Potter\nand the Chamber of Secrets", "Rowling\nJoanne K."),
-                    array('960-425-059-0', 'The Lord of the Rings', "J. R. R.\nTolkien"),
-                ),
+            ],
+            [
+                ['ISBN', 'Title', 'Author'],
+                [
+                    ['99921-58-10-7', "Divine\nComedy", 'Dante Alighieri'],
+                    ['9971-5-0210-2', "Harry Potter\nand the Chamber of Secrets", "Rowling\nJoanne K."],
+                    ['9971-5-0210-2', "Harry Potter\nand the Chamber of Secrets", "Rowling\nJoanne K."],
+                    ['960-425-059-0', 'The Lord of the Rings', "J. R. R.\nTolkien"],
+                ],
                 'default',
 <<<'TABLE'
 +---------------+----------------------------+-----------------+
@@ -202,10 +202,10 @@ public function renderProvider()
 +---------------+----------------------------+-----------------+
 
 TABLE
-            ),
-            array(
-                array('ISBN', 'Title'),
-                array(),
+            ],
+            [
+                ['ISBN', 'Title'],
+                [],
                 'default',
 <<<'TABLE'
 +------+-------+
@@ -213,19 +213,19 @@ public function renderProvider()
 +------+-------+
 
 TABLE
-            ),
-            array(
-                array(),
-                array(),
+            ],
+            [
+                [],
+                [],
                 'default',
                 '',
-            ),
-            'Cell text with tags used for Output styling' => array(
-                array('ISBN', 'Title', 'Author'),
-                array(
-                    array('<info>99921-58-10-7</info>', '<error>Divine Comedy</error>', '<fg=blue;bg=white>Dante Alighieri</fg=blue;bg=white>'),
-                    array('9971-5-0210-0', 'A Tale of Two Cities', '<info>Charles Dickens</>'),
-                ),
+            ],
+            'Cell text with tags used for Output styling' => [
+                ['ISBN', 'Title', 'Author'],
+                [
+                    ['<info>99921-58-10-7</info>', '<error>Divine Comedy</error>', '<fg=blue;bg=white>Dante Alighieri</fg=blue;bg=white>'],
+                    ['9971-5-0210-0', 'A Tale of Two Cities', '<info>Charles Dickens</>'],
+                ],
                 'default',
 <<<'TABLE'
 +---------------+----------------------+-----------------+
@@ -236,13 +236,13 @@ public function renderProvider()
 +---------------+----------------------+-----------------+
 
 TABLE
-            ),
-            'Cell text with tags not used for Output styling' => array(
-                array('ISBN', 'Title', 'Author'),
-                array(
-                    array('<strong>99921-58-10-700</strong>', '<f>Divine Com</f>', 'Dante Alighieri'),
-                    array('9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens'),
-                ),
+            ],
+            'Cell text with tags not used for Output styling' => [
+                ['ISBN', 'Title', 'Author'],
+                [
+                    ['<strong>99921-58-10-700</strong>', '<f>Divine Com</f>', 'Dante Alighieri'],
+                    ['9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens'],
+                ],
                 'default',
 <<<'TABLE'
 +----------------------------------+----------------------+-----------------+
@@ -253,28 +253,28 @@ public function renderProvider()
 +----------------------------------+----------------------+-----------------+
 
 TABLE
-            ),
-            'Cell with colspan' => array(
-                array('ISBN', 'Title', 'Author'),
-                array(
-                    array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'),
+            ],
+            'Cell with colspan' => [
+                ['ISBN', 'Title', 'Author'],
+                [
+                    ['99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'],
                     new TableSeparator(),
-                    array(new TableCell('Divine Comedy(Dante Alighieri)', array('colspan' => 3))),
+                    [new TableCell('Divine Comedy(Dante Alighieri)', ['colspan' => 3])],
                     new TableSeparator(),
-                    array(
-                        new TableCell('Arduino: A Quick-Start Guide', array('colspan' => 2)),
+                    [
+                        new TableCell('Arduino: A Quick-Start Guide', ['colspan' => 2]),
                         'Mark Schmidt',
-                    ),
+                    ],
                     new TableSeparator(),
-                    array(
+                    [
                         '9971-5-0210-0',
-                        new TableCell("A Tale of \nTwo Cities", array('colspan' => 2)),
-                    ),
+                        new TableCell("A Tale of \nTwo Cities", ['colspan' => 2]),
+                    ],
                     new TableSeparator(),
-                    array(
-                        new TableCell('Cupiditate dicta atque porro, tempora exercitationem modi animi nulla nemo vel nihil!', array('colspan' => 3)),
-                    ),
-                ),
+                    [
+                        new TableCell('Cupiditate dicta atque porro, tempora exercitationem modi animi nulla nemo vel nihil!', ['colspan' => 3]),
+                    ],
+                ],
                 'default',
 <<<'TABLE'
 +-------------------------------+-------------------------------+-----------------------------+
@@ -293,21 +293,21 @@ public function renderProvider()
 +-------------------------------+-------------------------------+-----------------------------+
 
 TABLE
-            ),
-            'Cell with rowspan' => array(
-                array('ISBN', 'Title', 'Author'),
-                array(
-                    array(
-                        new TableCell('9971-5-0210-0', array('rowspan' => 3)),
-                        new TableCell('Divine Comedy', array('rowspan' => 2)),
+            ],
+            'Cell with rowspan' => [
+                ['ISBN', 'Title', 'Author'],
+                [
+                    [
+                        new TableCell('9971-5-0210-0', ['rowspan' => 3]),
+                        new TableCell('Divine Comedy', ['rowspan' => 2]),
                         'Dante Alighieri',
-                    ),
-                    array(),
-                    array("The Lord of \nthe Rings", "J. R. \nR. Tolkien"),
+                    ],
+                    [],
+                    ["The Lord of \nthe Rings", "J. R. \nR. Tolkien"],
                     new TableSeparator(),
-                    array('80-902734-1-6', new TableCell("And Then \nThere \nWere None", array('rowspan' => 3)), 'Agatha Christie'),
-                    array('80-902734-1-7', 'Test'),
-                ),
+                    ['80-902734-1-6', new TableCell("And Then \nThere \nWere None", ['rowspan' => 3]), 'Agatha Christie'],
+                    ['80-902734-1-7', 'Test'],
+                ],
                 'default',
 <<<'TABLE'
 +---------------+---------------+-----------------+
@@ -324,23 +324,23 @@ public function renderProvider()
 +---------------+---------------+-----------------+
 
 TABLE
-            ),
-            'Cell with rowspan and colspan' => array(
-                array('ISBN', 'Title', 'Author'),
-                array(
-                    array(
-                        new TableCell('9971-5-0210-0', array('rowspan' => 2, 'colspan' => 2)),
+            ],
+            'Cell with rowspan and colspan' => [
+                ['ISBN', 'Title', 'Author'],
+                [
+                    [
+                        new TableCell('9971-5-0210-0', ['rowspan' => 2, 'colspan' => 2]),
                         'Dante Alighieri',
-                    ),
-                    array('Charles Dickens'),
+                    ],
+                    ['Charles Dickens'],
                     new TableSeparator(),
-                    array(
+                    [
                         'Dante Alighieri',
-                        new TableCell('9971-5-0210-0', array('rowspan' => 3, 'colspan' => 2)),
-                    ),
-                    array('J. R. R. Tolkien'),
-                    array('J. R. R'),
-                ),
+                        new TableCell('9971-5-0210-0', ['rowspan' => 3, 'colspan' => 2]),
+                    ],
+                    ['J. R. R. Tolkien'],
+                    ['J. R. R'],
+                ],
                 'default',
 <<<'TABLE'
 +------------------+---------+-----------------+
@@ -355,27 +355,27 @@ public function renderProvider()
 +------------------+---------+-----------------+
 
 TABLE
-            ),
-            'Cell with rowspan and colspan contains new line break' => array(
-                array('ISBN', 'Title', 'Author'),
-                array(
-                    array(
-                        new TableCell("9971\n-5-\n021\n0-0", array('rowspan' => 2, 'colspan' => 2)),
+            ],
+            'Cell with rowspan and colspan contains new line break' => [
+                ['ISBN', 'Title', 'Author'],
+                [
+                    [
+                        new TableCell("9971\n-5-\n021\n0-0", ['rowspan' => 2, 'colspan' => 2]),
                         'Dante Alighieri',
-                    ),
-                    array('Charles Dickens'),
+                    ],
+                    ['Charles Dickens'],
                     new TableSeparator(),
-                    array(
+                    [
                         'Dante Alighieri',
-                        new TableCell("9971\n-5-\n021\n0-0", array('rowspan' => 2, 'colspan' => 2)),
-                    ),
-                    array('Charles Dickens'),
+                        new TableCell("9971\n-5-\n021\n0-0", ['rowspan' => 2, 'colspan' => 2]),
+                    ],
+                    ['Charles Dickens'],
                     new TableSeparator(),
-                    array(
-                        new TableCell("9971\n-5-\n021\n0-0", array('rowspan' => 2, 'colspan' => 2)),
-                        new TableCell("Dante \nAlighieri", array('rowspan' => 2, 'colspan' => 1)),
-                    ),
-                ),
+                    [
+                        new TableCell("9971\n-5-\n021\n0-0", ['rowspan' => 2, 'colspan' => 2]),
+                        new TableCell("Dante \nAlighieri", ['rowspan' => 2, 'colspan' => 1]),
+                    ],
+                ],
                 'default',
 <<<'TABLE'
 +-----------------+-------+-----------------+
@@ -398,21 +398,21 @@ public function renderProvider()
 +-----------------+-------+-----------------+
 
 TABLE
-            ),
-            'Cell with rowspan and colspan without using TableSeparator' => array(
-                array('ISBN', 'Title', 'Author'),
-                array(
-                    array(
-                        new TableCell("9971\n-5-\n021\n0-0", array('rowspan' => 2, 'colspan' => 2)),
+            ],
+            'Cell with rowspan and colspan without using TableSeparator' => [
+                ['ISBN', 'Title', 'Author'],
+                [
+                    [
+                        new TableCell("9971\n-5-\n021\n0-0", ['rowspan' => 2, 'colspan' => 2]),
                         'Dante Alighieri',
-                    ),
-                    array('Charles Dickens'),
-                    array(
+                    ],
+                    ['Charles Dickens'],
+                    [
                         'Dante Alighieri',
-                        new TableCell("9971\n-5-\n021\n0-0", array('rowspan' => 2, 'colspan' => 2)),
-                    ),
-                    array('Charles Dickens'),
-                ),
+                        new TableCell("9971\n-5-\n021\n0-0", ['rowspan' => 2, 'colspan' => 2]),
+                    ],
+                    ['Charles Dickens'],
+                ],
                 'default',
 <<<'TABLE'
 +-----------------+-------+-----------------+
@@ -429,17 +429,17 @@ public function renderProvider()
 +-----------------+-------+-----------------+
 
 TABLE
-            ),
-            'Cell with rowspan and colspan with separator inside a rowspan' => array(
-                array('ISBN', 'Author'),
-                array(
-                    array(
-                        new TableCell('9971-5-0210-0', array('rowspan' => 3, 'colspan' => 1)),
+            ],
+            'Cell with rowspan and colspan with separator inside a rowspan' => [
+                ['ISBN', 'Author'],
+                [
+                    [
+                        new TableCell('9971-5-0210-0', ['rowspan' => 3, 'colspan' => 1]),
                         'Dante Alighieri',
-                    ),
-                    array(new TableSeparator()),
-                    array('Charles Dickens'),
-                ),
+                    ],
+                    [new TableSeparator()],
+                    ['Charles Dickens'],
+                ],
                 'default',
 <<<'TABLE'
 +---------------+-----------------+
@@ -451,13 +451,13 @@ public function renderProvider()
 +---------------+-----------------+
 
 TABLE
-            ),
-            'Multiple header lines' => array(
-                array(
-                    array(new TableCell('Main title', array('colspan' => 3))),
-                    array('ISBN', 'Title', 'Author'),
-                ),
-                array(),
+            ],
+            'Multiple header lines' => [
+                [
+                    [new TableCell('Main title', ['colspan' => 3])],
+                    ['ISBN', 'Title', 'Author'],
+                ],
+                [],
                 'default',
 <<<'TABLE'
 +------+-------+--------+
@@ -467,17 +467,17 @@ public function renderProvider()
 +------+-------+--------+
 
 TABLE
-            ),
-            'Row with multiple cells' => array(
-                array(),
-                array(
-                    array(
-                        new TableCell('1', array('colspan' => 3)),
-                        new TableCell('2', array('colspan' => 2)),
-                        new TableCell('3', array('colspan' => 2)),
-                        new TableCell('4', array('colspan' => 2)),
-                    ),
-        ),
+            ],
+            'Row with multiple cells' => [
+                [],
+                [
+                    [
+                        new TableCell('1', ['colspan' => 3]),
+                        new TableCell('2', ['colspan' => 2]),
+                        new TableCell('3', ['colspan' => 2]),
+                        new TableCell('4', ['colspan' => 2]),
+                    ],
+        ],
                 'default',
 <<<'TABLE'
 +---+--+--+---+--+---+--+---+--+
@@ -485,22 +485,22 @@ public function renderProvider()
 +---+--+--+---+--+---+--+---+--+
 
 TABLE
-            ),
-            'Coslpan and table cells with comment style' => array(
-                array(
-                    new TableCell('<comment>Long Title</comment>', array('colspan' => 3)),
-                ),
-                array(
-                    array(
-                        new TableCell('9971-5-0210-0', array('colspan' => 3)),
-                    ),
+            ],
+            'Coslpan and table cells with comment style' => [
+                [
+                    new TableCell('<comment>Long Title</comment>', ['colspan' => 3]),
+                ],
+                [
+                    [
+                        new TableCell('9971-5-0210-0', ['colspan' => 3]),
+                    ],
                     new TableSeparator(),
-                    array(
+                    [
                         'Dante Alighieri',
                         'J. R. R. Tolkien',
                         'J. R. R',
-                    ),
-                ),
+                    ],
+                ],
                 'default',
                 <<<TABLE
 +-----------------+------------------+---------+
@@ -514,22 +514,22 @@ public function renderProvider()
 TABLE
             ,
                 true,
-            ),
-            'Row with formatted cells containing a newline' => array(
-                array(),
-                array(
-                    array(
-                        new TableCell('<error>Dont break'."\n".'here</error>', array('colspan' => 2)),
-                    ),
+            ],
+            'Row with formatted cells containing a newline' => [
+                [],
+                [
+                    [
+                        new TableCell('<error>Dont break'."\n".'here</error>', ['colspan' => 2]),
+                    ],
                     new TableSeparator(),
-                    array(
+                    [
                         'foo',
-                         new TableCell('<error>Dont break'."\n".'here</error>', array('rowspan' => 2)),
-                    ),
-                    array(
+                         new TableCell('<error>Dont break'."\n".'here</error>', ['rowspan' => 2]),
+                    ],
+                    [
                         'bar',
-                    ),
-                ),
+                    ],
+                ],
                 'default',
                 <<<'TABLE'
 +-------+------------+
@@ -543,16 +543,16 @@ public function renderProvider()
 TABLE
             ,
                 true,
-            ),
-        );
+            ],
+        ];
     }
 
     public function testRenderMultiByte()
     {
         $table = new Table($output = $this->getOutputStream());
         $table
-            ->setHeaders(array('■■'))
-            ->setRows(array(array(1234)))
+            ->setHeaders(['■■'])
+            ->setRows([[1234]])
             ->setStyle('default')
         ;
         $table->render();
@@ -574,7 +574,7 @@ public function testTableCellWithNumericIntValue()
     {
         $table = new Table($output = $this->getOutputStream());
 
-        $table->setRows(array(array(new TableCell(12345))));
+        $table->setRows([[new TableCell(12345)]]);
         $table->render();
 
         $expected =
@@ -592,7 +592,7 @@ public function testTableCellWithNumericFloatValue()
     {
         $table = new Table($output = $this->getOutputStream());
 
-        $table->setRows(array(array(new TableCell(12345.01))));
+        $table->setRows([[new TableCell(12345.01)]]);
         $table->render();
 
         $expected =
@@ -618,8 +618,8 @@ public function testStyle()
         Table::setStyleDefinition('dotfull', $style);
         $table = new Table($output = $this->getOutputStream());
         $table
-            ->setHeaders(array('Foo'))
-            ->setRows(array(array('Bar')))
+            ->setHeaders(['Foo'])
+            ->setRows([['Bar']])
             ->setStyle('dotfull');
         $table->render();
 
@@ -640,14 +640,14 @@ public function testRowSeparator()
     {
         $table = new Table($output = $this->getOutputStream());
         $table
-            ->setHeaders(array('Foo'))
-            ->setRows(array(
-                array('Bar1'),
+            ->setHeaders(['Foo'])
+            ->setRows([
+                ['Bar1'],
                 new TableSeparator(),
-                array('Bar2'),
+                ['Bar2'],
                 new TableSeparator(),
-                array('Bar3'),
-            ));
+                ['Bar3'],
+            ]);
         $table->render();
 
         $expected =
@@ -672,9 +672,9 @@ public function testRowSeparator()
     public function testRenderMultiCalls()
     {
         $table = new Table($output = $this->getOutputStream());
-        $table->setRows(array(
-            array(new TableCell('foo', array('colspan' => 2))),
-        ));
+        $table->setRows([
+            [new TableCell('foo', ['colspan' => 2])],
+        ]);
         $table->render();
         $table->render();
         $table->render();
@@ -700,11 +700,11 @@ public function testColumnStyle()
     {
         $table = new Table($output = $this->getOutputStream());
         $table
-            ->setHeaders(array('ISBN', 'Title', 'Author', 'Price'))
-            ->setRows(array(
-                array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri', '9.95'),
-                array('9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens', '139.25'),
-            ));
+            ->setHeaders(['ISBN', 'Title', 'Author', 'Price'])
+            ->setRows([
+                ['99921-58-10-7', 'Divine Comedy', 'Dante Alighieri', '9.95'],
+                ['9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens', '139.25'],
+            ]);
 
         $style = new TableStyle();
         $style->setPadType(STR_PAD_LEFT);
@@ -734,10 +734,10 @@ public function testThrowsWhenTheCellInAnArray()
     {
         $table = new Table($output = $this->getOutputStream());
         $table
-            ->setHeaders(array('ISBN', 'Title', 'Author', 'Price'))
-            ->setRows(array(
-                array('99921-58-10-7', array(), 'Dante Alighieri', '9.95'),
-            ));
+            ->setHeaders(['ISBN', 'Title', 'Author', 'Price'])
+            ->setRows([
+                ['99921-58-10-7', [], 'Dante Alighieri', '9.95'],
+            ]);
 
         $table->render();
     }
@@ -746,11 +746,11 @@ public function testColumnWidth()
     {
         $table = new Table($output = $this->getOutputStream());
         $table
-            ->setHeaders(array('ISBN', 'Title', 'Author', 'Price'))
-            ->setRows(array(
-                array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri', '9.95'),
-                array('9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens', '139.25'),
-            ))
+            ->setHeaders(['ISBN', 'Title', 'Author', 'Price'])
+            ->setRows([
+                ['99921-58-10-7', 'Divine Comedy', 'Dante Alighieri', '9.95'],
+                ['9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens', '139.25'],
+            ])
             ->setColumnWidth(0, 15)
             ->setColumnWidth(3, 10);
 
@@ -778,12 +778,12 @@ public function testColumnWidths()
     {
         $table = new Table($output = $this->getOutputStream());
         $table
-            ->setHeaders(array('ISBN', 'Title', 'Author', 'Price'))
-            ->setRows(array(
-                array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri', '9.95'),
-                array('9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens', '139.25'),
-            ))
-            ->setColumnWidths(array(15, 0, -1, 10));
+            ->setHeaders(['ISBN', 'Title', 'Author', 'Price'])
+            ->setRows([
+                ['99921-58-10-7', 'Divine Comedy', 'Dante Alighieri', '9.95'],
+                ['9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens', '139.25'],
+            ])
+            ->setColumnWidths([15, 0, -1, 10]);
 
         $style = new TableStyle();
         $style->setPadType(STR_PAD_LEFT);
@@ -836,12 +836,12 @@ public function testBoxedStyleWithColspan()
         $table = new Table($output = $this->getOutputStream());
         $table->setStyle($boxed);
         $table
-            ->setHeaders(array('ISBN', 'Title', 'Author'))
-            ->setRows(array(
-                array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'),
+            ->setHeaders(['ISBN', 'Title', 'Author'])
+            ->setRows([
+                ['99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'],
                 new TableSeparator(),
-                array(new TableCell('This value spans 3 columns.', array('colspan' => 3))),
-            ))
+                [new TableCell('This value spans 3 columns.', ['colspan' => 3])],
+            ])
         ;
         $table->render();
 
diff --git a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
index b91b6d71df790..37caaf2d1cd72 100644
--- a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
+++ b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
@@ -21,23 +21,23 @@ class ArgvInputTest extends TestCase
 {
     public function testConstructor()
     {
-        $_SERVER['argv'] = array('cli.php', 'foo');
+        $_SERVER['argv'] = ['cli.php', 'foo'];
         $input = new ArgvInput();
         $r = new \ReflectionObject($input);
         $p = $r->getProperty('tokens');
         $p->setAccessible(true);
 
-        $this->assertEquals(array('foo'), $p->getValue($input), '__construct() automatically get its input from the argv server variable');
+        $this->assertEquals(['foo'], $p->getValue($input), '__construct() automatically get its input from the argv server variable');
     }
 
     public function testParseArguments()
     {
-        $input = new ArgvInput(array('cli.php', 'foo'));
-        $input->bind(new InputDefinition(array(new InputArgument('name'))));
-        $this->assertEquals(array('name' => 'foo'), $input->getArguments(), '->parse() parses required arguments');
+        $input = new ArgvInput(['cli.php', 'foo']);
+        $input->bind(new InputDefinition([new InputArgument('name')]));
+        $this->assertEquals(['name' => 'foo'], $input->getArguments(), '->parse() parses required arguments');
 
-        $input->bind(new InputDefinition(array(new InputArgument('name'))));
-        $this->assertEquals(array('name' => 'foo'), $input->getArguments(), '->parse() is stateless');
+        $input->bind(new InputDefinition([new InputArgument('name')]));
+        $this->assertEquals(['name' => 'foo'], $input->getArguments(), '->parse() is stateless');
     }
 
     /**
@@ -53,128 +53,128 @@ public function testParseOptions($input, $options, $expectedOptions, $message)
 
     public function provideOptions()
     {
-        return array(
-            array(
-                array('cli.php', '--foo'),
-                array(new InputOption('foo')),
-                array('foo' => true),
+        return [
+            [
+                ['cli.php', '--foo'],
+                [new InputOption('foo')],
+                ['foo' => true],
                 '->parse() parses long options without a value',
-            ),
-            array(
-                array('cli.php', '--foo=bar'),
-                array(new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)),
-                array('foo' => 'bar'),
+            ],
+            [
+                ['cli.php', '--foo=bar'],
+                [new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)],
+                ['foo' => 'bar'],
                 '->parse() parses long options with a required value (with a = separator)',
-            ),
-            array(
-                array('cli.php', '--foo', 'bar'),
-                array(new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)),
-                array('foo' => 'bar'),
+            ],
+            [
+                ['cli.php', '--foo', 'bar'],
+                [new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)],
+                ['foo' => 'bar'],
                 '->parse() parses long options with a required value (with a space separator)',
-            ),
-            array(
-                array('cli.php', '--foo='),
-                array(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)),
-                array('foo' => ''),
+            ],
+            [
+                ['cli.php', '--foo='],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)],
+                ['foo' => ''],
                 '->parse() parses long options with optional value which is empty (with a = separator) as empty string',
-            ),
-            array(
-                array('cli.php', '--foo=', 'bar'),
-                array(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::REQUIRED)),
-                array('foo' => ''),
+            ],
+            [
+                ['cli.php', '--foo=', 'bar'],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::REQUIRED)],
+                ['foo' => ''],
                 '->parse() parses long options with optional value without value specified or an empty string (with a = separator) followed by an argument as empty string',
-            ),
-            array(
-                array('cli.php', 'bar', '--foo'),
-                array(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::REQUIRED)),
-                array('foo' => null),
+            ],
+            [
+                ['cli.php', 'bar', '--foo'],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::REQUIRED)],
+                ['foo' => null],
                 '->parse() parses long options with optional value which is empty (with a = separator) preceded by an argument',
-            ),
-            array(
-                array('cli.php', '--foo', '', 'bar'),
-                array(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::REQUIRED)),
-                array('foo' => ''),
+            ],
+            [
+                ['cli.php', '--foo', '', 'bar'],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::REQUIRED)],
+                ['foo' => ''],
                 '->parse() parses long options with optional value which is empty as empty string even followed by an argument',
-            ),
-            array(
-                array('cli.php', '--foo'),
-                array(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)),
-                array('foo' => null),
+            ],
+            [
+                ['cli.php', '--foo'],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)],
+                ['foo' => null],
                 '->parse() parses long options with optional value specified with no separator and no value as null',
-            ),
-            array(
-                array('cli.php', '-f'),
-                array(new InputOption('foo', 'f')),
-                array('foo' => true),
+            ],
+            [
+                ['cli.php', '-f'],
+                [new InputOption('foo', 'f')],
+                ['foo' => true],
                 '->parse() parses short options without a value',
-            ),
-            array(
-                array('cli.php', '-fbar'),
-                array(new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)),
-                array('foo' => 'bar'),
+            ],
+            [
+                ['cli.php', '-fbar'],
+                [new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)],
+                ['foo' => 'bar'],
                 '->parse() parses short options with a required value (with no separator)',
-            ),
-            array(
-                array('cli.php', '-f', 'bar'),
-                array(new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)),
-                array('foo' => 'bar'),
+            ],
+            [
+                ['cli.php', '-f', 'bar'],
+                [new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)],
+                ['foo' => 'bar'],
                 '->parse() parses short options with a required value (with a space separator)',
-            ),
-            array(
-                array('cli.php', '-f', ''),
-                array(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)),
-                array('foo' => ''),
+            ],
+            [
+                ['cli.php', '-f', ''],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)],
+                ['foo' => ''],
                 '->parse() parses short options with an optional empty value',
-            ),
-            array(
-                array('cli.php', '-f', '', 'foo'),
-                array(new InputArgument('name'), new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)),
-                array('foo' => ''),
+            ],
+            [
+                ['cli.php', '-f', '', 'foo'],
+                [new InputArgument('name'), new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)],
+                ['foo' => ''],
                 '->parse() parses short options with an optional empty value followed by an argument',
-            ),
-            array(
-                array('cli.php', '-f', '', '-b'),
-                array(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputOption('bar', 'b')),
-                array('foo' => '', 'bar' => true),
+            ],
+            [
+                ['cli.php', '-f', '', '-b'],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputOption('bar', 'b')],
+                ['foo' => '', 'bar' => true],
                 '->parse() parses short options with an optional empty value followed by an option',
-            ),
-            array(
-                array('cli.php', '-f', '-b', 'foo'),
-                array(new InputArgument('name'), new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputOption('bar', 'b')),
-                array('foo' => null, 'bar' => true),
+            ],
+            [
+                ['cli.php', '-f', '-b', 'foo'],
+                [new InputArgument('name'), new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputOption('bar', 'b')],
+                ['foo' => null, 'bar' => true],
                 '->parse() parses short options with an optional value which is not present',
-            ),
-            array(
-                array('cli.php', '-fb'),
-                array(new InputOption('foo', 'f'), new InputOption('bar', 'b')),
-                array('foo' => true, 'bar' => true),
+            ],
+            [
+                ['cli.php', '-fb'],
+                [new InputOption('foo', 'f'), new InputOption('bar', 'b')],
+                ['foo' => true, 'bar' => true],
                 '->parse() parses short options when they are aggregated as a single one',
-            ),
-            array(
-                array('cli.php', '-fb', 'bar'),
-                array(new InputOption('foo', 'f'), new InputOption('bar', 'b', InputOption::VALUE_REQUIRED)),
-                array('foo' => true, 'bar' => 'bar'),
+            ],
+            [
+                ['cli.php', '-fb', 'bar'],
+                [new InputOption('foo', 'f'), new InputOption('bar', 'b', InputOption::VALUE_REQUIRED)],
+                ['foo' => true, 'bar' => 'bar'],
                 '->parse() parses short options when they are aggregated as a single one and the last one has a required value',
-            ),
-            array(
-                array('cli.php', '-fb', 'bar'),
-                array(new InputOption('foo', 'f'), new InputOption('bar', 'b', InputOption::VALUE_OPTIONAL)),
-                array('foo' => true, 'bar' => 'bar'),
+            ],
+            [
+                ['cli.php', '-fb', 'bar'],
+                [new InputOption('foo', 'f'), new InputOption('bar', 'b', InputOption::VALUE_OPTIONAL)],
+                ['foo' => true, 'bar' => 'bar'],
                 '->parse() parses short options when they are aggregated as a single one and the last one has an optional value',
-            ),
-            array(
-                array('cli.php', '-fbbar'),
-                array(new InputOption('foo', 'f'), new InputOption('bar', 'b', InputOption::VALUE_OPTIONAL)),
-                array('foo' => true, 'bar' => 'bar'),
+            ],
+            [
+                ['cli.php', '-fbbar'],
+                [new InputOption('foo', 'f'), new InputOption('bar', 'b', InputOption::VALUE_OPTIONAL)],
+                ['foo' => true, 'bar' => 'bar'],
                 '->parse() parses short options when they are aggregated as a single one and the last one has an optional value with no separator',
-            ),
-            array(
-                array('cli.php', '-fbbar'),
-                array(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputOption('bar', 'b', InputOption::VALUE_OPTIONAL)),
-                array('foo' => 'bbar', 'bar' => null),
+            ],
+            [
+                ['cli.php', '-fbbar'],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputOption('bar', 'b', InputOption::VALUE_OPTIONAL)],
+                ['foo' => 'bbar', 'bar' => null],
                 '->parse() parses short options when they are aggregated as a single one and one of them takes a value',
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -195,162 +195,162 @@ public function testInvalidInput($argv, $definition, $expectedExceptionMessage)
 
     public function provideInvalidInput()
     {
-        return array(
-            array(
-                array('cli.php', '--foo'),
-                new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_REQUIRED))),
+        return [
+            [
+                ['cli.php', '--foo'],
+                new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)]),
                 'The "--foo" option requires a value.',
-            ),
-            array(
-                array('cli.php', '-f'),
-                new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_REQUIRED))),
+            ],
+            [
+                ['cli.php', '-f'],
+                new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)]),
                 'The "--foo" option requires a value.',
-            ),
-            array(
-                array('cli.php', '-ffoo'),
-                new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_NONE))),
+            ],
+            [
+                ['cli.php', '-ffoo'],
+                new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_NONE)]),
                 'The "-o" option does not exist.',
-            ),
-            array(
-                array('cli.php', '--foo=bar'),
-                new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_NONE))),
+            ],
+            [
+                ['cli.php', '--foo=bar'],
+                new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_NONE)]),
                 'The "--foo" option does not accept a value.',
-            ),
-            array(
-                array('cli.php', 'foo', 'bar'),
+            ],
+            [
+                ['cli.php', 'foo', 'bar'],
                 new InputDefinition(),
                 'No arguments expected, got "foo".',
-            ),
-            array(
-                array('cli.php', 'foo', 'bar'),
-                new InputDefinition(array(new InputArgument('number'))),
+            ],
+            [
+                ['cli.php', 'foo', 'bar'],
+                new InputDefinition([new InputArgument('number')]),
                 'Too many arguments, expected arguments "number".',
-            ),
-            array(
-                array('cli.php', 'foo', 'bar', 'zzz'),
-                new InputDefinition(array(new InputArgument('number'), new InputArgument('county'))),
+            ],
+            [
+                ['cli.php', 'foo', 'bar', 'zzz'],
+                new InputDefinition([new InputArgument('number'), new InputArgument('county')]),
                 'Too many arguments, expected arguments "number" "county".',
-            ),
-            array(
-                array('cli.php', '--foo'),
+            ],
+            [
+                ['cli.php', '--foo'],
                 new InputDefinition(),
                 'The "--foo" option does not exist.',
-            ),
-            array(
-                array('cli.php', '-f'),
+            ],
+            [
+                ['cli.php', '-f'],
                 new InputDefinition(),
                 'The "-f" option does not exist.',
-            ),
-            array(
-                array('cli.php', '-1'),
-                new InputDefinition(array(new InputArgument('number'))),
+            ],
+            [
+                ['cli.php', '-1'],
+                new InputDefinition([new InputArgument('number')]),
                 'The "-1" option does not exist.',
-            ),
-            array(
-                array('cli.php', '-fЩ'),
-                new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_NONE))),
+            ],
+            [
+                ['cli.php', '-fЩ'],
+                new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_NONE)]),
                 'The "-Щ" option does not exist.',
-            ),
-        );
+            ],
+        ];
     }
 
     public function testParseArrayArgument()
     {
-        $input = new ArgvInput(array('cli.php', 'foo', 'bar', 'baz', 'bat'));
-        $input->bind(new InputDefinition(array(new InputArgument('name', InputArgument::IS_ARRAY))));
+        $input = new ArgvInput(['cli.php', 'foo', 'bar', 'baz', 'bat']);
+        $input->bind(new InputDefinition([new InputArgument('name', InputArgument::IS_ARRAY)]));
 
-        $this->assertEquals(array('name' => array('foo', 'bar', 'baz', 'bat')), $input->getArguments(), '->parse() parses array arguments');
+        $this->assertEquals(['name' => ['foo', 'bar', 'baz', 'bat']], $input->getArguments(), '->parse() parses array arguments');
     }
 
     public function testParseArrayOption()
     {
-        $input = new ArgvInput(array('cli.php', '--name=foo', '--name=bar', '--name=baz'));
-        $input->bind(new InputDefinition(array(new InputOption('name', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY))));
+        $input = new ArgvInput(['cli.php', '--name=foo', '--name=bar', '--name=baz']);
+        $input->bind(new InputDefinition([new InputOption('name', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY)]));
 
-        $this->assertEquals(array('name' => array('foo', 'bar', 'baz')), $input->getOptions(), '->parse() parses array options ("--option=value" syntax)');
+        $this->assertEquals(['name' => ['foo', 'bar', 'baz']], $input->getOptions(), '->parse() parses array options ("--option=value" syntax)');
 
-        $input = new ArgvInput(array('cli.php', '--name', 'foo', '--name', 'bar', '--name', 'baz'));
-        $input->bind(new InputDefinition(array(new InputOption('name', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY))));
-        $this->assertEquals(array('name' => array('foo', 'bar', 'baz')), $input->getOptions(), '->parse() parses array options ("--option value" syntax)');
+        $input = new ArgvInput(['cli.php', '--name', 'foo', '--name', 'bar', '--name', 'baz']);
+        $input->bind(new InputDefinition([new InputOption('name', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY)]));
+        $this->assertEquals(['name' => ['foo', 'bar', 'baz']], $input->getOptions(), '->parse() parses array options ("--option value" syntax)');
 
-        $input = new ArgvInput(array('cli.php', '--name=foo', '--name=bar', '--name='));
-        $input->bind(new InputDefinition(array(new InputOption('name', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY))));
-        $this->assertSame(array('name' => array('foo', 'bar', '')), $input->getOptions(), '->parse() parses empty array options as null ("--option=value" syntax)');
+        $input = new ArgvInput(['cli.php', '--name=foo', '--name=bar', '--name=']);
+        $input->bind(new InputDefinition([new InputOption('name', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY)]));
+        $this->assertSame(['name' => ['foo', 'bar', '']], $input->getOptions(), '->parse() parses empty array options as null ("--option=value" syntax)');
 
-        $input = new ArgvInput(array('cli.php', '--name', 'foo', '--name', 'bar', '--name', '--anotherOption'));
-        $input->bind(new InputDefinition(array(
+        $input = new ArgvInput(['cli.php', '--name', 'foo', '--name', 'bar', '--name', '--anotherOption']);
+        $input->bind(new InputDefinition([
             new InputOption('name', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY),
             new InputOption('anotherOption', null, InputOption::VALUE_NONE),
-        )));
-        $this->assertSame(array('name' => array('foo', 'bar', null), 'anotherOption' => true), $input->getOptions(), '->parse() parses empty array options ("--option value" syntax)');
+        ]));
+        $this->assertSame(['name' => ['foo', 'bar', null], 'anotherOption' => true], $input->getOptions(), '->parse() parses empty array options ("--option value" syntax)');
     }
 
     public function testParseNegativeNumberAfterDoubleDash()
     {
-        $input = new ArgvInput(array('cli.php', '--', '-1'));
-        $input->bind(new InputDefinition(array(new InputArgument('number'))));
-        $this->assertEquals(array('number' => '-1'), $input->getArguments(), '->parse() parses arguments with leading dashes as arguments after having encountered a double-dash sequence');
-
-        $input = new ArgvInput(array('cli.php', '-f', 'bar', '--', '-1'));
-        $input->bind(new InputDefinition(array(new InputArgument('number'), new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL))));
-        $this->assertEquals(array('foo' => 'bar'), $input->getOptions(), '->parse() parses arguments with leading dashes as options before having encountered a double-dash sequence');
-        $this->assertEquals(array('number' => '-1'), $input->getArguments(), '->parse() parses arguments with leading dashes as arguments after having encountered a double-dash sequence');
+        $input = new ArgvInput(['cli.php', '--', '-1']);
+        $input->bind(new InputDefinition([new InputArgument('number')]));
+        $this->assertEquals(['number' => '-1'], $input->getArguments(), '->parse() parses arguments with leading dashes as arguments after having encountered a double-dash sequence');
+
+        $input = new ArgvInput(['cli.php', '-f', 'bar', '--', '-1']);
+        $input->bind(new InputDefinition([new InputArgument('number'), new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)]));
+        $this->assertEquals(['foo' => 'bar'], $input->getOptions(), '->parse() parses arguments with leading dashes as options before having encountered a double-dash sequence');
+        $this->assertEquals(['number' => '-1'], $input->getArguments(), '->parse() parses arguments with leading dashes as arguments after having encountered a double-dash sequence');
     }
 
     public function testParseEmptyStringArgument()
     {
-        $input = new ArgvInput(array('cli.php', '-f', 'bar', ''));
-        $input->bind(new InputDefinition(array(new InputArgument('empty'), new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL))));
+        $input = new ArgvInput(['cli.php', '-f', 'bar', '']);
+        $input->bind(new InputDefinition([new InputArgument('empty'), new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)]));
 
-        $this->assertEquals(array('empty' => ''), $input->getArguments(), '->parse() parses empty string arguments');
+        $this->assertEquals(['empty' => ''], $input->getArguments(), '->parse() parses empty string arguments');
     }
 
     public function testGetFirstArgument()
     {
-        $input = new ArgvInput(array('cli.php', '-fbbar'));
+        $input = new ArgvInput(['cli.php', '-fbbar']);
         $this->assertNull($input->getFirstArgument(), '->getFirstArgument() returns null when there is no arguments');
 
-        $input = new ArgvInput(array('cli.php', '-fbbar', 'foo'));
+        $input = new ArgvInput(['cli.php', '-fbbar', 'foo']);
         $this->assertEquals('foo', $input->getFirstArgument(), '->getFirstArgument() returns the first argument from the raw input');
     }
 
     public function testHasParameterOption()
     {
-        $input = new ArgvInput(array('cli.php', '-f', 'foo'));
+        $input = new ArgvInput(['cli.php', '-f', 'foo']);
         $this->assertTrue($input->hasParameterOption('-f'), '->hasParameterOption() returns true if the given short option is in the raw input');
 
-        $input = new ArgvInput(array('cli.php', '-etest'));
+        $input = new ArgvInput(['cli.php', '-etest']);
         $this->assertTrue($input->hasParameterOption('-e'), '->hasParameterOption() returns true if the given short option is in the raw input');
         $this->assertFalse($input->hasParameterOption('-s'), '->hasParameterOption() returns true if the given short option is in the raw input');
 
-        $input = new ArgvInput(array('cli.php', '--foo', 'foo'));
+        $input = new ArgvInput(['cli.php', '--foo', 'foo']);
         $this->assertTrue($input->hasParameterOption('--foo'), '->hasParameterOption() returns true if the given short option is in the raw input');
 
-        $input = new ArgvInput(array('cli.php', 'foo'));
+        $input = new ArgvInput(['cli.php', 'foo']);
         $this->assertFalse($input->hasParameterOption('--foo'), '->hasParameterOption() returns false if the given short option is not in the raw input');
 
-        $input = new ArgvInput(array('cli.php', '--foo=bar'));
+        $input = new ArgvInput(['cli.php', '--foo=bar']);
         $this->assertTrue($input->hasParameterOption('--foo'), '->hasParameterOption() returns true if the given option with provided value is in the raw input');
     }
 
     public function testHasParameterOptionOnlyOptions()
     {
-        $input = new ArgvInput(array('cli.php', '-f', 'foo'));
+        $input = new ArgvInput(['cli.php', '-f', 'foo']);
         $this->assertTrue($input->hasParameterOption('-f', true), '->hasParameterOption() returns true if the given short option is in the raw input');
 
-        $input = new ArgvInput(array('cli.php', '--foo', '--', 'foo'));
+        $input = new ArgvInput(['cli.php', '--foo', '--', 'foo']);
         $this->assertTrue($input->hasParameterOption('--foo', true), '->hasParameterOption() returns true if the given long option is in the raw input');
 
-        $input = new ArgvInput(array('cli.php', '--foo=bar', 'foo'));
+        $input = new ArgvInput(['cli.php', '--foo=bar', 'foo']);
         $this->assertTrue($input->hasParameterOption('--foo', true), '->hasParameterOption() returns true if the given long option with provided value is in the raw input');
 
-        $input = new ArgvInput(array('cli.php', '--', '--foo'));
+        $input = new ArgvInput(['cli.php', '--', '--foo']);
         $this->assertFalse($input->hasParameterOption('--foo', true), '->hasParameterOption() returns false if the given option is in the raw input but after an end of options signal');
     }
 
     public function testHasParameterOptionEdgeCasesAndLimitations()
     {
-        $input = new ArgvInput(array('cli.php', '-fh'));
+        $input = new ArgvInput(['cli.php', '-fh']);
         // hasParameterOption does not know if the previous short option, -f,
         // takes a value or not. If -f takes a value, then -fh does NOT include
         // -h; Otherwise it does. Since we do not know which short options take
@@ -368,7 +368,7 @@ public function testHasParameterOptionEdgeCasesAndLimitations()
         // However, this is not supported.
         $this->assertFalse($input->hasParameterOption('-hf'), '->hasParameterOption() returns true if the given short option is in the raw input');
 
-        $input = new ArgvInput(array('cli.php', '-f', '-h'));
+        $input = new ArgvInput(['cli.php', '-f', '-h']);
         // If hasParameterOption('-fh') is supported for 'cli.php -fh', then
         // one might also expect that it should also be supported for
         // 'cli.php -f -h'. However, this is not supported.
@@ -377,23 +377,23 @@ public function testHasParameterOptionEdgeCasesAndLimitations()
 
     public function testNoWarningOnInvalidParameterOption()
     {
-        $input = new ArgvInput(array('cli.php', '-edev'));
+        $input = new ArgvInput(['cli.php', '-edev']);
 
-        $this->assertTrue($input->hasParameterOption(array('-e', '')));
+        $this->assertTrue($input->hasParameterOption(['-e', '']));
         // No warning thrown
-        $this->assertFalse($input->hasParameterOption(array('-m', '')));
+        $this->assertFalse($input->hasParameterOption(['-m', '']));
 
-        $this->assertEquals('dev', $input->getParameterOption(array('-e', '')));
+        $this->assertEquals('dev', $input->getParameterOption(['-e', '']));
         // No warning thrown
-        $this->assertFalse($input->getParameterOption(array('-m', '')));
+        $this->assertFalse($input->getParameterOption(['-m', '']));
     }
 
     public function testToString()
     {
-        $input = new ArgvInput(array('cli.php', '-f', 'foo'));
+        $input = new ArgvInput(['cli.php', '-f', 'foo']);
         $this->assertEquals('-f foo', (string) $input);
 
-        $input = new ArgvInput(array('cli.php', '-f', '--bar=foo', 'a b c d', "A\nB'C"));
+        $input = new ArgvInput(['cli.php', '-f', '--bar=foo', 'a b c d', "A\nB'C"]);
         $this->assertEquals('-f --bar=foo '.escapeshellarg('a b c d').' '.escapeshellarg("A\nB'C"), (string) $input);
     }
 
@@ -408,51 +408,51 @@ public function testGetParameterOptionEqualSign($argv, $key, $default, $onlyPara
 
     public function provideGetParameterOptionValues()
     {
-        return array(
-            array(array('app/console', 'foo:bar'), '-e', 'default', false, 'default'),
-            array(array('app/console', 'foo:bar', '-e', 'dev'), '-e', 'default', false, 'dev'),
-            array(array('app/console', 'foo:bar', '--env=dev'), '--env', 'default', false, 'dev'),
-            array(array('app/console', 'foo:bar', '-e', 'dev'), array('-e', '--env'), 'default', false, 'dev'),
-            array(array('app/console', 'foo:bar', '--env=dev'), array('-e', '--env'), 'default', false, 'dev'),
-            array(array('app/console', 'foo:bar', '--env=dev', '--en=1'), array('--en'), 'default', false, '1'),
-            array(array('app/console', 'foo:bar', '--env=dev', '', '--en=1'), array('--en'), 'default', false, '1'),
-            array(array('app/console', 'foo:bar', '--env', 'val'), '--env', 'default', false, 'val'),
-            array(array('app/console', 'foo:bar', '--env', 'val', '--dummy'), '--env', 'default', false, 'val'),
-            array(array('app/console', 'foo:bar', '--', '--env=dev'), '--env', 'default', false, 'dev'),
-            array(array('app/console', 'foo:bar', '--', '--env=dev'), '--env', 'default', true, 'default'),
-        );
+        return [
+            [['app/console', 'foo:bar'], '-e', 'default', false, 'default'],
+            [['app/console', 'foo:bar', '-e', 'dev'], '-e', 'default', false, 'dev'],
+            [['app/console', 'foo:bar', '--env=dev'], '--env', 'default', false, 'dev'],
+            [['app/console', 'foo:bar', '-e', 'dev'], ['-e', '--env'], 'default', false, 'dev'],
+            [['app/console', 'foo:bar', '--env=dev'], ['-e', '--env'], 'default', false, 'dev'],
+            [['app/console', 'foo:bar', '--env=dev', '--en=1'], ['--en'], 'default', false, '1'],
+            [['app/console', 'foo:bar', '--env=dev', '', '--en=1'], ['--en'], 'default', false, '1'],
+            [['app/console', 'foo:bar', '--env', 'val'], '--env', 'default', false, 'val'],
+            [['app/console', 'foo:bar', '--env', 'val', '--dummy'], '--env', 'default', false, 'val'],
+            [['app/console', 'foo:bar', '--', '--env=dev'], '--env', 'default', false, 'dev'],
+            [['app/console', 'foo:bar', '--', '--env=dev'], '--env', 'default', true, 'default'],
+        ];
     }
 
     public function testParseSingleDashAsArgument()
     {
-        $input = new ArgvInput(array('cli.php', '-'));
-        $input->bind(new InputDefinition(array(new InputArgument('file'))));
-        $this->assertEquals(array('file' => '-'), $input->getArguments(), '->parse() parses single dash as an argument');
+        $input = new ArgvInput(['cli.php', '-']);
+        $input->bind(new InputDefinition([new InputArgument('file')]));
+        $this->assertEquals(['file' => '-'], $input->getArguments(), '->parse() parses single dash as an argument');
     }
 
     public function testParseOptionWithValueOptionalGivenEmptyAndRequiredArgument()
     {
-        $input = new ArgvInput(array('cli.php', '--foo=', 'bar'));
-        $input->bind(new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::REQUIRED))));
-        $this->assertEquals(array('foo' => null), $input->getOptions(), '->parse() parses optional options with empty value as null');
-        $this->assertEquals(array('name' => 'bar'), $input->getArguments(), '->parse() parses required arguments');
-
-        $input = new ArgvInput(array('cli.php', '--foo=0', 'bar'));
-        $input->bind(new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::REQUIRED))));
-        $this->assertEquals(array('foo' => '0'), $input->getOptions(), '->parse() parses optional options with empty value as null');
-        $this->assertEquals(array('name' => 'bar'), $input->getArguments(), '->parse() parses required arguments');
+        $input = new ArgvInput(['cli.php', '--foo=', 'bar']);
+        $input->bind(new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::REQUIRED)]));
+        $this->assertEquals(['foo' => null], $input->getOptions(), '->parse() parses optional options with empty value as null');
+        $this->assertEquals(['name' => 'bar'], $input->getArguments(), '->parse() parses required arguments');
+
+        $input = new ArgvInput(['cli.php', '--foo=0', 'bar']);
+        $input->bind(new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::REQUIRED)]));
+        $this->assertEquals(['foo' => '0'], $input->getOptions(), '->parse() parses optional options with empty value as null');
+        $this->assertEquals(['name' => 'bar'], $input->getArguments(), '->parse() parses required arguments');
     }
 
     public function testParseOptionWithValueOptionalGivenEmptyAndOptionalArgument()
     {
-        $input = new ArgvInput(array('cli.php', '--foo=', 'bar'));
-        $input->bind(new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::OPTIONAL))));
-        $this->assertEquals(array('foo' => null), $input->getOptions(), '->parse() parses optional options with empty value as null');
-        $this->assertEquals(array('name' => 'bar'), $input->getArguments(), '->parse() parses optional arguments');
-
-        $input = new ArgvInput(array('cli.php', '--foo=0', 'bar'));
-        $input->bind(new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::OPTIONAL))));
-        $this->assertEquals(array('foo' => '0'), $input->getOptions(), '->parse() parses optional options with empty value as null');
-        $this->assertEquals(array('name' => 'bar'), $input->getArguments(), '->parse() parses optional arguments');
+        $input = new ArgvInput(['cli.php', '--foo=', 'bar']);
+        $input->bind(new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::OPTIONAL)]));
+        $this->assertEquals(['foo' => null], $input->getOptions(), '->parse() parses optional options with empty value as null');
+        $this->assertEquals(['name' => 'bar'], $input->getArguments(), '->parse() parses optional arguments');
+
+        $input = new ArgvInput(['cli.php', '--foo=0', 'bar']);
+        $input->bind(new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::OPTIONAL)]));
+        $this->assertEquals(['foo' => '0'], $input->getOptions(), '->parse() parses optional options with empty value as null');
+        $this->assertEquals(['name' => 'bar'], $input->getArguments(), '->parse() parses optional arguments');
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Input/ArrayInputTest.php b/src/Symfony/Component/Console/Tests/Input/ArrayInputTest.php
index 4bc83b3caffa1..afe74831e367a 100644
--- a/src/Symfony/Component/Console/Tests/Input/ArrayInputTest.php
+++ b/src/Symfony/Component/Console/Tests/Input/ArrayInputTest.php
@@ -21,47 +21,47 @@ class ArrayInputTest extends TestCase
 {
     public function testGetFirstArgument()
     {
-        $input = new ArrayInput(array());
+        $input = new ArrayInput([]);
         $this->assertNull($input->getFirstArgument(), '->getFirstArgument() returns null if no argument were passed');
-        $input = new ArrayInput(array('name' => 'Fabien'));
+        $input = new ArrayInput(['name' => 'Fabien']);
         $this->assertEquals('Fabien', $input->getFirstArgument(), '->getFirstArgument() returns the first passed argument');
-        $input = new ArrayInput(array('--foo' => 'bar', 'name' => 'Fabien'));
+        $input = new ArrayInput(['--foo' => 'bar', 'name' => 'Fabien']);
         $this->assertEquals('Fabien', $input->getFirstArgument(), '->getFirstArgument() returns the first passed argument');
     }
 
     public function testHasParameterOption()
     {
-        $input = new ArrayInput(array('name' => 'Fabien', '--foo' => 'bar'));
+        $input = new ArrayInput(['name' => 'Fabien', '--foo' => 'bar']);
         $this->assertTrue($input->hasParameterOption('--foo'), '->hasParameterOption() returns true if an option is present in the passed parameters');
         $this->assertFalse($input->hasParameterOption('--bar'), '->hasParameterOption() returns false if an option is not present in the passed parameters');
 
-        $input = new ArrayInput(array('--foo'));
+        $input = new ArrayInput(['--foo']);
         $this->assertTrue($input->hasParameterOption('--foo'), '->hasParameterOption() returns true if an option is present in the passed parameters');
 
-        $input = new ArrayInput(array('--foo', '--', '--bar'));
+        $input = new ArrayInput(['--foo', '--', '--bar']);
         $this->assertTrue($input->hasParameterOption('--bar'), '->hasParameterOption() returns true if an option is present in the passed parameters');
         $this->assertFalse($input->hasParameterOption('--bar', true), '->hasParameterOption() returns false if an option is present in the passed parameters after an end of options signal');
     }
 
     public function testGetParameterOption()
     {
-        $input = new ArrayInput(array('name' => 'Fabien', '--foo' => 'bar'));
+        $input = new ArrayInput(['name' => 'Fabien', '--foo' => 'bar']);
         $this->assertEquals('bar', $input->getParameterOption('--foo'), '->getParameterOption() returns the option of specified name');
         $this->assertEquals('default', $input->getParameterOption('--bar', 'default'), '->getParameterOption() returns the default value if an option is not present in the passed parameters');
 
-        $input = new ArrayInput(array('Fabien', '--foo' => 'bar'));
+        $input = new ArrayInput(['Fabien', '--foo' => 'bar']);
         $this->assertEquals('bar', $input->getParameterOption('--foo'), '->getParameterOption() returns the option of specified name');
 
-        $input = new ArrayInput(array('--foo', '--', '--bar' => 'woop'));
+        $input = new ArrayInput(['--foo', '--', '--bar' => 'woop']);
         $this->assertEquals('woop', $input->getParameterOption('--bar'), '->getParameterOption() returns the correct value if an option is present in the passed parameters');
         $this->assertEquals('default', $input->getParameterOption('--bar', 'default', true), '->getParameterOption() returns the default value if an option is present in the passed parameters after an end of options signal');
     }
 
     public function testParseArguments()
     {
-        $input = new ArrayInput(array('name' => 'foo'), new InputDefinition(array(new InputArgument('name'))));
+        $input = new ArrayInput(['name' => 'foo'], new InputDefinition([new InputArgument('name')]));
 
-        $this->assertEquals(array('name' => 'foo'), $input->getArguments(), '->parse() parses required arguments');
+        $this->assertEquals(['name' => 'foo'], $input->getArguments(), '->parse() parses required arguments');
     }
 
     /**
@@ -76,50 +76,50 @@ public function testParseOptions($input, $options, $expectedOptions, $message)
 
     public function provideOptions()
     {
-        return array(
-            array(
-                array('--foo' => 'bar'),
-                array(new InputOption('foo')),
-                array('foo' => 'bar'),
+        return [
+            [
+                ['--foo' => 'bar'],
+                [new InputOption('foo')],
+                ['foo' => 'bar'],
                 '->parse() parses long options',
-            ),
-            array(
-                array('--foo' => 'bar'),
-                array(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL, '', 'default')),
-                array('foo' => 'bar'),
+            ],
+            [
+                ['--foo' => 'bar'],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL, '', 'default')],
+                ['foo' => 'bar'],
                 '->parse() parses long options with a default value',
-            ),
-            array(
-                array(),
-                array(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL, '', 'default')),
-                array('foo' => 'default'),
+            ],
+            [
+                [],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL, '', 'default')],
+                ['foo' => 'default'],
                 '->parse() uses the default value for long options with value optional which are not passed',
-            ),
-            array(
-                array('--foo' => null),
-                array(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL, '', 'default')),
-                array('foo' => null),
+            ],
+            [
+                ['--foo' => null],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL, '', 'default')],
+                ['foo' => null],
                 '->parse() parses long options with a default value',
-            ),
-            array(
-                array('-f' => 'bar'),
-                array(new InputOption('foo', 'f')),
-                array('foo' => 'bar'),
+            ],
+            [
+                ['-f' => 'bar'],
+                [new InputOption('foo', 'f')],
+                ['foo' => 'bar'],
                 '->parse() parses short options',
-            ),
-            array(
-                array('--' => null, '-f' => 'bar'),
-                array(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL, '', 'default')),
-                array('foo' => 'default'),
+            ],
+            [
+                ['--' => null, '-f' => 'bar'],
+                [new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL, '', 'default')],
+                ['foo' => 'default'],
                 '->parse() does not parse opts after an end of options signal',
-            ),
-            array(
-                array('--' => null),
-                array(),
-                array(),
+            ],
+            [
+                ['--' => null],
+                [],
+                [],
                 '->parse() does not choke on end of options signal',
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -139,39 +139,39 @@ public function testParseInvalidInput($parameters, $definition, $expectedExcepti
 
     public function provideInvalidInput()
     {
-        return array(
-            array(
-                array('foo' => 'foo'),
-                new InputDefinition(array(new InputArgument('name'))),
+        return [
+            [
+                ['foo' => 'foo'],
+                new InputDefinition([new InputArgument('name')]),
                 'The "foo" argument does not exist.',
-            ),
-            array(
-                array('--foo' => null),
-                new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_REQUIRED))),
+            ],
+            [
+                ['--foo' => null],
+                new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_REQUIRED)]),
                 'The "--foo" option requires a value.',
-            ),
-            array(
-                array('--foo' => 'foo'),
+            ],
+            [
+                ['--foo' => 'foo'],
                 new InputDefinition(),
                 'The "--foo" option does not exist.',
-            ),
-            array(
-                array('-o' => 'foo'),
+            ],
+            [
+                ['-o' => 'foo'],
                 new InputDefinition(),
                 'The "-o" option does not exist.',
-            ),
-        );
+            ],
+        ];
     }
 
     public function testToString()
     {
-        $input = new ArrayInput(array('-f' => null, '-b' => 'bar', '--foo' => 'b a z', '--lala' => null, 'test' => 'Foo', 'test2' => "A\nB'C"));
+        $input = new ArrayInput(['-f' => null, '-b' => 'bar', '--foo' => 'b a z', '--lala' => null, 'test' => 'Foo', 'test2' => "A\nB'C"]);
         $this->assertEquals('-f -b=bar --foo='.escapeshellarg('b a z').' --lala Foo '.escapeshellarg("A\nB'C"), (string) $input);
 
-        $input = new ArrayInput(array('-b' => array('bval_1', 'bval_2'), '--f' => array('fval_1', 'fval_2')));
+        $input = new ArrayInput(['-b' => ['bval_1', 'bval_2'], '--f' => ['fval_1', 'fval_2']]);
         $this->assertSame('-b=bval_1 -b=bval_2 --f=fval_1 --f=fval_2', (string) $input);
 
-        $input = new ArrayInput(array('array_arg' => array('val_1', 'val_2')));
+        $input = new ArrayInput(['array_arg' => ['val_1', 'val_2']]);
         $this->assertSame('val_1 val_2', (string) $input);
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Input/InputArgumentTest.php b/src/Symfony/Component/Console/Tests/Input/InputArgumentTest.php
index 66af98b33b666..661d5f061a7d6 100644
--- a/src/Symfony/Component/Console/Tests/Input/InputArgumentTest.php
+++ b/src/Symfony/Component/Console/Tests/Input/InputArgumentTest.php
@@ -91,8 +91,8 @@ public function testSetDefault()
         $this->assertEquals('another', $argument->getDefault(), '->setDefault() changes the default value');
 
         $argument = new InputArgument('foo', InputArgument::OPTIONAL | InputArgument::IS_ARRAY);
-        $argument->setDefault(array(1, 2));
-        $this->assertEquals(array(1, 2), $argument->getDefault(), '->setDefault() changes the default value');
+        $argument->setDefault([1, 2]);
+        $this->assertEquals([1, 2], $argument->getDefault(), '->setDefault() changes the default value');
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php b/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php
index d9ff5435b2a71..f040b87befca3 100644
--- a/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php
+++ b/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php
@@ -35,10 +35,10 @@ public function testConstructorArguments()
         $this->initializeArguments();
 
         $definition = new InputDefinition();
-        $this->assertEquals(array(), $definition->getArguments(), '__construct() creates a new InputDefinition object');
+        $this->assertEquals([], $definition->getArguments(), '__construct() creates a new InputDefinition object');
 
-        $definition = new InputDefinition(array($this->foo, $this->bar));
-        $this->assertEquals(array('foo' => $this->foo, 'bar' => $this->bar), $definition->getArguments(), '__construct() takes an array of InputArgument objects as its first argument');
+        $definition = new InputDefinition([$this->foo, $this->bar]);
+        $this->assertEquals(['foo' => $this->foo, 'bar' => $this->bar], $definition->getArguments(), '__construct() takes an array of InputArgument objects as its first argument');
     }
 
     public function testConstructorOptions()
@@ -46,10 +46,10 @@ public function testConstructorOptions()
         $this->initializeOptions();
 
         $definition = new InputDefinition();
-        $this->assertEquals(array(), $definition->getOptions(), '__construct() creates a new InputDefinition object');
+        $this->assertEquals([], $definition->getOptions(), '__construct() creates a new InputDefinition object');
 
-        $definition = new InputDefinition(array($this->foo, $this->bar));
-        $this->assertEquals(array('foo' => $this->foo, 'bar' => $this->bar), $definition->getOptions(), '__construct() takes an array of InputOption objects as its first argument');
+        $definition = new InputDefinition([$this->foo, $this->bar]);
+        $this->assertEquals(['foo' => $this->foo, 'bar' => $this->bar], $definition->getOptions(), '__construct() takes an array of InputOption objects as its first argument');
     }
 
     public function testSetArguments()
@@ -57,11 +57,11 @@ public function testSetArguments()
         $this->initializeArguments();
 
         $definition = new InputDefinition();
-        $definition->setArguments(array($this->foo));
-        $this->assertEquals(array('foo' => $this->foo), $definition->getArguments(), '->setArguments() sets the array of InputArgument objects');
-        $definition->setArguments(array($this->bar));
+        $definition->setArguments([$this->foo]);
+        $this->assertEquals(['foo' => $this->foo], $definition->getArguments(), '->setArguments() sets the array of InputArgument objects');
+        $definition->setArguments([$this->bar]);
 
-        $this->assertEquals(array('bar' => $this->bar), $definition->getArguments(), '->setArguments() clears all InputArgument objects');
+        $this->assertEquals(['bar' => $this->bar], $definition->getArguments(), '->setArguments() clears all InputArgument objects');
     }
 
     public function testAddArguments()
@@ -69,10 +69,10 @@ public function testAddArguments()
         $this->initializeArguments();
 
         $definition = new InputDefinition();
-        $definition->addArguments(array($this->foo));
-        $this->assertEquals(array('foo' => $this->foo), $definition->getArguments(), '->addArguments() adds an array of InputArgument objects');
-        $definition->addArguments(array($this->bar));
-        $this->assertEquals(array('foo' => $this->foo, 'bar' => $this->bar), $definition->getArguments(), '->addArguments() does not clear existing InputArgument objects');
+        $definition->addArguments([$this->foo]);
+        $this->assertEquals(['foo' => $this->foo], $definition->getArguments(), '->addArguments() adds an array of InputArgument objects');
+        $definition->addArguments([$this->bar]);
+        $this->assertEquals(['foo' => $this->foo, 'bar' => $this->bar], $definition->getArguments(), '->addArguments() does not clear existing InputArgument objects');
     }
 
     public function testAddArgument()
@@ -81,9 +81,9 @@ public function testAddArgument()
 
         $definition = new InputDefinition();
         $definition->addArgument($this->foo);
-        $this->assertEquals(array('foo' => $this->foo), $definition->getArguments(), '->addArgument() adds a InputArgument object');
+        $this->assertEquals(['foo' => $this->foo], $definition->getArguments(), '->addArgument() adds a InputArgument object');
         $definition->addArgument($this->bar);
-        $this->assertEquals(array('foo' => $this->foo, 'bar' => $this->bar), $definition->getArguments(), '->addArgument() adds a InputArgument object');
+        $this->assertEquals(['foo' => $this->foo, 'bar' => $this->bar], $definition->getArguments(), '->addArgument() adds a InputArgument object');
     }
 
     /**
@@ -130,7 +130,7 @@ public function testGetArgument()
         $this->initializeArguments();
 
         $definition = new InputDefinition();
-        $definition->addArguments(array($this->foo));
+        $definition->addArguments([$this->foo]);
         $this->assertEquals($this->foo, $definition->getArgument('foo'), '->getArgument() returns a InputArgument by its name');
     }
 
@@ -143,7 +143,7 @@ public function testGetInvalidArgument()
         $this->initializeArguments();
 
         $definition = new InputDefinition();
-        $definition->addArguments(array($this->foo));
+        $definition->addArguments([$this->foo]);
         $definition->getArgument('bar');
     }
 
@@ -152,7 +152,7 @@ public function testHasArgument()
         $this->initializeArguments();
 
         $definition = new InputDefinition();
-        $definition->addArguments(array($this->foo));
+        $definition->addArguments([$this->foo]);
 
         $this->assertTrue($definition->hasArgument('foo'), '->hasArgument() returns true if a InputArgument exists for the given name');
         $this->assertFalse($definition->hasArgument('bar'), '->hasArgument() returns false if a InputArgument exists for the given name');
@@ -182,28 +182,28 @@ public function testGetArgumentCount()
 
     public function testGetArgumentDefaults()
     {
-        $definition = new InputDefinition(array(
+        $definition = new InputDefinition([
             new InputArgument('foo1', InputArgument::OPTIONAL),
             new InputArgument('foo2', InputArgument::OPTIONAL, '', 'default'),
             new InputArgument('foo3', InputArgument::OPTIONAL | InputArgument::IS_ARRAY),
         //  new InputArgument('foo4', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, '', array(1, 2)),
-        ));
-        $this->assertEquals(array('foo1' => null, 'foo2' => 'default', 'foo3' => array()), $definition->getArgumentDefaults(), '->getArgumentDefaults() return the default values for each argument');
+        ]);
+        $this->assertEquals(['foo1' => null, 'foo2' => 'default', 'foo3' => []], $definition->getArgumentDefaults(), '->getArgumentDefaults() return the default values for each argument');
 
-        $definition = new InputDefinition(array(
-            new InputArgument('foo4', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, '', array(1, 2)),
-        ));
-        $this->assertEquals(array('foo4' => array(1, 2)), $definition->getArgumentDefaults(), '->getArgumentDefaults() return the default values for each argument');
+        $definition = new InputDefinition([
+            new InputArgument('foo4', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, '', [1, 2]),
+        ]);
+        $this->assertEquals(['foo4' => [1, 2]], $definition->getArgumentDefaults(), '->getArgumentDefaults() return the default values for each argument');
     }
 
     public function testSetOptions()
     {
         $this->initializeOptions();
 
-        $definition = new InputDefinition(array($this->foo));
-        $this->assertEquals(array('foo' => $this->foo), $definition->getOptions(), '->setOptions() sets the array of InputOption objects');
-        $definition->setOptions(array($this->bar));
-        $this->assertEquals(array('bar' => $this->bar), $definition->getOptions(), '->setOptions() clears all InputOption objects');
+        $definition = new InputDefinition([$this->foo]);
+        $this->assertEquals(['foo' => $this->foo], $definition->getOptions(), '->setOptions() sets the array of InputOption objects');
+        $definition->setOptions([$this->bar]);
+        $this->assertEquals(['bar' => $this->bar], $definition->getOptions(), '->setOptions() clears all InputOption objects');
     }
 
     /**
@@ -214,8 +214,8 @@ public function testSetOptionsClearsOptions()
     {
         $this->initializeOptions();
 
-        $definition = new InputDefinition(array($this->foo));
-        $definition->setOptions(array($this->bar));
+        $definition = new InputDefinition([$this->foo]);
+        $definition->setOptions([$this->bar]);
         $definition->getOptionForShortcut('f');
     }
 
@@ -223,10 +223,10 @@ public function testAddOptions()
     {
         $this->initializeOptions();
 
-        $definition = new InputDefinition(array($this->foo));
-        $this->assertEquals(array('foo' => $this->foo), $definition->getOptions(), '->addOptions() adds an array of InputOption objects');
-        $definition->addOptions(array($this->bar));
-        $this->assertEquals(array('foo' => $this->foo, 'bar' => $this->bar), $definition->getOptions(), '->addOptions() does not clear existing InputOption objects');
+        $definition = new InputDefinition([$this->foo]);
+        $this->assertEquals(['foo' => $this->foo], $definition->getOptions(), '->addOptions() adds an array of InputOption objects');
+        $definition->addOptions([$this->bar]);
+        $this->assertEquals(['foo' => $this->foo, 'bar' => $this->bar], $definition->getOptions(), '->addOptions() does not clear existing InputOption objects');
     }
 
     public function testAddOption()
@@ -235,9 +235,9 @@ public function testAddOption()
 
         $definition = new InputDefinition();
         $definition->addOption($this->foo);
-        $this->assertEquals(array('foo' => $this->foo), $definition->getOptions(), '->addOption() adds a InputOption object');
+        $this->assertEquals(['foo' => $this->foo], $definition->getOptions(), '->addOption() adds a InputOption object');
         $definition->addOption($this->bar);
-        $this->assertEquals(array('foo' => $this->foo, 'bar' => $this->bar), $definition->getOptions(), '->addOption() adds a InputOption object');
+        $this->assertEquals(['foo' => $this->foo, 'bar' => $this->bar], $definition->getOptions(), '->addOption() adds a InputOption object');
     }
 
     /**
@@ -270,7 +270,7 @@ public function testGetOption()
     {
         $this->initializeOptions();
 
-        $definition = new InputDefinition(array($this->foo));
+        $definition = new InputDefinition([$this->foo]);
         $this->assertEquals($this->foo, $definition->getOption('foo'), '->getOption() returns a InputOption by its name');
     }
 
@@ -282,7 +282,7 @@ public function testGetInvalidOption()
     {
         $this->initializeOptions();
 
-        $definition = new InputDefinition(array($this->foo));
+        $definition = new InputDefinition([$this->foo]);
         $definition->getOption('bar');
     }
 
@@ -290,7 +290,7 @@ public function testHasOption()
     {
         $this->initializeOptions();
 
-        $definition = new InputDefinition(array($this->foo));
+        $definition = new InputDefinition([$this->foo]);
         $this->assertTrue($definition->hasOption('foo'), '->hasOption() returns true if a InputOption exists for the given name');
         $this->assertFalse($definition->hasOption('bar'), '->hasOption() returns false if a InputOption exists for the given name');
     }
@@ -299,7 +299,7 @@ public function testHasShortcut()
     {
         $this->initializeOptions();
 
-        $definition = new InputDefinition(array($this->foo));
+        $definition = new InputDefinition([$this->foo]);
         $this->assertTrue($definition->hasShortcut('f'), '->hasShortcut() returns true if a InputOption exists for the given shortcut');
         $this->assertFalse($definition->hasShortcut('b'), '->hasShortcut() returns false if a InputOption exists for the given shortcut');
     }
@@ -308,7 +308,7 @@ public function testGetOptionForShortcut()
     {
         $this->initializeOptions();
 
-        $definition = new InputDefinition(array($this->foo));
+        $definition = new InputDefinition([$this->foo]);
         $this->assertEquals($this->foo, $definition->getOptionForShortcut('f'), '->getOptionForShortcut() returns a InputOption by its shortcut');
     }
 
@@ -316,7 +316,7 @@ public function testGetOptionForMultiShortcut()
     {
         $this->initializeOptions();
 
-        $definition = new InputDefinition(array($this->multi));
+        $definition = new InputDefinition([$this->multi]);
         $this->assertEquals($this->multi, $definition->getOptionForShortcut('m'), '->getOptionForShortcut() returns a InputOption by its shortcut');
         $this->assertEquals($this->multi, $definition->getOptionForShortcut('mmm'), '->getOptionForShortcut() returns a InputOption by its shortcut');
     }
@@ -329,30 +329,30 @@ public function testGetOptionForInvalidShortcut()
     {
         $this->initializeOptions();
 
-        $definition = new InputDefinition(array($this->foo));
+        $definition = new InputDefinition([$this->foo]);
         $definition->getOptionForShortcut('l');
     }
 
     public function testGetOptionDefaults()
     {
-        $definition = new InputDefinition(array(
+        $definition = new InputDefinition([
             new InputOption('foo1', null, InputOption::VALUE_NONE),
             new InputOption('foo2', null, InputOption::VALUE_REQUIRED),
             new InputOption('foo3', null, InputOption::VALUE_REQUIRED, '', 'default'),
             new InputOption('foo4', null, InputOption::VALUE_OPTIONAL),
             new InputOption('foo5', null, InputOption::VALUE_OPTIONAL, '', 'default'),
             new InputOption('foo6', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY),
-            new InputOption('foo7', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, '', array(1, 2)),
-        ));
-        $defaults = array(
+            new InputOption('foo7', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, '', [1, 2]),
+        ]);
+        $defaults = [
             'foo1' => false,
             'foo2' => null,
             'foo3' => 'default',
             'foo4' => null,
             'foo5' => 'default',
-            'foo6' => array(),
-            'foo7' => array(1, 2),
-        );
+            'foo6' => [],
+            'foo7' => [1, 2],
+        ];
         $this->assertSame($defaults, $definition->getOptionDefaults(), '->getOptionDefaults() returns the default values for all options');
     }
 
diff --git a/src/Symfony/Component/Console/Tests/Input/InputOptionTest.php b/src/Symfony/Component/Console/Tests/Input/InputOptionTest.php
index 943bf607f5e5a..956147ce7330e 100644
--- a/src/Symfony/Component/Console/Tests/Input/InputOptionTest.php
+++ b/src/Symfony/Component/Console/Tests/Input/InputOptionTest.php
@@ -39,7 +39,7 @@ public function testShortcut()
         $this->assertEquals('f', $option->getShortcut(), '__construct() can take a shortcut as its second argument');
         $option = new InputOption('foo', '-f|-ff|fff');
         $this->assertEquals('f|ff|fff', $option->getShortcut(), '__construct() removes the leading - of the shortcuts');
-        $option = new InputOption('foo', array('f', 'ff', '-fff'));
+        $option = new InputOption('foo', ['f', 'ff', '-fff']);
         $this->assertEquals('f|ff|fff', $option->getShortcut(), '__construct() removes the leading - of the shortcuts');
         $option = new InputOption('foo');
         $this->assertNull($option->getShortcut(), '__construct() makes the shortcut null by default');
@@ -146,7 +146,7 @@ public function testGetDefault()
         $this->assertNull($option->getDefault(), '->getDefault() returns null if no default value is configured');
 
         $option = new InputOption('foo', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY);
-        $this->assertEquals(array(), $option->getDefault(), '->getDefault() returns an empty array if option is an array');
+        $this->assertEquals([], $option->getDefault(), '->getDefault() returns an empty array if option is an array');
 
         $option = new InputOption('foo', null, InputOption::VALUE_NONE);
         $this->assertFalse($option->getDefault(), '->getDefault() returns false if the option does not take a value');
@@ -161,8 +161,8 @@ public function testSetDefault()
         $this->assertEquals('another', $option->getDefault(), '->setDefault() changes the default value');
 
         $option = new InputOption('foo', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY);
-        $option->setDefault(array(1, 2));
-        $this->assertEquals(array(1, 2), $option->getDefault(), '->setDefault() changes the default value');
+        $option->setDefault([1, 2]);
+        $this->assertEquals([1, 2], $option->getDefault(), '->setDefault() changes the default value');
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/Input/InputTest.php b/src/Symfony/Component/Console/Tests/Input/InputTest.php
index 7cf1d244a3e4e..61608bf27cf4d 100644
--- a/src/Symfony/Component/Console/Tests/Input/InputTest.php
+++ b/src/Symfony/Component/Console/Tests/Input/InputTest.php
@@ -21,30 +21,30 @@ class InputTest extends TestCase
 {
     public function testConstructor()
     {
-        $input = new ArrayInput(array('name' => 'foo'), new InputDefinition(array(new InputArgument('name'))));
+        $input = new ArrayInput(['name' => 'foo'], new InputDefinition([new InputArgument('name')]));
         $this->assertEquals('foo', $input->getArgument('name'), '->__construct() takes a InputDefinition as an argument');
     }
 
     public function testOptions()
     {
-        $input = new ArrayInput(array('--name' => 'foo'), new InputDefinition(array(new InputOption('name'))));
+        $input = new ArrayInput(['--name' => 'foo'], new InputDefinition([new InputOption('name')]));
         $this->assertEquals('foo', $input->getOption('name'), '->getOption() returns the value for the given option');
 
         $input->setOption('name', 'bar');
         $this->assertEquals('bar', $input->getOption('name'), '->setOption() sets the value for a given option');
-        $this->assertEquals(array('name' => 'bar'), $input->getOptions(), '->getOptions() returns all option values');
+        $this->assertEquals(['name' => 'bar'], $input->getOptions(), '->getOptions() returns all option values');
 
-        $input = new ArrayInput(array('--name' => 'foo'), new InputDefinition(array(new InputOption('name'), new InputOption('bar', '', InputOption::VALUE_OPTIONAL, '', 'default'))));
+        $input = new ArrayInput(['--name' => 'foo'], new InputDefinition([new InputOption('name'), new InputOption('bar', '', InputOption::VALUE_OPTIONAL, '', 'default')]));
         $this->assertEquals('default', $input->getOption('bar'), '->getOption() returns the default value for optional options');
-        $this->assertEquals(array('name' => 'foo', 'bar' => 'default'), $input->getOptions(), '->getOptions() returns all option values, even optional ones');
+        $this->assertEquals(['name' => 'foo', 'bar' => 'default'], $input->getOptions(), '->getOptions() returns all option values, even optional ones');
 
-        $input = new ArrayInput(array('--name' => 'foo', '--bar' => ''), new InputDefinition(array(new InputOption('name'), new InputOption('bar', '', InputOption::VALUE_OPTIONAL, '', 'default'))));
+        $input = new ArrayInput(['--name' => 'foo', '--bar' => ''], new InputDefinition([new InputOption('name'), new InputOption('bar', '', InputOption::VALUE_OPTIONAL, '', 'default')]));
         $this->assertEquals('', $input->getOption('bar'), '->getOption() returns null for options explicitly passed without value (or an empty value)');
-        $this->assertEquals(array('name' => 'foo', 'bar' => ''), $input->getOptions(), '->getOptions() returns all option values.');
+        $this->assertEquals(['name' => 'foo', 'bar' => ''], $input->getOptions(), '->getOptions() returns all option values.');
 
-        $input = new ArrayInput(array('--name' => 'foo', '--bar' => null), new InputDefinition(array(new InputOption('name'), new InputOption('bar', '', InputOption::VALUE_OPTIONAL, '', 'default'))));
+        $input = new ArrayInput(['--name' => 'foo', '--bar' => null], new InputDefinition([new InputOption('name'), new InputOption('bar', '', InputOption::VALUE_OPTIONAL, '', 'default')]));
         $this->assertNull($input->getOption('bar'), '->getOption() returns null for options explicitly passed without value (or an empty value)');
-        $this->assertEquals(array('name' => 'foo', 'bar' => null), $input->getOptions(), '->getOptions() returns all option values');
+        $this->assertEquals(['name' => 'foo', 'bar' => null], $input->getOptions(), '->getOptions() returns all option values');
     }
 
     /**
@@ -53,7 +53,7 @@ public function testOptions()
      */
     public function testSetInvalidOption()
     {
-        $input = new ArrayInput(array('--name' => 'foo'), new InputDefinition(array(new InputOption('name'), new InputOption('bar', '', InputOption::VALUE_OPTIONAL, '', 'default'))));
+        $input = new ArrayInput(['--name' => 'foo'], new InputDefinition([new InputOption('name'), new InputOption('bar', '', InputOption::VALUE_OPTIONAL, '', 'default')]));
         $input->setOption('foo', 'bar');
     }
 
@@ -63,22 +63,22 @@ public function testSetInvalidOption()
      */
     public function testGetInvalidOption()
     {
-        $input = new ArrayInput(array('--name' => 'foo'), new InputDefinition(array(new InputOption('name'), new InputOption('bar', '', InputOption::VALUE_OPTIONAL, '', 'default'))));
+        $input = new ArrayInput(['--name' => 'foo'], new InputDefinition([new InputOption('name'), new InputOption('bar', '', InputOption::VALUE_OPTIONAL, '', 'default')]));
         $input->getOption('foo');
     }
 
     public function testArguments()
     {
-        $input = new ArrayInput(array('name' => 'foo'), new InputDefinition(array(new InputArgument('name'))));
+        $input = new ArrayInput(['name' => 'foo'], new InputDefinition([new InputArgument('name')]));
         $this->assertEquals('foo', $input->getArgument('name'), '->getArgument() returns the value for the given argument');
 
         $input->setArgument('name', 'bar');
         $this->assertEquals('bar', $input->getArgument('name'), '->setArgument() sets the value for a given argument');
-        $this->assertEquals(array('name' => 'bar'), $input->getArguments(), '->getArguments() returns all argument values');
+        $this->assertEquals(['name' => 'bar'], $input->getArguments(), '->getArguments() returns all argument values');
 
-        $input = new ArrayInput(array('name' => 'foo'), new InputDefinition(array(new InputArgument('name'), new InputArgument('bar', InputArgument::OPTIONAL, '', 'default'))));
+        $input = new ArrayInput(['name' => 'foo'], new InputDefinition([new InputArgument('name'), new InputArgument('bar', InputArgument::OPTIONAL, '', 'default')]));
         $this->assertEquals('default', $input->getArgument('bar'), '->getArgument() returns the default value for optional arguments');
-        $this->assertEquals(array('name' => 'foo', 'bar' => 'default'), $input->getArguments(), '->getArguments() returns all argument values, even optional ones');
+        $this->assertEquals(['name' => 'foo', 'bar' => 'default'], $input->getArguments(), '->getArguments() returns all argument values, even optional ones');
     }
 
     /**
@@ -87,7 +87,7 @@ public function testArguments()
      */
     public function testSetInvalidArgument()
     {
-        $input = new ArrayInput(array('name' => 'foo'), new InputDefinition(array(new InputArgument('name'), new InputArgument('bar', InputArgument::OPTIONAL, '', 'default'))));
+        $input = new ArrayInput(['name' => 'foo'], new InputDefinition([new InputArgument('name'), new InputArgument('bar', InputArgument::OPTIONAL, '', 'default')]));
         $input->setArgument('foo', 'bar');
     }
 
@@ -97,7 +97,7 @@ public function testSetInvalidArgument()
      */
     public function testGetInvalidArgument()
     {
-        $input = new ArrayInput(array('name' => 'foo'), new InputDefinition(array(new InputArgument('name'), new InputArgument('bar', InputArgument::OPTIONAL, '', 'default'))));
+        $input = new ArrayInput(['name' => 'foo'], new InputDefinition([new InputArgument('name'), new InputArgument('bar', InputArgument::OPTIONAL, '', 'default')]));
         $input->getArgument('foo');
     }
 
@@ -107,8 +107,8 @@ public function testGetInvalidArgument()
      */
     public function testValidateWithMissingArguments()
     {
-        $input = new ArrayInput(array());
-        $input->bind(new InputDefinition(array(new InputArgument('name', InputArgument::REQUIRED))));
+        $input = new ArrayInput([]);
+        $input->bind(new InputDefinition([new InputArgument('name', InputArgument::REQUIRED)]));
         $input->validate();
     }
 
@@ -118,22 +118,22 @@ public function testValidateWithMissingArguments()
      */
     public function testValidateWithMissingRequiredArguments()
     {
-        $input = new ArrayInput(array('bar' => 'baz'));
-        $input->bind(new InputDefinition(array(new InputArgument('name', InputArgument::REQUIRED), new InputArgument('bar', InputArgument::OPTIONAL))));
+        $input = new ArrayInput(['bar' => 'baz']);
+        $input->bind(new InputDefinition([new InputArgument('name', InputArgument::REQUIRED), new InputArgument('bar', InputArgument::OPTIONAL)]));
         $input->validate();
     }
 
     public function testValidate()
     {
-        $input = new ArrayInput(array('name' => 'foo'));
-        $input->bind(new InputDefinition(array(new InputArgument('name', InputArgument::REQUIRED))));
+        $input = new ArrayInput(['name' => 'foo']);
+        $input->bind(new InputDefinition([new InputArgument('name', InputArgument::REQUIRED)]));
 
         $this->assertNull($input->validate());
     }
 
     public function testSetGetInteractive()
     {
-        $input = new ArrayInput(array());
+        $input = new ArrayInput([]);
         $this->assertTrue($input->isInteractive(), '->isInteractive() returns whether the input should be interactive or not');
         $input->setInteractive(false);
         $this->assertFalse($input->isInteractive(), '->setInteractive() changes the interactive flag');
@@ -141,7 +141,7 @@ public function testSetGetInteractive()
 
     public function testSetGetStream()
     {
-        $input = new ArrayInput(array());
+        $input = new ArrayInput([]);
         $stream = fopen('php://memory', 'r+', false);
         $input->setStream($stream);
         $this->assertSame($stream, $input->getStream());
diff --git a/src/Symfony/Component/Console/Tests/Input/StringInputTest.php b/src/Symfony/Component/Console/Tests/Input/StringInputTest.php
index f2e3467ef8687..7f2189452608b 100644
--- a/src/Symfony/Component/Console/Tests/Input/StringInputTest.php
+++ b/src/Symfony/Component/Console/Tests/Input/StringInputTest.php
@@ -33,7 +33,7 @@ public function testTokenize($input, $tokens, $message)
     public function testInputOptionWithGivenString()
     {
         $definition = new InputDefinition(
-            array(new InputOption('foo', null, InputOption::VALUE_REQUIRED))
+            [new InputOption('foo', null, InputOption::VALUE_REQUIRED)]
         );
 
         // call to bind
@@ -44,33 +44,33 @@ public function testInputOptionWithGivenString()
 
     public function getTokenizeData()
     {
-        return array(
-            array('', array(), '->tokenize() parses an empty string'),
-            array('foo', array('foo'), '->tokenize() parses arguments'),
-            array('  foo  bar  ', array('foo', 'bar'), '->tokenize() ignores whitespaces between arguments'),
-            array('"quoted"', array('quoted'), '->tokenize() parses quoted arguments'),
-            array("'quoted'", array('quoted'), '->tokenize() parses quoted arguments'),
-            array("'a\rb\nc\td'", array("a\rb\nc\td"), '->tokenize() parses whitespace chars in strings'),
-            array("'a'\r'b'\n'c'\t'd'", array('a', 'b', 'c', 'd'), '->tokenize() parses whitespace chars between args as spaces'),
-            array('\"quoted\"', array('"quoted"'), '->tokenize() parses escaped-quoted arguments'),
-            array("\'quoted\'", array('\'quoted\''), '->tokenize() parses escaped-quoted arguments'),
-            array('-a', array('-a'), '->tokenize() parses short options'),
-            array('-azc', array('-azc'), '->tokenize() parses aggregated short options'),
-            array('-awithavalue', array('-awithavalue'), '->tokenize() parses short options with a value'),
-            array('-a"foo bar"', array('-afoo bar'), '->tokenize() parses short options with a value'),
-            array('-a"foo bar""foo bar"', array('-afoo barfoo bar'), '->tokenize() parses short options with a value'),
-            array('-a\'foo bar\'', array('-afoo bar'), '->tokenize() parses short options with a value'),
-            array('-a\'foo bar\'\'foo bar\'', array('-afoo barfoo bar'), '->tokenize() parses short options with a value'),
-            array('-a\'foo bar\'"foo bar"', array('-afoo barfoo bar'), '->tokenize() parses short options with a value'),
-            array('--long-option', array('--long-option'), '->tokenize() parses long options'),
-            array('--long-option=foo', array('--long-option=foo'), '->tokenize() parses long options with a value'),
-            array('--long-option="foo bar"', array('--long-option=foo bar'), '->tokenize() parses long options with a value'),
-            array('--long-option="foo bar""another"', array('--long-option=foo baranother'), '->tokenize() parses long options with a value'),
-            array('--long-option=\'foo bar\'', array('--long-option=foo bar'), '->tokenize() parses long options with a value'),
-            array("--long-option='foo bar''another'", array('--long-option=foo baranother'), '->tokenize() parses long options with a value'),
-            array("--long-option='foo bar'\"another\"", array('--long-option=foo baranother'), '->tokenize() parses long options with a value'),
-            array('foo -a -ffoo --long bar', array('foo', '-a', '-ffoo', '--long', 'bar'), '->tokenize() parses when several arguments and options'),
-        );
+        return [
+            ['', [], '->tokenize() parses an empty string'],
+            ['foo', ['foo'], '->tokenize() parses arguments'],
+            ['  foo  bar  ', ['foo', 'bar'], '->tokenize() ignores whitespaces between arguments'],
+            ['"quoted"', ['quoted'], '->tokenize() parses quoted arguments'],
+            ["'quoted'", ['quoted'], '->tokenize() parses quoted arguments'],
+            ["'a\rb\nc\td'", ["a\rb\nc\td"], '->tokenize() parses whitespace chars in strings'],
+            ["'a'\r'b'\n'c'\t'd'", ['a', 'b', 'c', 'd'], '->tokenize() parses whitespace chars between args as spaces'],
+            ['\"quoted\"', ['"quoted"'], '->tokenize() parses escaped-quoted arguments'],
+            ["\'quoted\'", ['\'quoted\''], '->tokenize() parses escaped-quoted arguments'],
+            ['-a', ['-a'], '->tokenize() parses short options'],
+            ['-azc', ['-azc'], '->tokenize() parses aggregated short options'],
+            ['-awithavalue', ['-awithavalue'], '->tokenize() parses short options with a value'],
+            ['-a"foo bar"', ['-afoo bar'], '->tokenize() parses short options with a value'],
+            ['-a"foo bar""foo bar"', ['-afoo barfoo bar'], '->tokenize() parses short options with a value'],
+            ['-a\'foo bar\'', ['-afoo bar'], '->tokenize() parses short options with a value'],
+            ['-a\'foo bar\'\'foo bar\'', ['-afoo barfoo bar'], '->tokenize() parses short options with a value'],
+            ['-a\'foo bar\'"foo bar"', ['-afoo barfoo bar'], '->tokenize() parses short options with a value'],
+            ['--long-option', ['--long-option'], '->tokenize() parses long options'],
+            ['--long-option=foo', ['--long-option=foo'], '->tokenize() parses long options with a value'],
+            ['--long-option="foo bar"', ['--long-option=foo bar'], '->tokenize() parses long options with a value'],
+            ['--long-option="foo bar""another"', ['--long-option=foo baranother'], '->tokenize() parses long options with a value'],
+            ['--long-option=\'foo bar\'', ['--long-option=foo bar'], '->tokenize() parses long options with a value'],
+            ["--long-option='foo bar''another'", ['--long-option=foo baranother'], '->tokenize() parses long options with a value'],
+            ["--long-option='foo bar'\"another\"", ['--long-option=foo baranother'], '->tokenize() parses long options with a value'],
+            ['foo -a -ffoo --long bar', ['foo', '-a', '-ffoo', '--long', 'bar'], '->tokenize() parses when several arguments and options'],
+        ];
     }
 
     public function testToString()
diff --git a/src/Symfony/Component/Console/Tests/Logger/ConsoleLoggerTest.php b/src/Symfony/Component/Console/Tests/Logger/ConsoleLoggerTest.php
index 95e78fc29f5a0..efeec4234e952 100644
--- a/src/Symfony/Component/Console/Tests/Logger/ConsoleLoggerTest.php
+++ b/src/Symfony/Component/Console/Tests/Logger/ConsoleLoggerTest.php
@@ -39,7 +39,7 @@ public function getLogger()
     {
         $this->output = new DummyOutput(OutputInterface::VERBOSITY_VERBOSE);
 
-        return new ConsoleLogger($this->output, array(
+        return new ConsoleLogger($this->output, [
             LogLevel::EMERGENCY => OutputInterface::VERBOSITY_NORMAL,
             LogLevel::ALERT => OutputInterface::VERBOSITY_NORMAL,
             LogLevel::CRITICAL => OutputInterface::VERBOSITY_NORMAL,
@@ -48,7 +48,7 @@ public function getLogger()
             LogLevel::NOTICE => OutputInterface::VERBOSITY_NORMAL,
             LogLevel::INFO => OutputInterface::VERBOSITY_NORMAL,
             LogLevel::DEBUG => OutputInterface::VERBOSITY_NORMAL,
-        ));
+        ]);
     }
 
     /**
@@ -64,7 +64,7 @@ public function getLogs()
     /**
      * @dataProvider provideOutputMappingParams
      */
-    public function testOutputMapping($logLevel, $outputVerbosity, $isOutput, $addVerbosityLevelMap = array())
+    public function testOutputMapping($logLevel, $outputVerbosity, $isOutput, $addVerbosityLevelMap = [])
     {
         $out = new BufferedOutput($outputVerbosity);
         $logger = new ConsoleLogger($out, $addVerbosityLevelMap);
@@ -75,22 +75,22 @@ public function testOutputMapping($logLevel, $outputVerbosity, $isOutput, $addVe
 
     public function provideOutputMappingParams()
     {
-        $quietMap = array(LogLevel::EMERGENCY => OutputInterface::VERBOSITY_QUIET);
-
-        return array(
-            array(LogLevel::EMERGENCY, OutputInterface::VERBOSITY_NORMAL, true),
-            array(LogLevel::WARNING, OutputInterface::VERBOSITY_NORMAL, true),
-            array(LogLevel::INFO, OutputInterface::VERBOSITY_NORMAL, false),
-            array(LogLevel::DEBUG, OutputInterface::VERBOSITY_NORMAL, false),
-            array(LogLevel::INFO, OutputInterface::VERBOSITY_VERBOSE, false),
-            array(LogLevel::INFO, OutputInterface::VERBOSITY_VERY_VERBOSE, true),
-            array(LogLevel::DEBUG, OutputInterface::VERBOSITY_VERY_VERBOSE, false),
-            array(LogLevel::DEBUG, OutputInterface::VERBOSITY_DEBUG, true),
-            array(LogLevel::ALERT, OutputInterface::VERBOSITY_QUIET, false),
-            array(LogLevel::EMERGENCY, OutputInterface::VERBOSITY_QUIET, false),
-            array(LogLevel::ALERT, OutputInterface::VERBOSITY_QUIET, false, $quietMap),
-            array(LogLevel::EMERGENCY, OutputInterface::VERBOSITY_QUIET, true, $quietMap),
-        );
+        $quietMap = [LogLevel::EMERGENCY => OutputInterface::VERBOSITY_QUIET];
+
+        return [
+            [LogLevel::EMERGENCY, OutputInterface::VERBOSITY_NORMAL, true],
+            [LogLevel::WARNING, OutputInterface::VERBOSITY_NORMAL, true],
+            [LogLevel::INFO, OutputInterface::VERBOSITY_NORMAL, false],
+            [LogLevel::DEBUG, OutputInterface::VERBOSITY_NORMAL, false],
+            [LogLevel::INFO, OutputInterface::VERBOSITY_VERBOSE, false],
+            [LogLevel::INFO, OutputInterface::VERBOSITY_VERY_VERBOSE, true],
+            [LogLevel::DEBUG, OutputInterface::VERBOSITY_VERY_VERBOSE, false],
+            [LogLevel::DEBUG, OutputInterface::VERBOSITY_DEBUG, true],
+            [LogLevel::ALERT, OutputInterface::VERBOSITY_QUIET, false],
+            [LogLevel::EMERGENCY, OutputInterface::VERBOSITY_QUIET, false],
+            [LogLevel::ALERT, OutputInterface::VERBOSITY_QUIET, false, $quietMap],
+            [LogLevel::EMERGENCY, OutputInterface::VERBOSITY_QUIET, true, $quietMap],
+        ];
     }
 
     public function testHasErrored()
@@ -117,28 +117,28 @@ public function testImplements()
     public function testLogsAtAllLevels($level, $message)
     {
         $logger = $this->getLogger();
-        $logger->{$level}($message, array('user' => 'Bob'));
-        $logger->log($level, $message, array('user' => 'Bob'));
+        $logger->{$level}($message, ['user' => 'Bob']);
+        $logger->log($level, $message, ['user' => 'Bob']);
 
-        $expected = array(
+        $expected = [
             $level.' message of level '.$level.' with context: Bob',
             $level.' message of level '.$level.' with context: Bob',
-        );
+        ];
         $this->assertEquals($expected, $this->getLogs());
     }
 
     public function provideLevelsAndMessages()
     {
-        return array(
-            LogLevel::EMERGENCY => array(LogLevel::EMERGENCY, 'message of level emergency with context: {user}'),
-            LogLevel::ALERT => array(LogLevel::ALERT, 'message of level alert with context: {user}'),
-            LogLevel::CRITICAL => array(LogLevel::CRITICAL, 'message of level critical with context: {user}'),
-            LogLevel::ERROR => array(LogLevel::ERROR, 'message of level error with context: {user}'),
-            LogLevel::WARNING => array(LogLevel::WARNING, 'message of level warning with context: {user}'),
-            LogLevel::NOTICE => array(LogLevel::NOTICE, 'message of level notice with context: {user}'),
-            LogLevel::INFO => array(LogLevel::INFO, 'message of level info with context: {user}'),
-            LogLevel::DEBUG => array(LogLevel::DEBUG, 'message of level debug with context: {user}'),
-        );
+        return [
+            LogLevel::EMERGENCY => [LogLevel::EMERGENCY, 'message of level emergency with context: {user}'],
+            LogLevel::ALERT => [LogLevel::ALERT, 'message of level alert with context: {user}'],
+            LogLevel::CRITICAL => [LogLevel::CRITICAL, 'message of level critical with context: {user}'],
+            LogLevel::ERROR => [LogLevel::ERROR, 'message of level error with context: {user}'],
+            LogLevel::WARNING => [LogLevel::WARNING, 'message of level warning with context: {user}'],
+            LogLevel::NOTICE => [LogLevel::NOTICE, 'message of level notice with context: {user}'],
+            LogLevel::INFO => [LogLevel::INFO, 'message of level info with context: {user}'],
+            LogLevel::DEBUG => [LogLevel::DEBUG, 'message of level debug with context: {user}'],
+        ];
     }
 
     /**
@@ -153,56 +153,56 @@ public function testThrowsOnInvalidLevel()
     public function testContextReplacement()
     {
         $logger = $this->getLogger();
-        $logger->info('{Message {nothing} {user} {foo.bar} a}', array('user' => 'Bob', 'foo.bar' => 'Bar'));
+        $logger->info('{Message {nothing} {user} {foo.bar} a}', ['user' => 'Bob', 'foo.bar' => 'Bar']);
 
-        $expected = array('info {Message {nothing} Bob Bar a}');
+        $expected = ['info {Message {nothing} Bob Bar a}'];
         $this->assertEquals($expected, $this->getLogs());
     }
 
     public function testObjectCastToString()
     {
         if (method_exists($this, 'createPartialMock')) {
-            $dummy = $this->createPartialMock('Symfony\Component\Console\Tests\Logger\DummyTest', array('__toString'));
+            $dummy = $this->createPartialMock('Symfony\Component\Console\Tests\Logger\DummyTest', ['__toString']);
         } else {
-            $dummy = $this->getMock('Symfony\Component\Console\Tests\Logger\DummyTest', array('__toString'));
+            $dummy = $this->getMock('Symfony\Component\Console\Tests\Logger\DummyTest', ['__toString']);
         }
         $dummy->method('__toString')->will($this->returnValue('DUMMY'));
 
         $this->getLogger()->warning($dummy);
 
-        $expected = array('warning DUMMY');
+        $expected = ['warning DUMMY'];
         $this->assertEquals($expected, $this->getLogs());
     }
 
     public function testContextCanContainAnything()
     {
-        $context = array(
+        $context = [
             'bool' => true,
             'null' => null,
             'string' => 'Foo',
             'int' => 0,
             'float' => 0.5,
-            'nested' => array('with object' => new DummyTest()),
+            'nested' => ['with object' => new DummyTest()],
             'object' => new \DateTime(),
             'resource' => fopen('php://memory', 'r'),
-        );
+        ];
 
         $this->getLogger()->warning('Crazy context data', $context);
 
-        $expected = array('warning Crazy context data');
+        $expected = ['warning Crazy context data'];
         $this->assertEquals($expected, $this->getLogs());
     }
 
     public function testContextExceptionKeyCanBeExceptionOrOtherValues()
     {
         $logger = $this->getLogger();
-        $logger->warning('Random message', array('exception' => 'oops'));
-        $logger->critical('Uncaught Exception!', array('exception' => new \LogicException('Fail')));
+        $logger->warning('Random message', ['exception' => 'oops']);
+        $logger->critical('Uncaught Exception!', ['exception' => new \LogicException('Fail')]);
 
-        $expected = array(
+        $expected = [
             'warning Random message',
             'critical Uncaught Exception!',
-        );
+        ];
         $this->assertEquals($expected, $this->getLogs());
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Output/OutputTest.php b/src/Symfony/Component/Console/Tests/Output/OutputTest.php
index fbd4e84989089..58659f285608f 100644
--- a/src/Symfony/Component/Console/Tests/Output/OutputTest.php
+++ b/src/Symfony/Component/Console/Tests/Output/OutputTest.php
@@ -77,7 +77,7 @@ public function testWriteWithVerbosityQuiet()
     public function testWriteAnArrayOfMessages()
     {
         $output = new TestOutput();
-        $output->writeln(array('foo', 'bar'));
+        $output->writeln(['foo', 'bar']);
         $this->assertEquals("foo\nbar\n", $output->output, '->writeln() can take an array of messages to output');
     }
 
@@ -93,10 +93,10 @@ public function testWriteRawMessage($message, $type, $expectedOutput)
 
     public function provideWriteArguments()
     {
-        return array(
-            array('<info>foo</info>', Output::OUTPUT_RAW, "<info>foo</info>\n"),
-            array('<info>foo</info>', Output::OUTPUT_PLAIN, "foo\n"),
-        );
+        return [
+            ['<info>foo</info>', Output::OUTPUT_RAW, "<info>foo</info>\n"],
+            ['<info>foo</info>', Output::OUTPUT_PLAIN, "foo\n"],
+        ];
     }
 
     public function testWriteWithDecorationTurnedOff()
@@ -109,7 +109,7 @@ public function testWriteWithDecorationTurnedOff()
 
     public function testWriteDecoratedMessage()
     {
-        $fooStyle = new OutputFormatterStyle('yellow', 'red', array('blink'));
+        $fooStyle = new OutputFormatterStyle('yellow', 'red', ['blink']);
         $output = new TestOutput();
         $output->getFormatter()->setStyle('FOO', $fooStyle);
         $output->setDecorated(true);
@@ -150,13 +150,13 @@ public function testWriteWithVerbosityOption($verbosity, $expected, $msg)
 
     public function verbosityProvider()
     {
-        return array(
-            array(Output::VERBOSITY_QUIET, '2', '->write() in QUIET mode only outputs when an explicit QUIET verbosity is passed'),
-            array(Output::VERBOSITY_NORMAL, '123', '->write() in NORMAL mode outputs anything below an explicit VERBOSE verbosity'),
-            array(Output::VERBOSITY_VERBOSE, '1234', '->write() in VERBOSE mode outputs anything below an explicit VERY_VERBOSE verbosity'),
-            array(Output::VERBOSITY_VERY_VERBOSE, '12345', '->write() in VERY_VERBOSE mode outputs anything below an explicit DEBUG verbosity'),
-            array(Output::VERBOSITY_DEBUG, '123456', '->write() in DEBUG mode outputs everything'),
-        );
+        return [
+            [Output::VERBOSITY_QUIET, '2', '->write() in QUIET mode only outputs when an explicit QUIET verbosity is passed'],
+            [Output::VERBOSITY_NORMAL, '123', '->write() in NORMAL mode outputs anything below an explicit VERBOSE verbosity'],
+            [Output::VERBOSITY_VERBOSE, '1234', '->write() in VERBOSE mode outputs anything below an explicit VERY_VERBOSE verbosity'],
+            [Output::VERBOSITY_VERY_VERBOSE, '12345', '->write() in VERY_VERBOSE mode outputs anything below an explicit DEBUG verbosity'],
+            [Output::VERBOSITY_DEBUG, '123456', '->write() in DEBUG mode outputs everything'],
+        ];
     }
 }
 
diff --git a/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php b/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php
index 308030bbcf22b..e6e061f4416b6 100644
--- a/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php
+++ b/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php
@@ -48,7 +48,7 @@ public function testOutputs($inputCommandFilepath, $outputFilepath)
     {
         $code = require $inputCommandFilepath;
         $this->command->setCode($code);
-        $this->tester->execute(array(), array('interactive' => false, 'decorated' => false));
+        $this->tester->execute([], ['interactive' => false, 'decorated' => false]);
         $this->assertStringEqualsFile($outputFilepath, $this->tester->getDisplay(true));
     }
 
@@ -59,7 +59,7 @@ public function testInteractiveOutputs($inputCommandFilepath, $outputFilepath)
     {
         $code = require $inputCommandFilepath;
         $this->command->setCode($code);
-        $this->tester->execute(array(), array('interactive' => true, 'decorated' => false));
+        $this->tester->execute([], ['interactive' => true, 'decorated' => false]);
         $this->assertStringEqualsFile($outputFilepath, $this->tester->getDisplay(true));
     }
 
diff --git a/src/Symfony/Component/Console/Tests/Tester/ApplicationTesterTest.php b/src/Symfony/Component/Console/Tests/Tester/ApplicationTesterTest.php
index 57e7136d5580e..74c3562001fca 100644
--- a/src/Symfony/Component/Console/Tests/Tester/ApplicationTesterTest.php
+++ b/src/Symfony/Component/Console/Tests/Tester/ApplicationTesterTest.php
@@ -31,7 +31,7 @@ protected function setUp()
         ;
 
         $this->tester = new ApplicationTester($this->application);
-        $this->tester->run(array('command' => 'foo', 'foo' => 'bar'), array('interactive' => false, 'decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE));
+        $this->tester->run(['command' => 'foo', 'foo' => 'bar'], ['interactive' => false, 'decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE]);
     }
 
     protected function tearDown()
diff --git a/src/Symfony/Component/Console/Tests/Tester/CommandTesterTest.php b/src/Symfony/Component/Console/Tests/Tester/CommandTesterTest.php
index 58eb8103fcc9a..bbb94059feda9 100644
--- a/src/Symfony/Component/Console/Tests/Tester/CommandTesterTest.php
+++ b/src/Symfony/Component/Console/Tests/Tester/CommandTesterTest.php
@@ -34,7 +34,7 @@ protected function setUp()
         $this->command->setCode(function ($input, $output) { $output->writeln('foo'); });
 
         $this->tester = new CommandTester($this->command);
-        $this->tester->execute(array('foo' => 'bar'), array('interactive' => false, 'decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE));
+        $this->tester->execute(['foo' => 'bar'], ['interactive' => false, 'decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE]);
     }
 
     protected function tearDown()
@@ -84,19 +84,19 @@ public function testCommandFromApplication()
         $tester = new CommandTester($application->find('foo'));
 
         // check that there is no need to pass the command name here
-        $this->assertEquals(0, $tester->execute(array()));
+        $this->assertEquals(0, $tester->execute([]));
     }
 
     public function testCommandWithInputs()
     {
-        $questions = array(
+        $questions = [
             'What\'s your name?',
             'How are you?',
             'Where do you come from?',
-        );
+        ];
 
         $command = new Command('foo');
-        $command->setHelperSet(new HelperSet(array(new QuestionHelper())));
+        $command->setHelperSet(new HelperSet([new QuestionHelper()]));
         $command->setCode(function ($input, $output) use ($questions, $command) {
             $helper = $command->getHelper('question');
             $helper->ask($input, $output, new Question($questions[0]));
@@ -105,8 +105,8 @@ public function testCommandWithInputs()
         });
 
         $tester = new CommandTester($command);
-        $tester->setInputs(array('Bobby', 'Fine', 'France'));
-        $tester->execute(array());
+        $tester->setInputs(['Bobby', 'Fine', 'France']);
+        $tester->execute([]);
 
         $this->assertEquals(0, $tester->getStatusCode());
         $this->assertEquals(implode('', $questions), $tester->getDisplay(true));
@@ -118,14 +118,14 @@ public function testCommandWithInputs()
      */
     public function testCommandWithWrongInputsNumber()
     {
-        $questions = array(
+        $questions = [
             'What\'s your name?',
             'How are you?',
             'Where do you come from?',
-        );
+        ];
 
         $command = new Command('foo');
-        $command->setHelperSet(new HelperSet(array(new QuestionHelper())));
+        $command->setHelperSet(new HelperSet([new QuestionHelper()]));
         $command->setCode(function ($input, $output) use ($questions, $command) {
             $helper = $command->getHelper('question');
             $helper->ask($input, $output, new Question($questions[0]));
@@ -134,17 +134,17 @@ public function testCommandWithWrongInputsNumber()
         });
 
         $tester = new CommandTester($command);
-        $tester->setInputs(array('Bobby', 'Fine'));
-        $tester->execute(array());
+        $tester->setInputs(['Bobby', 'Fine']);
+        $tester->execute([]);
     }
 
     public function testSymfonyStyleCommandWithInputs()
     {
-        $questions = array(
+        $questions = [
             'What\'s your name?',
             'How are you?',
             'Where do you come from?',
-        );
+        ];
 
         $command = new Command('foo');
         $command->setCode(function ($input, $output) use ($questions, $command) {
@@ -155,8 +155,8 @@ public function testSymfonyStyleCommandWithInputs()
         });
 
         $tester = new CommandTester($command);
-        $tester->setInputs(array('Bobby', 'Fine', 'France'));
-        $tester->execute(array());
+        $tester->setInputs(['Bobby', 'Fine', 'France']);
+        $tester->execute([]);
 
         $this->assertEquals(0, $tester->getStatusCode());
     }
diff --git a/src/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php b/src/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php
index 00155b04650d0..9869176b39466 100644
--- a/src/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php
+++ b/src/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php
@@ -47,7 +47,7 @@ public function handle(Reader $reader, TokenStream $stream)
     {
         $quote = $reader->getSubstring(1);
 
-        if (!\in_array($quote, array("'", '"'))) {
+        if (!\in_array($quote, ["'", '"'])) {
             return false;
         }
 
diff --git a/src/Symfony/Component/CssSelector/Parser/Parser.php b/src/Symfony/Component/CssSelector/Parser/Parser.php
index 87c05a74b5979..f07985ac52aba 100644
--- a/src/Symfony/Component/CssSelector/Parser/Parser.php
+++ b/src/Symfony/Component/CssSelector/Parser/Parser.php
@@ -76,22 +76,22 @@ public static function parseSeries(array $tokens)
 
         switch (true) {
             case 'odd' === $joined:
-                return array(2, 1);
+                return [2, 1];
             case 'even' === $joined:
-                return array(2, 0);
+                return [2, 0];
             case 'n' === $joined:
-                return array(1, 0);
+                return [1, 0];
             case false === strpos($joined, 'n'):
-                return array(0, $int($joined));
+                return [0, $int($joined)];
         }
 
         $split = explode('n', $joined);
         $first = isset($split[0]) ? $split[0] : null;
 
-        return array(
+        return [
             $first ? ('-' === $first || '+' === $first ? $int($first.'1') : $int($first)) : 1,
             isset($split[1]) && $split[1] ? $int($split[1]) : 0,
-        );
+        ];
     }
 
     /**
@@ -102,12 +102,12 @@ public static function parseSeries(array $tokens)
     private function parseSelectorList(TokenStream $stream)
     {
         $stream->skipWhitespace();
-        $selectors = array();
+        $selectors = [];
 
         while (true) {
             $selectors[] = $this->parserSelectorNode($stream);
 
-            if ($stream->getPeek()->isDelimiter(array(','))) {
+            if ($stream->getPeek()->isDelimiter([','])) {
                 $stream->getNext();
                 $stream->skipWhitespace();
             } else {
@@ -133,7 +133,7 @@ private function parserSelectorNode(TokenStream $stream)
             $stream->skipWhitespace();
             $peek = $stream->getPeek();
 
-            if ($peek->isFileEnd() || $peek->isDelimiter(array(','))) {
+            if ($peek->isFileEnd() || $peek->isDelimiter([','])) {
                 break;
             }
 
@@ -141,7 +141,7 @@ private function parserSelectorNode(TokenStream $stream)
                 throw SyntaxErrorException::pseudoElementFound($pseudoElement, 'not at the end of a selector');
             }
 
-            if ($peek->isDelimiter(array('+', '>', '~'))) {
+            if ($peek->isDelimiter(['+', '>', '~'])) {
                 $combinator = $stream->getNext()->getValue();
                 $stream->skipWhitespace();
             } else {
@@ -177,8 +177,8 @@ private function parseSimpleSelector(TokenStream $stream, $insideNegation = fals
             $peek = $stream->getPeek();
             if ($peek->isWhitespace()
                 || $peek->isFileEnd()
-                || $peek->isDelimiter(array(',', '+', '>', '~'))
-                || ($insideNegation && $peek->isDelimiter(array(')')))
+                || $peek->isDelimiter([',', '+', '>', '~'])
+                || ($insideNegation && $peek->isDelimiter([')']))
             ) {
                 break;
             }
@@ -189,16 +189,16 @@ private function parseSimpleSelector(TokenStream $stream, $insideNegation = fals
 
             if ($peek->isHash()) {
                 $result = new Node\HashNode($result, $stream->getNext()->getValue());
-            } elseif ($peek->isDelimiter(array('.'))) {
+            } elseif ($peek->isDelimiter(['.'])) {
                 $stream->getNext();
                 $result = new Node\ClassNode($result, $stream->getNextIdentifier());
-            } elseif ($peek->isDelimiter(array('['))) {
+            } elseif ($peek->isDelimiter(['['])) {
                 $stream->getNext();
                 $result = $this->parseAttributeNode($result, $stream);
-            } elseif ($peek->isDelimiter(array(':'))) {
+            } elseif ($peek->isDelimiter([':'])) {
                 $stream->getNext();
 
-                if ($stream->getPeek()->isDelimiter(array(':'))) {
+                if ($stream->getPeek()->isDelimiter([':'])) {
                     $stream->getNext();
                     $pseudoElement = $stream->getNextIdentifier();
 
@@ -206,7 +206,7 @@ private function parseSimpleSelector(TokenStream $stream, $insideNegation = fals
                 }
 
                 $identifier = $stream->getNextIdentifier();
-                if (\in_array(strtolower($identifier), array('first-line', 'first-letter', 'before', 'after'))) {
+                if (\in_array(strtolower($identifier), ['first-line', 'first-letter', 'before', 'after'])) {
                     // Special case: CSS 2.1 pseudo-elements can have a single ':'.
                     // Any new pseudo-element must have two.
                     $pseudoElement = $identifier;
@@ -214,7 +214,7 @@ private function parseSimpleSelector(TokenStream $stream, $insideNegation = fals
                     continue;
                 }
 
-                if (!$stream->getPeek()->isDelimiter(array('('))) {
+                if (!$stream->getPeek()->isDelimiter(['('])) {
                     $result = new Node\PseudoNode($result, $identifier);
 
                     continue;
@@ -235,13 +235,13 @@ private function parseSimpleSelector(TokenStream $stream, $insideNegation = fals
                         throw SyntaxErrorException::pseudoElementFound($argumentPseudoElement, 'inside ::not()');
                     }
 
-                    if (!$next->isDelimiter(array(')'))) {
+                    if (!$next->isDelimiter([')'])) {
                         throw SyntaxErrorException::unexpectedToken('")"', $next);
                     }
 
                     $result = new Node\NegationNode($result, $argument);
                 } else {
-                    $arguments = array();
+                    $arguments = [];
                     $next = null;
 
                     while (true) {
@@ -251,10 +251,10 @@ private function parseSimpleSelector(TokenStream $stream, $insideNegation = fals
                         if ($next->isIdentifier()
                             || $next->isString()
                             || $next->isNumber()
-                            || $next->isDelimiter(array('+', '-'))
+                            || $next->isDelimiter(['+', '-'])
                         ) {
                             $arguments[] = $next;
-                        } elseif ($next->isDelimiter(array(')'))) {
+                        } elseif ($next->isDelimiter([')'])) {
                             break;
                         } else {
                             throw SyntaxErrorException::unexpectedToken('an argument', $next);
@@ -276,7 +276,7 @@ private function parseSimpleSelector(TokenStream $stream, $insideNegation = fals
             throw SyntaxErrorException::unexpectedToken('selector', $stream->getPeek());
         }
 
-        return array($result, $pseudoElement);
+        return [$result, $pseudoElement];
     }
 
     /**
@@ -288,7 +288,7 @@ private function parseElementNode(TokenStream $stream)
     {
         $peek = $stream->getPeek();
 
-        if ($peek->isIdentifier() || $peek->isDelimiter(array('*'))) {
+        if ($peek->isIdentifier() || $peek->isDelimiter(['*'])) {
             if ($peek->isIdentifier()) {
                 $namespace = $stream->getNext()->getValue();
             } else {
@@ -296,7 +296,7 @@ private function parseElementNode(TokenStream $stream)
                 $namespace = null;
             }
 
-            if ($stream->getPeek()->isDelimiter(array('|'))) {
+            if ($stream->getPeek()->isDelimiter(['|'])) {
                 $stream->getNext();
                 $element = $stream->getNextIdentifierOrStar();
             } else {
@@ -322,14 +322,14 @@ private function parseAttributeNode(Node\NodeInterface $selector, TokenStream $s
         $stream->skipWhitespace();
         $attribute = $stream->getNextIdentifierOrStar();
 
-        if (null === $attribute && !$stream->getPeek()->isDelimiter(array('|'))) {
+        if (null === $attribute && !$stream->getPeek()->isDelimiter(['|'])) {
             throw SyntaxErrorException::unexpectedToken('"|"', $stream->getPeek());
         }
 
-        if ($stream->getPeek()->isDelimiter(array('|'))) {
+        if ($stream->getPeek()->isDelimiter(['|'])) {
             $stream->getNext();
 
-            if ($stream->getPeek()->isDelimiter(array('='))) {
+            if ($stream->getPeek()->isDelimiter(['='])) {
                 $namespace = null;
                 $stream->getNext();
                 $operator = '|=';
@@ -346,12 +346,12 @@ private function parseAttributeNode(Node\NodeInterface $selector, TokenStream $s
             $stream->skipWhitespace();
             $next = $stream->getNext();
 
-            if ($next->isDelimiter(array(']'))) {
+            if ($next->isDelimiter([']'])) {
                 return new Node\AttributeNode($selector, $namespace, $attribute, 'exists', null);
-            } elseif ($next->isDelimiter(array('='))) {
+            } elseif ($next->isDelimiter(['='])) {
                 $operator = '=';
-            } elseif ($next->isDelimiter(array('^', '$', '*', '~', '|', '!'))
-                && $stream->getPeek()->isDelimiter(array('='))
+            } elseif ($next->isDelimiter(['^', '$', '*', '~', '|', '!'])
+                && $stream->getPeek()->isDelimiter(['='])
             ) {
                 $operator = $next->getValue().'=';
                 $stream->getNext();
@@ -375,7 +375,7 @@ private function parseAttributeNode(Node\NodeInterface $selector, TokenStream $s
         $stream->skipWhitespace();
         $next = $stream->getNext();
 
-        if (!$next->isDelimiter(array(']'))) {
+        if (!$next->isDelimiter([']'])) {
             throw SyntaxErrorException::unexpectedToken('"]"', $next);
         }
 
diff --git a/src/Symfony/Component/CssSelector/Parser/Shortcut/ClassParser.php b/src/Symfony/Component/CssSelector/Parser/Shortcut/ClassParser.php
index c513de5ff12ee..3b92006231983 100644
--- a/src/Symfony/Component/CssSelector/Parser/Shortcut/ClassParser.php
+++ b/src/Symfony/Component/CssSelector/Parser/Shortcut/ClassParser.php
@@ -41,11 +41,11 @@ public function parse($source)
         //     2 => string 'input' (length=5)
         //     3 => string 'ab6bd_field' (length=11)
         if (preg_match('/^(?:([a-z]++)\|)?+([\w-]++|\*)?+\.([\w-]++)$/i', trim($source), $matches)) {
-            return array(
+            return [
                 new SelectorNode(new ClassNode(new ElementNode($matches[1] ?: null, $matches[2] ?: null), $matches[3])),
-            );
+            ];
         }
 
-        return array();
+        return [];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Parser/Shortcut/ElementParser.php b/src/Symfony/Component/CssSelector/Parser/Shortcut/ElementParser.php
index c29f5e442e739..392c6aabd1916 100644
--- a/src/Symfony/Component/CssSelector/Parser/Shortcut/ElementParser.php
+++ b/src/Symfony/Component/CssSelector/Parser/Shortcut/ElementParser.php
@@ -39,9 +39,9 @@ public function parse($source)
         //     1 => string 'testns' (length=6)
         //     2 => string 'testel' (length=6)
         if (preg_match('/^(?:([a-z]++)\|)?([\w-]++|\*)$/i', trim($source), $matches)) {
-            return array(new SelectorNode(new ElementNode($matches[1] ?: null, $matches[2])));
+            return [new SelectorNode(new ElementNode($matches[1] ?: null, $matches[2]))];
         }
 
-        return array();
+        return [];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Parser/Shortcut/EmptyStringParser.php b/src/Symfony/Component/CssSelector/Parser/Shortcut/EmptyStringParser.php
index 16d374af30ccc..276b57405d0d6 100644
--- a/src/Symfony/Component/CssSelector/Parser/Shortcut/EmptyStringParser.php
+++ b/src/Symfony/Component/CssSelector/Parser/Shortcut/EmptyStringParser.php
@@ -38,9 +38,9 @@ public function parse($source)
     {
         // Matches an empty string
         if ('' == $source) {
-            return array(new SelectorNode(new ElementNode(null, '*')));
+            return [new SelectorNode(new ElementNode(null, '*'))];
         }
 
-        return array();
+        return [];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Parser/Shortcut/HashParser.php b/src/Symfony/Component/CssSelector/Parser/Shortcut/HashParser.php
index 3f3883bb8d2e9..0ffcb6deefc7c 100644
--- a/src/Symfony/Component/CssSelector/Parser/Shortcut/HashParser.php
+++ b/src/Symfony/Component/CssSelector/Parser/Shortcut/HashParser.php
@@ -41,11 +41,11 @@ public function parse($source)
         //     2 => string 'input' (length=5)
         //     3 => string 'ab6bd_field' (length=11)
         if (preg_match('/^(?:([a-z]++)\|)?+([\w-]++|\*)?+#([\w-]++)$/i', trim($source), $matches)) {
-            return array(
+            return [
                 new SelectorNode(new HashNode(new ElementNode($matches[1] ?: null, $matches[2] ?: null), $matches[3])),
-            );
+            ];
         }
 
-        return array();
+        return [];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Parser/TokenStream.php b/src/Symfony/Component/CssSelector/Parser/TokenStream.php
index d2aee541cd0c6..843e330b523e0 100644
--- a/src/Symfony/Component/CssSelector/Parser/TokenStream.php
+++ b/src/Symfony/Component/CssSelector/Parser/TokenStream.php
@@ -29,12 +29,12 @@ class TokenStream
     /**
      * @var Token[]
      */
-    private $tokens = array();
+    private $tokens = [];
 
     /**
      * @var Token[]
      */
-    private $used = array();
+    private $used = [];
 
     /**
      * @var int
@@ -154,7 +154,7 @@ public function getNextIdentifierOrStar()
             return $next->getValue();
         }
 
-        if ($next->isDelimiter(array('*'))) {
+        if ($next->isDelimiter(['*'])) {
             return;
         }
 
diff --git a/src/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php b/src/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php
index e32b4d20ce9f8..fc65bc68463f9 100644
--- a/src/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php
+++ b/src/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php
@@ -38,14 +38,14 @@ public function __construct()
         $patterns = new TokenizerPatterns();
         $escaping = new TokenizerEscaping($patterns);
 
-        $this->handlers = array(
+        $this->handlers = [
             new Handler\WhitespaceHandler(),
             new Handler\IdentifierHandler($patterns, $escaping),
             new Handler\HashHandler($patterns, $escaping),
             new Handler\StringHandler($patterns, $escaping),
             new Handler\NumberHandler($patterns),
             new Handler\CommentHandler(),
-        );
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/CssSelector/Tests/CssSelectorConverterTest.php b/src/Symfony/Component/CssSelector/Tests/CssSelectorConverterTest.php
index a3eea7ad21869..cd0fd785e53d8 100644
--- a/src/Symfony/Component/CssSelector/Tests/CssSelectorConverterTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/CssSelectorConverterTest.php
@@ -55,22 +55,22 @@ public function testCssToXPathWithoutPrefix($css, $xpath)
 
     public function getCssToXPathWithoutPrefixTestData()
     {
-        return array(
-            array('h1', 'h1'),
-            array('foo|h1', 'foo:h1'),
-            array('h1, h2, h3', 'h1 | h2 | h3'),
-            array('h1:nth-child(3n+1)', "*/*[(name() = 'h1') and (position() - 1 >= 0 and (position() - 1) mod 3 = 0)]"),
-            array('h1 > p', 'h1/p'),
-            array('h1#foo', "h1[@id = 'foo']"),
-            array('h1.foo', "h1[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]"),
-            array('h1[class*="foo bar"]', "h1[@class and contains(@class, 'foo bar')]"),
-            array('h1[foo|class*="foo bar"]', "h1[@foo:class and contains(@foo:class, 'foo bar')]"),
-            array('h1[class]', 'h1[@class]'),
-            array('h1 .foo', "h1/descendant-or-self::*/*[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]"),
-            array('h1 #foo', "h1/descendant-or-self::*/*[@id = 'foo']"),
-            array('h1 [class*=foo]', "h1/descendant-or-self::*/*[@class and contains(@class, 'foo')]"),
-            array('div>.foo', "div/*[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]"),
-            array('div > .foo', "div/*[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]"),
-        );
+        return [
+            ['h1', 'h1'],
+            ['foo|h1', 'foo:h1'],
+            ['h1, h2, h3', 'h1 | h2 | h3'],
+            ['h1:nth-child(3n+1)', "*/*[(name() = 'h1') and (position() - 1 >= 0 and (position() - 1) mod 3 = 0)]"],
+            ['h1 > p', 'h1/p'],
+            ['h1#foo', "h1[@id = 'foo']"],
+            ['h1.foo', "h1[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]"],
+            ['h1[class*="foo bar"]', "h1[@class and contains(@class, 'foo bar')]"],
+            ['h1[foo|class*="foo bar"]', "h1[@foo:class and contains(@foo:class, 'foo bar')]"],
+            ['h1[class]', 'h1[@class]'],
+            ['h1 .foo', "h1/descendant-or-self::*/*[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]"],
+            ['h1 #foo', "h1/descendant-or-self::*/*[@id = 'foo']"],
+            ['h1 [class*=foo]', "h1/descendant-or-self::*/*[@class and contains(@class, 'foo')]"],
+            ['div>.foo', "div/*[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]"],
+            ['div > .foo', "div/*[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]"],
+        ];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/AttributeNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/AttributeNodeTest.php
index 1fd090f5a6e8c..4d60074061f07 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/AttributeNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/AttributeNodeTest.php
@@ -18,20 +18,20 @@ class AttributeNodeTest extends AbstractNodeTest
 {
     public function getToStringConversionTestData()
     {
-        return array(
-            array(new AttributeNode(new ElementNode(), null, 'attribute', 'exists', null), 'Attribute[Element[*][attribute]]'),
-            array(new AttributeNode(new ElementNode(), null, 'attribute', '$=', 'value'), "Attribute[Element[*][attribute $= 'value']]"),
-            array(new AttributeNode(new ElementNode(), 'namespace', 'attribute', '$=', 'value'), "Attribute[Element[*][namespace|attribute $= 'value']]"),
-        );
+        return [
+            [new AttributeNode(new ElementNode(), null, 'attribute', 'exists', null), 'Attribute[Element[*][attribute]]'],
+            [new AttributeNode(new ElementNode(), null, 'attribute', '$=', 'value'), "Attribute[Element[*][attribute $= 'value']]"],
+            [new AttributeNode(new ElementNode(), 'namespace', 'attribute', '$=', 'value'), "Attribute[Element[*][namespace|attribute $= 'value']]"],
+        ];
     }
 
     public function getSpecificityValueTestData()
     {
-        return array(
-            array(new AttributeNode(new ElementNode(), null, 'attribute', 'exists', null), 10),
-            array(new AttributeNode(new ElementNode(null, 'element'), null, 'attribute', 'exists', null), 11),
-            array(new AttributeNode(new ElementNode(), null, 'attribute', '$=', 'value'), 10),
-            array(new AttributeNode(new ElementNode(), 'namespace', 'attribute', '$=', 'value'), 10),
-        );
+        return [
+            [new AttributeNode(new ElementNode(), null, 'attribute', 'exists', null), 10],
+            [new AttributeNode(new ElementNode(null, 'element'), null, 'attribute', 'exists', null), 11],
+            [new AttributeNode(new ElementNode(), null, 'attribute', '$=', 'value'), 10],
+            [new AttributeNode(new ElementNode(), 'namespace', 'attribute', '$=', 'value'), 10],
+        ];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/ClassNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/ClassNodeTest.php
index e0ab45accc31d..aa80c92792f39 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/ClassNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/ClassNodeTest.php
@@ -18,16 +18,16 @@ class ClassNodeTest extends AbstractNodeTest
 {
     public function getToStringConversionTestData()
     {
-        return array(
-            array(new ClassNode(new ElementNode(), 'class'), 'Class[Element[*].class]'),
-        );
+        return [
+            [new ClassNode(new ElementNode(), 'class'), 'Class[Element[*].class]'],
+        ];
     }
 
     public function getSpecificityValueTestData()
     {
-        return array(
-            array(new ClassNode(new ElementNode(), 'class'), 10),
-            array(new ClassNode(new ElementNode(null, 'element'), 'class'), 11),
-        );
+        return [
+            [new ClassNode(new ElementNode(), 'class'), 10],
+            [new ClassNode(new ElementNode(null, 'element'), 'class'), 11],
+        ];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/CombinedSelectorNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/CombinedSelectorNodeTest.php
index 9547298a6fdf3..435eaa6aa6981 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/CombinedSelectorNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/CombinedSelectorNodeTest.php
@@ -18,18 +18,18 @@ class CombinedSelectorNodeTest extends AbstractNodeTest
 {
     public function getToStringConversionTestData()
     {
-        return array(
-            array(new CombinedSelectorNode(new ElementNode(), '>', new ElementNode()), 'CombinedSelector[Element[*] > Element[*]]'),
-            array(new CombinedSelectorNode(new ElementNode(), ' ', new ElementNode()), 'CombinedSelector[Element[*] <followed> Element[*]]'),
-        );
+        return [
+            [new CombinedSelectorNode(new ElementNode(), '>', new ElementNode()), 'CombinedSelector[Element[*] > Element[*]]'],
+            [new CombinedSelectorNode(new ElementNode(), ' ', new ElementNode()), 'CombinedSelector[Element[*] <followed> Element[*]]'],
+        ];
     }
 
     public function getSpecificityValueTestData()
     {
-        return array(
-            array(new CombinedSelectorNode(new ElementNode(), '>', new ElementNode()), 0),
-            array(new CombinedSelectorNode(new ElementNode(null, 'element'), '>', new ElementNode()), 1),
-            array(new CombinedSelectorNode(new ElementNode(null, 'element'), '>', new ElementNode(null, 'element')), 2),
-        );
+        return [
+            [new CombinedSelectorNode(new ElementNode(), '>', new ElementNode()), 0],
+            [new CombinedSelectorNode(new ElementNode(null, 'element'), '>', new ElementNode()), 1],
+            [new CombinedSelectorNode(new ElementNode(null, 'element'), '>', new ElementNode(null, 'element')), 2],
+        ];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/ElementNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/ElementNodeTest.php
index 6d24789320561..e0797ff09cf5a 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/ElementNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/ElementNodeTest.php
@@ -17,19 +17,19 @@ class ElementNodeTest extends AbstractNodeTest
 {
     public function getToStringConversionTestData()
     {
-        return array(
-            array(new ElementNode(), 'Element[*]'),
-            array(new ElementNode(null, 'element'), 'Element[element]'),
-            array(new ElementNode('namespace', 'element'), 'Element[namespace|element]'),
-        );
+        return [
+            [new ElementNode(), 'Element[*]'],
+            [new ElementNode(null, 'element'), 'Element[element]'],
+            [new ElementNode('namespace', 'element'), 'Element[namespace|element]'],
+        ];
     }
 
     public function getSpecificityValueTestData()
     {
-        return array(
-            array(new ElementNode(), 0),
-            array(new ElementNode(null, 'element'), 1),
-            array(new ElementNode('namespace', 'element'), 1),
-        );
+        return [
+            [new ElementNode(), 0],
+            [new ElementNode(null, 'element'), 1],
+            [new ElementNode('namespace', 'element'), 1],
+        ];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/FunctionNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/FunctionNodeTest.php
index ee3ce51ba5499..0932393e1aa10 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/FunctionNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/FunctionNodeTest.php
@@ -19,29 +19,29 @@ class FunctionNodeTest extends AbstractNodeTest
 {
     public function getToStringConversionTestData()
     {
-        return array(
-            array(new FunctionNode(new ElementNode(), 'function'), 'Function[Element[*]:function()]'),
-            array(new FunctionNode(new ElementNode(), 'function', array(
+        return [
+            [new FunctionNode(new ElementNode(), 'function'), 'Function[Element[*]:function()]'],
+            [new FunctionNode(new ElementNode(), 'function', [
                 new Token(Token::TYPE_IDENTIFIER, 'value', 0),
-            )), "Function[Element[*]:function(['value'])]"),
-            array(new FunctionNode(new ElementNode(), 'function', array(
+            ]), "Function[Element[*]:function(['value'])]"],
+            [new FunctionNode(new ElementNode(), 'function', [
                 new Token(Token::TYPE_STRING, 'value1', 0),
                 new Token(Token::TYPE_NUMBER, 'value2', 0),
-            )), "Function[Element[*]:function(['value1', 'value2'])]"),
-        );
+            ]), "Function[Element[*]:function(['value1', 'value2'])]"],
+        ];
     }
 
     public function getSpecificityValueTestData()
     {
-        return array(
-            array(new FunctionNode(new ElementNode(), 'function'), 10),
-            array(new FunctionNode(new ElementNode(), 'function', array(
+        return [
+            [new FunctionNode(new ElementNode(), 'function'), 10],
+            [new FunctionNode(new ElementNode(), 'function', [
                 new Token(Token::TYPE_IDENTIFIER, 'value', 0),
-            )), 10),
-            array(new FunctionNode(new ElementNode(), 'function', array(
+            ]), 10],
+            [new FunctionNode(new ElementNode(), 'function', [
                 new Token(Token::TYPE_STRING, 'value1', 0),
                 new Token(Token::TYPE_NUMBER, 'value2', 0),
-            )), 10),
-        );
+            ]), 10],
+        ];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/HashNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/HashNodeTest.php
index 3bc74da9459c3..ad6765b8625c4 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/HashNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/HashNodeTest.php
@@ -18,16 +18,16 @@ class HashNodeTest extends AbstractNodeTest
 {
     public function getToStringConversionTestData()
     {
-        return array(
-            array(new HashNode(new ElementNode(), 'id'), 'Hash[Element[*]#id]'),
-        );
+        return [
+            [new HashNode(new ElementNode(), 'id'), 'Hash[Element[*]#id]'],
+        ];
     }
 
     public function getSpecificityValueTestData()
     {
-        return array(
-            array(new HashNode(new ElementNode(), 'id'), 100),
-            array(new HashNode(new ElementNode(null, 'id'), 'class'), 101),
-        );
+        return [
+            [new HashNode(new ElementNode(), 'id'), 100],
+            [new HashNode(new ElementNode(null, 'id'), 'class'), 101],
+        ];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/NegationNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/NegationNodeTest.php
index ed4d2482c391e..90b684ceec8b4 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/NegationNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/NegationNodeTest.php
@@ -19,15 +19,15 @@ class NegationNodeTest extends AbstractNodeTest
 {
     public function getToStringConversionTestData()
     {
-        return array(
-            array(new NegationNode(new ElementNode(), new ClassNode(new ElementNode(), 'class')), 'Negation[Element[*]:not(Class[Element[*].class])]'),
-        );
+        return [
+            [new NegationNode(new ElementNode(), new ClassNode(new ElementNode(), 'class')), 'Negation[Element[*]:not(Class[Element[*].class])]'],
+        ];
     }
 
     public function getSpecificityValueTestData()
     {
-        return array(
-            array(new NegationNode(new ElementNode(), new ClassNode(new ElementNode(), 'class')), 10),
-        );
+        return [
+            [new NegationNode(new ElementNode(), new ClassNode(new ElementNode(), 'class')), 10],
+        ];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/PseudoNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/PseudoNodeTest.php
index bc57813cc8fe1..4e78776c02a41 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/PseudoNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/PseudoNodeTest.php
@@ -18,15 +18,15 @@ class PseudoNodeTest extends AbstractNodeTest
 {
     public function getToStringConversionTestData()
     {
-        return array(
-            array(new PseudoNode(new ElementNode(), 'pseudo'), 'Pseudo[Element[*]:pseudo]'),
-        );
+        return [
+            [new PseudoNode(new ElementNode(), 'pseudo'), 'Pseudo[Element[*]:pseudo]'],
+        ];
     }
 
     public function getSpecificityValueTestData()
     {
-        return array(
-            array(new PseudoNode(new ElementNode(), 'pseudo'), 10),
-        );
+        return [
+            [new PseudoNode(new ElementNode(), 'pseudo'), 10],
+        ];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/SelectorNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/SelectorNodeTest.php
index 5badf71d16d1b..85e3bdac3fdef 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/SelectorNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/SelectorNodeTest.php
@@ -18,17 +18,17 @@ class SelectorNodeTest extends AbstractNodeTest
 {
     public function getToStringConversionTestData()
     {
-        return array(
-            array(new SelectorNode(new ElementNode()), 'Selector[Element[*]]'),
-            array(new SelectorNode(new ElementNode(), 'pseudo'), 'Selector[Element[*]::pseudo]'),
-        );
+        return [
+            [new SelectorNode(new ElementNode()), 'Selector[Element[*]]'],
+            [new SelectorNode(new ElementNode(), 'pseudo'), 'Selector[Element[*]::pseudo]'],
+        ];
     }
 
     public function getSpecificityValueTestData()
     {
-        return array(
-            array(new SelectorNode(new ElementNode()), 0),
-            array(new SelectorNode(new ElementNode(), 'pseudo'), 1),
-        );
+        return [
+            [new SelectorNode(new ElementNode()), 0],
+            [new SelectorNode(new ElementNode(), 'pseudo'), 1],
+        ];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/SpecificityTest.php b/src/Symfony/Component/CssSelector/Tests/Node/SpecificityTest.php
index b58eb8929c85e..bf48d49ffdbd4 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/SpecificityTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/SpecificityTest.php
@@ -30,13 +30,13 @@ public function testPlusValue(Specificity $specificity, $value)
 
     public function getValueTestData()
     {
-        return array(
-            array(new Specificity(0, 0, 0), 0),
-            array(new Specificity(0, 0, 2), 2),
-            array(new Specificity(0, 3, 0), 30),
-            array(new Specificity(4, 0, 0), 400),
-            array(new Specificity(4, 3, 2), 432),
-        );
+        return [
+            [new Specificity(0, 0, 0), 0],
+            [new Specificity(0, 0, 2), 2],
+            [new Specificity(0, 3, 0), 30],
+            [new Specificity(4, 0, 0), 400],
+            [new Specificity(4, 3, 2), 432],
+        ];
     }
 
     /** @dataProvider getCompareTestData */
@@ -47,17 +47,17 @@ public function testCompareTo(Specificity $a, Specificity $b, $result)
 
     public function getCompareTestData()
     {
-        return array(
-            array(new Specificity(0, 0, 0), new Specificity(0, 0, 0), 0),
-            array(new Specificity(0, 0, 1), new Specificity(0, 0, 1), 0),
-            array(new Specificity(0, 0, 2), new Specificity(0, 0, 1), 1),
-            array(new Specificity(0, 0, 2), new Specificity(0, 0, 3), -1),
-            array(new Specificity(0, 4, 0), new Specificity(0, 4, 0), 0),
-            array(new Specificity(0, 6, 0), new Specificity(0, 5, 11), 1),
-            array(new Specificity(0, 7, 0), new Specificity(0, 8, 0), -1),
-            array(new Specificity(9, 0, 0), new Specificity(9, 0, 0), 0),
-            array(new Specificity(11, 0, 0), new Specificity(10, 11, 0), 1),
-            array(new Specificity(12, 11, 0), new Specificity(13, 0, 0), -1),
-        );
+        return [
+            [new Specificity(0, 0, 0), new Specificity(0, 0, 0), 0],
+            [new Specificity(0, 0, 1), new Specificity(0, 0, 1), 0],
+            [new Specificity(0, 0, 2), new Specificity(0, 0, 1), 1],
+            [new Specificity(0, 0, 2), new Specificity(0, 0, 3), -1],
+            [new Specificity(0, 4, 0), new Specificity(0, 4, 0), 0],
+            [new Specificity(0, 6, 0), new Specificity(0, 5, 11), 1],
+            [new Specificity(0, 7, 0), new Specificity(0, 8, 0), -1],
+            [new Specificity(9, 0, 0), new Specificity(9, 0, 0), 0],
+            [new Specificity(11, 0, 0), new Specificity(10, 11, 0), 1],
+            [new Specificity(12, 11, 0), new Specificity(13, 0, 0), -1],
+        ];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/AbstractHandlerTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/AbstractHandlerTest.php
index f5c9dc8bfecb7..aaed55c205a9a 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/AbstractHandlerTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/AbstractHandlerTest.php
@@ -54,7 +54,7 @@ protected function assertStreamEmpty(TokenStream $stream)
         $property = new \ReflectionProperty($stream, 'tokens');
         $property->setAccessible(true);
 
-        $this->assertEquals(array(), $property->getValue($stream));
+        $this->assertEquals([], $property->getValue($stream));
     }
 
     protected function assertRemainingContent(Reader $reader, $remainingContent)
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/CommentHandlerTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/CommentHandlerTest.php
index 3961bf7d55ad9..de400478d8a0e 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/CommentHandlerTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/CommentHandlerTest.php
@@ -32,20 +32,20 @@ public function testHandleValue($value, Token $unusedArgument, $remainingContent
 
     public function getHandleValueTestData()
     {
-        return array(
+        return [
             // 2nd argument only exists for inherited method compatibility
-            array('/* comment */', new Token(null, null, null), ''),
-            array('/* comment */foo', new Token(null, null, null), 'foo'),
-        );
+            ['/* comment */', new Token(null, null, null), ''],
+            ['/* comment */foo', new Token(null, null, null), 'foo'],
+        ];
     }
 
     public function getDontHandleValueTestData()
     {
-        return array(
-            array('>'),
-            array('+'),
-            array(' '),
-        );
+        return [
+            ['>'],
+            ['+'],
+            [' '],
+        ];
     }
 
     protected function generateHandler()
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/HashHandlerTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/HashHandlerTest.php
index 5730120bf74d2..9444f5106f33d 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/HashHandlerTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/HashHandlerTest.php
@@ -20,24 +20,24 @@ class HashHandlerTest extends AbstractHandlerTest
 {
     public function getHandleValueTestData()
     {
-        return array(
-            array('#id', new Token(Token::TYPE_HASH, 'id', 0), ''),
-            array('#123', new Token(Token::TYPE_HASH, '123', 0), ''),
+        return [
+            ['#id', new Token(Token::TYPE_HASH, 'id', 0), ''],
+            ['#123', new Token(Token::TYPE_HASH, '123', 0), ''],
 
-            array('#id.class', new Token(Token::TYPE_HASH, 'id', 0), '.class'),
-            array('#id element', new Token(Token::TYPE_HASH, 'id', 0), ' element'),
-        );
+            ['#id.class', new Token(Token::TYPE_HASH, 'id', 0), '.class'],
+            ['#id element', new Token(Token::TYPE_HASH, 'id', 0), ' element'],
+        ];
     }
 
     public function getDontHandleValueTestData()
     {
-        return array(
-            array('id'),
-            array('123'),
-            array('<'),
-            array('<'),
-            array('#'),
-        );
+        return [
+            ['id'],
+            ['123'],
+            ['<'],
+            ['<'],
+            ['#'],
+        ];
     }
 
     protected function generateHandler()
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/IdentifierHandlerTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/IdentifierHandlerTest.php
index f56430c7e83ab..c54ba537b8a27 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/IdentifierHandlerTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/IdentifierHandlerTest.php
@@ -20,24 +20,24 @@ class IdentifierHandlerTest extends AbstractHandlerTest
 {
     public function getHandleValueTestData()
     {
-        return array(
-            array('foo', new Token(Token::TYPE_IDENTIFIER, 'foo', 0), ''),
-            array('foo|bar', new Token(Token::TYPE_IDENTIFIER, 'foo', 0), '|bar'),
-            array('foo.class', new Token(Token::TYPE_IDENTIFIER, 'foo', 0), '.class'),
-            array('foo[attr]', new Token(Token::TYPE_IDENTIFIER, 'foo', 0), '[attr]'),
-            array('foo bar', new Token(Token::TYPE_IDENTIFIER, 'foo', 0), ' bar'),
-        );
+        return [
+            ['foo', new Token(Token::TYPE_IDENTIFIER, 'foo', 0), ''],
+            ['foo|bar', new Token(Token::TYPE_IDENTIFIER, 'foo', 0), '|bar'],
+            ['foo.class', new Token(Token::TYPE_IDENTIFIER, 'foo', 0), '.class'],
+            ['foo[attr]', new Token(Token::TYPE_IDENTIFIER, 'foo', 0), '[attr]'],
+            ['foo bar', new Token(Token::TYPE_IDENTIFIER, 'foo', 0), ' bar'],
+        ];
     }
 
     public function getDontHandleValueTestData()
     {
-        return array(
-            array('>'),
-            array('+'),
-            array(' '),
-            array('*|foo'),
-            array('/* comment */'),
-        );
+        return [
+            ['>'],
+            ['+'],
+            [' '],
+            ['*|foo'],
+            ['/* comment */'],
+        ];
     }
 
     protected function generateHandler()
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/NumberHandlerTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/NumberHandlerTest.php
index 675fd05b43ef8..b43d369421840 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/NumberHandlerTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/NumberHandlerTest.php
@@ -19,26 +19,26 @@ class NumberHandlerTest extends AbstractHandlerTest
 {
     public function getHandleValueTestData()
     {
-        return array(
-            array('12', new Token(Token::TYPE_NUMBER, '12', 0), ''),
-            array('12.34', new Token(Token::TYPE_NUMBER, '12.34', 0), ''),
-            array('+12.34', new Token(Token::TYPE_NUMBER, '+12.34', 0), ''),
-            array('-12.34', new Token(Token::TYPE_NUMBER, '-12.34', 0), ''),
-
-            array('12 arg', new Token(Token::TYPE_NUMBER, '12', 0), ' arg'),
-            array('12]', new Token(Token::TYPE_NUMBER, '12', 0), ']'),
-        );
+        return [
+            ['12', new Token(Token::TYPE_NUMBER, '12', 0), ''],
+            ['12.34', new Token(Token::TYPE_NUMBER, '12.34', 0), ''],
+            ['+12.34', new Token(Token::TYPE_NUMBER, '+12.34', 0), ''],
+            ['-12.34', new Token(Token::TYPE_NUMBER, '-12.34', 0), ''],
+
+            ['12 arg', new Token(Token::TYPE_NUMBER, '12', 0), ' arg'],
+            ['12]', new Token(Token::TYPE_NUMBER, '12', 0), ']'],
+        ];
     }
 
     public function getDontHandleValueTestData()
     {
-        return array(
-            array('hello'),
-            array('>'),
-            array('+'),
-            array(' '),
-            array('/* comment */'),
-        );
+        return [
+            ['hello'],
+            ['>'],
+            ['+'],
+            [' '],
+            ['/* comment */'],
+        ];
     }
 
     protected function generateHandler()
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/StringHandlerTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/StringHandlerTest.php
index 8ea5d4d58776c..baa72735ff165 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/StringHandlerTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/StringHandlerTest.php
@@ -20,25 +20,25 @@ class StringHandlerTest extends AbstractHandlerTest
 {
     public function getHandleValueTestData()
     {
-        return array(
-            array('"hello"', new Token(Token::TYPE_STRING, 'hello', 1), ''),
-            array('"1"', new Token(Token::TYPE_STRING, '1', 1), ''),
-            array('" "', new Token(Token::TYPE_STRING, ' ', 1), ''),
-            array('""', new Token(Token::TYPE_STRING, '', 1), ''),
-            array("'hello'", new Token(Token::TYPE_STRING, 'hello', 1), ''),
-
-            array("'foo'bar", new Token(Token::TYPE_STRING, 'foo', 1), 'bar'),
-        );
+        return [
+            ['"hello"', new Token(Token::TYPE_STRING, 'hello', 1), ''],
+            ['"1"', new Token(Token::TYPE_STRING, '1', 1), ''],
+            ['" "', new Token(Token::TYPE_STRING, ' ', 1), ''],
+            ['""', new Token(Token::TYPE_STRING, '', 1), ''],
+            ["'hello'", new Token(Token::TYPE_STRING, 'hello', 1), ''],
+
+            ["'foo'bar", new Token(Token::TYPE_STRING, 'foo', 1), 'bar'],
+        ];
     }
 
     public function getDontHandleValueTestData()
     {
-        return array(
-            array('hello'),
-            array('>'),
-            array('1'),
-            array(' '),
-        );
+        return [
+            ['hello'],
+            ['>'],
+            ['1'],
+            [' '],
+        ];
     }
 
     protected function generateHandler()
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/WhitespaceHandlerTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/WhitespaceHandlerTest.php
index f5f9e71dc2287..67509ef135473 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/WhitespaceHandlerTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/WhitespaceHandlerTest.php
@@ -18,23 +18,23 @@ class WhitespaceHandlerTest extends AbstractHandlerTest
 {
     public function getHandleValueTestData()
     {
-        return array(
-            array(' ', new Token(Token::TYPE_WHITESPACE, ' ', 0), ''),
-            array("\n", new Token(Token::TYPE_WHITESPACE, "\n", 0), ''),
-            array("\t", new Token(Token::TYPE_WHITESPACE, "\t", 0), ''),
+        return [
+            [' ', new Token(Token::TYPE_WHITESPACE, ' ', 0), ''],
+            ["\n", new Token(Token::TYPE_WHITESPACE, "\n", 0), ''],
+            ["\t", new Token(Token::TYPE_WHITESPACE, "\t", 0), ''],
 
-            array(' foo', new Token(Token::TYPE_WHITESPACE, ' ', 0), 'foo'),
-            array(' .foo', new Token(Token::TYPE_WHITESPACE, ' ', 0), '.foo'),
-        );
+            [' foo', new Token(Token::TYPE_WHITESPACE, ' ', 0), 'foo'],
+            [' .foo', new Token(Token::TYPE_WHITESPACE, ' ', 0), '.foo'],
+        ];
     }
 
     public function getDontHandleValueTestData()
     {
-        return array(
-            array('>'),
-            array('1'),
-            array('a'),
-        );
+        return [
+            ['>'],
+            ['1'],
+            ['a'],
+        ];
     }
 
     protected function generateHandler()
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/ParserTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/ParserTest.php
index 53b35a95473cc..8fb3ccb19bb9d 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/ParserTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/ParserTest.php
@@ -77,7 +77,7 @@ public function testParseSeries($series, $a, $b)
 
         /** @var FunctionNode $function */
         $function = $selectors[0]->getTree();
-        $this->assertEquals(array($a, $b), Parser::parseSeries($function->getArguments()));
+        $this->assertEquals([$a, $b], Parser::parseSeries($function->getArguments()));
     }
 
     /** @dataProvider getParseSeriesExceptionTestData */
@@ -95,156 +95,156 @@ public function testParseSeriesException($series)
 
     public function getParserTestData()
     {
-        return array(
-            array('*', array('Element[*]')),
-            array('*|*', array('Element[*]')),
-            array('*|foo', array('Element[foo]')),
-            array('foo|*', array('Element[foo|*]')),
-            array('foo|bar', array('Element[foo|bar]')),
-            array('#foo#bar', array('Hash[Hash[Element[*]#foo]#bar]')),
-            array('div>.foo', array('CombinedSelector[Element[div] > Class[Element[*].foo]]')),
-            array('div> .foo', array('CombinedSelector[Element[div] > Class[Element[*].foo]]')),
-            array('div >.foo', array('CombinedSelector[Element[div] > Class[Element[*].foo]]')),
-            array('div > .foo', array('CombinedSelector[Element[div] > Class[Element[*].foo]]')),
-            array("div \n>  \t \t .foo", array('CombinedSelector[Element[div] > Class[Element[*].foo]]')),
-            array('td.foo,.bar', array('Class[Element[td].foo]', 'Class[Element[*].bar]')),
-            array('td.foo, .bar', array('Class[Element[td].foo]', 'Class[Element[*].bar]')),
-            array("td.foo\t\r\n\f ,\t\r\n\f .bar", array('Class[Element[td].foo]', 'Class[Element[*].bar]')),
-            array('td.foo,.bar', array('Class[Element[td].foo]', 'Class[Element[*].bar]')),
-            array('td.foo, .bar', array('Class[Element[td].foo]', 'Class[Element[*].bar]')),
-            array("td.foo\t\r\n\f ,\t\r\n\f .bar", array('Class[Element[td].foo]', 'Class[Element[*].bar]')),
-            array('div, td.foo, div.bar span', array('Element[div]', 'Class[Element[td].foo]', 'CombinedSelector[Class[Element[div].bar] <followed> Element[span]]')),
-            array('div > p', array('CombinedSelector[Element[div] > Element[p]]')),
-            array('td:first', array('Pseudo[Element[td]:first]')),
-            array('td :first', array('CombinedSelector[Element[td] <followed> Pseudo[Element[*]:first]]')),
-            array('a[name]', array('Attribute[Element[a][name]]')),
-            array("a[ name\t]", array('Attribute[Element[a][name]]')),
-            array('a [name]', array('CombinedSelector[Element[a] <followed> Attribute[Element[*][name]]]')),
-            array('a[rel="include"]', array("Attribute[Element[a][rel = 'include']]")),
-            array('a[rel = include]', array("Attribute[Element[a][rel = 'include']]")),
-            array("a[hreflang |= 'en']", array("Attribute[Element[a][hreflang |= 'en']]")),
-            array('a[hreflang|=en]', array("Attribute[Element[a][hreflang |= 'en']]")),
-            array('div:nth-child(10)', array("Function[Element[div]:nth-child(['10'])]")),
-            array(':nth-child(2n+2)', array("Function[Element[*]:nth-child(['2', 'n', '+2'])]")),
-            array('div:nth-of-type(10)', array("Function[Element[div]:nth-of-type(['10'])]")),
-            array('div div:nth-of-type(10) .aclass', array("CombinedSelector[CombinedSelector[Element[div] <followed> Function[Element[div]:nth-of-type(['10'])]] <followed> Class[Element[*].aclass]]")),
-            array('label:only', array('Pseudo[Element[label]:only]')),
-            array('a:lang(fr)', array("Function[Element[a]:lang(['fr'])]")),
-            array('div:contains("foo")', array("Function[Element[div]:contains(['foo'])]")),
-            array('div#foobar', array('Hash[Element[div]#foobar]')),
-            array('div:not(div.foo)', array('Negation[Element[div]:not(Class[Element[div].foo])]')),
-            array('td ~ th', array('CombinedSelector[Element[td] ~ Element[th]]')),
-            array('.foo[data-bar][data-baz=0]', array("Attribute[Attribute[Class[Element[*].foo][data-bar]][data-baz = '0']]")),
-        );
+        return [
+            ['*', ['Element[*]']],
+            ['*|*', ['Element[*]']],
+            ['*|foo', ['Element[foo]']],
+            ['foo|*', ['Element[foo|*]']],
+            ['foo|bar', ['Element[foo|bar]']],
+            ['#foo#bar', ['Hash[Hash[Element[*]#foo]#bar]']],
+            ['div>.foo', ['CombinedSelector[Element[div] > Class[Element[*].foo]]']],
+            ['div> .foo', ['CombinedSelector[Element[div] > Class[Element[*].foo]]']],
+            ['div >.foo', ['CombinedSelector[Element[div] > Class[Element[*].foo]]']],
+            ['div > .foo', ['CombinedSelector[Element[div] > Class[Element[*].foo]]']],
+            ["div \n>  \t \t .foo", ['CombinedSelector[Element[div] > Class[Element[*].foo]]']],
+            ['td.foo,.bar', ['Class[Element[td].foo]', 'Class[Element[*].bar]']],
+            ['td.foo, .bar', ['Class[Element[td].foo]', 'Class[Element[*].bar]']],
+            ["td.foo\t\r\n\f ,\t\r\n\f .bar", ['Class[Element[td].foo]', 'Class[Element[*].bar]']],
+            ['td.foo,.bar', ['Class[Element[td].foo]', 'Class[Element[*].bar]']],
+            ['td.foo, .bar', ['Class[Element[td].foo]', 'Class[Element[*].bar]']],
+            ["td.foo\t\r\n\f ,\t\r\n\f .bar", ['Class[Element[td].foo]', 'Class[Element[*].bar]']],
+            ['div, td.foo, div.bar span', ['Element[div]', 'Class[Element[td].foo]', 'CombinedSelector[Class[Element[div].bar] <followed> Element[span]]']],
+            ['div > p', ['CombinedSelector[Element[div] > Element[p]]']],
+            ['td:first', ['Pseudo[Element[td]:first]']],
+            ['td :first', ['CombinedSelector[Element[td] <followed> Pseudo[Element[*]:first]]']],
+            ['a[name]', ['Attribute[Element[a][name]]']],
+            ["a[ name\t]", ['Attribute[Element[a][name]]']],
+            ['a [name]', ['CombinedSelector[Element[a] <followed> Attribute[Element[*][name]]]']],
+            ['a[rel="include"]', ["Attribute[Element[a][rel = 'include']]"]],
+            ['a[rel = include]', ["Attribute[Element[a][rel = 'include']]"]],
+            ["a[hreflang |= 'en']", ["Attribute[Element[a][hreflang |= 'en']]"]],
+            ['a[hreflang|=en]', ["Attribute[Element[a][hreflang |= 'en']]"]],
+            ['div:nth-child(10)', ["Function[Element[div]:nth-child(['10'])]"]],
+            [':nth-child(2n+2)', ["Function[Element[*]:nth-child(['2', 'n', '+2'])]"]],
+            ['div:nth-of-type(10)', ["Function[Element[div]:nth-of-type(['10'])]"]],
+            ['div div:nth-of-type(10) .aclass', ["CombinedSelector[CombinedSelector[Element[div] <followed> Function[Element[div]:nth-of-type(['10'])]] <followed> Class[Element[*].aclass]]"]],
+            ['label:only', ['Pseudo[Element[label]:only]']],
+            ['a:lang(fr)', ["Function[Element[a]:lang(['fr'])]"]],
+            ['div:contains("foo")', ["Function[Element[div]:contains(['foo'])]"]],
+            ['div#foobar', ['Hash[Element[div]#foobar]']],
+            ['div:not(div.foo)', ['Negation[Element[div]:not(Class[Element[div].foo])]']],
+            ['td ~ th', ['CombinedSelector[Element[td] ~ Element[th]]']],
+            ['.foo[data-bar][data-baz=0]', ["Attribute[Attribute[Class[Element[*].foo][data-bar]][data-baz = '0']]"]],
+        ];
     }
 
     public function getParserExceptionTestData()
     {
-        return array(
-            array('attributes(href)/html/body/a', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '(', 10))->getMessage()),
-            array('attributes(href)', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '(', 10))->getMessage()),
-            array('html/body/a', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '/', 4))->getMessage()),
-            array(' ', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_FILE_END, '', 1))->getMessage()),
-            array('div, ', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_FILE_END, '', 5))->getMessage()),
-            array(' , div', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, ',', 1))->getMessage()),
-            array('p, , div', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, ',', 3))->getMessage()),
-            array('div > ', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_FILE_END, '', 6))->getMessage()),
-            array('  > div', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '>', 2))->getMessage()),
-            array('foo|#bar', SyntaxErrorException::unexpectedToken('identifier or "*"', new Token(Token::TYPE_HASH, 'bar', 4))->getMessage()),
-            array('#.foo', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '#', 0))->getMessage()),
-            array('.#foo', SyntaxErrorException::unexpectedToken('identifier', new Token(Token::TYPE_HASH, 'foo', 1))->getMessage()),
-            array(':#foo', SyntaxErrorException::unexpectedToken('identifier', new Token(Token::TYPE_HASH, 'foo', 1))->getMessage()),
-            array('[*]', SyntaxErrorException::unexpectedToken('"|"', new Token(Token::TYPE_DELIMITER, ']', 2))->getMessage()),
-            array('[foo|]', SyntaxErrorException::unexpectedToken('identifier', new Token(Token::TYPE_DELIMITER, ']', 5))->getMessage()),
-            array('[#]', SyntaxErrorException::unexpectedToken('identifier or "*"', new Token(Token::TYPE_DELIMITER, '#', 1))->getMessage()),
-            array('[foo=#]', SyntaxErrorException::unexpectedToken('string or identifier', new Token(Token::TYPE_DELIMITER, '#', 5))->getMessage()),
-            array(':nth-child()', SyntaxErrorException::unexpectedToken('at least one argument', new Token(Token::TYPE_DELIMITER, ')', 11))->getMessage()),
-            array('[href]a', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_IDENTIFIER, 'a', 6))->getMessage()),
-            array('[rel:stylesheet]', SyntaxErrorException::unexpectedToken('operator', new Token(Token::TYPE_DELIMITER, ':', 4))->getMessage()),
-            array('[rel=stylesheet', SyntaxErrorException::unexpectedToken('"]"', new Token(Token::TYPE_FILE_END, '', 15))->getMessage()),
-            array(':lang(fr', SyntaxErrorException::unexpectedToken('an argument', new Token(Token::TYPE_FILE_END, '', 8))->getMessage()),
-            array(':contains("foo', SyntaxErrorException::unclosedString(10)->getMessage()),
-            array('foo!', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '!', 3))->getMessage()),
-        );
+        return [
+            ['attributes(href)/html/body/a', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '(', 10))->getMessage()],
+            ['attributes(href)', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '(', 10))->getMessage()],
+            ['html/body/a', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '/', 4))->getMessage()],
+            [' ', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_FILE_END, '', 1))->getMessage()],
+            ['div, ', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_FILE_END, '', 5))->getMessage()],
+            [' , div', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, ',', 1))->getMessage()],
+            ['p, , div', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, ',', 3))->getMessage()],
+            ['div > ', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_FILE_END, '', 6))->getMessage()],
+            ['  > div', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '>', 2))->getMessage()],
+            ['foo|#bar', SyntaxErrorException::unexpectedToken('identifier or "*"', new Token(Token::TYPE_HASH, 'bar', 4))->getMessage()],
+            ['#.foo', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '#', 0))->getMessage()],
+            ['.#foo', SyntaxErrorException::unexpectedToken('identifier', new Token(Token::TYPE_HASH, 'foo', 1))->getMessage()],
+            [':#foo', SyntaxErrorException::unexpectedToken('identifier', new Token(Token::TYPE_HASH, 'foo', 1))->getMessage()],
+            ['[*]', SyntaxErrorException::unexpectedToken('"|"', new Token(Token::TYPE_DELIMITER, ']', 2))->getMessage()],
+            ['[foo|]', SyntaxErrorException::unexpectedToken('identifier', new Token(Token::TYPE_DELIMITER, ']', 5))->getMessage()],
+            ['[#]', SyntaxErrorException::unexpectedToken('identifier or "*"', new Token(Token::TYPE_DELIMITER, '#', 1))->getMessage()],
+            ['[foo=#]', SyntaxErrorException::unexpectedToken('string or identifier', new Token(Token::TYPE_DELIMITER, '#', 5))->getMessage()],
+            [':nth-child()', SyntaxErrorException::unexpectedToken('at least one argument', new Token(Token::TYPE_DELIMITER, ')', 11))->getMessage()],
+            ['[href]a', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_IDENTIFIER, 'a', 6))->getMessage()],
+            ['[rel:stylesheet]', SyntaxErrorException::unexpectedToken('operator', new Token(Token::TYPE_DELIMITER, ':', 4))->getMessage()],
+            ['[rel=stylesheet', SyntaxErrorException::unexpectedToken('"]"', new Token(Token::TYPE_FILE_END, '', 15))->getMessage()],
+            [':lang(fr', SyntaxErrorException::unexpectedToken('an argument', new Token(Token::TYPE_FILE_END, '', 8))->getMessage()],
+            [':contains("foo', SyntaxErrorException::unclosedString(10)->getMessage()],
+            ['foo!', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '!', 3))->getMessage()],
+        ];
     }
 
     public function getPseudoElementsTestData()
     {
-        return array(
-            array('foo', 'Element[foo]', ''),
-            array('*', 'Element[*]', ''),
-            array(':empty', 'Pseudo[Element[*]:empty]', ''),
-            array(':BEfore', 'Element[*]', 'before'),
-            array(':aftER', 'Element[*]', 'after'),
-            array(':First-Line', 'Element[*]', 'first-line'),
-            array(':First-Letter', 'Element[*]', 'first-letter'),
-            array('::befoRE', 'Element[*]', 'before'),
-            array('::AFter', 'Element[*]', 'after'),
-            array('::firsT-linE', 'Element[*]', 'first-line'),
-            array('::firsT-letteR', 'Element[*]', 'first-letter'),
-            array('::Selection', 'Element[*]', 'selection'),
-            array('foo:after', 'Element[foo]', 'after'),
-            array('foo::selection', 'Element[foo]', 'selection'),
-            array('lorem#ipsum ~ a#b.c[href]:empty::selection', 'CombinedSelector[Hash[Element[lorem]#ipsum] ~ Pseudo[Attribute[Class[Hash[Element[a]#b].c][href]]:empty]]', 'selection'),
-            array('video::-webkit-media-controls', 'Element[video]', '-webkit-media-controls'),
-        );
+        return [
+            ['foo', 'Element[foo]', ''],
+            ['*', 'Element[*]', ''],
+            [':empty', 'Pseudo[Element[*]:empty]', ''],
+            [':BEfore', 'Element[*]', 'before'],
+            [':aftER', 'Element[*]', 'after'],
+            [':First-Line', 'Element[*]', 'first-line'],
+            [':First-Letter', 'Element[*]', 'first-letter'],
+            ['::befoRE', 'Element[*]', 'before'],
+            ['::AFter', 'Element[*]', 'after'],
+            ['::firsT-linE', 'Element[*]', 'first-line'],
+            ['::firsT-letteR', 'Element[*]', 'first-letter'],
+            ['::Selection', 'Element[*]', 'selection'],
+            ['foo:after', 'Element[foo]', 'after'],
+            ['foo::selection', 'Element[foo]', 'selection'],
+            ['lorem#ipsum ~ a#b.c[href]:empty::selection', 'CombinedSelector[Hash[Element[lorem]#ipsum] ~ Pseudo[Attribute[Class[Hash[Element[a]#b].c][href]]:empty]]', 'selection'],
+            ['video::-webkit-media-controls', 'Element[video]', '-webkit-media-controls'],
+        ];
     }
 
     public function getSpecificityTestData()
     {
-        return array(
-            array('*', 0),
-            array(' foo', 1),
-            array(':empty ', 10),
-            array(':before', 1),
-            array('*:before', 1),
-            array(':nth-child(2)', 10),
-            array('.bar', 10),
-            array('[baz]', 10),
-            array('[baz="4"]', 10),
-            array('[baz^="4"]', 10),
-            array('#lipsum', 100),
-            array(':not(*)', 0),
-            array(':not(foo)', 1),
-            array(':not(.foo)', 10),
-            array(':not([foo])', 10),
-            array(':not(:empty)', 10),
-            array(':not(#foo)', 100),
-            array('foo:empty', 11),
-            array('foo:before', 2),
-            array('foo::before', 2),
-            array('foo:empty::before', 12),
-            array('#lorem + foo#ipsum:first-child > bar:first-line', 213),
-        );
+        return [
+            ['*', 0],
+            [' foo', 1],
+            [':empty ', 10],
+            [':before', 1],
+            ['*:before', 1],
+            [':nth-child(2)', 10],
+            ['.bar', 10],
+            ['[baz]', 10],
+            ['[baz="4"]', 10],
+            ['[baz^="4"]', 10],
+            ['#lipsum', 100],
+            [':not(*)', 0],
+            [':not(foo)', 1],
+            [':not(.foo)', 10],
+            [':not([foo])', 10],
+            [':not(:empty)', 10],
+            [':not(#foo)', 100],
+            ['foo:empty', 11],
+            ['foo:before', 2],
+            ['foo::before', 2],
+            ['foo:empty::before', 12],
+            ['#lorem + foo#ipsum:first-child > bar:first-line', 213],
+        ];
     }
 
     public function getParseSeriesTestData()
     {
-        return array(
-            array('1n+3', 1, 3),
-            array('1n +3', 1, 3),
-            array('1n + 3', 1, 3),
-            array('1n+ 3', 1, 3),
-            array('1n-3', 1, -3),
-            array('1n -3', 1, -3),
-            array('1n - 3', 1, -3),
-            array('1n- 3', 1, -3),
-            array('n-5', 1, -5),
-            array('odd', 2, 1),
-            array('even', 2, 0),
-            array('3n', 3, 0),
-            array('n', 1, 0),
-            array('+n', 1, 0),
-            array('-n', -1, 0),
-            array('5', 0, 5),
-        );
+        return [
+            ['1n+3', 1, 3],
+            ['1n +3', 1, 3],
+            ['1n + 3', 1, 3],
+            ['1n+ 3', 1, 3],
+            ['1n-3', 1, -3],
+            ['1n -3', 1, -3],
+            ['1n - 3', 1, -3],
+            ['1n- 3', 1, -3],
+            ['n-5', 1, -5],
+            ['odd', 2, 1],
+            ['even', 2, 0],
+            ['3n', 3, 0],
+            ['n', 1, 0],
+            ['+n', 1, 0],
+            ['-n', -1, 0],
+            ['5', 0, 5],
+        ];
     }
 
     public function getParseSeriesExceptionTestData()
     {
-        return array(
-            array('foo'),
-            array('n+'),
-        );
+        return [
+            ['foo'],
+            ['n+'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/ReaderTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/ReaderTest.php
index 21eb60846240d..ff9ea909753cd 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/ReaderTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/ReaderTest.php
@@ -70,11 +70,11 @@ public function testFindPattern()
         $reader = new Reader('hello');
 
         $this->assertFalse($reader->findPattern('/world/'));
-        $this->assertEquals(array('hello', 'h'), $reader->findPattern('/^([a-z]).*/'));
+        $this->assertEquals(['hello', 'h'], $reader->findPattern('/^([a-z]).*/'));
 
         $this->assignPosition($reader, 2);
         $this->assertFalse($reader->findPattern('/^h.*/'));
-        $this->assertEquals(array('llo'), $reader->findPattern('/^llo$/'));
+        $this->assertEquals(['llo'], $reader->findPattern('/^llo$/'));
     }
 
     public function testMoveForward()
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/Shortcut/ClassParserTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/Shortcut/ClassParserTest.php
index 7e92f5baeed18..29d9d5f16b240 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/Shortcut/ClassParserTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/Shortcut/ClassParserTest.php
@@ -34,12 +34,12 @@ public function testParse($source, $representation)
 
     public function getParseTestData()
     {
-        return array(
-            array('.testclass', 'Class[Element[*].testclass]'),
-            array('testel.testclass', 'Class[Element[testel].testclass]'),
-            array('testns|.testclass', 'Class[Element[testns|*].testclass]'),
-            array('testns|*.testclass', 'Class[Element[testns|*].testclass]'),
-            array('testns|testel.testclass', 'Class[Element[testns|testel].testclass]'),
-        );
+        return [
+            ['.testclass', 'Class[Element[*].testclass]'],
+            ['testel.testclass', 'Class[Element[testel].testclass]'],
+            ['testns|.testclass', 'Class[Element[testns|*].testclass]'],
+            ['testns|*.testclass', 'Class[Element[testns|*].testclass]'],
+            ['testns|testel.testclass', 'Class[Element[testns|testel].testclass]'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/Shortcut/ElementParserTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/Shortcut/ElementParserTest.php
index 05a730fde15a2..79cc2270324f6 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/Shortcut/ElementParserTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/Shortcut/ElementParserTest.php
@@ -34,11 +34,11 @@ public function testParse($source, $representation)
 
     public function getParseTestData()
     {
-        return array(
-            array('*', 'Element[*]'),
-            array('testel', 'Element[testel]'),
-            array('testns|*', 'Element[testns|*]'),
-            array('testns|testel', 'Element[testns|testel]'),
-        );
+        return [
+            ['*', 'Element[*]'],
+            ['testel', 'Element[testel]'],
+            ['testns|*', 'Element[testns|*]'],
+            ['testns|testel', 'Element[testns|testel]'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/Shortcut/HashParserTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/Shortcut/HashParserTest.php
index 82f555d9abf16..a7c79d69a547a 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/Shortcut/HashParserTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/Shortcut/HashParserTest.php
@@ -34,12 +34,12 @@ public function testParse($source, $representation)
 
     public function getParseTestData()
     {
-        return array(
-            array('#testid', 'Hash[Element[*]#testid]'),
-            array('testel#testid', 'Hash[Element[testel]#testid]'),
-            array('testns|#testid', 'Hash[Element[testns|*]#testid]'),
-            array('testns|*#testid', 'Hash[Element[testns|*]#testid]'),
-            array('testns|testel#testid', 'Hash[Element[testns|testel]#testid]'),
-        );
+        return [
+            ['#testid', 'Hash[Element[*]#testid]'],
+            ['testel#testid', 'Hash[Element[testel]#testid]'],
+            ['testns|#testid', 'Hash[Element[testns|*]#testid]'],
+            ['testns|*#testid', 'Hash[Element[testns|*]#testid]'],
+            ['testns|testel#testid', 'Hash[Element[testns|testel]#testid]'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Tests/XPath/TranslatorTest.php b/src/Symfony/Component/CssSelector/Tests/XPath/TranslatorTest.php
index 610458297ecec..66647b670ca3a 100644
--- a/src/Symfony/Component/CssSelector/Tests/XPath/TranslatorTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/XPath/TranslatorTest.php
@@ -80,248 +80,248 @@ public function testHtmlShakespear($css, $count)
 
     public function getXpathLiteralTestData()
     {
-        return array(
-            array('foo', "'foo'"),
-            array("foo's bar", '"foo\'s bar"'),
-            array("foo's \"middle\" bar", 'concat(\'foo\', "\'", \'s "middle" bar\')'),
-            array("foo's 'middle' \"bar\"", 'concat(\'foo\', "\'", \'s \', "\'", \'middle\', "\'", \' "bar"\')'),
-        );
+        return [
+            ['foo', "'foo'"],
+            ["foo's bar", '"foo\'s bar"'],
+            ["foo's \"middle\" bar", 'concat(\'foo\', "\'", \'s "middle" bar\')'],
+            ["foo's 'middle' \"bar\"", 'concat(\'foo\', "\'", \'s \', "\'", \'middle\', "\'", \' "bar"\')'],
+        ];
     }
 
     public function getCssToXPathTestData()
     {
-        return array(
-            array('*', '*'),
-            array('e', 'e'),
-            array('*|e', 'e'),
-            array('e|f', 'e:f'),
-            array('e[foo]', 'e[@foo]'),
-            array('e[foo|bar]', 'e[@foo:bar]'),
-            array('e[foo="bar"]', "e[@foo = 'bar']"),
-            array('e[foo~="bar"]', "e[@foo and contains(concat(' ', normalize-space(@foo), ' '), ' bar ')]"),
-            array('e[foo^="bar"]', "e[@foo and starts-with(@foo, 'bar')]"),
-            array('e[foo$="bar"]', "e[@foo and substring(@foo, string-length(@foo)-2) = 'bar']"),
-            array('e[foo*="bar"]', "e[@foo and contains(@foo, 'bar')]"),
-            array('e[foo!="bar"]', "e[not(@foo) or @foo != 'bar']"),
-            array('e[foo!="bar"][foo!="baz"]', "e[(not(@foo) or @foo != 'bar') and (not(@foo) or @foo != 'baz')]"),
-            array('e[hreflang|="en"]', "e[@hreflang and (@hreflang = 'en' or starts-with(@hreflang, 'en-'))]"),
-            array('e:nth-child(1)', "*/*[(name() = 'e') and (position() = 1)]"),
-            array('e:nth-last-child(1)', "*/*[(name() = 'e') and (position() = last() - 0)]"),
-            array('e:nth-last-child(2n+2)', "*/*[(name() = 'e') and (last() - position() - 1 >= 0 and (last() - position() - 1) mod 2 = 0)]"),
-            array('e:nth-of-type(1)', '*/e[position() = 1]'),
-            array('e:nth-last-of-type(1)', '*/e[position() = last() - 0]'),
-            array('div e:nth-last-of-type(1) .aclass', "div/descendant-or-self::*/e[position() = last() - 0]/descendant-or-self::*/*[@class and contains(concat(' ', normalize-space(@class), ' '), ' aclass ')]"),
-            array('e:first-child', "*/*[(name() = 'e') and (position() = 1)]"),
-            array('e:last-child', "*/*[(name() = 'e') and (position() = last())]"),
-            array('e:first-of-type', '*/e[position() = 1]'),
-            array('e:last-of-type', '*/e[position() = last()]'),
-            array('e:only-child', "*/*[(name() = 'e') and (last() = 1)]"),
-            array('e:only-of-type', 'e[last() = 1]'),
-            array('e:empty', 'e[not(*) and not(string-length())]'),
-            array('e:EmPTY', 'e[not(*) and not(string-length())]'),
-            array('e:root', 'e[not(parent::*)]'),
-            array('e:hover', 'e[0]'),
-            array('e:contains("foo")', "e[contains(string(.), 'foo')]"),
-            array('e:ConTains(foo)', "e[contains(string(.), 'foo')]"),
-            array('e.warning', "e[@class and contains(concat(' ', normalize-space(@class), ' '), ' warning ')]"),
-            array('e#myid', "e[@id = 'myid']"),
-            array('e:not(:nth-child(odd))', 'e[not(position() - 1 >= 0 and (position() - 1) mod 2 = 0)]'),
-            array('e:nOT(*)', 'e[0]'),
-            array('e f', 'e/descendant-or-self::*/f'),
-            array('e > f', 'e/f'),
-            array('e + f', "e/following-sibling::*[(name() = 'f') and (position() = 1)]"),
-            array('e ~ f', 'e/following-sibling::f'),
-            array('div#container p', "div[@id = 'container']/descendant-or-self::*/p"),
-        );
+        return [
+            ['*', '*'],
+            ['e', 'e'],
+            ['*|e', 'e'],
+            ['e|f', 'e:f'],
+            ['e[foo]', 'e[@foo]'],
+            ['e[foo|bar]', 'e[@foo:bar]'],
+            ['e[foo="bar"]', "e[@foo = 'bar']"],
+            ['e[foo~="bar"]', "e[@foo and contains(concat(' ', normalize-space(@foo), ' '), ' bar ')]"],
+            ['e[foo^="bar"]', "e[@foo and starts-with(@foo, 'bar')]"],
+            ['e[foo$="bar"]', "e[@foo and substring(@foo, string-length(@foo)-2) = 'bar']"],
+            ['e[foo*="bar"]', "e[@foo and contains(@foo, 'bar')]"],
+            ['e[foo!="bar"]', "e[not(@foo) or @foo != 'bar']"],
+            ['e[foo!="bar"][foo!="baz"]', "e[(not(@foo) or @foo != 'bar') and (not(@foo) or @foo != 'baz')]"],
+            ['e[hreflang|="en"]', "e[@hreflang and (@hreflang = 'en' or starts-with(@hreflang, 'en-'))]"],
+            ['e:nth-child(1)', "*/*[(name() = 'e') and (position() = 1)]"],
+            ['e:nth-last-child(1)', "*/*[(name() = 'e') and (position() = last() - 0)]"],
+            ['e:nth-last-child(2n+2)', "*/*[(name() = 'e') and (last() - position() - 1 >= 0 and (last() - position() - 1) mod 2 = 0)]"],
+            ['e:nth-of-type(1)', '*/e[position() = 1]'],
+            ['e:nth-last-of-type(1)', '*/e[position() = last() - 0]'],
+            ['div e:nth-last-of-type(1) .aclass', "div/descendant-or-self::*/e[position() = last() - 0]/descendant-or-self::*/*[@class and contains(concat(' ', normalize-space(@class), ' '), ' aclass ')]"],
+            ['e:first-child', "*/*[(name() = 'e') and (position() = 1)]"],
+            ['e:last-child', "*/*[(name() = 'e') and (position() = last())]"],
+            ['e:first-of-type', '*/e[position() = 1]'],
+            ['e:last-of-type', '*/e[position() = last()]'],
+            ['e:only-child', "*/*[(name() = 'e') and (last() = 1)]"],
+            ['e:only-of-type', 'e[last() = 1]'],
+            ['e:empty', 'e[not(*) and not(string-length())]'],
+            ['e:EmPTY', 'e[not(*) and not(string-length())]'],
+            ['e:root', 'e[not(parent::*)]'],
+            ['e:hover', 'e[0]'],
+            ['e:contains("foo")', "e[contains(string(.), 'foo')]"],
+            ['e:ConTains(foo)', "e[contains(string(.), 'foo')]"],
+            ['e.warning', "e[@class and contains(concat(' ', normalize-space(@class), ' '), ' warning ')]"],
+            ['e#myid', "e[@id = 'myid']"],
+            ['e:not(:nth-child(odd))', 'e[not(position() - 1 >= 0 and (position() - 1) mod 2 = 0)]'],
+            ['e:nOT(*)', 'e[0]'],
+            ['e f', 'e/descendant-or-self::*/f'],
+            ['e > f', 'e/f'],
+            ['e + f', "e/following-sibling::*[(name() = 'f') and (position() = 1)]"],
+            ['e ~ f', 'e/following-sibling::f'],
+            ['div#container p', "div[@id = 'container']/descendant-or-self::*/p"],
+        ];
     }
 
     public function getXmlLangTestData()
     {
-        return array(
-            array(':lang("EN")', array('first', 'second', 'third', 'fourth')),
-            array(':lang("en-us")', array('second', 'fourth')),
-            array(':lang(en-nz)', array('third')),
-            array(':lang(fr)', array('fifth')),
-            array(':lang(ru)', array('sixth')),
-            array(":lang('ZH')", array('eighth')),
-            array(':lang(de) :lang(zh)', array('eighth')),
-            array(':lang(en), :lang(zh)', array('first', 'second', 'third', 'fourth', 'eighth')),
-            array(':lang(es)', array()),
-        );
+        return [
+            [':lang("EN")', ['first', 'second', 'third', 'fourth']],
+            [':lang("en-us")', ['second', 'fourth']],
+            [':lang(en-nz)', ['third']],
+            [':lang(fr)', ['fifth']],
+            [':lang(ru)', ['sixth']],
+            [":lang('ZH')", ['eighth']],
+            [':lang(de) :lang(zh)', ['eighth']],
+            [':lang(en), :lang(zh)', ['first', 'second', 'third', 'fourth', 'eighth']],
+            [':lang(es)', []],
+        ];
     }
 
     public function getHtmlIdsTestData()
     {
-        return array(
-            array('div', array('outer-div', 'li-div', 'foobar-div')),
-            array('DIV', array('outer-div', 'li-div', 'foobar-div')),  // case-insensitive in HTML
-            array('div div', array('li-div')),
-            array('div, div div', array('outer-div', 'li-div', 'foobar-div')),
-            array('a[name]', array('name-anchor')),
-            array('a[NAme]', array('name-anchor')), // case-insensitive in HTML:
-            array('a[rel]', array('tag-anchor', 'nofollow-anchor')),
-            array('a[rel="tag"]', array('tag-anchor')),
-            array('a[href*="localhost"]', array('tag-anchor')),
-            array('a[href*=""]', array()),
-            array('a[href^="http"]', array('tag-anchor', 'nofollow-anchor')),
-            array('a[href^="http:"]', array('tag-anchor')),
-            array('a[href^=""]', array()),
-            array('a[href$="org"]', array('nofollow-anchor')),
-            array('a[href$=""]', array()),
-            array('div[foobar~="bc"]', array('foobar-div')),
-            array('div[foobar~="cde"]', array('foobar-div')),
-            array('[foobar~="ab bc"]', array('foobar-div')),
-            array('[foobar~=""]', array()),
-            array('[foobar~=" \t"]', array()),
-            array('div[foobar~="cd"]', array()),
-            array('*[lang|="En"]', array('second-li')),
-            array('[lang|="En-us"]', array('second-li')),
+        return [
+            ['div', ['outer-div', 'li-div', 'foobar-div']],
+            ['DIV', ['outer-div', 'li-div', 'foobar-div']],  // case-insensitive in HTML
+            ['div div', ['li-div']],
+            ['div, div div', ['outer-div', 'li-div', 'foobar-div']],
+            ['a[name]', ['name-anchor']],
+            ['a[NAme]', ['name-anchor']], // case-insensitive in HTML:
+            ['a[rel]', ['tag-anchor', 'nofollow-anchor']],
+            ['a[rel="tag"]', ['tag-anchor']],
+            ['a[href*="localhost"]', ['tag-anchor']],
+            ['a[href*=""]', []],
+            ['a[href^="http"]', ['tag-anchor', 'nofollow-anchor']],
+            ['a[href^="http:"]', ['tag-anchor']],
+            ['a[href^=""]', []],
+            ['a[href$="org"]', ['nofollow-anchor']],
+            ['a[href$=""]', []],
+            ['div[foobar~="bc"]', ['foobar-div']],
+            ['div[foobar~="cde"]', ['foobar-div']],
+            ['[foobar~="ab bc"]', ['foobar-div']],
+            ['[foobar~=""]', []],
+            ['[foobar~=" \t"]', []],
+            ['div[foobar~="cd"]', []],
+            ['*[lang|="En"]', ['second-li']],
+            ['[lang|="En-us"]', ['second-li']],
             // Attribute values are case sensitive
-            array('*[lang|="en"]', array()),
-            array('[lang|="en-US"]', array()),
-            array('*[lang|="e"]', array()),
+            ['*[lang|="en"]', []],
+            ['[lang|="en-US"]', []],
+            ['*[lang|="e"]', []],
             // ... :lang() is not.
-            array(':lang("EN")', array('second-li', 'li-div')),
-            array('*:lang(en-US)', array('second-li', 'li-div')),
-            array(':lang("e")', array()),
-            array('li:nth-child(3)', array('third-li')),
-            array('li:nth-child(10)', array()),
-            array('li:nth-child(2n)', array('second-li', 'fourth-li', 'sixth-li')),
-            array('li:nth-child(even)', array('second-li', 'fourth-li', 'sixth-li')),
-            array('li:nth-child(2n+0)', array('second-li', 'fourth-li', 'sixth-li')),
-            array('li:nth-child(+2n+1)', array('first-li', 'third-li', 'fifth-li', 'seventh-li')),
-            array('li:nth-child(odd)', array('first-li', 'third-li', 'fifth-li', 'seventh-li')),
-            array('li:nth-child(2n+4)', array('fourth-li', 'sixth-li')),
-            array('li:nth-child(3n+1)', array('first-li', 'fourth-li', 'seventh-li')),
-            array('li:nth-child(n)', array('first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li')),
-            array('li:nth-child(n-1)', array('first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li')),
-            array('li:nth-child(n+1)', array('first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li')),
-            array('li:nth-child(n+3)', array('third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li')),
-            array('li:nth-child(-n)', array()),
-            array('li:nth-child(-n-1)', array()),
-            array('li:nth-child(-n+1)', array('first-li')),
-            array('li:nth-child(-n+3)', array('first-li', 'second-li', 'third-li')),
-            array('li:nth-last-child(0)', array()),
-            array('li:nth-last-child(2n)', array('second-li', 'fourth-li', 'sixth-li')),
-            array('li:nth-last-child(even)', array('second-li', 'fourth-li', 'sixth-li')),
-            array('li:nth-last-child(2n+2)', array('second-li', 'fourth-li', 'sixth-li')),
-            array('li:nth-last-child(n)', array('first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li')),
-            array('li:nth-last-child(n-1)', array('first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li')),
-            array('li:nth-last-child(n-3)', array('first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li')),
-            array('li:nth-last-child(n+1)', array('first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li')),
-            array('li:nth-last-child(n+3)', array('first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li')),
-            array('li:nth-last-child(-n)', array()),
-            array('li:nth-last-child(-n-1)', array()),
-            array('li:nth-last-child(-n+1)', array('seventh-li')),
-            array('li:nth-last-child(-n+3)', array('fifth-li', 'sixth-li', 'seventh-li')),
-            array('ol:first-of-type', array('first-ol')),
-            array('ol:nth-child(1)', array('first-ol')),
-            array('ol:nth-of-type(2)', array('second-ol')),
-            array('ol:nth-last-of-type(1)', array('second-ol')),
-            array('span:only-child', array('foobar-span')),
-            array('li div:only-child', array('li-div')),
-            array('div *:only-child', array('li-div', 'foobar-span')),
-            array('p:only-of-type', array('paragraph')),
-            array('a:empty', array('name-anchor')),
-            array('a:EMpty', array('name-anchor')),
-            array('li:empty', array('third-li', 'fourth-li', 'fifth-li', 'sixth-li')),
-            array(':root', array('html')),
-            array('html:root', array('html')),
-            array('li:root', array()),
-            array('* :root', array()),
-            array('*:contains("link")', array('html', 'outer-div', 'tag-anchor', 'nofollow-anchor')),
-            array(':CONtains("link")', array('html', 'outer-div', 'tag-anchor', 'nofollow-anchor')),
-            array('*:contains("LInk")', array()),  // case sensitive
-            array('*:contains("e")', array('html', 'nil', 'outer-div', 'first-ol', 'first-li', 'paragraph', 'p-em')),
-            array('*:contains("E")', array()),  // case-sensitive
-            array('.a', array('first-ol')),
-            array('.b', array('first-ol')),
-            array('*.a', array('first-ol')),
-            array('ol.a', array('first-ol')),
-            array('.c', array('first-ol', 'third-li', 'fourth-li')),
-            array('*.c', array('first-ol', 'third-li', 'fourth-li')),
-            array('ol *.c', array('third-li', 'fourth-li')),
-            array('ol li.c', array('third-li', 'fourth-li')),
-            array('li ~ li.c', array('third-li', 'fourth-li')),
-            array('ol > li.c', array('third-li', 'fourth-li')),
-            array('#first-li', array('first-li')),
-            array('li#first-li', array('first-li')),
-            array('*#first-li', array('first-li')),
-            array('li div', array('li-div')),
-            array('li > div', array('li-div')),
-            array('div div', array('li-div')),
-            array('div > div', array()),
-            array('div>.c', array('first-ol')),
-            array('div > .c', array('first-ol')),
-            array('div + div', array('foobar-div')),
-            array('a ~ a', array('tag-anchor', 'nofollow-anchor')),
-            array('a[rel="tag"] ~ a', array('nofollow-anchor')),
-            array('ol#first-ol li:last-child', array('seventh-li')),
-            array('ol#first-ol *:last-child', array('li-div', 'seventh-li')),
-            array('#outer-div:first-child', array('outer-div')),
-            array('#outer-div :first-child', array('name-anchor', 'first-li', 'li-div', 'p-b', 'checkbox-fieldset-disabled', 'area-href')),
-            array('a[href]', array('tag-anchor', 'nofollow-anchor')),
-            array(':not(*)', array()),
-            array('a:not([href])', array('name-anchor')),
-            array('ol :Not(li[class])', array('first-li', 'second-li', 'li-div', 'fifth-li', 'sixth-li', 'seventh-li')),
+            [':lang("EN")', ['second-li', 'li-div']],
+            ['*:lang(en-US)', ['second-li', 'li-div']],
+            [':lang("e")', []],
+            ['li:nth-child(3)', ['third-li']],
+            ['li:nth-child(10)', []],
+            ['li:nth-child(2n)', ['second-li', 'fourth-li', 'sixth-li']],
+            ['li:nth-child(even)', ['second-li', 'fourth-li', 'sixth-li']],
+            ['li:nth-child(2n+0)', ['second-li', 'fourth-li', 'sixth-li']],
+            ['li:nth-child(+2n+1)', ['first-li', 'third-li', 'fifth-li', 'seventh-li']],
+            ['li:nth-child(odd)', ['first-li', 'third-li', 'fifth-li', 'seventh-li']],
+            ['li:nth-child(2n+4)', ['fourth-li', 'sixth-li']],
+            ['li:nth-child(3n+1)', ['first-li', 'fourth-li', 'seventh-li']],
+            ['li:nth-child(n)', ['first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li']],
+            ['li:nth-child(n-1)', ['first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li']],
+            ['li:nth-child(n+1)', ['first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li']],
+            ['li:nth-child(n+3)', ['third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li']],
+            ['li:nth-child(-n)', []],
+            ['li:nth-child(-n-1)', []],
+            ['li:nth-child(-n+1)', ['first-li']],
+            ['li:nth-child(-n+3)', ['first-li', 'second-li', 'third-li']],
+            ['li:nth-last-child(0)', []],
+            ['li:nth-last-child(2n)', ['second-li', 'fourth-li', 'sixth-li']],
+            ['li:nth-last-child(even)', ['second-li', 'fourth-li', 'sixth-li']],
+            ['li:nth-last-child(2n+2)', ['second-li', 'fourth-li', 'sixth-li']],
+            ['li:nth-last-child(n)', ['first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li']],
+            ['li:nth-last-child(n-1)', ['first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li']],
+            ['li:nth-last-child(n-3)', ['first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li']],
+            ['li:nth-last-child(n+1)', ['first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li']],
+            ['li:nth-last-child(n+3)', ['first-li', 'second-li', 'third-li', 'fourth-li', 'fifth-li']],
+            ['li:nth-last-child(-n)', []],
+            ['li:nth-last-child(-n-1)', []],
+            ['li:nth-last-child(-n+1)', ['seventh-li']],
+            ['li:nth-last-child(-n+3)', ['fifth-li', 'sixth-li', 'seventh-li']],
+            ['ol:first-of-type', ['first-ol']],
+            ['ol:nth-child(1)', ['first-ol']],
+            ['ol:nth-of-type(2)', ['second-ol']],
+            ['ol:nth-last-of-type(1)', ['second-ol']],
+            ['span:only-child', ['foobar-span']],
+            ['li div:only-child', ['li-div']],
+            ['div *:only-child', ['li-div', 'foobar-span']],
+            ['p:only-of-type', ['paragraph']],
+            ['a:empty', ['name-anchor']],
+            ['a:EMpty', ['name-anchor']],
+            ['li:empty', ['third-li', 'fourth-li', 'fifth-li', 'sixth-li']],
+            [':root', ['html']],
+            ['html:root', ['html']],
+            ['li:root', []],
+            ['* :root', []],
+            ['*:contains("link")', ['html', 'outer-div', 'tag-anchor', 'nofollow-anchor']],
+            [':CONtains("link")', ['html', 'outer-div', 'tag-anchor', 'nofollow-anchor']],
+            ['*:contains("LInk")', []],  // case sensitive
+            ['*:contains("e")', ['html', 'nil', 'outer-div', 'first-ol', 'first-li', 'paragraph', 'p-em']],
+            ['*:contains("E")', []],  // case-sensitive
+            ['.a', ['first-ol']],
+            ['.b', ['first-ol']],
+            ['*.a', ['first-ol']],
+            ['ol.a', ['first-ol']],
+            ['.c', ['first-ol', 'third-li', 'fourth-li']],
+            ['*.c', ['first-ol', 'third-li', 'fourth-li']],
+            ['ol *.c', ['third-li', 'fourth-li']],
+            ['ol li.c', ['third-li', 'fourth-li']],
+            ['li ~ li.c', ['third-li', 'fourth-li']],
+            ['ol > li.c', ['third-li', 'fourth-li']],
+            ['#first-li', ['first-li']],
+            ['li#first-li', ['first-li']],
+            ['*#first-li', ['first-li']],
+            ['li div', ['li-div']],
+            ['li > div', ['li-div']],
+            ['div div', ['li-div']],
+            ['div > div', []],
+            ['div>.c', ['first-ol']],
+            ['div > .c', ['first-ol']],
+            ['div + div', ['foobar-div']],
+            ['a ~ a', ['tag-anchor', 'nofollow-anchor']],
+            ['a[rel="tag"] ~ a', ['nofollow-anchor']],
+            ['ol#first-ol li:last-child', ['seventh-li']],
+            ['ol#first-ol *:last-child', ['li-div', 'seventh-li']],
+            ['#outer-div:first-child', ['outer-div']],
+            ['#outer-div :first-child', ['name-anchor', 'first-li', 'li-div', 'p-b', 'checkbox-fieldset-disabled', 'area-href']],
+            ['a[href]', ['tag-anchor', 'nofollow-anchor']],
+            [':not(*)', []],
+            ['a:not([href])', ['name-anchor']],
+            ['ol :Not(li[class])', ['first-li', 'second-li', 'li-div', 'fifth-li', 'sixth-li', 'seventh-li']],
             // HTML-specific
-            array(':link', array('link-href', 'tag-anchor', 'nofollow-anchor', 'area-href')),
-            array(':visited', array()),
-            array(':enabled', array('link-href', 'tag-anchor', 'nofollow-anchor', 'checkbox-unchecked', 'text-checked', 'checkbox-checked', 'area-href')),
-            array(':disabled', array('checkbox-disabled', 'checkbox-disabled-checked', 'fieldset', 'checkbox-fieldset-disabled')),
-            array(':checked', array('checkbox-checked', 'checkbox-disabled-checked')),
-        );
+            [':link', ['link-href', 'tag-anchor', 'nofollow-anchor', 'area-href']],
+            [':visited', []],
+            [':enabled', ['link-href', 'tag-anchor', 'nofollow-anchor', 'checkbox-unchecked', 'text-checked', 'checkbox-checked', 'area-href']],
+            [':disabled', ['checkbox-disabled', 'checkbox-disabled-checked', 'fieldset', 'checkbox-fieldset-disabled']],
+            [':checked', ['checkbox-checked', 'checkbox-disabled-checked']],
+        ];
     }
 
     public function getHtmlShakespearTestData()
     {
-        return array(
-            array('*', 246),
-            array('div:contains(CELIA)', 26),
-            array('div:only-child', 22), // ?
-            array('div:nth-child(even)', 106),
-            array('div:nth-child(2n)', 106),
-            array('div:nth-child(odd)', 137),
-            array('div:nth-child(2n+1)', 137),
-            array('div:nth-child(n)', 243),
-            array('div:last-child', 53),
-            array('div:first-child', 51),
-            array('div > div', 242),
-            array('div + div', 190),
-            array('div ~ div', 190),
-            array('body', 1),
-            array('body div', 243),
-            array('div', 243),
-            array('div div', 242),
-            array('div div div', 241),
-            array('div, div, div', 243),
-            array('div, a, span', 243),
-            array('.dialog', 51),
-            array('div.dialog', 51),
-            array('div .dialog', 51),
-            array('div.character, div.dialog', 99),
-            array('div.direction.dialog', 0),
-            array('div.dialog.direction', 0),
-            array('div.dialog.scene', 1),
-            array('div.scene.scene', 1),
-            array('div.scene .scene', 0),
-            array('div.direction .dialog ', 0),
-            array('div .dialog .direction', 4),
-            array('div.dialog .dialog .direction', 4),
-            array('#speech5', 1),
-            array('div#speech5', 1),
-            array('div #speech5', 1),
-            array('div.scene div.dialog', 49),
-            array('div#scene1 div.dialog div', 142),
-            array('#scene1 #speech1', 1),
-            array('div[class]', 103),
-            array('div[class=dialog]', 50),
-            array('div[class^=dia]', 51),
-            array('div[class$=log]', 50),
-            array('div[class*=sce]', 1),
-            array('div[class|=dialog]', 50), // ? Seems right
-            array('div[class!=madeup]', 243), // ? Seems right
-            array('div[class~=dialog]', 51), // ? Seems right
-        );
+        return [
+            ['*', 246],
+            ['div:contains(CELIA)', 26],
+            ['div:only-child', 22], // ?
+            ['div:nth-child(even)', 106],
+            ['div:nth-child(2n)', 106],
+            ['div:nth-child(odd)', 137],
+            ['div:nth-child(2n+1)', 137],
+            ['div:nth-child(n)', 243],
+            ['div:last-child', 53],
+            ['div:first-child', 51],
+            ['div > div', 242],
+            ['div + div', 190],
+            ['div ~ div', 190],
+            ['body', 1],
+            ['body div', 243],
+            ['div', 243],
+            ['div div', 242],
+            ['div div div', 241],
+            ['div, div, div', 243],
+            ['div, a, span', 243],
+            ['.dialog', 51],
+            ['div.dialog', 51],
+            ['div .dialog', 51],
+            ['div.character, div.dialog', 99],
+            ['div.direction.dialog', 0],
+            ['div.dialog.direction', 0],
+            ['div.dialog.scene', 1],
+            ['div.scene.scene', 1],
+            ['div.scene .scene', 0],
+            ['div.direction .dialog ', 0],
+            ['div .dialog .direction', 4],
+            ['div.dialog .dialog .direction', 4],
+            ['#speech5', 1],
+            ['div#speech5', 1],
+            ['div #speech5', 1],
+            ['div.scene div.dialog', 49],
+            ['div#scene1 div.dialog div', 142],
+            ['#scene1 #speech1', 1],
+            ['div[class]', 103],
+            ['div[class=dialog]', 50],
+            ['div[class^=dia]', 51],
+            ['div[class$=log]', 50],
+            ['div[class*=sce]', 1],
+            ['div[class|=dialog]', 50], // ? Seems right
+            ['div[class!=madeup]', 243], // ? Seems right
+            ['div[class~=dialog]', 51], // ? Seems right
+        ];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/AbstractExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/AbstractExtension.php
index 026ac06c79f21..1dce1eddff2c9 100644
--- a/src/Symfony/Component/CssSelector/XPath/Extension/AbstractExtension.php
+++ b/src/Symfony/Component/CssSelector/XPath/Extension/AbstractExtension.php
@@ -28,7 +28,7 @@ abstract class AbstractExtension implements ExtensionInterface
      */
     public function getNodeTranslators()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -36,7 +36,7 @@ public function getNodeTranslators()
      */
     public function getCombinationTranslators()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -44,7 +44,7 @@ public function getCombinationTranslators()
      */
     public function getFunctionTranslators()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -52,7 +52,7 @@ public function getFunctionTranslators()
      */
     public function getPseudoClassTranslators()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -60,6 +60,6 @@ public function getPseudoClassTranslators()
      */
     public function getAttributeMatchingTranslators()
     {
-        return array();
+        return [];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php
index 2078dca61da10..0571b3b7651ed 100644
--- a/src/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php
+++ b/src/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php
@@ -31,16 +31,16 @@ class AttributeMatchingExtension extends AbstractExtension
      */
     public function getAttributeMatchingTranslators()
     {
-        return array(
-            'exists' => array($this, 'translateExists'),
-            '=' => array($this, 'translateEquals'),
-            '~=' => array($this, 'translateIncludes'),
-            '|=' => array($this, 'translateDashMatch'),
-            '^=' => array($this, 'translatePrefixMatch'),
-            '$=' => array($this, 'translateSuffixMatch'),
-            '*=' => array($this, 'translateSubstringMatch'),
-            '!=' => array($this, 'translateDifferent'),
-        );
+        return [
+            'exists' => [$this, 'translateExists'],
+            '=' => [$this, 'translateEquals'],
+            '~=' => [$this, 'translateIncludes'],
+            '|=' => [$this, 'translateDashMatch'],
+            '^=' => [$this, 'translatePrefixMatch'],
+            '$=' => [$this, 'translateSuffixMatch'],
+            '*=' => [$this, 'translateSubstringMatch'],
+            '!=' => [$this, 'translateDifferent'],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/CombinationExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/CombinationExtension.php
index 0c9cc0320c3c2..d962dc5ab2743 100644
--- a/src/Symfony/Component/CssSelector/XPath/Extension/CombinationExtension.php
+++ b/src/Symfony/Component/CssSelector/XPath/Extension/CombinationExtension.php
@@ -30,12 +30,12 @@ class CombinationExtension extends AbstractExtension
      */
     public function getCombinationTranslators()
     {
-        return array(
-            ' ' => array($this, 'translateDescendant'),
-            '>' => array($this, 'translateChild'),
-            '+' => array($this, 'translateDirectAdjacent'),
-            '~' => array($this, 'translateIndirectAdjacent'),
-        );
+        return [
+            ' ' => [$this, 'translateDescendant'],
+            '>' => [$this, 'translateChild'],
+            '+' => [$this, 'translateDirectAdjacent'],
+            '~' => [$this, 'translateIndirectAdjacent'],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php
index 4d34d0ef2401b..a8e0b69f12766 100644
--- a/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php
+++ b/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php
@@ -35,14 +35,14 @@ class FunctionExtension extends AbstractExtension
      */
     public function getFunctionTranslators()
     {
-        return array(
-            'nth-child' => array($this, 'translateNthChild'),
-            'nth-last-child' => array($this, 'translateNthLastChild'),
-            'nth-of-type' => array($this, 'translateNthOfType'),
-            'nth-last-of-type' => array($this, 'translateNthLastOfType'),
-            'contains' => array($this, 'translateContains'),
-            'lang' => array($this, 'translateLang'),
-        );
+        return [
+            'nth-child' => [$this, 'translateNthChild'],
+            'nth-last-child' => [$this, 'translateNthLastChild'],
+            'nth-of-type' => [$this, 'translateNthOfType'],
+            'nth-last-of-type' => [$this, 'translateNthLastOfType'],
+            'contains' => [$this, 'translateContains'],
+            'lang' => [$this, 'translateLang'],
+        ];
     }
 
     /**
@@ -93,7 +93,7 @@ public function translateNthChild(XPathExpr $xpath, FunctionNode $function, $las
             $expr .= ' - '.$b;
         }
 
-        $conditions = array(sprintf('%s %s 0', $expr, $sign));
+        $conditions = [sprintf('%s %s 0', $expr, $sign)];
 
         if (1 !== $a && -1 !== $a) {
             $conditions[] = sprintf('(%s) mod %d = 0', $expr, $a);
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php
index cd8e0d5fd8677..99c1166c0172c 100644
--- a/src/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php
+++ b/src/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php
@@ -41,16 +41,16 @@ public function __construct(Translator $translator)
      */
     public function getPseudoClassTranslators()
     {
-        return array(
-            'checked' => array($this, 'translateChecked'),
-            'link' => array($this, 'translateLink'),
-            'disabled' => array($this, 'translateDisabled'),
-            'enabled' => array($this, 'translateEnabled'),
-            'selected' => array($this, 'translateSelected'),
-            'invalid' => array($this, 'translateInvalid'),
-            'hover' => array($this, 'translateHover'),
-            'visited' => array($this, 'translateVisited'),
-        );
+        return [
+            'checked' => [$this, 'translateChecked'],
+            'link' => [$this, 'translateLink'],
+            'disabled' => [$this, 'translateDisabled'],
+            'enabled' => [$this, 'translateEnabled'],
+            'selected' => [$this, 'translateSelected'],
+            'invalid' => [$this, 'translateInvalid'],
+            'hover' => [$this, 'translateHover'],
+            'visited' => [$this, 'translateVisited'],
+        ];
     }
 
     /**
@@ -58,9 +58,9 @@ public function getPseudoClassTranslators()
      */
     public function getFunctionTranslators()
     {
-        return array(
-            'lang' => array($this, 'translateLang'),
-        );
+        return [
+            'lang' => [$this, 'translateLang'],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
index 715d9611a8267..de222af349af2 100644
--- a/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
+++ b/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
@@ -75,17 +75,17 @@ public function hasFlag($flag)
      */
     public function getNodeTranslators()
     {
-        return array(
-            'Selector' => array($this, 'translateSelector'),
-            'CombinedSelector' => array($this, 'translateCombinedSelector'),
-            'Negation' => array($this, 'translateNegation'),
-            'Function' => array($this, 'translateFunction'),
-            'Pseudo' => array($this, 'translatePseudo'),
-            'Attribute' => array($this, 'translateAttribute'),
-            'Class' => array($this, 'translateClass'),
-            'Hash' => array($this, 'translateHash'),
-            'Element' => array($this, 'translateElement'),
-        );
+        return [
+            'Selector' => [$this, 'translateSelector'],
+            'CombinedSelector' => [$this, 'translateCombinedSelector'],
+            'Negation' => [$this, 'translateNegation'],
+            'Function' => [$this, 'translateFunction'],
+            'Pseudo' => [$this, 'translatePseudo'],
+            'Attribute' => [$this, 'translateAttribute'],
+            'Class' => [$this, 'translateClass'],
+            'Hash' => [$this, 'translateHash'],
+            'Element' => [$this, 'translateElement'],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php
index 378dfb7de1773..27fe47f9a56fb 100644
--- a/src/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php
+++ b/src/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php
@@ -31,16 +31,16 @@ class PseudoClassExtension extends AbstractExtension
      */
     public function getPseudoClassTranslators()
     {
-        return array(
-            'root' => array($this, 'translateRoot'),
-            'first-child' => array($this, 'translateFirstChild'),
-            'last-child' => array($this, 'translateLastChild'),
-            'first-of-type' => array($this, 'translateFirstOfType'),
-            'last-of-type' => array($this, 'translateLastOfType'),
-            'only-child' => array($this, 'translateOnlyChild'),
-            'only-of-type' => array($this, 'translateOnlyOfType'),
-            'empty' => array($this, 'translateEmpty'),
-        );
+        return [
+            'root' => [$this, 'translateRoot'],
+            'first-child' => [$this, 'translateFirstChild'],
+            'last-child' => [$this, 'translateLastChild'],
+            'first-of-type' => [$this, 'translateFirstOfType'],
+            'last-of-type' => [$this, 'translateLastOfType'],
+            'only-child' => [$this, 'translateOnlyChild'],
+            'only-of-type' => [$this, 'translateOnlyOfType'],
+            'empty' => [$this, 'translateEmpty'],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/CssSelector/XPath/Translator.php b/src/Symfony/Component/CssSelector/XPath/Translator.php
index f8585a057daba..d078126772e92 100644
--- a/src/Symfony/Component/CssSelector/XPath/Translator.php
+++ b/src/Symfony/Component/CssSelector/XPath/Translator.php
@@ -35,18 +35,18 @@ class Translator implements TranslatorInterface
     /**
      * @var ParserInterface[]
      */
-    private $shortcutParsers = array();
+    private $shortcutParsers = [];
 
     /**
      * @var Extension\ExtensionInterface[]
      */
-    private $extensions = array();
+    private $extensions = [];
 
-    private $nodeTranslators = array();
-    private $combinationTranslators = array();
-    private $functionTranslators = array();
-    private $pseudoClassTranslators = array();
-    private $attributeMatchingTranslators = array();
+    private $nodeTranslators = [];
+    private $combinationTranslators = [];
+    private $functionTranslators = [];
+    private $pseudoClassTranslators = [];
+    private $attributeMatchingTranslators = [];
 
     public function __construct(ParserInterface $parser = null)
     {
@@ -77,7 +77,7 @@ public static function getXpathLiteral($element)
         }
 
         $string = $element;
-        $parts = array();
+        $parts = [];
         while (true) {
             if (false !== $pos = strpos($string, "'")) {
                 $parts[] = sprintf("'%s'", substr($string, 0, $pos));
diff --git a/src/Symfony/Component/Debug/BufferingLogger.php b/src/Symfony/Component/Debug/BufferingLogger.php
index a2ed75b9dc9f1..e7db3a4ce4c6a 100644
--- a/src/Symfony/Component/Debug/BufferingLogger.php
+++ b/src/Symfony/Component/Debug/BufferingLogger.php
@@ -20,17 +20,17 @@
  */
 class BufferingLogger extends AbstractLogger
 {
-    private $logs = array();
+    private $logs = [];
 
-    public function log($level, $message, array $context = array())
+    public function log($level, $message, array $context = [])
     {
-        $this->logs[] = array($level, $message, $context);
+        $this->logs[] = [$level, $message, $context];
     }
 
     public function cleanLogs()
     {
         $logs = $this->logs;
-        $this->logs = array();
+        $this->logs = [];
 
         return $logs;
     }
diff --git a/src/Symfony/Component/Debug/Debug.php b/src/Symfony/Component/Debug/Debug.php
index 2a3d7f31593b2..498d30935c971 100644
--- a/src/Symfony/Component/Debug/Debug.php
+++ b/src/Symfony/Component/Debug/Debug.php
@@ -42,7 +42,7 @@ public static function enable($errorReportingLevel = E_ALL, $displayErrors = tru
             error_reporting(E_ALL);
         }
 
-        if (!\in_array(\PHP_SAPI, array('cli', 'phpdbg'), true)) {
+        if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
             ini_set('display_errors', 0);
             ExceptionHandler::register();
         } elseif ($displayErrors && (!filter_var(ini_get('log_errors'), FILTER_VALIDATE_BOOLEAN) || ini_get('error_log'))) {
diff --git a/src/Symfony/Component/Debug/DebugClassLoader.php b/src/Symfony/Component/Debug/DebugClassLoader.php
index dd2f169ce4f9c..15696c2875381 100644
--- a/src/Symfony/Component/Debug/DebugClassLoader.php
+++ b/src/Symfony/Component/Debug/DebugClassLoader.php
@@ -95,7 +95,7 @@ class_exists('Psr\Log\LogLevel');
 
         foreach ($functions as $function) {
             if (!\is_array($function) || !$function[0] instanceof self) {
-                $function = array(new static($function), 'loadClass');
+                $function = [new static($function), 'loadClass'];
             }
 
             spl_autoload_register($function);
@@ -212,7 +212,7 @@ private function checkClass($class, $file = null)
 
     public function checkAnnotations(\ReflectionClass $refl, $class)
     {
-        $deprecations = array();
+        $deprecations = [];
 
         // Don't trigger deprecations for classes in the same vendor
         if (2 > $len = 1 + (\strpos($class, '\\') ?: \strpos($class, '_'))) {
@@ -224,7 +224,7 @@ public function checkAnnotations(\ReflectionClass $refl, $class)
 
         // Detect annotations on the class
         if (false !== $doc = $refl->getDocComment()) {
-            foreach (array('final', 'deprecated', 'internal') as $annotation) {
+            foreach (['final', 'deprecated', 'internal'] as $annotation) {
                 if (false !== \strpos($doc, $annotation) && preg_match('#\n \* @'.$annotation.'(?:( .+?)\.?)?\r?\n \*(?: @|/$)#s', $doc, $notice)) {
                     self::${$annotation}[$class] = isset($notice[1]) ? preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]) : '';
                 }
@@ -339,7 +339,7 @@ public function checkCase(\ReflectionClass $refl, $file, $class)
         if (0 === substr_compare($real, $tail, -$tailLen, $tailLen, true)
             && 0 !== substr_compare($real, $tail, -$tailLen, $tailLen, false)
         ) {
-            return array(substr($tail, -$tailLen + 1), substr($real, -$tailLen + 1), substr($real, 0, -$tailLen + 1));
+            return [substr($tail, -$tailLen + 1), substr($real, -$tailLen + 1), substr($real, 0, -$tailLen + 1)];
         }
     }
 
@@ -369,7 +369,7 @@ private function darwinRealpath($real)
                 $k = $kDir;
                 $i = \strlen($dir) - 1;
                 while (!isset(self::$darwinCache[$k])) {
-                    self::$darwinCache[$k] = array($dir, array());
+                    self::$darwinCache[$k] = [$dir, []];
                     self::$darwinCache[$dir] = &self::$darwinCache[$k];
 
                     while ('/' !== $dir[--$i]) {
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
index 69a7280417792..924cd03bb989a 100644
--- a/src/Symfony/Component/Debug/ErrorHandler.php
+++ b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -48,7 +48,7 @@
  */
 class ErrorHandler
 {
-    private $levels = array(
+    private $levels = [
         E_DEPRECATED => 'Deprecated',
         E_USER_DEPRECATED => 'User Deprecated',
         E_NOTICE => 'Notice',
@@ -64,25 +64,25 @@ class ErrorHandler
         E_PARSE => 'Parse Error',
         E_ERROR => 'Error',
         E_CORE_ERROR => 'Core Error',
-    );
-
-    private $loggers = array(
-        E_DEPRECATED => array(null, LogLevel::INFO),
-        E_USER_DEPRECATED => array(null, LogLevel::INFO),
-        E_NOTICE => array(null, LogLevel::WARNING),
-        E_USER_NOTICE => array(null, LogLevel::WARNING),
-        E_STRICT => array(null, LogLevel::WARNING),
-        E_WARNING => array(null, LogLevel::WARNING),
-        E_USER_WARNING => array(null, LogLevel::WARNING),
-        E_COMPILE_WARNING => array(null, LogLevel::WARNING),
-        E_CORE_WARNING => array(null, LogLevel::WARNING),
-        E_USER_ERROR => array(null, LogLevel::CRITICAL),
-        E_RECOVERABLE_ERROR => array(null, LogLevel::CRITICAL),
-        E_COMPILE_ERROR => array(null, LogLevel::CRITICAL),
-        E_PARSE => array(null, LogLevel::CRITICAL),
-        E_ERROR => array(null, LogLevel::CRITICAL),
-        E_CORE_ERROR => array(null, LogLevel::CRITICAL),
-    );
+    ];
+
+    private $loggers = [
+        E_DEPRECATED => [null, LogLevel::INFO],
+        E_USER_DEPRECATED => [null, LogLevel::INFO],
+        E_NOTICE => [null, LogLevel::WARNING],
+        E_USER_NOTICE => [null, LogLevel::WARNING],
+        E_STRICT => [null, LogLevel::WARNING],
+        E_WARNING => [null, LogLevel::WARNING],
+        E_USER_WARNING => [null, LogLevel::WARNING],
+        E_COMPILE_WARNING => [null, LogLevel::WARNING],
+        E_CORE_WARNING => [null, LogLevel::WARNING],
+        E_USER_ERROR => [null, LogLevel::CRITICAL],
+        E_RECOVERABLE_ERROR => [null, LogLevel::CRITICAL],
+        E_COMPILE_ERROR => [null, LogLevel::CRITICAL],
+        E_PARSE => [null, LogLevel::CRITICAL],
+        E_ERROR => [null, LogLevel::CRITICAL],
+        E_CORE_ERROR => [null, LogLevel::CRITICAL],
+    ];
 
     private $thrownErrors = 0x1FFF; // E_ALL - E_DEPRECATED - E_USER_DEPRECATED
     private $scopedErrors = 0x1FFF; // E_ALL - E_DEPRECATED - E_USER_DEPRECATED
@@ -123,10 +123,10 @@ public static function register(self $handler = null, $replace = true)
             $handler = new static();
         }
 
-        if (null === $prev = set_error_handler(array($handler, 'handleError'))) {
+        if (null === $prev = set_error_handler([$handler, 'handleError'])) {
             restore_error_handler();
             // Specifying the error types earlier would expose us to https://bugs.php.net/63206
-            set_error_handler(array($handler, 'handleError'), $handler->thrownErrors | $handler->loggedErrors);
+            set_error_handler([$handler, 'handleError'], $handler->thrownErrors | $handler->loggedErrors);
             $handler->isRoot = true;
         }
 
@@ -140,12 +140,12 @@ public static function register(self $handler = null, $replace = true)
         } else {
             $handlerIsRegistered = true;
         }
-        if (\is_array($prev = set_exception_handler(array($handler, 'handleException'))) && $prev[0] instanceof self) {
+        if (\is_array($prev = set_exception_handler([$handler, 'handleException'])) && $prev[0] instanceof self) {
             restore_exception_handler();
             if (!$handlerIsRegistered) {
                 $handler = $prev[0];
             } elseif ($handler !== $prev[0] && $replace) {
-                set_exception_handler(array($handler, 'handleException'));
+                set_exception_handler([$handler, 'handleException']);
                 $p = $prev[0]->setExceptionHandler(null);
                 $handler->setExceptionHandler($p);
                 $prev[0]->setExceptionHandler($p);
@@ -178,12 +178,12 @@ public function __construct(BufferingLogger $bootstrappingLogger = null)
      */
     public function setDefaultLogger(LoggerInterface $logger, $levels = E_ALL, $replace = false)
     {
-        $loggers = array();
+        $loggers = [];
 
         if (\is_array($levels)) {
             foreach ($levels as $type => $logLevel) {
                 if (empty($this->loggers[$type][0]) || $replace || $this->loggers[$type][0] === $this->bootstrappingLogger) {
-                    $loggers[$type] = array($logger, $logLevel);
+                    $loggers[$type] = [$logger, $logLevel];
                 }
             }
         } else {
@@ -214,14 +214,14 @@ public function setLoggers(array $loggers)
     {
         $prevLogged = $this->loggedErrors;
         $prev = $this->loggers;
-        $flush = array();
+        $flush = [];
 
         foreach ($loggers as $type => $log) {
             if (!isset($prev[$type])) {
                 throw new \InvalidArgumentException('Unknown error type: '.$type);
             }
             if (!\is_array($log)) {
-                $log = array($log);
+                $log = [$log];
             } elseif (!array_key_exists(0, $log)) {
                 throw new \InvalidArgumentException('No logger provided');
             }
@@ -358,9 +358,9 @@ private function reRegister($prev)
             if ($handler === $this) {
                 restore_error_handler();
                 if ($this->isRoot) {
-                    set_error_handler(array($this, 'handleError'), $this->thrownErrors | $this->loggedErrors);
+                    set_error_handler([$this, 'handleError'], $this->thrownErrors | $this->loggedErrors);
                 } else {
-                    set_error_handler(array($this, 'handleError'));
+                    set_error_handler([$this, 'handleError']);
                 }
             }
         }
@@ -612,7 +612,7 @@ public static function handleFatalError(array $error = null)
         }
 
         $handler = self::$reservedMemory = null;
-        $handlers = array();
+        $handlers = [];
         $previousHandler = null;
         $sameHandlerLimit = 10;
 
@@ -643,7 +643,7 @@ public static function handleFatalError(array $error = null)
             $handler[0]->setExceptionHandler($h);
         }
         $handler = $handler[0];
-        $handlers = array();
+        $handlers = [];
 
         if ($exit = null === $error) {
             $error = error_get_last();
diff --git a/src/Symfony/Component/Debug/Exception/FatalErrorException.php b/src/Symfony/Component/Debug/Exception/FatalErrorException.php
index 8d996a422b142..0f70ef929904a 100644
--- a/src/Symfony/Component/Debug/Exception/FatalErrorException.php
+++ b/src/Symfony/Component/Debug/Exception/FatalErrorException.php
@@ -66,7 +66,7 @@ public function __construct($message, $code, $severity, $filename, $lineno, $tra
                     array_splice($trace, 0, $traceOffset);
                 }
             } else {
-                $trace = array();
+                $trace = [];
             }
 
             $this->setTrace($trace);
diff --git a/src/Symfony/Component/Debug/Exception/FlattenException.php b/src/Symfony/Component/Debug/Exception/FlattenException.php
index f76cf23f33777..52f150073b187 100644
--- a/src/Symfony/Component/Debug/Exception/FlattenException.php
+++ b/src/Symfony/Component/Debug/Exception/FlattenException.php
@@ -33,7 +33,7 @@ class FlattenException
     private $file;
     private $line;
 
-    public static function create(\Exception $exception, $statusCode = null, array $headers = array())
+    public static function create(\Exception $exception, $statusCode = null, array $headers = [])
     {
         $e = new static();
         $e->setMessage($exception->getMessage());
@@ -70,13 +70,13 @@ public static function create(\Exception $exception, $statusCode = null, array $
 
     public function toArray()
     {
-        $exceptions = array();
-        foreach (array_merge(array($this), $this->getAllPrevious()) as $exception) {
-            $exceptions[] = array(
+        $exceptions = [];
+        foreach (array_merge([$this], $this->getAllPrevious()) as $exception) {
+            $exceptions[] = [
                 'message' => $exception->getMessage(),
                 'class' => $exception->getClass(),
                 'trace' => $exception->getTrace(),
-            );
+            ];
         }
 
         return $exceptions;
@@ -164,7 +164,7 @@ public function setPrevious(self $previous)
 
     public function getAllPrevious()
     {
-        $exceptions = array();
+        $exceptions = [];
         $e = $this;
         while ($e = $e->getPrevious()) {
             $exceptions[] = $e;
@@ -185,8 +185,8 @@ public function setTraceFromException(\Exception $exception)
 
     public function setTrace($trace, $file, $line)
     {
-        $this->trace = array();
-        $this->trace[] = array(
+        $this->trace = [];
+        $this->trace[] = [
             'namespace' => '',
             'short_class' => '',
             'class' => '',
@@ -194,8 +194,8 @@ public function setTrace($trace, $file, $line)
             'function' => '',
             'file' => $file,
             'line' => $line,
-            'args' => array(),
-        );
+            'args' => [],
+        ];
         foreach ($trace as $entry) {
             $class = '';
             $namespace = '';
diff --git a/src/Symfony/Component/Debug/Exception/SilencedErrorContext.php b/src/Symfony/Component/Debug/Exception/SilencedErrorContext.php
index 4be83491b9df7..6aa4252725cec 100644
--- a/src/Symfony/Component/Debug/Exception/SilencedErrorContext.php
+++ b/src/Symfony/Component/Debug/Exception/SilencedErrorContext.php
@@ -56,12 +56,12 @@ public function getTrace()
 
     public function JsonSerialize()
     {
-        return array(
+        return [
             'severity' => $this->severity,
             'file' => $this->file,
             'line' => $this->line,
             'trace' => $this->trace,
             'count' => $this->count,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php
index f18ee2a9f0923..2f3d56601271c 100644
--- a/src/Symfony/Component/Debug/ExceptionHandler.php
+++ b/src/Symfony/Component/Debug/ExceptionHandler.php
@@ -56,10 +56,10 @@ public static function register($debug = true, $charset = null, $fileLinkFormat
     {
         $handler = new static($debug, $charset, $fileLinkFormat);
 
-        $prev = set_exception_handler(array($handler, 'handle'));
+        $prev = set_exception_handler([$handler, 'handle']);
         if (\is_array($prev) && $prev[0] instanceof ErrorHandler) {
             restore_exception_handler();
-            $prev[0]->setExceptionHandler(array($handler, 'handle'));
+            $prev[0]->setExceptionHandler([$handler, 'handle']);
         }
 
         return $handler;
@@ -377,7 +377,7 @@ private function formatPath($path, $line)
 
         if (\is_string($fmt)) {
             $i = strpos($f = $fmt, '&', max(strrpos($f, '%f'), strrpos($f, '%l'))) ?: \strlen($f);
-            $fmt = array(substr($f, 0, $i)) + preg_split('/&([^>]++)>/', substr($f, $i), -1, PREG_SPLIT_DELIM_CAPTURE);
+            $fmt = [substr($f, 0, $i)] + preg_split('/&([^>]++)>/', substr($f, $i), -1, PREG_SPLIT_DELIM_CAPTURE);
 
             for ($i = 1; isset($fmt[$i]); ++$i) {
                 if (0 === strpos($path, $k = $fmt[$i++])) {
@@ -386,7 +386,7 @@ private function formatPath($path, $line)
                 }
             }
 
-            $link = strtr($fmt[0], array('%f' => $path, '%l' => $line));
+            $link = strtr($fmt[0], ['%f' => $path, '%l' => $line]);
         } else {
             $link = $fmt->format($path, $line);
         }
@@ -403,7 +403,7 @@ private function formatPath($path, $line)
      */
     private function formatArgs(array $args)
     {
-        $result = array();
+        $result = [];
         foreach ($args as $key => $item) {
             if ('object' === $item[0]) {
                 $formattedValue = sprintf('<em>object</em>(%s)', $this->formatClass($item[1]));
diff --git a/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php b/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
index 2b59c14692f43..1ac18ac8f5657 100644
--- a/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
+++ b/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
@@ -40,7 +40,7 @@ public function handleError(array $error, FatalErrorException $exception)
             return;
         }
 
-        foreach (array('class', 'interface', 'trait') as $typeName) {
+        foreach (['class', 'interface', 'trait'] as $typeName) {
             $prefix = ucfirst($typeName).' \'';
             $prefixLen = \strlen($prefix);
             if (0 !== strpos($error['message'], $prefix)) {
@@ -86,11 +86,11 @@ public function handleError(array $error, FatalErrorException $exception)
     private function getClassCandidates($class)
     {
         if (!\is_array($functions = spl_autoload_functions())) {
-            return array();
+            return [];
         }
 
         // find Symfony and Composer autoloaders
-        $classes = array();
+        $classes = [];
 
         foreach ($functions as $function) {
             if (!\is_array($function)) {
@@ -134,10 +134,10 @@ private function getClassCandidates($class)
     private function findClassInPath($path, $class, $prefix)
     {
         if (!$path = realpath($path.'/'.strtr($prefix, '\\_', '//')) ?: realpath($path.'/'.\dirname(strtr($prefix, '\\_', '//'))) ?: realpath($path)) {
-            return array();
+            return [];
         }
 
-        $classes = array();
+        $classes = [];
         $filename = $class.'.php';
         foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path, \RecursiveDirectoryIterator::SKIP_DOTS), \RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
             if ($filename == $file->getFileName() && $class = $this->convertFileToClass($path, $file->getPathName(), $prefix)) {
@@ -157,9 +157,9 @@ private function findClassInPath($path, $class, $prefix)
      */
     private function convertFileToClass($path, $file, $prefix)
     {
-        $candidates = array(
+        $candidates = [
             // namespaced class
-            $namespacedClass = str_replace(array($path.\DIRECTORY_SEPARATOR, '.php', '/'), array('', '', '\\'), $file),
+            $namespacedClass = str_replace([$path.\DIRECTORY_SEPARATOR, '.php', '/'], ['', '', '\\'], $file),
             // namespaced class (with target dir)
             $prefix.$namespacedClass,
             // namespaced class (with target dir and separator)
@@ -170,7 +170,7 @@ private function convertFileToClass($path, $file, $prefix)
             str_replace('\\', '_', $prefix.$namespacedClass),
             // PEAR class (with target dir and separator)
             str_replace('\\', '_', $prefix.'\\'.$namespacedClass),
-        );
+        ];
 
         if ($prefix) {
             $candidates = array_filter($candidates, function ($candidate) use ($prefix) { return 0 === strpos($candidate, $prefix); });
diff --git a/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php b/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
index db2418037748b..9eddeba5a64a3 100644
--- a/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
+++ b/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
@@ -53,7 +53,7 @@ public function handleError(array $error, FatalErrorException $exception)
             $message = sprintf('Attempted to call function "%s" from the global namespace.', $functionName);
         }
 
-        $candidates = array();
+        $candidates = [];
         foreach (get_defined_functions() as $type => $definedFunctionNames) {
             foreach ($definedFunctionNames as $definedFunctionName) {
                 if (false !== $namespaceSeparatorIndex = strrpos($definedFunctionName, '\\')) {
diff --git a/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php b/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
index e9ce535ee71f7..53087638727d5 100644
--- a/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
+++ b/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
@@ -28,14 +28,14 @@ protected function setUp()
     {
         $this->errorReporting = error_reporting(E_ALL);
         $this->loader = new ClassLoader();
-        spl_autoload_register(array($this->loader, 'loadClass'), true, true);
+        spl_autoload_register([$this->loader, 'loadClass'], true, true);
         DebugClassLoader::enable();
     }
 
     protected function tearDown()
     {
         DebugClassLoader::disable();
-        spl_autoload_unregister(array($this->loader, 'loadClass'));
+        spl_autoload_unregister([$this->loader, 'loadClass']);
         error_reporting($this->errorReporting);
     }
 
@@ -202,20 +202,20 @@ class_exists('Test\\'.__NAMESPACE__.'\\'.$class, true);
         $lastError = error_get_last();
         unset($lastError['file'], $lastError['line']);
 
-        $xError = array(
+        $xError = [
             'type' => E_USER_DEPRECATED,
             'message' => 'The "Test\Symfony\Component\Debug\Tests\\'.$class.'" class '.$type.' "Symfony\Component\Debug\Tests\Fixtures\\'.$super.'" that is deprecated but this is a test deprecation notice.',
-        );
+        ];
 
         $this->assertSame($xError, $lastError);
     }
 
     public function provideDeprecatedSuper()
     {
-        return array(
-            array('DeprecatedInterfaceClass', 'DeprecatedInterface', 'implements'),
-            array('DeprecatedParentClass', 'DeprecatedClass', 'extends'),
-        );
+        return [
+            ['DeprecatedInterfaceClass', 'DeprecatedInterface', 'implements'],
+            ['DeprecatedParentClass', 'DeprecatedClass', 'extends'],
+        ];
     }
 
     public function testInterfaceExtendsDeprecatedInterface()
@@ -232,10 +232,10 @@ class_exists('Test\\'.__NAMESPACE__.'\\NonDeprecatedInterfaceClass', true);
         $lastError = error_get_last();
         unset($lastError['file'], $lastError['line']);
 
-        $xError = array(
+        $xError = [
             'type' => E_USER_NOTICE,
             'message' => '',
-        );
+        ];
 
         $this->assertSame($xError, $lastError);
     }
@@ -254,10 +254,10 @@ class_exists('Symfony\Bridge\Debug\Tests\Fixtures\ExtendsDeprecatedParent', true
         $lastError = error_get_last();
         unset($lastError['file'], $lastError['line']);
 
-        $xError = array(
+        $xError = [
             'type' => E_USER_NOTICE,
             'message' => '',
-        );
+        ];
 
         $this->assertSame($xError, $lastError);
     }
@@ -343,12 +343,12 @@ class_exists('Test\\'.__NAMESPACE__.'\\ExtendsAnnotatedClass', true);
         $lastError = error_get_last();
         unset($lastError['file'], $lastError['line']);
 
-        $this->assertSame(array('type' => E_USER_NOTICE, 'message' => ''), $lastError);
+        $this->assertSame(['type' => E_USER_NOTICE, 'message' => ''], $lastError);
     }
 
     public function testInternalsUse()
     {
-        $deprecations = array();
+        $deprecations = [];
         set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
         $e = error_reporting(E_USER_DEPRECATED);
 
@@ -376,7 +376,7 @@ class_exists('Test\\'.__NAMESPACE__.'\\UseTraitWithInternalMethod', true);
         error_reporting($e);
         restore_error_handler();
 
-        $this->assertSame(array(), $deprecations);
+        $this->assertSame([], $deprecations);
     }
 }
 
@@ -388,7 +388,7 @@ public function loadClass($class)
 
     public function getClassMap()
     {
-        return array(__NAMESPACE__.'\Fixtures\NotPSR0bis' => __DIR__.'/Fixtures/notPsr0Bis.php');
+        return [__NAMESPACE__.'\Fixtures\NotPSR0bis' => __DIR__.'/Fixtures/notPsr0Bis.php'];
     }
 
     public function findFile($class)
diff --git a/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
index a8d40e849b6d9..b998a19435098 100644
--- a/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
+++ b/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
@@ -38,13 +38,13 @@ public function testRegister()
             $this->assertSame($handler, ErrorHandler::register($newHandler, false));
             $h = set_error_handler('var_dump');
             restore_error_handler();
-            $this->assertSame(array($handler, 'handleError'), $h);
+            $this->assertSame([$handler, 'handleError'], $h);
 
             try {
                 $this->assertSame($newHandler, ErrorHandler::register($newHandler, true));
                 $h = set_error_handler('var_dump');
                 restore_error_handler();
-                $this->assertSame(array($newHandler, 'handleError'), $h);
+                $this->assertSame([$newHandler, 'handleError'], $h);
             } catch (\Exception $e) {
             }
 
@@ -74,12 +74,12 @@ public function testErrorGetLast()
 
         try {
             @trigger_error('Hello', E_USER_WARNING);
-            $expected = array(
+            $expected = [
                 'type' => E_USER_WARNING,
                 'message' => 'Hello',
                 'file' => __FILE__,
                 'line' => __LINE__ - 5,
-            );
+            ];
             $this->assertSame($expected, error_get_last());
         } catch (\Exception $e) {
             restore_error_handler();
@@ -145,26 +145,26 @@ public function testDefaultLogger()
             $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
 
             $handler->setDefaultLogger($logger, E_NOTICE);
-            $handler->setDefaultLogger($logger, array(E_USER_NOTICE => LogLevel::CRITICAL));
-
-            $loggers = array(
-                E_DEPRECATED => array(null, LogLevel::INFO),
-                E_USER_DEPRECATED => array(null, LogLevel::INFO),
-                E_NOTICE => array($logger, LogLevel::WARNING),
-                E_USER_NOTICE => array($logger, LogLevel::CRITICAL),
-                E_STRICT => array(null, LogLevel::WARNING),
-                E_WARNING => array(null, LogLevel::WARNING),
-                E_USER_WARNING => array(null, LogLevel::WARNING),
-                E_COMPILE_WARNING => array(null, LogLevel::WARNING),
-                E_CORE_WARNING => array(null, LogLevel::WARNING),
-                E_USER_ERROR => array(null, LogLevel::CRITICAL),
-                E_RECOVERABLE_ERROR => array(null, LogLevel::CRITICAL),
-                E_COMPILE_ERROR => array(null, LogLevel::CRITICAL),
-                E_PARSE => array(null, LogLevel::CRITICAL),
-                E_ERROR => array(null, LogLevel::CRITICAL),
-                E_CORE_ERROR => array(null, LogLevel::CRITICAL),
-            );
-            $this->assertSame($loggers, $handler->setLoggers(array()));
+            $handler->setDefaultLogger($logger, [E_USER_NOTICE => LogLevel::CRITICAL]);
+
+            $loggers = [
+                E_DEPRECATED => [null, LogLevel::INFO],
+                E_USER_DEPRECATED => [null, LogLevel::INFO],
+                E_NOTICE => [$logger, LogLevel::WARNING],
+                E_USER_NOTICE => [$logger, LogLevel::CRITICAL],
+                E_STRICT => [null, LogLevel::WARNING],
+                E_WARNING => [null, LogLevel::WARNING],
+                E_USER_WARNING => [null, LogLevel::WARNING],
+                E_COMPILE_WARNING => [null, LogLevel::WARNING],
+                E_CORE_WARNING => [null, LogLevel::WARNING],
+                E_USER_ERROR => [null, LogLevel::CRITICAL],
+                E_RECOVERABLE_ERROR => [null, LogLevel::CRITICAL],
+                E_COMPILE_ERROR => [null, LogLevel::CRITICAL],
+                E_PARSE => [null, LogLevel::CRITICAL],
+                E_ERROR => [null, LogLevel::CRITICAL],
+                E_CORE_ERROR => [null, LogLevel::CRITICAL],
+            ];
+            $this->assertSame($loggers, $handler->setLoggers([]));
         } finally {
             restore_error_handler();
             restore_exception_handler();
@@ -176,14 +176,14 @@ public function testHandleError()
         try {
             $handler = ErrorHandler::register();
             $handler->throwAt(0, true);
-            $this->assertFalse($handler->handleError(0, 'foo', 'foo.php', 12, array()));
+            $this->assertFalse($handler->handleError(0, 'foo', 'foo.php', 12, []));
 
             restore_error_handler();
             restore_exception_handler();
 
             $handler = ErrorHandler::register();
             $handler->throwAt(3, true);
-            $this->assertFalse($handler->handleError(4, 'foo', 'foo.php', 12, array()));
+            $this->assertFalse($handler->handleError(4, 'foo', 'foo.php', 12, []));
 
             restore_error_handler();
             restore_exception_handler();
@@ -191,7 +191,7 @@ public function testHandleError()
             $handler = ErrorHandler::register();
             $handler->throwAt(3, true);
             try {
-                $handler->handleError(4, 'foo', 'foo.php', 12, array());
+                $handler->handleError(4, 'foo', 'foo.php', 12, []);
             } catch (\ErrorException $e) {
                 $this->assertSame('Parse Error: foo', $e->getMessage());
                 $this->assertSame(4, $e->getSeverity());
@@ -204,14 +204,14 @@ public function testHandleError()
 
             $handler = ErrorHandler::register();
             $handler->throwAt(E_USER_DEPRECATED, true);
-            $this->assertFalse($handler->handleError(E_USER_DEPRECATED, 'foo', 'foo.php', 12, array()));
+            $this->assertFalse($handler->handleError(E_USER_DEPRECATED, 'foo', 'foo.php', 12, []));
 
             restore_error_handler();
             restore_exception_handler();
 
             $handler = ErrorHandler::register();
             $handler->throwAt(E_DEPRECATED, true);
-            $this->assertFalse($handler->handleError(E_DEPRECATED, 'foo', 'foo.php', 12, array()));
+            $this->assertFalse($handler->handleError(E_DEPRECATED, 'foo', 'foo.php', 12, []));
 
             restore_error_handler();
             restore_exception_handler();
@@ -236,7 +236,7 @@ public function testHandleError()
 
             $handler = ErrorHandler::register();
             $handler->setDefaultLogger($logger, E_USER_DEPRECATED);
-            $this->assertTrue($handler->handleError(E_USER_DEPRECATED, 'foo', 'foo.php', 12, array()));
+            $this->assertTrue($handler->handleError(E_USER_DEPRECATED, 'foo', 'foo.php', 12, []));
 
             restore_error_handler();
             restore_exception_handler();
@@ -320,7 +320,7 @@ public function testHandleDeprecation()
 
         $handler = new ErrorHandler();
         $handler->setDefaultLogger($logger);
-        @$handler->handleError(E_USER_DEPRECATED, 'Foo deprecation', __FILE__, __LINE__, array());
+        @$handler->handleError(E_USER_DEPRECATED, 'Foo deprecation', __FILE__, __LINE__, []);
     }
 
     /**
@@ -404,27 +404,27 @@ public function testBootstrappingLogger()
         $bootLogger = new BufferingLogger();
         $handler = new ErrorHandler($bootLogger);
 
-        $loggers = array(
-            E_DEPRECATED => array($bootLogger, LogLevel::INFO),
-            E_USER_DEPRECATED => array($bootLogger, LogLevel::INFO),
-            E_NOTICE => array($bootLogger, LogLevel::WARNING),
-            E_USER_NOTICE => array($bootLogger, LogLevel::WARNING),
-            E_STRICT => array($bootLogger, LogLevel::WARNING),
-            E_WARNING => array($bootLogger, LogLevel::WARNING),
-            E_USER_WARNING => array($bootLogger, LogLevel::WARNING),
-            E_COMPILE_WARNING => array($bootLogger, LogLevel::WARNING),
-            E_CORE_WARNING => array($bootLogger, LogLevel::WARNING),
-            E_USER_ERROR => array($bootLogger, LogLevel::CRITICAL),
-            E_RECOVERABLE_ERROR => array($bootLogger, LogLevel::CRITICAL),
-            E_COMPILE_ERROR => array($bootLogger, LogLevel::CRITICAL),
-            E_PARSE => array($bootLogger, LogLevel::CRITICAL),
-            E_ERROR => array($bootLogger, LogLevel::CRITICAL),
-            E_CORE_ERROR => array($bootLogger, LogLevel::CRITICAL),
-        );
-
-        $this->assertSame($loggers, $handler->setLoggers(array()));
-
-        $handler->handleError(E_DEPRECATED, 'Foo message', __FILE__, 123, array());
+        $loggers = [
+            E_DEPRECATED => [$bootLogger, LogLevel::INFO],
+            E_USER_DEPRECATED => [$bootLogger, LogLevel::INFO],
+            E_NOTICE => [$bootLogger, LogLevel::WARNING],
+            E_USER_NOTICE => [$bootLogger, LogLevel::WARNING],
+            E_STRICT => [$bootLogger, LogLevel::WARNING],
+            E_WARNING => [$bootLogger, LogLevel::WARNING],
+            E_USER_WARNING => [$bootLogger, LogLevel::WARNING],
+            E_COMPILE_WARNING => [$bootLogger, LogLevel::WARNING],
+            E_CORE_WARNING => [$bootLogger, LogLevel::WARNING],
+            E_USER_ERROR => [$bootLogger, LogLevel::CRITICAL],
+            E_RECOVERABLE_ERROR => [$bootLogger, LogLevel::CRITICAL],
+            E_COMPILE_ERROR => [$bootLogger, LogLevel::CRITICAL],
+            E_PARSE => [$bootLogger, LogLevel::CRITICAL],
+            E_ERROR => [$bootLogger, LogLevel::CRITICAL],
+            E_CORE_ERROR => [$bootLogger, LogLevel::CRITICAL],
+        ];
+
+        $this->assertSame($loggers, $handler->setLoggers([]));
+
+        $handler->handleError(E_DEPRECATED, 'Foo message', __FILE__, 123, []);
 
         $logs = $bootLogger->cleanLogs();
 
@@ -440,14 +440,14 @@ public function testBootstrappingLogger()
         $this->assertSame(123, $exception->getLine());
         $this->assertSame(E_DEPRECATED, $exception->getSeverity());
 
-        $bootLogger->log(LogLevel::WARNING, 'Foo message', array('exception' => $exception));
+        $bootLogger->log(LogLevel::WARNING, 'Foo message', ['exception' => $exception]);
 
         $mockLogger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
         $mockLogger->expects($this->once())
             ->method('log')
-            ->with(LogLevel::WARNING, 'Foo message', array('exception' => $exception));
+            ->with(LogLevel::WARNING, 'Foo message', ['exception' => $exception]);
 
-        $handler->setLoggers(array(E_DEPRECATED => array($mockLogger, LogLevel::WARNING)));
+        $handler->setLoggers([E_DEPRECATED => [$mockLogger, LogLevel::WARNING]]);
     }
 
     /**
@@ -463,7 +463,7 @@ public function testSettingLoggerWhenExceptionIsBuffered()
         $mockLogger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
         $mockLogger->expects($this->once())
             ->method('log')
-            ->with(LogLevel::CRITICAL, 'Uncaught Exception: Foo message', array('exception' => $exception));
+            ->with(LogLevel::CRITICAL, 'Uncaught Exception: Foo message', ['exception' => $exception]);
 
         $handler->setExceptionHandler(function () use ($handler, $mockLogger) {
             $handler->setDefaultLogger($mockLogger);
@@ -480,12 +480,12 @@ public function testHandleFatalError()
         try {
             $handler = ErrorHandler::register();
 
-            $error = array(
+            $error = [
                 'type' => E_PARSE,
                 'message' => 'foo',
                 'file' => 'bar',
                 'line' => 123,
-            );
+            ];
 
             $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
 
diff --git a/src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php b/src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
index ce9f355530e67..2ba90f4778259 100644
--- a/src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
+++ b/src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
@@ -54,7 +54,7 @@ public function testStatusCode()
         $flattened = FlattenException::create(new ConflictHttpException());
         $this->assertEquals('409', $flattened->getStatusCode());
 
-        $flattened = FlattenException::create(new MethodNotAllowedHttpException(array('POST')));
+        $flattened = FlattenException::create(new MethodNotAllowedHttpException(['POST']));
         $this->assertEquals('405', $flattened->getStatusCode());
 
         $flattened = FlattenException::create(new AccessDeniedHttpException());
@@ -89,23 +89,23 @@ public function testStatusCode()
 
     public function testHeadersForHttpException()
     {
-        $flattened = FlattenException::create(new MethodNotAllowedHttpException(array('POST')));
-        $this->assertEquals(array('Allow' => 'POST'), $flattened->getHeaders());
+        $flattened = FlattenException::create(new MethodNotAllowedHttpException(['POST']));
+        $this->assertEquals(['Allow' => 'POST'], $flattened->getHeaders());
 
         $flattened = FlattenException::create(new UnauthorizedHttpException('Basic realm="My Realm"'));
-        $this->assertEquals(array('WWW-Authenticate' => 'Basic realm="My Realm"'), $flattened->getHeaders());
+        $this->assertEquals(['WWW-Authenticate' => 'Basic realm="My Realm"'], $flattened->getHeaders());
 
         $flattened = FlattenException::create(new ServiceUnavailableHttpException('Fri, 31 Dec 1999 23:59:59 GMT'));
-        $this->assertEquals(array('Retry-After' => 'Fri, 31 Dec 1999 23:59:59 GMT'), $flattened->getHeaders());
+        $this->assertEquals(['Retry-After' => 'Fri, 31 Dec 1999 23:59:59 GMT'], $flattened->getHeaders());
 
         $flattened = FlattenException::create(new ServiceUnavailableHttpException(120));
-        $this->assertEquals(array('Retry-After' => 120), $flattened->getHeaders());
+        $this->assertEquals(['Retry-After' => 120], $flattened->getHeaders());
 
         $flattened = FlattenException::create(new TooManyRequestsHttpException('Fri, 31 Dec 1999 23:59:59 GMT'));
-        $this->assertEquals(array('Retry-After' => 'Fri, 31 Dec 1999 23:59:59 GMT'), $flattened->getHeaders());
+        $this->assertEquals(['Retry-After' => 'Fri, 31 Dec 1999 23:59:59 GMT'], $flattened->getHeaders());
 
         $flattened = FlattenException::create(new TooManyRequestsHttpException(120));
-        $this->assertEquals(array('Retry-After' => 120), $flattened->getHeaders());
+        $this->assertEquals(['Retry-After' => 120], $flattened->getHeaders());
     }
 
     /**
@@ -135,7 +135,7 @@ public function testPrevious(\Exception $exception)
 
         $this->assertSame($flattened2, $flattened->getPrevious());
 
-        $this->assertSame(array($flattened2), $flattened->getAllPrevious());
+        $this->assertSame([$flattened2], $flattened->getAllPrevious());
     }
 
     /**
@@ -204,15 +204,15 @@ public function testArguments()
 
         $incomplete = unserialize('O:14:"BogusTestClass":0:{}');
 
-        $exception = $this->createException(array(
-            (object) array('foo' => 1),
+        $exception = $this->createException([
+            (object) ['foo' => 1],
             new NotFoundHttpException(),
             $incomplete,
             $dh,
             $fh,
             function () {},
-            array(1, 2),
-            array('foo' => 123),
+            [1, 2],
+            ['foo' => 123],
             null,
             true,
             false,
@@ -222,7 +222,7 @@ function () {},
             '',
             INF,
             NAN,
-        ));
+        ]);
 
         $flattened = FlattenException::create($exception);
         $trace = $flattened->getTrace();
@@ -262,7 +262,7 @@ function () {},
     public function testRecursionInArguments()
     {
         $a = null;
-        $a = array('foo', array(2, &$a));
+        $a = ['foo', [2, &$a]];
         $exception = $this->createException($a);
 
         $flattened = FlattenException::create($exception);
@@ -272,7 +272,7 @@ public function testRecursionInArguments()
 
     public function testTooBigArray()
     {
-        $a = array();
+        $a = [];
         for ($i = 0; $i < 20; ++$i) {
             for ($j = 0; $j < 50; ++$j) {
                 for ($k = 0; $k < 10; ++$k) {
@@ -287,7 +287,7 @@ public function testTooBigArray()
         $flattened = FlattenException::create($exception);
         $trace = $flattened->getTrace();
 
-        $this->assertSame($trace[1]['args'][0], array('array', array('array', '*SKIPPED over 10000 entries*')));
+        $this->assertSame($trace[1]['args'][0], ['array', ['array', '*SKIPPED over 10000 entries*']]);
 
         $serializeTrace = serialize($trace);
 
diff --git a/src/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php b/src/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php
index 6ff6a74f4f99e..e166136cbbed4 100644
--- a/src/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php
+++ b/src/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php
@@ -62,10 +62,10 @@ public function testStatusCode()
 
         $this->assertContains('Sorry, the page you are looking for could not be found.', $response);
 
-        $expectedHeaders = array(
-            array('HTTP/1.0 404', true, null),
-            array('Content-Type: text/html; charset=iso8859-1', true, null),
-        );
+        $expectedHeaders = [
+            ['HTTP/1.0 404', true, null],
+            ['Content-Type: text/html; charset=iso8859-1', true, null],
+        ];
 
         $this->assertSame($expectedHeaders, testHeader());
     }
@@ -75,14 +75,14 @@ public function testHeaders()
         $handler = new ExceptionHandler(false, 'iso8859-1');
 
         ob_start();
-        $handler->sendPhpResponse(new MethodNotAllowedHttpException(array('POST')));
+        $handler->sendPhpResponse(new MethodNotAllowedHttpException(['POST']));
         $response = ob_get_clean();
 
-        $expectedHeaders = array(
-            array('HTTP/1.0 405', true, null),
-            array('Allow: POST', false, null),
-            array('Content-Type: text/html; charset=iso8859-1', true, null),
-        );
+        $expectedHeaders = [
+            ['HTTP/1.0 405', true, null],
+            ['Allow: POST', false, null],
+            ['Content-Type: text/html; charset=iso8859-1', true, null],
+        ];
 
         $this->assertSame($expectedHeaders, testHeader());
     }
@@ -101,7 +101,7 @@ public function testHandle()
     {
         $exception = new \Exception('foo');
 
-        $handler = $this->getMockBuilder('Symfony\Component\Debug\ExceptionHandler')->setMethods(array('sendPhpResponse'))->getMock();
+        $handler = $this->getMockBuilder('Symfony\Component\Debug\ExceptionHandler')->setMethods(['sendPhpResponse'])->getMock();
         $handler
             ->expects($this->exactly(2))
             ->method('sendPhpResponse');
@@ -119,7 +119,7 @@ public function testHandleOutOfMemoryException()
     {
         $exception = new OutOfMemoryException('foo', 0, E_ERROR, __FILE__, __LINE__);
 
-        $handler = $this->getMockBuilder('Symfony\Component\Debug\ExceptionHandler')->setMethods(array('sendPhpResponse'))->getMock();
+        $handler = $this->getMockBuilder('Symfony\Component\Debug\ExceptionHandler')->setMethods(['sendPhpResponse'])->getMock();
         $handler
             ->expects($this->once())
             ->method('sendPhpResponse');
diff --git a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
index 5cdac2f12afc2..8e615ac640be9 100644
--- a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
+++ b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
@@ -72,85 +72,85 @@ public function provideClassNotFoundData()
         $autoloader = new ComposerClassLoader();
         $autoloader->add('Symfony\Component\Debug\Exception\\', realpath(__DIR__.'/../../Exception'));
 
-        $debugClassLoader = new DebugClassLoader(array($autoloader, 'loadClass'));
+        $debugClassLoader = new DebugClassLoader([$autoloader, 'loadClass']);
 
-        return array(
-            array(
-                array(
+        return [
+            [
+                [
                     'type' => 1,
                     'line' => 12,
                     'file' => 'foo.php',
                     'message' => 'Class \'WhizBangFactory\' not found',
-                ),
+                ],
                 "Attempted to load class \"WhizBangFactory\" from the global namespace.\nDid you forget a \"use\" statement?",
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'type' => 1,
                     'line' => 12,
                     'file' => 'foo.php',
                     'message' => 'Class \'Foo\\Bar\\WhizBangFactory\' not found',
-                ),
+                ],
                 "Attempted to load class \"WhizBangFactory\" from namespace \"Foo\\Bar\".\nDid you forget a \"use\" statement for another namespace?",
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'type' => 1,
                     'line' => 12,
                     'file' => 'foo.php',
                     'message' => 'Class \'UndefinedFunctionException\' not found',
-                ),
+                ],
                 "Attempted to load class \"UndefinedFunctionException\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'type' => 1,
                     'line' => 12,
                     'file' => 'foo.php',
                     'message' => 'Class \'PEARClass\' not found',
-                ),
+                ],
                 "Attempted to load class \"PEARClass\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony_Component_Debug_Tests_Fixtures_PEARClass\"?",
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'type' => 1,
                     'line' => 12,
                     'file' => 'foo.php',
                     'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
-                ),
+                ],
                 "Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'type' => 1,
                     'line' => 12,
                     'file' => 'foo.php',
                     'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
-                ),
+                ],
                 "Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
-                array($autoloader, 'loadClass'),
-            ),
-            array(
-                array(
+                [$autoloader, 'loadClass'],
+            ],
+            [
+                [
                     'type' => 1,
                     'line' => 12,
                     'file' => 'foo.php',
                     'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
-                ),
+                ],
                 "Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
-                array($debugClassLoader, 'loadClass'),
-            ),
-            array(
-                array(
+                [$debugClassLoader, 'loadClass'],
+            ],
+            [
+                [
                     'type' => 1,
                     'line' => 12,
                     'file' => 'foo.php',
                     'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
-                ),
+                ],
                 "Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\\Bar\".\nDid you forget a \"use\" statement for another namespace?",
                 function ($className) { /* do nothing here */ },
-            ),
-        );
+            ],
+        ];
     }
 
     public function testCannotRedeclareClass()
@@ -161,12 +161,12 @@ public function testCannotRedeclareClass()
 
         require_once __DIR__.'/../FIXTURES2/REQUIREDTWICE.PHP';
 
-        $error = array(
+        $error = [
             'type' => 1,
             'line' => 12,
             'file' => 'foo.php',
             'message' => 'Class \'Foo\\Bar\\RequiredTwice\' not found',
-        );
+        ];
 
         $handler = new ClassNotFoundFatalErrorHandler();
         $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
diff --git a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
index 1dc2120045c2c..2de44a25ef156 100644
--- a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
+++ b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
@@ -35,44 +35,44 @@ public function testUndefinedFunction($error, $translatedMessage)
 
     public function provideUndefinedFunctionData()
     {
-        return array(
-            array(
-                array(
+        return [
+            [
+                [
                     'type' => 1,
                     'line' => 12,
                     'file' => 'foo.php',
                     'message' => 'Call to undefined function test_namespaced_function()',
-                ),
+                ],
                 "Attempted to call function \"test_namespaced_function\" from the global namespace.\nDid you mean to call \"\\symfony\\component\\debug\\tests\\fatalerrorhandler\\test_namespaced_function\"?",
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'type' => 1,
                     'line' => 12,
                     'file' => 'foo.php',
                     'message' => 'Call to undefined function Foo\\Bar\\Baz\\test_namespaced_function()',
-                ),
+                ],
                 "Attempted to call function \"test_namespaced_function\" from namespace \"Foo\\Bar\\Baz\".\nDid you mean to call \"\\symfony\\component\\debug\\tests\\fatalerrorhandler\\test_namespaced_function\"?",
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'type' => 1,
                     'line' => 12,
                     'file' => 'foo.php',
                     'message' => 'Call to undefined function foo()',
-                ),
+                ],
                 'Attempted to call function "foo" from the global namespace.',
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'type' => 1,
                     'line' => 12,
                     'file' => 'foo.php',
                     'message' => 'Call to undefined function Foo\\Bar\\Baz\\foo()',
-                ),
+                ],
                 'Attempted to call function "foo" from namespace "Foo\Bar\Baz".',
-            ),
-        );
+            ],
+        ];
     }
 }
 
diff --git a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
index a2647f57f201a..268a841351ec4 100644
--- a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
+++ b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
@@ -34,43 +34,43 @@ public function testUndefinedMethod($error, $translatedMessage)
 
     public function provideUndefinedMethodData()
     {
-        return array(
-            array(
-                array(
+        return [
+            [
+                [
                     'type' => 1,
                     'line' => 12,
                     'file' => 'foo.php',
                     'message' => 'Call to undefined method SplObjectStorage::what()',
-                ),
+                ],
                 'Attempted to call an undefined method named "what" of class "SplObjectStorage".',
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'type' => 1,
                     'line' => 12,
                     'file' => 'foo.php',
                     'message' => 'Call to undefined method SplObjectStorage::walid()',
-                ),
+                ],
                 "Attempted to call an undefined method named \"walid\" of class \"SplObjectStorage\".\nDid you mean to call \"valid\"?",
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'type' => 1,
                     'line' => 12,
                     'file' => 'foo.php',
                     'message' => 'Call to undefined method SplObjectStorage::offsetFet()',
-                ),
+                ],
                 "Attempted to call an undefined method named \"offsetFet\" of class \"SplObjectStorage\".\nDid you mean to call e.g. \"offsetGet\", \"offsetSet\" or \"offsetUnset\"?",
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'type' => 1,
                     'message' => 'Call to undefined method class@anonymous::test()',
                     'file' => '/home/possum/work/symfony/test.php',
                     'line' => 11,
-                ),
+                ],
                 'Attempted to call an undefined method named "test" of class "class@anonymous".',
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Debug/Tests/HeaderMock.php b/src/Symfony/Component/Debug/Tests/HeaderMock.php
index 3d8d84c5a4c45..d7564db4854b8 100644
--- a/src/Symfony/Component/Debug/Tests/HeaderMock.php
+++ b/src/Symfony/Component/Debug/Tests/HeaderMock.php
@@ -25,11 +25,11 @@ function header($str, $replace = true, $status = null)
 
 function testHeader()
 {
-    static $headers = array();
+    static $headers = [];
 
     if (!$h = \func_get_args()) {
         $h = $headers;
-        $headers = array();
+        $headers = [];
 
         return $h;
     }
diff --git a/src/Symfony/Component/Debug/Tests/phpt/exception_rethrown.phpt b/src/Symfony/Component/Debug/Tests/phpt/exception_rethrown.phpt
index 3f4559543064c..b743d93ad7c80 100644
--- a/src/Symfony/Component/Debug/Tests/phpt/exception_rethrown.phpt
+++ b/src/Symfony/Component/Debug/Tests/phpt/exception_rethrown.phpt
@@ -14,7 +14,7 @@ require $vendor.'/vendor/autoload.php';
 if (true) {
     class TestLogger extends \Psr\Log\AbstractLogger
     {
-        public function log($level, $message, array $context = array())
+        public function log($level, $message, array $context = [])
         {
             echo $message, "\n";
         }
diff --git a/src/Symfony/Component/Debug/Tests/phpt/fatal_with_nested_handlers.phpt b/src/Symfony/Component/Debug/Tests/phpt/fatal_with_nested_handlers.phpt
index 2b74e5c6857f3..b3f0e0eb0995a 100644
--- a/src/Symfony/Component/Debug/Tests/phpt/fatal_with_nested_handlers.phpt
+++ b/src/Symfony/Component/Debug/Tests/phpt/fatal_with_nested_handlers.phpt
@@ -17,9 +17,9 @@ ini_set('display_errors', 0);
 $eHandler = set_error_handler('var_dump');
 $xHandler = set_exception_handler('var_dump');
 
-var_dump(array(
+var_dump([
     $eHandler[0] === $xHandler[0] ? 'Error and exception handlers do match' : 'Error and exception handlers are different',
-));
+]);
 
 $eHandler[0]->setExceptionHandler('print_r');
 
diff --git a/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php b/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php
index f72f2110744c1..a20698440c3cf 100644
--- a/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php
+++ b/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php
@@ -33,7 +33,7 @@ public function __construct($value)
      */
     public function getValues()
     {
-        return array($this->value, $this->identifier, $this->used);
+        return [$this->value, $this->identifier, $this->used];
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Argument/ServiceClosureArgument.php b/src/Symfony/Component/DependencyInjection/Argument/ServiceClosureArgument.php
index 2fec5d26d0fc5..6331affa48387 100644
--- a/src/Symfony/Component/DependencyInjection/Argument/ServiceClosureArgument.php
+++ b/src/Symfony/Component/DependencyInjection/Argument/ServiceClosureArgument.php
@@ -25,7 +25,7 @@ class ServiceClosureArgument implements ArgumentInterface
 
     public function __construct(Reference $reference)
     {
-        $this->values = array($reference);
+        $this->values = [$reference];
     }
 
     /**
@@ -41,7 +41,7 @@ public function getValues()
      */
     public function setValues(array $values)
     {
-        if (array(0) !== array_keys($values) || !($values[0] instanceof Reference || null === $values[0])) {
+        if ([0] !== array_keys($values) || !($values[0] instanceof Reference || null === $values[0])) {
             throw new InvalidArgumentException('A ServiceClosureArgument must hold one and only one Reference.');
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php b/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
index 19e0d2b97152c..f00e533919f9b 100644
--- a/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
+++ b/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
@@ -25,7 +25,7 @@ class TaggedIteratorArgument extends IteratorArgument
      */
     public function __construct($tag)
     {
-        parent::__construct(array());
+        parent::__construct([]);
 
         $this->tag = (string) $tag;
     }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index 4aabb0b29aa7d..1d5a7f1c77304 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -401,7 +401,7 @@ private function set($type, $id)
 
         // keep an array of all services matching this type
         if (!isset($this->ambiguousServiceTypes[$type])) {
-            $this->ambiguousServiceTypes[$type] = array($this->types[$type]);
+            $this->ambiguousServiceTypes[$type] = [$this->types[$type]];
             unset($this->types[$type]);
         }
         $this->ambiguousServiceTypes[$type][] = $id;
@@ -543,7 +543,7 @@ private static function getResourceMetadataForMethod(\ReflectionMethod $method)
 
     private function getAliasesSuggestionForType($type, $extraContext = null)
     {
-        $aliases = array();
+        $aliases = [];
         foreach (class_parents($type) + class_implements($type) as $parent) {
             if ($this->container->has($parent) && !$this->container->findDefinition($parent)->isAbstract()) {
                 $aliases[] = $parent;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredMethodsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredMethodsPass.php
index 6c744f88f6a94..efb9df7b94318 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredMethodsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredMethodsPass.php
@@ -34,7 +34,7 @@ protected function processValue($value, $isRoot = false)
             return $value;
         }
 
-        $alreadyCalledMethods = array();
+        $alreadyCalledMethods = [];
 
         foreach ($value->getMethodCalls() as list($method)) {
             $alreadyCalledMethods[strtolower($method)] = true;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
index ac7866b2bab86..55d911c4f3e60 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
@@ -36,9 +36,9 @@ public function process(ContainerBuilder $container)
     {
         $graph = $container->getCompiler()->getServiceReferenceGraph();
 
-        $this->checkedNodes = array();
+        $this->checkedNodes = [];
         foreach ($graph->getNodes() as $id => $node) {
-            $this->currentPath = array($id);
+            $this->currentPath = [$id];
 
             $this->checkOutEdges($node->getOutEdges());
         }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
index a1967802f6a30..0e9005415a30b 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
@@ -83,7 +83,7 @@ public function process(ContainerBuilder $container)
             if ($definition->isPublic() && !$definition->isPrivate()) {
                 $resolvedId = $container->resolveEnvPlaceholders($id, null, $usedEnvs);
                 if (null !== $usedEnvs) {
-                    throw new EnvParameterException(array($resolvedId), null, 'A service name ("%s") cannot contain dynamic values.');
+                    throw new EnvParameterException([$resolvedId], null, 'A service name ("%s") cannot contain dynamic values.');
                 }
             }
         }
@@ -92,7 +92,7 @@ public function process(ContainerBuilder $container)
             if ($alias->isPublic() && !$alias->isPrivate()) {
                 $resolvedId = $container->resolveEnvPlaceholders($id, null, $usedEnvs);
                 if (null !== $usedEnvs) {
-                    throw new EnvParameterException(array($resolvedId), null, 'An alias name ("%s") cannot contain dynamic values.');
+                    throw new EnvParameterException([$resolvedId], null, 'An alias name ("%s") cannot contain dynamic values.');
                 }
             }
         }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
index d5c01a640fce5..e5e21a2b28caf 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
@@ -141,7 +141,7 @@ public function compile(ContainerBuilder $container)
                 $pass->process($container);
             }
         } catch (\Exception $e) {
-            $usedEnvs = array();
+            $usedEnvs = [];
             $prev = $e;
 
             do {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
index 263bd4cf1fba5..af6045e110aad 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
@@ -32,9 +32,9 @@ public function process(ContainerBuilder $container)
             if (!$decorated = $definition->getDecoratedService()) {
                 continue;
             }
-            $definitions->insert(array($id, $definition), array($decorated[2], --$order));
+            $definitions->insert([$id, $definition], [$decorated[2], --$order]);
         }
-        $decoratingDefinitions = array();
+        $decoratingDefinitions = [];
 
         foreach ($definitions as list($id, $definition)) {
             list($inner, $renamedId) = $definition->getDecoratedService();
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
index 71cfa2d51dc19..63f8013c313fb 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
@@ -110,7 +110,7 @@ public function freezeAfterProcessing(Extension $extension, ContainerBuilder $co
             // Extension::processConfiguration() wasn't called, we cannot know how configs were merged
             return;
         }
-        $this->processedEnvPlaceholders = array();
+        $this->processedEnvPlaceholders = [];
 
         // serialize config and container to catch env vars nested in object graphs
         $config = serialize($config).serialize($container->getDefinitions()).serialize($container->getAliases()).serialize($container->getParameterBag()->all());
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
index d547c3e95e129..a29469166e777 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -29,9 +29,9 @@ class PassConfig
     const TYPE_REMOVE = 'removing';
 
     private $mergePass;
-    private $afterRemovingPasses = array();
-    private $beforeOptimizationPasses = array();
-    private $beforeRemovingPasses = array();
+    private $afterRemovingPasses = [];
+    private $beforeOptimizationPasses = [];
+    private $beforeRemovingPasses = [];
     private $optimizationPasses;
     private $removingPasses;
 
@@ -101,7 +101,7 @@ public function __construct()
     public function getPasses()
     {
         return array_merge(
-            array($this->mergePass),
+            [$this->mergePass],
             $this->getBeforeOptimizationPasses(),
             $this->getOptimizationPasses(),
             $this->getBeforeRemovingPasses(),
@@ -142,7 +142,7 @@ public function addPass(CompilerPassInterface $pass, $type = self::TYPE_BEFORE_O
         $passes = &$this->$property;
 
         if (!isset($passes[$priority])) {
-            $passes[$priority] = array();
+            $passes[$priority] = [];
         }
         $passes[$priority][] = $pass;
     }
@@ -219,7 +219,7 @@ public function setMergePass(CompilerPassInterface $pass)
      */
     public function setAfterRemovingPasses(array $passes)
     {
-        $this->afterRemovingPasses = array($passes);
+        $this->afterRemovingPasses = [$passes];
     }
 
     /**
@@ -229,7 +229,7 @@ public function setAfterRemovingPasses(array $passes)
      */
     public function setBeforeOptimizationPasses(array $passes)
     {
-        $this->beforeOptimizationPasses = array($passes);
+        $this->beforeOptimizationPasses = [$passes];
     }
 
     /**
@@ -239,7 +239,7 @@ public function setBeforeOptimizationPasses(array $passes)
      */
     public function setBeforeRemovingPasses(array $passes)
     {
-        $this->beforeRemovingPasses = array($passes);
+        $this->beforeRemovingPasses = [$passes];
     }
 
     /**
@@ -249,7 +249,7 @@ public function setBeforeRemovingPasses(array $passes)
      */
     public function setOptimizationPasses(array $passes)
     {
-        $this->optimizationPasses = array($passes);
+        $this->optimizationPasses = [$passes];
     }
 
     /**
@@ -259,7 +259,7 @@ public function setOptimizationPasses(array $passes)
      */
     public function setRemovingPasses(array $passes)
     {
-        $this->removingPasses = array($passes);
+        $this->removingPasses = [$passes];
     }
 
     /**
@@ -272,7 +272,7 @@ public function setRemovingPasses(array $passes)
     private function sortPasses(array $passes)
     {
         if (0 === \count($passes)) {
-            return array();
+            return [];
         }
 
         krsort($passes);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
index ed9b0b7f1e948..daff3495acdb7 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
@@ -38,7 +38,7 @@ trait PriorityTaggedServiceTrait
      */
     private function findAndSortTaggedServices($tagName, ContainerBuilder $container)
     {
-        $services = array();
+        $services = [];
 
         foreach ($container->findTaggedServiceIds($tagName, true) as $serviceId => $attributes) {
             $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php
index e206b0ced8876..2b73e13649625 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php
@@ -27,13 +27,13 @@
  */
 class RegisterEnvVarProcessorsPass implements CompilerPassInterface
 {
-    private static $allowedTypes = array('array', 'bool', 'float', 'int', 'string');
+    private static $allowedTypes = ['array', 'bool', 'float', 'int', 'string'];
 
     public function process(ContainerBuilder $container)
     {
         $bag = $container->getParameterBag();
-        $types = array();
-        $processors = array();
+        $types = [];
+        $processors = [];
         foreach ($container->findTaggedServiceIds('container.env_var_processor') as $id => $tags) {
             if (!$r = $container->getReflectionClass($class = $container->getDefinition($id)->getClass())) {
                 throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RegisterServiceSubscribersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RegisterServiceSubscribersPass.php
index 0a7dcd7e9dece..2b5b2a60827bc 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/RegisterServiceSubscribersPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RegisterServiceSubscribersPass.php
@@ -31,7 +31,7 @@ protected function processValue($value, $isRoot = false)
             return parent::processValue($value, $isRoot);
         }
 
-        $serviceMap = array();
+        $serviceMap = [];
         $autowire = $value->isAutowired();
 
         foreach ($value->getTag('container.service_subscriber') as $attributes) {
@@ -40,7 +40,7 @@ protected function processValue($value, $isRoot = false)
                 continue;
             }
             ksort($attributes);
-            if (array() !== array_diff(array_keys($attributes), array('id', 'key'))) {
+            if ([] !== array_diff(array_keys($attributes), ['id', 'key'])) {
                 throw new InvalidArgumentException(sprintf('The "container.service_subscriber" tag accepts only the "key" and "id" attributes, "%s" given for service "%s".', implode('", "', array_keys($attributes)), $this->currentId));
             }
             if (!array_key_exists('id', $attributes)) {
@@ -94,7 +94,7 @@ protected function processValue($value, $isRoot = false)
             throw new InvalidArgumentException(sprintf('Service %s not exist in the map returned by "%s::getSubscribedServices()" for service "%s".', $message, $class, $this->currentId));
         }
 
-        $value->addTag('container.service_subscriber.locator', array('id' => (string) ServiceLocatorTagPass::register($this->container, $subscriberMap, $this->currentId)));
+        $value->addTag('container.service_subscriber.locator', ['id' => (string) ServiceLocatorTagPass::register($this->container, $subscriberMap, $this->currentId)]);
 
         return parent::processValue($value);
     }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
index 8e20676592454..472bf9415ad69 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
@@ -33,8 +33,8 @@ class ReplaceAliasByActualDefinitionPass extends AbstractRecursivePass
     public function process(ContainerBuilder $container)
     {
         // First collect all alias targets that need to be replaced
-        $seenAliasTargets = array();
-        $replacements = array();
+        $seenAliasTargets = [];
+        $replacements = [];
         foreach ($container->getAliases() as $definitionId => $target) {
             $targetId = $container->normalizeId($target);
             // Special case: leave this target alone
@@ -69,7 +69,7 @@ public function process(ContainerBuilder $container)
         $this->replacements = $replacements;
 
         parent::process($container);
-        $this->replacements = array();
+        $this->replacements = [];
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
index bcf265ab47235..0fad285e5aaf4 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
@@ -25,9 +25,9 @@
  */
 class ResolveBindingsPass extends AbstractRecursivePass
 {
-    private $usedBindings = array();
-    private $unusedBindings = array();
-    private $errorMessages = array();
+    private $usedBindings = [];
+    private $unusedBindings = [];
+    private $errorMessages = [];
 
     /**
      * {@inheritdoc}
@@ -48,9 +48,9 @@ public function process(ContainerBuilder $container)
                 throw new InvalidArgumentException($message);
             }
         } finally {
-            $this->usedBindings = array();
-            $this->unusedBindings = array();
-            $this->errorMessages = array();
+            $this->usedBindings = [];
+            $this->unusedBindings = [];
+            $this->errorMessages = [];
         }
     }
 
@@ -80,7 +80,7 @@ protected function processValue($value, $isRoot = false)
                 $this->usedBindings[$bindingId] = true;
                 unset($this->unusedBindings[$bindingId]);
             } elseif (!isset($this->usedBindings[$bindingId])) {
-                $this->unusedBindings[$bindingId] = array($key, $this->currentId);
+                $this->unusedBindings[$bindingId] = [$key, $this->currentId];
             }
 
             if (isset($key[0]) && '$' === $key[0]) {
@@ -100,7 +100,7 @@ protected function processValue($value, $isRoot = false)
 
         try {
             if ($constructor = $this->getConstructor($value, false)) {
-                $calls[] = array($constructor, $value->getArguments());
+                $calls[] = [$constructor, $value->getArguments()];
             }
         } catch (RuntimeException $e) {
             $this->errorMessages[] = $e->getMessage();
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
index d647eda2376c0..539395a43742e 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
@@ -39,7 +39,7 @@ protected function processValue($value, $isRoot = false)
             $value = $this->container->getDefinition($this->currentId);
         }
         if ($value instanceof ChildDefinition) {
-            $this->currentPath = array();
+            $this->currentPath = [];
             $value = $this->resolveDefinition($value);
             if ($isRoot) {
                 $this->container->setDefinition($this->currentId, $value);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveHotPathPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveHotPathPass.php
index 2888cf4d396dc..4e025113acdb8 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveHotPathPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveHotPathPass.php
@@ -24,7 +24,7 @@
 class ResolveHotPathPass extends AbstractRecursivePass
 {
     private $tagName;
-    private $resolvedIds = array();
+    private $resolvedIds = [];
 
     public function __construct($tagName = 'container.hot_path')
     {
@@ -40,7 +40,7 @@ public function process(ContainerBuilder $container)
             parent::process($container);
             $container->getDefinition('service_container')->clearTag($this->tagName);
         } finally {
-            $this->resolvedIds = array();
+            $this->resolvedIds = [];
         }
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
index 20507cfb56980..637ecd1f679e1 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
@@ -50,7 +50,7 @@ public function process(ContainerBuilder $container)
     private function processDefinition(ContainerBuilder $container, $id, Definition $definition)
     {
         $instanceofConditionals = $definition->getInstanceofConditionals();
-        $autoconfiguredInstanceof = $definition->isAutoconfigured() ? $container->getAutoconfiguredInstanceof() : array();
+        $autoconfiguredInstanceof = $definition->isAutoconfigured() ? $container->getAutoconfiguredInstanceof() : [];
         if (!$instanceofConditionals && !$autoconfiguredInstanceof) {
             return $definition;
         }
@@ -94,7 +94,7 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
             $abstract = $container->setDefinition('abstract.instanceof.'.$id, $definition);
 
             // cast Definition to ChildDefinition
-            $definition->setBindings(array());
+            $definition->setBindings([]);
             $definition = serialize($definition);
             $definition = substr_replace($definition, '53', 2, 2);
             $definition = substr_replace($definition, 'Child', 44, 0);
@@ -121,11 +121,11 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
 
             // reset fields with "merge" behavior
             $abstract
-                ->setBindings(array())
-                ->setArguments(array())
-                ->setMethodCalls(array())
+                ->setBindings([])
+                ->setArguments([])
+                ->setMethodCalls([])
                 ->setDecoratedService(null)
-                ->setTags(array())
+                ->setTags([])
                 ->setAbstract(true);
         }
 
@@ -135,7 +135,7 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
     private function mergeConditionals(array $autoconfiguredInstanceof, array $instanceofConditionals, ContainerBuilder $container)
     {
         // make each value an array of ChildDefinition
-        $conditionals = array_map(function ($childDef) { return array($childDef); }, $autoconfiguredInstanceof);
+        $conditionals = array_map(function ($childDef) { return [$childDef]; }, $autoconfiguredInstanceof);
 
         foreach ($instanceofConditionals as $interface => $instanceofDef) {
             // make sure the interface/class exists (but don't validate automaticInstanceofConditionals)
@@ -144,7 +144,7 @@ private function mergeConditionals(array $autoconfiguredInstanceof, array $insta
             }
 
             if (!isset($autoconfiguredInstanceof[$interface])) {
-                $conditionals[$interface] = array();
+                $conditionals[$interface] = [];
             }
 
             $conditionals[$interface][] = $instanceofDef;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php
index 90cf64adbec35..d01faf1ba5f5b 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php
@@ -33,12 +33,12 @@ protected function processValue($value, $isRoot = false)
         }
 
         $calls = $value->getMethodCalls();
-        $calls[] = array('__construct', $value->getArguments());
+        $calls[] = ['__construct', $value->getArguments()];
 
         foreach ($calls as $i => $call) {
             list($method, $arguments) = $call;
             $parameters = null;
-            $resolvedArguments = array();
+            $resolvedArguments = [];
 
             foreach ($arguments as $key => $argument) {
                 if (\is_int($key)) {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
index 9a59a73ec5e12..8c942b524ea3b 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
@@ -42,7 +42,7 @@ public function process(ContainerBuilder $container)
         try {
             parent::process($container);
 
-            $aliases = array();
+            $aliases = [];
             foreach ($container->getAliases() as $name => $target) {
                 $this->currentId = $name;
                 $aliases[$this->bag->resolveValue($name)] = $target;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
index 839af1ae232d3..b80e45256cbed 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
@@ -63,10 +63,10 @@ protected function processValue($value, $isRoot = false)
      */
     private function getDefinitionId($id, ContainerBuilder $container)
     {
-        $seen = array();
+        $seen = [];
         while ($container->hasAlias($id)) {
             if (isset($seen[$id])) {
-                throw new ServiceCircularReferenceException($id, array_merge(array_keys($seen), array($id)));
+                throw new ServiceCircularReferenceException($id, array_merge(array_keys($seen), [$id]));
             }
             $seen[$id] = true;
             $id = $container->normalizeId($container->getAlias($id));
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php
index 83486f0533714..23d4745ed3d9f 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php
@@ -28,7 +28,7 @@ class ServiceReferenceGraph
     /**
      * @var ServiceReferenceGraphNode[]
      */
-    private $nodes = array();
+    private $nodes = [];
 
     /**
      * Checks if the graph has a specific node.
@@ -78,7 +78,7 @@ public function clear()
         foreach ($this->nodes as $node) {
             $node->clear();
         }
-        $this->nodes = array();
+        $this->nodes = [];
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
index 36b99f1a82538..0d737346a3f87 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
@@ -24,8 +24,8 @@
 class ServiceReferenceGraphNode
 {
     private $id;
-    private $inEdges = array();
-    private $outEdges = array();
+    private $inEdges = [];
+    private $outEdges = [];
     private $value;
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
index 4d3e3883d428a..4379f4507b7ab 100644
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@@ -331,13 +331,13 @@ public function get($id, $invalidBehavior = /* self::EXCEPTION_ON_INVALID_REFERE
                 throw new ServiceNotFoundException($id);
             }
             if (isset($this->syntheticIds[$id])) {
-                throw new ServiceNotFoundException($id, null, null, array(), sprintf('The "%s" service is synthetic, it needs to be set at boot time before it can be used.', $id));
+                throw new ServiceNotFoundException($id, null, null, [], sprintf('The "%s" service is synthetic, it needs to be set at boot time before it can be used.', $id));
             }
             if (isset($this->getRemovedIds()[$id])) {
-                throw new ServiceNotFoundException($id, null, null, array(), sprintf('The "%s" service or alias has been removed or inlined when the container was compiled. You should either make it public, or stop using the container directly and use dependency injection instead.', $id));
+                throw new ServiceNotFoundException($id, null, null, [], sprintf('The "%s" service or alias has been removed or inlined when the container was compiled. You should either make it public, or stop using the container directly and use dependency injection instead.', $id));
             }
 
-            $alternatives = array();
+            $alternatives = [];
             foreach ($this->getServiceIds() as $knownId) {
                 $lev = levenshtein($id, $knownId);
                 if ($lev <= \strlen($id) / 3 || false !== strpos($knownId, $id)) {
@@ -415,7 +415,7 @@ public function getServiceIds()
      */
     public function getRemovedIds()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -427,7 +427,7 @@ public function getRemovedIds()
      */
     public static function camelize($id)
     {
-        return strtr(ucwords(strtr($id, array('_' => ' ', '.' => '_ ', '\\' => '_ '))), array(' ' => ''));
+        return strtr(ucwords(strtr($id, ['_' => ' ', '.' => '_ ', '\\' => '_ '])), [' ' => '']);
     }
 
     /**
@@ -439,7 +439,7 @@ public static function camelize($id)
      */
     public static function underscore($id)
     {
-        return strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), array('\\1_\\2', '\\1_\\2'), str_replace('_', '.', $id)));
+        return strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], ['\\1_\\2', '\\1_\\2'], str_replace('_', '.', $id)));
     }
 
     /**
@@ -470,7 +470,7 @@ protected function getEnv($name)
             return $this->envCache[$name];
         }
         if (!$this->has($id = 'container.env_var_processors_locator')) {
-            $this->set($id, new ServiceLocator(array()));
+            $this->set($id, new ServiceLocator([]));
         }
         if (!$this->getEnv) {
             $this->getEnv = new \ReflectionMethod($this, __FUNCTION__);
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index 5fe6f2ae6fdfd..0143267af98a8 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -53,29 +53,29 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
     /**
      * @var ExtensionInterface[]
      */
-    private $extensions = array();
+    private $extensions = [];
 
     /**
      * @var ExtensionInterface[]
      */
-    private $extensionsByNs = array();
+    private $extensionsByNs = [];
 
     /**
      * @var Definition[]
      */
-    private $definitions = array();
+    private $definitions = [];
 
     /**
      * @var Alias[]
      */
-    private $aliasDefinitions = array();
+    private $aliasDefinitions = [];
 
     /**
      * @var ResourceInterface[]
      */
-    private $resources = array();
+    private $resources = [];
 
-    private $extensionConfigs = array();
+    private $extensionConfigs = [];
 
     /**
      * @var Compiler
@@ -97,33 +97,33 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
     /**
      * @var ExpressionFunctionProviderInterface[]
      */
-    private $expressionLanguageProviders = array();
+    private $expressionLanguageProviders = [];
 
     /**
      * @var string[] with tag names used by findTaggedServiceIds
      */
-    private $usedTags = array();
+    private $usedTags = [];
 
     /**
      * @var string[][] a map of env var names to their placeholders
      */
-    private $envPlaceholders = array();
+    private $envPlaceholders = [];
 
     /**
      * @var int[] a map of env vars to their resolution counter
      */
-    private $envCounters = array();
+    private $envCounters = [];
 
     /**
      * @var string[] the list of vendor directories
      */
     private $vendors;
 
-    private $autoconfiguredInstanceof = array();
+    private $autoconfiguredInstanceof = [];
 
-    private $removedIds = array();
+    private $removedIds = [];
 
-    private static $internalTypes = array(
+    private static $internalTypes = [
         'int' => true,
         'float' => true,
         'string' => true,
@@ -135,7 +135,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
         'callable' => true,
         'iterable' => true,
         'mixed' => true,
-    );
+    ];
 
     public function __construct(ParameterBagInterface $parameterBag = null)
     {
@@ -449,7 +449,7 @@ public function loadFromExtension($extension, array $values = null)
         }
 
         if (\func_num_args() < 2) {
-            $values = array();
+            $values = [];
         }
 
         $namespace = $this->getExtension($extension)->getAlias();
@@ -596,7 +596,7 @@ private function doGet($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_
         }
         if (null === $inlineServices) {
             $isConstructorArgument = true;
-            $inlineServices = array();
+            $inlineServices = [];
         }
         try {
             if (ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $invalidBehavior) {
@@ -676,7 +676,7 @@ public function merge(self $container)
 
         foreach ($this->extensions as $name => $extension) {
             if (!isset($this->extensionConfigs[$name])) {
-                $this->extensionConfigs[$name] = array();
+                $this->extensionConfigs[$name] = [];
             }
 
             $this->extensionConfigs[$name] = array_merge($this->extensionConfigs[$name], $container->getExtensionConfig($name));
@@ -686,7 +686,7 @@ public function merge(self $container)
             $envPlaceholders = $container->getParameterBag()->getEnvPlaceholders();
             $this->getParameterBag()->mergeEnvPlaceholders($container->getParameterBag());
         } else {
-            $envPlaceholders = array();
+            $envPlaceholders = [];
         }
 
         foreach ($container->envCounters as $env => $count) {
@@ -719,7 +719,7 @@ public function merge(self $container)
     public function getExtensionConfig($name)
     {
         if (!isset($this->extensionConfigs[$name])) {
-            $this->extensionConfigs[$name] = array();
+            $this->extensionConfigs[$name] = [];
         }
 
         return $this->extensionConfigs[$name];
@@ -734,7 +734,7 @@ public function getExtensionConfig($name)
     public function prependExtensionConfig($name, array $config)
     {
         if (!isset($this->extensionConfigs[$name])) {
-            $this->extensionConfigs[$name] = array();
+            $this->extensionConfigs[$name] = [];
         }
 
         array_unshift($this->extensionConfigs[$name], $config);
@@ -793,7 +793,7 @@ public function compile(/*$resolveEnvPlaceholders = false*/)
             }
         }
 
-        $this->extensionConfigs = array();
+        $this->extensionConfigs = [];
 
         if ($bag instanceof EnvPlaceholderParameterBag) {
             if ($resolveEnvPlaceholders) {
@@ -847,7 +847,7 @@ public function addAliases(array $aliases)
      */
     public function setAliases(array $aliases)
     {
-        $this->aliasDefinitions = array();
+        $this->aliasDefinitions = [];
         $this->addAliases($aliases);
     }
 
@@ -987,7 +987,7 @@ public function addDefinitions(array $definitions)
      */
     public function setDefinitions(array $definitions)
     {
-        $this->definitions = array();
+        $this->definitions = [];
         $this->addDefinitions($definitions);
     }
 
@@ -1071,7 +1071,7 @@ public function findDefinition($id)
     {
         $id = $this->normalizeId($id);
 
-        $seen = array();
+        $seen = [];
         while (isset($this->aliasDefinitions[$id])) {
             $id = (string) $this->aliasDefinitions[$id];
 
@@ -1143,7 +1143,7 @@ private function createService(Definition $definition, array &$inlineServices, $
 
         if (null !== $factory = $definition->getFactory()) {
             if (\is_array($factory)) {
-                $factory = array($this->doResolveServices($parameterBag->resolveValue($factory[0]), $inlineServices, $isConstructorArgument), $factory[1]);
+                $factory = [$this->doResolveServices($parameterBag->resolveValue($factory[0]), $inlineServices, $isConstructorArgument), $factory[1]];
             } elseif (!\is_string($factory)) {
                 throw new RuntimeException(sprintf('Cannot create service "%s" because of invalid factory', $id));
             }
@@ -1224,7 +1224,7 @@ public function resolveServices($value)
         return $this->doResolveServices($value);
     }
 
-    private function doResolveServices($value, array &$inlineServices = array(), $isConstructorArgument = false)
+    private function doResolveServices($value, array &$inlineServices = [], $isConstructorArgument = false)
     {
         if (\is_array($value)) {
             foreach ($value as $k => $v) {
@@ -1277,7 +1277,7 @@ private function doResolveServices($value, array &$inlineServices = array(), $is
         } elseif ($value instanceof Parameter) {
             $value = $this->getParameter((string) $value);
         } elseif ($value instanceof Expression) {
-            $value = $this->getExpressionLanguage()->evaluate($value, array('container' => $this));
+            $value = $this->getExpressionLanguage()->evaluate($value, ['container' => $this]);
         }
 
         return $value;
@@ -1305,7 +1305,7 @@ private function doResolveServices($value, array &$inlineServices = array(), $is
     public function findTaggedServiceIds($name, $throwOnAbstract = false)
     {
         $this->usedTags[] = $name;
-        $tags = array();
+        $tags = [];
         foreach ($this->getDefinitions() as $id => $definition) {
             if ($definition->hasTag($name)) {
                 if ($throwOnAbstract && $definition->isAbstract()) {
@@ -1325,7 +1325,7 @@ public function findTaggedServiceIds($name, $throwOnAbstract = false)
      */
     public function findTags()
     {
-        $tags = array();
+        $tags = [];
         foreach ($this->getDefinitions() as $id => $definition) {
             $tags = array_merge(array_keys($definition->getTags()), $tags);
         }
@@ -1405,7 +1405,7 @@ public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs
         }
 
         if (\is_array($value)) {
-            $result = array();
+            $result = [];
             foreach ($value as $k => $v) {
                 $result[\is_string($k) ? $this->resolveEnvPlaceholders($k, $format, $usedEnvs) : $k] = $this->resolveEnvPlaceholders($v, $format, $usedEnvs);
             }
@@ -1515,7 +1515,7 @@ public function normalizeId($id)
      */
     public static function getServiceConditionals($value)
     {
-        $services = array();
+        $services = [];
 
         if (\is_array($value)) {
             foreach ($value as $v) {
@@ -1539,7 +1539,7 @@ public static function getServiceConditionals($value)
      */
     public static function getInitializedConditionals($value)
     {
-        $services = array();
+        $services = [];
 
         if (\is_array($value)) {
             foreach ($value as $v) {
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
index 849d617a1860b..4ef0a102c14b5 100644
--- a/src/Symfony/Component/DependencyInjection/Definition.php
+++ b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -28,12 +28,12 @@ class Definition
     private $shared = true;
     private $deprecated = false;
     private $deprecationTemplate;
-    private $properties = array();
-    private $calls = array();
-    private $instanceof = array();
+    private $properties = [];
+    private $calls = [];
+    private $instanceof = [];
     private $autoconfigured = false;
     private $configurator;
-    private $tags = array();
+    private $tags = [];
     private $public = true;
     private $private = true;
     private $synthetic = false;
@@ -54,7 +54,7 @@ class Definition
      * @param string|null $class     The service class
      * @param array       $arguments An array of arguments to pass to the service constructor
      */
-    public function __construct($class = null, array $arguments = array())
+    public function __construct($class = null, array $arguments = [])
     {
         if (null !== $class) {
             $this->setClass($class);
@@ -138,7 +138,7 @@ public function setDecoratedService($id, $renamedId = null, $priority = 0)
         if (null === $id) {
             $this->decoratedService = null;
         } else {
-            $this->decoratedService = array($id, $renamedId, (int) $priority);
+            $this->decoratedService = [$id, $renamedId, (int) $priority];
         }
 
         return $this;
@@ -320,9 +320,9 @@ public function getArgument($index)
      *
      * @return $this
      */
-    public function setMethodCalls(array $calls = array())
+    public function setMethodCalls(array $calls = [])
     {
-        $this->calls = array();
+        $this->calls = [];
         foreach ($calls as $call) {
             $this->addMethodCall($call[0], $call[1]);
         }
@@ -340,12 +340,12 @@ public function setMethodCalls(array $calls = array())
      *
      * @throws InvalidArgumentException on empty $method param
      */
-    public function addMethodCall($method, array $arguments = array())
+    public function addMethodCall($method, array $arguments = [])
     {
         if (empty($method)) {
             throw new InvalidArgumentException('Method name cannot be empty.');
         }
-        $this->calls[] = array($method, $arguments);
+        $this->calls[] = [$method, $arguments];
 
         return $this;
     }
@@ -476,7 +476,7 @@ public function getTags()
      */
     public function getTag($name)
     {
-        return isset($this->tags[$name]) ? $this->tags[$name] : array();
+        return isset($this->tags[$name]) ? $this->tags[$name] : [];
     }
 
     /**
@@ -487,7 +487,7 @@ public function getTag($name)
      *
      * @return $this
      */
-    public function addTag($name, array $attributes = array())
+    public function addTag($name, array $attributes = [])
     {
         $this->tags[$name][] = $attributes;
 
@@ -527,7 +527,7 @@ public function clearTag($name)
      */
     public function clearTags()
     {
-        $this->tags = array();
+        $this->tags = [];
 
         return $this;
     }
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/DumperInterface.php b/src/Symfony/Component/DependencyInjection/Dumper/DumperInterface.php
index dd001e4ed080c..1ea775ddfe032 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/DumperInterface.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/DumperInterface.php
@@ -25,5 +25,5 @@ interface DumperInterface
      *
      * @return string The representation of the service container
      */
-    public function dump(array $options = array());
+    public function dump(array $options = []);
 }
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
index 2105d1d40f2ec..3adcef79b195e 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
@@ -32,14 +32,14 @@ class GraphvizDumper extends Dumper
 {
     private $nodes;
     private $edges;
-    private $options = array(
-            'graph' => array('ratio' => 'compress'),
-            'node' => array('fontsize' => 11, 'fontname' => 'Arial', 'shape' => 'record'),
-            'edge' => array('fontsize' => 9, 'fontname' => 'Arial', 'color' => 'grey', 'arrowhead' => 'open', 'arrowsize' => 0.5),
-            'node.instance' => array('fillcolor' => '#9999ff', 'style' => 'filled'),
-            'node.definition' => array('fillcolor' => '#eeeeee'),
-            'node.missing' => array('fillcolor' => '#ff9999', 'style' => 'filled'),
-        );
+    private $options = [
+            'graph' => ['ratio' => 'compress'],
+            'node' => ['fontsize' => 11, 'fontname' => 'Arial', 'shape' => 'record'],
+            'edge' => ['fontsize' => 9, 'fontname' => 'Arial', 'color' => 'grey', 'arrowhead' => 'open', 'arrowsize' => 0.5],
+            'node.instance' => ['fillcolor' => '#9999ff', 'style' => 'filled'],
+            'node.definition' => ['fillcolor' => '#eeeeee'],
+            'node.missing' => ['fillcolor' => '#ff9999', 'style' => 'filled'],
+        ];
 
     /**
      * Dumps the service container as a graphviz graph.
@@ -55,9 +55,9 @@ class GraphvizDumper extends Dumper
      *
      * @return string The dot representation of the service container
      */
-    public function dump(array $options = array())
+    public function dump(array $options = [])
     {
-        foreach (array('graph', 'node', 'edge', 'node.instance', 'node.definition', 'node.missing') as $key) {
+        foreach (['graph', 'node', 'edge', 'node.instance', 'node.definition', 'node.missing'] as $key) {
             if (isset($options[$key])) {
                 $this->options[$key] = array_merge($this->options[$key], $options[$key]);
             }
@@ -65,7 +65,7 @@ public function dump(array $options = array())
 
         $this->nodes = $this->findNodes();
 
-        $this->edges = array();
+        $this->edges = [];
         foreach ($this->container->getDefinitions() as $id => $definition) {
             $this->edges[$id] = array_merge(
                 $this->findEdges($id, $definition->getArguments(), true, ''),
@@ -129,7 +129,7 @@ private function addEdges()
      */
     private function findEdges($id, array $arguments, $required, $name, $lazy = false)
     {
-        $edges = array();
+        $edges = [];
         foreach ($arguments as $argument) {
             if ($argument instanceof Parameter) {
                 $argument = $this->container->hasParameter($argument) ? $this->container->getParameter($argument) : null;
@@ -141,12 +141,12 @@ private function findEdges($id, array $arguments, $required, $name, $lazy = fals
                 $lazyEdge = $lazy;
 
                 if (!$this->container->has((string) $argument)) {
-                    $this->nodes[(string) $argument] = array('name' => $name, 'required' => $required, 'class' => '', 'attributes' => $this->options['node.missing']);
+                    $this->nodes[(string) $argument] = ['name' => $name, 'required' => $required, 'class' => '', 'attributes' => $this->options['node.missing']];
                 } elseif ('service_container' !== (string) $argument) {
                     $lazyEdge = $lazy || $this->container->getDefinition((string) $argument)->isLazy();
                 }
 
-                $edges[] = array('name' => $name, 'required' => $required, 'to' => $argument, 'lazy' => $lazyEdge);
+                $edges[] = ['name' => $name, 'required' => $required, 'to' => $argument, 'lazy' => $lazyEdge];
             } elseif ($argument instanceof ArgumentInterface) {
                 $edges = array_merge($edges, $this->findEdges($id, $argument->getValues(), $required, $name, true));
             } elseif ($argument instanceof Definition) {
@@ -172,7 +172,7 @@ private function findEdges($id, array $arguments, $required, $name, $lazy = fals
      */
     private function findNodes()
     {
-        $nodes = array();
+        $nodes = [];
 
         $container = $this->cloneContainer();
 
@@ -188,7 +188,7 @@ private function findNodes()
             } catch (ParameterNotFoundException $e) {
             }
 
-            $nodes[$id] = array('class' => str_replace('\\', '\\\\', $class), 'attributes' => array_merge($this->options['node.definition'], array('style' => $definition->isShared() ? 'filled' : 'dotted')));
+            $nodes[$id] = ['class' => str_replace('\\', '\\\\', $class), 'attributes' => array_merge($this->options['node.definition'], ['style' => $definition->isShared() ? 'filled' : 'dotted'])];
             $container->setDefinition($id, new Definition('stdClass'));
         }
 
@@ -198,7 +198,7 @@ private function findNodes()
             }
 
             if (!$container->hasDefinition($id)) {
-                $nodes[$id] = array('class' => str_replace('\\', '\\\\', \get_class($container->get($id))), 'attributes' => $this->options['node.instance']);
+                $nodes[$id] = ['class' => str_replace('\\', '\\\\', \get_class($container->get($id))), 'attributes' => $this->options['node.instance']];
             }
         }
 
@@ -253,7 +253,7 @@ private function endDot()
      */
     private function addAttributes(array $attributes)
     {
-        $code = array();
+        $code = [];
         foreach ($attributes as $k => $v) {
             $code[] = sprintf('%s="%s"', $k, $v);
         }
@@ -270,7 +270,7 @@ private function addAttributes(array $attributes)
      */
     private function addOptions(array $options)
     {
-        $code = array();
+        $code = [];
         foreach ($options as $k => $v) {
             $code[] = sprintf('%s="%s"', $k, $v);
         }
@@ -299,7 +299,7 @@ private function dotize($id)
      */
     private function getAliases($id)
     {
-        $aliases = array();
+        $aliases = [];
         foreach ($this->container->getAliases() as $alias => $origin) {
             if ($id == $origin) {
                 $aliases[] = $alias;
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 3a3c24d0445bd..e322495b71cc5 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -57,7 +57,7 @@ class PhpDumper extends Dumper
     private $variableCount;
     private $inlinedDefinitions;
     private $serviceCalls;
-    private $reservedVariables = array('instance', 'class', 'this');
+    private $reservedVariables = ['instance', 'class', 'this'];
     private $expressionLanguage;
     private $targetDirRegex;
     private $targetDirMaxMatches;
@@ -302,7 +302,7 @@ private function getProxyDumper()
         return $this->proxyDumper;
     }
 
-    private function analyzeCircularReferences($sourceId, array $edges, &$checkedNodes, &$currentPath = array())
+    private function analyzeCircularReferences($sourceId, array $edges, &$checkedNodes, &$currentPath = [])
     {
         $checkedNodes[$sourceId] = true;
         $currentPath[$sourceId] = $sourceId;
@@ -331,7 +331,7 @@ private function analyzeCircularReferences($sourceId, array $edges, &$checkedNod
         unset($currentPath[$sourceId]);
     }
 
-    private function connectCircularReferences($sourceId, &$currentPath, &$subPath = array())
+    private function connectCircularReferences($sourceId, &$currentPath, &$subPath = [])
     {
         $subPath[$sourceId] = $sourceId;
         $currentPath[$sourceId] = $sourceId;
@@ -387,7 +387,7 @@ private function collectLineage($class, array &$lineage)
 
     private function generateProxyClasses()
     {
-        $alreadyGenerated = array();
+        $alreadyGenerated = [];
         $definitions = $this->container->getDefinitions();
         $strip = '' === $this->docStar && method_exists('Symfony\Component\HttpKernel\Kernel', 'stripComments');
         $proxyDumper = $this->getProxyDumper();
@@ -629,7 +629,7 @@ private function addService($id, Definition $definition, &$file = null)
         $this->variableCount = 0;
         $this->referenceVariables[$id] = new Variable('instance');
 
-        $return = array();
+        $return = [];
 
         if ($class = $definition->getClass()) {
             $class = $class instanceof Parameter ? '%'.$class.'%' : $this->container->resolveEnvPlaceholders($class);
@@ -686,7 +686,7 @@ protected function {$methodName}($lazyInitialization)
         }
 
         $this->serviceCalls = array();
-        $this->inlinedDefinitions = $this->getDefinitionsFromArguments(array($definition), null, $this->serviceCalls);
+        $this->inlinedDefinitions = $this->getDefinitionsFromArguments([$definition], null, $this->serviceCalls);
 
         $code .= $this->addServiceInclude($id, $definition);
 
@@ -791,7 +791,7 @@ private function addInlineService($id, Definition $definition, Definition $inlin
 
         $code = $this->addInlineVariables($id, $definition, $arguments, $forConstructor);
 
-        if ($arguments = array_filter(array($inlineDef->getProperties(), $inlineDef->getMethodCalls(), $inlineDef->getConfigurator()))) {
+        if ($arguments = array_filter([$inlineDef->getProperties(), $inlineDef->getMethodCalls(), $inlineDef->getConfigurator()])) {
             $isSimpleInstance = false;
         } elseif ($definition !== $inlineDef && 2 > $this->inlinedDefinitions[$inlineDef]) {
             return $code;
@@ -1251,7 +1251,7 @@ private function addInlineRequires()
 
         foreach ($this->container->findTaggedServiceIds($this->hotPathTag) as $id => $tags) {
             $definition = $this->container->getDefinition($id);
-            $inlinedDefinitions = $this->getDefinitionsFromArguments(array($definition));
+            $inlinedDefinitions = $this->getDefinitionsFromArguments([$definition]);
 
             foreach ($inlinedDefinitions as $def) {
                 if (\is_string($class = \is_array($factory = $def->getFactory()) && \is_string($factory[0]) ? $factory[0] : $def->getClass())) {
@@ -1570,7 +1570,7 @@ private function getDefinitionsFromArguments(array $arguments, \SplObjectStorage
                 $definitions[$argument] = 1 + $definitions[$argument];
             } else {
                 $definitions[$argument] = 1;
-                $arguments = array($argument->getArguments(), $argument->getFactory(), $argument->getProperties(), $argument->getMethodCalls(), $argument->getConfigurator());
+                $arguments = [$argument->getArguments(), $argument->getFactory(), $argument->getProperties(), $argument->getMethodCalls(), $argument->getConfigurator()];
                 $this->getDefinitionsFromArguments($arguments, $definitions, $calls);
             }
         }
@@ -1601,7 +1601,7 @@ private function dumpValue($value, $interpolate = true)
 
             return sprintf('array(%s)', implode(', ', $code));
         } elseif ($value instanceof ArgumentInterface) {
-            $scope = array($this->definitionVariables, $this->referenceVariables);
+            $scope = [$this->definitionVariables, $this->referenceVariables];
             $this->definitionVariables = $this->referenceVariables = null;
 
             try {
@@ -1619,14 +1619,14 @@ private function dumpValue($value, $interpolate = true)
                 }
 
                 if ($value instanceof IteratorArgument) {
-                    $operands = array(0);
-                    $code = array();
+                    $operands = [0];
+                    $code = [];
                     $code[] = 'new RewindableGenerator(function () {';
 
                     if (!$values = $value->getValues()) {
                         $code[] = '            return new \EmptyIterator();';
                     } else {
-                        $countCode = array();
+                        $countCode = [];
                         $countCode[] = 'function () {';
 
                         foreach ($values as $k => $v) {
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
index 1dcef12dabd39..36e3e121d23bc 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
@@ -40,7 +40,7 @@ class XmlDumper extends Dumper
      *
      * @return string An xml string representing of the service container
      */
-    public function dump(array $options = array())
+    public function dump(array $options = [])
     {
         $this->document = new \DOMDocument('1.0', 'utf-8');
         $this->document->formatOutput = true;
@@ -306,7 +306,7 @@ private function convertParameters(array $parameters, $type, \DOMElement $parent
                 $text = $this->document->createTextNode(self::phpToXml((string) $value));
                 $element->appendChild($text);
             } else {
-                if (\in_array($value, array('null', 'true', 'false'), true)) {
+                if (\in_array($value, ['null', 'true', 'false'], true)) {
                     $element->setAttribute('type', 'string');
                 }
                 $text = $this->document->createTextNode(self::phpToXml($value));
@@ -323,7 +323,7 @@ private function convertParameters(array $parameters, $type, \DOMElement $parent
      */
     private function escape(array $arguments)
     {
-        $args = array();
+        $args = [];
         foreach ($arguments as $k => $v) {
             if (\is_array($v)) {
                 $args[$k] = $this->escape($v);
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
index 35441023de5b5..8f3fcddf3079e 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -41,7 +41,7 @@ class YamlDumper extends Dumper
      *
      * @return string A YAML string representing of the service container
      */
-    public function dump(array $options = array())
+    public function dump(array $options = [])
     {
         if (!class_exists('Symfony\Component\Yaml\Dumper')) {
             throw new RuntimeException('Unable to dump the container as the Symfony Yaml Component is not installed.');
@@ -80,7 +80,7 @@ private function addService($id, Definition $definition)
         $tagsCode = '';
         foreach ($definition->getTags() as $name => $tags) {
             foreach ($tags as $attributes) {
-                $att = array();
+                $att = [];
                 foreach ($attributes as $key => $value) {
                     $att[] = sprintf('%s: %s', $this->dumper->dump($key), $this->dumper->dump($value));
                 }
@@ -224,7 +224,7 @@ private function addParameters()
 
         $parameters = $this->prepareParameters($this->container->getParameterBag()->all(), $this->container->isCompiled());
 
-        return $this->dumper->dump(array('parameters' => $parameters), 2);
+        return $this->dumper->dump(['parameters' => $parameters], 2);
     }
 
     /**
@@ -238,9 +238,9 @@ private function dumpCallable($callable)
     {
         if (\is_array($callable)) {
             if ($callable[0] instanceof Reference) {
-                $callable = array($this->getServiceCall((string) $callable[0], $callable[0]), $callable[1]);
+                $callable = [$this->getServiceCall((string) $callable[0], $callable[0]), $callable[1]];
             } else {
-                $callable = array($callable[0], $callable[1]);
+                $callable = [$callable[0], $callable[1]];
             }
         }
 
@@ -275,7 +275,7 @@ private function dumpValue($value)
         }
 
         if (\is_array($value)) {
-            $code = array();
+            $code = [];
             foreach ($value as $k => $v) {
                 $code[$k] = $this->dumpValue($v);
             }
@@ -344,7 +344,7 @@ private function getExpressionCall($expression)
      */
     private function prepareParameters(array $parameters, $escape = true)
     {
-        $filtered = array();
+        $filtered = [];
         foreach ($parameters as $key => $value) {
             if (\is_array($value)) {
                 $value = $this->prepareParameters($value, $escape);
@@ -365,7 +365,7 @@ private function prepareParameters(array $parameters, $escape = true)
      */
     private function escape(array $arguments)
     {
-        $args = array();
+        $args = [];
         foreach ($arguments as $k => $v) {
             if (\is_array($v)) {
                 $args[$k] = $this->escape($v);
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
index 13568079bb680..a23b83436bbe5 100644
--- a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
+++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -32,7 +32,7 @@ public function __construct(ContainerInterface $container)
      */
     public static function getProvidedTypes()
     {
-        return array(
+        return [
             'base64' => 'string',
             'bool' => 'bool',
             'const' => 'bool|int|float|string|array',
@@ -42,7 +42,7 @@ public static function getProvidedTypes()
             'json' => 'array',
             'resolve' => 'string',
             'string' => 'string',
-        );
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php b/src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php
index e2084aa85da6d..9198ca0a40a9a 100644
--- a/src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php
+++ b/src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php
@@ -33,7 +33,7 @@ public function __construct(callable $serviceCompiler = null)
 
     public function getFunctions()
     {
-        return array(
+        return [
             new ExpressionFunction('service', $this->serviceCompiler ?: function ($arg) {
                 return sprintf('$this->get(%s)', $arg);
             }, function (array $variables, $value) {
@@ -45,6 +45,6 @@ public function getFunctions()
             }, function (array $variables, $value) {
                 return $variables['container']->getParameter($value);
             }),
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Extension/Extension.php b/src/Symfony/Component/DependencyInjection/Extension/Extension.php
index 1bafdbebd08d0..80a9419c5d3f3 100644
--- a/src/Symfony/Component/DependencyInjection/Extension/Extension.php
+++ b/src/Symfony/Component/DependencyInjection/Extension/Extension.php
@@ -25,7 +25,7 @@
  */
 abstract class Extension implements ExtensionInterface, ConfigurationExtensionInterface
 {
-    private $processedConfigs = array();
+    private $processedConfigs = [];
 
     /**
      * {@inheritdoc}
@@ -104,7 +104,7 @@ final public function getProcessedConfigs()
         try {
             return $this->processedConfigs;
         } finally {
-            $this->processedConfigs = array();
+            $this->processedConfigs = [];
         }
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractServiceConfigurator.php
index 40b6c2f389723..42b5776c05d20 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractServiceConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractServiceConfigurator.php
@@ -36,7 +36,7 @@ public function __destruct()
                 $this->definition->addTag($name, $attributes);
             }
         }
-        $this->defaultTags = array();
+        $this->defaultTags = [];
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php
index 76e7829e8fe99..d80c8b13389f2 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php
@@ -49,7 +49,7 @@ public function __construct(ServicesConfigurator $parent, PhpFileLoader $loader,
         $definition->setAutowired($defaults->isAutowired());
         $definition->setAutoconfigured($defaults->isAutoconfigured());
         $definition->setBindings($defaults->getBindings());
-        $definition->setChanges(array());
+        $definition->setChanges([]);
 
         $this->loader = $loader;
         $this->resource = $resource;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php
index c9673b6c7a730..424005fca7152 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php
@@ -83,7 +83,7 @@ final public function set($id, $class = null)
         $definition->setAutowired($defaults->isAutowired());
         $definition->setAutoconfigured($defaults->isAutoconfigured());
         $definition->setBindings($defaults->getBindings());
-        $definition->setChanges(array());
+        $definition->setChanges([]);
 
         $configurator = new ServiceConfigurator($this->container, $this->instanceof, $allowParent, $this, $definition, $id, $defaults->getTags());
 
@@ -136,7 +136,7 @@ final public function get($id)
         $allowParent = !$this->defaults->getChanges() && empty($this->instanceof);
         $definition = $this->container->getDefinition($id);
 
-        return new ServiceConfigurator($this->container, $definition->getInstanceofConditionals(), $allowParent, $this, $definition, $id, array());
+        return new ServiceConfigurator($this->container, $definition->getInstanceofConditionals(), $allowParent, $this, $definition, $id, []);
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/CallTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/CallTrait.php
index abc14e2155591..8e6b17a19d289 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/CallTrait.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/CallTrait.php
@@ -25,7 +25,7 @@ trait CallTrait
      *
      * @throws InvalidArgumentException on empty $method param
      */
-    final public function call($method, array $arguments = array())
+    final public function call($method, array $arguments = [])
     {
         $this->definition->addMethodCall($method, static::processValue($arguments, true));
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/TagTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/TagTrait.php
index c165b6503e797..d17339f88b692 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/TagTrait.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/TagTrait.php
@@ -23,7 +23,7 @@ trait TagTrait
      *
      * @return $this
      */
-    final public function tag($name, array $attributes = array())
+    final public function tag($name, array $attributes = [])
     {
         if (!\is_string($name) || '' === $name) {
             throw new InvalidArgumentException(sprintf('The tag name for service "%s" must be a non-empty string.', $this->id));
diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
index d5e2327ed046c..88354a48e9474 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -28,7 +28,7 @@ abstract class FileLoader extends BaseFileLoader
 {
     protected $container;
     protected $isLoadingInstanceof = false;
-    protected $instanceof = array();
+    protected $instanceof = [];
 
     public function __construct(ContainerBuilder $container, FileLocatorInterface $locator)
     {
@@ -57,8 +57,8 @@ public function registerClasses(Definition $prototype, $namespace, $resource, $e
         $classes = $this->findClasses($namespace, $resource, $exclude);
         // prepare for deep cloning
         $serializedPrototype = serialize($prototype);
-        $interfaces = array();
-        $singlyImplemented = array();
+        $interfaces = [];
+        $singlyImplemented = [];
 
         foreach ($classes as $class => $errorMessage) {
             if (interface_exists($class, false)) {
@@ -105,7 +105,7 @@ private function findClasses($namespace, $pattern, $excludePattern)
     {
         $parameterBag = $this->container->getParameterBag();
 
-        $excludePaths = array();
+        $excludePaths = [];
         $excludePrefix = null;
         if ($excludePattern) {
             $excludePattern = $parameterBag->unescapeValue($parameterBag->resolveValue($excludePattern));
diff --git a/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
index 2ee9ea8ffce56..307a3eefbbe56 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
@@ -32,7 +32,7 @@ public function load($resource, $type = null)
 
         // first pass to catch parsing errors
         $result = parse_ini_file($path, true);
-        if (false === $result || array() === $result) {
+        if (false === $result || [] === $result) {
             throw new InvalidArgumentException(sprintf('The "%s" file is not valid.', $resource));
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index 4236b72f252a6..24b471a5ed9d9 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -63,7 +63,7 @@ public function load($resource, $type = null)
         try {
             $this->parseDefinitions($xml, $path, $defaults);
         } finally {
-            $this->instanceof = array();
+            $this->instanceof = [];
         }
     }
 
@@ -134,11 +134,11 @@ private function parseDefinitions(\DOMDocument $xml, $file, $defaults)
         }
         $this->setCurrentDir(\dirname($file));
 
-        $this->instanceof = array();
+        $this->instanceof = [];
         $this->isLoadingInstanceof = true;
         $instanceof = $xpath->query('//container:services/container:instanceof');
         foreach ($instanceof as $service) {
-            $this->setDefinition((string) $service->getAttribute('id'), $this->parseDefinition($service, $file, array()));
+            $this->setDefinition((string) $service->getAttribute('id'), $this->parseDefinition($service, $file, []));
         }
 
         $this->isLoadingInstanceof = false;
@@ -164,12 +164,12 @@ private function getServiceDefaults(\DOMDocument $xml, $file)
         $xpath->registerNamespace('container', self::NS);
 
         if (null === $defaultsNode = $xpath->query('//container:services/container:defaults')->item(0)) {
-            return array();
+            return [];
         }
-        $defaults = array(
+        $defaults = [
             'tags' => $this->getChildren($defaultsNode, 'tag'),
             'bind' => array_map(function ($v) { return new BoundArgument($v); }, $this->getArgumentsAsPhp($defaultsNode, 'bind', $file)),
-        );
+        ];
 
         foreach ($defaults['tags'] as $tag) {
             if ('' === $tag->getAttribute('name')) {
@@ -297,7 +297,7 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults)
                     $class = $factory->hasAttribute('class') ? $factory->getAttribute('class') : null;
                 }
 
-                $definition->setFactory(array($class, $factory->getAttribute('method')));
+                $definition->setFactory([$class, $factory->getAttribute('method')]);
             }
         }
 
@@ -312,7 +312,7 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults)
                     $class = $configurator->getAttribute('class');
                 }
 
-                $definition->setConfigurator(array($class, $configurator->getAttribute('method')));
+                $definition->setConfigurator([$class, $configurator->getAttribute('method')]);
             }
         }
 
@@ -327,7 +327,7 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults)
         }
 
         foreach ($tags as $tag) {
-            $parameters = array();
+            $parameters = [];
             foreach ($tag->attributes as $name => $node) {
                 if ('name' === $name) {
                     continue;
@@ -381,7 +381,7 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults)
     private function parseFileToDOM($file)
     {
         try {
-            $dom = XmlUtils::loadFile($file, array($this, 'validateSchema'));
+            $dom = XmlUtils::loadFile($file, [$this, 'validateSchema']);
         } catch (\InvalidArgumentException $e) {
             throw new InvalidArgumentException(sprintf('Unable to parse file "%s".', $file), $e->getCode(), $e);
         }
@@ -400,7 +400,7 @@ private function parseFileToDOM($file)
      */
     private function processAnonymousServices(\DOMDocument $xml, $file, $defaults)
     {
-        $definitions = array();
+        $definitions = [];
         $count = 0;
         $suffix = '~'.ContainerBuilder::hash($file);
 
@@ -465,7 +465,7 @@ private function processAnonymousServices(\DOMDocument $xml, $file, $defaults)
      */
     private function getArgumentsAsPhp(\DOMElement $node, $name, $file, $lowercase = true, $isChildDefinition = false)
     {
-        $arguments = array();
+        $arguments = [];
         foreach ($this->getChildren($node, $name) as $arg) {
             if ($arg->hasAttribute('name')) {
                 $arg->setAttribute('key', $arg->getAttribute('name'));
@@ -553,7 +553,7 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $file, $lowercase =
      */
     private function getChildren(\DOMNode $node, $name)
     {
-        $children = array();
+        $children = [];
         foreach ($node->childNodes as $child) {
             if ($child instanceof \DOMElement && $child->localName === $name && self::NS === $child->namespaceURI) {
                 $children[] = $child;
@@ -574,7 +574,7 @@ private function getChildren(\DOMNode $node, $name)
      */
     public function validateSchema(\DOMDocument $dom)
     {
-        $schemaLocations = array('http://symfony.com/schema/dic/services' => str_replace('\\', '/', __DIR__.'/schema/dic/services/services-1.0.xsd'));
+        $schemaLocations = ['http://symfony.com/schema/dic/services' => str_replace('\\', '/', __DIR__.'/schema/dic/services/services-1.0.xsd')];
 
         if ($element = $dom->documentElement->getAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'schemaLocation')) {
             $items = preg_split('/\s+/', $element);
@@ -595,7 +595,7 @@ public function validateSchema(\DOMDocument $dom)
             }
         }
 
-        $tmpfiles = array();
+        $tmpfiles = [];
         $imports = '';
         foreach ($schemaLocations as $namespace => $location) {
             $parts = explode('/', $location);
@@ -699,7 +699,7 @@ private function loadFromExtensions(\DOMDocument $xml)
 
             $values = static::convertDomElementToArray($node);
             if (!\is_array($values)) {
-                $values = array();
+                $values = [];
             }
 
             $this->container->loadFromExtension($node->namespaceURI, $values);
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index 48cfde60dd49d..331050aad0d26 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -36,7 +36,7 @@
  */
 class YamlFileLoader extends FileLoader
 {
-    private static $serviceKeywords = array(
+    private static $serviceKeywords = [
         'alias' => 'alias',
         'parent' => 'parent',
         'class' => 'class',
@@ -60,9 +60,9 @@ class YamlFileLoader extends FileLoader
         'autowiring_types' => 'autowiring_types',
         'autoconfigure' => 'autoconfigure',
         'bind' => 'bind',
-    );
+    ];
 
-    private static $prototypeKeywords = array(
+    private static $prototypeKeywords = [
         'resource' => 'resource',
         'namespace' => 'namespace',
         'exclude' => 'exclude',
@@ -81,7 +81,7 @@ class YamlFileLoader extends FileLoader
         'autowire' => 'autowire',
         'autoconfigure' => 'autoconfigure',
         'bind' => 'bind',
-    );
+    ];
 
     private static $instanceofKeywords = array(
         'shared' => 'shared',
@@ -147,7 +147,7 @@ public function load($resource, $type = null)
         try {
             $this->parseDefinitions($content, $path);
         } finally {
-            $this->instanceof = array();
+            $this->instanceof = [];
         }
     }
 
@@ -160,11 +160,11 @@ public function supports($resource, $type = null)
             return false;
         }
 
-        if (null === $type && \in_array(pathinfo($resource, PATHINFO_EXTENSION), array('yaml', 'yml'), true)) {
+        if (null === $type && \in_array(pathinfo($resource, PATHINFO_EXTENSION), ['yaml', 'yml'], true)) {
             return true;
         }
 
-        return \in_array($type, array('yaml', 'yml'), true);
+        return \in_array($type, ['yaml', 'yml'], true);
     }
 
     /**
@@ -186,7 +186,7 @@ private function parseImports(array $content, $file)
         $defaultDirectory = \dirname($file);
         foreach ($content['imports'] as $import) {
             if (!\is_array($import)) {
-                $import = array('resource' => $import);
+                $import = ['resource' => $import];
             }
             if (!isset($import['resource'])) {
                 throw new InvalidArgumentException(sprintf('An import should provide a resource in %s. Check your YAML syntax.', $file));
@@ -220,7 +220,7 @@ private function parseDefinitions(array $content, $file)
             if (!\is_array($instanceof)) {
                 throw new InvalidArgumentException(sprintf('Service "_instanceof" key must be an array, "%s" given in "%s".', \gettype($instanceof), $file));
             }
-            $this->instanceof = array();
+            $this->instanceof = [];
             $this->isLoadingInstanceof = true;
             foreach ($instanceof as $id => $service) {
                 if (!$service || !\is_array($service)) {
@@ -229,7 +229,7 @@ private function parseDefinitions(array $content, $file)
                 if (\is_string($service) && 0 === strpos($service, '@')) {
                     throw new InvalidArgumentException(sprintf('Type definition "%s" cannot be an alias within "_instanceof" in %s. Check your YAML syntax.', $id, $file));
                 }
-                $this->parseDefinition($id, $service, $file, array());
+                $this->parseDefinition($id, $service, $file, []);
             }
         }
 
@@ -251,7 +251,7 @@ private function parseDefinitions(array $content, $file)
     private function parseDefaults(array &$content, $file)
     {
         if (!array_key_exists('_defaults', $content['services'])) {
-            return array();
+            return [];
         }
         $defaults = $content['services']['_defaults'];
         unset($content['services']['_defaults']);
@@ -273,7 +273,7 @@ private function parseDefaults(array &$content, $file)
 
             foreach ($tags as $tag) {
                 if (!\is_array($tag)) {
-                    $tag = array('name' => $tag);
+                    $tag = ['name' => $tag];
                 }
 
                 if (!isset($tag['name'])) {
@@ -346,11 +346,11 @@ private function parseDefinition($id, $service, $file, array $defaults)
         }
 
         if (\is_array($service) && $this->isUsingShortSyntax($service)) {
-            $service = array('arguments' => $service);
+            $service = ['arguments' => $service];
         }
 
         if (null === $service) {
-            $service = array();
+            $service = [];
         }
 
         if (!\is_array($service)) {
@@ -411,7 +411,7 @@ private function parseDefinition($id, $service, $file, array $defaults)
                 $definition->setAutoconfigured($defaults['autoconfigure']);
             }
 
-            $definition->setChanges(array());
+            $definition->setChanges([]);
         }
 
         if (isset($service['class'])) {
@@ -470,10 +470,10 @@ private function parseDefinition($id, $service, $file, array $defaults)
             foreach ($service['calls'] as $call) {
                 if (isset($call['method'])) {
                     $method = $call['method'];
-                    $args = isset($call['arguments']) ? $this->resolveServices($call['arguments'], $file) : array();
+                    $args = isset($call['arguments']) ? $this->resolveServices($call['arguments'], $file) : [];
                 } else {
                     $method = $call[0];
-                    $args = isset($call[1]) ? $this->resolveServices($call[1], $file) : array();
+                    $args = isset($call[1]) ? $this->resolveServices($call[1], $file) : [];
                 }
 
                 if (!\is_array($args)) {
@@ -483,7 +483,7 @@ private function parseDefinition($id, $service, $file, array $defaults)
             }
         }
 
-        $tags = isset($service['tags']) ? $service['tags'] : array();
+        $tags = isset($service['tags']) ? $service['tags'] : [];
         if (!\is_array($tags)) {
             throw new InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
         }
@@ -494,7 +494,7 @@ private function parseDefinition($id, $service, $file, array $defaults)
 
         foreach ($tags as $tag) {
             if (!\is_array($tag)) {
-                $tag = array('name' => $tag);
+                $tag = ['name' => $tag];
             }
 
             if (!isset($tag['name'])) {
@@ -550,7 +550,7 @@ private function parseDefinition($id, $service, $file, array $defaults)
 
         if (isset($defaults['bind']) || isset($service['bind'])) {
             // deep clone, to avoid multiple process of the same instance in the passes
-            $bindings = isset($defaults['bind']) ? unserialize(serialize($defaults['bind'])) : array();
+            $bindings = isset($defaults['bind']) ? unserialize(serialize($defaults['bind'])) : [];
 
             if (isset($service['bind'])) {
                 if (!\is_array($service['bind'])) {
@@ -609,7 +609,7 @@ private function parseCallable($callable, $parameter, $id, $file)
             if (false !== strpos($callable, ':') && false === strpos($callable, '::')) {
                 $parts = explode(':', $callable);
 
-                return array($this->resolveServices('@'.$parts[0], $file), $parts[1]);
+                return [$this->resolveServices('@'.$parts[0], $file), $parts[1]];
             }
 
             return $callable;
@@ -617,7 +617,7 @@ private function parseCallable($callable, $parameter, $id, $file)
 
         if (\is_array($callable)) {
             if (isset($callable[0]) && isset($callable[1])) {
-                return array($this->resolveServices($callable[0], $file), $callable[1]);
+                return [$this->resolveServices($callable[0], $file), $callable[1]];
             }
 
             if ('factory' === $parameter && isset($callable[1]) && null === $callable[0]) {
@@ -695,7 +695,7 @@ private function validate($content, $file)
         }
 
         foreach ($content as $namespace => $data) {
-            if (\in_array($namespace, array('imports', 'parameters', 'services'))) {
+            if (\in_array($namespace, ['imports', 'parameters', 'services'])) {
                 continue;
             }
 
@@ -811,12 +811,12 @@ private function resolveServices($value, $file, $isParameter = false)
     private function loadFromExtensions(array $content)
     {
         foreach ($content as $namespace => $values) {
-            if (\in_array($namespace, array('imports', 'parameters', 'services'))) {
+            if (\in_array($namespace, ['imports', 'parameters', 'services'])) {
                 continue;
             }
 
             if (!\is_array($values) && null !== $values) {
-                $values = array();
+                $values = [];
             }
 
             $this->container->loadFromExtension($namespace, $values);
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
index ad65ad960f527..a5199937e233f 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
@@ -28,7 +28,7 @@ class FrozenParameterBag extends ParameterBag
      *
      * @param array $parameters An array of parameters
      */
-    public function __construct(array $parameters = array())
+    public function __construct(array $parameters = [])
     {
         $this->parameters = $parameters;
         $this->resolved = true;
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
index e06fd344c05a0..185273a943d74 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
@@ -40,7 +40,7 @@ public function __construct(array $parameters = array())
      */
     public function clear()
     {
-        $this->parameters = array();
+        $this->parameters = [];
     }
 
     /**
@@ -75,7 +75,7 @@ public function get($name)
                 throw new ParameterNotFoundException($name);
             }
 
-            $alternatives = array();
+            $alternatives = [];
             foreach ($this->parameters as $key => $parameterValue) {
                 $lev = levenshtein($name, $key);
                 if ($lev <= \strlen($name) / 3 || false !== strpos($key, $name)) {
@@ -143,7 +143,7 @@ public function resolve()
             return;
         }
 
-        $parameters = array();
+        $parameters = [];
         foreach ($this->parameters as $key => $value) {
             try {
                 $value = $this->resolveValue($value);
@@ -171,10 +171,10 @@ public function resolve()
      * @throws ParameterCircularReferenceException if a circular reference if detected
      * @throws RuntimeException                    when a given parameter has a type problem
      */
-    public function resolveValue($value, array $resolving = array())
+    public function resolveValue($value, array $resolving = [])
     {
         if (\is_array($value)) {
-            $args = array();
+            $args = [];
             foreach ($value as $k => $v) {
                 $args[\is_string($k) ? $this->resolveValue($k, $resolving) : $k] = $this->resolveValue($v, $resolving);
             }
@@ -201,7 +201,7 @@ public function resolveValue($value, array $resolving = array())
      * @throws ParameterCircularReferenceException if a circular reference if detected
      * @throws RuntimeException                    when a given parameter has a type problem
      */
-    public function resolveString($value, array $resolving = array())
+    public function resolveString($value, array $resolving = [])
     {
         // we do this to deal with non string values (Boolean, integer, ...)
         // as the preg_replace_callback throw an exception when trying
@@ -259,7 +259,7 @@ public function escapeValue($value)
         }
 
         if (\is_array($value)) {
-            $result = array();
+            $result = [];
             foreach ($value as $k => $v) {
                 $result[$k] = $this->escapeValue($v);
             }
@@ -280,7 +280,7 @@ public function unescapeValue($value)
         }
 
         if (\is_array($value)) {
-            $result = array();
+            $result = [];
             foreach ($value as $k => $v) {
                 $result[$k] = $this->unescapeValue($v);
             }
diff --git a/src/Symfony/Component/DependencyInjection/ServiceLocator.php b/src/Symfony/Component/DependencyInjection/ServiceLocator.php
index 10c7c9eb65de1..e39d10eba6bf6 100644
--- a/src/Symfony/Component/DependencyInjection/ServiceLocator.php
+++ b/src/Symfony/Component/DependencyInjection/ServiceLocator.php
@@ -94,7 +94,7 @@ private function createServiceNotFoundMessage($id)
         $class = isset($class[2]['object']) ? \get_class($class[2]['object']) : null;
         $externalId = $this->externalId ?: $class;
 
-        $msg = array();
+        $msg = [];
         $msg[] = sprintf('Service "%s" not found:', $id);
 
         if (!$this->container) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ChildDefinitionTest.php b/src/Symfony/Component/DependencyInjection/Tests/ChildDefinitionTest.php
index a941b960746be..cbae0eaaaa9ee 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ChildDefinitionTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ChildDefinitionTest.php
@@ -22,7 +22,7 @@ public function testConstructor()
         $def = new ChildDefinition('foo');
 
         $this->assertSame('foo', $def->getParent());
-        $this->assertSame(array(), $def->getChanges());
+        $this->assertSame([], $def->getChanges());
     }
 
     /**
@@ -38,17 +38,17 @@ public function testSetProperty($property, $changeKey)
         $this->assertNull($def->$getter());
         $this->assertSame($def, $def->$setter('foo'));
         $this->assertSame('foo', $def->$getter());
-        $this->assertSame(array($changeKey => true), $def->getChanges());
+        $this->assertSame([$changeKey => true], $def->getChanges());
     }
 
     public function getPropertyTests()
     {
-        return array(
-            array('class', 'class'),
-            array('factory', 'factory'),
-            array('configurator', 'configurator'),
-            array('file', 'file'),
-        );
+        return [
+            ['class', 'class'],
+            ['factory', 'factory'],
+            ['configurator', 'configurator'],
+            ['file', 'file'],
+        ];
     }
 
     public function testSetPublic()
@@ -58,7 +58,7 @@ public function testSetPublic()
         $this->assertTrue($def->isPublic());
         $this->assertSame($def, $def->setPublic(false));
         $this->assertFalse($def->isPublic());
-        $this->assertSame(array('public' => true), $def->getChanges());
+        $this->assertSame(['public' => true], $def->getChanges());
     }
 
     public function testSetLazy()
@@ -68,7 +68,7 @@ public function testSetLazy()
         $this->assertFalse($def->isLazy());
         $this->assertSame($def, $def->setLazy(false));
         $this->assertFalse($def->isLazy());
-        $this->assertSame(array('lazy' => true), $def->getChanges());
+        $this->assertSame(['lazy' => true], $def->getChanges());
     }
 
     public function testSetAutowired()
@@ -78,16 +78,16 @@ public function testSetAutowired()
         $this->assertFalse($def->isAutowired());
         $this->assertSame($def, $def->setAutowired(true));
         $this->assertTrue($def->isAutowired());
-        $this->assertSame(array('autowired' => true), $def->getChanges());
+        $this->assertSame(['autowired' => true], $def->getChanges());
     }
 
     public function testSetArgument()
     {
         $def = new ChildDefinition('foo');
 
-        $this->assertSame(array(), $def->getArguments());
+        $this->assertSame([], $def->getArguments());
         $this->assertSame($def, $def->replaceArgument(0, 'foo'));
-        $this->assertSame(array('index_0' => 'foo'), $def->getArguments());
+        $this->assertSame(['index_0' => 'foo'], $def->getArguments());
     }
 
     /**
@@ -104,7 +104,7 @@ public function testReplaceArgument()
     {
         $def = new ChildDefinition('foo');
 
-        $def->setArguments(array(0 => 'foo', 1 => 'bar'));
+        $def->setArguments([0 => 'foo', 1 => 'bar']);
         $this->assertSame('foo', $def->getArgument(0));
         $this->assertSame('bar', $def->getArgument(1));
 
@@ -112,11 +112,11 @@ public function testReplaceArgument()
         $this->assertSame('foo', $def->getArgument(0));
         $this->assertSame('baz', $def->getArgument(1));
 
-        $this->assertSame(array(0 => 'foo', 1 => 'bar', 'index_1' => 'baz'), $def->getArguments());
+        $this->assertSame([0 => 'foo', 1 => 'bar', 'index_1' => 'baz'], $def->getArguments());
 
         $this->assertSame($def, $def->replaceArgument('$bar', 'val'));
         $this->assertSame('val', $def->getArgument('$bar'));
-        $this->assertSame(array(0 => 'foo', 1 => 'bar', 'index_1' => 'baz', '$bar' => 'val'), $def->getArguments());
+        $this->assertSame([0 => 'foo', 1 => 'bar', 'index_1' => 'baz', '$bar' => 'val'], $def->getArguments());
     }
 
     /**
@@ -126,7 +126,7 @@ public function testGetArgumentShouldCheckBounds()
     {
         $def = new ChildDefinition('foo');
 
-        $def->setArguments(array(0 => 'foo'));
+        $def->setArguments([0 => 'foo']);
         $def->replaceArgument(0, 'foo');
 
         $def->getArgument(1);
@@ -152,6 +152,6 @@ public function testCannotCallSetAutoconfigured()
     public function testCannotCallSetInstanceofConditionals()
     {
         $def = new ChildDefinition('foo');
-        $def->setInstanceofConditionals(array('Foo' => new ChildDefinition('')));
+        $def->setInstanceofConditionals(['Foo' => new ChildDefinition('')]);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AnalyzeServiceReferencesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AnalyzeServiceReferencesPassTest.php
index 8d44fad8611e2..e0c5bdb6b51ee 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AnalyzeServiceReferencesPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AnalyzeServiceReferencesPassTest.php
@@ -32,7 +32,7 @@ public function testProcess()
 
         $b = $container
             ->register('b')
-            ->addMethodCall('setA', array($ref2 = new Reference('a')))
+            ->addMethodCall('setA', [$ref2 = new Reference('a')])
         ;
 
         $c = $container
@@ -48,7 +48,7 @@ public function testProcess()
 
         $e = $container
             ->register('e')
-            ->setConfigurator(array($ref6 = new Reference('b'), 'methodName'))
+            ->setConfigurator([$ref6 = new Reference('b'), 'methodName'])
         ;
 
         $graph = $this->process($container);
@@ -94,7 +94,7 @@ public function testProcessMarksEdgesLazyWhenReferencedFromIteratorArgument()
         $container
             ->register('c')
             ->addArgument($ref1 = new Reference('a'))
-            ->addArgument(new IteratorArgument(array($ref2 = new Reference('b'))))
+            ->addArgument(new IteratorArgument([$ref2 = new Reference('b')]))
         ;
 
         $graph = $this->process($container);
@@ -119,7 +119,7 @@ public function testProcessDetectsReferencesFromInlinedDefinitions()
 
         $container
             ->register('b')
-            ->addArgument(new Definition(null, array($ref = new Reference('a'))))
+            ->addArgument(new Definition(null, [$ref = new Reference('a')]))
         ;
 
         $graph = $this->process($container);
@@ -138,7 +138,7 @@ public function testProcessDetectsReferencesFromIteratorArguments()
 
         $container
             ->register('b')
-            ->addArgument(new IteratorArgument(array($ref = new Reference('a'))))
+            ->addArgument(new IteratorArgument([$ref = new Reference('a')]))
         ;
 
         $graph = $this->process($container);
@@ -156,7 +156,7 @@ public function testProcessDetectsReferencesFromInlinedFactoryDefinitions()
         ;
 
         $factory = new Definition();
-        $factory->setFactory(array(new Reference('a'), 'a'));
+        $factory->setFactory([new Reference('a'), 'a']);
 
         $container
             ->register('b')
@@ -178,8 +178,8 @@ public function testProcessDoesNotSaveDuplicateReferences()
         ;
         $container
             ->register('b')
-            ->addArgument(new Definition(null, array($ref1 = new Reference('a'))))
-            ->addArgument(new Definition(null, array($ref2 = new Reference('a'))))
+            ->addArgument(new Definition(null, [$ref1 = new Reference('a')]))
+            ->addArgument(new Definition(null, [$ref2 = new Reference('a')]))
         ;
 
         $graph = $this->process($container);
@@ -193,11 +193,11 @@ public function testProcessDetectsFactoryReferences()
 
         $container
             ->register('foo', 'stdClass')
-            ->setFactory(array('stdClass', 'getInstance'));
+            ->setFactory(['stdClass', 'getInstance']);
 
         $container
             ->register('bar', 'stdClass')
-            ->setFactory(array(new Reference('foo'), 'getInstance'));
+            ->setFactory([new Reference('foo'), 'getInstance']);
 
         $graph = $this->process($container);
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutoAliasServicePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutoAliasServicePassTest.php
index f76001a11abf7..06f9a0d0341a2 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutoAliasServicePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutoAliasServicePassTest.php
@@ -25,7 +25,7 @@ public function testProcessWithMissingParameter()
         $container = new ContainerBuilder();
 
         $container->register('example')
-            ->addTag('auto_alias', array('format' => '%non_existing%.example'));
+            ->addTag('auto_alias', ['format' => '%non_existing%.example']);
 
         $pass = new AutoAliasServicePass();
         $pass->process($container);
@@ -39,7 +39,7 @@ public function testProcessWithMissingFormat()
         $container = new ContainerBuilder();
 
         $container->register('example')
-            ->addTag('auto_alias', array());
+            ->addTag('auto_alias', []);
         $container->setParameter('existing', 'mysql');
 
         $pass = new AutoAliasServicePass();
@@ -51,7 +51,7 @@ public function testProcessWithNonExistingAlias()
         $container = new ContainerBuilder();
 
         $container->register('example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault')
-            ->addTag('auto_alias', array('format' => '%existing%.example'));
+            ->addTag('auto_alias', ['format' => '%existing%.example']);
         $container->setParameter('existing', 'mysql');
 
         $pass = new AutoAliasServicePass();
@@ -65,7 +65,7 @@ public function testProcessWithExistingAlias()
         $container = new ContainerBuilder();
 
         $container->register('example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault')
-            ->addTag('auto_alias', array('format' => '%existing%.example'));
+            ->addTag('auto_alias', ['format' => '%existing%.example']);
 
         $container->register('mysql.example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMysql');
         $container->setParameter('existing', 'mysql');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index a216877237713..f1162470ec62d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -465,7 +465,7 @@ public function testScalarArgsCannotBeAutowired()
         $container->register(A::class);
         $container->register(Dunglas::class);
         $container->register('arg_no_type_hint', __NAMESPACE__.'\MultipleArguments')
-            ->setArguments(array(1 => 'foo'))
+            ->setArguments([1 => 'foo'])
             ->setAutowired(true);
 
         (new ResolveClassPass())->process($container);
@@ -562,7 +562,7 @@ public function testOptionalArgsNoRequiredForCoreClasses()
 
         $definition = $container->getDefinition('foo');
         $this->assertEquals(
-            array('foo.txt'),
+            ['foo.txt'],
             $definition->getArguments()
         );
     }
@@ -579,7 +579,7 @@ public function testSetterInjection()
         $container
             ->register('setter_injection', SetterInjection::class)
             ->setAutowired(true)
-            ->addMethodCall('setWithCallsConfigured', array('manual_arg1', 'manual_arg2'))
+            ->addMethodCall('setWithCallsConfigured', ['manual_arg1', 'manual_arg2'])
         ;
 
         (new ResolveClassPass())->process($container);
@@ -616,7 +616,7 @@ public function testExplicitMethodInjection()
         $container
             ->register('setter_injection', SetterInjection::class)
             ->setAutowired(true)
-            ->addMethodCall('notASetter', array())
+            ->addMethodCall('notASetter', [])
         ;
 
         (new ResolveClassPass())->process($container);
@@ -682,10 +682,10 @@ public function testCreateResourceForClass($className, $isEqual)
 
     public function getCreateResourceTests()
     {
-        return array(
-            array('IdenticalClassResource', true),
-            array('ClassChangedConstructorArgs', false),
-        );
+        return [
+            ['IdenticalClassResource', true],
+            ['ClassChangedConstructorArgs', false],
+        ];
     }
 
     public function testIgnoreServiceWithClassNotExisting()
@@ -805,14 +805,14 @@ public function testNotWireableCalls($method, $expectedMsg)
         $container = new ContainerBuilder();
 
         $foo = $container->register('foo', NotWireable::class)->setAutowired(true)
-            ->addMethodCall('setBar', array())
-            ->addMethodCall('setOptionalNotAutowireable', array())
-            ->addMethodCall('setOptionalNoTypeHint', array())
-            ->addMethodCall('setOptionalArgNoAutowireable', array())
+            ->addMethodCall('setBar', [])
+            ->addMethodCall('setOptionalNotAutowireable', [])
+            ->addMethodCall('setOptionalNoTypeHint', [])
+            ->addMethodCall('setOptionalArgNoAutowireable', [])
         ;
 
         if ($method) {
-            $foo->addMethodCall($method, array());
+            $foo->addMethodCall($method, []);
         }
 
         if (method_exists($this, 'expectException')) {
@@ -922,6 +922,6 @@ public function testInlineServicesAreNotCandidates()
         $pass = new AutowirePass();
         $pass->process($container);
 
-        $this->assertSame(array(), $container->getDefinition('autowired')->getArguments());
+        $this->assertSame([], $container->getDefinition('autowired')->getArguments());
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredMethodsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredMethodsPassTest.php
index 07c9f9d774e3e..644b32d20465e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredMethodsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredMethodsPassTest.php
@@ -32,7 +32,7 @@ public function testSetterInjection()
         $container
             ->register('setter_injection', SetterInjection::class)
             ->setAutowired(true)
-            ->addMethodCall('setWithCallsConfigured', array('manual_arg1', 'manual_arg2'));
+            ->addMethodCall('setWithCallsConfigured', ['manual_arg1', 'manual_arg2']);
 
         (new ResolveClassPass())->process($container);
         (new AutowireRequiredMethodsPass())->process($container);
@@ -40,17 +40,17 @@ public function testSetterInjection()
         $methodCalls = $container->getDefinition('setter_injection')->getMethodCalls();
 
         $this->assertEquals(
-            array('setWithCallsConfigured', 'setFoo', 'setDependencies', 'setChildMethodWithoutDocBlock'),
+            ['setWithCallsConfigured', 'setFoo', 'setDependencies', 'setChildMethodWithoutDocBlock'],
             array_column($methodCalls, 0)
         );
 
         // test setWithCallsConfigured args
         $this->assertEquals(
-            array('manual_arg1', 'manual_arg2'),
+            ['manual_arg1', 'manual_arg2'],
             $methodCalls[0][1]
         );
         // test setFoo args
-        $this->assertEquals(array(), $methodCalls[1][1]);
+        $this->assertEquals([], $methodCalls[1][1]);
     }
 
     public function testExplicitMethodInjection()
@@ -64,7 +64,7 @@ public function testExplicitMethodInjection()
         $container
             ->register('setter_injection', SetterInjection::class)
             ->setAutowired(true)
-            ->addMethodCall('notASetter', array());
+            ->addMethodCall('notASetter', []);
 
         (new ResolveClassPass())->process($container);
         (new AutowireRequiredMethodsPass())->process($container);
@@ -72,9 +72,9 @@ public function testExplicitMethodInjection()
         $methodCalls = $container->getDefinition('setter_injection')->getMethodCalls();
 
         $this->assertEquals(
-            array('notASetter', 'setFoo', 'setDependencies', 'setWithCallsConfigured', 'setChildMethodWithoutDocBlock'),
+            ['notASetter', 'setFoo', 'setDependencies', 'setWithCallsConfigured', 'setChildMethodWithoutDocBlock'],
             array_column($methodCalls, 0)
         );
-        $this->assertEquals(array(), $methodCalls[0][1]);
+        $this->assertEquals([], $methodCalls[0][1]);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckArgumentsValidityPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckArgumentsValidityPassTest.php
index d121689ff9c6a..c1e47b308e760 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckArgumentsValidityPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckArgumentsValidityPassTest.php
@@ -24,20 +24,20 @@ public function testProcess()
     {
         $container = new ContainerBuilder();
         $definition = $container->register('foo');
-        $definition->setArguments(array(null, 1, 'a'));
-        $definition->setMethodCalls(array(
-            array('bar', array('a', 'b')),
-            array('baz', array('c', 'd')),
-        ));
+        $definition->setArguments([null, 1, 'a']);
+        $definition->setMethodCalls([
+            ['bar', ['a', 'b']],
+            ['baz', ['c', 'd']],
+        ]);
 
         $pass = new CheckArgumentsValidityPass();
         $pass->process($container);
 
-        $this->assertEquals(array(null, 1, 'a'), $container->getDefinition('foo')->getArguments());
-        $this->assertEquals(array(
-            array('bar', array('a', 'b')),
-            array('baz', array('c', 'd')),
-        ), $container->getDefinition('foo')->getMethodCalls());
+        $this->assertEquals([null, 1, 'a'], $container->getDefinition('foo')->getArguments());
+        $this->assertEquals([
+            ['bar', ['a', 'b']],
+            ['baz', ['c', 'd']],
+        ], $container->getDefinition('foo')->getMethodCalls());
     }
 
     /**
@@ -57,19 +57,19 @@ public function testException(array $arguments, array $methodCalls)
 
     public function definitionProvider()
     {
-        return array(
-            array(array(null, 'a' => 'a'), array()),
-            array(array(1 => 1), array()),
-            array(array(), array(array('baz', array(null, 'a' => 'a')))),
-            array(array(), array(array('baz', array(1 => 1)))),
-        );
+        return [
+            [[null, 'a' => 'a'], []],
+            [[1 => 1], []],
+            [[], [['baz', [null, 'a' => 'a']]]],
+            [[], [['baz', [1 => 1]]]],
+        ];
     }
 
     public function testNoException()
     {
         $container = new ContainerBuilder();
         $definition = $container->register('foo');
-        $definition->setArguments(array(null, 'a' => 'a'));
+        $definition->setArguments([null, 'a' => 'a']);
 
         $pass = new CheckArgumentsValidityPass(false);
         $pass->process($container);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckCircularReferencesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckCircularReferencesPassTest.php
index a87dc44a9cb2e..8423c5616b3b9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckCircularReferencesPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckCircularReferencesPassTest.php
@@ -55,11 +55,11 @@ public function testProcessWithFactory()
 
         $container
             ->register('a', 'stdClass')
-            ->setFactory(array(new Reference('b'), 'getInstance'));
+            ->setFactory([new Reference('b'), 'getInstance']);
 
         $container
             ->register('b', 'stdClass')
-            ->setFactory(array(new Reference('a'), 'getInstance'));
+            ->setFactory([new Reference('a'), 'getInstance']);
 
         $this->process($container);
     }
@@ -88,7 +88,7 @@ public function testProcessDetectsIndirectCircularReferenceWithFactory()
 
         $container
             ->register('b', 'stdClass')
-            ->setFactory(array(new Reference('c'), 'getInstance'));
+            ->setFactory([new Reference('c'), 'getInstance']);
 
         $container->register('c')->addArgument(new Reference('a'));
 
@@ -112,7 +112,7 @@ public function testProcessIgnoresMethodCalls()
     {
         $container = new ContainerBuilder();
         $container->register('a')->addArgument(new Reference('b'));
-        $container->register('b')->addMethodCall('setA', array(new Reference('a')));
+        $container->register('b')->addMethodCall('setA', [new Reference('a')]);
 
         $this->process($container);
 
@@ -135,7 +135,7 @@ public function testProcessIgnoresIteratorArguments()
     {
         $container = new ContainerBuilder();
         $container->register('a')->addArgument(new Reference('b'));
-        $container->register('b')->addArgument(new IteratorArgument(array(new Reference('a'))));
+        $container->register('b')->addArgument(new IteratorArgument([new Reference('a')]));
 
         $this->process($container);
 
@@ -147,11 +147,11 @@ protected function process(ContainerBuilder $container)
     {
         $compiler = new Compiler();
         $passConfig = $compiler->getPassConfig();
-        $passConfig->setOptimizationPasses(array(
+        $passConfig->setOptimizationPasses([
             new AnalyzeServiceReferencesPass(true),
             new CheckCircularReferencesPass(),
-        ));
-        $passConfig->setRemovingPasses(array());
+        ]);
+        $passConfig->setRemovingPasses([]);
 
         $compiler->compile($container);
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php
index f698ed02dc744..e1dd60b662be9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php
@@ -55,10 +55,10 @@ public function testProcess()
     public function testValidTags()
     {
         $container = new ContainerBuilder();
-        $container->register('a', 'class')->addTag('foo', array('bar' => 'baz'));
-        $container->register('b', 'class')->addTag('foo', array('bar' => null));
-        $container->register('c', 'class')->addTag('foo', array('bar' => 1));
-        $container->register('d', 'class')->addTag('foo', array('bar' => 1.1));
+        $container->register('a', 'class')->addTag('foo', ['bar' => 'baz']);
+        $container->register('b', 'class')->addTag('foo', ['bar' => null]);
+        $container->register('c', 'class')->addTag('foo', ['bar' => 1]);
+        $container->register('d', 'class')->addTag('foo', ['bar' => 1.1]);
 
         $this->process($container);
 
@@ -71,7 +71,7 @@ public function testValidTags()
     public function testInvalidTags()
     {
         $container = new ContainerBuilder();
-        $container->register('a', 'class')->addTag('foo', array('bar' => array('baz' => 'baz')));
+        $container->register('a', 'class')->addTag('foo', ['bar' => ['baz' => 'baz']]);
 
         $this->process($container);
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
index 631c344ff6cb1..38717eaf1fd5d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
@@ -74,7 +74,7 @@ public function testProcessDefinitionWithBindings()
 
         $container
             ->register('b')
-            ->setBindings(array(new BoundArgument(new Reference('a'))))
+            ->setBindings([new BoundArgument(new Reference('a'))])
         ;
 
         $this->process($container);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php
index fe1334e91a0dd..872a2dc3fb26d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php
@@ -130,18 +130,18 @@ public function testProcessMovesTagsFromDecoratedDefinitionToDecoratingDefinitio
         $container = new ContainerBuilder();
         $container
             ->register('foo')
-            ->setTags(array('bar' => array('attr' => 'baz')))
+            ->setTags(['bar' => ['attr' => 'baz']])
         ;
         $container
             ->register('baz')
-            ->setTags(array('foobar' => array('attr' => 'bar')))
+            ->setTags(['foobar' => ['attr' => 'bar']])
             ->setDecoratedService('foo')
         ;
 
         $this->process($container);
 
         $this->assertEmpty($container->getDefinition('baz.inner')->getTags());
-        $this->assertEquals(array('bar' => array('attr' => 'baz'), 'foobar' => array('attr' => 'bar')), $container->getDefinition('baz')->getTags());
+        $this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar']], $container->getDefinition('baz')->getTags());
     }
 
     /**
@@ -174,7 +174,7 @@ public function testProcessMovesTagsFromDecoratedDefinitionToDecoratingDefinitio
         $container
             ->register('foo')
             ->setPublic(true)
-            ->setTags(array('bar' => array('attr' => 'baz')))
+            ->setTags(['bar' => ['attr' => 'baz']])
         ;
         $container
             ->register('deco1')
@@ -188,7 +188,7 @@ public function testProcessMovesTagsFromDecoratedDefinitionToDecoratingDefinitio
         $this->process($container);
 
         $this->assertEmpty($container->getDefinition('deco1')->getTags());
-        $this->assertEquals(array('bar' => array('attr' => 'baz')), $container->getDefinition('deco2')->getTags());
+        $this->assertEquals(['bar' => ['attr' => 'baz']], $container->getDefinition('deco2')->getTags());
     }
 
     protected function process(ContainerBuilder $container)
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/DefinitionErrorExceptionPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/DefinitionErrorExceptionPassTest.php
index e0585e21324b3..a290f94e59980 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/DefinitionErrorExceptionPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/DefinitionErrorExceptionPassTest.php
@@ -29,9 +29,9 @@ public function testThrowsException()
         $def->addError('Things went wrong!');
         $def->addError('Now something else!');
         $container->register('foo_service_id')
-            ->setArguments(array(
+            ->setArguments([
                 $def,
-            ));
+            ]);
 
         $pass = new DefinitionErrorExceptionPass();
         $pass->process($container);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
index b2ad6f9476fa1..e1161d5bf0971 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
@@ -33,7 +33,7 @@ public function testProcess()
 
         $container
             ->register('service')
-            ->setArguments(array(new Reference('inlinable.service')))
+            ->setArguments([new Reference('inlinable.service')])
         ;
 
         $this->process($container);
@@ -54,7 +54,7 @@ public function testProcessDoesNotInlinesWhenAliasedServiceIsShared()
 
         $container
             ->register('service')
-            ->setArguments(array($ref = new Reference('foo')))
+            ->setArguments([$ref = new Reference('foo')])
         ;
 
         $this->process($container);
@@ -79,7 +79,7 @@ public function testProcessDoesInlineNonSharedService()
 
         $container
             ->register('service')
-            ->setArguments(array(new Reference('foo'), $ref = new Reference('moo'), new Reference('bar')))
+            ->setArguments([new Reference('foo'), $ref = new Reference('moo'), new Reference('bar')])
         ;
 
         $this->process($container);
@@ -103,7 +103,7 @@ public function testProcessDoesNotInlineMixedServicesLoop()
         $container
             ->register('bar')
             ->setPublic(false)
-            ->addMethodCall('setFoo', array(new Reference('foo')))
+            ->addMethodCall('setFoo', [new Reference('foo')])
         ;
 
         $this->process($container);
@@ -126,7 +126,7 @@ public function testProcessThrowsOnNonSharedLoops()
         $container
             ->register('bar')
             ->setShared(false)
-            ->addMethodCall('setFoo', array(new Reference('foo')))
+            ->addMethodCall('setFoo', [new Reference('foo')])
         ;
 
         $this->process($container);
@@ -173,7 +173,7 @@ public function testProcessInlinesIfMultipleReferencesButAllFromTheSameDefinitio
         $b = $container
             ->register('b')
             ->addArgument(new Reference('a'))
-            ->addArgument(new Definition(null, array(new Reference('a'))))
+            ->addArgument(new Definition(null, [new Reference('a')]))
         ;
 
         $this->process($container);
@@ -193,14 +193,14 @@ public function testProcessInlinesPrivateFactoryReference()
         $b = $container
             ->register('b')
             ->setPublic(false)
-            ->setFactory(array(new Reference('a'), 'a'))
+            ->setFactory([new Reference('a'), 'a'])
         ;
 
         $container
             ->register('foo')
-            ->setArguments(array(
+            ->setArguments([
                 $ref = new Reference('b'),
-            ));
+            ]);
 
         $this->process($container);
 
@@ -217,15 +217,15 @@ public function testProcessDoesNotInlinePrivateFactoryIfReferencedMultipleTimesW
         $container
             ->register('b')
             ->setPublic(false)
-            ->setFactory(array(new Reference('a'), 'a'))
+            ->setFactory([new Reference('a'), 'a'])
         ;
 
         $container
             ->register('foo')
-            ->setArguments(array(
+            ->setArguments([
                     $ref1 = new Reference('b'),
                     $ref2 = new Reference('b'),
-                ))
+                ])
         ;
         $this->process($container);
 
@@ -243,19 +243,19 @@ public function testProcessDoesNotInlineReferenceWhenUsedByInlineFactory()
         $container
             ->register('b')
             ->setPublic(false)
-            ->setFactory(array(new Reference('a'), 'a'))
+            ->setFactory([new Reference('a'), 'a'])
         ;
 
         $inlineFactory = new Definition();
         $inlineFactory->setPublic(false);
-        $inlineFactory->setFactory(array(new Reference('b'), 'b'));
+        $inlineFactory->setFactory([new Reference('b'), 'b']);
 
         $container
             ->register('foo')
-            ->setArguments(array(
+            ->setArguments([
                     $ref = new Reference('b'),
                     $inlineFactory,
-                ))
+                ])
         ;
         $this->process($container);
 
@@ -274,7 +274,7 @@ public function testProcessDoesNotInlineWhenServiceIsPrivateButLazy()
 
         $container
             ->register('service')
-            ->setArguments(array($ref = new Reference('foo')))
+            ->setArguments([$ref = new Reference('foo')])
         ;
 
         $this->process($container);
@@ -289,7 +289,7 @@ public function testProcessDoesNotInlineWhenServiceReferencesItself()
         $container
             ->register('foo')
             ->setPublic(false)
-            ->addMethodCall('foo', array($ref = new Reference('foo')))
+            ->addMethodCall('foo', [$ref = new Reference('foo')])
         ;
 
         $this->process($container);
@@ -307,11 +307,11 @@ public function testProcessDoesNotSetLazyArgumentValuesAfterInlining()
         ;
         $container
             ->register('service-closure')
-            ->setArguments(array(new ServiceClosureArgument(new Reference('inline'))))
+            ->setArguments([new ServiceClosureArgument(new Reference('inline'))])
         ;
         $container
             ->register('iterator')
-            ->setArguments(array(new IteratorArgument(array(new Reference('inline')))))
+            ->setArguments([new IteratorArgument([new Reference('inline')])])
         ;
 
         $this->process($container);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
index 104b39f13ff83..f817d0ab89f2a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
@@ -155,8 +155,8 @@ public function testYamlContainerCompiles($directory, $actualServiceId, $expecte
         $expectedService = $container->getDefinition($expectedServiceId);
 
         // reset changes, we don't care if these differ
-        $actualService->setChanges(array());
-        $expectedService->setChanges(array());
+        $actualService->setChanges([]);
+        $expectedService->setChanges([]);
 
         $this->assertEquals($expectedService, $actualService);
     }
@@ -227,7 +227,7 @@ class ServiceSubscriberStub implements ServiceSubscriberInterface
 {
     public static function getSubscribedServices()
     {
-        return array();
+        return [];
     }
 }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
index 3ebd3f5e5c981..667ae388648ae 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
@@ -25,7 +25,7 @@ class MergeExtensionConfigurationPassTest extends TestCase
 {
     public function testExpressionLanguageProviderForwarding()
     {
-        $tmpProviders = array();
+        $tmpProviders = [];
 
         $extension = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\Extension\\ExtensionInterface')->getMock();
         $extension->expects($this->any())
@@ -46,18 +46,18 @@ public function testExpressionLanguageProviderForwarding()
         $provider = $this->getMockBuilder('Symfony\\Component\\ExpressionLanguage\\ExpressionFunctionProviderInterface')->getMock();
         $container = new ContainerBuilder(new ParameterBag());
         $container->registerExtension($extension);
-        $container->prependExtensionConfig('foo', array('bar' => true));
+        $container->prependExtensionConfig('foo', ['bar' => true]);
         $container->addExpressionLanguageProvider($provider);
 
         $pass = new MergeExtensionConfigurationPass();
         $pass->process($container);
 
-        $this->assertEquals(array($provider), $tmpProviders);
+        $this->assertEquals([$provider], $tmpProviders);
     }
 
     public function testExtensionLoadGetAMergeExtensionConfigurationContainerBuilderInstance()
     {
-        $extension = $this->getMockBuilder(FooExtension::class)->setMethods(array('load'))->getMock();
+        $extension = $this->getMockBuilder(FooExtension::class)->setMethods(['load'])->getMock();
         $extension->expects($this->once())
             ->method('load')
             ->with($this->isType('array'), $this->isInstanceOf(MergeExtensionConfigurationContainerBuilder::class))
@@ -65,7 +65,7 @@ public function testExtensionLoadGetAMergeExtensionConfigurationContainerBuilder
 
         $container = new ContainerBuilder(new ParameterBag());
         $container->registerExtension($extension);
-        $container->prependExtensionConfig('foo', array());
+        $container->prependExtensionConfig('foo', []);
 
         $pass = new MergeExtensionConfigurationPass();
         $pass->process($container);
@@ -73,14 +73,14 @@ public function testExtensionLoadGetAMergeExtensionConfigurationContainerBuilder
 
     public function testExtensionConfigurationIsTrackedByDefault()
     {
-        $extension = $this->getMockBuilder(FooExtension::class)->setMethods(array('getConfiguration'))->getMock();
+        $extension = $this->getMockBuilder(FooExtension::class)->setMethods(['getConfiguration'])->getMock();
         $extension->expects($this->exactly(2))
             ->method('getConfiguration')
             ->will($this->returnValue(new FooConfiguration()));
 
         $container = new ContainerBuilder(new ParameterBag());
         $container->registerExtension($extension);
-        $container->prependExtensionConfig('foo', array('bar' => true));
+        $container->prependExtensionConfig('foo', ['bar' => true]);
 
         $pass = new MergeExtensionConfigurationPass();
         $pass->process($container);
@@ -92,14 +92,14 @@ public function testOverriddenEnvsAreMerged()
     {
         $container = new ContainerBuilder();
         $container->registerExtension(new FooExtension());
-        $container->prependExtensionConfig('foo', array('bar' => '%env(FOO)%'));
-        $container->prependExtensionConfig('foo', array('bar' => '%env(BAR)%', 'baz' => '%env(BAZ)%'));
+        $container->prependExtensionConfig('foo', ['bar' => '%env(FOO)%']);
+        $container->prependExtensionConfig('foo', ['bar' => '%env(BAR)%', 'baz' => '%env(BAZ)%']);
 
         $pass = new MergeExtensionConfigurationPass();
         $pass->process($container);
 
-        $this->assertSame(array('BAZ', 'FOO'), array_keys($container->getParameterBag()->getEnvPlaceholders()));
-        $this->assertSame(array('BAZ' => 1, 'FOO' => 0), $container->getEnvCounters());
+        $this->assertSame(['BAZ', 'FOO'], array_keys($container->getParameterBag()->getEnvPlaceholders()));
+        $this->assertSame(['BAZ' => 1, 'FOO' => 0], $container->getEnvCounters());
     }
 
     /**
@@ -110,7 +110,7 @@ public function testProcessedEnvsAreIncompatibleWithResolve()
     {
         $container = new ContainerBuilder();
         $container->registerExtension(new BarExtension());
-        $container->prependExtensionConfig('bar', array());
+        $container->prependExtensionConfig('bar', []);
 
         (new MergeExtensionConfigurationPass())->process($container);
     }
@@ -119,7 +119,7 @@ public function testThrowingExtensionsGetMergedBag()
     {
         $container = new ContainerBuilder();
         $container->registerExtension(new ThrowingExtension());
-        $container->prependExtensionConfig('throwing', array('bar' => '%env(FOO)%'));
+        $container->prependExtensionConfig('throwing', ['bar' => '%env(FOO)%']);
 
         try {
             $pass = new MergeExtensionConfigurationPass();
@@ -128,7 +128,7 @@ public function testThrowingExtensionsGetMergedBag()
         } catch (\Exception $e) {
         }
 
-        $this->assertSame(array('FOO'), array_keys($container->getParameterBag()->getEnvPlaceholders()));
+        $this->assertSame(['FOO'], array_keys($container->getParameterBag()->getEnvPlaceholders()));
     }
 }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/PassConfigTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/PassConfigTest.php
index 1fd772ee690ec..9470e526fa27b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/PassConfigTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/PassConfigTest.php
@@ -23,7 +23,7 @@ class PassConfigTest extends TestCase
     public function testPassOrdering()
     {
         $config = new PassConfig();
-        $config->setBeforeOptimizationPasses(array());
+        $config->setBeforeOptimizationPasses([]);
 
         $pass1 = $this->getMockBuilder(CompilerPassInterface::class)->getMock();
         $config->addPass($pass1, PassConfig::TYPE_BEFORE_OPTIMIZATION, 10);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php
index 61e3fa947a47d..57682b5da5666 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php
@@ -20,27 +20,27 @@ class PriorityTaggedServiceTraitTest extends TestCase
 {
     public function testThatCacheWarmersAreProcessedInPriorityOrder()
     {
-        $services = array(
-            'my_service1' => array('my_custom_tag' => array('priority' => 100)),
-            'my_service2' => array('my_custom_tag' => array('priority' => 200)),
-            'my_service3' => array('my_custom_tag' => array('priority' => -501)),
-            'my_service4' => array('my_custom_tag' => array()),
-            'my_service5' => array('my_custom_tag' => array('priority' => -1)),
-            'my_service6' => array('my_custom_tag' => array('priority' => -500)),
-            'my_service7' => array('my_custom_tag' => array('priority' => -499)),
-            'my_service8' => array('my_custom_tag' => array('priority' => 1)),
-            'my_service9' => array('my_custom_tag' => array('priority' => -2)),
-            'my_service10' => array('my_custom_tag' => array('priority' => -1000)),
-            'my_service11' => array('my_custom_tag' => array('priority' => -1001)),
-            'my_service12' => array('my_custom_tag' => array('priority' => -1002)),
-            'my_service13' => array('my_custom_tag' => array('priority' => -1003)),
-            'my_service14' => array('my_custom_tag' => array('priority' => -1000)),
-            'my_service15' => array('my_custom_tag' => array('priority' => 1)),
-            'my_service16' => array('my_custom_tag' => array('priority' => -1)),
-            'my_service17' => array('my_custom_tag' => array('priority' => 200)),
-            'my_service18' => array('my_custom_tag' => array('priority' => 100)),
-            'my_service19' => array('my_custom_tag' => array()),
-        );
+        $services = [
+            'my_service1' => ['my_custom_tag' => ['priority' => 100]],
+            'my_service2' => ['my_custom_tag' => ['priority' => 200]],
+            'my_service3' => ['my_custom_tag' => ['priority' => -501]],
+            'my_service4' => ['my_custom_tag' => []],
+            'my_service5' => ['my_custom_tag' => ['priority' => -1]],
+            'my_service6' => ['my_custom_tag' => ['priority' => -500]],
+            'my_service7' => ['my_custom_tag' => ['priority' => -499]],
+            'my_service8' => ['my_custom_tag' => ['priority' => 1]],
+            'my_service9' => ['my_custom_tag' => ['priority' => -2]],
+            'my_service10' => ['my_custom_tag' => ['priority' => -1000]],
+            'my_service11' => ['my_custom_tag' => ['priority' => -1001]],
+            'my_service12' => ['my_custom_tag' => ['priority' => -1002]],
+            'my_service13' => ['my_custom_tag' => ['priority' => -1003]],
+            'my_service14' => ['my_custom_tag' => ['priority' => -1000]],
+            'my_service15' => ['my_custom_tag' => ['priority' => 1]],
+            'my_service16' => ['my_custom_tag' => ['priority' => -1]],
+            'my_service17' => ['my_custom_tag' => ['priority' => 200]],
+            'my_service18' => ['my_custom_tag' => ['priority' => 100]],
+            'my_service19' => ['my_custom_tag' => []],
+        ];
 
         $container = new ContainerBuilder();
 
@@ -52,7 +52,7 @@ public function testThatCacheWarmersAreProcessedInPriorityOrder()
             }
         }
 
-        $expected = array(
+        $expected = [
             new Reference('my_service2'),
             new Reference('my_service17'),
             new Reference('my_service1'),
@@ -72,7 +72,7 @@ public function testThatCacheWarmersAreProcessedInPriorityOrder()
             new Reference('my_service11'),
             new Reference('my_service12'),
             new Reference('my_service13'),
-        );
+        ];
 
         $priorityTaggedServiceTraitImplementation = new PriorityTaggedServiceTraitImplementation();
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
index cddb62dce9826..764a5b610b031 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
@@ -75,7 +75,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)
 
     public static function getProvidedTypes()
     {
-        return array('foo' => 'string');
+        return ['foo' => 'string'];
     }
 }
 
@@ -83,6 +83,6 @@ class BadProcessor extends SimpleProcessor
 {
     public static function getProvidedTypes()
     {
-        return array('foo' => 'string|foo');
+        return ['foo' => 'string|foo'];
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
index 42f994e821d97..80d632bbaaa0f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
@@ -53,7 +53,7 @@ public function testInvalidAttributes()
         $container = new ContainerBuilder();
 
         $container->register('foo', TestServiceSubscriber::class)
-            ->addTag('container.service_subscriber', array('bar' => '123'))
+            ->addTag('container.service_subscriber', ['bar' => '123'])
         ;
 
         (new RegisterServiceSubscribersPass())->process($container);
@@ -95,8 +95,8 @@ public function testWithAttributes()
         $container->register('foo', TestServiceSubscriber::class)
             ->setAutowired(true)
             ->addArgument(new Reference(PsrContainerInterface::class))
-            ->addTag('container.service_subscriber', array('key' => 'bar', 'id' => 'bar'))
-            ->addTag('container.service_subscriber', array('key' => 'bar', 'id' => 'baz')) // should be ignored: the first wins
+            ->addTag('container.service_subscriber', ['key' => 'bar', 'id' => 'bar'])
+            ->addTag('container.service_subscriber', ['key' => 'bar', 'id' => 'baz']) // should be ignored: the first wins
         ;
 
         (new RegisterServiceSubscribersPass())->process($container);
@@ -128,10 +128,10 @@ public function testExtraServiceSubscriber()
         $container->register('foo_service', TestServiceSubscriber::class)
             ->setAutowired(true)
             ->addArgument(new Reference(PsrContainerInterface::class))
-            ->addTag('container.service_subscriber', array(
+            ->addTag('container.service_subscriber', [
                 'key' => 'test',
                 'id' => TestServiceSubscriber::class,
-            ))
+            ])
         ;
         $container->register(TestServiceSubscriber::class, TestServiceSubscriber::class);
         $container->compile();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php
index fd26561a247fd..3644854339ce9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php
@@ -35,7 +35,7 @@ public function testProcess()
         ;
         $container
             ->register('moo')
-            ->setArguments(array(new Reference('bar')))
+            ->setArguments([new Reference('bar')])
         ;
 
         $this->process($container);
@@ -54,7 +54,7 @@ public function testProcessRemovesUnusedDefinitionsRecursively()
         ;
         $container
             ->register('bar')
-            ->setArguments(array(new Reference('foo')))
+            ->setArguments([new Reference('foo')])
             ->setPublic(false)
         ;
 
@@ -73,7 +73,7 @@ public function testProcessWorksWithInlinedDefinitions()
         ;
         $container
             ->register('bar')
-            ->setArguments(array(new Definition(null, array(new Reference('foo')))))
+            ->setArguments([new Definition(null, [new Reference('foo')])])
         ;
 
         $this->process($container);
@@ -88,12 +88,12 @@ public function testProcessWontRemovePrivateFactory()
 
         $container
             ->register('foo', 'stdClass')
-            ->setFactory(array('stdClass', 'getInstance'))
+            ->setFactory(['stdClass', 'getInstance'])
             ->setPublic(false);
 
         $container
             ->register('bar', 'stdClass')
-            ->setFactory(array(new Reference('foo'), 'getInstance'))
+            ->setFactory([new Reference('foo'), 'getInstance'])
             ->setPublic(false);
 
         $container
@@ -113,7 +113,7 @@ public function testProcessConsiderEnvVariablesAsUsedEvenInPrivateServices()
         $container->setParameter('env(FOOBAR)', 'test');
         $container
             ->register('foo')
-            ->setArguments(array('%env(FOOBAR)%'))
+            ->setArguments(['%env(FOOBAR)%'])
             ->setPublic(false)
         ;
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
index 7574e7943b4cb..f9c755c35e184 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
@@ -26,7 +26,7 @@ public function testProcess()
         $container = new ContainerBuilder();
 
         $aDefinition = $container->register('a', '\stdClass');
-        $aDefinition->setFactory(array(new Reference('b'), 'createA'));
+        $aDefinition->setFactory([new Reference('b'), 'createA']);
 
         $bDefinition = new Definition('\stdClass');
         $bDefinition->setPublic(false);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
index d59b95af5c406..5118b416f93fa 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
@@ -30,10 +30,10 @@ public function testProcess()
     {
         $container = new ContainerBuilder();
 
-        $bindings = array(CaseSensitiveClass::class => new BoundArgument(new Reference('foo')));
+        $bindings = [CaseSensitiveClass::class => new BoundArgument(new Reference('foo'))];
 
         $definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
-        $definition->setArguments(array(1 => '123'));
+        $definition->setArguments([1 => '123']);
         $definition->addMethodCall('setSensitiveClass');
         $definition->setBindings($bindings);
 
@@ -43,8 +43,8 @@ public function testProcess()
         $pass = new ResolveBindingsPass();
         $pass->process($container);
 
-        $this->assertEquals(array(new Reference('foo'), '123'), $definition->getArguments());
-        $this->assertEquals(array(array('setSensitiveClass', array(new Reference('foo')))), $definition->getMethodCalls());
+        $this->assertEquals([new Reference('foo'), '123'], $definition->getArguments());
+        $this->assertEquals([['setSensitiveClass', [new Reference('foo')]]], $definition->getMethodCalls());
     }
 
     /**
@@ -56,7 +56,7 @@ public function testUnusedBinding()
         $container = new ContainerBuilder();
 
         $definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
-        $definition->setBindings(array('$quz' => '123'));
+        $definition->setBindings(['$quz' => '123']);
 
         $pass = new ResolveBindingsPass();
         $pass->process($container);
@@ -71,7 +71,7 @@ public function testMissingParent()
         $container = new ContainerBuilder();
 
         $definition = $container->register(ParentNotExists::class, ParentNotExists::class);
-        $definition->setBindings(array('$quz' => '123'));
+        $definition->setBindings(['$quz' => '123']);
 
         $pass = new ResolveBindingsPass();
         $pass->process($container);
@@ -81,7 +81,7 @@ public function testTypedReferenceSupport()
     {
         $container = new ContainerBuilder();
 
-        $bindings = array(CaseSensitiveClass::class => new BoundArgument(new Reference('foo')));
+        $bindings = [CaseSensitiveClass::class => new BoundArgument(new Reference('foo'))];
 
         // Explicit service id
         $definition1 = $container->register('def1', NamedArgumentsDummy::class);
@@ -95,8 +95,8 @@ public function testTypedReferenceSupport()
         $pass = new ResolveBindingsPass();
         $pass->process($container);
 
-        $this->assertEquals(array($typedRef), $container->getDefinition('def1')->getArguments());
-        $this->assertEquals(array(new Reference('foo')), $container->getDefinition('def2')->getArguments());
+        $this->assertEquals([$typedRef], $container->getDefinition('def1')->getArguments());
+        $this->assertEquals([new Reference('foo')], $container->getDefinition('def2')->getArguments());
     }
 
     public function testScalarSetter()
@@ -104,11 +104,11 @@ public function testScalarSetter()
         $container = new ContainerBuilder();
 
         $definition = $container->autowire('foo', ScalarSetter::class);
-        $definition->setBindings(array('$defaultLocale' => 'fr'));
+        $definition->setBindings(['$defaultLocale' => 'fr']);
 
         (new AutowireRequiredMethodsPass())->process($container);
         (new ResolveBindingsPass())->process($container);
 
-        $this->assertEquals(array(array('setDefaultLocale', array('fr'))), $definition->getMethodCalls());
+        $this->assertEquals([['setDefaultLocale', ['fr']]], $definition->getMethodCalls());
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
index 1575bd7b07751..9220c277901ca 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
@@ -22,7 +22,7 @@ class ResolveChildDefinitionsPassTest extends TestCase
     public function testProcess()
     {
         $container = new ContainerBuilder();
-        $container->register('parent', 'foo')->setArguments(array('moo', 'b'))->setProperty('foo', 'moo');
+        $container->register('parent', 'foo')->setArguments(['moo', 'b'])->setProperty('foo', 'moo');
         $container->setDefinition('child', new ChildDefinition('parent'))
             ->replaceArgument(0, 'a')
             ->setProperty('foo', 'bar')
@@ -34,8 +34,8 @@ public function testProcess()
         $def = $container->getDefinition('child');
         $this->assertNotInstanceOf(ChildDefinition::class, $def);
         $this->assertEquals('bar', $def->getClass());
-        $this->assertEquals(array('a', 'b'), $def->getArguments());
-        $this->assertEquals(array('foo' => 'bar'), $def->getProperties());
+        $this->assertEquals(['a', 'b'], $def->getArguments());
+        $this->assertEquals(['foo' => 'bar'], $def->getProperties());
     }
 
     public function testProcessAppendsMethodCallsAlways()
@@ -44,21 +44,21 @@ public function testProcessAppendsMethodCallsAlways()
 
         $container
             ->register('parent')
-            ->addMethodCall('foo', array('bar'))
+            ->addMethodCall('foo', ['bar'])
         ;
 
         $container
             ->setDefinition('child', new ChildDefinition('parent'))
-            ->addMethodCall('bar', array('foo'))
+            ->addMethodCall('bar', ['foo'])
         ;
 
         $this->process($container);
 
         $def = $container->getDefinition('child');
-        $this->assertEquals(array(
-            array('foo', array('bar')),
-            array('bar', array('foo')),
-        ), $def->getMethodCalls());
+        $this->assertEquals([
+            ['foo', ['bar']],
+            ['bar', ['foo']],
+        ], $def->getMethodCalls());
     }
 
     public function testProcessDoesNotCopyAbstract()
@@ -115,7 +115,7 @@ public function testProcessDoesNotCopyTags()
         $this->process($container);
 
         $def = $container->getDefinition('child');
-        $this->assertEquals(array(), $def->getTags());
+        $this->assertEquals([], $def->getTags());
     }
 
     public function testProcessDoesNotCopyDecoratedService()
@@ -162,7 +162,7 @@ public function testProcessHandlesMultipleInheritance()
 
         $container
             ->register('parent', 'foo')
-            ->setArguments(array('foo', 'bar', 'c'))
+            ->setArguments(['foo', 'bar', 'c'])
         ;
 
         $container
@@ -178,7 +178,7 @@ public function testProcessHandlesMultipleInheritance()
         $this->process($container);
 
         $def = $container->getDefinition('child2');
-        $this->assertEquals(array('a', 'b', 'c'), $def->getArguments());
+        $this->assertEquals(['a', 'b', 'c'], $def->getArguments());
         $this->assertEquals('foo', $def->getClass());
     }
 
@@ -251,10 +251,10 @@ public function testDeepDefinitionsResolving()
         $container->register('parent', 'parentClass');
         $container->register('sibling', 'siblingClass')
             ->setConfigurator(new ChildDefinition('parent'), 'foo')
-            ->setFactory(array(new ChildDefinition('parent'), 'foo'))
+            ->setFactory([new ChildDefinition('parent'), 'foo'])
             ->addArgument(new ChildDefinition('parent'))
             ->setProperty('prop', new ChildDefinition('parent'))
-            ->addMethodCall('meth', array(new ChildDefinition('parent')))
+            ->addMethodCall('meth', [new ChildDefinition('parent')])
         ;
 
         $this->process($container);
@@ -292,7 +292,7 @@ public function testSetDecoratedServiceOnServiceHasParent()
 
         $this->process($container);
 
-        $this->assertEquals(array('foo', 'foo_inner', 5), $container->getDefinition('child1')->getDecoratedService());
+        $this->assertEquals(['foo', 'foo_inner', 5], $container->getDefinition('child1')->getDecoratedService());
     }
 
     public function testDecoratedServiceCopiesDeprecatedStatusFromParent()
@@ -369,17 +369,17 @@ public function testProcessSetsArguments()
     {
         $container = new ContainerBuilder();
 
-        $container->register('parent', 'ParentClass')->setArguments(array(0));
-        $container->setDefinition('child', (new ChildDefinition('parent'))->setArguments(array(
+        $container->register('parent', 'ParentClass')->setArguments([0]);
+        $container->setDefinition('child', (new ChildDefinition('parent'))->setArguments([
             1,
             'index_0' => 2,
             'foo' => 3,
-        )));
+        ]));
 
         $this->process($container);
 
         $def = $container->getDefinition('child');
-        $this->assertSame(array(2, 1, 'foo' => 3), $def->getArguments());
+        $this->assertSame([2, 1, 'foo' => 3], $def->getArguments());
     }
 
     public function testBindings()
@@ -387,20 +387,20 @@ public function testBindings()
         $container = new ContainerBuilder();
 
         $container->register('parent', 'stdClass')
-            ->setBindings(array('a' => '1', 'b' => '2'))
+            ->setBindings(['a' => '1', 'b' => '2'])
         ;
 
         $child = $container->setDefinition('child', new ChildDefinition('parent'))
-            ->setBindings(array('b' => 'B', 'c' => 'C'))
+            ->setBindings(['b' => 'B', 'c' => 'C'])
         ;
 
         $this->process($container);
 
-        $bindings = array();
+        $bindings = [];
         foreach ($container->getDefinition('child')->getBindings() as $k => $v) {
             $bindings[$k] = $v->getValues()[0];
         }
-        $this->assertEquals(array('b' => 'B', 'c' => 'C', 'a' => '1'), $bindings);
+        $this->assertEquals(['b' => 'B', 'c' => 'C', 'a' => '1'], $bindings);
     }
 
     public function testSetAutoconfiguredOnServiceIsParent()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveClassPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveClassPassTest.php
index acbcf1dda2d8c..675947efb73ac 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveClassPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveClassPassTest.php
@@ -34,8 +34,8 @@ public function testResolveClassFromId($serviceId)
 
     public function provideValidClassId()
     {
-        yield array('Acme\UnknownClass');
-        yield array(CaseSensitiveClass::class);
+        yield ['Acme\UnknownClass'];
+        yield [CaseSensitiveClass::class];
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveFactoryClassPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveFactoryClassPassTest.php
index 96453c30381e2..3438fad0689f3 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveFactoryClassPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveFactoryClassPassTest.php
@@ -24,12 +24,12 @@ public function testProcess()
         $container = new ContainerBuilder();
 
         $factory = $container->register('factory', 'Foo\Bar');
-        $factory->setFactory(array(null, 'create'));
+        $factory->setFactory([null, 'create']);
 
         $pass = new ResolveFactoryClassPass();
         $pass->process($container);
 
-        $this->assertSame(array('Foo\Bar', 'create'), $factory->getFactory());
+        $this->assertSame(['Foo\Bar', 'create'], $factory->getFactory());
     }
 
     public function testInlinedDefinitionFactoryIsProcessed()
@@ -37,21 +37,21 @@ public function testInlinedDefinitionFactoryIsProcessed()
         $container = new ContainerBuilder();
 
         $factory = $container->register('factory');
-        $factory->setFactory(array((new Definition('Baz\Qux'))->setFactory(array(null, 'getInstance')), 'create'));
+        $factory->setFactory([(new Definition('Baz\Qux'))->setFactory([null, 'getInstance']), 'create']);
 
         $pass = new ResolveFactoryClassPass();
         $pass->process($container);
 
-        $this->assertSame(array('Baz\Qux', 'getInstance'), $factory->getFactory()[0]->getFactory());
+        $this->assertSame(['Baz\Qux', 'getInstance'], $factory->getFactory()[0]->getFactory());
     }
 
     public function provideFulfilledFactories()
     {
-        return array(
-            array(array('Foo\Bar', 'create')),
-            array(array(new Reference('foo'), 'create')),
-            array(array(new Definition('Baz'), 'create')),
-        );
+        return [
+            [['Foo\Bar', 'create']],
+            [[new Reference('foo'), 'create']],
+            [[new Definition('Baz'), 'create']],
+        ];
     }
 
     /**
@@ -80,7 +80,7 @@ public function testNotAnyClassThrowsException()
         $container = new ContainerBuilder();
 
         $factory = $container->register('factory');
-        $factory->setFactory(array(null, 'create'));
+        $factory->setFactory([null, 'create']);
 
         $pass = new ResolveFactoryClassPass();
         $pass->process($container);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveHotPathPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveHotPathPassTest.php
index d2ba590047caa..a2fece0580b86 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveHotPathPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveHotPathPassTest.php
@@ -26,9 +26,9 @@ public function testProcess()
 
         $container->register('foo')
             ->addTag('container.hot_path')
-            ->addArgument(new IteratorArgument(array(new Reference('lazy'))))
+            ->addArgument(new IteratorArgument([new Reference('lazy')]))
             ->addArgument(new Reference('service_container'))
-            ->addArgument(new Definition('', array(new Reference('bar'))))
+            ->addArgument(new Definition('', [new Reference('bar')]))
             ->addArgument(new Reference('baz', ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE))
             ->addArgument(new Reference('missing'))
         ;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
index ad6f79d4051b1..26560b4ca3249 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
@@ -23,10 +23,10 @@ class ResolveInstanceofConditionalsPassTest extends TestCase
     public function testProcess()
     {
         $container = new ContainerBuilder();
-        $def = $container->register('foo', self::class)->addTag('tag')->setAutowired(true)->setChanges(array());
-        $def->setInstanceofConditionals(array(
-            parent::class => (new ChildDefinition(''))->setProperty('foo', 'bar')->addTag('baz', array('attr' => 123)),
-        ));
+        $def = $container->register('foo', self::class)->addTag('tag')->setAutowired(true)->setChanges([]);
+        $def->setInstanceofConditionals([
+            parent::class => (new ChildDefinition(''))->setProperty('foo', 'bar')->addTag('baz', ['attr' => 123]),
+        ]);
 
         (new ResolveInstanceofConditionalsPass())->process($container);
 
@@ -36,11 +36,11 @@ public function testProcess()
         $this->assertInstanceOf(ChildDefinition::class, $def);
         $this->assertTrue($def->isAutowired());
         $this->assertSame($parent, $def->getParent());
-        $this->assertSame(array('tag' => array(array()), 'baz' => array(array('attr' => 123))), $def->getTags());
+        $this->assertSame(['tag' => [[]], 'baz' => [['attr' => 123]]], $def->getTags());
 
         $parent = $container->getDefinition($parent);
-        $this->assertSame(array('foo' => 'bar'), $parent->getProperties());
-        $this->assertSame(array(), $parent->getTags());
+        $this->assertSame(['foo' => 'bar'], $parent->getProperties());
+        $this->assertSame([], $parent->getTags());
     }
 
     public function testProcessInheritance()
@@ -49,10 +49,10 @@ public function testProcessInheritance()
 
         $def = $container
             ->register('parent', parent::class)
-            ->addMethodCall('foo', array('foo'));
-        $def->setInstanceofConditionals(array(
-            parent::class => (new ChildDefinition(''))->addMethodCall('foo', array('bar')),
-        ));
+            ->addMethodCall('foo', ['foo']);
+        $def->setInstanceofConditionals([
+            parent::class => (new ChildDefinition(''))->addMethodCall('foo', ['bar']),
+        ]);
 
         $def = (new ChildDefinition('parent'))->setClass(self::class);
         $container->setDefinition('child', $def);
@@ -60,10 +60,10 @@ public function testProcessInheritance()
         (new ResolveInstanceofConditionalsPass())->process($container);
         (new ResolveChildDefinitionsPass())->process($container);
 
-        $expected = array(
-            array('foo', array('bar')),
-            array('foo', array('foo')),
-        );
+        $expected = [
+            ['foo', ['bar']],
+            ['foo', ['foo']],
+        ];
 
         $this->assertSame($expected, $container->getDefinition('parent')->getMethodCalls());
         $this->assertSame($expected, $container->getDefinition('child')->getMethodCalls());
@@ -74,9 +74,9 @@ public function testProcessDoesReplaceShared()
         $container = new ContainerBuilder();
 
         $def = $container->register('foo', 'stdClass');
-        $def->setInstanceofConditionals(array(
+        $def->setInstanceofConditionals([
             'stdClass' => (new ChildDefinition(''))->setShared(false),
-        ));
+        ]);
 
         (new ResolveInstanceofConditionalsPass())->process($container);
 
@@ -90,10 +90,10 @@ public function testProcessHandlesMultipleInheritance()
 
         $def = $container->register('foo', self::class)->setShared(true);
 
-        $def->setInstanceofConditionals(array(
+        $def->setInstanceofConditionals([
             parent::class => (new ChildDefinition(''))->setLazy(true)->setShared(false),
             self::class => (new ChildDefinition(''))->setAutowired(true),
-        ));
+        ]);
 
         (new ResolveInstanceofConditionalsPass())->process($container);
         (new ResolveChildDefinitionsPass())->process($container);
@@ -108,11 +108,11 @@ public function testProcessUsesAutoconfiguredInstanceof()
     {
         $container = new ContainerBuilder();
         $def = $container->register('normal_service', self::class);
-        $def->setInstanceofConditionals(array(
+        $def->setInstanceofConditionals([
             parent::class => (new ChildDefinition(''))
                 ->addTag('local_instanceof_tag')
                 ->setFactory('locally_set_factory'),
-        ));
+        ]);
         $def->setAutoconfigured(true);
         $container->registerForAutoconfiguration(parent::class)
             ->addTag('autoconfigured_tag')
@@ -128,7 +128,7 @@ public function testProcessUsesAutoconfiguredInstanceof()
         // factory from the specific instanceof overrides global one
         $this->assertEquals('locally_set_factory', $def->getFactory());
         // tags are merged, the locally set one is first
-        $this->assertSame(array('local_instanceof_tag' => array(array()), 'autoconfigured_tag' => array(array())), $def->getTags());
+        $this->assertSame(['local_instanceof_tag' => [[]], 'autoconfigured_tag' => [[]]], $def->getTags());
     }
 
     public function testAutoconfigureInstanceofDoesNotDuplicateTags()
@@ -137,31 +137,31 @@ public function testAutoconfigureInstanceofDoesNotDuplicateTags()
         $def = $container->register('normal_service', self::class);
         $def
             ->addTag('duplicated_tag')
-            ->addTag('duplicated_tag', array('and_attributes' => 1))
+            ->addTag('duplicated_tag', ['and_attributes' => 1])
         ;
-        $def->setInstanceofConditionals(array(
+        $def->setInstanceofConditionals([
             parent::class => (new ChildDefinition(''))->addTag('duplicated_tag'),
-        ));
+        ]);
         $def->setAutoconfigured(true);
         $container->registerForAutoconfiguration(parent::class)
-            ->addTag('duplicated_tag', array('and_attributes' => 1))
+            ->addTag('duplicated_tag', ['and_attributes' => 1])
         ;
 
         (new ResolveInstanceofConditionalsPass())->process($container);
         (new ResolveChildDefinitionsPass())->process($container);
 
         $def = $container->getDefinition('normal_service');
-        $this->assertSame(array('duplicated_tag' => array(array(), array('and_attributes' => 1))), $def->getTags());
+        $this->assertSame(['duplicated_tag' => [[], ['and_attributes' => 1]]], $def->getTags());
     }
 
     public function testProcessDoesNotUseAutoconfiguredInstanceofIfNotEnabled()
     {
         $container = new ContainerBuilder();
         $def = $container->register('normal_service', self::class);
-        $def->setInstanceofConditionals(array(
+        $def->setInstanceofConditionals([
             parent::class => (new ChildDefinition(''))
                 ->addTag('foo_tag'),
-        ));
+        ]);
         $container->registerForAutoconfiguration(parent::class)
             ->setAutowired(true);
 
@@ -180,10 +180,10 @@ public function testBadInterfaceThrowsException()
     {
         $container = new ContainerBuilder();
         $def = $container->register('normal_service', self::class);
-        $def->setInstanceofConditionals(array(
+        $def->setInstanceofConditionals([
             'App\\FakeInterface' => (new ChildDefinition(''))
                 ->addTag('foo_tag'),
-        ));
+        ]);
 
         (new ResolveInstanceofConditionalsPass())->process($container);
     }
@@ -236,9 +236,9 @@ public function testMergeReset()
             ->addMethodCall('setB')
             ->setDecoratedService('foo')
             ->addTag('t')
-            ->setInstanceofConditionals(array(
+            ->setInstanceofConditionals([
                 parent::class => (new ChildDefinition(''))->addTag('bar'),
-            ))
+            ])
         ;
 
         (new ResolveInstanceofConditionalsPass())->process($container);
@@ -255,13 +255,13 @@ public function testMergeReset()
     public function testBindings()
     {
         $container = new ContainerBuilder();
-        $def = $container->register('foo', self::class)->setBindings(array('$toto' => 123));
-        $def->setInstanceofConditionals(array(parent::class => new ChildDefinition('')));
+        $def = $container->register('foo', self::class)->setBindings(['$toto' => 123]);
+        $def->setInstanceofConditionals([parent::class => new ChildDefinition('')]);
 
         (new ResolveInstanceofConditionalsPass())->process($container);
 
         $bindings = $container->getDefinition('foo')->getBindings();
-        $this->assertSame(array('$toto'), array_keys($bindings));
+        $this->assertSame(['$toto'], array_keys($bindings));
         $this->assertInstanceOf(BoundArgument::class, $bindings['$toto']);
         $this->assertSame(123, $bindings['$toto']->getValues()[0]);
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInvalidReferencesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInvalidReferencesPassTest.php
index 61bad48a54668..817cc64ce31d7 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInvalidReferencesPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInvalidReferencesPassTest.php
@@ -25,17 +25,17 @@ public function testProcess()
         $container = new ContainerBuilder();
         $def = $container
             ->register('foo')
-            ->setArguments(array(
+            ->setArguments([
                 new Reference('bar', ContainerInterface::NULL_ON_INVALID_REFERENCE),
                 new Reference('baz', ContainerInterface::IGNORE_ON_INVALID_REFERENCE),
-            ))
-            ->addMethodCall('foo', array(new Reference('moo', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)))
+            ])
+            ->addMethodCall('foo', [new Reference('moo', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)])
         ;
 
         $this->process($container);
 
         $arguments = $def->getArguments();
-        $this->assertSame(array(null, null), $arguments);
+        $this->assertSame([null, null], $arguments);
         $this->assertCount(0, $def->getMethodCalls());
     }
 
@@ -45,19 +45,19 @@ public function testProcessIgnoreInvalidArgumentInCollectionArgument()
         $container->register('baz');
         $def = $container
             ->register('foo')
-            ->setArguments(array(
-                array(
+            ->setArguments([
+                [
                     new Reference('bar', ContainerInterface::IGNORE_ON_INVALID_REFERENCE),
                     $baz = new Reference('baz', ContainerInterface::IGNORE_ON_INVALID_REFERENCE),
                     new Reference('moo', ContainerInterface::NULL_ON_INVALID_REFERENCE),
-                ),
-            ))
+                ],
+            ])
         ;
 
         $this->process($container);
 
         $arguments = $def->getArguments();
-        $this->assertSame(array($baz, null), $arguments[0]);
+        $this->assertSame([$baz, null], $arguments[0]);
     }
 
     public function testProcessKeepMethodCallOnInvalidArgumentInCollectionArgument()
@@ -66,20 +66,20 @@ public function testProcessKeepMethodCallOnInvalidArgumentInCollectionArgument()
         $container->register('baz');
         $def = $container
             ->register('foo')
-            ->addMethodCall('foo', array(
-                array(
+            ->addMethodCall('foo', [
+                [
                     new Reference('bar', ContainerInterface::IGNORE_ON_INVALID_REFERENCE),
                     $baz = new Reference('baz', ContainerInterface::IGNORE_ON_INVALID_REFERENCE),
                     new Reference('moo', ContainerInterface::NULL_ON_INVALID_REFERENCE),
-                ),
-            ))
+                ],
+            ])
         ;
 
         $this->process($container);
 
         $calls = $def->getMethodCalls();
         $this->assertCount(1, $def->getMethodCalls());
-        $this->assertSame(array($baz, null), $calls[0][1][0]);
+        $this->assertSame([$baz, null], $calls[0][1][0]);
     }
 
     public function testProcessIgnoreNonExistentServices()
@@ -87,7 +87,7 @@ public function testProcessIgnoreNonExistentServices()
         $container = new ContainerBuilder();
         $def = $container
             ->register('foo')
-            ->setArguments(array(new Reference('bar')))
+            ->setArguments([new Reference('bar')])
         ;
 
         $this->process($container);
@@ -106,7 +106,7 @@ public function testProcessRemovesPropertiesOnInvalid()
 
         $this->process($container);
 
-        $this->assertEquals(array(), $def->getProperties());
+        $this->assertEquals([], $def->getProperties());
     }
 
     public function testProcessRemovesArgumentsOnInvalid()
@@ -114,17 +114,17 @@ public function testProcessRemovesArgumentsOnInvalid()
         $container = new ContainerBuilder();
         $def = $container
             ->register('foo')
-            ->addArgument(array(
-                array(
+            ->addArgument([
+                [
                     new Reference('bar', ContainerInterface::IGNORE_ON_INVALID_REFERENCE),
                     new ServiceClosureArgument(new Reference('baz', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)),
-                ),
-            ))
+                ],
+            ])
         ;
 
         $this->process($container);
 
-        $this->assertSame(array(array(array())), $def->getArguments());
+        $this->assertSame([[[]]], $def->getArguments());
     }
 
     protected function process(ContainerBuilder $container)
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveNamedArgumentsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveNamedArgumentsPassTest.php
index fe681b41df788..f5f1122742da1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveNamedArgumentsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveNamedArgumentsPassTest.php
@@ -29,18 +29,18 @@ public function testProcess()
         $container = new ContainerBuilder();
 
         $definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
-        $definition->setArguments(array(
+        $definition->setArguments([
             2 => 'http://api.example.com',
             '$apiKey' => '123',
             0 => new Reference('foo'),
-        ));
-        $definition->addMethodCall('setApiKey', array('$apiKey' => '123'));
+        ]);
+        $definition->addMethodCall('setApiKey', ['$apiKey' => '123']);
 
         $pass = new ResolveNamedArgumentsPass();
         $pass->process($container);
 
-        $this->assertEquals(array(0 => new Reference('foo'), 1 => '123', 2 => 'http://api.example.com'), $definition->getArguments());
-        $this->assertEquals(array(array('setApiKey', array('123'))), $definition->getMethodCalls());
+        $this->assertEquals([0 => new Reference('foo'), 1 => '123', 2 => 'http://api.example.com'], $definition->getArguments());
+        $this->assertEquals([['setApiKey', ['123']]], $definition->getMethodCalls());
     }
 
     public function testWithFactory()
@@ -49,13 +49,13 @@ public function testWithFactory()
 
         $container->register('factory', NoConstructor::class);
         $definition = $container->register('foo', NoConstructor::class)
-            ->setFactory(array(new Reference('factory'), 'create'))
-            ->setArguments(array('$apiKey' => '123'));
+            ->setFactory([new Reference('factory'), 'create'])
+            ->setArguments(['$apiKey' => '123']);
 
         $pass = new ResolveNamedArgumentsPass();
         $pass->process($container);
 
-        $this->assertSame(array(0 => '123'), $definition->getArguments());
+        $this->assertSame([0 => '123'], $definition->getArguments());
     }
 
     /**
@@ -66,7 +66,7 @@ public function testClassNull()
         $container = new ContainerBuilder();
 
         $definition = $container->register(NamedArgumentsDummy::class);
-        $definition->setArguments(array('$apiKey' => '123'));
+        $definition->setArguments(['$apiKey' => '123']);
 
         $pass = new ResolveNamedArgumentsPass();
         $pass->process($container);
@@ -80,7 +80,7 @@ public function testClassNotExist()
         $container = new ContainerBuilder();
 
         $definition = $container->register(NotExist::class, NotExist::class);
-        $definition->setArguments(array('$apiKey' => '123'));
+        $definition->setArguments(['$apiKey' => '123']);
 
         $pass = new ResolveNamedArgumentsPass();
         $pass->process($container);
@@ -94,7 +94,7 @@ public function testClassNoConstructor()
         $container = new ContainerBuilder();
 
         $definition = $container->register(NoConstructor::class, NoConstructor::class);
-        $definition->setArguments(array('$apiKey' => '123'));
+        $definition->setArguments(['$apiKey' => '123']);
 
         $pass = new ResolveNamedArgumentsPass();
         $pass->process($container);
@@ -108,7 +108,7 @@ public function testArgumentNotFound()
         $container = new ContainerBuilder();
 
         $definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
-        $definition->setArguments(array('$notFound' => '123'));
+        $definition->setArguments(['$notFound' => '123']);
 
         $pass = new ResolveNamedArgumentsPass();
         $pass->process($container);
@@ -119,12 +119,12 @@ public function testTypedArgument()
         $container = new ContainerBuilder();
 
         $definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
-        $definition->setArguments(array('$apiKey' => '123', CaseSensitiveClass::class => new Reference('foo')));
+        $definition->setArguments(['$apiKey' => '123', CaseSensitiveClass::class => new Reference('foo')]);
 
         $pass = new ResolveNamedArgumentsPass();
         $pass->process($container);
 
-        $this->assertEquals(array(new Reference('foo'), '123'), $definition->getArguments());
+        $this->assertEquals([new Reference('foo'), '123'], $definition->getArguments());
     }
 
     public function testResolvesMultipleArgumentsOfTheSameType()
@@ -132,12 +132,12 @@ public function testResolvesMultipleArgumentsOfTheSameType()
         $container = new ContainerBuilder();
 
         $definition = $container->register(SimilarArgumentsDummy::class, SimilarArgumentsDummy::class);
-        $definition->setArguments(array(CaseSensitiveClass::class => new Reference('foo'), '$token' => 'qwerty'));
+        $definition->setArguments([CaseSensitiveClass::class => new Reference('foo'), '$token' => 'qwerty']);
 
         $pass = new ResolveNamedArgumentsPass();
         $pass->process($container);
 
-        $this->assertEquals(array(new Reference('foo'), 'qwerty', new Reference('foo')), $definition->getArguments());
+        $this->assertEquals([new Reference('foo'), 'qwerty', new Reference('foo')], $definition->getArguments());
     }
 
     public function testResolvePrioritizeNamedOverType()
@@ -145,12 +145,12 @@ public function testResolvePrioritizeNamedOverType()
         $container = new ContainerBuilder();
 
         $definition = $container->register(SimilarArgumentsDummy::class, SimilarArgumentsDummy::class);
-        $definition->setArguments(array(CaseSensitiveClass::class => new Reference('foo'), '$token' => 'qwerty', '$class1' => new Reference('bar')));
+        $definition->setArguments([CaseSensitiveClass::class => new Reference('foo'), '$token' => 'qwerty', '$class1' => new Reference('bar')]);
 
         $pass = new ResolveNamedArgumentsPass();
         $pass->process($container);
 
-        $this->assertEquals(array(new Reference('bar'), 'qwerty', new Reference('foo')), $definition->getArguments());
+        $this->assertEquals([new Reference('bar'), 'qwerty', new Reference('foo')], $definition->getArguments());
     }
 }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php
index a34e007de7f00..5aa6471751f24 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php
@@ -36,22 +36,22 @@ public function testClassParametersShouldBeResolved()
 
     public function testFactoryParametersShouldBeResolved()
     {
-        $this->assertSame(array('FooFactory', 'getFoo'), $this->fooDefinition->getFactory());
+        $this->assertSame(['FooFactory', 'getFoo'], $this->fooDefinition->getFactory());
     }
 
     public function testArgumentParametersShouldBeResolved()
     {
-        $this->assertSame(array('bar', array('bar' => 'baz')), $this->fooDefinition->getArguments());
+        $this->assertSame(['bar', ['bar' => 'baz']], $this->fooDefinition->getArguments());
     }
 
     public function testMethodCallParametersShouldBeResolved()
     {
-        $this->assertSame(array(array('foobar', array('bar', array('bar' => 'baz')))), $this->fooDefinition->getMethodCalls());
+        $this->assertSame([['foobar', ['bar', ['bar' => 'baz']]]], $this->fooDefinition->getMethodCalls());
     }
 
     public function testPropertyParametersShouldBeResolved()
     {
-        $this->assertSame(array('bar' => 'baz'), $this->fooDefinition->getProperties());
+        $this->assertSame(['bar' => 'baz'], $this->fooDefinition->getProperties());
     }
 
     public function testFileParametersShouldBeResolved()
@@ -78,7 +78,7 @@ private function createContainerBuilder()
         $containerBuilder->setParameter('foo.class', 'Foo');
         $containerBuilder->setParameter('foo.factory.class', 'FooFactory');
         $containerBuilder->setParameter('foo.arg1', 'bar');
-        $containerBuilder->setParameter('foo.arg2', array('%foo.arg1%' => 'baz'));
+        $containerBuilder->setParameter('foo.arg2', ['%foo.arg1%' => 'baz']);
         $containerBuilder->setParameter('foo.method', 'foobar');
         $containerBuilder->setParameter('foo.property.name', 'bar');
         $containerBuilder->setParameter('foo.property.value', 'baz');
@@ -86,12 +86,12 @@ private function createContainerBuilder()
         $containerBuilder->setParameter('alias.id', 'bar');
 
         $fooDefinition = $containerBuilder->register('foo', '%foo.class%');
-        $fooDefinition->setFactory(array('%foo.factory.class%', 'getFoo'));
-        $fooDefinition->setArguments(array('%foo.arg1%', array('%foo.arg1%' => 'baz')));
-        $fooDefinition->addMethodCall('%foo.method%', array('%foo.arg1%', '%foo.arg2%'));
+        $fooDefinition->setFactory(['%foo.factory.class%', 'getFoo']);
+        $fooDefinition->setArguments(['%foo.arg1%', ['%foo.arg1%' => 'baz']]);
+        $fooDefinition->addMethodCall('%foo.method%', ['%foo.arg1%', '%foo.arg2%']);
         $fooDefinition->setProperty('%foo.property.name%', '%foo.property.value%');
         $fooDefinition->setFile('%foo.file%');
-        $fooDefinition->setBindings(array('$baz' => '%env(BAZ)%'));
+        $fooDefinition->setBindings(['$baz' => '%env(BAZ)%']);
 
         $containerBuilder->setAlias('%alias.id%', 'foo');
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php
index 6fb619718a646..55b47057b1fd5 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php
@@ -26,7 +26,7 @@ public function testProcess()
         $container->setAlias('bar', 'foo');
         $def = $container
             ->register('moo')
-            ->setArguments(array(new Reference('bar')))
+            ->setArguments([new Reference('bar')])
         ;
 
         $this->process($container);
@@ -42,7 +42,7 @@ public function testProcessRecursively()
         $container->setAlias('moo', 'bar');
         $def = $container
             ->register('foobar')
-            ->setArguments(array(new Reference('moo')))
+            ->setArguments([new Reference('moo')])
         ;
 
         $this->process($container);
@@ -68,10 +68,10 @@ public function testResolveFactory()
         $container->register('factory', 'Factory');
         $container->setAlias('factory_alias', new Alias('factory'));
         $foo = new Definition();
-        $foo->setFactory(array(new Reference('factory_alias'), 'createFoo'));
+        $foo->setFactory([new Reference('factory_alias'), 'createFoo']);
         $container->setDefinition('foo', $foo);
         $bar = new Definition();
-        $bar->setFactory(array('Factory', 'createFoo'));
+        $bar->setFactory(['Factory', 'createFoo']);
         $container->setDefinition('bar', $bar);
 
         $this->process($container);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Config/ContainerParametersResourceCheckerTest.php b/src/Symfony/Component/DependencyInjection/Tests/Config/ContainerParametersResourceCheckerTest.php
index a91934b3ef8f0..fc2d85ecf9560 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Config/ContainerParametersResourceCheckerTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Config/ContainerParametersResourceCheckerTest.php
@@ -30,7 +30,7 @@ class ContainerParametersResourceCheckerTest extends TestCase
 
     protected function setUp()
     {
-        $this->resource = new ContainerParametersResource(array('locales' => array('fr', 'en'), 'default_locale' => 'fr'));
+        $this->resource = new ContainerParametersResource(['locales' => ['fr', 'en'], 'default_locale' => 'fr']);
         $this->container = $this->getMockBuilder(ContainerInterface::class)->getMock();
         $this->resourceChecker = new ContainerParametersResourceChecker($this->container);
     }
@@ -52,26 +52,26 @@ public function testIsFresh(callable $mockContainer, $expected)
 
     public function isFreshProvider()
     {
-        yield 'not fresh on missing parameter' => array(function (\PHPUnit_Framework_MockObject_MockObject $container) {
+        yield 'not fresh on missing parameter' => [function (\PHPUnit_Framework_MockObject_MockObject $container) {
             $container->method('hasParameter')->with('locales')->willReturn(false);
-        }, false);
+        }, false];
 
-        yield 'not fresh on different value' => array(function (\PHPUnit_Framework_MockObject_MockObject $container) {
-            $container->method('getParameter')->with('locales')->willReturn(array('nl', 'es'));
-        }, false);
+        yield 'not fresh on different value' => [function (\PHPUnit_Framework_MockObject_MockObject $container) {
+            $container->method('getParameter')->with('locales')->willReturn(['nl', 'es']);
+        }, false];
 
-        yield 'fresh on every identical parameters' => array(function (\PHPUnit_Framework_MockObject_MockObject $container) {
+        yield 'fresh on every identical parameters' => [function (\PHPUnit_Framework_MockObject_MockObject $container) {
             $container->expects($this->exactly(2))->method('hasParameter')->willReturn(true);
             $container->expects($this->exactly(2))->method('getParameter')
                 ->withConsecutive(
-                    array($this->equalTo('locales')),
-                    array($this->equalTo('default_locale'))
+                    [$this->equalTo('locales')],
+                    [$this->equalTo('default_locale')]
                 )
-                ->will($this->returnValueMap(array(
-                    array('locales', array('fr', 'en')),
-                    array('default_locale', 'fr'),
-                )))
+                ->will($this->returnValueMap([
+                    ['locales', ['fr', 'en']],
+                    ['default_locale', 'fr'],
+                ]))
             ;
-        }, true);
+        }, true];
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Config/ContainerParametersResourceTest.php b/src/Symfony/Component/DependencyInjection/Tests/Config/ContainerParametersResourceTest.php
index 4da4766f27253..e177ac16b80f7 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Config/ContainerParametersResourceTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Config/ContainerParametersResourceTest.php
@@ -21,7 +21,7 @@ class ContainerParametersResourceTest extends TestCase
 
     protected function setUp()
     {
-        $this->resource = new ContainerParametersResource(array('locales' => array('fr', 'en'), 'default_locale' => 'fr'));
+        $this->resource = new ContainerParametersResource(['locales' => ['fr', 'en'], 'default_locale' => 'fr']);
     }
 
     public function testToString()
@@ -38,6 +38,6 @@ public function testSerializeUnserialize()
 
     public function testGetParameters()
     {
-        $this->assertSame(array('locales' => array('fr', 'en'), 'default_locale' => 'fr'), $this->resource->getParameters());
+        $this->assertSame(['locales' => ['fr', 'en'], 'default_locale' => 'fr'], $this->resource->getParameters());
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
index 0bf1befa3f84d..b28a83286a181 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -62,10 +62,10 @@ public function testDefaultRegisteredDefinitions()
     public function testDefinitions()
     {
         $builder = new ContainerBuilder();
-        $definitions = array(
+        $definitions = [
             'foo' => new Definition('Bar\FooClass'),
             'bar' => new Definition('BarClass'),
-        );
+        ];
         $builder->setDefinitions($definitions);
         $this->assertEquals($definitions, $builder->getDefinitions(), '->setDefinitions() sets the service definitions');
         $this->assertTrue($builder->hasDefinition('foo'), '->hasDefinition() returns true if a service definition exists');
@@ -75,7 +75,7 @@ public function testDefinitions()
         $this->assertEquals($foo, $builder->getDefinition('foobar'), '->getDefinition() returns a service definition if defined');
         $this->assertSame($builder->setDefinition('foobar', $foo = new Definition('FooBarClass')), $foo, '->setDefinition() implements a fluid interface by returning the service reference');
 
-        $builder->addDefinitions($defs = array('foobar' => new Definition('FooBarClass')));
+        $builder->addDefinitions($defs = ['foobar' => new Definition('FooBarClass')]);
         $this->assertEquals(array_merge($definitions, $defs), $builder->getDefinitions(), '->addDefinitions() adds the service definitions');
 
         try {
@@ -150,7 +150,7 @@ public function testGetReturnsNullIfServiceDoesNotExistAndInvalidReferenceIsUsed
     public function testGetThrowsCircularReferenceExceptionIfServiceHasReferenceToItself()
     {
         $builder = new ContainerBuilder();
-        $builder->register('baz', 'stdClass')->setArguments(array(new Reference('baz')));
+        $builder->register('baz', 'stdClass')->setArguments([new Reference('baz')]);
         $builder->get('baz');
     }
 
@@ -221,13 +221,13 @@ public function testGetServiceIds()
         $builder->bar = $bar = new \stdClass();
         $builder->register('bar', 'stdClass');
         $this->assertEquals(
-            array(
+            [
                 'service_container',
                 'foo',
                 'bar',
                 'Psr\Container\ContainerInterface',
                 'Symfony\Component\DependencyInjection\ContainerInterface',
-            ),
+            ],
             $builder->getServiceIds(),
             '->getServiceIds() returns all defined service ids'
         );
@@ -284,7 +284,7 @@ public function testGetAliases()
     public function testSetAliases()
     {
         $builder = new ContainerBuilder();
-        $builder->setAliases(array('bar' => 'foo', 'foobar' => 'foo'));
+        $builder->setAliases(['bar' => 'foo', 'foobar' => 'foo']);
 
         $aliases = $builder->getAliases();
         $this->assertArrayHasKey('bar', $aliases);
@@ -294,8 +294,8 @@ public function testSetAliases()
     public function testAddAliases()
     {
         $builder = new ContainerBuilder();
-        $builder->setAliases(array('bar' => 'foo'));
-        $builder->addAliases(array('foobar' => 'foo'));
+        $builder->setAliases(['bar' => 'foo']);
+        $builder->addAliases(['foobar' => 'foo']);
 
         $aliases = $builder->getAliases();
         $this->assertArrayHasKey('bar', $aliases);
@@ -317,7 +317,7 @@ public function testAliasesKeepInvalidBehavior()
         $builder = new ContainerBuilder();
 
         $aliased = new Definition('stdClass');
-        $aliased->addMethodCall('setBar', array(new Reference('bar', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)));
+        $aliased->addMethodCall('setBar', [new Reference('bar', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]);
         $builder->setDefinition('aliased', $aliased);
         $builder->setAlias('alias', 'aliased');
 
@@ -373,18 +373,18 @@ public function testCreateServiceArguments()
     {
         $builder = new ContainerBuilder();
         $builder->register('bar', 'stdClass');
-        $builder->register('foo1', 'Bar\FooClass')->addArgument(array('foo' => '%value%', '%value%' => 'foo', new Reference('bar'), '%%unescape_it%%'));
+        $builder->register('foo1', 'Bar\FooClass')->addArgument(['foo' => '%value%', '%value%' => 'foo', new Reference('bar'), '%%unescape_it%%']);
         $builder->setParameter('value', 'bar');
-        $this->assertEquals(array('foo' => 'bar', 'bar' => 'foo', $builder->get('bar'), '%unescape_it%'), $builder->get('foo1')->arguments, '->createService() replaces parameters and service references in the arguments provided by the service definition');
+        $this->assertEquals(['foo' => 'bar', 'bar' => 'foo', $builder->get('bar'), '%unescape_it%'], $builder->get('foo1')->arguments, '->createService() replaces parameters and service references in the arguments provided by the service definition');
     }
 
     public function testCreateServiceFactory()
     {
         $builder = new ContainerBuilder();
         $builder->register('foo', 'Bar\FooClass')->setFactory('Bar\FooClass::getInstance');
-        $builder->register('qux', 'Bar\FooClass')->setFactory(array('Bar\FooClass', 'getInstance'));
-        $builder->register('bar', 'Bar\FooClass')->setFactory(array(new Definition('Bar\FooClass'), 'getInstance'));
-        $builder->register('baz', 'Bar\FooClass')->setFactory(array(new Reference('bar'), 'getInstance'));
+        $builder->register('qux', 'Bar\FooClass')->setFactory(['Bar\FooClass', 'getInstance']);
+        $builder->register('bar', 'Bar\FooClass')->setFactory([new Definition('Bar\FooClass'), 'getInstance']);
+        $builder->register('baz', 'Bar\FooClass')->setFactory([new Reference('bar'), 'getInstance']);
 
         $this->assertTrue($builder->get('foo')->called, '->createService() calls the factory method to create the service instance');
         $this->assertTrue($builder->get('qux')->called, '->createService() calls the factory method to create the service instance');
@@ -396,38 +396,38 @@ public function testCreateServiceMethodCalls()
     {
         $builder = new ContainerBuilder();
         $builder->register('bar', 'stdClass');
-        $builder->register('foo1', 'Bar\FooClass')->addMethodCall('setBar', array(array('%value%', new Reference('bar'))));
+        $builder->register('foo1', 'Bar\FooClass')->addMethodCall('setBar', [['%value%', new Reference('bar')]]);
         $builder->setParameter('value', 'bar');
-        $this->assertEquals(array('bar', $builder->get('bar')), $builder->get('foo1')->bar, '->createService() replaces the values in the method calls arguments');
+        $this->assertEquals(['bar', $builder->get('bar')], $builder->get('foo1')->bar, '->createService() replaces the values in the method calls arguments');
     }
 
     public function testCreateServiceMethodCallsWithEscapedParam()
     {
         $builder = new ContainerBuilder();
         $builder->register('bar', 'stdClass');
-        $builder->register('foo1', 'Bar\FooClass')->addMethodCall('setBar', array(array('%%unescape_it%%')));
+        $builder->register('foo1', 'Bar\FooClass')->addMethodCall('setBar', [['%%unescape_it%%']]);
         $builder->setParameter('value', 'bar');
-        $this->assertEquals(array('%unescape_it%'), $builder->get('foo1')->bar, '->createService() replaces the values in the method calls arguments');
+        $this->assertEquals(['%unescape_it%'], $builder->get('foo1')->bar, '->createService() replaces the values in the method calls arguments');
     }
 
     public function testCreateServiceProperties()
     {
         $builder = new ContainerBuilder();
         $builder->register('bar', 'stdClass');
-        $builder->register('foo1', 'Bar\FooClass')->setProperty('bar', array('%value%', new Reference('bar'), '%%unescape_it%%'));
+        $builder->register('foo1', 'Bar\FooClass')->setProperty('bar', ['%value%', new Reference('bar'), '%%unescape_it%%']);
         $builder->setParameter('value', 'bar');
-        $this->assertEquals(array('bar', $builder->get('bar'), '%unescape_it%'), $builder->get('foo1')->bar, '->createService() replaces the values in the properties');
+        $this->assertEquals(['bar', $builder->get('bar'), '%unescape_it%'], $builder->get('foo1')->bar, '->createService() replaces the values in the properties');
     }
 
     public function testCreateServiceConfigurator()
     {
         $builder = new ContainerBuilder();
         $builder->register('foo1', 'Bar\FooClass')->setConfigurator('sc_configure');
-        $builder->register('foo2', 'Bar\FooClass')->setConfigurator(array('%class%', 'configureStatic'));
+        $builder->register('foo2', 'Bar\FooClass')->setConfigurator(['%class%', 'configureStatic']);
         $builder->setParameter('class', 'BazClass');
         $builder->register('baz', 'BazClass');
-        $builder->register('foo3', 'Bar\FooClass')->setConfigurator(array(new Reference('baz'), 'configure'));
-        $builder->register('foo4', 'Bar\FooClass')->setConfigurator(array($builder->getDefinition('baz'), 'configure'));
+        $builder->register('foo3', 'Bar\FooClass')->setConfigurator([new Reference('baz'), 'configure']);
+        $builder->register('foo4', 'Bar\FooClass')->setConfigurator([$builder->getDefinition('baz'), 'configure']);
         $builder->register('foo5', 'Bar\FooClass')->setConfigurator('foo');
 
         $this->assertTrue($builder->get('foo1')->configured, '->createService() calls the configurator');
@@ -449,10 +449,10 @@ public function testCreateServiceWithIteratorArgument()
         $builder->register('bar', 'stdClass');
         $builder
             ->register('lazy_context', 'LazyContext')
-            ->setArguments(array(
-                new IteratorArgument(array('k1' => new Reference('bar'), new Reference('invalid', ContainerInterface::IGNORE_ON_INVALID_REFERENCE))),
-                new IteratorArgument(array()),
-            ))
+            ->setArguments([
+                new IteratorArgument(['k1' => new Reference('bar'), new Reference('invalid', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]),
+                new IteratorArgument([]),
+            ])
         ;
 
         $lazyContext = $builder->get('lazy_context');
@@ -494,7 +494,7 @@ public function testCreateServiceWithExpression()
         $builder = new ContainerBuilder();
         $builder->setParameter('bar', 'bar');
         $builder->register('bar', 'BarClass');
-        $builder->register('foo', 'Bar\FooClass')->addArgument(array('foo' => new Expression('service("bar").foo ~ parameter("bar")')));
+        $builder->register('foo', 'Bar\FooClass')->addArgument(['foo' => new Expression('service("bar").foo ~ parameter("bar")')]);
         $this->assertEquals('foobar', $builder->get('foo')->arguments['foo']);
     }
 
@@ -503,7 +503,7 @@ public function testResolveServices()
         $builder = new ContainerBuilder();
         $builder->register('foo', 'Bar\FooClass');
         $this->assertEquals($builder->get('foo'), $builder->resolveServices(new Reference('foo')), '->resolveServices() resolves service references to service instances');
-        $this->assertEquals(array('foo' => array('foo', $builder->get('foo'))), $builder->resolveServices(array('foo' => array('foo', new Reference('foo')))), '->resolveServices() resolves service references to service instances in nested arrays');
+        $this->assertEquals(['foo' => ['foo', $builder->get('foo')]], $builder->resolveServices(['foo' => ['foo', new Reference('foo')]]), '->resolveServices() resolves service references to service instances in nested arrays');
         $this->assertEquals($builder->get('foo'), $builder->resolveServices(new Expression('service("foo")')), '->resolveServices() resolves expressions');
     }
 
@@ -531,25 +531,25 @@ public function testResolveServicesWithCustomDefinitionClass()
 
     public function testMerge()
     {
-        $container = new ContainerBuilder(new ParameterBag(array('bar' => 'foo')));
+        $container = new ContainerBuilder(new ParameterBag(['bar' => 'foo']));
         $container->setResourceTracking(false);
-        $config = new ContainerBuilder(new ParameterBag(array('foo' => 'bar')));
+        $config = new ContainerBuilder(new ParameterBag(['foo' => 'bar']));
         $container->merge($config);
-        $this->assertEquals(array('bar' => 'foo', 'foo' => 'bar'), $container->getParameterBag()->all(), '->merge() merges current parameters with the loaded ones');
+        $this->assertEquals(['bar' => 'foo', 'foo' => 'bar'], $container->getParameterBag()->all(), '->merge() merges current parameters with the loaded ones');
 
-        $container = new ContainerBuilder(new ParameterBag(array('bar' => 'foo')));
+        $container = new ContainerBuilder(new ParameterBag(['bar' => 'foo']));
         $container->setResourceTracking(false);
-        $config = new ContainerBuilder(new ParameterBag(array('foo' => '%bar%')));
+        $config = new ContainerBuilder(new ParameterBag(['foo' => '%bar%']));
         $container->merge($config);
         $container->compile();
-        $this->assertEquals(array('bar' => 'foo', 'foo' => 'foo'), $container->getParameterBag()->all(), '->merge() evaluates the values of the parameters towards already defined ones');
+        $this->assertEquals(['bar' => 'foo', 'foo' => 'foo'], $container->getParameterBag()->all(), '->merge() evaluates the values of the parameters towards already defined ones');
 
-        $container = new ContainerBuilder(new ParameterBag(array('bar' => 'foo')));
+        $container = new ContainerBuilder(new ParameterBag(['bar' => 'foo']));
         $container->setResourceTracking(false);
-        $config = new ContainerBuilder(new ParameterBag(array('foo' => '%bar%', 'baz' => '%foo%')));
+        $config = new ContainerBuilder(new ParameterBag(['foo' => '%bar%', 'baz' => '%foo%']));
         $container->merge($config);
         $container->compile();
-        $this->assertEquals(array('bar' => 'foo', 'foo' => 'foo', 'baz' => 'foo'), $container->getParameterBag()->all(), '->merge() evaluates the values of the parameters towards already defined ones');
+        $this->assertEquals(['bar' => 'foo', 'foo' => 'foo', 'baz' => 'foo'], $container->getParameterBag()->all(), '->merge() evaluates the values of the parameters towards already defined ones');
 
         $container = new ContainerBuilder();
         $container->setResourceTracking(false);
@@ -559,7 +559,7 @@ public function testMerge()
         $config->setDefinition('baz', new Definition('BazClass'));
         $config->setAlias('alias_for_foo', 'foo');
         $container->merge($config);
-        $this->assertEquals(array('service_container', 'foo', 'bar', 'baz'), array_keys($container->getDefinitions()), '->merge() merges definitions already defined ones');
+        $this->assertEquals(['service_container', 'foo', 'bar', 'baz'], array_keys($container->getDefinitions()), '->merge() merges definitions already defined ones');
 
         $aliases = $container->getAliases();
         $this->assertArrayHasKey('alias_for_foo', $aliases);
@@ -576,16 +576,16 @@ public function testMerge()
         $bag = new EnvPlaceholderParameterBag();
         $bag->get('env(Foo)');
         $config = new ContainerBuilder($bag);
-        $this->assertSame(array('%env(Bar)%'), $config->resolveEnvPlaceholders(array($bag->get('env(Bar)'))));
+        $this->assertSame(['%env(Bar)%'], $config->resolveEnvPlaceholders([$bag->get('env(Bar)')]));
         $container->merge($config);
-        $this->assertEquals(array('Foo' => 0, 'Bar' => 1), $container->getEnvCounters());
+        $this->assertEquals(['Foo' => 0, 'Bar' => 1], $container->getEnvCounters());
 
         $container = new ContainerBuilder();
         $config = new ContainerBuilder();
         $childDefA = $container->registerForAutoconfiguration('AInterface');
         $childDefB = $config->registerForAutoconfiguration('BInterface');
         $container->merge($config);
-        $this->assertSame(array('AInterface' => $childDefA, 'BInterface' => $childDefB), $container->getAutoconfiguredInstanceof());
+        $this->assertSame(['AInterface' => $childDefA, 'BInterface' => $childDefB], $container->getAutoconfiguredInstanceof());
     }
 
     /**
@@ -620,7 +620,7 @@ public function testResolveEnvValuesWithArray()
     {
         $_ENV['ANOTHER_DUMMY_ENV_VAR'] = 'dummy';
 
-        $dummyArray = array('1' => 'one', '2' => 'two');
+        $dummyArray = ['1' => 'one', '2' => 'two'];
 
         $container = new ContainerBuilder();
         $container->setParameter('dummy', '%env(ANOTHER_DUMMY_ENV_VAR)%');
@@ -673,7 +673,7 @@ public function testCompileWithArrayResolveEnv()
         $container->setParameter('foo', '%env(json:ARRAY)%');
         $container->compile(true);
 
-        $this->assertSame(array('foo' => 'bar'), $container->getParameter('foo'));
+        $this->assertSame(['foo' => 'bar'], $container->getParameter('foo'));
 
         putenv('ARRAY');
     }
@@ -688,7 +688,7 @@ public function testCompileWithArrayAndAnotherResolveEnv()
         $container->setParameter('bar', '%env(DUMMY_ENV_VAR)%');
         $container->compile(true);
 
-        $this->assertSame(array('foo' => 'bar'), $container->getParameter('foo'));
+        $this->assertSame(['foo' => 'bar'], $container->getParameter('foo'));
         $this->assertSame('abc', $container->getParameter('bar'));
 
         putenv('DUMMY_ENV_VAR');
@@ -745,9 +745,9 @@ public function testCastEnv()
 
         $container->register('foo', 'stdClass')
             ->setPublic(true)
-            ->setProperties(array(
+            ->setProperties([
                 'fake' => '%env(int:FAKE)%',
-            ));
+            ]);
 
         $container->compile(true);
 
@@ -761,9 +761,9 @@ public function testEnvAreNullable()
 
         $container->register('foo', 'stdClass')
             ->setPublic(true)
-            ->setProperties(array(
+            ->setProperties([
             'fake' => '%env(int:FAKE)%',
-        ));
+        ]);
 
         $container->compile(true);
 
@@ -775,23 +775,23 @@ public function testEnvInId()
         $container = include __DIR__.'/Fixtures/containers/container_env_in_id.php';
         $container->compile(true);
 
-        $expected = array(
+        $expected = [
             'service_container',
             'foo',
             'bar',
             'bar_%env(BAR)%',
-        );
+        ];
         $this->assertSame($expected, array_keys($container->getDefinitions()));
 
-        $expected = array(
+        $expected = [
             PsrContainerInterface::class => true,
             ContainerInterface::class => true,
             'baz_%env(BAR)%' => true,
             'bar_%env(BAR)%' => true,
-        );
+        ];
         $this->assertSame($expected, $container->getRemovedIds());
 
-        $this->assertSame(array('baz_bar'), array_keys($container->getDefinition('foo')->getArgument(1)));
+        $this->assertSame(['baz_bar'], array_keys($container->getDefinition('foo')->getArgument(1)));
     }
 
     /**
@@ -829,17 +829,17 @@ public function testfindTaggedServiceIds()
         $builder = new ContainerBuilder();
         $builder
             ->register('foo', 'Bar\FooClass')
-            ->addTag('foo', array('foo' => 'foo'))
-            ->addTag('bar', array('bar' => 'bar'))
-            ->addTag('foo', array('foofoo' => 'foofoo'))
+            ->addTag('foo', ['foo' => 'foo'])
+            ->addTag('bar', ['bar' => 'bar'])
+            ->addTag('foo', ['foofoo' => 'foofoo'])
         ;
-        $this->assertEquals($builder->findTaggedServiceIds('foo'), array(
-            'foo' => array(
-                array('foo' => 'foo'),
-                array('foofoo' => 'foofoo'),
-            ),
-        ), '->findTaggedServiceIds() returns an array of service ids and its tag attributes');
-        $this->assertEquals(array(), $builder->findTaggedServiceIds('foobar'), '->findTaggedServiceIds() returns an empty array if there is annotated services');
+        $this->assertEquals($builder->findTaggedServiceIds('foo'), [
+            'foo' => [
+                ['foo' => 'foo'],
+                ['foofoo' => 'foofoo'],
+            ],
+        ], '->findTaggedServiceIds() returns an array of service ids and its tag attributes');
+        $this->assertEquals([], $builder->findTaggedServiceIds('foobar'), '->findTaggedServiceIds() returns an empty array if there is annotated services');
     }
 
     public function testFindUnusedTags()
@@ -847,11 +847,11 @@ public function testFindUnusedTags()
         $builder = new ContainerBuilder();
         $builder
             ->register('foo', 'Bar\FooClass')
-            ->addTag('kernel.event_listener', array('foo' => 'foo'))
-            ->addTag('kenrel.event_listener', array('bar' => 'bar'))
+            ->addTag('kernel.event_listener', ['foo' => 'foo'])
+            ->addTag('kenrel.event_listener', ['bar' => 'bar'])
         ;
         $builder->findTaggedServiceIds('kernel.event_listener');
-        $this->assertEquals(array('kenrel.event_listener'), $builder->findUnusedTags(), '->findUnusedTags() returns an array with unused tags');
+        $this->assertEquals(['kenrel.event_listener'], $builder->findUnusedTags(), '->findUnusedTags() returns an array with unused tags');
     }
 
     public function testFindDefinition()
@@ -981,15 +981,15 @@ public function testResources()
         $container = new ContainerBuilder();
         $container->addResource($a = new FileResource(__DIR__.'/Fixtures/xml/services1.xml'));
         $container->addResource($b = new FileResource(__DIR__.'/Fixtures/xml/services2.xml'));
-        $resources = array();
+        $resources = [];
         foreach ($container->getResources() as $resource) {
             if (false === strpos($resource, '.php')) {
                 $resources[] = $resource;
             }
         }
-        $this->assertEquals(array($a, $b), $resources, '->getResources() returns an array of resources read for the current configuration');
-        $this->assertSame($container, $container->setResources(array()));
-        $this->assertEquals(array(), $container->getResources());
+        $this->assertEquals([$a, $b], $resources, '->getResources() returns an array of resources read for the current configuration');
+        $this->assertSame($container, $container->setResources([]));
+        $this->assertEquals([], $container->getResources());
     }
 
     public function testFileExists()
@@ -1002,14 +1002,14 @@ public function testFileExists()
 
         $this->assertTrue($container->fileExists((string) $a) && $container->fileExists((string) $b) && $container->fileExists($dir));
 
-        $resources = array();
+        $resources = [];
         foreach ($container->getResources() as $resource) {
             if (false === strpos($resource, '.php')) {
                 $resources[] = $resource;
             }
         }
 
-        $this->assertEquals(array($A, $a, $b, $c), $resources, '->getResources() returns an array of resources read for the current configuration');
+        $this->assertEquals([$A, $a, $b, $c], $resources, '->getResources() returns an array of resources read for the current configuration');
     }
 
     public function testExtension()
@@ -1040,28 +1040,28 @@ public function testRegisteredAndLoadedExtension()
     {
         $extension = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\Extension\\ExtensionInterface')->getMock();
         $extension->expects($this->exactly(2))->method('getAlias')->will($this->returnValue('project'));
-        $extension->expects($this->once())->method('load')->with(array(array('foo' => 'bar')));
+        $extension->expects($this->once())->method('load')->with([['foo' => 'bar']]);
 
         $container = new ContainerBuilder();
         $container->setResourceTracking(false);
         $container->registerExtension($extension);
-        $container->loadFromExtension('project', array('foo' => 'bar'));
+        $container->loadFromExtension('project', ['foo' => 'bar']);
         $container->compile();
     }
 
     public function testPrivateServiceUser()
     {
         $fooDefinition = new Definition('BarClass');
-        $fooUserDefinition = new Definition('BarUserClass', array(new Reference('bar')));
+        $fooUserDefinition = new Definition('BarUserClass', [new Reference('bar')]);
         $container = new ContainerBuilder();
         $container->setResourceTracking(false);
 
         $fooDefinition->setPublic(false);
 
-        $container->addDefinitions(array(
+        $container->addDefinitions([
             'bar' => $fooDefinition,
             'bar_user' => $fooUserDefinition->setPublic(true),
-        ));
+        ]);
 
         $container->compile();
         $this->assertInstanceOf('BarClass', $container->get('bar_user')->bar);
@@ -1116,15 +1116,15 @@ public function testExtensionConfig()
         $configs = $container->getExtensionConfig('foo');
         $this->assertEmpty($configs);
 
-        $first = array('foo' => 'bar');
+        $first = ['foo' => 'bar'];
         $container->prependExtensionConfig('foo', $first);
         $configs = $container->getExtensionConfig('foo');
-        $this->assertEquals(array($first), $configs);
+        $this->assertEquals([$first], $configs);
 
-        $second = array('ding' => 'dong');
+        $second = ['ding' => 'dong'];
         $container->prependExtensionConfig('foo', $second);
         $configs = $container->getExtensionConfig('foo');
-        $this->assertEquals(array($second, $first), $configs);
+        $this->assertEquals([$second, $first], $configs);
     }
 
     public function testAbstractAlias()
@@ -1184,7 +1184,7 @@ public function testInlinedDefinitions()
 
         $container->register('bar', 'BarClass')
             ->setProperty('foo', $definition)
-            ->addMethodCall('setBaz', array($definition));
+            ->addMethodCall('setBaz', [$definition]);
 
         $barUser = $container->get('bar_user');
         $bar = $container->get('bar');
@@ -1202,11 +1202,11 @@ public function testThrowsCircularExceptionForCircularAliases()
     {
         $builder = new ContainerBuilder();
 
-        $builder->setAliases(array(
+        $builder->setAliases([
             'foo' => new Alias('app.test_class'),
             'app.test_class' => new Alias('App\\TestClass'),
             'App\\TestClass' => new Alias('app.test_class'),
-        ));
+        ]);
 
         $builder->findDefinition('foo');
     }
@@ -1317,12 +1317,12 @@ public function testServiceLocator()
         $container = new ContainerBuilder();
         $container->register('foo_service', ServiceLocator::class)
             ->setPublic(true)
-            ->addArgument(array(
+            ->addArgument([
                 'bar' => new ServiceClosureArgument(new Reference('bar_service')),
                 'baz' => new ServiceClosureArgument(new TypedReference('baz_service', 'stdClass')),
-            ))
+            ])
         ;
-        $container->register('bar_service', 'stdClass')->setArguments(array(new Reference('baz_service')))->setPublic(true);
+        $container->register('bar_service', 'stdClass')->setArguments([new Reference('baz_service')])->setPublic(true);
         $container->register('baz_service', 'stdClass')->setPublic(false);
         $container->compile();
 
@@ -1343,7 +1343,7 @@ public function testUninitializedReference()
         $this->assertNull($bar->closures[0]());
         $this->assertNull($bar->closures[1]());
         $this->assertNull($bar->closures[2]());
-        $this->assertSame(array(), iterator_to_array($bar->iter));
+        $this->assertSame([], iterator_to_array($bar->iter));
 
         $container = include __DIR__.'/Fixtures/containers/container_uninitialized_ref.php';
         $container->compile();
@@ -1359,7 +1359,7 @@ public function testUninitializedReference()
         $this->assertEquals(new \stdClass(), $bar->closures[0]());
         $this->assertNull($bar->closures[1]());
         $this->assertEquals(new \stdClass(), $bar->closures[2]());
-        $this->assertEquals(array('foo1' => new \stdClass(), 'foo3' => new \stdClass()), iterator_to_array($bar->iter));
+        $this->assertEquals(['foo1' => new \stdClass(), 'foo3' => new \stdClass()], iterator_to_array($bar->iter));
     }
 
     /**
@@ -1375,7 +1375,7 @@ public function testAlmostCircular($visibility)
         $foo2 = $container->get('foo2');
         $this->assertSame($foo2, $foo2->bar->foobar->foo);
 
-        $this->assertSame(array(), (array) $container->get('foobar4'));
+        $this->assertSame([], (array) $container->get('foobar4'));
 
         $foo5 = $container->get('foo5');
         $this->assertSame($foo5, $foo5->bar->foo);
@@ -1387,15 +1387,15 @@ public function testAlmostCircular($visibility)
         $this->assertEquals(new \stdClass(), $manager);
 
         $foo6 = $container->get('foo6');
-        $this->assertEquals((object) array('bar6' => (object) array()), $foo6);
+        $this->assertEquals((object) ['bar6' => (object) []], $foo6);
 
         $this->assertInstanceOf(\stdClass::class, $container->get('root'));
     }
 
     public function provideAlmostCircular()
     {
-        yield array('public');
-        yield array('private');
+        yield ['public'];
+        yield ['private'];
     }
 
     public function testRegisterForAutoconfiguration()
@@ -1403,7 +1403,7 @@ public function testRegisterForAutoconfiguration()
         $container = new ContainerBuilder();
         $childDefA = $container->registerForAutoconfiguration('AInterface');
         $childDefB = $container->registerForAutoconfiguration('BInterface');
-        $this->assertSame(array('AInterface' => $childDefA, 'BInterface' => $childDefB), $container->getAutoconfiguredInstanceof());
+        $this->assertSame(['AInterface' => $childDefA, 'BInterface' => $childDefB], $container->getAutoconfiguredInstanceof());
 
         // when called multiple times, the same instance is returned
         $this->assertSame($childDefA, $container->registerForAutoconfiguration('AInterface'));
@@ -1449,20 +1449,20 @@ public function testParameterWithMixedCase()
     public function testArgumentsHaveHigherPriorityThanBindings()
     {
         $container = new ContainerBuilder();
-        $container->register('class.via.bindings', CaseSensitiveClass::class)->setArguments(array(
+        $container->register('class.via.bindings', CaseSensitiveClass::class)->setArguments([
             'via-bindings',
-        ));
-        $container->register('class.via.argument', CaseSensitiveClass::class)->setArguments(array(
+        ]);
+        $container->register('class.via.argument', CaseSensitiveClass::class)->setArguments([
             'via-argument',
-        ));
-        $container->register('foo', SimilarArgumentsDummy::class)->setPublic(true)->setBindings(array(
+        ]);
+        $container->register('foo', SimilarArgumentsDummy::class)->setPublic(true)->setBindings([
             CaseSensitiveClass::class => new Reference('class.via.bindings'),
             '$token' => '1234',
-        ))->setArguments(array(
+        ])->setArguments([
             '$class1' => new Reference('class.via.argument'),
-        ));
+        ]);
 
-        $this->assertSame(array('service_container', 'class.via.bindings', 'class.via.argument', 'foo', 'Psr\Container\ContainerInterface', 'Symfony\Component\DependencyInjection\ContainerInterface'), $container->getServiceIds());
+        $this->assertSame(['service_container', 'class.via.bindings', 'class.via.argument', 'foo', 'Psr\Container\ContainerInterface', 'Symfony\Component\DependencyInjection\ContainerInterface'], $container->getServiceIds());
 
         $container->compile();
 
@@ -1479,10 +1479,10 @@ public function testUninitializedSyntheticReference()
 
         $container->compile();
 
-        $this->assertEquals((object) array('foo' => null), $container->get('bar'));
+        $this->assertEquals((object) ['foo' => null], $container->get('bar'));
 
-        $container->set('foo', (object) array(123));
-        $this->assertEquals((object) array('foo' => (object) array(123)), $container->get('bar'));
+        $container->set('foo', (object) [123]);
+        $this->assertEquals((object) ['foo' => (object) [123]], $container->get('bar'));
     }
 
     public function testDecoratedSelfReferenceInvolvingPrivateServices()
@@ -1498,7 +1498,7 @@ public function testDecoratedSelfReferenceInvolvingPrivateServices()
 
         $container->compile();
 
-        $this->assertSame(array('service_container'), array_keys($container->getDefinitions()));
+        $this->assertSame(['service_container'], array_keys($container->getDefinitions()));
     }
 }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
index a57f787972f22..24ab5e432eb8c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
@@ -25,8 +25,8 @@ public function testConstructor()
         $sc = new Container();
         $this->assertSame($sc, $sc->get('service_container'), '__construct() automatically registers itself as a service');
 
-        $sc = new Container(new ParameterBag(array('foo' => 'bar')));
-        $this->assertEquals(array('foo' => 'bar'), $sc->getParameterBag()->all(), '__construct() takes an array of parameters as its first argument');
+        $sc = new Container(new ParameterBag(['foo' => 'bar']));
+        $this->assertEquals(['foo' => 'bar'], $sc->getParameterBag()->all(), '__construct() takes an array of parameters as its first argument');
     }
 
     /**
@@ -39,18 +39,18 @@ public function testCamelize($id, $expected)
 
     public function dataForTestCamelize()
     {
-        return array(
-            array('foo_bar', 'FooBar'),
-            array('foo.bar', 'Foo_Bar'),
-            array('foo.bar_baz', 'Foo_BarBaz'),
-            array('foo._bar', 'Foo_Bar'),
-            array('foo_.bar', 'Foo_Bar'),
-            array('_foo', 'Foo'),
-            array('.foo', '_Foo'),
-            array('foo_', 'Foo'),
-            array('foo.', 'Foo_'),
-            array('foo\bar', 'Foo_Bar'),
-        );
+        return [
+            ['foo_bar', 'FooBar'],
+            ['foo.bar', 'Foo_Bar'],
+            ['foo.bar_baz', 'Foo_BarBaz'],
+            ['foo._bar', 'Foo_Bar'],
+            ['foo_.bar', 'Foo_Bar'],
+            ['_foo', 'Foo'],
+            ['.foo', '_Foo'],
+            ['foo_', 'Foo'],
+            ['foo.', 'Foo_'],
+            ['foo\bar', 'Foo_Bar'],
+        ];
     }
 
     /**
@@ -63,24 +63,24 @@ public function testUnderscore($id, $expected)
 
     public function dataForTestUnderscore()
     {
-        return array(
-            array('FooBar', 'foo_bar'),
-            array('Foo_Bar', 'foo.bar'),
-            array('Foo_BarBaz', 'foo.bar_baz'),
-            array('FooBar_BazQux', 'foo_bar.baz_qux'),
-            array('_Foo', '.foo'),
-            array('Foo_', 'foo.'),
-        );
+        return [
+            ['FooBar', 'foo_bar'],
+            ['Foo_Bar', 'foo.bar'],
+            ['Foo_BarBaz', 'foo.bar_baz'],
+            ['FooBar_BazQux', 'foo_bar.baz_qux'],
+            ['_Foo', '.foo'],
+            ['Foo_', 'foo.'],
+        ];
     }
 
     public function testCompile()
     {
-        $sc = new Container(new ParameterBag(array('foo' => 'bar')));
+        $sc = new Container(new ParameterBag(['foo' => 'bar']));
         $this->assertFalse($sc->getParameterBag()->isResolved(), '->compile() resolves the parameter bag');
         $sc->compile();
         $this->assertTrue($sc->getParameterBag()->isResolved(), '->compile() resolves the parameter bag');
         $this->assertInstanceOf('Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag', $sc->getParameterBag(), '->compile() changes the parameter bag to a FrozenParameterBag instance');
-        $this->assertEquals(array('foo' => 'bar'), $sc->getParameterBag()->all(), '->compile() copies the current parameters to the new parameter bag');
+        $this->assertEquals(['foo' => 'bar'], $sc->getParameterBag()->all(), '->compile() copies the current parameters to the new parameter bag');
     }
 
     /**
@@ -98,7 +98,7 @@ public function testIsFrozen()
 
     public function testIsCompiled()
     {
-        $sc = new Container(new ParameterBag(array('foo' => 'bar')));
+        $sc = new Container(new ParameterBag(['foo' => 'bar']));
         $this->assertFalse($sc->isCompiled(), '->isCompiled() returns false if the container is not compiled');
         $sc->compile();
         $this->assertTrue($sc->isCompiled(), '->isCompiled() returns true if the container is compiled');
@@ -106,19 +106,19 @@ public function testIsCompiled()
 
     public function testIsCompiledWithFrozenParameters()
     {
-        $sc = new Container(new FrozenParameterBag(array('foo' => 'bar')));
+        $sc = new Container(new FrozenParameterBag(['foo' => 'bar']));
         $this->assertFalse($sc->isCompiled(), '->isCompiled() returns false if the container is not compiled but the parameter bag is already frozen');
     }
 
     public function testGetParameterBag()
     {
         $sc = new Container();
-        $this->assertEquals(array(), $sc->getParameterBag()->all(), '->getParameterBag() returns an empty array if no parameter has been defined');
+        $this->assertEquals([], $sc->getParameterBag()->all(), '->getParameterBag() returns an empty array if no parameter has been defined');
     }
 
     public function testGetSetParameter()
     {
-        $sc = new Container(new ParameterBag(array('foo' => 'bar')));
+        $sc = new Container(new ParameterBag(['foo' => 'bar']));
         $sc->setParameter('bar', 'foo');
         $this->assertEquals('foo', $sc->getParameter('bar'), '->setParameter() sets the value of a new parameter');
 
@@ -141,7 +141,7 @@ public function testGetSetParameter()
      */
     public function testGetSetParameterWithMixedCase()
     {
-        $sc = new Container(new ParameterBag(array('foo' => 'bar')));
+        $sc = new Container(new ParameterBag(['foo' => 'bar']));
 
         $sc->setParameter('Foo', 'baz1');
         $this->assertEquals('baz1', $sc->getParameter('foo'), '->setParameter() converts the key to lowercase');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php b/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
index 5fe4236ad9384..8e593f329e72a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
@@ -20,10 +20,10 @@ public function testConstructor()
     {
         $def = new Definition('stdClass');
         $this->assertEquals('stdClass', $def->getClass(), '__construct() takes the class name as its first argument');
-        $this->assertSame(array('class' => true), $def->getChanges());
+        $this->assertSame(['class' => true], $def->getChanges());
 
-        $def = new Definition('stdClass', array('foo'));
-        $this->assertEquals(array('foo'), $def->getArguments(), '__construct() takes an optional array of arguments as its second argument');
+        $def = new Definition('stdClass', ['foo']);
+        $this->assertEquals(['foo'], $def->getArguments(), '__construct() takes an optional array of arguments as its second argument');
     }
 
     public function testSetGetFactory()
@@ -34,8 +34,8 @@ public function testSetGetFactory()
         $this->assertEquals('foo', $def->getFactory(), '->getFactory() returns the factory');
 
         $def->setFactory('Foo::bar');
-        $this->assertEquals(array('Foo', 'bar'), $def->getFactory(), '->setFactory() converts string static method call to the array');
-        $this->assertSame(array('factory' => true), $def->getChanges());
+        $this->assertEquals(['Foo', 'bar'], $def->getFactory(), '->setFactory() converts string static method call to the array');
+        $this->assertSame(['factory' => true], $def->getChanges());
     }
 
     public function testSetGetClass()
@@ -50,20 +50,20 @@ public function testSetGetDecoratedService()
         $def = new Definition('stdClass');
         $this->assertNull($def->getDecoratedService());
         $def->setDecoratedService('foo', 'foo.renamed', 5);
-        $this->assertEquals(array('foo', 'foo.renamed', 5), $def->getDecoratedService());
+        $this->assertEquals(['foo', 'foo.renamed', 5], $def->getDecoratedService());
         $def->setDecoratedService(null);
         $this->assertNull($def->getDecoratedService());
 
         $def = new Definition('stdClass');
         $this->assertNull($def->getDecoratedService());
         $def->setDecoratedService('foo', 'foo.renamed');
-        $this->assertEquals(array('foo', 'foo.renamed', 0), $def->getDecoratedService());
+        $this->assertEquals(['foo', 'foo.renamed', 0], $def->getDecoratedService());
         $def->setDecoratedService(null);
         $this->assertNull($def->getDecoratedService());
 
         $def = new Definition('stdClass');
         $def->setDecoratedService('foo');
-        $this->assertEquals(array('foo', null, 0), $def->getDecoratedService());
+        $this->assertEquals(['foo', null, 0], $def->getDecoratedService());
         $def->setDecoratedService(null);
         $this->assertNull($def->getDecoratedService());
 
@@ -82,23 +82,23 @@ public function testSetGetDecoratedService()
     public function testArguments()
     {
         $def = new Definition('stdClass');
-        $this->assertSame($def, $def->setArguments(array('foo')), '->setArguments() implements a fluent interface');
-        $this->assertEquals(array('foo'), $def->getArguments(), '->getArguments() returns the arguments');
+        $this->assertSame($def, $def->setArguments(['foo']), '->setArguments() implements a fluent interface');
+        $this->assertEquals(['foo'], $def->getArguments(), '->getArguments() returns the arguments');
         $this->assertSame($def, $def->addArgument('bar'), '->addArgument() implements a fluent interface');
-        $this->assertEquals(array('foo', 'bar'), $def->getArguments(), '->addArgument() adds an argument');
+        $this->assertEquals(['foo', 'bar'], $def->getArguments(), '->addArgument() adds an argument');
     }
 
     public function testMethodCalls()
     {
         $def = new Definition('stdClass');
-        $this->assertSame($def, $def->setMethodCalls(array(array('foo', array('foo')))), '->setMethodCalls() implements a fluent interface');
-        $this->assertEquals(array(array('foo', array('foo'))), $def->getMethodCalls(), '->getMethodCalls() returns the methods to call');
-        $this->assertSame($def, $def->addMethodCall('bar', array('bar')), '->addMethodCall() implements a fluent interface');
-        $this->assertEquals(array(array('foo', array('foo')), array('bar', array('bar'))), $def->getMethodCalls(), '->addMethodCall() adds a method to call');
+        $this->assertSame($def, $def->setMethodCalls([['foo', ['foo']]]), '->setMethodCalls() implements a fluent interface');
+        $this->assertEquals([['foo', ['foo']]], $def->getMethodCalls(), '->getMethodCalls() returns the methods to call');
+        $this->assertSame($def, $def->addMethodCall('bar', ['bar']), '->addMethodCall() implements a fluent interface');
+        $this->assertEquals([['foo', ['foo']], ['bar', ['bar']]], $def->getMethodCalls(), '->addMethodCall() adds a method to call');
         $this->assertTrue($def->hasMethodCall('bar'), '->hasMethodCall() returns true if first argument is a method to call registered');
         $this->assertFalse($def->hasMethodCall('no_registered'), '->hasMethodCall() returns false if first argument is not a method to call registered');
         $this->assertSame($def, $def->removeMethodCall('bar'), '->removeMethodCall() implements a fluent interface');
-        $this->assertEquals(array(array('foo', array('foo'))), $def->getMethodCalls(), '->removeMethodCall() removes a method to call');
+        $this->assertEquals([['foo', ['foo']]], $def->getMethodCalls(), '->removeMethodCall() removes a method to call');
     }
 
     /**
@@ -179,12 +179,12 @@ public function testSetDeprecatedWithInvalidDeprecationTemplate($message)
 
     public function invalidDeprecationMessageProvider()
     {
-        return array(
-            "With \rs" => array("invalid \r message %service_id%"),
-            "With \ns" => array("invalid \n message %service_id%"),
-            'With */s' => array('invalid */ message %service_id%'),
-            'message not containing require %service_id% variable' => array('this is deprecated'),
-        );
+        return [
+            "With \rs" => ["invalid \r message %service_id%"],
+            "With \ns" => ["invalid \n message %service_id%"],
+            'With */s' => ['invalid */ message %service_id%'],
+            'message not containing require %service_id% variable' => ['this is deprecated'],
+        ];
     }
 
     public function testSetGetConfigurator()
@@ -198,18 +198,18 @@ public function testClearTags()
     {
         $def = new Definition('stdClass');
         $this->assertSame($def, $def->clearTags(), '->clearTags() implements a fluent interface');
-        $def->addTag('foo', array('foo' => 'bar'));
+        $def->addTag('foo', ['foo' => 'bar']);
         $def->clearTags();
-        $this->assertEquals(array(), $def->getTags(), '->clearTags() removes all current tags');
+        $this->assertEquals([], $def->getTags(), '->clearTags() removes all current tags');
     }
 
     public function testClearTag()
     {
         $def = new Definition('stdClass');
         $this->assertSame($def, $def->clearTags(), '->clearTags() implements a fluent interface');
-        $def->addTag('1foo1', array('foo1' => 'bar1'));
-        $def->addTag('2foo2', array('foo2' => 'bar2'));
-        $def->addTag('3foo3', array('foo3' => 'bar3'));
+        $def->addTag('1foo1', ['foo1' => 'bar1']);
+        $def->addTag('2foo2', ['foo2' => 'bar2']);
+        $def->addTag('3foo3', ['foo3' => 'bar3']);
         $def->clearTag('2foo2');
         $this->assertTrue($def->hasTag('1foo1'));
         $this->assertFalse($def->hasTag('2foo2'));
@@ -222,18 +222,18 @@ public function testClearTag()
     public function testTags()
     {
         $def = new Definition('stdClass');
-        $this->assertEquals(array(), $def->getTag('foo'), '->getTag() returns an empty array if the tag is not defined');
+        $this->assertEquals([], $def->getTag('foo'), '->getTag() returns an empty array if the tag is not defined');
         $this->assertFalse($def->hasTag('foo'));
         $this->assertSame($def, $def->addTag('foo'), '->addTag() implements a fluent interface');
         $this->assertTrue($def->hasTag('foo'));
-        $this->assertEquals(array(array()), $def->getTag('foo'), '->getTag() returns attributes for a tag name');
-        $def->addTag('foo', array('foo' => 'bar'));
-        $this->assertEquals(array(array(), array('foo' => 'bar')), $def->getTag('foo'), '->addTag() can adds the same tag several times');
-        $def->addTag('bar', array('bar' => 'bar'));
-        $this->assertEquals($def->getTags(), array(
-            'foo' => array(array(), array('foo' => 'bar')),
-            'bar' => array(array('bar' => 'bar')),
-        ), '->getTags() returns all tags');
+        $this->assertEquals([[]], $def->getTag('foo'), '->getTag() returns attributes for a tag name');
+        $def->addTag('foo', ['foo' => 'bar']);
+        $this->assertEquals([[], ['foo' => 'bar']], $def->getTag('foo'), '->addTag() can adds the same tag several times');
+        $def->addTag('bar', ['bar' => 'bar']);
+        $this->assertEquals($def->getTags(), [
+            'foo' => [[], ['foo' => 'bar']],
+            'bar' => [['bar' => 'bar']],
+        ], '->getTags() returns all tags');
     }
 
     public function testSetArgument()
@@ -241,17 +241,17 @@ public function testSetArgument()
         $def = new Definition('stdClass');
 
         $def->addArgument('foo');
-        $this->assertSame(array('foo'), $def->getArguments());
+        $this->assertSame(['foo'], $def->getArguments());
 
         $this->assertSame($def, $def->replaceArgument(0, 'moo'));
-        $this->assertSame(array('moo'), $def->getArguments());
+        $this->assertSame(['moo'], $def->getArguments());
 
         $def->addArgument('moo');
         $def
             ->replaceArgument(0, 'foo')
             ->replaceArgument(1, 'bar')
         ;
-        $this->assertSame(array('foo', 'bar'), $def->getArguments());
+        $this->assertSame(['foo', 'bar'], $def->getArguments());
     }
 
     /**
@@ -291,18 +291,18 @@ public function testSetGetProperties()
     {
         $def = new Definition('stdClass');
 
-        $this->assertEquals(array(), $def->getProperties());
-        $this->assertSame($def, $def->setProperties(array('foo' => 'bar')));
-        $this->assertEquals(array('foo' => 'bar'), $def->getProperties());
+        $this->assertEquals([], $def->getProperties());
+        $this->assertSame($def, $def->setProperties(['foo' => 'bar']));
+        $this->assertEquals(['foo' => 'bar'], $def->getProperties());
     }
 
     public function testSetProperty()
     {
         $def = new Definition('stdClass');
 
-        $this->assertEquals(array(), $def->getProperties());
+        $this->assertEquals([], $def->getProperties());
         $this->assertSame($def, $def->setProperty('foo', 'bar'));
-        $this->assertEquals(array('foo' => 'bar'), $def->getProperties());
+        $this->assertEquals(['foo' => 'bar'], $def->getProperties());
     }
 
     public function testAutowired()
@@ -321,12 +321,12 @@ public function testChangesNoChanges()
     {
         $def = new Definition();
 
-        $this->assertSame(array(), $def->getChanges());
+        $this->assertSame([], $def->getChanges());
     }
 
     public function testGetChangesWithChanges()
     {
-        $def = new Definition('stdClass', array('fooarg'));
+        $def = new Definition('stdClass', ['fooarg']);
 
         $def->setAbstract(true);
         $def->setAutowired(true);
@@ -340,13 +340,13 @@ public function testGetChangesWithChanges()
         $def->setShared(true);
         $def->setSynthetic(true);
         // changes aren't tracked for these, class or arguments
-        $def->setInstanceofConditionals(array());
+        $def->setInstanceofConditionals([]);
         $def->addTag('foo_tag');
         $def->addMethodCall('methodCall');
         $def->setProperty('fooprop', true);
         $def->setAutoconfigured(true);
 
-        $this->assertSame(array(
+        $this->assertSame([
             'class' => true,
             'autowired' => true,
             'configurator' => true,
@@ -358,10 +358,10 @@ public function testGetChangesWithChanges()
             'public' => true,
             'shared' => true,
             'autoconfigured' => true,
-        ), $def->getChanges());
+        ], $def->getChanges());
 
-        $def->setChanges(array());
-        $this->assertSame(array(), $def->getChanges());
+        $def->setChanges([]);
+        $this->assertSame([], $def->getChanges());
     }
 
     /**
@@ -394,6 +394,6 @@ public function testAddError()
         $this->assertEmpty($def->getErrors());
         $def->addError('First error');
         $def->addError('Second error');
-        $this->assertSame(array('First error', 'Second error'), $def->getErrors());
+        $this->assertSame(['First error', 'Second error'], $def->getErrors());
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/GraphvizDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/GraphvizDumperTest.php
index 3c40bb5504e82..ea11c7c533a3d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/GraphvizDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/GraphvizDumperTest.php
@@ -42,14 +42,14 @@ public function testDump()
 
         $container = include self::$fixturesPath.'/containers/container10.php';
         $dumper = new GraphvizDumper($container);
-        $this->assertEquals($dumper->dump(array(
-            'graph' => array('ratio' => 'normal'),
-            'node' => array('fontsize' => 13, 'fontname' => 'Verdana', 'shape' => 'square'),
-            'edge' => array('fontsize' => 12, 'fontname' => 'Verdana', 'color' => 'white', 'arrowhead' => 'closed', 'arrowsize' => 1),
-            'node.instance' => array('fillcolor' => 'green', 'style' => 'empty'),
-            'node.definition' => array('fillcolor' => 'grey'),
-            'node.missing' => array('fillcolor' => 'red', 'style' => 'empty'),
-        )), file_get_contents(self::$fixturesPath.'/graphviz/services10-1.dot'), '->dump() dumps services');
+        $this->assertEquals($dumper->dump([
+            'graph' => ['ratio' => 'normal'],
+            'node' => ['fontsize' => 13, 'fontname' => 'Verdana', 'shape' => 'square'],
+            'edge' => ['fontsize' => 12, 'fontname' => 'Verdana', 'color' => 'white', 'arrowhead' => 'closed', 'arrowsize' => 1],
+            'node.instance' => ['fillcolor' => 'green', 'style' => 'empty'],
+            'node.definition' => ['fillcolor' => 'grey'],
+            'node.missing' => ['fillcolor' => 'red', 'style' => 'empty'],
+        ]), file_get_contents(self::$fixturesPath.'/graphviz/services10-1.dot'), '->dump() dumps services');
     }
 
     public function testDumpWithFrozenContainer()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 60fa55c3b5451..6df780185a856 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -54,14 +54,14 @@ public function testDump()
         $dumper = new PhpDumper($container);
 
         $this->assertStringEqualsFile(self::$fixturesPath.'/php/services1.php', $dumper->dump(), '->dump() dumps an empty container as an empty PHP class');
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services1-1.php', $dumper->dump(array('class' => 'Container', 'base_class' => 'AbstractContainer', 'namespace' => 'Symfony\Component\DependencyInjection\Dump')), '->dump() takes a class and a base_class options');
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services1-1.php', $dumper->dump(['class' => 'Container', 'base_class' => 'AbstractContainer', 'namespace' => 'Symfony\Component\DependencyInjection\Dump']), '->dump() takes a class and a base_class options');
     }
 
     public function testDumpOptimizationString()
     {
         $definition = new Definition();
         $definition->setClass('stdClass');
-        $definition->addArgument(array(
+        $definition->addArgument([
             'only dot' => '.',
             'concatenation as value' => '.\'\'.',
             'concatenation from the start value' => '\'\'.',
@@ -73,7 +73,7 @@ public function testDumpOptimizationString()
             'optimize concatenation from the start' => '%empty_value%start',
             'optimize concatenation at the end' => 'end%empty_value%',
             'new line' => "string with \nnew line",
-        ));
+        ]);
         $definition->setPublic(true);
 
         $container = new ContainerBuilder();
@@ -92,7 +92,7 @@ public function testDumpRelativeDir()
         $definition = new Definition();
         $definition->setClass('stdClass');
         $definition->addArgument('%foo%');
-        $definition->addArgument(array('%foo%' => '%buz%/'));
+        $definition->addArgument(['%foo%' => '%buz%/']);
         $definition->setPublic(true);
 
         $container = new ContainerBuilder();
@@ -104,7 +104,7 @@ public function testDumpRelativeDir()
         $container->compile();
 
         $dumper = new PhpDumper($container);
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services12.php', $dumper->dump(array('file' => __FILE__)), '->dump() dumps __DIR__ relative strings');
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services12.php', $dumper->dump(['file' => __FILE__]), '->dump() dumps __DIR__ relative strings');
     }
 
     public function testDumpCustomContainerClassWithoutConstructor()
@@ -114,7 +114,7 @@ public function testDumpCustomContainerClassWithoutConstructor()
 
         $dumper = new PhpDumper($container);
 
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/custom_container_class_without_constructor.php', $dumper->dump(array('base_class' => 'NoConstructorContainer', 'namespace' => 'Symfony\Component\DependencyInjection\Tests\Fixtures\Container')));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/custom_container_class_without_constructor.php', $dumper->dump(['base_class' => 'NoConstructorContainer', 'namespace' => 'Symfony\Component\DependencyInjection\Tests\Fixtures\Container']));
     }
 
     public function testDumpCustomContainerClassConstructorWithoutArguments()
@@ -124,7 +124,7 @@ public function testDumpCustomContainerClassConstructorWithoutArguments()
 
         $dumper = new PhpDumper($container);
 
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/custom_container_class_constructor_without_arguments.php', $dumper->dump(array('base_class' => 'ConstructorWithoutArgumentsContainer', 'namespace' => 'Symfony\Component\DependencyInjection\Tests\Fixtures\Container')));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/custom_container_class_constructor_without_arguments.php', $dumper->dump(['base_class' => 'ConstructorWithoutArgumentsContainer', 'namespace' => 'Symfony\Component\DependencyInjection\Tests\Fixtures\Container']));
     }
 
     public function testDumpCustomContainerClassWithOptionalArgumentLessConstructor()
@@ -134,7 +134,7 @@ public function testDumpCustomContainerClassWithOptionalArgumentLessConstructor(
 
         $dumper = new PhpDumper($container);
 
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/custom_container_class_with_optional_constructor_arguments.php', $dumper->dump(array('base_class' => 'ConstructorWithOptionalArgumentsContainer', 'namespace' => 'Symfony\Component\DependencyInjection\Tests\Fixtures\Container')));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/custom_container_class_with_optional_constructor_arguments.php', $dumper->dump(['base_class' => 'ConstructorWithOptionalArgumentsContainer', 'namespace' => 'Symfony\Component\DependencyInjection\Tests\Fixtures\Container']));
     }
 
     public function testDumpCustomContainerClassWithMandatoryArgumentLessConstructor()
@@ -144,7 +144,7 @@ public function testDumpCustomContainerClassWithMandatoryArgumentLessConstructor
 
         $dumper = new PhpDumper($container);
 
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/custom_container_class_with_mandatory_constructor_arguments.php', $dumper->dump(array('base_class' => 'ConstructorWithMandatoryArgumentsContainer', 'namespace' => 'Symfony\Component\DependencyInjection\Tests\Fixtures\Container')));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/custom_container_class_with_mandatory_constructor_arguments.php', $dumper->dump(['base_class' => 'ConstructorWithMandatoryArgumentsContainer', 'namespace' => 'Symfony\Component\DependencyInjection\Tests\Fixtures\Container']));
     }
 
     /**
@@ -161,12 +161,12 @@ public function testExportParameters($parameters)
 
     public function provideInvalidParameters()
     {
-        return array(
-            array(array('foo' => new Definition('stdClass'))),
-            array(array('foo' => new Expression('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")'))),
-            array(array('foo' => new Reference('foo'))),
-            array(array('foo' => new Variable('foo'))),
-        );
+        return [
+            [['foo' => new Definition('stdClass')]],
+            [['foo' => new Expression('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")')]],
+            [['foo' => new Reference('foo')]],
+            [['foo' => new Variable('foo')]],
+        ];
     }
 
     public function testAddParameters()
@@ -214,7 +214,7 @@ public function testDumpAsFiles()
         $container->getDefinition('bar')->addTag('hot');
         $container->compile();
         $dumper = new PhpDumper($container);
-        $dump = print_r($dumper->dump(array('as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot')), true);
+        $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot']), true);
         if ('\\' === \DIRECTORY_SEPARATOR) {
             $dump = str_replace('\\\\Fixtures\\\\includes\\\\foo.php', '/Fixtures/includes/foo.php', $dump);
         }
@@ -238,7 +238,7 @@ public function testAddServiceIdWithUnsupportedCharacters()
         $container->register('bar$!', 'FooClass')->setPublic(true);
         $container->compile();
         $dumper = new PhpDumper($container);
-        eval('?>'.$dumper->dump(array('class' => $class)));
+        eval('?>'.$dumper->dump(['class' => $class]));
 
         $this->assertTrue(method_exists($class, 'getBarService'));
         $this->assertTrue(method_exists($class, 'getBar2Service'));
@@ -252,7 +252,7 @@ public function testConflictingServiceIds()
         $container->register('foobar', 'FooClass')->setPublic(true);
         $container->compile();
         $dumper = new PhpDumper($container);
-        eval('?>'.$dumper->dump(array('class' => $class)));
+        eval('?>'.$dumper->dump(['class' => $class]));
 
         $this->assertTrue(method_exists($class, 'getFooBarService'));
         $this->assertTrue(method_exists($class, 'getFoobar2Service'));
@@ -266,10 +266,10 @@ public function testConflictingMethodsWithParent()
         $container->register('foo_bar', 'FooClass')->setPublic(true);
         $container->compile();
         $dumper = new PhpDumper($container);
-        eval('?>'.$dumper->dump(array(
+        eval('?>'.$dumper->dump([
             'class' => $class,
             'base_class' => 'Symfony\Component\DependencyInjection\Tests\Fixtures\containers\CustomContainer',
-        )));
+        ]));
 
         $this->assertTrue(method_exists($class, 'getBar2Service'));
         $this->assertTrue(method_exists($class, 'getFoobar2Service'));
@@ -294,12 +294,12 @@ public function testInvalidFactories($factory)
 
     public function provideInvalidFactories()
     {
-        return array(
-            array(array('', 'method')),
-            array(array('class', '')),
-            array(array('...', 'method')),
-            array(array('class', '...')),
-        );
+        return [
+            [['', 'method']],
+            [['class', '']],
+            [['...', 'method']],
+            [['class', '...']],
+        ];
     }
 
     public function testAliases()
@@ -308,7 +308,7 @@ public function testAliases()
         $container->setParameter('foo_bar', 'foo_bar');
         $container->compile();
         $dumper = new PhpDumper($container);
-        eval('?>'.$dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Aliases')));
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Aliases']));
 
         $container = new \Symfony_DI_PhpDumper_Test_Aliases();
         $foo = $container->get('foo');
@@ -322,7 +322,7 @@ public function testFrozenContainerWithoutAliases()
         $container->compile();
 
         $dumper = new PhpDumper($container);
-        eval('?>'.$dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Frozen_No_Aliases')));
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Frozen_No_Aliases']));
 
         $container = new \Symfony_DI_PhpDumper_Test_Frozen_No_Aliases();
         $this->assertFalse($container->has('foo'));
@@ -372,12 +372,12 @@ public function testEnvParameter()
         $container->compile();
         $dumper = new PhpDumper($container);
 
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services26.php', $dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_EnvParameters', 'file' => self::$fixturesPath.'/php/services26.php')));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services26.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_EnvParameters', 'file' => self::$fixturesPath.'/php/services26.php']));
 
         require self::$fixturesPath.'/php/services26.php';
         $container = new \Symfony_DI_PhpDumper_Test_EnvParameters();
         $this->assertSame($rand, $container->getParameter('baz'));
-        $this->assertSame(array(123, 'abc'), $container->getParameter('json'));
+        $this->assertSame([123, 'abc'], $container->getParameter('json'));
         $this->assertSame('sqlite:///foo/bar/var/data.db', $container->getParameter('db_dsn'));
         putenv('Baz');
     }
@@ -389,10 +389,10 @@ public function testResolvedBase64EnvParameters()
         $container->setParameter('hello', '%env(base64:foo)%');
         $container->compile(true);
 
-        $expected = array(
+        $expected = [
             'env(foo)' => 'd29ybGQ=',
             'hello' => 'world',
-        );
+        ];
         $this->assertSame($expected, $container->getParameterBag()->all());
     }
 
@@ -406,7 +406,7 @@ public function testDumpedBase64EnvParameters()
         $dumper = new PhpDumper($container);
         $dumper->dump();
 
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_base64_env.php', $dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Base64Parameters')));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_base64_env.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Base64Parameters']));
 
         require self::$fixturesPath.'/php/services_base64_env.php';
         $container = new \Symfony_DI_PhpDumper_Test_Base64Parameters();
@@ -424,7 +424,7 @@ public function testCustomEnvParameters()
         $dumper = new PhpDumper($container);
         $dumper->dump();
 
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_rot13_env.php', $dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Rot13Parameters')));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_rot13_env.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Rot13Parameters']));
 
         require self::$fixturesPath.'/php/services_rot13_env.php';
         $container = new \Symfony_DI_PhpDumper_Test_Rot13Parameters();
@@ -466,7 +466,7 @@ public function testCircularDynamicEnv()
         $container->compile();
 
         $dumper = new PhpDumper($container);
-        $dump = $dumper->dump(array('class' => $class = __FUNCTION__));
+        $dump = $dumper->dump(['class' => $class = __FUNCTION__]);
 
         eval('?>'.$dump);
         $container = new $class();
@@ -482,7 +482,7 @@ public function testCircularDynamicEnv()
     public function testInlinedDefinitionReferencingServiceContainer()
     {
         $container = new ContainerBuilder();
-        $container->register('foo', 'stdClass')->addMethodCall('add', array(new Reference('service_container')))->setPublic(false);
+        $container->register('foo', 'stdClass')->addMethodCall('add', [new Reference('service_container')])->setPublic(false);
         $container->register('bar', 'stdClass')->addArgument(new Reference('foo'))->setPublic(true);
         $container->compile();
 
@@ -517,7 +517,7 @@ public function testInitializePropertiesBeforeMethodCalls()
         $container->compile();
 
         $dumper = new PhpDumper($container);
-        eval('?>'.$dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Properties_Before_Method_Calls')));
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Properties_Before_Method_Calls']));
 
         $container = new \Symfony_DI_PhpDumper_Test_Properties_Before_Method_Calls();
         $this->assertTrue($container->get('bar')->callPassed(), '->dump() initializes properties before method calls');
@@ -571,15 +571,15 @@ public function testLazyArgumentProvideGenerator()
         $container
             ->register('lazy_context', 'LazyContext')
             ->setPublic(true)
-            ->setArguments(array(
-                new IteratorArgument(array('k1' => new Reference('lazy_referenced'), 'k2' => new Reference('service_container'))),
-                new IteratorArgument(array()),
-            ))
+            ->setArguments([
+                new IteratorArgument(['k1' => new Reference('lazy_referenced'), 'k2' => new Reference('service_container')]),
+                new IteratorArgument([]),
+            ])
         ;
         $container->compile();
 
         $dumper = new PhpDumper($container);
-        eval('?>'.$dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Lazy_Argument_Provide_Generator')));
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Lazy_Argument_Provide_Generator']));
 
         $container = new \Symfony_DI_PhpDumper_Test_Lazy_Argument_Provide_Generator();
         $lazyContext = $container->get('lazy_context');
@@ -618,8 +618,8 @@ public function testNormalizedId()
     public function testDumpContainerBuilderWithFrozenConstructorIncludingPrivateServices()
     {
         $container = new ContainerBuilder();
-        $container->register('foo_service', 'stdClass')->setArguments(array(new Reference('baz_service')))->setPublic(true);
-        $container->register('bar_service', 'stdClass')->setArguments(array(new Reference('baz_service')))->setPublic(true);
+        $container->register('foo_service', 'stdClass')->setArguments([new Reference('baz_service')])->setPublic(true);
+        $container->register('bar_service', 'stdClass')->setArguments([new Reference('baz_service')])->setPublic(true);
         $container->register('baz_service', 'stdClass')->setPublic(false);
         $container->compile();
 
@@ -633,20 +633,20 @@ public function testServiceLocator()
         $container = new ContainerBuilder();
         $container->register('foo_service', ServiceLocator::class)
             ->setPublic(true)
-            ->addArgument(array(
+            ->addArgument([
                 'bar' => new ServiceClosureArgument(new Reference('bar_service')),
                 'baz' => new ServiceClosureArgument(new TypedReference('baz_service', 'stdClass')),
                 'nil' => $nil = new ServiceClosureArgument(new Reference('nil')),
-            ))
+            ])
         ;
 
         // no method calls
         $container->register('translator.loader_1', 'stdClass')->setPublic(true);
         $container->register('translator.loader_1_locator', ServiceLocator::class)
             ->setPublic(false)
-            ->addArgument(array(
+            ->addArgument([
                 'translator.loader_1' => new ServiceClosureArgument(new Reference('translator.loader_1')),
-            ));
+            ]);
         $container->register('translator_1', StubbedTranslator::class)
             ->setPublic(true)
             ->addArgument(new Reference('translator.loader_1_locator'));
@@ -655,29 +655,29 @@ public function testServiceLocator()
         $container->register('translator.loader_2', 'stdClass')->setPublic(true);
         $container->register('translator.loader_2_locator', ServiceLocator::class)
             ->setPublic(false)
-            ->addArgument(array(
+            ->addArgument([
                 'translator.loader_2' => new ServiceClosureArgument(new Reference('translator.loader_2')),
-            ));
+            ]);
         $container->register('translator_2', StubbedTranslator::class)
             ->setPublic(true)
             ->addArgument(new Reference('translator.loader_2_locator'))
-            ->addMethodCall('addResource', array('db', new Reference('translator.loader_2'), 'nl'));
+            ->addMethodCall('addResource', ['db', new Reference('translator.loader_2'), 'nl']);
 
         // two method calls
         $container->register('translator.loader_3', 'stdClass')->setPublic(true);
         $container->register('translator.loader_3_locator', ServiceLocator::class)
             ->setPublic(false)
-            ->addArgument(array(
+            ->addArgument([
                 'translator.loader_3' => new ServiceClosureArgument(new Reference('translator.loader_3')),
-            ));
+            ]);
         $container->register('translator_3', StubbedTranslator::class)
             ->setPublic(true)
             ->addArgument(new Reference('translator.loader_3_locator'))
-            ->addMethodCall('addResource', array('db', new Reference('translator.loader_3'), 'nl'))
-            ->addMethodCall('addResource', array('db', new Reference('translator.loader_3'), 'en'));
+            ->addMethodCall('addResource', ['db', new Reference('translator.loader_3'), 'nl'])
+            ->addMethodCall('addResource', ['db', new Reference('translator.loader_3'), 'en']);
 
-        $nil->setValues(array(null));
-        $container->register('bar_service', 'stdClass')->setArguments(array(new Reference('baz_service')))->setPublic(true);
+        $nil->setValues([null]);
+        $container->register('bar_service', 'stdClass')->setArguments([new Reference('baz_service')])->setPublic(true);
         $container->register('baz_service', 'stdClass')->setPublic(false);
         $container->compile();
 
@@ -693,10 +693,10 @@ public function testServiceSubscriber()
             ->setPublic(true)
             ->setAutowired(true)
             ->addArgument(new Reference(ContainerInterface::class))
-            ->addTag('container.service_subscriber', array(
+            ->addTag('container.service_subscriber', [
                 'key' => 'bar',
                 'id' => TestServiceSubscriber::class,
-            ))
+            ])
         ;
         $container->register(TestServiceSubscriber::class, TestServiceSubscriber::class)->setPublic(true);
 
@@ -718,11 +718,11 @@ public function testPrivateWithIgnoreOnInvalidReference()
             ->setPublic(false);
         $container->register('bar', 'BarClass')
             ->setPublic(true)
-            ->addMethodCall('setBaz', array(new Reference('not_invalid', SymfonyContainerInterface::IGNORE_ON_INVALID_REFERENCE)));
+            ->addMethodCall('setBaz', [new Reference('not_invalid', SymfonyContainerInterface::IGNORE_ON_INVALID_REFERENCE)]);
         $container->compile();
 
         $dumper = new PhpDumper($container);
-        eval('?>'.$dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Private_With_Ignore_On_Invalid_Reference')));
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Private_With_Ignore_On_Invalid_Reference']));
 
         $container = new \Symfony_DI_PhpDumper_Test_Private_With_Ignore_On_Invalid_Reference();
         $this->assertInstanceOf('BazClass', $container->get('bar')->getBaz());
@@ -731,16 +731,16 @@ public function testPrivateWithIgnoreOnInvalidReference()
     public function testArrayParameters()
     {
         $container = new ContainerBuilder();
-        $container->setParameter('array_1', array(123));
-        $container->setParameter('array_2', array(__DIR__));
+        $container->setParameter('array_1', [123]);
+        $container->setParameter('array_2', [__DIR__]);
         $container->register('bar', 'BarClass')
             ->setPublic(true)
-            ->addMethodCall('setBaz', array('%array_1%', '%array_2%', '%%array_1%%', array(123)));
+            ->addMethodCall('setBaz', ['%array_1%', '%array_2%', '%%array_1%%', [123]]);
         $container->compile();
 
         $dumper = new PhpDumper($container);
 
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_array_params.php', str_replace('\\\\Dumper', '/Dumper', $dumper->dump(array('file' => self::$fixturesPath.'/php/services_array_params.php'))));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_array_params.php', str_replace('\\\\Dumper', '/Dumper', $dumper->dump(['file' => self::$fixturesPath.'/php/services_array_params.php'])));
     }
 
     public function testExpressionReferencingPrivateService()
@@ -766,7 +766,7 @@ public function testUninitializedReference()
         $container->compile();
         $dumper = new PhpDumper($container);
 
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_uninitialized_ref.php', $dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Uninitialized_Reference')));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_uninitialized_ref.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Uninitialized_Reference']));
 
         require self::$fixturesPath.'/php/services_uninitialized_ref.php';
 
@@ -780,7 +780,7 @@ public function testUninitializedReference()
         $this->assertNull($bar->closures[0]());
         $this->assertNull($bar->closures[1]());
         $this->assertNull($bar->closures[2]());
-        $this->assertSame(array(), iterator_to_array($bar->iter));
+        $this->assertSame([], iterator_to_array($bar->iter));
 
         $container = new \Symfony_DI_PhpDumper_Test_Uninitialized_Reference();
 
@@ -795,7 +795,7 @@ public function testUninitializedReference()
         $this->assertEquals(new \stdClass(), $bar->closures[0]());
         $this->assertNull($bar->closures[1]());
         $this->assertEquals(new \stdClass(), $bar->closures[2]());
-        $this->assertEquals(array('foo1' => new \stdClass(), 'foo3' => new \stdClass()), iterator_to_array($bar->iter));
+        $this->assertEquals(['foo1' => new \stdClass(), 'foo3' => new \stdClass()], iterator_to_array($bar->iter));
     }
 
     /**
@@ -808,7 +808,7 @@ public function testAlmostCircular($visibility)
         $dumper = new PhpDumper($container);
 
         $container = 'Symfony_DI_PhpDumper_Test_Almost_Circular_'.ucfirst($visibility);
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_almost_circular_'.$visibility.'.php', $dumper->dump(array('class' => $container)));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_almost_circular_'.$visibility.'.php', $dumper->dump(['class' => $container]));
 
         require self::$fixturesPath.'/php/services_almost_circular_'.$visibility.'.php';
 
@@ -820,7 +820,7 @@ public function testAlmostCircular($visibility)
         $foo2 = $container->get('foo2');
         $this->assertSame($foo2, $foo2->bar->foobar->foo);
 
-        $this->assertSame(array(), (array) $container->get('foobar4'));
+        $this->assertSame([], (array) $container->get('foobar4'));
 
         $foo5 = $container->get('foo5');
         $this->assertSame($foo5, $foo5->bar->foo);
@@ -832,15 +832,15 @@ public function testAlmostCircular($visibility)
         $this->assertEquals(new \stdClass(), $manager);
 
         $foo6 = $container->get('foo6');
-        $this->assertEquals((object) array('bar6' => (object) array()), $foo6);
+        $this->assertEquals((object) ['bar6' => (object) []], $foo6);
 
         $this->assertInstanceOf(\stdClass::class, $container->get('root'));
     }
 
     public function provideAlmostCircular()
     {
-        yield array('public');
-        yield array('private');
+        yield ['public'];
+        yield ['private'];
     }
 
     public function testDeepServiceGraph()
@@ -855,14 +855,14 @@ public function testDeepServiceGraph()
         $dumper = new PhpDumper($container);
         $dumper->dump();
 
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_deep_graph.php', $dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Deep_Graph')));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_deep_graph.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Deep_Graph']));
 
         require self::$fixturesPath.'/php/services_deep_graph.php';
 
         $container = new \Symfony_DI_PhpDumper_Test_Deep_Graph();
 
         $this->assertInstanceOf(FooForDeepGraph::class, $container->get('foo'));
-        $this->assertEquals((object) array('p2' => (object) array('p3' => (object) array())), $container->get('foo')->bClone);
+        $this->assertEquals((object) ['p2' => (object) ['p3' => (object) []]], $container->get('foo')->bClone);
     }
 
     public function testInlineSelfRef()
@@ -884,7 +884,7 @@ public function testInlineSelfRef()
         $container->compile();
 
         $dumper = new PhpDumper($container);
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_inline_self_ref.php', $dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Inline_Self_Ref')));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_inline_self_ref.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Inline_Self_Ref']));
     }
 
     public function testHotPathOptimizations()
@@ -894,7 +894,7 @@ public function testHotPathOptimizations()
         $container->compile();
         $dumper = new PhpDumper($container);
 
-        $dump = $dumper->dump(array('hot_path_tag' => 'container.hot_path', 'inline_class_loader_parameter' => 'inline_requires', 'file' => self::$fixturesPath.'/php/services_inline_requires.php'));
+        $dump = $dumper->dump(['hot_path_tag' => 'container.hot_path', 'inline_class_loader_parameter' => 'inline_requires', 'file' => self::$fixturesPath.'/php/services_inline_requires.php']);
         if ('\\' === \DIRECTORY_SEPARATOR) {
             $dump = str_replace("'\\\\includes\\\\HotPath\\\\", "'/includes/HotPath/", $dump);
         }
@@ -909,7 +909,7 @@ public function testDumpHandlesLiteralClassWithRootNamespace()
         $container->compile();
 
         $dumper = new PhpDumper($container);
-        eval('?>'.$dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Literal_Class_With_Root_Namespace')));
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Literal_Class_With_Root_Namespace']));
 
         $container = new \Symfony_DI_PhpDumper_Test_Literal_Class_With_Root_Namespace();
 
@@ -918,23 +918,23 @@ public function testDumpHandlesLiteralClassWithRootNamespace()
 
     public function testDumpHandlesObjectClassNames()
     {
-        $container = new ContainerBuilder(new ParameterBag(array(
+        $container = new ContainerBuilder(new ParameterBag([
             'class' => 'stdClass',
-        )));
+        ]));
 
         $container->setDefinition('foo', new Definition(new Parameter('class')));
-        $container->setDefinition('bar', new Definition('stdClass', array(
+        $container->setDefinition('bar', new Definition('stdClass', [
             new Reference('foo'),
-        )))->setPublic(true);
+        ]))->setPublic(true);
 
         $container->setParameter('inline_requires', true);
         $container->compile();
 
         $dumper = new PhpDumper($container);
-        eval('?>'.$dumper->dump(array(
+        eval('?>'.$dumper->dump([
             'class' => 'Symfony_DI_PhpDumper_Test_Object_Class_Name',
             'inline_class_loader_parameter' => 'inline_requires',
-        )));
+        ]));
 
         $container = new \Symfony_DI_PhpDumper_Test_Object_Class_Name();
 
@@ -951,17 +951,17 @@ public function testUninitializedSyntheticReference()
         $container->compile();
 
         $dumper = new PhpDumper($container);
-        eval('?>'.$dumper->dump(array(
+        eval('?>'.$dumper->dump([
             'class' => 'Symfony_DI_PhpDumper_Test_UninitializedSyntheticReference',
             'inline_class_loader_parameter' => 'inline_requires',
-        )));
+        ]));
 
         $container = new \Symfony_DI_PhpDumper_Test_UninitializedSyntheticReference();
 
-        $this->assertEquals((object) array('foo' => null), $container->get('bar'));
+        $this->assertEquals((object) ['foo' => null], $container->get('bar'));
 
-        $container->set('foo', (object) array(123));
-        $this->assertEquals((object) array('foo' => (object) array(123)), $container->get('bar'));
+        $container->set('foo', (object) [123]);
+        $this->assertEquals((object) ['foo' => (object) [123]], $container->get('bar'));
     }
 
     public function testAdawsonContainer()
@@ -1044,7 +1044,7 @@ public function testPrivateServiceTriggersDeprecation()
         $container->compile();
 
         $dumper = new PhpDumper($container);
-        eval('?>'.$dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Private_Service_Triggers_Deprecation')));
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Private_Service_Triggers_Deprecation']));
 
         $container = new \Symfony_DI_PhpDumper_Test_Private_Service_Triggers_Deprecation();
 
@@ -1059,11 +1059,11 @@ public function testPrivateServiceTriggersDeprecation()
      */
     public function testParameterWithMixedCase()
     {
-        $container = new ContainerBuilder(new ParameterBag(array('Foo' => 'bar', 'BAR' => 'foo')));
+        $container = new ContainerBuilder(new ParameterBag(['Foo' => 'bar', 'BAR' => 'foo']));
         $container->compile();
 
         $dumper = new PhpDumper($container);
-        eval('?>'.$dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Parameter_With_Mixed_Case')));
+        eval('?>'.$dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Parameter_With_Mixed_Case']));
 
         $container = new \Symfony_DI_PhpDumper_Test_Parameter_With_Mixed_Case();
 
@@ -1120,7 +1120,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)
 
     public static function getProvidedTypes()
     {
-        return array('rot13' => 'string');
+        return ['rot13' => 'string'];
     }
 }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
index f33b3b8d70732..ac274c6f26267 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
@@ -123,8 +123,8 @@ public function provideDecoratedServicesData()
     {
         $fixturesPath = realpath(__DIR__.'/../Fixtures/');
 
-        return array(
-            array("<?xml version=\"1.0\" encoding=\"utf-8\"?>
+        return [
+            ["<?xml version=\"1.0\" encoding=\"utf-8\"?>
 <container xmlns=\"http://symfony.com/schema/dic/services\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd\">
   <services>
     <service id=\"service_container\" class=\"Symfony\Component\DependencyInjection\ContainerInterface\" public=\"true\" synthetic=\"true\"/>
@@ -133,8 +133,8 @@ public function provideDecoratedServicesData()
     <service id=\"Symfony\Component\DependencyInjection\ContainerInterface\" alias=\"service_container\" public=\"false\"/>
   </services>
 </container>
-", include $fixturesPath.'/containers/container15.php'),
-            array("<?xml version=\"1.0\" encoding=\"utf-8\"?>
+", include $fixturesPath.'/containers/container15.php'],
+            ["<?xml version=\"1.0\" encoding=\"utf-8\"?>
 <container xmlns=\"http://symfony.com/schema/dic/services\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd\">
   <services>
     <service id=\"service_container\" class=\"Symfony\Component\DependencyInjection\ContainerInterface\" public=\"true\" synthetic=\"true\"/>
@@ -143,8 +143,8 @@ public function provideDecoratedServicesData()
     <service id=\"Symfony\Component\DependencyInjection\ContainerInterface\" alias=\"service_container\" public=\"false\"/>
   </services>
 </container>
-", include $fixturesPath.'/containers/container16.php'),
-        );
+", include $fixturesPath.'/containers/container16.php'],
+        ];
     }
 
     /**
@@ -163,13 +163,13 @@ public function testCompiledContainerCanBeDumped($containerFile)
 
     public function provideCompiledContainerData()
     {
-        return array(
-            array('container8'),
-            array('container9'),
-            array('container11'),
-            array('container12'),
-            array('container14'),
-        );
+        return [
+            ['container8'],
+            ['container9'],
+            ['container11'],
+            ['container12'],
+            ['container14'],
+        ];
     }
 
     public function testDumpInlinedServices()
@@ -194,7 +194,7 @@ public function testDumpLoad()
         $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
         $loader->load('services_dump_load.xml');
 
-        $this->assertEquals(array(new Reference('bar', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)), $container->getDefinition('foo')->getArguments());
+        $this->assertEquals([new Reference('bar', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)], $container->getDefinition('foo')->getArguments());
 
         $dumper = new XmlDumper($container);
         $this->assertStringEqualsFile(self::$fixturesPath.'/xml/services_dump_load.xml', $dumper->dump());
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
index ff2239fb64d66..49ee8e6f3002e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
@@ -75,7 +75,7 @@ public function testDumpLoad()
         $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('services_dump_load.yml');
 
-        $this->assertEquals(array(new Reference('bar', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)), $container->getDefinition('foo')->getArguments());
+        $this->assertEquals([new Reference('bar', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)], $container->getDefinition('foo')->getArguments());
 
         $dumper = new YamlDumper($container);
         $this->assertStringEqualsFile(self::$fixturesPath.'/yaml/services_dump_load.yml', $dumper->dump());
diff --git a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
index b1ee044e9e5c0..1684f2492825a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
@@ -31,16 +31,16 @@ public function testGetEnvString($value, $processed)
 
     public function validStrings()
     {
-        return array(
-            array('hello', 'hello'),
-            array('true', 'true'),
-            array('false', 'false'),
-            array('null', 'null'),
-            array('1', '1'),
-            array('0', '0'),
-            array('1.1', '1.1'),
-            array('1e1', '1e1'),
-        );
+        return [
+            ['hello', 'hello'],
+            ['true', 'true'],
+            ['false', 'false'],
+            ['null', 'null'],
+            ['1', '1'],
+            ['0', '0'],
+            ['1.1', '1.1'],
+            ['1e1', '1e1'],
+        ];
     }
 
     /**
@@ -61,15 +61,15 @@ public function testGetEnvBool($value, $processed)
 
     public function validBools()
     {
-        return array(
-            array('true', true),
-            array('false', false),
-            array('null', false),
-            array('1', true),
-            array('0', false),
-            array('1.1', true),
-            array('1e1', true),
-        );
+        return [
+            ['true', true],
+            ['false', false],
+            ['null', false],
+            ['1', true],
+            ['0', false],
+            ['1.1', true],
+            ['1e1', true],
+        ];
     }
 
     /**
@@ -90,11 +90,11 @@ public function testGetEnvInt($value, $processed)
 
     public function validInts()
     {
-        return array(
-            array('1', 1),
-            array('1.1', 1),
-            array('1e1', 10),
-        );
+        return [
+            ['1', 1],
+            ['1.1', 1],
+            ['1e1', 10],
+        ];
     }
 
     /**
@@ -115,11 +115,11 @@ public function testGetEnvIntInvalid($value)
 
     public function invalidInts()
     {
-        return array(
-            array('foo'),
-            array('true'),
-            array('null'),
-        );
+        return [
+            ['foo'],
+            ['true'],
+            ['null'],
+        ];
     }
 
     /**
@@ -140,11 +140,11 @@ public function testGetEnvFloat($value, $processed)
 
     public function validFloats()
     {
-        return array(
-            array('1', 1.0),
-            array('1.1', 1.1),
-            array('1e1', 10.0),
-        );
+        return [
+            ['1', 1.0],
+            ['1.1', 1.1],
+            ['1e1', 10.0],
+        ];
     }
 
     /**
@@ -165,11 +165,11 @@ public function testGetEnvFloatInvalid($value)
 
     public function invalidFloats()
     {
-        return array(
-            array('foo'),
-            array('true'),
-            array('null'),
-        );
+        return [
+            ['foo'],
+            ['true'],
+            ['null'],
+        ];
     }
 
     /**
@@ -190,10 +190,10 @@ public function testGetEnvConst($value, $processed)
 
     public function validConsts()
     {
-        return array(
-            array('Symfony\Component\DependencyInjection\Tests\EnvVarProcessorTest::TEST_CONST', self::TEST_CONST),
-            array('E_ERROR', E_ERROR),
-        );
+        return [
+            ['Symfony\Component\DependencyInjection\Tests\EnvVarProcessorTest::TEST_CONST', self::TEST_CONST],
+            ['E_ERROR', E_ERROR],
+        ];
     }
 
     /**
@@ -214,10 +214,10 @@ public function testGetEnvConstInvalid($value)
 
     public function invalidConsts()
     {
-        return array(
-            array('Symfony\Component\DependencyInjection\Tests\EnvVarProcessorTest::UNDEFINED_CONST'),
-            array('UNDEFINED_CONST'),
-        );
+        return [
+            ['Symfony\Component\DependencyInjection\Tests\EnvVarProcessorTest::UNDEFINED_CONST'],
+            ['UNDEFINED_CONST'],
+        ];
     }
 
     public function testGetEnvBase64()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Extension/ExtensionTest.php b/src/Symfony/Component/DependencyInjection/Tests/Extension/ExtensionTest.php
index 9f66bfd7c6802..3c912f2a13678 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Extension/ExtensionTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Extension/ExtensionTest.php
@@ -23,15 +23,15 @@ class ExtensionTest extends TestCase
     public function testIsConfigEnabledReturnsTheResolvedValue($enabled)
     {
         $extension = new EnableableExtension();
-        $this->assertSame($enabled, $extension->isConfigEnabled(new ContainerBuilder(), array('enabled' => $enabled)));
+        $this->assertSame($enabled, $extension->isConfigEnabled(new ContainerBuilder(), ['enabled' => $enabled]));
     }
 
     public function getResolvedEnabledFixtures()
     {
-        return array(
-            array(true),
-            array(false),
-        );
+        return [
+            [true],
+            [false],
+        ];
     }
 
     /**
@@ -42,7 +42,7 @@ public function testIsConfigEnabledOnNonEnableableConfig()
     {
         $extension = new EnableableExtension();
 
-        $extension->isConfigEnabled(new ContainerBuilder(), array());
+        $extension->isConfigEnabled(new ContainerBuilder(), []);
     }
 }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Bar.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Bar.php
index d243866d36ef9..83f2da12a70ab 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Bar.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Bar.php
@@ -13,7 +13,7 @@
 
 class Bar implements BarInterface
 {
-    public function __construct($quz = null, \NonExistent $nonExistent = null, BarInterface $decorated = null, array $foo = array())
+    public function __construct($quz = null, \NonExistent $nonExistent = null, BarInterface $decorated = null, array $foo = [])
     {
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/TestServiceSubscriber.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/TestServiceSubscriber.php
index 875abe9e02e12..a3b042b8f261d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/TestServiceSubscriber.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/TestServiceSubscriber.php
@@ -12,11 +12,11 @@ public function __construct($container)
 
     public static function getSubscribedServices()
     {
-        return array(
+        return [
             __CLASS__,
             '?'.CustomDefinition::class,
             'bar' => CustomDefinition::class,
             'baz' => '?'.CustomDefinition::class,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/basic.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/basic.php
index b98e894c37253..a9e250b9213a1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/basic.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/basic.php
@@ -7,5 +7,5 @@
 return function (ContainerConfigurator $c) {
     $s = $c->services();
     $s->set(BarService::class)
-        ->args(array(inline('FooClass')));
+        ->args([inline('FooClass')]);
 };
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.php
index 6fd84485e7a3a..8a5f2431d0abf 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.php
@@ -13,7 +13,7 @@
         ->set('foo')
             ->parent(BarService::class)
             ->decorate('bar', 'b', 1)
-            ->args(array(ref('b')))
+            ->args([ref('b')])
             ->class('Class2')
             ->file('file.php')
             ->parent('bar')
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.php
index de3b99d745a56..2889d3fbb6400 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.php
@@ -12,10 +12,10 @@
         ->private()
         ->autoconfigure()
         ->autowire()
-        ->tag('t', array('a' => 'b'))
+        ->tag('t', ['a' => 'b'])
         ->bind(Foo::class, ref('bar'))
         ->private();
 
-    $s->set(Foo::class)->args(array(ref('bar')))->public();
+    $s->set(Foo::class)->args([ref('bar')])->public();
     $s->set('bar', Foo::class)->call('setFoo')->autoconfigure(false);
 };
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof.php
index 062e8c00ab250..0d6aac7a0051e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof.php
@@ -9,8 +9,8 @@
     $s = $c->services();
     $s->instanceof(Prototype\Foo::class)
         ->property('p', 0)
-        ->call('setFoo', array(ref('foo')))
-        ->tag('tag', array('k' => 'v'))
+        ->call('setFoo', [ref('foo')])
+        ->tag('tag', ['k' => 'v'])
         ->share(false)
         ->lazy()
         ->configurator('c')
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.php
index 622c51af57a26..e2884aa20216a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.php
@@ -12,8 +12,8 @@
         ->exclude('../Prototype/{OtherDir,BadClasses}')
         ->factory('f')
         ->deprecate('%service_id%')
-        ->args(array(0))
-        ->args(array(1))
+        ->args([0])
+        ->args([1])
         ->autoconfigure(false)
         ->tag('foo')
         ->parent('foo');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services9.php
index b013e5126d3b6..d9373a2a6f9e6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services9.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services9.php
@@ -16,65 +16,65 @@
 
     $s = $c->services();
     $s->set('foo')
-        ->args(array('foo', ref('foo.baz'), array('%foo%' => 'foo is %foo%', 'foobar' => '%foo%'), true, ref('service_container')))
+        ->args(['foo', ref('foo.baz'), ['%foo%' => 'foo is %foo%', 'foobar' => '%foo%'], true, ref('service_container')])
         ->class(FooClass::class)
-        ->tag('foo', array('foo' => 'foo'))
-        ->tag('foo', array('bar' => 'bar', 'baz' => 'baz'))
-        ->factory(array(FooClass::class, 'getInstance'))
+        ->tag('foo', ['foo' => 'foo'])
+        ->tag('foo', ['bar' => 'bar', 'baz' => 'baz'])
+        ->factory([FooClass::class, 'getInstance'])
         ->property('foo', 'bar')
         ->property('moo', ref('foo.baz'))
-        ->property('qux', array('%foo%' => 'foo is %foo%', 'foobar' => '%foo%'))
-        ->call('setBar', array(ref('bar')))
+        ->property('qux', ['%foo%' => 'foo is %foo%', 'foobar' => '%foo%'])
+        ->call('setBar', [ref('bar')])
         ->call('initialize')
         ->configurator('sc_configure');
 
     $s->set('foo.baz', '%baz_class%')
-        ->factory(array('%baz_class%', 'getInstance'))
-        ->configurator(array('%baz_class%', 'configureStatic1'));
+        ->factory(['%baz_class%', 'getInstance'])
+        ->configurator(['%baz_class%', 'configureStatic1']);
 
     $s->set('bar', FooClass::class)
-        ->args(array('foo', ref('foo.baz'), new Parameter('foo_bar')))
-        ->configurator(array(ref('foo.baz'), 'configure'));
+        ->args(['foo', ref('foo.baz'), new Parameter('foo_bar')])
+        ->configurator([ref('foo.baz'), 'configure']);
 
     $s->set('foo_bar', '%foo_class%')
-        ->args(array(ref('deprecated_service')))
+        ->args([ref('deprecated_service')])
         ->share(false);
 
     $s->set('method_call1', 'Bar\FooClass')
         ->file(realpath(__DIR__.'/../includes/foo.php'))
-        ->call('setBar', array(ref('foo')))
-        ->call('setBar', array(ref('foo2')->nullOnInvalid()))
-        ->call('setBar', array(ref('foo3')->ignoreOnInvalid()))
-        ->call('setBar', array(ref('foobaz')->ignoreOnInvalid()))
-        ->call('setBar', array(expr('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")')));
+        ->call('setBar', [ref('foo')])
+        ->call('setBar', [ref('foo2')->nullOnInvalid()])
+        ->call('setBar', [ref('foo3')->ignoreOnInvalid()])
+        ->call('setBar', [ref('foobaz')->ignoreOnInvalid()])
+        ->call('setBar', [expr('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")')]);
 
     $s->set('foo_with_inline', 'Foo')
-        ->call('setBar', array(ref('inlined')));
+        ->call('setBar', [ref('inlined')]);
 
     $s->set('inlined', 'Bar')
         ->property('pub', 'pub')
-        ->call('setBaz', array(ref('baz')))
+        ->call('setBaz', [ref('baz')])
         ->private();
 
     $s->set('baz', 'Baz')
-        ->call('setFoo', array(ref('foo_with_inline')));
+        ->call('setFoo', [ref('foo_with_inline')]);
 
     $s->set('request', 'Request')
         ->synthetic();
 
     $s->set('configurator_service', 'ConfClass')
         ->private()
-        ->call('setFoo', array(ref('baz')));
+        ->call('setFoo', [ref('baz')]);
 
     $s->set('configured_service', 'stdClass')
-        ->configurator(array(ref('configurator_service'), 'configureStdClass'));
+        ->configurator([ref('configurator_service'), 'configureStdClass']);
 
     $s->set('configurator_service_simple', 'ConfClass')
-        ->args(array('bar'))
+        ->args(['bar'])
         ->private();
 
     $s->set('configured_service_simple', 'stdClass')
-        ->configurator(array(ref('configurator_service_simple'), 'configureStdClass'));
+        ->configurator([ref('configurator_service_simple'), 'configureStdClass']);
 
     $s->set('decorated', 'stdClass');
 
@@ -92,28 +92,28 @@
         ->private();
 
     $s->set('factory_service', 'Bar')
-        ->factory(array(ref('foo.baz'), 'getInstance'));
+        ->factory([ref('foo.baz'), 'getInstance']);
 
     $s->set('new_factory_service', 'FooBarBaz')
         ->property('foo', 'bar')
-        ->factory(array(ref('new_factory'), 'getInstance'));
+        ->factory([ref('new_factory'), 'getInstance']);
 
     $s->set('service_from_static_method', 'Bar\FooClass')
-        ->factory(array('Bar\FooClass', 'getInstance'));
+        ->factory(['Bar\FooClass', 'getInstance']);
 
     $s->set('factory_simple', 'SimpleFactoryClass')
         ->deprecate()
-        ->args(array('foo'))
+        ->args(['foo'])
         ->private();
 
     $s->set('factory_service_simple', 'Bar')
-        ->factory(array(ref('factory_simple'), 'getInstance'));
+        ->factory([ref('factory_simple'), 'getInstance']);
 
     $s->set('lazy_context', 'LazyContext')
-        ->args(array(iterator(array('k1' => ref('foo.baz'), 'k2' => ref('service_container'))), iterator(array())));
+        ->args([iterator(['k1' => ref('foo.baz'), 'k2' => ref('service_container')]), iterator([])]);
 
     $s->set('lazy_context_ignore_invalid_ref', 'LazyContext')
-        ->args(array(iterator(array(ref('foo.baz'), ref('invalid')->ignoreOnInvalid())), iterator(array())));
+        ->args([iterator([ref('foo.baz'), ref('invalid')->ignoreOnInvalid()]), iterator([])]);
 
     $s->set('tagged_iterator_foo', 'Bar')
         ->private()
@@ -121,7 +121,7 @@
 
     $s->set('tagged_iterator', 'Bar')
         ->public()
-        ->args(array(tagged('foo')));
+        ->args([tagged('foo')]);
 
     $s->alias('alias_for_foo', 'foo')->private()->public();
     $s->alias('alias_for_alias', ref('alias_for_foo'));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container11.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container11.php
index 150cd7921ee1b..91e5c26330f45 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container11.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container11.php
@@ -6,7 +6,7 @@
 $container = new ContainerBuilder();
 $container->
     register('foo', 'FooClass')->
-    addArgument(new Definition('BarClass', array(new Definition('BazClass'))))
+    addArgument(new Definition('BarClass', [new Definition('BazClass')]))
     ->setPublic(true)
 ;
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container12.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container12.php
index bc527eb79e78d..ef0770302491c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container12.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container12.php
@@ -6,7 +6,7 @@
 $container->
     register('foo', 'FooClass\\Foo')->
     addArgument('foo<>&bar')->
-    addTag('foo"bar\\bar', array('foo' => 'foo"barřž€'))
+    addTag('foo"bar\\bar', ['foo' => 'foo"barřž€'])
     ->setPublic(true)
 ;
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container19.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container19.php
index 300a5cc7697de..c3af5c96063ba 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container19.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container19.php
@@ -12,7 +12,7 @@
 
 $container
     ->register('service_from_anonymous_factory', '%foo%')
-    ->setFactory(array(new Definition('%foo%'), 'getInstance'))
+    ->setFactory([new Definition('%foo%'), 'getInstance'])
     ->setPublic(true)
 ;
 
@@ -20,7 +20,7 @@
 $anonymousServiceWithFactory->setFactory('Bar\FooClass::getInstance');
 $container
     ->register('service_with_method_call_and_factory', 'Bar\FooClass')
-    ->addMethodCall('setBar', array($anonymousServiceWithFactory))
+    ->addMethodCall('setBar', [$anonymousServiceWithFactory])
     ->setPublic(true)
 ;
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container21.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container21.php
index 298c9266a9e2b..d82cf38538c33 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container21.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container21.php
@@ -6,15 +6,15 @@
 $container = new ContainerBuilder();
 
 $bar = new Definition('Bar');
-$bar->setConfigurator(array(new Definition('Baz'), 'configureBar'));
+$bar->setConfigurator([new Definition('Baz'), 'configureBar']);
 
 $fooFactory = new Definition('FooFactory');
-$fooFactory->setFactory(array(new Definition('Foobar'), 'createFooFactory'));
+$fooFactory->setFactory([new Definition('Foobar'), 'createFooFactory']);
 
 $container
     ->register('foo', 'Foo')
-    ->setFactory(array($fooFactory, 'createFoo'))
-    ->setConfigurator(array($bar, 'configureFoo'))
+    ->setFactory([$fooFactory, 'createFoo'])
+    ->setConfigurator([$bar, 'configureFoo'])
     ->setPublic(true)
 ;
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
index 21d35611c33ae..691a7fa695f91 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
@@ -14,26 +14,26 @@
 $container = new ContainerBuilder();
 $container
     ->register('foo', '\Bar\FooClass')
-    ->addTag('foo', array('foo' => 'foo'))
-    ->addTag('foo', array('bar' => 'bar', 'baz' => 'baz'))
-    ->setFactory(array('Bar\\FooClass', 'getInstance'))
-    ->setArguments(array('foo', new Reference('foo.baz'), array('%foo%' => 'foo is %foo%', 'foobar' => '%foo%'), true, new Reference('service_container')))
-    ->setProperties(array('foo' => 'bar', 'moo' => new Reference('foo.baz'), 'qux' => array('%foo%' => 'foo is %foo%', 'foobar' => '%foo%')))
-    ->addMethodCall('setBar', array(new Reference('bar')))
+    ->addTag('foo', ['foo' => 'foo'])
+    ->addTag('foo', ['bar' => 'bar', 'baz' => 'baz'])
+    ->setFactory(['Bar\\FooClass', 'getInstance'])
+    ->setArguments(['foo', new Reference('foo.baz'), ['%foo%' => 'foo is %foo%', 'foobar' => '%foo%'], true, new Reference('service_container')])
+    ->setProperties(['foo' => 'bar', 'moo' => new Reference('foo.baz'), 'qux' => ['%foo%' => 'foo is %foo%', 'foobar' => '%foo%']])
+    ->addMethodCall('setBar', [new Reference('bar')])
     ->addMethodCall('initialize')
     ->setConfigurator('sc_configure')
     ->setPublic(true)
 ;
 $container
     ->register('foo.baz', '%baz_class%')
-    ->setFactory(array('%baz_class%', 'getInstance'))
-    ->setConfigurator(array('%baz_class%', 'configureStatic1'))
+    ->setFactory(['%baz_class%', 'getInstance'])
+    ->setConfigurator(['%baz_class%', 'configureStatic1'])
     ->setPublic(true)
 ;
 $container
     ->register('bar', 'Bar\FooClass')
-    ->setArguments(array('foo', new Reference('foo.baz'), new Parameter('foo_bar')))
-    ->setConfigurator(array(new Reference('foo.baz'), 'configure'))
+    ->setArguments(['foo', new Reference('foo.baz'), new Parameter('foo_bar')])
+    ->setConfigurator([new Reference('foo.baz'), 'configure'])
     ->setPublic(true)
 ;
 $container
@@ -43,35 +43,35 @@
     ->setPublic(true)
 ;
 $container->getParameterBag()->clear();
-$container->getParameterBag()->add(array(
+$container->getParameterBag()->add([
     'baz_class' => 'BazClass',
     'foo_class' => 'Bar\FooClass',
     'foo' => 'bar',
-));
+]);
 $container
     ->register('method_call1', 'Bar\FooClass')
     ->setFile(realpath(__DIR__.'/../includes/foo.php'))
-    ->addMethodCall('setBar', array(new Reference('foo')))
-    ->addMethodCall('setBar', array(new Reference('foo2', ContainerInterface::NULL_ON_INVALID_REFERENCE)))
-    ->addMethodCall('setBar', array(new Reference('foo3', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)))
-    ->addMethodCall('setBar', array(new Reference('foobaz', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)))
-    ->addMethodCall('setBar', array(new Expression('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")')))
+    ->addMethodCall('setBar', [new Reference('foo')])
+    ->addMethodCall('setBar', [new Reference('foo2', ContainerInterface::NULL_ON_INVALID_REFERENCE)])
+    ->addMethodCall('setBar', [new Reference('foo3', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)])
+    ->addMethodCall('setBar', [new Reference('foobaz', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)])
+    ->addMethodCall('setBar', [new Expression('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")')])
     ->setPublic(true)
 ;
 $container
     ->register('foo_with_inline', 'Foo')
-    ->addMethodCall('setBar', array(new Reference('inlined')))
+    ->addMethodCall('setBar', [new Reference('inlined')])
     ->setPublic(true)
 ;
 $container
     ->register('inlined', 'Bar')
     ->setProperty('pub', 'pub')
-    ->addMethodCall('setBaz', array(new Reference('baz')))
+    ->addMethodCall('setBaz', [new Reference('baz')])
     ->setPublic(false)
 ;
 $container
     ->register('baz', 'Baz')
-    ->addMethodCall('setFoo', array(new Reference('foo_with_inline')))
+    ->addMethodCall('setFoo', [new Reference('foo_with_inline')])
     ->setPublic(true)
 ;
 $container
@@ -82,11 +82,11 @@
 $container
     ->register('configurator_service', 'ConfClass')
     ->setPublic(false)
-    ->addMethodCall('setFoo', array(new Reference('baz')))
+    ->addMethodCall('setFoo', [new Reference('baz')])
 ;
 $container
     ->register('configured_service', 'stdClass')
-    ->setConfigurator(array(new Reference('configurator_service'), 'configureStdClass'))
+    ->setConfigurator([new Reference('configurator_service'), 'configureStdClass'])
     ->setPublic(true)
 ;
 $container
@@ -96,7 +96,7 @@
 ;
 $container
     ->register('configured_service_simple', 'stdClass')
-    ->setConfigurator(array(new Reference('configurator_service_simple'), 'configureStdClass'))
+    ->setConfigurator([new Reference('configurator_service_simple'), 'configureStdClass'])
     ->setPublic(true)
 ;
 $container
@@ -125,18 +125,18 @@
 ;
 $container
     ->register('factory_service', 'Bar')
-    ->setFactory(array(new Reference('foo.baz'), 'getInstance'))
+    ->setFactory([new Reference('foo.baz'), 'getInstance'])
     ->setPublic(true)
 ;
 $container
     ->register('new_factory_service', 'FooBarBaz')
     ->setProperty('foo', 'bar')
-    ->setFactory(array(new Reference('new_factory'), 'getInstance'))
+    ->setFactory([new Reference('new_factory'), 'getInstance'])
     ->setPublic(true)
 ;
 $container
     ->register('service_from_static_method', 'Bar\FooClass')
-    ->setFactory(array('Bar\FooClass', 'getInstance'))
+    ->setFactory(['Bar\FooClass', 'getInstance'])
     ->setPublic(true)
 ;
 $container
@@ -147,17 +147,17 @@
 ;
 $container
     ->register('factory_service_simple', 'Bar')
-    ->setFactory(array(new Reference('factory_simple'), 'getInstance'))
+    ->setFactory([new Reference('factory_simple'), 'getInstance'])
     ->setPublic(true)
 ;
 $container
     ->register('lazy_context', 'LazyContext')
-    ->setArguments(array(new IteratorArgument(array('k1' => new Reference('foo.baz'), 'k2' => new Reference('service_container'))), new IteratorArgument(array())))
+    ->setArguments([new IteratorArgument(['k1' => new Reference('foo.baz'), 'k2' => new Reference('service_container')]), new IteratorArgument([])])
     ->setPublic(true)
 ;
 $container
     ->register('lazy_context_ignore_invalid_ref', 'LazyContext')
-    ->setArguments(array(new IteratorArgument(array(new Reference('foo.baz'), new Reference('invalid', ContainerInterface::IGNORE_ON_INVALID_REFERENCE))), new IteratorArgument(array())))
+    ->setArguments([new IteratorArgument([new Reference('foo.baz'), new Reference('invalid', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]), new IteratorArgument([])])
     ->setPublic(true)
 ;
 $container
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_almost_circular.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_almost_circular.php
index 4c9906f7ae015..df136cfa5ddba 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_almost_circular.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_almost_circular.php
@@ -15,7 +15,7 @@
    ->addArgument(new Reference('bar'));
 
 $container->register('bar', BarCircular::class)->setPublic($public)
-    ->addMethodCall('addFoobar', array(new Reference('foobar')));
+    ->addMethodCall('addFoobar', [new Reference('foobar')]);
 
 $container->register('foobar', FoobarCircular::class)->setPublic($public)
     ->addArgument(new Reference('foo'));
@@ -26,7 +26,7 @@
    ->addArgument(new Reference('bar2'));
 
 $container->register('bar2', BarCircular::class)->setPublic(!$public)
-    ->addMethodCall('addFoobar', array(new Reference('foobar2')));
+    ->addMethodCall('addFoobar', [new Reference('foobar2')]);
 
 $container->register('foobar2', FoobarCircular::class)->setPublic($public)
     ->addArgument(new Reference('foo2'));
@@ -34,7 +34,7 @@
 // simple inline setter with internal reference
 
 $container->register('bar3', BarCircular::class)->setPublic(true)
-    ->addMethodCall('addFoobar', array(new Reference('foobar3'), new Reference('foobar3')));
+    ->addMethodCall('addFoobar', [new Reference('foobar3'), new Reference('foobar3')]);
 
 $container->register('foobar3', FoobarCircular::class)->setPublic($public);
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_env_in_id.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_env_in_id.php
index 4699f41011a41..1e851cf016c2b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_env_in_id.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_env_in_id.php
@@ -11,7 +11,7 @@
 
 $container->register('foo', 'stdClass')->setPublic(true)
    ->addArgument(new Reference('bar_%env(BAR)%'))
-   ->addArgument(array('baz_%env(BAR)%' => new Reference('baz_%env(BAR)%')));
+   ->addArgument(['baz_%env(BAR)%' => new Reference('baz_%env(BAR)%')]);
 
 $container->register('bar', 'stdClass')->setPublic(true)
    ->addArgument(new Reference('bar_%env(BAR)%'));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_uninitialized_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_uninitialized_ref.php
index 7aeefb4d5227f..36c05c3fa33ea 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_uninitialized_ref.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_uninitialized_ref.php
@@ -33,16 +33,16 @@
     ->setProperty('foo1', new Reference('foo1', $container::IGNORE_ON_UNINITIALIZED_REFERENCE))
     ->setProperty('foo2', new Reference('foo2', $container::IGNORE_ON_UNINITIALIZED_REFERENCE))
     ->setProperty('foo3', new Reference('foo3', $container::IGNORE_ON_UNINITIALIZED_REFERENCE))
-    ->setProperty('closures', array(
+    ->setProperty('closures', [
         new ServiceClosureArgument(new Reference('foo1', $container::IGNORE_ON_UNINITIALIZED_REFERENCE)),
         new ServiceClosureArgument(new Reference('foo2', $container::IGNORE_ON_UNINITIALIZED_REFERENCE)),
         new ServiceClosureArgument(new Reference('foo3', $container::IGNORE_ON_UNINITIALIZED_REFERENCE)),
-    ))
-    ->setProperty('iter', new IteratorArgument(array(
+    ])
+    ->setProperty('iter', new IteratorArgument([
         'foo1' => new Reference('foo1', $container::IGNORE_ON_UNINITIALIZED_REFERENCE),
         'foo2' => new Reference('foo2', $container::IGNORE_ON_UNINITIALIZED_REFERENCE),
         'foo3' => new Reference('foo3', $container::IGNORE_ON_UNINITIALIZED_REFERENCE),
-    )))
+    ]))
     ->setPublic(true)
 ;
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectExtension.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectExtension.php
index ba07d7c44cbd6..2198b19c4d627 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectExtension.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectExtension.php
@@ -14,7 +14,7 @@ public function load(array $configs, ContainerBuilder $configuration)
         if ($configs) {
             $config = call_user_func_array('array_merge', $configs);
         } else {
-            $config = array();
+            $config = [];
         }
 
         $configuration->setDefinition('project.service.bar', new Definition('FooClass'));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/foo.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/foo.php
index bcb4e20a94afd..20bc928b9728c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/foo.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/foo.php
@@ -11,14 +11,14 @@ class FooClass
     public $initialized = false;
     public $configured = false;
     public $called = false;
-    public $arguments = array();
+    public $arguments = [];
 
-    public function __construct($arguments = array())
+    public function __construct($arguments = [])
     {
         $this->arguments = $arguments;
     }
 
-    public static function getInstance($arguments = array())
+    public static function getInstance($arguments = [])
     {
         $obj = new self($arguments);
         $obj->called = true;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/DirectoryLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/DirectoryLoaderTest.php
index 559abbe25b81d..c7c303b683d99 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/DirectoryLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/DirectoryLoaderTest.php
@@ -37,25 +37,25 @@ protected function setUp()
         $locator = new FileLocator(self::$fixturesPath);
         $this->container = new ContainerBuilder();
         $this->loader = new DirectoryLoader($this->container, $locator);
-        $resolver = new LoaderResolver(array(
+        $resolver = new LoaderResolver([
             new PhpFileLoader($this->container, $locator),
             new IniFileLoader($this->container, $locator),
             new YamlFileLoader($this->container, $locator),
             $this->loader,
-        ));
+        ]);
         $this->loader->setResolver($resolver);
     }
 
     public function testDirectoryCanBeLoadedRecursively()
     {
         $this->loader->load('directory/');
-        $this->assertEquals(array('ini' => 'ini', 'yaml' => 'yaml', 'php' => 'php'), $this->container->getParameterBag()->all(), '->load() takes a single directory');
+        $this->assertEquals(['ini' => 'ini', 'yaml' => 'yaml', 'php' => 'php'], $this->container->getParameterBag()->all(), '->load() takes a single directory');
     }
 
     public function testImports()
     {
         $this->loader->resolve('directory/import/import.yml')->load('directory/import/import.yml');
-        $this->assertEquals(array('ini' => 'ini', 'yaml' => 'yaml'), $this->container->getParameterBag()->all(), '->load() takes a single file that imports a directory');
+        $this->assertEquals(['ini' => 'ini', 'yaml' => 'yaml'], $this->container->getParameterBag()->all(), '->load() takes a single file that imports a directory');
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
index 73015084ab49c..2568c61908771 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
@@ -47,21 +47,21 @@ public function testImportWithGlobPattern()
         $container = new ContainerBuilder();
         $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath));
 
-        $resolver = new LoaderResolver(array(
+        $resolver = new LoaderResolver([
             new IniFileLoader($container, new FileLocator(self::$fixturesPath.'/ini')),
             new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml')),
             new PhpFileLoader($container, new FileLocator(self::$fixturesPath.'/php')),
             new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml')),
-        ));
+        ]);
 
         $loader->setResolver($resolver);
         $loader->import('{F}ixtures/{xml,yaml}/services2.{yml,xml}');
 
         $actual = $container->getParameterBag()->all();
-        $expected = array(
+        $expected = [
             'a string',
             'foo' => 'bar',
-            'values' => array(
+            'values' => [
                 0,
                 'integer' => 4,
                 100 => null,
@@ -73,14 +73,14 @@ public function testImportWithGlobPattern()
                 'float' => 1.3,
                 1000.3,
                 'a string',
-                array('foo', 'bar'),
-            ),
-            'mixedcase' => array('MixedCaseKey' => 'value'),
+                ['foo', 'bar'],
+            ],
+            'mixedcase' => ['MixedCaseKey' => 'value'],
             'constant' => PHP_EOL,
             'bar' => '%foo%',
             'escape' => '@escapeme',
             'foo_bar' => new Reference('foo_bar'),
-        );
+        ];
 
         $this->assertEquals(array_keys($expected), array_keys($actual), '->load() imports and merges imported files');
     }
@@ -94,15 +94,15 @@ public function testRegisterClasses()
         $loader->registerClasses(new Definition(), 'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\\', 'Prototype/%sub_dir%/*');
 
         $this->assertEquals(
-            array('service_container', Bar::class),
+            ['service_container', Bar::class],
             array_keys($container->getDefinitions())
         );
         $this->assertEquals(
-            array(
+            [
                 PsrContainerInterface::class,
                 ContainerInterface::class,
                 BarInterface::class,
-            ),
+            ],
             array_keys($container->getAliases())
         );
     }
@@ -127,11 +127,11 @@ public function testRegisterClassesWithExclude()
         $this->assertFalse($container->has(DeeperBaz::class));
 
         $this->assertEquals(
-            array(
+            [
                 PsrContainerInterface::class,
                 ContainerInterface::class,
                 BarInterface::class,
-            ),
+            ],
             array_keys($container->getAliases())
         );
     }
@@ -150,11 +150,11 @@ public function testNestedRegisterClasses()
         $this->assertTrue($container->has(Foo::class));
 
         $this->assertEquals(
-            array(
+            [
                 PsrContainerInterface::class,
                 ContainerInterface::class,
                 FooInterface::class,
-            ),
+            ],
             array_keys($container->getAliases())
         );
 
@@ -179,7 +179,7 @@ public function testMissingParentClass()
         $this->assertTrue($container->has(MissingParent::class));
 
         $this->assertSame(
-            array('While discovering services from namespace "Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\BadClasses\", an error was thrown when processing the class "Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\BadClasses\MissingParent": "Class Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\BadClasses\MissingClass not found".'),
+            ['While discovering services from namespace "Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\BadClasses\", an error was thrown when processing the class "Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\BadClasses\MissingParent": "Class Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\BadClasses\MissingClass not found".'],
             $container->getDefinition(MissingParent::class)->getErrors()
         );
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php
index c2332f8222883..1d7d3a93ebd09 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php
@@ -30,7 +30,7 @@ protected function setUp()
     public function testIniFileCanBeLoaded()
     {
         $this->loader->load('parameters.ini');
-        $this->assertEquals(array('foo' => 'bar', 'bar' => '%foo%'), $this->container->getParameterBag()->all(), '->load() takes a single file name as its first argument');
+        $this->assertEquals(['foo' => 'bar', 'bar' => '%foo%'], $this->container->getParameterBag()->all(), '->load() takes a single file name as its first argument');
     }
 
     /**
@@ -64,35 +64,35 @@ public function testTypeConversionsWithNativePhp($key, $value, $supported)
 
     public function getTypeConversions()
     {
-        return array(
-            array('true_comment', true, true),
-            array('true', true, true),
-            array('false', false, true),
-            array('on', true, true),
-            array('off', false, true),
-            array('yes', true, true),
-            array('no', false, true),
-            array('none', false, true),
-            array('null', null, true),
-            array('constant', PHP_VERSION, true),
-            array('12', 12, true),
-            array('12_string', '12', true),
-            array('12_quoted_number', 12, false), // INI_SCANNER_RAW removes the double quotes
-            array('12_comment', 12, true),
-            array('12_string_comment', '12', true),
-            array('12_quoted_number_comment', 12, false), // INI_SCANNER_RAW removes the double quotes
-            array('-12', -12, true),
-            array('1', 1, true),
-            array('0', 0, true),
-            array('0b0110', bindec('0b0110'), false), // not supported by INI_SCANNER_TYPED
-            array('11112222333344445555', '1111,2222,3333,4444,5555', true),
-            array('0777', 0777, false), // not supported by INI_SCANNER_TYPED
-            array('255', 0xFF, false), // not supported by INI_SCANNER_TYPED
-            array('100.0', 1e2, false), // not supported by INI_SCANNER_TYPED
-            array('-120.0', -1.2E2, false), // not supported by INI_SCANNER_TYPED
-            array('-10100.1', -10100.1, false), // not supported by INI_SCANNER_TYPED
-            array('-10,100.1', '-10,100.1', true),
-        );
+        return [
+            ['true_comment', true, true],
+            ['true', true, true],
+            ['false', false, true],
+            ['on', true, true],
+            ['off', false, true],
+            ['yes', true, true],
+            ['no', false, true],
+            ['none', false, true],
+            ['null', null, true],
+            ['constant', PHP_VERSION, true],
+            ['12', 12, true],
+            ['12_string', '12', true],
+            ['12_quoted_number', 12, false], // INI_SCANNER_RAW removes the double quotes
+            ['12_comment', 12, true],
+            ['12_string_comment', '12', true],
+            ['12_quoted_number_comment', 12, false], // INI_SCANNER_RAW removes the double quotes
+            ['-12', -12, true],
+            ['1', 1, true],
+            ['0', 0, true],
+            ['0b0110', bindec('0b0110'), false], // not supported by INI_SCANNER_TYPED
+            ['11112222333344445555', '1111,2222,3333,4444,5555', true],
+            ['0777', 0777, false], // not supported by INI_SCANNER_TYPED
+            ['255', 0xFF, false], // not supported by INI_SCANNER_TYPED
+            ['100.0', 1e2, false], // not supported by INI_SCANNER_TYPED
+            ['-120.0', -1.2E2, false], // not supported by INI_SCANNER_TYPED
+            ['-10100.1', -10100.1, false], // not supported by INI_SCANNER_TYPED
+            ['-10,100.1', '-10,100.1', true],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/LoaderResolverTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/LoaderResolverTest.php
index cb2d6ddcc248f..9167e18cedcab 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/LoaderResolverTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/LoaderResolverTest.php
@@ -33,23 +33,23 @@ protected function setUp()
         self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
 
         $container = new ContainerBuilder();
-        $this->resolver = new LoaderResolver(array(
+        $this->resolver = new LoaderResolver([
             new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml')),
             new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml')),
             new IniFileLoader($container, new FileLocator(self::$fixturesPath.'/ini')),
             new PhpFileLoader($container, new FileLocator(self::$fixturesPath.'/php')),
             new ClosureLoader($container),
-        ));
+        ]);
     }
 
     public function provideResourcesToLoad()
     {
-        return array(
-            array('ini_with_wrong_ext.xml', 'ini', IniFileLoader::class),
-            array('xml_with_wrong_ext.php', 'xml', XmlFileLoader::class),
-            array('php_with_wrong_ext.yml', 'php', PhpFileLoader::class),
-            array('yaml_with_wrong_ext.ini', 'yaml', YamlFileLoader::class),
-        );
+        return [
+            ['ini_with_wrong_ext.xml', 'ini', IniFileLoader::class],
+            ['xml_with_wrong_ext.php', 'xml', XmlFileLoader::class],
+            ['php_with_wrong_ext.yml', 'php', PhpFileLoader::class],
+            ['yaml_with_wrong_ext.ini', 'yaml', YamlFileLoader::class],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
index 2a9ac68e97e44..fa9bee4680872 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -112,10 +112,10 @@ public function testLoadParameters()
         $loader->load('services2.xml');
 
         $actual = $container->getParameterBag()->all();
-        $expected = array(
+        $expected = [
             'a string',
             'foo' => 'bar',
-            'values' => array(
+            'values' => [
                 0,
                 'integer' => 4,
                 100 => null,
@@ -127,11 +127,11 @@ public function testLoadParameters()
                 'float' => 1.3,
                 1000.3,
                 'a string',
-                array('foo', 'bar'),
-            ),
-            'mixedcase' => array('MixedCaseKey' => 'value'),
+                ['foo', 'bar'],
+            ],
+            'mixedcase' => ['MixedCaseKey' => 'value'],
             'constant' => PHP_EOL,
-        );
+        ];
 
         $this->assertEquals($expected, $actual, '->load() converts XML values to PHP ones');
     }
@@ -139,19 +139,19 @@ public function testLoadParameters()
     public function testLoadImports()
     {
         $container = new ContainerBuilder();
-        $resolver = new LoaderResolver(array(
+        $resolver = new LoaderResolver([
             new IniFileLoader($container, new FileLocator(self::$fixturesPath.'/ini')),
             new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yml')),
             $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml')),
-        ));
+        ]);
         $loader->setResolver($resolver);
         $loader->load('services4.xml');
 
         $actual = $container->getParameterBag()->all();
-        $expected = array(
+        $expected = [
             'a string',
             'foo' => 'bar',
-            'values' => array(
+            'values' => [
                 0,
                 'integer' => 4,
                 100 => null,
@@ -163,15 +163,15 @@ public function testLoadImports()
                 'float' => 1.3,
                 1000.3,
                 'a string',
-                array('foo', 'bar'),
-            ),
-            'mixedcase' => array('MixedCaseKey' => 'value'),
+                ['foo', 'bar'],
+            ],
+            'mixedcase' => ['MixedCaseKey' => 'value'],
             'constant' => PHP_EOL,
             'bar' => '%foo%',
             'imported_from_ini' => true,
             'imported_from_yaml' => true,
             'with_wrong_ext' => 'from yaml',
-        );
+        ];
 
         $this->assertEquals(array_keys($expected), array_keys($actual), '->load() imports and merges imported files');
         $this->assertTrue($actual['imported_from_ini']);
@@ -266,16 +266,16 @@ public function testLoadServices()
         $this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Definition', $services['foo'], '->load() converts <service> element to Definition instances');
         $this->assertEquals('FooClass', $services['foo']->getClass(), '->load() parses the class attribute');
         $this->assertEquals('%path%/foo.php', $services['file']->getFile(), '->load() parses the file tag');
-        $this->assertEquals(array('foo', new Reference('foo'), array(true, false)), $services['arguments']->getArguments(), '->load() parses the argument tags');
+        $this->assertEquals(['foo', new Reference('foo'), [true, false]], $services['arguments']->getArguments(), '->load() parses the argument tags');
         $this->assertEquals('sc_configure', $services['configurator1']->getConfigurator(), '->load() parses the configurator tag');
-        $this->assertEquals(array(new Reference('baz'), 'configure'), $services['configurator2']->getConfigurator(), '->load() parses the configurator tag');
-        $this->assertEquals(array('BazClass', 'configureStatic'), $services['configurator3']->getConfigurator(), '->load() parses the configurator tag');
-        $this->assertEquals(array(array('setBar', array()), array('setBar', array(new Expression('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")')))), $services['method_call1']->getMethodCalls(), '->load() parses the method_call tag');
-        $this->assertEquals(array(array('setBar', array('foo', new Reference('foo'), array(true, false)))), $services['method_call2']->getMethodCalls(), '->load() parses the method_call tag');
+        $this->assertEquals([new Reference('baz'), 'configure'], $services['configurator2']->getConfigurator(), '->load() parses the configurator tag');
+        $this->assertEquals(['BazClass', 'configureStatic'], $services['configurator3']->getConfigurator(), '->load() parses the configurator tag');
+        $this->assertEquals([['setBar', []], ['setBar', [new Expression('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")')]]], $services['method_call1']->getMethodCalls(), '->load() parses the method_call tag');
+        $this->assertEquals([['setBar', ['foo', new Reference('foo'), [true, false]]]], $services['method_call2']->getMethodCalls(), '->load() parses the method_call tag');
         $this->assertEquals('factory', $services['new_factory1']->getFactory(), '->load() parses the factory tag');
-        $this->assertEquals(array(new Reference('baz'), 'getClass'), $services['new_factory2']->getFactory(), '->load() parses the factory tag');
-        $this->assertEquals(array('BazClass', 'getInstance'), $services['new_factory3']->getFactory(), '->load() parses the factory tag');
-        $this->assertSame(array(null, 'getInstance'), $services['new_factory4']->getFactory(), '->load() accepts factory tag without class');
+        $this->assertEquals([new Reference('baz'), 'getClass'], $services['new_factory2']->getFactory(), '->load() parses the factory tag');
+        $this->assertEquals(['BazClass', 'getInstance'], $services['new_factory3']->getFactory(), '->load() parses the factory tag');
+        $this->assertSame([null, 'getInstance'], $services['new_factory4']->getFactory(), '->load() accepts factory tag without class');
 
         $aliases = $container->getAliases();
         $this->assertArrayHasKey('alias_for_foo', $aliases, '->load() parses <service> elements');
@@ -285,9 +285,9 @@ public function testLoadServices()
         $this->assertEquals('foo', (string) $aliases['another_alias_for_foo']);
         $this->assertFalse($aliases['another_alias_for_foo']->isPublic());
 
-        $this->assertEquals(array('decorated', null, 0), $services['decorator_service']->getDecoratedService());
-        $this->assertEquals(array('decorated', 'decorated.pif-pouf', 0), $services['decorator_service_with_name']->getDecoratedService());
-        $this->assertEquals(array('decorated', 'decorated.pif-pouf', 5), $services['decorator_service_with_name_and_priority']->getDecoratedService());
+        $this->assertEquals(['decorated', null, 0], $services['decorator_service']->getDecoratedService());
+        $this->assertEquals(['decorated', 'decorated.pif-pouf', 0], $services['decorator_service_with_name']->getDecoratedService());
+        $this->assertEquals(['decorated', 'decorated.pif-pouf', 5], $services['decorator_service_with_name_and_priority']->getDecoratedService());
     }
 
     public function testParsesIteratorArgument()
@@ -298,7 +298,7 @@ public function testParsesIteratorArgument()
 
         $lazyDefinition = $container->getDefinition('lazy_context');
 
-        $this->assertEquals(array(new IteratorArgument(array('k1' => new Reference('foo.baz'), 'k2' => new Reference('service_container'))), new IteratorArgument(array())), $lazyDefinition->getArguments(), '->load() parses lazy arguments');
+        $this->assertEquals([new IteratorArgument(['k1' => new Reference('foo.baz'), 'k2' => new Reference('service_container')]), new IteratorArgument([])], $lazyDefinition->getArguments(), '->load() parses lazy arguments');
     }
 
     public function testParsesTags()
@@ -368,27 +368,27 @@ public function testConvertDomElementToArray()
 
         $doc = new \DOMDocument('1.0');
         $doc->loadXML('<foo foo="bar" />');
-        $this->assertEquals(array('foo' => 'bar'), XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
+        $this->assertEquals(['foo' => 'bar'], XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
 
         $doc = new \DOMDocument('1.0');
         $doc->loadXML('<foo><foo>bar</foo></foo>');
-        $this->assertEquals(array('foo' => 'bar'), XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
+        $this->assertEquals(['foo' => 'bar'], XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
 
         $doc = new \DOMDocument('1.0');
         $doc->loadXML('<foo><foo>bar<foo>bar</foo></foo></foo>');
-        $this->assertEquals(array('foo' => array('value' => 'bar', 'foo' => 'bar')), XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
+        $this->assertEquals(['foo' => ['value' => 'bar', 'foo' => 'bar']], XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
 
         $doc = new \DOMDocument('1.0');
         $doc->loadXML('<foo><foo></foo></foo>');
-        $this->assertEquals(array('foo' => null), XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
+        $this->assertEquals(['foo' => null], XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
 
         $doc = new \DOMDocument('1.0');
         $doc->loadXML('<foo><foo><!-- foo --></foo></foo>');
-        $this->assertEquals(array('foo' => null), XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
+        $this->assertEquals(['foo' => null], XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
 
         $doc = new \DOMDocument('1.0');
         $doc->loadXML('<foo><foo foo="bar"/><foo foo="bar"/></foo>');
-        $this->assertEquals(array('foo' => array(array('foo' => 'bar'), array('foo' => 'bar'))), XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
+        $this->assertEquals(['foo' => [['foo' => 'bar'], ['foo' => 'bar']]], XmlFileLoader::convertDomElementToArray($doc->documentElement), '::convertDomElementToArray() converts a \DomElement to an array');
     }
 
     public function testExtensions()
@@ -545,7 +545,7 @@ public function testXmlNamespaces()
 
         $this->assertArrayHasKey('foo', $services, '->load() parses <srv:service> elements');
         $this->assertCount(1, $services['foo']->getTag('foo.tag'), '->load parses <srv:tag> elements');
-        $this->assertEquals(array(array('setBar', array('foo'))), $services['foo']->getMethodCalls(), '->load() parses the <srv:call> tag');
+        $this->assertEquals([['setBar', ['foo']]], $services['foo']->getMethodCalls(), '->load() parses the <srv:call> tag');
     }
 
     public function testLoadIndexedArguments()
@@ -554,7 +554,7 @@ public function testLoadIndexedArguments()
         $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
         $loader->load('services14.xml');
 
-        $this->assertEquals(array('index_0' => 'app'), $container->findDefinition('logger')->getArguments());
+        $this->assertEquals(['index_0' => 'app'], $container->findDefinition('logger')->getArguments());
     }
 
     public function testLoadInlinedServices()
@@ -630,7 +630,7 @@ public function testPrototype()
 
         $ids = array_keys($container->getDefinitions());
         sort($ids);
-        $this->assertSame(array(Prototype\Foo::class, Prototype\Sub\Bar::class, 'service_container'), $ids);
+        $this->assertSame([Prototype\Foo::class, Prototype\Sub\Bar::class, 'service_container'], $ids);
 
         $resources = $container->getResources();
 
@@ -664,7 +664,7 @@ public function testArgumentWithKeyOutsideCollection()
         $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
         $loader->load('with_key_outside_collection.xml');
 
-        $this->assertSame(array('type' => 'foo', 'bar'), $container->getDefinition('foo')->getArguments());
+        $this->assertSame(['type' => 'foo', 'bar'], $container->getDefinition('foo')->getArguments());
     }
 
     public function testDefaults()
@@ -674,7 +674,7 @@ public function testDefaults()
         $loader->load('services28.xml');
 
         $this->assertFalse($container->getDefinition('with_defaults')->isPublic());
-        $this->assertSame(array('foo' => array(array())), $container->getDefinition('with_defaults')->getTags());
+        $this->assertSame(['foo' => [[]]], $container->getDefinition('with_defaults')->getTags());
         $this->assertTrue($container->getDefinition('with_defaults')->isAutowired());
         $this->assertArrayNotHasKey('public', $container->getDefinition('with_defaults')->getChanges());
         $this->assertArrayNotHasKey('autowire', $container->getDefinition('with_defaults')->getChanges());
@@ -683,12 +683,12 @@ public function testDefaults()
 
         $this->assertTrue($container->getDefinition('no_defaults')->isPublic());
 
-        $this->assertSame(array('foo' => array(array())), $container->getDefinition('no_defaults')->getTags());
+        $this->assertSame(['foo' => [[]]], $container->getDefinition('no_defaults')->getTags());
 
         $this->assertFalse($container->getDefinition('no_defaults')->isAutowired());
 
         $this->assertTrue($container->getDefinition('child_def')->isPublic());
-        $this->assertSame(array('foo' => array(array())), $container->getDefinition('child_def')->getTags());
+        $this->assertSame(['foo' => [[]]], $container->getDefinition('child_def')->getTags());
         $this->assertFalse($container->getDefinition('child_def')->isAutowired());
 
         $definitions = $container->getDefinitions();
@@ -699,7 +699,7 @@ public function testDefaults()
         $this->assertSame('bar', key($definitions));
         $this->assertTrue($anonymous->isPublic());
         $this->assertTrue($anonymous->isAutowired());
-        $this->assertSame(array('foo' => array(array())), $anonymous->getTags());
+        $this->assertSame(['foo' => [[]]], $anonymous->getTags());
     }
 
     public function testNamedArguments()
@@ -708,12 +708,12 @@ public function testNamedArguments()
         $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
         $loader->load('services_named_args.xml');
 
-        $this->assertEquals(array('$apiKey' => 'ABCD', CaseSensitiveClass::class => null), $container->getDefinition(NamedArgumentsDummy::class)->getArguments());
+        $this->assertEquals(['$apiKey' => 'ABCD', CaseSensitiveClass::class => null], $container->getDefinition(NamedArgumentsDummy::class)->getArguments());
 
         $container->compile();
 
-        $this->assertEquals(array(null, 'ABCD'), $container->getDefinition(NamedArgumentsDummy::class)->getArguments());
-        $this->assertEquals(array(array('setApiKey', array('123'))), $container->getDefinition(NamedArgumentsDummy::class)->getMethodCalls());
+        $this->assertEquals([null, 'ABCD'], $container->getDefinition(NamedArgumentsDummy::class)->getArguments());
+        $this->assertEquals([['setApiKey', ['123']]], $container->getDefinition(NamedArgumentsDummy::class)->getMethodCalls());
     }
 
     public function testInstanceof()
@@ -726,7 +726,7 @@ public function testInstanceof()
         $definition = $container->getDefinition(Bar::class);
         $this->assertTrue($definition->isAutowired());
         $this->assertTrue($definition->isLazy());
-        $this->assertSame(array('foo' => array(array()), 'bar' => array(array())), $definition->getTags());
+        $this->assertSame(['foo' => [[]], 'bar' => [[]]], $definition->getTags());
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
index d8b329a5602b7..50b8f7bed8ccf 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -83,17 +83,17 @@ public function testLoadInvalidFile($file)
 
     public function provideInvalidFiles()
     {
-        return array(
-            array('bad_parameters'),
-            array('bad_imports'),
-            array('bad_import'),
-            array('bad_services'),
-            array('bad_service'),
-            array('bad_calls'),
-            array('bad_format'),
-            array('nonvalid1'),
-            array('nonvalid2'),
-        );
+        return [
+            ['bad_parameters'],
+            ['bad_imports'],
+            ['bad_import'],
+            ['bad_services'],
+            ['bad_service'],
+            ['bad_calls'],
+            ['bad_format'],
+            ['nonvalid1'],
+            ['nonvalid2'],
+        ];
     }
 
     public function testLoadParameters()
@@ -101,33 +101,33 @@ public function testLoadParameters()
         $container = new ContainerBuilder();
         $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('services2.yml');
-        $this->assertEquals(array('foo' => 'bar', 'mixedcase' => array('MixedCaseKey' => 'value'), 'values' => array(true, false, 0, 1000.3, PHP_INT_MAX), 'bar' => 'foo', 'escape' => '@escapeme', 'foo_bar' => new Reference('foo_bar')), $container->getParameterBag()->all(), '->load() converts YAML keys to lowercase');
+        $this->assertEquals(['foo' => 'bar', 'mixedcase' => ['MixedCaseKey' => 'value'], 'values' => [true, false, 0, 1000.3, PHP_INT_MAX], 'bar' => 'foo', 'escape' => '@escapeme', 'foo_bar' => new Reference('foo_bar')], $container->getParameterBag()->all(), '->load() converts YAML keys to lowercase');
     }
 
     public function testLoadImports()
     {
         $container = new ContainerBuilder();
-        $resolver = new LoaderResolver(array(
+        $resolver = new LoaderResolver([
             new IniFileLoader($container, new FileLocator(self::$fixturesPath.'/ini')),
             new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml')),
             new PhpFileLoader($container, new FileLocator(self::$fixturesPath.'/php')),
             $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml')),
-        ));
+        ]);
         $loader->setResolver($resolver);
         $loader->load('services4.yml');
 
         $actual = $container->getParameterBag()->all();
-        $expected = array(
+        $expected = [
             'foo' => 'bar',
-            'values' => array(true, false, PHP_INT_MAX),
+            'values' => [true, false, PHP_INT_MAX],
             'bar' => '%foo%',
             'escape' => '@escapeme',
             'foo_bar' => new Reference('foo_bar'),
-            'mixedcase' => array('MixedCaseKey' => 'value'),
+            'mixedcase' => ['MixedCaseKey' => 'value'],
             'imported_from_ini' => true,
             'imported_from_xml' => true,
             'with_wrong_ext' => 'from yaml',
-        );
+        ];
         $this->assertEquals(array_keys($expected), array_keys($actual), '->load() imports and merges imported files');
         $this->assertTrue($actual['imported_from_ini']);
 
@@ -146,17 +146,17 @@ public function testLoadServices()
         $this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\Definition', $services['foo'], '->load() converts service element to Definition instances');
         $this->assertEquals('FooClass', $services['foo']->getClass(), '->load() parses the class attribute');
         $this->assertEquals('%path%/foo.php', $services['file']->getFile(), '->load() parses the file tag');
-        $this->assertEquals(array('foo', new Reference('foo'), array(true, false)), $services['arguments']->getArguments(), '->load() parses the argument tags');
+        $this->assertEquals(['foo', new Reference('foo'), [true, false]], $services['arguments']->getArguments(), '->load() parses the argument tags');
         $this->assertEquals('sc_configure', $services['configurator1']->getConfigurator(), '->load() parses the configurator tag');
-        $this->assertEquals(array(new Reference('baz'), 'configure'), $services['configurator2']->getConfigurator(), '->load() parses the configurator tag');
-        $this->assertEquals(array('BazClass', 'configureStatic'), $services['configurator3']->getConfigurator(), '->load() parses the configurator tag');
-        $this->assertEquals(array(array('setBar', array()), array('setBar', array()), array('setBar', array(new Expression('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")')))), $services['method_call1']->getMethodCalls(), '->load() parses the method_call tag');
-        $this->assertEquals(array(array('setBar', array('foo', new Reference('foo'), array(true, false)))), $services['method_call2']->getMethodCalls(), '->load() parses the method_call tag');
+        $this->assertEquals([new Reference('baz'), 'configure'], $services['configurator2']->getConfigurator(), '->load() parses the configurator tag');
+        $this->assertEquals(['BazClass', 'configureStatic'], $services['configurator3']->getConfigurator(), '->load() parses the configurator tag');
+        $this->assertEquals([['setBar', []], ['setBar', []], ['setBar', [new Expression('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")')]]], $services['method_call1']->getMethodCalls(), '->load() parses the method_call tag');
+        $this->assertEquals([['setBar', ['foo', new Reference('foo'), [true, false]]]], $services['method_call2']->getMethodCalls(), '->load() parses the method_call tag');
         $this->assertEquals('factory', $services['new_factory1']->getFactory(), '->load() parses the factory tag');
-        $this->assertEquals(array(new Reference('baz'), 'getClass'), $services['new_factory2']->getFactory(), '->load() parses the factory tag');
-        $this->assertEquals(array('BazClass', 'getInstance'), $services['new_factory3']->getFactory(), '->load() parses the factory tag');
-        $this->assertSame(array(null, 'getInstance'), $services['new_factory4']->getFactory(), '->load() accepts factory tag without class');
-        $this->assertEquals(array('foo', new Reference('baz')), $services['Acme\WithShortCutArgs']->getArguments(), '->load() parses short service definition');
+        $this->assertEquals([new Reference('baz'), 'getClass'], $services['new_factory2']->getFactory(), '->load() parses the factory tag');
+        $this->assertEquals(['BazClass', 'getInstance'], $services['new_factory3']->getFactory(), '->load() parses the factory tag');
+        $this->assertSame([null, 'getInstance'], $services['new_factory4']->getFactory(), '->load() accepts factory tag without class');
+        $this->assertEquals(['foo', new Reference('baz')], $services['Acme\WithShortCutArgs']->getArguments(), '->load() parses short service definition');
 
         $aliases = $container->getAliases();
         $this->assertArrayHasKey('alias_for_foo', $aliases, '->load() parses aliases');
@@ -169,9 +169,9 @@ public function testLoadServices()
         $this->assertEquals('foo', (string) $aliases['another_third_alias_for_foo']);
         $this->assertTrue($aliases['another_third_alias_for_foo']->isPublic());
 
-        $this->assertEquals(array('decorated', null, 0), $services['decorator_service']->getDecoratedService());
-        $this->assertEquals(array('decorated', 'decorated.pif-pouf', 0), $services['decorator_service_with_name']->getDecoratedService());
-        $this->assertEquals(array('decorated', 'decorated.pif-pouf', 5), $services['decorator_service_with_name_and_priority']->getDecoratedService());
+        $this->assertEquals(['decorated', null, 0], $services['decorator_service']->getDecoratedService());
+        $this->assertEquals(['decorated', 'decorated.pif-pouf', 0], $services['decorator_service_with_name']->getDecoratedService());
+        $this->assertEquals(['decorated', 'decorated.pif-pouf', 5], $services['decorator_service_with_name_and_priority']->getDecoratedService());
     }
 
     public function testLoadFactoryShortSyntax()
@@ -181,8 +181,8 @@ public function testLoadFactoryShortSyntax()
         $loader->load('services14.yml');
         $services = $container->getDefinitions();
 
-        $this->assertEquals(array(new Reference('baz'), 'getClass'), $services['factory']->getFactory(), '->load() parses the factory tag with service:method');
-        $this->assertEquals(array('FooBacFactory', 'createFooBar'), $services['factory_with_static_call']->getFactory(), '->load() parses the factory tag with Class::method');
+        $this->assertEquals([new Reference('baz'), 'getClass'], $services['factory']->getFactory(), '->load() parses the factory tag with service:method');
+        $this->assertEquals(['FooBacFactory', 'createFooBar'], $services['factory_with_static_call']->getFactory(), '->load() parses the factory tag with Class::method');
     }
 
     public function testLoadConfiguratorShortSyntax()
@@ -192,8 +192,8 @@ public function testLoadConfiguratorShortSyntax()
         $loader->load('services_configurator_short_syntax.yml');
         $services = $container->getDefinitions();
 
-        $this->assertEquals(array(new Reference('foo_bar_configurator'), 'configure'), $services['foo_bar']->getConfigurator(), '->load() parses the configurator tag with service:method');
-        $this->assertEquals(array('FooBarConfigurator', 'configureFooBar'), $services['foo_bar_with_static_call']->getConfigurator(), '->load() parses the configurator tag with Class::method');
+        $this->assertEquals([new Reference('foo_bar_configurator'), 'configure'], $services['foo_bar']->getConfigurator(), '->load() parses the configurator tag with service:method');
+        $this->assertEquals(['FooBarConfigurator', 'configureFooBar'], $services['foo_bar_with_static_call']->getConfigurator(), '->load() parses the configurator tag with Class::method');
     }
 
     public function testExtensions()
@@ -229,7 +229,7 @@ public function testExtensionWithNullConfig()
         $loader->load('null_config.yml');
         $container->compile();
 
-        $this->assertSame(array(null), $container->getParameter('project.configs'));
+        $this->assertSame([null], $container->getParameter('project.configs'));
     }
 
     public function testSupports()
@@ -295,9 +295,9 @@ public function testLoadYamlOnlyWithKeys()
         $loader->load('services21.yml');
 
         $definition = $container->getDefinition('manager');
-        $this->assertEquals(array(array('setLogger', array(new Reference('logger'))), array('setClass', array('User'))), $definition->getMethodCalls());
-        $this->assertEquals(array(true), $definition->getArguments());
-        $this->assertEquals(array('manager' => array(array('alias' => 'user'))), $definition->getTags());
+        $this->assertEquals([['setLogger', [new Reference('logger')]], ['setClass', ['User']]], $definition->getMethodCalls());
+        $this->assertEquals([true], $definition->getArguments());
+        $this->assertEquals(['manager' => [['alias' => 'user']]], $definition->getTags());
     }
 
     /**
@@ -359,7 +359,7 @@ public function testParsesIteratorArgument()
 
         $lazyDefinition = $container->getDefinition('lazy_context');
 
-        $this->assertEquals(array(new IteratorArgument(array('k1' => new Reference('foo.baz'), 'k2' => new Reference('service_container'))), new IteratorArgument(array())), $lazyDefinition->getArguments(), '->load() parses lazy arguments');
+        $this->assertEquals([new IteratorArgument(['k1' => new Reference('foo.baz'), 'k2' => new Reference('service_container')]), new IteratorArgument([])], $lazyDefinition->getArguments(), '->load() parses lazy arguments');
     }
 
     public function testAutowire()
@@ -389,7 +389,7 @@ public function testPrototype()
 
         $ids = array_keys($container->getDefinitions());
         sort($ids);
-        $this->assertSame(array(Prototype\Foo::class, Prototype\Sub\Bar::class, 'service_container'), $ids);
+        $this->assertSame([Prototype\Foo::class, Prototype\Sub\Bar::class, 'service_container'], $ids);
 
         $resources = $container->getResources();
 
@@ -410,13 +410,13 @@ public function testPrototypeWithNamespace()
         $ids = array_keys($container->getDefinitions());
         sort($ids);
 
-        $this->assertSame(array(
+        $this->assertSame([
             Prototype\OtherDir\Component1\Dir1\Service1::class,
             Prototype\OtherDir\Component1\Dir2\Service2::class,
             Prototype\OtherDir\Component2\Dir1\Service4::class,
             Prototype\OtherDir\Component2\Dir2\Service5::class,
             'service_container',
-        ), $ids);
+        ], $ids);
 
         $this->assertTrue($container->getDefinition(Prototype\OtherDir\Component1\Dir1\Service1::class)->hasTag('foo'));
         $this->assertTrue($container->getDefinition(Prototype\OtherDir\Component2\Dir1\Service4::class)->hasTag('foo'));
@@ -447,7 +447,7 @@ public function testDefaults()
         $loader->load('services28.yml');
 
         $this->assertFalse($container->getDefinition('with_defaults')->isPublic());
-        $this->assertSame(array('foo' => array(array())), $container->getDefinition('with_defaults')->getTags());
+        $this->assertSame(['foo' => [[]]], $container->getDefinition('with_defaults')->getTags());
         $this->assertTrue($container->getDefinition('with_defaults')->isAutowired());
         $this->assertArrayNotHasKey('public', $container->getDefinition('with_defaults')->getChanges());
         $this->assertArrayNotHasKey('autowire', $container->getDefinition('with_defaults')->getChanges());
@@ -456,7 +456,7 @@ public function testDefaults()
         $this->assertFalse($container->getAlias('with_defaults_aliased_short')->isPublic());
 
         $this->assertFalse($container->getDefinition('Acme\WithShortCutArgs')->isPublic());
-        $this->assertSame(array('foo' => array(array())), $container->getDefinition('Acme\WithShortCutArgs')->getTags());
+        $this->assertSame(['foo' => [[]]], $container->getDefinition('Acme\WithShortCutArgs')->getTags());
         $this->assertTrue($container->getDefinition('Acme\WithShortCutArgs')->isAutowired());
 
         $container->compile();
@@ -465,14 +465,14 @@ public function testDefaults()
         $this->assertTrue($container->getDefinition('no_defaults')->isPublic());
 
         // foo tag is inherited from defaults
-        $this->assertSame(array('foo' => array(array())), $container->getDefinition('with_null')->getTags());
-        $this->assertSame(array('foo' => array(array())), $container->getDefinition('no_defaults')->getTags());
+        $this->assertSame(['foo' => [[]]], $container->getDefinition('with_null')->getTags());
+        $this->assertSame(['foo' => [[]]], $container->getDefinition('no_defaults')->getTags());
 
         $this->assertTrue($container->getDefinition('with_null')->isAutowired());
         $this->assertFalse($container->getDefinition('no_defaults')->isAutowired());
 
         $this->assertTrue($container->getDefinition('child_def')->isPublic());
-        $this->assertSame(array('foo' => array(array())), $container->getDefinition('child_def')->getTags());
+        $this->assertSame(['foo' => [[]]], $container->getDefinition('child_def')->getTags());
         $this->assertFalse($container->getDefinition('child_def')->isAutowired());
     }
 
@@ -482,14 +482,14 @@ public function testNamedArguments()
         $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('services_named_args.yml');
 
-        $this->assertEquals(array(null, '$apiKey' => 'ABCD'), $container->getDefinition(NamedArgumentsDummy::class)->getArguments());
-        $this->assertEquals(array('$apiKey' => 'ABCD', CaseSensitiveClass::class => null), $container->getDefinition('another_one')->getArguments());
+        $this->assertEquals([null, '$apiKey' => 'ABCD'], $container->getDefinition(NamedArgumentsDummy::class)->getArguments());
+        $this->assertEquals(['$apiKey' => 'ABCD', CaseSensitiveClass::class => null], $container->getDefinition('another_one')->getArguments());
 
         $container->compile();
 
-        $this->assertEquals(array(null, 'ABCD'), $container->getDefinition(NamedArgumentsDummy::class)->getArguments());
-        $this->assertEquals(array(null, 'ABCD'), $container->getDefinition('another_one')->getArguments());
-        $this->assertEquals(array(array('setApiKey', array('123'))), $container->getDefinition('another_one')->getMethodCalls());
+        $this->assertEquals([null, 'ABCD'], $container->getDefinition(NamedArgumentsDummy::class)->getArguments());
+        $this->assertEquals([null, 'ABCD'], $container->getDefinition('another_one')->getArguments());
+        $this->assertEquals([['setApiKey', ['123']]], $container->getDefinition('another_one')->getMethodCalls());
     }
 
     public function testInstanceof()
@@ -502,7 +502,7 @@ public function testInstanceof()
         $definition = $container->getDefinition(Bar::class);
         $this->assertTrue($definition->isAutowired());
         $this->assertTrue($definition->isLazy());
-        $this->assertSame(array('foo' => array(array()), 'bar' => array(array())), $definition->getTags());
+        $this->assertSame(['foo' => [[]], 'bar' => [[]]], $definition->getTags());
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
index 9abfb45d6ef9d..e7c88d2bb58ec 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
@@ -137,7 +137,7 @@ public function testResolveThrowsOnBadDefaultValue()
     {
         $bag = new EnvPlaceholderParameterBag();
         $bag->get('env(ARRAY_VAR)');
-        $bag->set('env(ARRAY_VAR)', array());
+        $bag->set('env(ARRAY_VAR)', []);
         $bag->resolve();
     }
 
@@ -158,7 +158,7 @@ public function testGetEnvAllowsNull()
     public function testGetThrowsOnBadDefaultValue()
     {
         $bag = new EnvPlaceholderParameterBag();
-        $bag->set('env(ARRAY_VAR)', array());
+        $bag->set('env(ARRAY_VAR)', []);
         $bag->get('env(ARRAY_VAR)');
         $bag->resolve();
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/FrozenParameterBagTest.php b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/FrozenParameterBagTest.php
index ef9a66f6cff72..b168e0c20a976 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/FrozenParameterBagTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/FrozenParameterBagTest.php
@@ -18,10 +18,10 @@ class FrozenParameterBagTest extends TestCase
 {
     public function testConstructor()
     {
-        $parameters = array(
+        $parameters = [
             'foo' => 'foo',
             'bar' => 'bar',
-        );
+        ];
         $bag = new FrozenParameterBag($parameters);
         $this->assertEquals($parameters, $bag->all(), '__construct() takes an array of parameters as its first argument');
     }
@@ -31,7 +31,7 @@ public function testConstructor()
      */
     public function testClear()
     {
-        $bag = new FrozenParameterBag(array());
+        $bag = new FrozenParameterBag([]);
         $bag->clear();
     }
 
@@ -40,7 +40,7 @@ public function testClear()
      */
     public function testSet()
     {
-        $bag = new FrozenParameterBag(array());
+        $bag = new FrozenParameterBag([]);
         $bag->set('foo', 'bar');
     }
 
@@ -49,8 +49,8 @@ public function testSet()
      */
     public function testAdd()
     {
-        $bag = new FrozenParameterBag(array());
-        $bag->add(array());
+        $bag = new FrozenParameterBag([]);
+        $bag->add([]);
     }
 
     /**
@@ -58,7 +58,7 @@ public function testAdd()
      */
     public function testRemove()
     {
-        $bag = new FrozenParameterBag(array('foo' => 'bar'));
+        $bag = new FrozenParameterBag(['foo' => 'bar']);
         $bag->remove('foo');
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php
index a04cc15c129f6..cf31673881e27 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php
@@ -21,36 +21,36 @@ class ParameterBagTest extends TestCase
 {
     public function testConstructor()
     {
-        $bag = new ParameterBag($parameters = array(
+        $bag = new ParameterBag($parameters = [
             'foo' => 'foo',
             'bar' => 'bar',
-        ));
+        ]);
         $this->assertEquals($parameters, $bag->all(), '__construct() takes an array of parameters as its first argument');
     }
 
     public function testClear()
     {
-        $bag = new ParameterBag($parameters = array(
+        $bag = new ParameterBag($parameters = [
             'foo' => 'foo',
             'bar' => 'bar',
-        ));
+        ]);
         $bag->clear();
-        $this->assertEquals(array(), $bag->all(), '->clear() removes all parameters');
+        $this->assertEquals([], $bag->all(), '->clear() removes all parameters');
     }
 
     public function testRemove()
     {
-        $bag = new ParameterBag(array(
+        $bag = new ParameterBag([
             'foo' => 'foo',
             'bar' => 'bar',
-        ));
+        ]);
         $bag->remove('foo');
-        $this->assertEquals(array('bar' => 'bar'), $bag->all(), '->remove() removes a parameter');
+        $this->assertEquals(['bar' => 'bar'], $bag->all(), '->remove() removes a parameter');
     }
 
     public function testGetSet()
     {
-        $bag = new ParameterBag(array('foo' => 'bar'));
+        $bag = new ParameterBag(['foo' => 'bar']);
         $bag->set('bar', 'foo');
         $this->assertEquals('foo', $bag->get('bar'), '->set() sets the value of a new parameter');
 
@@ -71,12 +71,12 @@ public function testGetSet()
      */
     public function testGetThrowParameterNotFoundException($parameterKey, $exceptionMessage)
     {
-        $bag = new ParameterBag(array(
+        $bag = new ParameterBag([
             'foo' => 'foo',
             'bar' => 'bar',
             'baz' => 'baz',
-            'fiz' => array('bar' => array('boo' => 12)),
-        ));
+            'fiz' => ['bar' => ['boo' => 12]],
+        ]);
 
         if (method_exists($this, 'expectException')) {
             $this->expectException(ParameterNotFoundException::class);
@@ -90,18 +90,18 @@ public function testGetThrowParameterNotFoundException($parameterKey, $exception
 
     public function provideGetThrowParameterNotFoundExceptionData()
     {
-        return array(
-            array('foo1', 'You have requested a non-existent parameter "foo1". Did you mean this: "foo"?'),
-            array('bag', 'You have requested a non-existent parameter "bag". Did you mean one of these: "bar", "baz"?'),
-            array('', 'You have requested a non-existent parameter "".'),
+        return [
+            ['foo1', 'You have requested a non-existent parameter "foo1". Did you mean this: "foo"?'],
+            ['bag', 'You have requested a non-existent parameter "bag". Did you mean one of these: "bar", "baz"?'],
+            ['', 'You have requested a non-existent parameter "".'],
 
-            array('fiz.bar.boo', 'You have requested a non-existent parameter "fiz.bar.boo". You cannot access nested array items, do you want to inject "fiz" instead?'),
-        );
+            ['fiz.bar.boo', 'You have requested a non-existent parameter "fiz.bar.boo". You cannot access nested array items, do you want to inject "fiz" instead?'],
+        ];
     }
 
     public function testHas()
     {
-        $bag = new ParameterBag(array('foo' => 'bar'));
+        $bag = new ParameterBag(['foo' => 'bar']);
         $this->assertTrue($bag->has('foo'), '->has() returns true if a parameter is defined');
         $this->assertFalse($bag->has('bar'), '->has() returns false if a parameter is not defined');
     }
@@ -132,29 +132,29 @@ public function testMixedCase()
 
     public function testResolveValue()
     {
-        $bag = new ParameterBag(array());
+        $bag = new ParameterBag([]);
         $this->assertEquals('foo', $bag->resolveValue('foo'), '->resolveValue() returns its argument unmodified if no placeholders are found');
 
-        $bag = new ParameterBag(array('foo' => 'bar'));
+        $bag = new ParameterBag(['foo' => 'bar']);
         $this->assertEquals('I\'m a bar', $bag->resolveValue('I\'m a %foo%'), '->resolveValue() replaces placeholders by their values');
-        $this->assertEquals(array('bar' => 'bar'), $bag->resolveValue(array('%foo%' => '%foo%')), '->resolveValue() replaces placeholders in keys and values of arrays');
-        $this->assertEquals(array('bar' => array('bar' => array('bar' => 'bar'))), $bag->resolveValue(array('%foo%' => array('%foo%' => array('%foo%' => '%foo%')))), '->resolveValue() replaces placeholders in nested arrays');
+        $this->assertEquals(['bar' => 'bar'], $bag->resolveValue(['%foo%' => '%foo%']), '->resolveValue() replaces placeholders in keys and values of arrays');
+        $this->assertEquals(['bar' => ['bar' => ['bar' => 'bar']]], $bag->resolveValue(['%foo%' => ['%foo%' => ['%foo%' => '%foo%']]]), '->resolveValue() replaces placeholders in nested arrays');
         $this->assertEquals('I\'m a %%foo%%', $bag->resolveValue('I\'m a %%foo%%'), '->resolveValue() supports % escaping by doubling it');
         $this->assertEquals('I\'m a bar %%foo bar', $bag->resolveValue('I\'m a %foo% %%foo %foo%'), '->resolveValue() supports % escaping by doubling it');
-        $this->assertEquals(array('foo' => array('bar' => array('ding' => 'I\'m a bar %%foo %%bar'))), $bag->resolveValue(array('foo' => array('bar' => array('ding' => 'I\'m a bar %%foo %%bar')))), '->resolveValue() supports % escaping by doubling it');
+        $this->assertEquals(['foo' => ['bar' => ['ding' => 'I\'m a bar %%foo %%bar']]], $bag->resolveValue(['foo' => ['bar' => ['ding' => 'I\'m a bar %%foo %%bar']]]), '->resolveValue() supports % escaping by doubling it');
 
-        $bag = new ParameterBag(array('foo' => true));
+        $bag = new ParameterBag(['foo' => true]);
         $this->assertTrue($bag->resolveValue('%foo%'), '->resolveValue() replaces arguments that are just a placeholder by their value without casting them to strings');
-        $bag = new ParameterBag(array('foo' => null));
+        $bag = new ParameterBag(['foo' => null]);
         $this->assertNull($bag->resolveValue('%foo%'), '->resolveValue() replaces arguments that are just a placeholder by their value without casting them to strings');
 
-        $bag = new ParameterBag(array('foo' => 'bar', 'baz' => '%%%foo% %foo%%% %%foo%% %%%foo%%%'));
+        $bag = new ParameterBag(['foo' => 'bar', 'baz' => '%%%foo% %foo%%% %%foo%% %%%foo%%%']);
         $this->assertEquals('%%bar bar%% %%foo%% %%bar%%', $bag->resolveValue('%baz%'), '->resolveValue() replaces params placed besides escaped %');
 
-        $bag = new ParameterBag(array('baz' => '%%s?%%s'));
+        $bag = new ParameterBag(['baz' => '%%s?%%s']);
         $this->assertEquals('%%s?%%s', $bag->resolveValue('%baz%'), '->resolveValue() is not replacing greedily');
 
-        $bag = new ParameterBag(array());
+        $bag = new ParameterBag([]);
         try {
             $bag->resolveValue('%foobar%');
             $this->fail('->resolveValue() throws an InvalidArgumentException if a placeholder references a non-existent parameter');
@@ -169,7 +169,7 @@ public function testResolveValue()
             $this->assertEquals('You have requested a non-existent parameter "foobar".', $e->getMessage(), '->resolveValue() throws a ParameterNotFoundException if a placeholder references a non-existent parameter');
         }
 
-        $bag = new ParameterBag(array('foo' => 'a %bar%', 'bar' => array()));
+        $bag = new ParameterBag(['foo' => 'a %bar%', 'bar' => []]);
         try {
             $bag->resolveValue('%foo%');
             $this->fail('->resolveValue() throws a RuntimeException when a parameter embeds another non-string parameter');
@@ -177,7 +177,7 @@ public function testResolveValue()
             $this->assertEquals('A string value must be composed of strings and/or numbers, but found parameter "bar" of type array inside string value "a %bar%".', $e->getMessage(), '->resolveValue() throws a RuntimeException when a parameter embeds another non-string parameter');
         }
 
-        $bag = new ParameterBag(array('foo' => '%bar%', 'bar' => '%foobar%', 'foobar' => '%foo%'));
+        $bag = new ParameterBag(['foo' => '%bar%', 'bar' => '%foobar%', 'foobar' => '%foo%']);
         try {
             $bag->resolveValue('%foo%');
             $this->fail('->resolveValue() throws a ParameterCircularReferenceException when a parameter has a circular reference');
@@ -185,7 +185,7 @@ public function testResolveValue()
             $this->assertEquals('Circular reference detected for parameter "foo" ("foo" > "bar" > "foobar" > "foo").', $e->getMessage(), '->resolveValue() throws a ParameterCircularReferenceException when a parameter has a circular reference');
         }
 
-        $bag = new ParameterBag(array('foo' => 'a %bar%', 'bar' => 'a %foobar%', 'foobar' => 'a %foo%'));
+        $bag = new ParameterBag(['foo' => 'a %bar%', 'bar' => 'a %foobar%', 'foobar' => 'a %foo%']);
         try {
             $bag->resolveValue('%foo%');
             $this->fail('->resolveValue() throws a ParameterCircularReferenceException when a parameter has a circular reference');
@@ -193,13 +193,13 @@ public function testResolveValue()
             $this->assertEquals('Circular reference detected for parameter "foo" ("foo" > "bar" > "foobar" > "foo").', $e->getMessage(), '->resolveValue() throws a ParameterCircularReferenceException when a parameter has a circular reference');
         }
 
-        $bag = new ParameterBag(array('host' => 'foo.bar', 'port' => 1337));
+        $bag = new ParameterBag(['host' => 'foo.bar', 'port' => 1337]);
         $this->assertEquals('foo.bar:1337', $bag->resolveValue('%host%:%port%'));
     }
 
     public function testResolveIndicatesWhyAParameterIsNeeded()
     {
-        $bag = new ParameterBag(array('foo' => '%bar%'));
+        $bag = new ParameterBag(['foo' => '%bar%']);
 
         try {
             $bag->resolve();
@@ -207,7 +207,7 @@ public function testResolveIndicatesWhyAParameterIsNeeded()
             $this->assertEquals('The parameter "foo" has a dependency on a non-existent parameter "bar".', $e->getMessage());
         }
 
-        $bag = new ParameterBag(array('foo' => '%bar%'));
+        $bag = new ParameterBag(['foo' => '%bar%']);
 
         try {
             $bag->resolve();
@@ -218,28 +218,28 @@ public function testResolveIndicatesWhyAParameterIsNeeded()
 
     public function testResolveUnescapesValue()
     {
-        $bag = new ParameterBag(array(
-            'foo' => array('bar' => array('ding' => 'I\'m a bar %%foo %%bar')),
+        $bag = new ParameterBag([
+            'foo' => ['bar' => ['ding' => 'I\'m a bar %%foo %%bar']],
             'bar' => 'I\'m a %%foo%%',
-        ));
+        ]);
 
         $bag->resolve();
 
         $this->assertEquals('I\'m a %foo%', $bag->get('bar'), '->resolveValue() supports % escaping by doubling it');
-        $this->assertEquals(array('bar' => array('ding' => 'I\'m a bar %foo %bar')), $bag->get('foo'), '->resolveValue() supports % escaping by doubling it');
+        $this->assertEquals(['bar' => ['ding' => 'I\'m a bar %foo %bar']], $bag->get('foo'), '->resolveValue() supports % escaping by doubling it');
     }
 
     public function testEscapeValue()
     {
         $bag = new ParameterBag();
 
-        $bag->add(array(
-            'foo' => $bag->escapeValue(array('bar' => array('ding' => 'I\'m a bar %foo %bar', 'zero' => null))),
+        $bag->add([
+            'foo' => $bag->escapeValue(['bar' => ['ding' => 'I\'m a bar %foo %bar', 'zero' => null]]),
             'bar' => $bag->escapeValue('I\'m a %foo%'),
-        ));
+        ]);
 
         $this->assertEquals('I\'m a %%foo%%', $bag->get('bar'), '->escapeValue() escapes % by doubling it');
-        $this->assertEquals(array('bar' => array('ding' => 'I\'m a bar %%foo %%bar', 'zero' => null)), $bag->get('foo'), '->escapeValue() escapes % by doubling it');
+        $this->assertEquals(['bar' => ['ding' => 'I\'m a bar %%foo %%bar', 'zero' => null]], $bag->get('foo'), '->escapeValue() escapes % by doubling it');
     }
 
     /**
@@ -247,7 +247,7 @@ public function testEscapeValue()
      */
     public function testResolveStringWithSpacesReturnsString($expected, $test, $description)
     {
-        $bag = new ParameterBag(array('foo' => 'bar'));
+        $bag = new ParameterBag(['foo' => 'bar']);
 
         try {
             $this->assertEquals($expected, $bag->resolveString($test), $description);
@@ -258,11 +258,11 @@ public function testResolveStringWithSpacesReturnsString($expected, $test, $desc
 
     public function stringsWithSpacesProvider()
     {
-        return array(
-            array('bar', '%foo%', 'Parameters must be wrapped by %.'),
-            array('% foo %', '% foo %', 'Parameters should not have spaces.'),
-            array('{% set my_template = "foo" %}', '{% set my_template = "foo" %}', 'Twig-like strings are not parameters.'),
-            array('50% is less than 100%', '50% is less than 100%', 'Text between % signs is allowed, if there are spaces.'),
-        );
+        return [
+            ['bar', '%foo%', 'Parameters must be wrapped by %.'],
+            ['% foo %', '% foo %', 'Parameters should not have spaces.'],
+            ['{% set my_template = "foo" %}', '{% set my_template = "foo" %}', 'Twig-like strings are not parameters.'],
+            ['50% is less than 100%', '50% is less than 100%', 'Text between % signs is allowed, if there are spaces.'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php b/src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php
index aa9790e833797..1337b735a99af 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php
@@ -153,6 +153,6 @@ public function getFoo()
 
     public static function getSubscribedServices()
     {
-        return array('bar' => 'stdClass');
+        return ['bar' => 'stdClass'];
     }
 }
diff --git a/src/Symfony/Component/DomCrawler/AbstractUriElement.php b/src/Symfony/Component/DomCrawler/AbstractUriElement.php
index 192d7922f479d..74b86e401ec2b 100644
--- a/src/Symfony/Component/DomCrawler/AbstractUriElement.php
+++ b/src/Symfony/Component/DomCrawler/AbstractUriElement.php
@@ -144,7 +144,7 @@ protected function canonicalizePath($path)
             $path .= '/';
         }
 
-        $output = array();
+        $output = [];
 
         foreach (explode('/', $path) as $segment) {
             if ('..' === $segment) {
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
index a3228d1bab6c2..976c1569d44cc 100644
--- a/src/Symfony/Component/DomCrawler/Crawler.php
+++ b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -30,7 +30,7 @@ class Crawler implements \Countable, \IteratorAggregate
     /**
      * @var array A map of manually registered namespaces
      */
-    private $namespaces = array();
+    private $namespaces = [];
 
     /**
      * @var string The base href value
@@ -45,7 +45,7 @@ class Crawler implements \Countable, \IteratorAggregate
     /**
      * @var \DOMElement[]
      */
-    private $nodes = array();
+    private $nodes = [];
 
     /**
      * Whether the Crawler contains HTML or XML content (used when converting CSS to XPath).
@@ -92,7 +92,7 @@ public function getBaseHref()
      */
     public function clear()
     {
-        $this->nodes = array();
+        $this->nodes = [];
         $this->document = null;
     }
 
@@ -208,7 +208,7 @@ public function addHtmlContent($content, $charset = 'UTF-8')
 
         $this->addDocument($dom);
 
-        $base = $this->filterRelativeXPath('descendant-or-self::base')->extract(array('href'));
+        $base = $this->filterRelativeXPath('descendant-or-self::base')->extract(['href']);
 
         $baseHref = current($base);
         if (\count($base) && !empty($baseHref)) {
@@ -363,7 +363,7 @@ public function eq($position)
      */
     public function each(\Closure $closure)
     {
-        $data = array();
+        $data = [];
         foreach ($this->nodes as $i => $node) {
             $data[] = $closure($this->createSubCrawler($node), $i);
         }
@@ -395,7 +395,7 @@ public function slice($offset = 0, $length = null)
      */
     public function reduce(\Closure $closure)
     {
-        $nodes = array();
+        $nodes = [];
         foreach ($this->nodes as $i => $node) {
             if (false !== $closure($this->createSubCrawler($node), $i)) {
                 $nodes[] = $node;
@@ -487,7 +487,7 @@ public function parents()
         }
 
         $node = $this->getNode(0);
-        $nodes = array();
+        $nodes = [];
 
         while ($node = $node->parentNode) {
             if (XML_ELEMENT_NODE === $node->nodeType) {
@@ -513,7 +513,7 @@ public function children()
 
         $node = $this->getNode(0)->firstChild;
 
-        return $this->createSubCrawler($node ? $this->sibling($node) : array());
+        return $this->createSubCrawler($node ? $this->sibling($node) : []);
     }
 
     /**
@@ -605,7 +605,7 @@ public function evaluate($xpath)
             throw new \LogicException('Cannot evaluate the expression on an uninitialized crawler.');
         }
 
-        $data = array();
+        $data = [];
         $domxpath = $this->createDOMXPath($this->document, $this->findNamespacePrefixes($xpath));
 
         foreach ($this->nodes as $node) {
@@ -637,9 +637,9 @@ public function extract($attributes)
         $attributes = (array) $attributes;
         $count = \count($attributes);
 
-        $data = array();
+        $data = [];
         foreach ($this->nodes as $node) {
-            $elements = array();
+            $elements = [];
             foreach ($attributes as $attribute) {
                 if ('_text' === $attribute) {
                     $elements[] = $node->nodeValue;
@@ -780,7 +780,7 @@ public function link($method = 'get')
      */
     public function links()
     {
-        $links = array();
+        $links = [];
         foreach ($this->nodes as $node) {
             if (!$node instanceof \DOMElement) {
                 throw new \InvalidArgumentException(sprintf('The current node list should contain only DOMElement instances, "%s" found.', \get_class($node)));
@@ -821,7 +821,7 @@ public function image()
      */
     public function images()
     {
-        $images = array();
+        $images = [];
         foreach ($this as $node) {
             if (!$node instanceof \DOMElement) {
                 throw new \InvalidArgumentException(sprintf('The current node list should contain only DOMElement instances, "%s" found.', \get_class($node)));
@@ -915,7 +915,7 @@ public static function xpathLiteral($s)
         }
 
         $string = $s;
-        $parts = array();
+        $parts = [];
         while (true) {
             if (false !== $pos = strpos($string, "'")) {
                 $parts[] = sprintf("'%s'", substr($string, 0, $pos));
@@ -965,7 +965,7 @@ private function filterRelativeXPath($xpath)
      */
     private function relativize($xpath)
     {
-        $expressions = array();
+        $expressions = [];
 
         // An expression which will never match to replace expressions which cannot match in the crawler
         // We cannot simply drop
@@ -1083,7 +1083,7 @@ public function getIterator()
      */
     protected function sibling($node, $siblingDir = 'nextSibling')
     {
-        $nodes = array();
+        $nodes = [];
 
         do {
             if ($node !== $this->getNode(0) && 1 === $node->nodeType) {
@@ -1149,7 +1149,7 @@ private function findNamespacePrefixes($xpath)
             return array_unique($matches['prefix']);
         }
 
-        return array();
+        return [];
     }
 
     /**
diff --git a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
index 6f112b5350079..9196628789b1a 100644
--- a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
+++ b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
@@ -45,7 +45,7 @@ class ChoiceFormField extends FormField
     public function hasValue()
     {
         // don't send a value for unchecked checkboxes
-        if (\in_array($this->type, array('checkbox', 'radio')) && null === $this->value) {
+        if (\in_array($this->type, ['checkbox', 'radio']) && null === $this->value) {
             return false;
         }
 
@@ -211,7 +211,7 @@ protected function initialize()
         }
 
         $this->value = null;
-        $this->options = array();
+        $this->options = [];
         $this->multiple = false;
 
         if ('input' == $this->node->nodeName) {
@@ -226,7 +226,7 @@ protected function initialize()
             $this->type = 'select';
             if ($this->node->hasAttribute('multiple')) {
                 $this->multiple = true;
-                $this->value = array();
+                $this->value = [];
                 $this->name = str_replace('[]', '', $this->name);
             }
 
@@ -261,7 +261,7 @@ protected function initialize()
      */
     private function buildOptionValue(\DOMElement $node)
     {
-        $option = array();
+        $option = [];
 
         $defaultDefaultValue = 'select' === $this->node->nodeName ? '' : 'on';
         $defaultValue = (isset($node->nodeValue) && !empty($node->nodeValue)) ? $node->nodeValue : $defaultDefaultValue;
@@ -301,7 +301,7 @@ public function containsOption($optionValue, $options)
      */
     public function availableOptionValues()
     {
-        $values = array();
+        $values = [];
 
         foreach ($this->options as $option) {
             $values[] = $option['value'];
diff --git a/src/Symfony/Component/DomCrawler/Field/FileFormField.php b/src/Symfony/Component/DomCrawler/Field/FileFormField.php
index 3288fc135a778..af9c6e6f25ff4 100644
--- a/src/Symfony/Component/DomCrawler/Field/FileFormField.php
+++ b/src/Symfony/Component/DomCrawler/Field/FileFormField.php
@@ -27,12 +27,12 @@ class FileFormField extends FormField
      */
     public function setErrorCode($error)
     {
-        $codes = array(UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE, UPLOAD_ERR_PARTIAL, UPLOAD_ERR_NO_FILE, UPLOAD_ERR_NO_TMP_DIR, UPLOAD_ERR_CANT_WRITE, UPLOAD_ERR_EXTENSION);
+        $codes = [UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE, UPLOAD_ERR_PARTIAL, UPLOAD_ERR_NO_FILE, UPLOAD_ERR_NO_TMP_DIR, UPLOAD_ERR_CANT_WRITE, UPLOAD_ERR_EXTENSION];
         if (!\in_array($error, $codes)) {
             throw new \InvalidArgumentException(sprintf('The error code %s is not valid.', $error));
         }
 
-        $this->value = array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => $error, 'size' => 0);
+        $this->value = ['name' => '', 'type' => '', 'tmp_name' => '', 'error' => $error, 'size' => 0];
     }
 
     /**
@@ -75,7 +75,7 @@ public function setValue($value)
             $value = '';
         }
 
-        $this->value = array('name' => $name, 'type' => '', 'tmp_name' => $value, 'error' => $error, 'size' => $size);
+        $this->value = ['name' => $name, 'type' => '', 'tmp_name' => $value, 'error' => $error, 'size' => $size];
     }
 
     /**
diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php
index 47d20a04b6884..87ab31485f397 100644
--- a/src/Symfony/Component/DomCrawler/Form.php
+++ b/src/Symfony/Component/DomCrawler/Form.php
@@ -87,7 +87,7 @@ public function setValues(array $values)
      */
     public function getValues()
     {
-        $values = array();
+        $values = [];
         foreach ($this->fields->all() as $name => $field) {
             if ($field->isDisabled()) {
                 continue;
@@ -108,11 +108,11 @@ public function getValues()
      */
     public function getFiles()
     {
-        if (!\in_array($this->getMethod(), array('POST', 'PUT', 'DELETE', 'PATCH'))) {
-            return array();
+        if (!\in_array($this->getMethod(), ['POST', 'PUT', 'DELETE', 'PATCH'])) {
+            return [];
         }
 
-        $files = array();
+        $files = [];
 
         foreach ($this->fields->all() as $name => $field) {
             if ($field->isDisabled()) {
@@ -137,13 +137,13 @@ public function getFiles()
      */
     public function getPhpValues()
     {
-        $values = array();
+        $values = [];
         foreach ($this->getValues() as $name => $value) {
-            $qs = http_build_query(array($name => $value), '', '&');
+            $qs = http_build_query([$name => $value], '', '&');
             if (!empty($qs)) {
                 parse_str($qs, $expandedValue);
                 $varName = substr($name, 0, \strlen(key($expandedValue)));
-                $values = array_replace_recursive($values, array($varName => current($expandedValue)));
+                $values = array_replace_recursive($values, [$varName => current($expandedValue)]);
             }
         }
 
@@ -164,9 +164,9 @@ public function getPhpValues()
      */
     public function getPhpFiles()
     {
-        $values = array();
+        $values = [];
         foreach ($this->getFiles() as $name => $value) {
-            $qs = http_build_query(array($name => $value), '', '&');
+            $qs = http_build_query([$name => $value], '', '&');
             if (!empty($qs)) {
                 parse_str($qs, $expandedValue);
                 $varName = substr($name, 0, \strlen(key($expandedValue)));
@@ -182,7 +182,7 @@ function (&$value, $key) {
 
                 reset($expandedValue);
 
-                $values = array_replace_recursive($values, array($varName => current($expandedValue)));
+                $values = array_replace_recursive($values, [$varName => current($expandedValue)]);
             }
         }
 
@@ -202,9 +202,9 @@ public function getUri()
     {
         $uri = parent::getUri();
 
-        if (!\in_array($this->getMethod(), array('POST', 'PUT', 'DELETE', 'PATCH'))) {
+        if (!\in_array($this->getMethod(), ['POST', 'PUT', 'DELETE', 'PATCH'])) {
             $query = parse_url($uri, PHP_URL_QUERY);
-            $currentParameters = array();
+            $currentParameters = [];
             if ($query) {
                 parse_str($query, $currentParameters);
             }
@@ -379,7 +379,7 @@ public function disableValidation()
     protected function setNode(\DOMElement $node)
     {
         $this->button = $node;
-        if ('button' === $node->nodeName || ('input' === $node->nodeName && \in_array(strtolower($node->getAttribute('type')), array('submit', 'button', 'image')))) {
+        if ('button' === $node->nodeName || ('input' === $node->nodeName && \in_array(strtolower($node->getAttribute('type')), ['submit', 'button', 'image']))) {
             if ($node->hasAttribute('form')) {
                 // if the node has the HTML5-compliant 'form' attribute, use it
                 $formId = $node->getAttribute('form');
@@ -480,7 +480,7 @@ private function addField(\DOMElement $node)
             }
         } elseif ('input' == $nodeName && 'file' == strtolower($node->getAttribute('type'))) {
             $this->set(new Field\FileFormField($node));
-        } elseif ('input' == $nodeName && !\in_array(strtolower($node->getAttribute('type')), array('submit', 'button', 'image'))) {
+        } elseif ('input' == $nodeName && !\in_array(strtolower($node->getAttribute('type')), ['submit', 'button', 'image'])) {
             $this->set(new Field\InputFormField($node));
         } elseif ('textarea' == $nodeName) {
             $this->set(new Field\TextareaFormField($node));
diff --git a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php
index 6398cc60693ad..b4ec51290c853 100644
--- a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php
+++ b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php
@@ -20,7 +20,7 @@
  */
 class FormFieldRegistry
 {
-    private $fields = array();
+    private $fields = [];
 
     private $base;
 
@@ -34,7 +34,7 @@ public function add(FormField $field)
         $target = &$this->fields;
         while ($segments) {
             if (!\is_array($target)) {
-                $target = array();
+                $target = [];
             }
             $path = array_shift($segments);
             if ('' === $path) {
@@ -169,7 +169,7 @@ private static function create($base, array $values)
      *
      * @return array The list of fields as array((string) Fully qualified name => (mixed) value)
      */
-    private function walk(array $array, $base = '', array &$output = array())
+    private function walk(array $array, $base = '', array &$output = [])
     {
         foreach ($array as $k => $v) {
             $path = empty($base) ? $k : sprintf('%s[%s]', $base, $k);
@@ -195,7 +195,7 @@ private function walk(array $array, $base = '', array &$output = array())
     private function getSegments($name)
     {
         if (preg_match('/^(?P<base>[^[]+)(?P<extra>(\[.*)|$)/', $name, $m)) {
-            $segments = array($m['base']);
+            $segments = [$m['base']];
             while (!empty($m['extra'])) {
                 $extra = $m['extra'];
                 if (preg_match('/^\[(?P<segment>.*?)\](?P<extra>.*)$/', $extra, $m)) {
@@ -208,6 +208,6 @@ private function getSegments($name)
             return $segments;
         }
 
-        return array($name);
+        return [$name];
     }
 }
diff --git a/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
index 9b2d1241949d1..11f189c4a73c5 100644
--- a/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
@@ -52,7 +52,7 @@ public function testAdd()
         $crawler->add($this->createNodeList());
         $this->assertEquals('foo', $crawler->filterXPath('//div')->attr('class'), '->add() adds nodes from a \DOMNodeList');
 
-        $list = array();
+        $list = [];
         foreach ($this->createNodeList() as $node) {
             $list[] = $node;
         }
@@ -269,7 +269,7 @@ public function testAddNodeList()
 
     public function testAddNodes()
     {
-        $list = array();
+        $list = [];
         foreach ($this->createNodeList() as $node) {
             $list[] = $node;
         }
@@ -314,7 +314,7 @@ public function testEach()
             return $i.'-'.$node->text();
         });
 
-        $this->assertEquals(array('0-One', '1-Two', '2-Three'), $data, '->each() executes an anonymous function on each node of the list');
+        $this->assertEquals(['0-One', '1-Two', '2-Three'], $data, '->each() executes an anonymous function on each node of the list');
     }
 
     public function testIteration()
@@ -849,7 +849,7 @@ public function testLinks()
         $links = $crawler->links();
         $this->assertInstanceOf('Symfony\\Component\\DomCrawler\\Link', $links[0], '->links() returns an array of Link instances');
 
-        $this->assertEquals(array(), $this->createTestCrawler()->filterXPath('//ol')->links(), '->links() returns an empty array if the node selection is empty');
+        $this->assertEquals([], $this->createTestCrawler()->filterXPath('//ol')->links(), '->links() returns an empty array if the node selection is empty');
     }
 
     public function testImages()
@@ -861,7 +861,7 @@ public function testImages()
         $images = $crawler->images();
         $this->assertInstanceOf('Symfony\\Component\\DomCrawler\\Image', $images[0], '->images() returns an array of Image instances');
 
-        $this->assertEquals(array(), $this->createTestCrawler()->filterXPath('//ol')->links(), '->links() returns an empty array if the node selection is empty');
+        $this->assertEquals([], $this->createTestCrawler()->filterXPath('//ol')->links(), '->links() returns an empty array if the node selection is empty');
     }
 
     public function testForm()
@@ -874,9 +874,9 @@ public function testForm()
 
         $this->assertEquals($crawler->form()->getFormNode()->getAttribute('id'), $crawler2->form()->getFormNode()->getAttribute('id'), '->form() works on elements with form attribute');
 
-        $this->assertEquals(array('FooName' => 'FooBar', 'TextName' => 'TextValue', 'FooTextName' => 'FooTextValue'), $crawler->form(array('FooName' => 'FooBar'))->getValues(), '->form() takes an array of values to submit as its first argument');
-        $this->assertEquals(array('FooName' => 'FooValue', 'TextName' => 'TextValue', 'FooTextName' => 'FooTextValue'), $crawler->form()->getValues(), '->getValues() returns correct form values');
-        $this->assertEquals(array('FooBarName' => 'FooBarValue', 'TextName' => 'TextValue', 'FooTextName' => 'FooTextValue'), $crawler2->form()->getValues(), '->getValues() returns correct form values');
+        $this->assertEquals(['FooName' => 'FooBar', 'TextName' => 'TextValue', 'FooTextName' => 'FooTextValue'], $crawler->form(['FooName' => 'FooBar'])->getValues(), '->form() takes an array of values to submit as its first argument');
+        $this->assertEquals(['FooName' => 'FooValue', 'TextName' => 'TextValue', 'FooTextName' => 'FooTextValue'], $crawler->form()->getValues(), '->getValues() returns correct form values');
+        $this->assertEquals(['FooBarName' => 'FooBarValue', 'TextName' => 'TextValue', 'FooTextName' => 'FooTextValue'], $crawler2->form()->getValues(), '->getValues() returns correct form values');
 
         try {
             $this->createTestCrawler()->filterXPath('//ol')->form();
@@ -1035,13 +1035,13 @@ public function testBaseTag($baseValue, $linkValue, $expectedUri, $currentUri =
 
     public function getBaseTagData()
     {
-        return array(
-            array('http://base.com', 'link', 'http://base.com/link'),
-            array('//base.com', 'link', 'https://base.com/link', 'https://domain.com', '<base> tag can use a schema-less URL'),
-            array('path/', 'link', 'https://domain.com/path/link', 'https://domain.com', '<base> tag can set a path'),
-            array('http://base.com', '#', 'http://base.com#', 'http://domain.com/path/link', '<base> tag does work with links to an anchor'),
-            array('http://base.com', '', 'http://base.com', 'http://domain.com/path/link', '<base> tag does work with empty links'),
-        );
+        return [
+            ['http://base.com', 'link', 'http://base.com/link'],
+            ['//base.com', 'link', 'https://base.com/link', 'https://domain.com', '<base> tag can use a schema-less URL'],
+            ['path/', 'link', 'https://domain.com/path/link', 'https://domain.com', '<base> tag can set a path'],
+            ['http://base.com', '#', 'http://base.com#', 'http://domain.com/path/link', '<base> tag does work with links to an anchor'],
+            ['http://base.com', '', 'http://base.com', 'http://domain.com/path/link', '<base> tag does work with empty links'],
+        ];
     }
 
     /**
@@ -1055,14 +1055,14 @@ public function testBaseTagWithForm($baseValue, $actionValue, $expectedUri, $cur
 
     public function getBaseTagWithFormData()
     {
-        return array(
-            array('https://base.com/', 'link/', 'https://base.com/link/', 'https://base.com/link/', '<base> tag does work with a path and relative form action'),
-            array('/basepath', '/registration', 'http://domain.com/registration', 'http://domain.com/registration', '<base> tag does work with a path and form action'),
-            array('/basepath', '', 'http://domain.com/registration', 'http://domain.com/registration', '<base> tag does work with a path and empty form action'),
-            array('http://base.com/', '/registration', 'http://base.com/registration', 'http://domain.com/registration', '<base> tag does work with a URL and form action'),
-            array('http://base.com', '', 'http://domain.com/path/form', 'http://domain.com/path/form', '<base> tag does work with a URL and an empty form action'),
-            array('http://base.com/path', '/registration', 'http://base.com/registration', 'http://domain.com/path/form', '<base> tag does work with a URL and form action'),
-        );
+        return [
+            ['https://base.com/', 'link/', 'https://base.com/link/', 'https://base.com/link/', '<base> tag does work with a path and relative form action'],
+            ['/basepath', '/registration', 'http://domain.com/registration', 'http://domain.com/registration', '<base> tag does work with a path and form action'],
+            ['/basepath', '', 'http://domain.com/registration', 'http://domain.com/registration', '<base> tag does work with a path and empty form action'],
+            ['http://base.com/', '/registration', 'http://base.com/registration', 'http://domain.com/registration', '<base> tag does work with a URL and form action'],
+            ['http://base.com', '', 'http://domain.com/path/form', 'http://domain.com/path/form', '<base> tag does work with a URL and an empty form action'],
+            ['http://base.com/path', '/registration', 'http://base.com/registration', 'http://domain.com/path/form', '<base> tag does work with a URL and form action'],
+        ];
     }
 
     public function testCountOfNestedElements()
@@ -1078,7 +1078,7 @@ public function testEvaluateReturnsTypedResultOfXPathExpressionOnADocumentSubset
 
         $result = $crawler->filterXPath('//form/input')->evaluate('substring-before(@name, "Name")');
 
-        $this->assertSame(array('Text', 'Foo', 'Bar'), $result);
+        $this->assertSame(['Text', 'Foo', 'Bar'], $result);
     }
 
     public function testEvaluateReturnsTypedResultOfNamespacedXPathExpressionOnADocumentSubset()
@@ -1087,7 +1087,7 @@ public function testEvaluateReturnsTypedResultOfNamespacedXPathExpressionOnADocu
 
         $result = $crawler->filterXPath('//yt:accessControl/@action')->evaluate('string(.)');
 
-        $this->assertSame(array('comment', 'videoRespond'), $result);
+        $this->assertSame(['comment', 'videoRespond'], $result);
     }
 
     public function testEvaluateReturnsTypedResultOfNamespacedXPathExpression()
@@ -1097,7 +1097,7 @@ public function testEvaluateReturnsTypedResultOfNamespacedXPathExpression()
 
         $result = $crawler->evaluate('string(//youtube:accessControl/@action)');
 
-        $this->assertSame(array('comment'), $result);
+        $this->assertSame(['comment'], $result);
     }
 
     public function testEvaluateReturnsACrawlerIfXPathExpressionEvaluatesToANode()
diff --git a/src/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php b/src/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php
index 9592286305651..61e776736a4b5 100644
--- a/src/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php
@@ -25,7 +25,7 @@ public function testInitialize()
             $this->assertTrue(true, '->initialize() throws a \LogicException if the node is not an input or a select');
         }
 
-        $node = $this->createNode('input', '', array('type' => 'text'));
+        $node = $this->createNode('input', '', ['type' => 'text']);
         try {
             $field = new ChoiceFormField($node);
             $this->fail('->initialize() throws a \LogicException if the node is an input with a type different from checkbox or radio');
@@ -36,12 +36,12 @@ public function testInitialize()
 
     public function testGetType()
     {
-        $node = $this->createNode('input', '', array('type' => 'radio', 'name' => 'name', 'value' => 'foo'));
+        $node = $this->createNode('input', '', ['type' => 'radio', 'name' => 'name', 'value' => 'foo']);
         $field = new ChoiceFormField($node);
 
         $this->assertEquals('radio', $field->getType(), '->getType() returns radio for radio buttons');
 
-        $node = $this->createNode('input', '', array('type' => 'checkbox', 'name' => 'name', 'value' => 'foo'));
+        $node = $this->createNode('input', '', ['type' => 'checkbox', 'name' => 'name', 'value' => 'foo']);
         $field = new ChoiceFormField($node);
 
         $this->assertEquals('checkbox', $field->getType(), '->getType() returns radio for a checkbox');
@@ -54,12 +54,12 @@ public function testGetType()
 
     public function testIsMultiple()
     {
-        $node = $this->createNode('input', '', array('type' => 'radio', 'name' => 'name', 'value' => 'foo'));
+        $node = $this->createNode('input', '', ['type' => 'radio', 'name' => 'name', 'value' => 'foo']);
         $field = new ChoiceFormField($node);
 
         $this->assertFalse($field->isMultiple(), '->isMultiple() returns false for radio buttons');
 
-        $node = $this->createNode('input', '', array('type' => 'checkbox', 'name' => 'name', 'value' => 'foo'));
+        $node = $this->createNode('input', '', ['type' => 'checkbox', 'name' => 'name', 'value' => 'foo']);
         $field = new ChoiceFormField($node);
 
         $this->assertFalse($field->isMultiple(), '->isMultiple() returns false for checkboxes');
@@ -69,12 +69,12 @@ public function testIsMultiple()
 
         $this->assertFalse($field->isMultiple(), '->isMultiple() returns false for selects without the multiple attribute');
 
-        $node = $this->createNode('select', '', array('multiple' => 'multiple'));
+        $node = $this->createNode('select', '', ['multiple' => 'multiple']);
         $field = new ChoiceFormField($node);
 
         $this->assertTrue($field->isMultiple(), '->isMultiple() returns true for selects with the multiple attribute');
 
-        $node = $this->createNode('select', '', array('multiple' => ''));
+        $node = $this->createNode('select', '', ['multiple' => '']);
         $field = new ChoiceFormField($node);
 
         $this->assertTrue($field->isMultiple(), '->isMultiple() returns true for selects with an empty multiple attribute');
@@ -82,14 +82,14 @@ public function testIsMultiple()
 
     public function testSelects()
     {
-        $node = $this->createSelectNode(array('foo' => false, 'bar' => false));
+        $node = $this->createSelectNode(['foo' => false, 'bar' => false]);
         $field = new ChoiceFormField($node);
 
         $this->assertTrue($field->hasValue(), '->hasValue() returns true for selects');
         $this->assertEquals('foo', $field->getValue(), '->getValue() returns the first option if none are selected');
         $this->assertFalse($field->isMultiple(), '->isMultiple() returns false when no multiple attribute is defined');
 
-        $node = $this->createSelectNode(array('foo' => false, 'bar' => true));
+        $node = $this->createSelectNode(['foo' => false, 'bar' => true]);
         $field = new ChoiceFormField($node);
 
         $this->assertEquals('bar', $field->getValue(), '->getValue() returns the selected option');
@@ -105,7 +105,7 @@ public function testSelects()
         }
 
         try {
-            $field->setValue(array('foobar'));
+            $field->setValue(['foobar']);
             $this->fail('->setValue() throws an \InvalidArgumentException if the value is an array');
         } catch (\InvalidArgumentException $e) {
             $this->assertTrue(true, '->setValue() throws an \InvalidArgumentException if the value is an array');
@@ -114,7 +114,7 @@ public function testSelects()
 
     public function testSelectWithEmptyBooleanAttribute()
     {
-        $node = $this->createSelectNode(array('foo' => false, 'bar' => true), array(), '');
+        $node = $this->createSelectNode(['foo' => false, 'bar' => true], [], '');
         $field = new ChoiceFormField($node);
 
         $this->assertEquals('bar', $field->getValue());
@@ -122,7 +122,7 @@ public function testSelectWithEmptyBooleanAttribute()
 
     public function testSelectIsDisabled()
     {
-        $node = $this->createSelectNode(array('foo' => false, 'bar' => true), array('disabled' => 'disabled'));
+        $node = $this->createSelectNode(['foo' => false, 'bar' => true], ['disabled' => 'disabled']);
         $field = new ChoiceFormField($node);
 
         $this->assertTrue($field->isDisabled(), '->isDisabled() returns true for selects with a disabled attribute');
@@ -130,27 +130,27 @@ public function testSelectIsDisabled()
 
     public function testMultipleSelects()
     {
-        $node = $this->createSelectNode(array('foo' => false, 'bar' => false), array('multiple' => 'multiple'));
+        $node = $this->createSelectNode(['foo' => false, 'bar' => false], ['multiple' => 'multiple']);
         $field = new ChoiceFormField($node);
 
-        $this->assertEquals(array(), $field->getValue(), '->setValue() returns an empty array if multiple is true and no option is selected');
+        $this->assertEquals([], $field->getValue(), '->setValue() returns an empty array if multiple is true and no option is selected');
 
         $field->setValue('foo');
-        $this->assertEquals(array('foo'), $field->getValue(), '->setValue() returns an array of options if multiple is true');
+        $this->assertEquals(['foo'], $field->getValue(), '->setValue() returns an array of options if multiple is true');
 
         $field->setValue('bar');
-        $this->assertEquals(array('bar'), $field->getValue(), '->setValue() returns an array of options if multiple is true');
+        $this->assertEquals(['bar'], $field->getValue(), '->setValue() returns an array of options if multiple is true');
 
-        $field->setValue(array('foo', 'bar'));
-        $this->assertEquals(array('foo', 'bar'), $field->getValue(), '->setValue() returns an array of options if multiple is true');
+        $field->setValue(['foo', 'bar']);
+        $this->assertEquals(['foo', 'bar'], $field->getValue(), '->setValue() returns an array of options if multiple is true');
 
-        $node = $this->createSelectNode(array('foo' => true, 'bar' => true), array('multiple' => 'multiple'));
+        $node = $this->createSelectNode(['foo' => true, 'bar' => true], ['multiple' => 'multiple']);
         $field = new ChoiceFormField($node);
 
-        $this->assertEquals(array('foo', 'bar'), $field->getValue(), '->getValue() returns the selected options');
+        $this->assertEquals(['foo', 'bar'], $field->getValue(), '->getValue() returns the selected options');
 
         try {
-            $field->setValue(array('foobar'));
+            $field->setValue(['foobar']);
             $this->fail('->setValue() throws an \InvalidArgumentException if the value is not one of the options');
         } catch (\InvalidArgumentException $e) {
             $this->assertTrue(true, '->setValue() throws an \InvalidArgumentException if the value is not one of the options');
@@ -159,18 +159,18 @@ public function testMultipleSelects()
 
     public function testRadioButtons()
     {
-        $node = $this->createNode('input', '', array('type' => 'radio', 'name' => 'name', 'value' => 'foo'));
+        $node = $this->createNode('input', '', ['type' => 'radio', 'name' => 'name', 'value' => 'foo']);
         $field = new ChoiceFormField($node);
-        $node = $this->createNode('input', '', array('type' => 'radio', 'name' => 'name', 'value' => 'bar'));
+        $node = $this->createNode('input', '', ['type' => 'radio', 'name' => 'name', 'value' => 'bar']);
         $field->addChoice($node);
 
         $this->assertFalse($field->hasValue(), '->hasValue() returns false when no radio button is selected');
         $this->assertNull($field->getValue(), '->getValue() returns null if no radio button is selected');
         $this->assertFalse($field->isMultiple(), '->isMultiple() returns false for radio buttons');
 
-        $node = $this->createNode('input', '', array('type' => 'radio', 'name' => 'name', 'value' => 'foo'));
+        $node = $this->createNode('input', '', ['type' => 'radio', 'name' => 'name', 'value' => 'foo']);
         $field = new ChoiceFormField($node);
-        $node = $this->createNode('input', '', array('type' => 'radio', 'name' => 'name', 'value' => 'bar', 'checked' => 'checked'));
+        $node = $this->createNode('input', '', ['type' => 'radio', 'name' => 'name', 'value' => 'bar', 'checked' => 'checked']);
         $field->addChoice($node);
 
         $this->assertTrue($field->hasValue(), '->hasValue() returns true when a radio button is selected');
@@ -189,9 +189,9 @@ public function testRadioButtons()
 
     public function testRadioButtonsWithEmptyBooleanAttribute()
     {
-        $node = $this->createNode('input', '', array('type' => 'radio', 'name' => 'name', 'value' => 'foo'));
+        $node = $this->createNode('input', '', ['type' => 'radio', 'name' => 'name', 'value' => 'foo']);
         $field = new ChoiceFormField($node);
-        $node = $this->createNode('input', '', array('type' => 'radio', 'name' => 'name', 'value' => 'bar', 'checked' => ''));
+        $node = $this->createNode('input', '', ['type' => 'radio', 'name' => 'name', 'value' => 'bar', 'checked' => '']);
         $field->addChoice($node);
 
         $this->assertTrue($field->hasValue(), '->hasValue() returns true when a radio button is selected');
@@ -200,11 +200,11 @@ public function testRadioButtonsWithEmptyBooleanAttribute()
 
     public function testRadioButtonIsDisabled()
     {
-        $node = $this->createNode('input', '', array('type' => 'radio', 'name' => 'name', 'value' => 'foo', 'disabled' => 'disabled'));
+        $node = $this->createNode('input', '', ['type' => 'radio', 'name' => 'name', 'value' => 'foo', 'disabled' => 'disabled']);
         $field = new ChoiceFormField($node);
-        $node = $this->createNode('input', '', array('type' => 'radio', 'name' => 'name', 'value' => 'bar'));
+        $node = $this->createNode('input', '', ['type' => 'radio', 'name' => 'name', 'value' => 'bar']);
         $field->addChoice($node);
-        $node = $this->createNode('input', '', array('type' => 'radio', 'name' => 'name', 'value' => 'baz', 'disabled' => ''));
+        $node = $this->createNode('input', '', ['type' => 'radio', 'name' => 'name', 'value' => 'baz', 'disabled' => '']);
         $field->addChoice($node);
 
         $field->select('foo');
@@ -222,7 +222,7 @@ public function testRadioButtonIsDisabled()
 
     public function testCheckboxes()
     {
-        $node = $this->createNode('input', '', array('type' => 'checkbox', 'name' => 'name'));
+        $node = $this->createNode('input', '', ['type' => 'checkbox', 'name' => 'name']);
         $field = new ChoiceFormField($node);
 
         $this->assertFalse($field->hasValue(), '->hasValue() returns false when the checkbox is not checked');
@@ -235,18 +235,18 @@ public function testCheckboxes()
             $this->assertTrue(true, '->initialize() throws a \LogicException for checkboxes');
         }
 
-        $node = $this->createNode('input', '', array('type' => 'checkbox', 'name' => 'name', 'checked' => 'checked'));
+        $node = $this->createNode('input', '', ['type' => 'checkbox', 'name' => 'name', 'checked' => 'checked']);
         $field = new ChoiceFormField($node);
 
         $this->assertTrue($field->hasValue(), '->hasValue() returns true when the checkbox is checked');
         $this->assertEquals('on', $field->getValue(), '->getValue() returns 1 if the checkbox is checked and has no value attribute');
 
-        $node = $this->createNode('input', '', array('type' => 'checkbox', 'name' => 'name', 'checked' => 'checked', 'value' => 'foo'));
+        $node = $this->createNode('input', '', ['type' => 'checkbox', 'name' => 'name', 'checked' => 'checked', 'value' => 'foo']);
         $field = new ChoiceFormField($node);
 
         $this->assertEquals('foo', $field->getValue(), '->getValue() returns the value attribute if the checkbox is checked');
 
-        $node = $this->createNode('input', '', array('type' => 'checkbox', 'name' => 'name', 'checked' => 'checked', 'value' => 'foo'));
+        $node = $this->createNode('input', '', ['type' => 'checkbox', 'name' => 'name', 'checked' => 'checked', 'value' => 'foo']);
         $field = new ChoiceFormField($node);
 
         $field->setValue(false);
@@ -265,7 +265,7 @@ public function testCheckboxes()
 
     public function testCheckboxWithEmptyBooleanAttribute()
     {
-        $node = $this->createNode('input', '', array('type' => 'checkbox', 'name' => 'name', 'value' => 'foo', 'checked' => ''));
+        $node = $this->createNode('input', '', ['type' => 'checkbox', 'name' => 'name', 'value' => 'foo', 'checked' => '']);
         $field = new ChoiceFormField($node);
 
         $this->assertTrue($field->hasValue(), '->hasValue() returns true when the checkbox is checked');
@@ -274,7 +274,7 @@ public function testCheckboxWithEmptyBooleanAttribute()
 
     public function testTick()
     {
-        $node = $this->createSelectNode(array('foo' => false, 'bar' => false));
+        $node = $this->createSelectNode(['foo' => false, 'bar' => false]);
         $field = new ChoiceFormField($node);
 
         try {
@@ -284,7 +284,7 @@ public function testTick()
             $this->assertTrue(true, '->tick() throws a \LogicException for select boxes');
         }
 
-        $node = $this->createNode('input', '', array('type' => 'checkbox', 'name' => 'name'));
+        $node = $this->createNode('input', '', ['type' => 'checkbox', 'name' => 'name']);
         $field = new ChoiceFormField($node);
         $field->tick();
         $this->assertEquals('on', $field->getValue(), '->tick() ticks checkboxes');
@@ -292,7 +292,7 @@ public function testTick()
 
     public function testUntick()
     {
-        $node = $this->createSelectNode(array('foo' => false, 'bar' => false));
+        $node = $this->createSelectNode(['foo' => false, 'bar' => false]);
         $field = new ChoiceFormField($node);
 
         try {
@@ -302,7 +302,7 @@ public function testUntick()
             $this->assertTrue(true, '->untick() throws a \LogicException for select boxes');
         }
 
-        $node = $this->createNode('input', '', array('type' => 'checkbox', 'name' => 'name', 'checked' => 'checked'));
+        $node = $this->createNode('input', '', ['type' => 'checkbox', 'name' => 'name', 'checked' => 'checked']);
         $field = new ChoiceFormField($node);
         $field->untick();
         $this->assertNull($field->getValue(), '->untick() unticks checkboxes');
@@ -310,14 +310,14 @@ public function testUntick()
 
     public function testSelect()
     {
-        $node = $this->createNode('input', '', array('type' => 'checkbox', 'name' => 'name', 'checked' => 'checked'));
+        $node = $this->createNode('input', '', ['type' => 'checkbox', 'name' => 'name', 'checked' => 'checked']);
         $field = new ChoiceFormField($node);
         $field->select(true);
         $this->assertEquals('on', $field->getValue(), '->select() changes the value of the field');
         $field->select(false);
         $this->assertNull($field->getValue(), '->select() changes the value of the field');
 
-        $node = $this->createSelectNode(array('foo' => false, 'bar' => false));
+        $node = $this->createSelectNode(['foo' => false, 'bar' => false]);
         $field = new ChoiceFormField($node);
         $field->select('foo');
         $this->assertEquals('foo', $field->getValue(), '->select() changes the selected option');
@@ -325,11 +325,11 @@ public function testSelect()
 
     public function testOptionWithNoValue()
     {
-        $node = $this->createSelectNodeWithEmptyOption(array('foo' => false, 'bar' => false));
+        $node = $this->createSelectNodeWithEmptyOption(['foo' => false, 'bar' => false]);
         $field = new ChoiceFormField($node);
         $this->assertEquals('foo', $field->getValue());
 
-        $node = $this->createSelectNodeWithEmptyOption(array('foo' => false, 'bar' => true));
+        $node = $this->createSelectNodeWithEmptyOption(['foo' => false, 'bar' => true]);
         $field = new ChoiceFormField($node);
         $this->assertEquals('bar', $field->getValue());
         $field->select('foo');
@@ -338,28 +338,28 @@ public function testOptionWithNoValue()
 
     public function testDisableValidation()
     {
-        $node = $this->createSelectNode(array('foo' => false, 'bar' => false));
+        $node = $this->createSelectNode(['foo' => false, 'bar' => false]);
         $field = new ChoiceFormField($node);
         $field->disableValidation();
         $field->setValue('foobar');
         $this->assertEquals('foobar', $field->getValue(), '->disableValidation() allows to set a value which is not in the selected options.');
 
-        $node = $this->createSelectNode(array('foo' => false, 'bar' => false), array('multiple' => 'multiple'));
+        $node = $this->createSelectNode(['foo' => false, 'bar' => false], ['multiple' => 'multiple']);
         $field = new ChoiceFormField($node);
         $field->disableValidation();
-        $field->setValue(array('foobar'));
-        $this->assertEquals(array('foobar'), $field->getValue(), '->disableValidation() allows to set a value which is not in the selected options.');
+        $field->setValue(['foobar']);
+        $this->assertEquals(['foobar'], $field->getValue(), '->disableValidation() allows to set a value which is not in the selected options.');
     }
 
     public function testSelectWithEmptyValue()
     {
-        $node = $this->createSelectNodeWithEmptyOption(array('' => true, 'Female' => false, 'Male' => false));
+        $node = $this->createSelectNodeWithEmptyOption(['' => true, 'Female' => false, 'Male' => false]);
         $field = new ChoiceFormField($node);
 
         $this->assertSame('', $field->getValue());
     }
 
-    protected function createSelectNode($options, $attributes = array(), $selectedAttrText = 'selected')
+    protected function createSelectNode($options, $attributes = [], $selectedAttrText = 'selected')
     {
         $document = new \DOMDocument();
         $node = $document->createElement('select');
@@ -381,7 +381,7 @@ protected function createSelectNode($options, $attributes = array(), $selectedAt
         return $node;
     }
 
-    protected function createSelectNodeWithEmptyOption($options, $attributes = array())
+    protected function createSelectNodeWithEmptyOption($options, $attributes = [])
     {
         $document = new \DOMDocument();
         $node = $document->createElement('select');
diff --git a/src/Symfony/Component/DomCrawler/Tests/Field/FileFormFieldTest.php b/src/Symfony/Component/DomCrawler/Tests/Field/FileFormFieldTest.php
index 3ce49a46ef732..03ab383cbbaf1 100644
--- a/src/Symfony/Component/DomCrawler/Tests/Field/FileFormFieldTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/Field/FileFormFieldTest.php
@@ -17,10 +17,10 @@ class FileFormFieldTest extends FormFieldTestCase
 {
     public function testInitialize()
     {
-        $node = $this->createNode('input', '', array('type' => 'file'));
+        $node = $this->createNode('input', '', ['type' => 'file']);
         $field = new FileFormField($node);
 
-        $this->assertEquals(array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => UPLOAD_ERR_NO_FILE, 'size' => 0), $field->getValue(), '->initialize() sets the value of the field to no file uploaded');
+        $this->assertEquals(['name' => '', 'type' => '', 'tmp_name' => '', 'error' => UPLOAD_ERR_NO_FILE, 'size' => 0], $field->getValue(), '->initialize() sets the value of the field to no file uploaded');
 
         $node = $this->createNode('textarea', '');
         try {
@@ -30,7 +30,7 @@ public function testInitialize()
             $this->assertTrue(true, '->initialize() throws a \LogicException if the node is not an input field');
         }
 
-        $node = $this->createNode('input', '', array('type' => 'text'));
+        $node = $this->createNode('input', '', ['type' => 'text']);
         try {
             $field = new FileFormField($node);
             $this->fail('->initialize() throws a \LogicException if the node is not a file input field');
@@ -44,11 +44,11 @@ public function testInitialize()
      */
     public function testSetValue($method)
     {
-        $node = $this->createNode('input', '', array('type' => 'file'));
+        $node = $this->createNode('input', '', ['type' => 'file']);
         $field = new FileFormField($node);
 
         $field->$method(null);
-        $this->assertEquals(array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => UPLOAD_ERR_NO_FILE, 'size' => 0), $field->getValue(), "->$method() clears the uploaded file if the value is null");
+        $this->assertEquals(['name' => '', 'type' => '', 'tmp_name' => '', 'error' => UPLOAD_ERR_NO_FILE, 'size' => 0], $field->getValue(), "->$method() clears the uploaded file if the value is null");
 
         $field->$method(__FILE__);
         $value = $field->getValue();
@@ -80,15 +80,15 @@ public function testSetValue($method)
 
     public function getSetValueMethods()
     {
-        return array(
-            array('setValue'),
-            array('upload'),
-        );
+        return [
+            ['setValue'],
+            ['upload'],
+        ];
     }
 
     public function testSetErrorCode()
     {
-        $node = $this->createNode('input', '', array('type' => 'file'));
+        $node = $this->createNode('input', '', ['type' => 'file']);
         $field = new FileFormField($node);
 
         $field->setErrorCode(UPLOAD_ERR_FORM_SIZE);
@@ -105,7 +105,7 @@ public function testSetErrorCode()
 
     public function testSetRawFilePath()
     {
-        $node = $this->createNode('input', '', array('type' => 'file'));
+        $node = $this->createNode('input', '', ['type' => 'file']);
         $field = new FileFormField($node);
         $field->setFilePath(__FILE__);
 
diff --git a/src/Symfony/Component/DomCrawler/Tests/Field/FormFieldTest.php b/src/Symfony/Component/DomCrawler/Tests/Field/FormFieldTest.php
index d150eb3ac73b1..e2daa03987169 100644
--- a/src/Symfony/Component/DomCrawler/Tests/Field/FormFieldTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/Field/FormFieldTest.php
@@ -17,7 +17,7 @@ class FormFieldTest extends FormFieldTestCase
 {
     public function testGetName()
     {
-        $node = $this->createNode('input', '', array('type' => 'text', 'name' => 'name', 'value' => 'value'));
+        $node = $this->createNode('input', '', ['type' => 'text', 'name' => 'name', 'value' => 'value']);
         $field = new InputFormField($node);
 
         $this->assertEquals('name', $field->getName(), '->getName() returns the name of the field');
@@ -25,7 +25,7 @@ public function testGetName()
 
     public function testGetSetHasValue()
     {
-        $node = $this->createNode('input', '', array('type' => 'text', 'name' => 'name', 'value' => 'value'));
+        $node = $this->createNode('input', '', ['type' => 'text', 'name' => 'name', 'value' => 'value']);
         $field = new InputFormField($node);
 
         $this->assertEquals('value', $field->getValue(), '->getValue() returns the value of the field');
diff --git a/src/Symfony/Component/DomCrawler/Tests/Field/FormFieldTestCase.php b/src/Symfony/Component/DomCrawler/Tests/Field/FormFieldTestCase.php
index 2059d049c1d0f..5ca19d95416f6 100644
--- a/src/Symfony/Component/DomCrawler/Tests/Field/FormFieldTestCase.php
+++ b/src/Symfony/Component/DomCrawler/Tests/Field/FormFieldTestCase.php
@@ -15,7 +15,7 @@
 
 class FormFieldTestCase extends TestCase
 {
-    protected function createNode($tag, $value, $attributes = array())
+    protected function createNode($tag, $value, $attributes = [])
     {
         $document = new \DOMDocument();
         $node = $document->createElement($tag, $value);
diff --git a/src/Symfony/Component/DomCrawler/Tests/Field/InputFormFieldTest.php b/src/Symfony/Component/DomCrawler/Tests/Field/InputFormFieldTest.php
index 193d301de691e..5758f1b7bb3fe 100644
--- a/src/Symfony/Component/DomCrawler/Tests/Field/InputFormFieldTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/Field/InputFormFieldTest.php
@@ -17,7 +17,7 @@ class InputFormFieldTest extends FormFieldTestCase
 {
     public function testInitialize()
     {
-        $node = $this->createNode('input', '', array('type' => 'text', 'name' => 'name', 'value' => 'value'));
+        $node = $this->createNode('input', '', ['type' => 'text', 'name' => 'name', 'value' => 'value']);
         $field = new InputFormField($node);
 
         $this->assertEquals('value', $field->getValue(), '->initialize() sets the value of the field to the value attribute value');
@@ -30,7 +30,7 @@ public function testInitialize()
             $this->assertTrue(true, '->initialize() throws a \LogicException if the node is not an input');
         }
 
-        $node = $this->createNode('input', '', array('type' => 'checkbox'));
+        $node = $this->createNode('input', '', ['type' => 'checkbox']);
         try {
             $field = new InputFormField($node);
             $this->fail('->initialize() throws a \LogicException if the node is a checkbox');
@@ -38,7 +38,7 @@ public function testInitialize()
             $this->assertTrue(true, '->initialize() throws a \LogicException if the node is a checkbox');
         }
 
-        $node = $this->createNode('input', '', array('type' => 'file'));
+        $node = $this->createNode('input', '', ['type' => 'file']);
         try {
             $field = new InputFormField($node);
             $this->fail('->initialize() throws a \LogicException if the node is a file');
diff --git a/src/Symfony/Component/DomCrawler/Tests/FormTest.php b/src/Symfony/Component/DomCrawler/Tests/FormTest.php
index f7ea51b2d0d24..2778fd075e3a5 100644
--- a/src/Symfony/Component/DomCrawler/Tests/FormTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/FormTest.php
@@ -129,18 +129,18 @@ public function testConstructorHandlesFormValues()
         $form2 = new Form($buttonElements->item(0), 'http://example.com');
 
         // Tests if form values are correctly assigned to forms
-        $values1 = array(
-            'apples' => array('1', '2'),
+        $values1 = [
+            'apples' => ['1', '2'],
             'form_name' => 'form-1',
             'button_1' => 'Capture fields',
             'outer_field' => 'success',
-        );
-        $values2 = array(
-            'oranges' => array('1', '2', '3'),
+        ];
+        $values2 = [
+            'oranges' => ['1', '2', '3'],
             'form_name' => 'form_2',
             'button_2' => '',
-            'app_frontend_form_type_contact_form_type' => array('contactType' => '', 'firstName' => 'John'),
-        );
+            'app_frontend_form_type_contact_form_type' => ['contactType' => '', 'firstName' => 'John'],
+        ];
 
         $this->assertEquals($values1, $form1->getPhpValues(), 'HTML5-compliant form attribute handled incorrectly');
         $this->assertEquals($values2, $form2->getPhpValues(), 'HTML5-compliant form attribute handled incorrectly');
@@ -161,7 +161,7 @@ public function testMultiValuedFields()
 
         $this->assertEquals(
             array_keys($form->all()),
-            array('foo[2]', 'foo[3]', 'bar[foo][0]', 'bar[foo][foobar]')
+            ['foo[2]', 'foo[3]', 'bar[foo][0]', 'bar[foo][foobar]']
         );
 
         $this->assertEquals($form->get('foo[2]')->getValue(), 'foo');
@@ -175,7 +175,7 @@ public function testMultiValuedFields()
         $this->assertEquals($form->get('foo[2]')->getValue(), 'bar');
         $this->assertEquals($form->get('foo[3]')->getValue(), 'bar');
 
-        $form['bar'] = array('foo' => array('0' => 'bar', 'foobar' => 'foobar'));
+        $form['bar'] = ['foo' => ['0' => 'bar', 'foobar' => 'foobar']];
 
         $this->assertEquals($form->get('bar[foo][0]')->getValue(), 'bar');
         $this->assertEquals($form->get('bar[foo][foobar]')->getValue(), 'foobar');
@@ -193,7 +193,7 @@ public function testConstructor($message, $form, $values)
                 function ($field) {
                     $class = \get_class($field);
 
-                    return array(substr($class, strrpos($class, '\\') + 1), $field->getValue());
+                    return [substr($class, strrpos($class, '\\') + 1), $field->getValue()];
                 },
                 $form->all()
             ),
@@ -203,84 +203,84 @@ function ($field) {
 
     public function provideInitializeValues()
     {
-        return array(
-            array(
+        return [
+            [
                 'does not take into account input fields without a name attribute',
                 '<input type="text" value="foo" />
                  <input type="submit" />',
-                array(),
-            ),
-            array(
+                [],
+            ],
+            [
                 'does not take into account input fields with an empty name attribute value',
                 '<input type="text" name="" value="foo" />
                  <input type="submit" />',
-                array(),
-            ),
-            array(
+                [],
+            ],
+            [
                 'takes into account disabled input fields',
                 '<input type="text" name="foo" value="foo" disabled="disabled" />
                  <input type="submit" />',
-                array('foo' => array('InputFormField', 'foo')),
-            ),
-            array(
+                ['foo' => ['InputFormField', 'foo']],
+            ],
+            [
                 'appends the submitted button value',
                 '<input type="submit" name="bar" value="bar" />',
-                array('bar' => array('InputFormField', 'bar')),
-            ),
-            array(
+                ['bar' => ['InputFormField', 'bar']],
+            ],
+            [
                 'appends the submitted button value for Button element',
                 '<button type="submit" name="bar" value="bar">Bar</button>',
-                array('bar' => array('InputFormField', 'bar')),
-            ),
-            array(
+                ['bar' => ['InputFormField', 'bar']],
+            ],
+            [
                 'appends the submitted button value but not other submit buttons',
                 '<input type="submit" name="bar" value="bar" />
                  <input type="submit" name="foobar" value="foobar" />',
-                 array('foobar' => array('InputFormField', 'foobar')),
-            ),
-            array(
+                 ['foobar' => ['InputFormField', 'foobar']],
+            ],
+            [
                 'turns an image input into x and y fields',
                 '<input type="image" name="bar" />',
-                array('bar.x' => array('InputFormField', '0'), 'bar.y' => array('InputFormField', '0')),
-            ),
-            array(
+                ['bar.x' => ['InputFormField', '0'], 'bar.y' => ['InputFormField', '0']],
+            ],
+            [
                 'returns textareas',
                 '<textarea name="foo">foo</textarea>
                  <input type="submit" />',
-                 array('foo' => array('TextareaFormField', 'foo')),
-            ),
-            array(
+                 ['foo' => ['TextareaFormField', 'foo']],
+            ],
+            [
                 'returns inputs',
                 '<input type="text" name="foo" value="foo" />
                  <input type="submit" />',
-                 array('foo' => array('InputFormField', 'foo')),
-            ),
-            array(
+                 ['foo' => ['InputFormField', 'foo']],
+            ],
+            [
                 'returns checkboxes',
                 '<input type="checkbox" name="foo" value="foo" checked="checked" />
                  <input type="submit" />',
-                 array('foo' => array('ChoiceFormField', 'foo')),
-            ),
-            array(
+                 ['foo' => ['ChoiceFormField', 'foo']],
+            ],
+            [
                 'returns not-checked checkboxes',
                 '<input type="checkbox" name="foo" value="foo" />
                  <input type="submit" />',
-                 array('foo' => array('ChoiceFormField', false)),
-            ),
-            array(
+                 ['foo' => ['ChoiceFormField', false]],
+            ],
+            [
                 'returns radio buttons',
                 '<input type="radio" name="foo" value="foo" />
                  <input type="radio" name="foo" value="bar" checked="bar" />
                  <input type="submit" />',
-                 array('foo' => array('ChoiceFormField', 'bar')),
-            ),
-            array(
+                 ['foo' => ['ChoiceFormField', 'bar']],
+            ],
+            [
                 'returns file inputs',
                 '<input type="file" name="foo" />
                  <input type="submit" />',
-                 array('foo' => array('FileFormField', array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0))),
-            ),
-        );
+                 ['foo' => ['FileFormField', ['name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0]]],
+            ],
+        ];
     }
 
     public function testGetFormNode()
@@ -390,86 +390,86 @@ public function testOffsetExists()
     public function testGetValues()
     {
         $form = $this->createForm('<form><input type="text" name="foo[bar]" value="foo" /><input type="text" name="bar" value="bar" /><select multiple="multiple" name="baz[]"></select><input type="submit" /></form>');
-        $this->assertEquals(array('foo[bar]' => 'foo', 'bar' => 'bar', 'baz' => array()), $form->getValues(), '->getValues() returns all form field values');
+        $this->assertEquals(['foo[bar]' => 'foo', 'bar' => 'bar', 'baz' => []], $form->getValues(), '->getValues() returns all form field values');
 
         $form = $this->createForm('<form><input type="checkbox" name="foo" value="foo" /><input type="text" name="bar" value="bar" /><input type="submit" /></form>');
-        $this->assertEquals(array('bar' => 'bar'), $form->getValues(), '->getValues() does not include not-checked checkboxes');
+        $this->assertEquals(['bar' => 'bar'], $form->getValues(), '->getValues() does not include not-checked checkboxes');
 
         $form = $this->createForm('<form><input type="file" name="foo" value="foo" /><input type="text" name="bar" value="bar" /><input type="submit" /></form>');
-        $this->assertEquals(array('bar' => 'bar'), $form->getValues(), '->getValues() does not include file input fields');
+        $this->assertEquals(['bar' => 'bar'], $form->getValues(), '->getValues() does not include file input fields');
 
         $form = $this->createForm('<form><input type="text" name="foo" value="foo" disabled="disabled" /><input type="text" name="bar" value="bar" /><input type="submit" /></form>');
-        $this->assertEquals(array('bar' => 'bar'), $form->getValues(), '->getValues() does not include disabled fields');
+        $this->assertEquals(['bar' => 'bar'], $form->getValues(), '->getValues() does not include disabled fields');
 
         $form = $this->createForm('<form><template><input type="text" name="foo" value="foo" /></template><input type="text" name="bar" value="bar" /><input type="submit" /></form>');
-        $this->assertEquals(array('bar' => 'bar'), $form->getValues(), '->getValues() does not include template fields');
+        $this->assertEquals(['bar' => 'bar'], $form->getValues(), '->getValues() does not include template fields');
         $this->assertFalse($form->has('foo'));
     }
 
     public function testSetValues()
     {
         $form = $this->createForm('<form><input type="checkbox" name="foo" value="foo" checked="checked" /><input type="text" name="bar" value="bar" /><input type="submit" /></form>');
-        $form->setValues(array('foo' => false, 'bar' => 'foo'));
-        $this->assertEquals(array('bar' => 'foo'), $form->getValues(), '->setValues() sets the values of fields');
+        $form->setValues(['foo' => false, 'bar' => 'foo']);
+        $this->assertEquals(['bar' => 'foo'], $form->getValues(), '->setValues() sets the values of fields');
     }
 
     public function testMultiselectSetValues()
     {
         $form = $this->createForm('<form><select multiple="multiple" name="multi"><option value="foo">foo</option><option value="bar">bar</option></select><input type="submit" /></form>');
-        $form->setValues(array('multi' => array('foo', 'bar')));
-        $this->assertEquals(array('multi' => array('foo', 'bar')), $form->getValues(), '->setValue() sets the values of select');
+        $form->setValues(['multi' => ['foo', 'bar']]);
+        $this->assertEquals(['multi' => ['foo', 'bar']], $form->getValues(), '->setValue() sets the values of select');
     }
 
     public function testGetPhpValues()
     {
         $form = $this->createForm('<form><input type="text" name="foo[bar]" value="foo" /><input type="text" name="bar" value="bar" /><input type="submit" /></form>');
-        $this->assertEquals(array('foo' => array('bar' => 'foo'), 'bar' => 'bar'), $form->getPhpValues(), '->getPhpValues() converts keys with [] to arrays');
+        $this->assertEquals(['foo' => ['bar' => 'foo'], 'bar' => 'bar'], $form->getPhpValues(), '->getPhpValues() converts keys with [] to arrays');
 
         $form = $this->createForm('<form><input type="text" name="fo.o[ba.r]" value="foo" /><input type="text" name="ba r" value="bar" /><input type="submit" /></form>');
-        $this->assertEquals(array('fo.o' => array('ba.r' => 'foo'), 'ba r' => 'bar'), $form->getPhpValues(), '->getPhpValues() preserves periods and spaces in names');
+        $this->assertEquals(['fo.o' => ['ba.r' => 'foo'], 'ba r' => 'bar'], $form->getPhpValues(), '->getPhpValues() preserves periods and spaces in names');
 
         $form = $this->createForm('<form><input type="text" name="fo.o[ba.r][]" value="foo" /><input type="text" name="fo.o[ba.r][ba.z]" value="bar" /><input type="submit" /></form>');
-        $this->assertEquals(array('fo.o' => array('ba.r' => array('foo', 'ba.z' => 'bar'))), $form->getPhpValues(), '->getPhpValues() preserves periods and spaces in names recursively');
+        $this->assertEquals(['fo.o' => ['ba.r' => ['foo', 'ba.z' => 'bar']]], $form->getPhpValues(), '->getPhpValues() preserves periods and spaces in names recursively');
 
         $form = $this->createForm('<form><input type="text" name="foo[bar]" value="foo" /><input type="text" name="bar" value="bar" /><select multiple="multiple" name="baz[]"></select><input type="submit" /></form>');
-        $this->assertEquals(array('foo' => array('bar' => 'foo'), 'bar' => 'bar'), $form->getPhpValues(), "->getPhpValues() doesn't return empty values");
+        $this->assertEquals(['foo' => ['bar' => 'foo'], 'bar' => 'bar'], $form->getPhpValues(), "->getPhpValues() doesn't return empty values");
     }
 
     public function testGetFiles()
     {
         $form = $this->createForm('<form><input type="file" name="foo[bar]" /><input type="text" name="bar" value="bar" /><input type="submit" /></form>');
-        $this->assertEquals(array(), $form->getFiles(), '->getFiles() returns an empty array if method is get');
+        $this->assertEquals([], $form->getFiles(), '->getFiles() returns an empty array if method is get');
 
         $form = $this->createForm('<form method="post"><input type="file" name="foo[bar]" /><input type="text" name="bar" value="bar" /><input type="submit" /></form>');
-        $this->assertEquals(array('foo[bar]' => array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0)), $form->getFiles(), '->getFiles() only returns file fields for POST');
+        $this->assertEquals(['foo[bar]' => ['name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0]], $form->getFiles(), '->getFiles() only returns file fields for POST');
 
         $form = $this->createForm('<form method="post"><input type="file" name="foo[bar]" /><input type="text" name="bar" value="bar" /><input type="submit" /></form>', 'put');
-        $this->assertEquals(array('foo[bar]' => array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0)), $form->getFiles(), '->getFiles() only returns file fields for PUT');
+        $this->assertEquals(['foo[bar]' => ['name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0]], $form->getFiles(), '->getFiles() only returns file fields for PUT');
 
         $form = $this->createForm('<form method="post"><input type="file" name="foo[bar]" /><input type="text" name="bar" value="bar" /><input type="submit" /></form>', 'delete');
-        $this->assertEquals(array('foo[bar]' => array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0)), $form->getFiles(), '->getFiles() only returns file fields for DELETE');
+        $this->assertEquals(['foo[bar]' => ['name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0]], $form->getFiles(), '->getFiles() only returns file fields for DELETE');
 
         $form = $this->createForm('<form method="post"><input type="file" name="foo[bar]" /><input type="text" name="bar" value="bar" /><input type="submit" /></form>', 'patch');
-        $this->assertEquals(array('foo[bar]' => array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0)), $form->getFiles(), '->getFiles() only returns file fields for PATCH');
+        $this->assertEquals(['foo[bar]' => ['name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0]], $form->getFiles(), '->getFiles() only returns file fields for PATCH');
 
         $form = $this->createForm('<form method="post"><input type="file" name="foo[bar]" disabled="disabled" /><input type="submit" /></form>');
-        $this->assertEquals(array(), $form->getFiles(), '->getFiles() does not include disabled file fields');
+        $this->assertEquals([], $form->getFiles(), '->getFiles() does not include disabled file fields');
 
         $form = $this->createForm('<form method="post"><template><input type="file" name="foo"/></template><input type="text" name="bar" value="bar"/><input type="submit"/></form>');
-        $this->assertEquals(array(), $form->getFiles(), '->getFiles() does not include template file fields');
+        $this->assertEquals([], $form->getFiles(), '->getFiles() does not include template file fields');
         $this->assertFalse($form->has('foo'));
     }
 
     public function testGetPhpFiles()
     {
         $form = $this->createForm('<form method="post"><input type="file" name="foo[bar]" /><input type="text" name="bar" value="bar" /><input type="submit" /></form>');
-        $this->assertEquals(array('foo' => array('bar' => array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0))), $form->getPhpFiles(), '->getPhpFiles() converts keys with [] to arrays');
+        $this->assertEquals(['foo' => ['bar' => ['name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0]]], $form->getPhpFiles(), '->getPhpFiles() converts keys with [] to arrays');
 
         $form = $this->createForm('<form method="post"><input type="file" name="f.o o[bar]" /><input type="text" name="bar" value="bar" /><input type="submit" /></form>');
-        $this->assertEquals(array('f.o o' => array('bar' => array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0))), $form->getPhpFiles(), '->getPhpFiles() preserves periods and spaces in names');
+        $this->assertEquals(['f.o o' => ['bar' => ['name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0]]], $form->getPhpFiles(), '->getPhpFiles() preserves periods and spaces in names');
 
         $form = $this->createForm('<form method="post"><input type="file" name="f.o o[bar][ba.z]" /><input type="file" name="f.o o[bar][]" /><input type="text" name="bar" value="bar" /><input type="submit" /></form>');
-        $this->assertEquals(array('f.o o' => array('bar' => array('ba.z' => array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0), array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0)))), $form->getPhpFiles(), '->getPhpFiles() preserves periods and spaces in names recursively');
+        $this->assertEquals(['f.o o' => ['bar' => ['ba.z' => ['name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0], ['name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0]]]], $form->getPhpFiles(), '->getPhpFiles() preserves periods and spaces in names recursively');
 
         $form = $this->createForm('<form method="post"><input type="file" name="foo[bar]" /><input type="text" name="bar" value="bar" /><input type="submit" /></form>');
         $files = $form->getPhpFiles();
@@ -478,7 +478,7 @@ public function testGetPhpFiles()
         $this->assertSame(4, $files['foo']['bar']['error'], '->getPhpFiles() converts error to int');
 
         $form = $this->createForm('<form method="post"><input type="file" name="size[error]" /><input type="text" name="error" value="error" /><input type="submit" /></form>');
-        $this->assertEquals(array('size' => array('error' => array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0))), $form->getPhpFiles(), '->getPhpFiles() int conversion does not collide with file names');
+        $this->assertEquals(['size' => ['error' => ['name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0]]], $form->getPhpFiles(), '->getPhpFiles() int conversion does not collide with file names');
     }
 
     /**
@@ -559,83 +559,83 @@ public function testGetUriWithActionOverride()
 
     public function provideGetUriValues()
     {
-        return array(
-            array(
+        return [
+            [
                 'returns the URI of the form',
                 '<form action="/foo"><input type="submit" /></form>',
-                array(),
+                [],
                 '/foo',
-            ),
-            array(
+            ],
+            [
                 'appends the form values if the method is get',
                 '<form action="/foo"><input type="text" name="foo" value="foo" /><input type="submit" /></form>',
-                array(),
+                [],
                 '/foo?foo=foo',
-            ),
-            array(
+            ],
+            [
                 'appends the form values and merges the submitted values',
                 '<form action="/foo"><input type="text" name="foo" value="foo" /><input type="submit" /></form>',
-                array('foo' => 'bar'),
+                ['foo' => 'bar'],
                 '/foo?foo=bar',
-            ),
-            array(
+            ],
+            [
                 'does not append values if the method is post',
                 '<form action="/foo" method="post"><input type="text" name="foo" value="foo" /><input type="submit" /></form>',
-                array(),
+                [],
                 '/foo',
-            ),
-            array(
+            ],
+            [
                 'does not append values if the method is patch',
                 '<form action="/foo" method="post"><input type="text" name="foo" value="foo" /><input type="submit" /></form>',
-                array(),
+                [],
                 '/foo',
                 'PUT',
-            ),
-            array(
+            ],
+            [
                 'does not append values if the method is delete',
                 '<form action="/foo" method="post"><input type="text" name="foo" value="foo" /><input type="submit" /></form>',
-                array(),
+                [],
                 '/foo',
                 'DELETE',
-            ),
-            array(
+            ],
+            [
                 'does not append values if the method is put',
                 '<form action="/foo" method="post"><input type="text" name="foo" value="foo" /><input type="submit" /></form>',
-                array(),
+                [],
                 '/foo',
                 'PATCH',
-            ),
-            array(
+            ],
+            [
                 'appends the form values to an existing query string',
                 '<form action="/foo?bar=bar"><input type="text" name="foo" value="foo" /><input type="submit" /></form>',
-                array(),
+                [],
                 '/foo?bar=bar&foo=foo',
-            ),
-            array(
+            ],
+            [
                 'replaces query values with the form values',
                 '<form action="/foo?bar=bar"><input type="text" name="bar" value="foo" /><input type="submit" /></form>',
-                array(),
+                [],
                 '/foo?bar=foo',
-            ),
-            array(
+            ],
+            [
                 'returns an empty URI if the action is empty',
                 '<form><input type="submit" /></form>',
-                array(),
+                [],
                 '/',
-            ),
-            array(
+            ],
+            [
                 'appends the form values even if the action is empty',
                 '<form><input type="text" name="foo" value="foo" /><input type="submit" /></form>',
-                array(),
+                [],
                 '/?foo=foo',
-            ),
-            array(
+            ],
+            [
                 'chooses the path if the action attribute value is a sharp (#)',
                 '<form action="#" method="post"><input type="text" name="foo" value="foo" /><input type="submit" /></form>',
-                array(),
+                [],
                 '/#',
-            ),
-        );
+            ],
+        ];
     }
 
     public function testHas()
@@ -761,7 +761,7 @@ public function testFormRegistrySupportsMultivaluedFields()
         $registry->add($this->getFormFieldMock('bar[baz]'));
 
         $this->assertEquals(
-            array('foo[0]', 'foo[1]', 'bar[5]', 'bar[6]', 'bar[baz]'),
+            ['foo[0]', 'foo[1]', 'bar[5]', 'bar[6]', 'bar[baz]'],
             array_keys($registry->all())
         );
     }
@@ -795,13 +795,13 @@ public function testFormRegistrySetValues()
         $registry->set('foo[3]', 3);
         $registry->set('foo[bar][baz]', 'fbb');
 
-        $registry->set('foo', array(
+        $registry->set('foo', [
             2 => 2,
             3 => 3,
-            'bar' => array(
+            'bar' => [
                 'baz' => 'fbb',
-             ),
-        ));
+             ],
+        ]);
     }
 
     /**
@@ -825,7 +825,7 @@ public function testFormRegistrySetArrayOnNotCompoundField()
         $registry = new FormFieldRegistry();
         $registry->add($this->getFormFieldMock('bar'));
 
-        $registry->set('bar', array('baz'));
+        $registry->set('bar', ['baz']);
     }
 
     public function testDifferentFieldTypesWithSameName()
@@ -854,7 +854,7 @@ protected function getFormFieldMock($name, $value = null)
     {
         $field = $this
             ->getMockBuilder('Symfony\\Component\\DomCrawler\\Field\\FormField')
-            ->setMethods(array('getName', 'getValue', 'setValue', 'initialize'))
+            ->setMethods(['getName', 'getValue', 'setValue', 'initialize'])
             ->disableOriginalConstructor()
             ->getMock()
         ;
@@ -965,6 +965,6 @@ public function testgetPhpValuesWithEmptyTextarea()
 
         $nodes = $dom->getElementsByTagName('form');
         $form = new Form($nodes->item(0), 'http://example.com');
-        $this->assertEquals($form->getPhpValues(), array('example' => ''));
+        $this->assertEquals($form->getPhpValues(), ['example' => '']);
     }
 }
diff --git a/src/Symfony/Component/DomCrawler/Tests/ImageTest.php b/src/Symfony/Component/DomCrawler/Tests/ImageTest.php
index 309578a90233e..7f9c71924f7eb 100644
--- a/src/Symfony/Component/DomCrawler/Tests/ImageTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/ImageTest.php
@@ -41,9 +41,9 @@ public function testGetUri($url, $currentUri, $expected)
 
     public function getGetUriTests()
     {
-        return array(
-            array('/foo.png', 'http://localhost/bar/foo/', 'http://localhost/foo.png'),
-            array('foo.png', 'http://localhost/bar/foo/', 'http://localhost/bar/foo/foo.png'),
-        );
+        return [
+            ['/foo.png', 'http://localhost/bar/foo/', 'http://localhost/foo.png'],
+            ['foo.png', 'http://localhost/bar/foo/', 'http://localhost/bar/foo/foo.png'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/DomCrawler/Tests/LinkTest.php b/src/Symfony/Component/DomCrawler/Tests/LinkTest.php
index 3f0364705f986..3cbcdbd62b57a 100644
--- a/src/Symfony/Component/DomCrawler/Tests/LinkTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/LinkTest.php
@@ -101,61 +101,61 @@ public function testGetUriOnLink($url, $currentUri, $expected)
 
     public function getGetUriTests()
     {
-        return array(
-            array('/foo', 'http://localhost/bar/foo/', 'http://localhost/foo'),
-            array('/foo', 'http://localhost/bar/foo', 'http://localhost/foo'),
-            array('
-            /foo', 'http://localhost/bar/foo/', 'http://localhost/foo'),
-            array('/foo
-            ', 'http://localhost/bar/foo', 'http://localhost/foo'),
-
-            array('foo', 'http://localhost/bar/foo/', 'http://localhost/bar/foo/foo'),
-            array('foo', 'http://localhost/bar/foo', 'http://localhost/bar/foo'),
-
-            array('', 'http://localhost/bar/', 'http://localhost/bar/'),
-            array('#', 'http://localhost/bar/', 'http://localhost/bar/#'),
-            array('#bar', 'http://localhost/bar?a=b', 'http://localhost/bar?a=b#bar'),
-            array('#bar', 'http://localhost/bar/#foo', 'http://localhost/bar/#bar'),
-            array('?a=b', 'http://localhost/bar#foo', 'http://localhost/bar?a=b'),
-            array('?a=b', 'http://localhost/bar/', 'http://localhost/bar/?a=b'),
-
-            array('http://login.foo.com/foo', 'http://localhost/bar/', 'http://login.foo.com/foo'),
-            array('https://login.foo.com/foo', 'https://localhost/bar/', 'https://login.foo.com/foo'),
-            array('mailto:foo@bar.com', 'http://localhost/foo', 'mailto:foo@bar.com'),
+        return [
+            ['/foo', 'http://localhost/bar/foo/', 'http://localhost/foo'],
+            ['/foo', 'http://localhost/bar/foo', 'http://localhost/foo'],
+            ['
+            /foo', 'http://localhost/bar/foo/', 'http://localhost/foo'],
+            ['/foo
+            ', 'http://localhost/bar/foo', 'http://localhost/foo'],
+
+            ['foo', 'http://localhost/bar/foo/', 'http://localhost/bar/foo/foo'],
+            ['foo', 'http://localhost/bar/foo', 'http://localhost/bar/foo'],
+
+            ['', 'http://localhost/bar/', 'http://localhost/bar/'],
+            ['#', 'http://localhost/bar/', 'http://localhost/bar/#'],
+            ['#bar', 'http://localhost/bar?a=b', 'http://localhost/bar?a=b#bar'],
+            ['#bar', 'http://localhost/bar/#foo', 'http://localhost/bar/#bar'],
+            ['?a=b', 'http://localhost/bar#foo', 'http://localhost/bar?a=b'],
+            ['?a=b', 'http://localhost/bar/', 'http://localhost/bar/?a=b'],
+
+            ['http://login.foo.com/foo', 'http://localhost/bar/', 'http://login.foo.com/foo'],
+            ['https://login.foo.com/foo', 'https://localhost/bar/', 'https://login.foo.com/foo'],
+            ['mailto:foo@bar.com', 'http://localhost/foo', 'mailto:foo@bar.com'],
 
             // tests schema relative URL (issue #7169)
-            array('//login.foo.com/foo', 'http://localhost/bar/', 'http://login.foo.com/foo'),
-            array('//login.foo.com/foo', 'https://localhost/bar/', 'https://login.foo.com/foo'),
-
-            array('?foo=2', 'http://localhost?foo=1', 'http://localhost?foo=2'),
-            array('?foo=2', 'http://localhost/?foo=1', 'http://localhost/?foo=2'),
-            array('?foo=2', 'http://localhost/bar?foo=1', 'http://localhost/bar?foo=2'),
-            array('?foo=2', 'http://localhost/bar/?foo=1', 'http://localhost/bar/?foo=2'),
-            array('?bar=2', 'http://localhost?foo=1', 'http://localhost?bar=2'),
-
-            array('foo', 'http://login.foo.com/bar/baz?/query/string', 'http://login.foo.com/bar/foo'),
-
-            array('.', 'http://localhost/foo/bar/baz', 'http://localhost/foo/bar/'),
-            array('./', 'http://localhost/foo/bar/baz', 'http://localhost/foo/bar/'),
-            array('./foo', 'http://localhost/foo/bar/baz', 'http://localhost/foo/bar/foo'),
-            array('..', 'http://localhost/foo/bar/baz', 'http://localhost/foo/'),
-            array('../', 'http://localhost/foo/bar/baz', 'http://localhost/foo/'),
-            array('../foo', 'http://localhost/foo/bar/baz', 'http://localhost/foo/foo'),
-            array('../..', 'http://localhost/foo/bar/baz', 'http://localhost/'),
-            array('../../', 'http://localhost/foo/bar/baz', 'http://localhost/'),
-            array('../../foo', 'http://localhost/foo/bar/baz', 'http://localhost/foo'),
-            array('../../foo', 'http://localhost/bar/foo/', 'http://localhost/foo'),
-            array('../bar/../../foo', 'http://localhost/bar/foo/', 'http://localhost/foo'),
-            array('../bar/./../../foo', 'http://localhost/bar/foo/', 'http://localhost/foo'),
-            array('../../', 'http://localhost/', 'http://localhost/'),
-            array('../../', 'http://localhost', 'http://localhost/'),
-
-            array('/foo', 'http://localhost?bar=1', 'http://localhost/foo'),
-            array('/foo', 'http://localhost#bar', 'http://localhost/foo'),
-            array('/foo', 'file:///', 'file:///foo'),
-            array('/foo', 'file:///bar/baz', 'file:///foo'),
-            array('foo', 'file:///', 'file:///foo'),
-            array('foo', 'file:///bar/baz', 'file:///bar/foo'),
-        );
+            ['//login.foo.com/foo', 'http://localhost/bar/', 'http://login.foo.com/foo'],
+            ['//login.foo.com/foo', 'https://localhost/bar/', 'https://login.foo.com/foo'],
+
+            ['?foo=2', 'http://localhost?foo=1', 'http://localhost?foo=2'],
+            ['?foo=2', 'http://localhost/?foo=1', 'http://localhost/?foo=2'],
+            ['?foo=2', 'http://localhost/bar?foo=1', 'http://localhost/bar?foo=2'],
+            ['?foo=2', 'http://localhost/bar/?foo=1', 'http://localhost/bar/?foo=2'],
+            ['?bar=2', 'http://localhost?foo=1', 'http://localhost?bar=2'],
+
+            ['foo', 'http://login.foo.com/bar/baz?/query/string', 'http://login.foo.com/bar/foo'],
+
+            ['.', 'http://localhost/foo/bar/baz', 'http://localhost/foo/bar/'],
+            ['./', 'http://localhost/foo/bar/baz', 'http://localhost/foo/bar/'],
+            ['./foo', 'http://localhost/foo/bar/baz', 'http://localhost/foo/bar/foo'],
+            ['..', 'http://localhost/foo/bar/baz', 'http://localhost/foo/'],
+            ['../', 'http://localhost/foo/bar/baz', 'http://localhost/foo/'],
+            ['../foo', 'http://localhost/foo/bar/baz', 'http://localhost/foo/foo'],
+            ['../..', 'http://localhost/foo/bar/baz', 'http://localhost/'],
+            ['../../', 'http://localhost/foo/bar/baz', 'http://localhost/'],
+            ['../../foo', 'http://localhost/foo/bar/baz', 'http://localhost/foo'],
+            ['../../foo', 'http://localhost/bar/foo/', 'http://localhost/foo'],
+            ['../bar/../../foo', 'http://localhost/bar/foo/', 'http://localhost/foo'],
+            ['../bar/./../../foo', 'http://localhost/bar/foo/', 'http://localhost/foo'],
+            ['../../', 'http://localhost/', 'http://localhost/'],
+            ['../../', 'http://localhost', 'http://localhost/'],
+
+            ['/foo', 'http://localhost?bar=1', 'http://localhost/foo'],
+            ['/foo', 'http://localhost#bar', 'http://localhost/foo'],
+            ['/foo', 'file:///', 'file:///foo'],
+            ['/foo', 'file:///bar/baz', 'file:///foo'],
+            ['foo', 'file:///', 'file:///foo'],
+            ['foo', 'file:///bar/baz', 'file:///bar/foo'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
index e5f5cd7e236b6..7b17513ab1470 100644
--- a/src/Symfony/Component/Dotenv/Dotenv.php
+++ b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -107,12 +107,12 @@ public function populate($values)
     public function parse($data, $path = '.env')
     {
         $this->path = $path;
-        $this->data = str_replace(array("\r\n", "\r"), "\n", $data);
+        $this->data = str_replace(["\r\n", "\r"], "\n", $data);
         $this->lineno = 1;
         $this->cursor = 0;
         $this->end = \strlen($this->data);
         $this->state = self::STATE_VARNAME;
-        $this->values = array();
+        $this->values = [];
         $name = '';
 
         $this->skipEmptyLines();
@@ -138,7 +138,7 @@ public function parse($data, $path = '.env')
         try {
             return $this->values;
         } finally {
-            $this->values = array();
+            $this->values = [];
             $this->data = null;
             $this->path = null;
         }
@@ -224,7 +224,7 @@ private function lexValue()
                     throw $this->createFormatException('Missing quote to end the value');
                 }
                 ++$this->cursor;
-                $value = str_replace(array('\\"', '\r', '\n'), array('"', "\r", "\n"), $value);
+                $value = str_replace(['\\"', '\r', '\n'], ['"', "\r", "\n"], $value);
                 $resolvedValue = $value;
                 $resolvedValue = $this->resolveVariables($resolvedValue);
                 $resolvedValue = $this->resolveCommands($resolvedValue);
@@ -233,7 +233,7 @@ private function lexValue()
             } else {
                 $value = '';
                 $prevChr = $this->data[$this->cursor - 1];
-                while ($this->cursor < $this->end && !\in_array($this->data[$this->cursor], array("\n", '"', "'"), true) && !((' ' === $prevChr || "\t" === $prevChr) && '#' === $this->data[$this->cursor])) {
+                while ($this->cursor < $this->end && !\in_array($this->data[$this->cursor], ["\n", '"', "'"], true) && !((' ' === $prevChr || "\t" === $prevChr) && '#' === $this->data[$this->cursor])) {
                     if ('\\' === $this->data[$this->cursor] && isset($this->data[$this->cursor + 1]) && ('"' === $this->data[$this->cursor + 1] || "'" === $this->data[$this->cursor + 1])) {
                         ++$this->cursor;
                     }
diff --git a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php
index 332c20527b0d1..792ed2bf560ac 100644
--- a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php
+++ b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php
@@ -34,18 +34,18 @@ public function testParseWithFormatError($data, $error)
 
     public function getEnvDataWithFormatErrors()
     {
-        $tests = array(
-            array('FOO=BAR BAZ', "A value containing spaces must be surrounded by quotes in \".env\" at line 1.\n...FOO=BAR BAZ...\n             ^ line 1 offset 11"),
-            array('FOO BAR=BAR', "Whitespace are not supported after the variable name in \".env\" at line 1.\n...FOO BAR=BAR...\n     ^ line 1 offset 3"),
-            array('FOO', "Missing = in the environment variable declaration in \".env\" at line 1.\n...FOO...\n     ^ line 1 offset 3"),
-            array('FOO="foo', "Missing quote to end the value in \".env\" at line 1.\n...FOO=\"foo...\n          ^ line 1 offset 8"),
-            array('FOO=\'foo', "Missing quote to end the value in \".env\" at line 1.\n...FOO='foo...\n          ^ line 1 offset 8"),
-            array('export FOO', "Unable to unset an environment variable in \".env\" at line 1.\n...export FOO...\n            ^ line 1 offset 10"),
-            array('FOO=${FOO', "Unclosed braces on variable expansion in \".env\" at line 1.\n...FOO=\${FOO...\n           ^ line 1 offset 9"),
-        );
+        $tests = [
+            ['FOO=BAR BAZ', "A value containing spaces must be surrounded by quotes in \".env\" at line 1.\n...FOO=BAR BAZ...\n             ^ line 1 offset 11"],
+            ['FOO BAR=BAR', "Whitespace are not supported after the variable name in \".env\" at line 1.\n...FOO BAR=BAR...\n     ^ line 1 offset 3"],
+            ['FOO', "Missing = in the environment variable declaration in \".env\" at line 1.\n...FOO...\n     ^ line 1 offset 3"],
+            ['FOO="foo', "Missing quote to end the value in \".env\" at line 1.\n...FOO=\"foo...\n          ^ line 1 offset 8"],
+            ['FOO=\'foo', "Missing quote to end the value in \".env\" at line 1.\n...FOO='foo...\n          ^ line 1 offset 8"],
+            ['export FOO', "Unable to unset an environment variable in \".env\" at line 1.\n...export FOO...\n            ^ line 1 offset 10"],
+            ['FOO=${FOO', "Unclosed braces on variable expansion in \".env\" at line 1.\n...FOO=\${FOO...\n           ^ line 1 offset 9"],
+        ];
 
         if ('\\' !== \DIRECTORY_SEPARATOR) {
-            $tests[] = array('FOO=$((1dd2))', "Issue expanding a command (%s\n) in \".env\" at line 1.\n...FOO=$((1dd2))...\n               ^ line 1 offset 13");
+            $tests[] = ['FOO=$((1dd2))', "Issue expanding a command (%s\n) in \".env\" at line 1.\n...FOO=$((1dd2))...\n               ^ line 1 offset 13"];
         }
 
         return $tests;
@@ -65,104 +65,104 @@ public function getEnvData()
         putenv('LOCAL=local');
         $_ENV['REMOTE'] = 'remote';
 
-        $tests = array(
+        $tests = [
             // backslashes
-            array('FOO=foo\\\\bar', array('FOO' => 'foo\\bar')),
-            array("FOO='foo\\\\bar'", array('FOO' => 'foo\\\\bar')),
-            array('FOO="foo\\\\bar"', array('FOO' => 'foo\\bar')),
+            ['FOO=foo\\\\bar', ['FOO' => 'foo\\bar']],
+            ["FOO='foo\\\\bar'", ['FOO' => 'foo\\\\bar']],
+            ['FOO="foo\\\\bar"', ['FOO' => 'foo\\bar']],
 
             // escaped backslash in front of variable
-            array("BAR=bar\nFOO=foo\\\\\$BAR", array('BAR' => 'bar', 'FOO' => 'foo\\bar')),
-            array("BAR=bar\nFOO='foo\\\\\$BAR'", array('BAR' => 'bar', 'FOO' => 'foo\\\\$BAR')),
-            array("BAR=bar\nFOO=\"foo\\\\\$BAR\"", array('BAR' => 'bar', 'FOO' => 'foo\\bar')),
+            ["BAR=bar\nFOO=foo\\\\\$BAR", ['BAR' => 'bar', 'FOO' => 'foo\\bar']],
+            ["BAR=bar\nFOO='foo\\\\\$BAR'", ['BAR' => 'bar', 'FOO' => 'foo\\\\$BAR']],
+            ["BAR=bar\nFOO=\"foo\\\\\$BAR\"", ['BAR' => 'bar', 'FOO' => 'foo\\bar']],
 
-            array('FOO=foo\\\\\\$BAR', array('FOO' => 'foo\\$BAR')),
-            array('FOO=\'foo\\\\\\$BAR\'', array('FOO' => 'foo\\\\\\$BAR')),
-            array('FOO="foo\\\\\\$BAR"', array('FOO' => 'foo\\$BAR')),
+            ['FOO=foo\\\\\\$BAR', ['FOO' => 'foo\\$BAR']],
+            ['FOO=\'foo\\\\\\$BAR\'', ['FOO' => 'foo\\\\\\$BAR']],
+            ['FOO="foo\\\\\\$BAR"', ['FOO' => 'foo\\$BAR']],
 
             // spaces
-            array('FOO=bar', array('FOO' => 'bar')),
-            array(' FOO=bar ', array('FOO' => 'bar')),
-            array('FOO=', array('FOO' => '')),
-            array("FOO=\n\n\nBAR=bar", array('FOO' => '', 'BAR' => 'bar')),
-            array('FOO=  ', array('FOO' => '')),
-            array("FOO=\nBAR=bar", array('FOO' => '', 'BAR' => 'bar')),
+            ['FOO=bar', ['FOO' => 'bar']],
+            [' FOO=bar ', ['FOO' => 'bar']],
+            ['FOO=', ['FOO' => '']],
+            ["FOO=\n\n\nBAR=bar", ['FOO' => '', 'BAR' => 'bar']],
+            ['FOO=  ', ['FOO' => '']],
+            ["FOO=\nBAR=bar", ['FOO' => '', 'BAR' => 'bar']],
 
             // newlines
-            array("\n\nFOO=bar\r\n\n", array('FOO' => 'bar')),
-            array("FOO=bar\r\nBAR=foo", array('FOO' => 'bar', 'BAR' => 'foo')),
-            array("FOO=bar\rBAR=foo", array('FOO' => 'bar', 'BAR' => 'foo')),
-            array("FOO=bar\nBAR=foo", array('FOO' => 'bar', 'BAR' => 'foo')),
+            ["\n\nFOO=bar\r\n\n", ['FOO' => 'bar']],
+            ["FOO=bar\r\nBAR=foo", ['FOO' => 'bar', 'BAR' => 'foo']],
+            ["FOO=bar\rBAR=foo", ['FOO' => 'bar', 'BAR' => 'foo']],
+            ["FOO=bar\nBAR=foo", ['FOO' => 'bar', 'BAR' => 'foo']],
 
             // quotes
-            array("FOO=\"bar\"\n", array('FOO' => 'bar')),
-            array("FOO=\"bar'foo\"\n", array('FOO' => 'bar\'foo')),
-            array("FOO='bar'\n", array('FOO' => 'bar')),
-            array("FOO='bar\"foo'\n", array('FOO' => 'bar"foo')),
-            array("FOO=\"bar\\\"foo\"\n", array('FOO' => 'bar"foo')),
-            array('FOO="bar\nfoo"', array('FOO' => "bar\nfoo")),
-            array('FOO="bar\rfoo"', array('FOO' => "bar\rfoo")),
-            array('FOO=\'bar\nfoo\'', array('FOO' => 'bar\nfoo')),
-            array('FOO=\'bar\rfoo\'', array('FOO' => 'bar\rfoo')),
-            array('FOO=" FOO "', array('FOO' => ' FOO ')),
-            array('FOO="  "', array('FOO' => '  ')),
-            array('PATH="c:\\\\"', array('PATH' => 'c:\\')),
-            array("FOO=\"bar\nfoo\"", array('FOO' => "bar\nfoo")),
-            array('FOO=BAR\\"', array('FOO' => 'BAR"')),
-            array("FOO=BAR\\'BAZ", array('FOO' => "BAR'BAZ")),
-            array('FOO=\\"BAR', array('FOO' => '"BAR')),
+            ["FOO=\"bar\"\n", ['FOO' => 'bar']],
+            ["FOO=\"bar'foo\"\n", ['FOO' => 'bar\'foo']],
+            ["FOO='bar'\n", ['FOO' => 'bar']],
+            ["FOO='bar\"foo'\n", ['FOO' => 'bar"foo']],
+            ["FOO=\"bar\\\"foo\"\n", ['FOO' => 'bar"foo']],
+            ['FOO="bar\nfoo"', ['FOO' => "bar\nfoo"]],
+            ['FOO="bar\rfoo"', ['FOO' => "bar\rfoo"]],
+            ['FOO=\'bar\nfoo\'', ['FOO' => 'bar\nfoo']],
+            ['FOO=\'bar\rfoo\'', ['FOO' => 'bar\rfoo']],
+            ['FOO=" FOO "', ['FOO' => ' FOO ']],
+            ['FOO="  "', ['FOO' => '  ']],
+            ['PATH="c:\\\\"', ['PATH' => 'c:\\']],
+            ["FOO=\"bar\nfoo\"", ['FOO' => "bar\nfoo"]],
+            ['FOO=BAR\\"', ['FOO' => 'BAR"']],
+            ["FOO=BAR\\'BAZ", ['FOO' => "BAR'BAZ"]],
+            ['FOO=\\"BAR', ['FOO' => '"BAR']],
 
             // concatenated values
-            array("FOO='bar''foo'\n", array('FOO' => 'barfoo')),
-            array("FOO='bar '' baz'", array('FOO' => 'bar  baz')),
-            array("FOO=bar\nBAR='baz'\"\$FOO\"", array('FOO' => 'bar', 'BAR' => 'bazbar')),
-            array("FOO='bar '\\'' baz'", array('FOO' => "bar ' baz")),
+            ["FOO='bar''foo'\n", ['FOO' => 'barfoo']],
+            ["FOO='bar '' baz'", ['FOO' => 'bar  baz']],
+            ["FOO=bar\nBAR='baz'\"\$FOO\"", ['FOO' => 'bar', 'BAR' => 'bazbar']],
+            ["FOO='bar '\\'' baz'", ['FOO' => "bar ' baz"]],
 
             // comments
-            array("#FOO=bar\nBAR=foo", array('BAR' => 'foo')),
-            array("#FOO=bar # Comment\nBAR=foo", array('BAR' => 'foo')),
-            array("FOO='bar foo' # Comment", array('FOO' => 'bar foo')),
-            array("FOO='bar#foo' # Comment", array('FOO' => 'bar#foo')),
-            array("# Comment\r\nFOO=bar\n# Comment\nBAR=foo", array('FOO' => 'bar', 'BAR' => 'foo')),
-            array("FOO=bar # Another comment\nBAR=foo", array('FOO' => 'bar', 'BAR' => 'foo')),
-            array("FOO=\n\n# comment\nBAR=bar", array('FOO' => '', 'BAR' => 'bar')),
-            array('FOO=NOT#COMMENT', array('FOO' => 'NOT#COMMENT')),
-            array('FOO=  # Comment', array('FOO' => '')),
+            ["#FOO=bar\nBAR=foo", ['BAR' => 'foo']],
+            ["#FOO=bar # Comment\nBAR=foo", ['BAR' => 'foo']],
+            ["FOO='bar foo' # Comment", ['FOO' => 'bar foo']],
+            ["FOO='bar#foo' # Comment", ['FOO' => 'bar#foo']],
+            ["# Comment\r\nFOO=bar\n# Comment\nBAR=foo", ['FOO' => 'bar', 'BAR' => 'foo']],
+            ["FOO=bar # Another comment\nBAR=foo", ['FOO' => 'bar', 'BAR' => 'foo']],
+            ["FOO=\n\n# comment\nBAR=bar", ['FOO' => '', 'BAR' => 'bar']],
+            ['FOO=NOT#COMMENT', ['FOO' => 'NOT#COMMENT']],
+            ['FOO=  # Comment', ['FOO' => '']],
 
             // edge cases (no conversions, only strings as values)
-            array('FOO=0', array('FOO' => '0')),
-            array('FOO=false', array('FOO' => 'false')),
-            array('FOO=null', array('FOO' => 'null')),
+            ['FOO=0', ['FOO' => '0']],
+            ['FOO=false', ['FOO' => 'false']],
+            ['FOO=null', ['FOO' => 'null']],
 
             // export
-            array('export FOO=bar', array('FOO' => 'bar')),
-            array('  export   FOO=bar', array('FOO' => 'bar')),
+            ['export FOO=bar', ['FOO' => 'bar']],
+            ['  export   FOO=bar', ['FOO' => 'bar']],
 
             // variable expansion
-            array("FOO=BAR\nBAR=\$FOO", array('FOO' => 'BAR', 'BAR' => 'BAR')),
-            array("FOO=BAR\nBAR=\"\$FOO\"", array('FOO' => 'BAR', 'BAR' => 'BAR')),
-            array("FOO=BAR\nBAR='\$FOO'", array('FOO' => 'BAR', 'BAR' => '$FOO')),
-            array("FOO_BAR9=BAR\nBAR=\$FOO_BAR9", array('FOO_BAR9' => 'BAR', 'BAR' => 'BAR')),
-            array("FOO=BAR\nBAR=\${FOO}Z", array('FOO' => 'BAR', 'BAR' => 'BARZ')),
-            array("FOO=BAR\nBAR=\$FOO}", array('FOO' => 'BAR', 'BAR' => 'BAR}')),
-            array("FOO=BAR\nBAR=\\\$FOO", array('FOO' => 'BAR', 'BAR' => '$FOO')),
-            array('FOO=" \\$ "', array('FOO' => ' $ ')),
-            array('FOO=" $ "', array('FOO' => ' $ ')),
-            array('BAR=$LOCAL', array('BAR' => 'local')),
-            array('BAR=$REMOTE', array('BAR' => 'remote')),
-            array('FOO=$NOTDEFINED', array('FOO' => '')),
-        );
+            ["FOO=BAR\nBAR=\$FOO", ['FOO' => 'BAR', 'BAR' => 'BAR']],
+            ["FOO=BAR\nBAR=\"\$FOO\"", ['FOO' => 'BAR', 'BAR' => 'BAR']],
+            ["FOO=BAR\nBAR='\$FOO'", ['FOO' => 'BAR', 'BAR' => '$FOO']],
+            ["FOO_BAR9=BAR\nBAR=\$FOO_BAR9", ['FOO_BAR9' => 'BAR', 'BAR' => 'BAR']],
+            ["FOO=BAR\nBAR=\${FOO}Z", ['FOO' => 'BAR', 'BAR' => 'BARZ']],
+            ["FOO=BAR\nBAR=\$FOO}", ['FOO' => 'BAR', 'BAR' => 'BAR}']],
+            ["FOO=BAR\nBAR=\\\$FOO", ['FOO' => 'BAR', 'BAR' => '$FOO']],
+            ['FOO=" \\$ "', ['FOO' => ' $ ']],
+            ['FOO=" $ "', ['FOO' => ' $ ']],
+            ['BAR=$LOCAL', ['BAR' => 'local']],
+            ['BAR=$REMOTE', ['BAR' => 'remote']],
+            ['FOO=$NOTDEFINED', ['FOO' => '']],
+        ];
 
         if ('\\' !== \DIRECTORY_SEPARATOR) {
-            $tests = array_merge($tests, array(
+            $tests = array_merge($tests, [
                 // command expansion
-                array('FOO=$(echo foo)', array('FOO' => 'foo')),
-                array('FOO=$((1+2))', array('FOO' => '3')),
-                array('FOO=FOO$((1+2))BAR', array('FOO' => 'FOO3BAR')),
-                array('FOO=$(echo "$(echo "$(echo "$(echo foo)")")")', array('FOO' => 'foo')),
-                array("FOO=$(echo \"Quotes won't be a problem\")", array('FOO' => 'Quotes won\'t be a problem')),
-                array("FOO=bar\nBAR=$(echo \"FOO is \$FOO\")", array('FOO' => 'bar', 'BAR' => 'FOO is bar')),
-            ));
+                ['FOO=$(echo foo)', ['FOO' => 'foo']],
+                ['FOO=$((1+2))', ['FOO' => '3']],
+                ['FOO=FOO$((1+2))BAR', ['FOO' => 'FOO3BAR']],
+                ['FOO=$(echo "$(echo "$(echo "$(echo foo)")")")', ['FOO' => 'foo']],
+                ["FOO=$(echo \"Quotes won't be a problem\")", ['FOO' => 'Quotes won\'t be a problem']],
+                ["FOO=bar\nBAR=$(echo \"FOO is \$FOO\")", ['FOO' => 'bar', 'BAR' => 'FOO is bar']],
+            ]);
         }
 
         return $tests;
@@ -214,7 +214,7 @@ public function testServerSuperglobalIsNotOverriden()
         $originalValue = $_SERVER['argc'];
 
         $dotenv = new Dotenv();
-        $dotenv->populate(array('argc' => 'new_value'));
+        $dotenv->populate(['argc' => 'new_value']);
 
         $this->assertSame($originalValue, $_SERVER['argc']);
     }
@@ -225,7 +225,7 @@ public function testEnvVarIsNotOverriden()
         $_SERVER['TEST_ENV_VAR'] = 'original_value';
 
         $dotenv = new Dotenv();
-        $dotenv->populate(array('TEST_ENV_VAR' => 'new_value'));
+        $dotenv->populate(['TEST_ENV_VAR' => 'new_value']);
 
         $this->assertSame('original_value', getenv('TEST_ENV_VAR'));
     }
@@ -235,7 +235,7 @@ public function testHttpVarIsPartiallyOverriden()
         $_SERVER['HTTP_TEST_ENV_VAR'] = 'http_value';
 
         $dotenv = new Dotenv();
-        $dotenv->populate(array('HTTP_TEST_ENV_VAR' => 'env_value'));
+        $dotenv->populate(['HTTP_TEST_ENV_VAR' => 'env_value']);
 
         $this->assertSame('env_value', getenv('HTTP_TEST_ENV_VAR'));
         $this->assertSame('env_value', $_ENV['HTTP_TEST_ENV_VAR']);
@@ -257,7 +257,7 @@ public function testMemorizingLoadedVarsNamesInSpecialVar()
         putenv('DATABASE_URL');
 
         $dotenv = new Dotenv();
-        $dotenv->populate(array('APP_DEBUG' => '1', 'DATABASE_URL' => 'mysql://root@localhost/db'));
+        $dotenv->populate(['APP_DEBUG' => '1', 'DATABASE_URL' => 'mysql://root@localhost/db']);
 
         $this->assertSame('APP_DEBUG,DATABASE_URL', getenv('SYMFONY_DOTENV_VARS'));
 
@@ -274,8 +274,8 @@ public function testMemorizingLoadedVarsNamesInSpecialVar()
         putenv('DATABASE_URL');
 
         $dotenv = new Dotenv();
-        $dotenv->populate(array('APP_DEBUG' => '0', 'DATABASE_URL' => 'mysql://root@localhost/db'));
-        $dotenv->populate(array('DATABASE_URL' => 'sqlite:///somedb.sqlite'));
+        $dotenv->populate(['APP_DEBUG' => '0', 'DATABASE_URL' => 'mysql://root@localhost/db']);
+        $dotenv->populate(['DATABASE_URL' => 'sqlite:///somedb.sqlite']);
 
         $this->assertSame('APP_ENV,DATABASE_URL', getenv('SYMFONY_DOTENV_VARS'));
     }
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
index 967bb9fba10ee..6a4e474e381cf 100644
--- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
@@ -158,7 +158,7 @@ public function dispatch($eventName, Event $event = null)
      */
     public function getCalledListeners()
     {
-        $called = array();
+        $called = [];
         foreach ($this->called as $eventName => $listeners) {
             foreach ($listeners as $listener) {
                 $called[$eventName.'.'.$listener->getPretty()] = $listener->getInfo($eventName);
@@ -177,14 +177,14 @@ public function getNotCalledListeners()
             $allListeners = $this->getListeners();
         } catch (\Exception $e) {
             if (null !== $this->logger) {
-                $this->logger->info('An exception was thrown while getting the uncalled listeners.', array('exception' => $e));
+                $this->logger->info('An exception was thrown while getting the uncalled listeners.', ['exception' => $e]);
             }
 
             // unable to retrieve the uncalled listeners
-            return array();
+            return [];
         }
 
-        $notCalled = array();
+        $notCalled = [];
         foreach ($allListeners as $eventName => $listeners) {
             foreach ($listeners as $listener) {
                 $called = false;
@@ -275,7 +275,7 @@ private function postProcess($eventName)
             $this->dispatcher->addListener($eventName, $listener->getWrappedListener(), $priority);
 
             if (null !== $this->logger) {
-                $context = array('event' => $eventName, 'listener' => $listener->getPretty());
+                $context = ['event' => $eventName, 'listener' => $listener->getPretty()];
             }
 
             if ($listener->wasCalled()) {
diff --git a/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php b/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php
index d49f69de72502..c90ac927b2c84 100644
--- a/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php
+++ b/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php
@@ -94,12 +94,12 @@ public function getInfo($eventName)
             $this->stub = self::$hasClassStub ? new ClassStub($this->pretty.'()', $this->listener) : $this->pretty.'()';
         }
 
-        return array(
+        return [
             'event' => $eventName,
             'priority' => null !== $this->dispatcher ? $this->dispatcher->getListenerPriority($eventName, $this->listener) : null,
             'pretty' => $this->pretty,
             'stub' => $this->stub,
-        );
+        ];
     }
 
     public function __invoke(Event $event, $eventName, EventDispatcherInterface $dispatcher)
diff --git a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
index a6fcde33ad972..b294b247013ca 100644
--- a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
+++ b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
@@ -28,7 +28,7 @@ class RegisterListenersPass implements CompilerPassInterface
     protected $listenerTag;
     protected $subscriberTag;
 
-    private $hotPathEvents = array();
+    private $hotPathEvents = [];
     private $hotPathTagName;
 
     /**
@@ -102,14 +102,14 @@ public function process(ContainerBuilder $container)
             ExtractingEventDispatcher::$subscriber = $class;
             $extractingDispatcher->addSubscriber($extractingDispatcher);
             foreach ($extractingDispatcher->listeners as $args) {
-                $args[1] = array(new ServiceClosureArgument(new Reference($id)), $args[1]);
+                $args[1] = [new ServiceClosureArgument(new Reference($id)), $args[1]];
                 $definition->addMethodCall('addListener', $args);
 
                 if (isset($this->hotPathEvents[$args[0]])) {
                     $container->getDefinition($id)->addTag('container.hot_path');
                 }
             }
-            $extractingDispatcher->listeners = array();
+            $extractingDispatcher->listeners = [];
         }
     }
 }
@@ -119,18 +119,18 @@ public function process(ContainerBuilder $container)
  */
 class ExtractingEventDispatcher extends EventDispatcher implements EventSubscriberInterface
 {
-    public $listeners = array();
+    public $listeners = [];
 
     public static $subscriber;
 
     public function addListener($eventName, $listener, $priority = 0)
     {
-        $this->listeners[] = array($eventName, $listener[1], $priority);
+        $this->listeners[] = [$eventName, $listener[1], $priority];
     }
 
     public static function getSubscribedEvents()
     {
-        $callback = array(self::$subscriber, 'getSubscribedEvents');
+        $callback = [self::$subscriber, 'getSubscribedEvents'];
 
         return $callback();
     }
diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcher.php b/src/Symfony/Component/EventDispatcher/EventDispatcher.php
index 4e75c63e4fafb..41a9048b9c05a 100644
--- a/src/Symfony/Component/EventDispatcher/EventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/EventDispatcher.php
@@ -54,7 +54,7 @@ public function getListeners($eventName = null)
     {
         if (null !== $eventName) {
             if (empty($this->listeners[$eventName])) {
-                return array();
+                return [];
             }
 
             if (!isset($this->sorted[$eventName])) {
@@ -166,12 +166,12 @@ public function addSubscriber(EventSubscriberInterface $subscriber)
     {
         foreach ($subscriber->getSubscribedEvents() as $eventName => $params) {
             if (\is_string($params)) {
-                $this->addListener($eventName, array($subscriber, $params));
+                $this->addListener($eventName, [$subscriber, $params]);
             } elseif (\is_string($params[0])) {
-                $this->addListener($eventName, array($subscriber, $params[0]), isset($params[1]) ? $params[1] : 0);
+                $this->addListener($eventName, [$subscriber, $params[0]], isset($params[1]) ? $params[1] : 0);
             } else {
                 foreach ($params as $listener) {
-                    $this->addListener($eventName, array($subscriber, $listener[0]), isset($listener[1]) ? $listener[1] : 0);
+                    $this->addListener($eventName, [$subscriber, $listener[0]], isset($listener[1]) ? $listener[1] : 0);
                 }
             }
         }
@@ -185,10 +185,10 @@ public function removeSubscriber(EventSubscriberInterface $subscriber)
         foreach ($subscriber->getSubscribedEvents() as $eventName => $params) {
             if (\is_array($params) && \is_array($params[0])) {
                 foreach ($params as $listener) {
-                    $this->removeListener($eventName, array($subscriber, $listener[0]));
+                    $this->removeListener($eventName, [$subscriber, $listener[0]]);
                 }
             } else {
-                $this->removeListener($eventName, array($subscriber, \is_string($params) ? $params : $params[0]));
+                $this->removeListener($eventName, [$subscriber, \is_string($params) ? $params : $params[0]]);
             }
         }
     }
@@ -221,7 +221,7 @@ protected function doDispatch($listeners, $eventName, Event $event)
     private function sortListeners($eventName)
     {
         krsort($this->listeners[$eventName]);
-        $this->sorted[$eventName] = array();
+        $this->sorted[$eventName] = [];
 
         foreach ($this->listeners[$eventName] as $priority => $listeners) {
             foreach ($listeners as $k => $listener) {
diff --git a/src/Symfony/Component/EventDispatcher/GenericEvent.php b/src/Symfony/Component/EventDispatcher/GenericEvent.php
index f0be7e18ff3c3..58d16920d5e2d 100644
--- a/src/Symfony/Component/EventDispatcher/GenericEvent.php
+++ b/src/Symfony/Component/EventDispatcher/GenericEvent.php
@@ -29,7 +29,7 @@ class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate
      * @param mixed $subject   The subject of the event, usually an object or a callable
      * @param array $arguments Arguments to store in the event
      */
-    public function __construct($subject = null, array $arguments = array())
+    public function __construct($subject = null, array $arguments = [])
     {
         $this->subject = $subject;
         $this->arguments = $arguments;
diff --git a/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php b/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
index d7c5ce18ccca0..3677b62b3b8a2 100644
--- a/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
+++ b/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
@@ -98,7 +98,7 @@ public function testAddRemoveSubscriber()
         $tdispatcher->addSubscriber($subscriber);
         $listeners = $dispatcher->getListeners('foo');
         $this->assertCount(1, $listeners);
-        $this->assertSame(array($subscriber, 'call'), $listeners[0]);
+        $this->assertSame([$subscriber, 'call'], $listeners[0]);
 
         $tdispatcher->removeSubscriber($subscriber);
         $this->assertCount(0, $dispatcher->getListeners('foo'));
@@ -112,16 +112,16 @@ public function testGetCalledListeners()
         $listeners = $tdispatcher->getNotCalledListeners();
         $this->assertArrayHasKey('stub', $listeners['foo.closure']);
         unset($listeners['foo.closure']['stub']);
-        $this->assertEquals(array(), $tdispatcher->getCalledListeners());
-        $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'pretty' => 'closure', 'priority' => 5)), $listeners);
+        $this->assertEquals([], $tdispatcher->getCalledListeners());
+        $this->assertEquals(['foo.closure' => ['event' => 'foo', 'pretty' => 'closure', 'priority' => 5]], $listeners);
 
         $tdispatcher->dispatch('foo');
 
         $listeners = $tdispatcher->getCalledListeners();
         $this->assertArrayHasKey('stub', $listeners['foo.closure']);
         unset($listeners['foo.closure']['stub']);
-        $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'pretty' => 'closure', 'priority' => 5)), $listeners);
-        $this->assertEquals(array(), $tdispatcher->getNotCalledListeners());
+        $this->assertEquals(['foo.closure' => ['event' => 'foo', 'pretty' => 'closure', 'priority' => 5]], $listeners);
+        $this->assertEquals([], $tdispatcher->getNotCalledListeners());
     }
 
     public function testClearCalledListeners()
@@ -135,8 +135,8 @@ public function testClearCalledListeners()
         $listeners = $tdispatcher->getNotCalledListeners();
         $this->assertArrayHasKey('stub', $listeners['foo.closure']);
         unset($listeners['foo.closure']['stub']);
-        $this->assertEquals(array(), $tdispatcher->getCalledListeners());
-        $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'pretty' => 'closure', 'priority' => 5)), $listeners);
+        $this->assertEquals([], $tdispatcher->getCalledListeners());
+        $this->assertEquals(['foo.closure' => ['event' => 'foo', 'pretty' => 'closure', 'priority' => 5]], $listeners);
     }
 
     public function testGetCalledListenersNested()
@@ -162,8 +162,8 @@ public function testLogger()
         $tdispatcher->addListener('foo', $listener1 = function () {});
         $tdispatcher->addListener('foo', $listener2 = function () {});
 
-        $logger->expects($this->at(0))->method('debug')->with('Notified event "{event}" to listener "{listener}".', array('event' => 'foo', 'listener' => 'closure'));
-        $logger->expects($this->at(1))->method('debug')->with('Notified event "{event}" to listener "{listener}".', array('event' => 'foo', 'listener' => 'closure'));
+        $logger->expects($this->at(0))->method('debug')->with('Notified event "{event}" to listener "{listener}".', ['event' => 'foo', 'listener' => 'closure']);
+        $logger->expects($this->at(1))->method('debug')->with('Notified event "{event}" to listener "{listener}".', ['event' => 'foo', 'listener' => 'closure']);
 
         $tdispatcher->dispatch('foo');
     }
@@ -177,16 +177,16 @@ public function testLoggerWithStoppedEvent()
         $tdispatcher->addListener('foo', $listener1 = function (Event $event) { $event->stopPropagation(); });
         $tdispatcher->addListener('foo', $listener2 = function () {});
 
-        $logger->expects($this->at(0))->method('debug')->with('Notified event "{event}" to listener "{listener}".', array('event' => 'foo', 'listener' => 'closure'));
-        $logger->expects($this->at(1))->method('debug')->with('Listener "{listener}" stopped propagation of the event "{event}".', array('event' => 'foo', 'listener' => 'closure'));
-        $logger->expects($this->at(2))->method('debug')->with('Listener "{listener}" was not called for event "{event}".', array('event' => 'foo', 'listener' => 'closure'));
+        $logger->expects($this->at(0))->method('debug')->with('Notified event "{event}" to listener "{listener}".', ['event' => 'foo', 'listener' => 'closure']);
+        $logger->expects($this->at(1))->method('debug')->with('Listener "{listener}" stopped propagation of the event "{event}".', ['event' => 'foo', 'listener' => 'closure']);
+        $logger->expects($this->at(2))->method('debug')->with('Listener "{listener}" was not called for event "{event}".', ['event' => 'foo', 'listener' => 'closure']);
 
         $tdispatcher->dispatch('foo');
     }
 
     public function testDispatchCallListeners()
     {
-        $called = array();
+        $called = [];
 
         $dispatcher = new EventDispatcher();
         $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch());
@@ -195,7 +195,7 @@ public function testDispatchCallListeners()
 
         $tdispatcher->dispatch('foo');
 
-        $this->assertSame(array('foo2', 'foo1'), $called);
+        $this->assertSame(['foo2', 'foo1'], $called);
     }
 
     public function testDispatchNested()
@@ -252,6 +252,6 @@ class EventSubscriber implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
-        return array('foo' => 'call');
+        return ['foo' => 'call'];
     }
 }
diff --git a/src/Symfony/Component/EventDispatcher/Tests/Debug/WrappedListenerTest.php b/src/Symfony/Component/EventDispatcher/Tests/Debug/WrappedListenerTest.php
index f743f148d2d21..258938ed9b009 100644
--- a/src/Symfony/Component/EventDispatcher/Tests/Debug/WrappedListenerTest.php
+++ b/src/Symfony/Component/EventDispatcher/Tests/Debug/WrappedListenerTest.php
@@ -30,18 +30,18 @@ public function testListenerDescription(callable $listener, $expected)
 
     public function provideListenersToDescribe()
     {
-        $listeners = array(
-            array(new FooListener(), 'Symfony\Component\EventDispatcher\Tests\Debug\FooListener::__invoke'),
-            array(array(new FooListener(), 'listen'), 'Symfony\Component\EventDispatcher\Tests\Debug\FooListener::listen'),
-            array(array('Symfony\Component\EventDispatcher\Tests\Debug\FooListener', 'listenStatic'), 'Symfony\Component\EventDispatcher\Tests\Debug\FooListener::listenStatic'),
-            array('var_dump', 'var_dump'),
-            array(function () {}, 'closure'),
-        );
+        $listeners = [
+            [new FooListener(), 'Symfony\Component\EventDispatcher\Tests\Debug\FooListener::__invoke'],
+            [[new FooListener(), 'listen'], 'Symfony\Component\EventDispatcher\Tests\Debug\FooListener::listen'],
+            [['Symfony\Component\EventDispatcher\Tests\Debug\FooListener', 'listenStatic'], 'Symfony\Component\EventDispatcher\Tests\Debug\FooListener::listenStatic'],
+            ['var_dump', 'var_dump'],
+            [function () {}, 'closure'],
+        ];
 
         if (\PHP_VERSION_ID >= 70100) {
-            $listeners[] = array(\Closure::fromCallable(array(new FooListener(), 'listen')), 'Symfony\Component\EventDispatcher\Tests\Debug\FooListener::listen');
-            $listeners[] = array(\Closure::fromCallable(array('Symfony\Component\EventDispatcher\Tests\Debug\FooListener', 'listenStatic')), 'Symfony\Component\EventDispatcher\Tests\Debug\FooListener::listenStatic');
-            $listeners[] = array(\Closure::fromCallable(function () {}), 'closure');
+            $listeners[] = [\Closure::fromCallable([new FooListener(), 'listen']), 'Symfony\Component\EventDispatcher\Tests\Debug\FooListener::listen'];
+            $listeners[] = [\Closure::fromCallable(['Symfony\Component\EventDispatcher\Tests\Debug\FooListener', 'listenStatic']), 'Symfony\Component\EventDispatcher\Tests\Debug\FooListener::listenStatic'];
+            $listeners[] = [\Closure::fromCallable(function () {}), 'closure'];
         }
 
         return $listeners;
diff --git a/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php b/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
index c1b49f75b8a47..801471b47b6e3 100644
--- a/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
+++ b/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
@@ -38,9 +38,9 @@ public function testEventSubscriberWithoutInterface()
 
     public function testValidEventSubscriber()
     {
-        $services = array(
-            'my_event_subscriber' => array(0 => array()),
-        );
+        $services = [
+            'my_event_subscriber' => [0 => []],
+        ];
 
         $builder = new ContainerBuilder();
         $eventDispatcherDefinition = $builder->register('event_dispatcher');
@@ -50,16 +50,16 @@ public function testValidEventSubscriber()
         $registerListenersPass = new RegisterListenersPass();
         $registerListenersPass->process($builder);
 
-        $expectedCalls = array(
-            array(
+        $expectedCalls = [
+            [
                 'addListener',
-                array(
+                [
                     'event',
-                    array(new ServiceClosureArgument(new Reference('my_event_subscriber')), 'onEvent'),
+                    [new ServiceClosureArgument(new Reference('my_event_subscriber')), 'onEvent'],
                     0,
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
         $this->assertEquals($expectedCalls, $eventDispatcherDefinition->getMethodCalls());
     }
 
@@ -70,7 +70,7 @@ public function testValidEventSubscriber()
     public function testAbstractEventListener()
     {
         $container = new ContainerBuilder();
-        $container->register('foo', 'stdClass')->setAbstract(true)->addTag('kernel.event_listener', array());
+        $container->register('foo', 'stdClass')->setAbstract(true)->addTag('kernel.event_listener', []);
         $container->register('event_dispatcher', 'stdClass');
 
         $registerListenersPass = new RegisterListenersPass();
@@ -84,7 +84,7 @@ public function testAbstractEventListener()
     public function testAbstractEventSubscriber()
     {
         $container = new ContainerBuilder();
-        $container->register('foo', 'stdClass')->setAbstract(true)->addTag('kernel.event_subscriber', array());
+        $container->register('foo', 'stdClass')->setAbstract(true)->addTag('kernel.event_subscriber', []);
         $container->register('event_dispatcher', 'stdClass');
 
         $registerListenersPass = new RegisterListenersPass();
@@ -96,23 +96,23 @@ public function testEventSubscriberResolvableClassName()
         $container = new ContainerBuilder();
 
         $container->setParameter('subscriber.class', 'Symfony\Component\EventDispatcher\Tests\DependencyInjection\SubscriberService');
-        $container->register('foo', '%subscriber.class%')->addTag('kernel.event_subscriber', array());
+        $container->register('foo', '%subscriber.class%')->addTag('kernel.event_subscriber', []);
         $container->register('event_dispatcher', 'stdClass');
 
         $registerListenersPass = new RegisterListenersPass();
         $registerListenersPass->process($container);
 
         $definition = $container->getDefinition('event_dispatcher');
-        $expectedCalls = array(
-            array(
+        $expectedCalls = [
+            [
                 'addListener',
-                array(
+                [
                     'event',
-                    array(new ServiceClosureArgument(new Reference('foo')), 'onEvent'),
+                    [new ServiceClosureArgument(new Reference('foo')), 'onEvent'],
                     0,
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
         $this->assertEquals($expectedCalls, $definition->getMethodCalls());
     }
 
@@ -120,10 +120,10 @@ public function testHotPathEvents()
     {
         $container = new ContainerBuilder();
 
-        $container->register('foo', SubscriberService::class)->addTag('kernel.event_subscriber', array());
+        $container->register('foo', SubscriberService::class)->addTag('kernel.event_subscriber', []);
         $container->register('event_dispatcher', 'stdClass');
 
-        (new RegisterListenersPass())->setHotPathEvents(array('event'))->process($container);
+        (new RegisterListenersPass())->setHotPathEvents(['event'])->process($container);
 
         $this->assertTrue($container->getDefinition('foo')->hasTag('container.hot_path'));
     }
@@ -135,7 +135,7 @@ public function testHotPathEvents()
     public function testEventSubscriberUnresolvableClassName()
     {
         $container = new ContainerBuilder();
-        $container->register('foo', '%subscriber.class%')->addTag('kernel.event_subscriber', array());
+        $container->register('foo', '%subscriber.class%')->addTag('kernel.event_subscriber', []);
         $container->register('event_dispatcher', 'stdClass');
 
         $registerListenersPass = new RegisterListenersPass();
@@ -147,8 +147,8 @@ class SubscriberService implements \Symfony\Component\EventDispatcher\EventSubsc
 {
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             'event' => 'onEvent',
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php b/src/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php
index b63f69df1456f..461f86161e067 100644
--- a/src/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php
+++ b/src/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php
@@ -32,7 +32,7 @@ class GenericEventTest extends TestCase
     protected function setUp()
     {
         $this->subject = new \stdClass();
-        $this->event = new GenericEvent($this->subject, array('name' => 'Event'));
+        $this->event = new GenericEvent($this->subject, ['name' => 'Event']);
     }
 
     /**
@@ -46,7 +46,7 @@ protected function tearDown()
 
     public function testConstruct()
     {
-        $this->assertEquals($this->event, new GenericEvent($this->subject, array('name' => 'Event')));
+        $this->assertEquals($this->event, new GenericEvent($this->subject, ['name' => 'Event']));
     }
 
     /**
@@ -55,20 +55,20 @@ public function testConstruct()
     public function testGetArguments()
     {
         // test getting all
-        $this->assertSame(array('name' => 'Event'), $this->event->getArguments());
+        $this->assertSame(['name' => 'Event'], $this->event->getArguments());
     }
 
     public function testSetArguments()
     {
-        $result = $this->event->setArguments(array('foo' => 'bar'));
-        $this->assertAttributeSame(array('foo' => 'bar'), 'arguments', $this->event);
+        $result = $this->event->setArguments(['foo' => 'bar']);
+        $this->assertAttributeSame(['foo' => 'bar'], 'arguments', $this->event);
         $this->assertSame($this->event, $result);
     }
 
     public function testSetArgument()
     {
         $result = $this->event->setArgument('foo2', 'bar2');
-        $this->assertAttributeSame(array('name' => 'Event', 'foo2' => 'bar2'), 'arguments', $this->event);
+        $this->assertAttributeSame(['name' => 'Event', 'foo2' => 'bar2'], 'arguments', $this->event);
         $this->assertEquals($this->event, $result);
     }
 
@@ -99,13 +99,13 @@ public function testOffsetGet()
     public function testOffsetSet()
     {
         $this->event['foo2'] = 'bar2';
-        $this->assertAttributeSame(array('name' => 'Event', 'foo2' => 'bar2'), 'arguments', $this->event);
+        $this->assertAttributeSame(['name' => 'Event', 'foo2' => 'bar2'], 'arguments', $this->event);
     }
 
     public function testOffsetUnset()
     {
         unset($this->event['name']);
-        $this->assertAttributeSame(array(), 'arguments', $this->event);
+        $this->assertAttributeSame([], 'arguments', $this->event);
     }
 
     public function testOffsetIsset()
@@ -127,10 +127,10 @@ public function testGetSubject()
 
     public function testHasIterator()
     {
-        $data = array();
+        $data = [];
         foreach ($this->event as $key => $value) {
             $data[$key] = $value;
         }
-        $this->assertEquals(array('name' => 'Event'), $data);
+        $this->assertEquals(['name' => 'Event'], $data);
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
index 20e8386f4190f..b95147bb2c38b 100644
--- a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
+++ b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
@@ -60,7 +60,7 @@ public function __construct($cache = null, array $providers = array())
      *
      * @return string The compiled PHP source code
      */
-    public function compile($expression, $names = array())
+    public function compile($expression, $names = [])
     {
         return $this->getCompiler()->compile($this->parse($expression, $names)->getNodes())->getSource();
     }
@@ -73,7 +73,7 @@ public function compile($expression, $names = array())
      *
      * @return mixed The result of the evaluation of the expression
      */
-    public function evaluate($expression, $values = array())
+    public function evaluate($expression, $values = [])
     {
         return $this->parse($expression, array_keys($values))->getNodes()->evaluate($this->functions, $values);
     }
@@ -93,7 +93,7 @@ public function parse($expression, $names)
         }
 
         asort($names);
-        $cacheKeyItems = array();
+        $cacheKeyItems = [];
 
         foreach ($names as $nameKey => $name) {
             $cacheKeyItems[] = \is_int($nameKey) ? $name : $nameKey.':'.$name;
@@ -129,7 +129,7 @@ public function register($name, callable $compiler, callable $evaluator)
             throw new \LogicException('Registering functions after calling evaluate(), compile() or parse() is not supported.');
         }
 
-        $this->functions[$name] = array('compiler' => $compiler, 'evaluator' => $evaluator);
+        $this->functions[$name] = ['compiler' => $compiler, 'evaluator' => $evaluator];
     }
 
     public function addFunction(ExpressionFunction $function)
diff --git a/src/Symfony/Component/ExpressionLanguage/Lexer.php b/src/Symfony/Component/ExpressionLanguage/Lexer.php
index bd54e8913a7f4..48b15ffe7c235 100644
--- a/src/Symfony/Component/ExpressionLanguage/Lexer.php
+++ b/src/Symfony/Component/ExpressionLanguage/Lexer.php
@@ -29,10 +29,10 @@ class Lexer
      */
     public function tokenize($expression)
     {
-        $expression = str_replace(array("\r", "\n", "\t", "\v", "\f"), ' ', $expression);
+        $expression = str_replace(["\r", "\n", "\t", "\v", "\f"], ' ', $expression);
         $cursor = 0;
-        $tokens = array();
-        $brackets = array();
+        $tokens = [];
+        $brackets = [];
         $end = \strlen($expression);
 
         while ($cursor < $end) {
@@ -52,7 +52,7 @@ public function tokenize($expression)
                 $cursor += \strlen($match[0]);
             } elseif (false !== strpos('([{', $expression[$cursor])) {
                 // opening bracket
-                $brackets[] = array($expression[$cursor], $cursor);
+                $brackets[] = [$expression[$cursor], $cursor];
 
                 $tokens[] = new Token(Token::PUNCTUATION_TYPE, $expression[$cursor], $cursor + 1);
                 ++$cursor;
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ArgumentsNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ArgumentsNode.php
index 1c78d8054be39..e9849a448a624 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/ArgumentsNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/ArgumentsNode.php
@@ -27,7 +27,7 @@ public function compile(Compiler $compiler)
 
     public function toArray()
     {
-        $array = array();
+        $array = [];
 
         foreach ($this->getKeyValuePairs() as $pair) {
             $array[] = $pair['value'];
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php
index e1a2f2e904796..2dd0627c6d72a 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php
@@ -48,7 +48,7 @@ public function compile(Compiler $compiler)
 
     public function evaluate($functions, $values)
     {
-        $result = array();
+        $result = [];
         foreach ($this->getKeyValuePairs() as $pair) {
             $result[$pair['key']->evaluate($functions, $values)] = $pair['value']->evaluate($functions, $values);
         }
@@ -58,12 +58,12 @@ public function evaluate($functions, $values)
 
     public function toArray()
     {
-        $value = array();
+        $value = [];
         foreach ($this->getKeyValuePairs() as $pair) {
             $value[$pair['key']->attributes['value']] = $pair['value'];
         }
 
-        $array = array();
+        $array = [];
 
         if ($this->isHash($value)) {
             foreach ($value as $k => $v) {
@@ -88,9 +88,9 @@ public function toArray()
 
     protected function getKeyValuePairs()
     {
-        $pairs = array();
+        $pairs = [];
         foreach (array_chunk($this->nodes, 2) as $pair) {
-            $pairs[] = array('key' => $pair[0], 'value' => $pair[1]);
+            $pairs[] = ['key' => $pair[0], 'value' => $pair[1]];
         }
 
         return $pairs;
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
index f1755daee44a5..093a136f883fb 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
@@ -157,6 +157,6 @@ public function evaluate($functions, $values)
 
     public function toArray()
     {
-        return array('(', $this->nodes['left'], ' '.$this->attributes['operator'].' ', $this->nodes['right'], ')');
+        return ['(', $this->nodes['left'], ' '.$this->attributes['operator'].' ', $this->nodes['right'], ')'];
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
index 9db0f931aae6b..ca1b484bc08c2 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
@@ -23,7 +23,7 @@ class ConditionalNode extends Node
     public function __construct(Node $expr1, Node $expr2, Node $expr3)
     {
         parent::__construct(
-            array('expr1' => $expr1, 'expr2' => $expr2, 'expr3' => $expr3)
+            ['expr1' => $expr1, 'expr2' => $expr2, 'expr3' => $expr3]
         );
     }
 
@@ -51,6 +51,6 @@ public function evaluate($functions, $values)
 
     public function toArray()
     {
-        return array('(', $this->nodes['expr1'], ' ? ', $this->nodes['expr2'], ' : ', $this->nodes['expr3'], ')');
+        return ['(', $this->nodes['expr1'], ' ? ', $this->nodes['expr2'], ' : ', $this->nodes['expr3'], ')'];
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php
index 53c3290b3a56d..670e52ed42289 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php
@@ -26,8 +26,8 @@ public function __construct($value, $isIdentifier = false)
     {
         $this->isIdentifier = $isIdentifier;
         parent::__construct(
-            array(),
-            array('value' => $value)
+            [],
+            ['value' => $value]
         );
     }
 
@@ -43,7 +43,7 @@ public function evaluate($functions, $values)
 
     public function toArray()
     {
-        $array = array();
+        $array = [];
         $value = $this->attributes['value'];
 
         if ($this->isIdentifier) {
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
index ca479b3d5cbc2..90008d5d41daf 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
@@ -23,14 +23,14 @@ class FunctionNode extends Node
     public function __construct($name, Node $arguments)
     {
         parent::__construct(
-            array('arguments' => $arguments),
-            array('name' => $name)
+            ['arguments' => $arguments],
+            ['name' => $name]
         );
     }
 
     public function compile(Compiler $compiler)
     {
-        $arguments = array();
+        $arguments = [];
         foreach ($this->nodes['arguments']->nodes as $node) {
             $arguments[] = $compiler->subcompile($node);
         }
@@ -42,7 +42,7 @@ public function compile(Compiler $compiler)
 
     public function evaluate($functions, $values)
     {
-        $arguments = array($values);
+        $arguments = [$values];
         foreach ($this->nodes['arguments']->nodes as $node) {
             $arguments[] = $node->evaluate($functions, $values);
         }
@@ -52,7 +52,7 @@ public function evaluate($functions, $values)
 
     public function toArray()
     {
-        $array = array();
+        $array = [];
         $array[] = $this->attributes['name'];
 
         foreach ($this->nodes['arguments']->nodes as $node) {
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php b/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
index f76ce175e8c4f..1cf414aefec41 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
@@ -27,8 +27,8 @@ class GetAttrNode extends Node
     public function __construct(Node $node, Node $attribute, ArrayNode $arguments, $type)
     {
         parent::__construct(
-            array('node' => $node, 'attribute' => $attribute, 'arguments' => $arguments),
-            array('type' => $type)
+            ['node' => $node, 'attribute' => $attribute, 'arguments' => $arguments],
+            ['type' => $type]
         );
     }
 
@@ -82,7 +82,7 @@ public function evaluate($functions, $values)
                 if (!\is_object($obj)) {
                     throw new \RuntimeException('Unable to get a property on a non-object.');
                 }
-                if (!\is_callable($toCall = array($obj, $this->nodes['attribute']->attributes['value']))) {
+                if (!\is_callable($toCall = [$obj, $this->nodes['attribute']->attributes['value']])) {
                     throw new \RuntimeException(sprintf('Unable to call method "%s" of object "%s".', $this->nodes['attribute']->attributes['value'], \get_class($obj)));
                 }
 
@@ -102,13 +102,13 @@ public function toArray()
     {
         switch ($this->attributes['type']) {
             case self::PROPERTY_CALL:
-                return array($this->nodes['node'], '.', $this->nodes['attribute']);
+                return [$this->nodes['node'], '.', $this->nodes['attribute']];
 
             case self::METHOD_CALL:
-                return array($this->nodes['node'], '.', $this->nodes['attribute'], '(', $this->nodes['arguments'], ')');
+                return [$this->nodes['node'], '.', $this->nodes['attribute'], '(', $this->nodes['arguments'], ')'];
 
             case self::ARRAY_CALL:
-                return array($this->nodes['node'], '[', $this->nodes['attribute'], ']');
+                return [$this->nodes['node'], '[', $this->nodes['attribute'], ']'];
         }
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php b/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php
index 9e1462f2c6798..1c9c277b28962 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php
@@ -23,8 +23,8 @@ class NameNode extends Node
     public function __construct($name)
     {
         parent::__construct(
-            array(),
-            array('name' => $name)
+            [],
+            ['name' => $name]
         );
     }
 
@@ -40,6 +40,6 @@ public function evaluate($functions, $values)
 
     public function toArray()
     {
-        return array($this->attributes['name']);
+        return [$this->attributes['name']];
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/Node.php b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
index c6eb9f035177a..7923cb1d64e4f 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/Node.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
@@ -20,14 +20,14 @@
  */
 class Node
 {
-    public $nodes = array();
-    public $attributes = array();
+    public $nodes = [];
+    public $attributes = [];
 
     /**
      * @param array $nodes      An array of nodes
      * @param array $attributes An array of attributes
      */
-    public function __construct(array $nodes = array(), array $attributes = array())
+    public function __construct(array $nodes = [], array $attributes = [])
     {
         $this->nodes = $nodes;
         $this->attributes = $attributes;
@@ -35,12 +35,12 @@ public function __construct(array $nodes = array(), array $attributes = array())
 
     public function __toString()
     {
-        $attributes = array();
+        $attributes = [];
         foreach ($this->attributes as $name => $value) {
             $attributes[] = sprintf('%s: %s', $name, str_replace("\n", '', var_export($value, true)));
         }
 
-        $repr = array(str_replace('Symfony\Component\ExpressionLanguage\Node\\', '', \get_class($this)).'('.implode(', ', $attributes));
+        $repr = [str_replace('Symfony\Component\ExpressionLanguage\Node\\', '', \get_class($this)).'('.implode(', ', $attributes)];
 
         if (\count($this->nodes)) {
             foreach ($this->nodes as $node) {
@@ -66,7 +66,7 @@ public function compile(Compiler $compiler)
 
     public function evaluate($functions, $values)
     {
-        $results = array();
+        $results = [];
         foreach ($this->nodes as $node) {
             $results[] = $node->evaluate($functions, $values);
         }
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
index 583103217a626..16f0fb566c70b 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
@@ -61,6 +61,6 @@ public function evaluate($functions, $values)
 
     public function toArray()
     {
-        return array('(', $this->attributes['operator'].' ', $this->nodes['node'], ')');
+        return ['(', $this->attributes['operator'].' ', $this->nodes['node'], ')'];
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php
index a3b31ce9769c5..a51aabbd7b160 100644
--- a/src/Symfony/Component/ExpressionLanguage/Parser.php
+++ b/src/Symfony/Component/ExpressionLanguage/Parser.php
@@ -36,40 +36,40 @@ public function __construct(array $functions)
     {
         $this->functions = $functions;
 
-        $this->unaryOperators = array(
-            'not' => array('precedence' => 50),
-            '!' => array('precedence' => 50),
-            '-' => array('precedence' => 500),
-            '+' => array('precedence' => 500),
-        );
-        $this->binaryOperators = array(
-            'or' => array('precedence' => 10, 'associativity' => self::OPERATOR_LEFT),
-            '||' => array('precedence' => 10, 'associativity' => self::OPERATOR_LEFT),
-            'and' => array('precedence' => 15, 'associativity' => self::OPERATOR_LEFT),
-            '&&' => array('precedence' => 15, 'associativity' => self::OPERATOR_LEFT),
-            '|' => array('precedence' => 16, 'associativity' => self::OPERATOR_LEFT),
-            '^' => array('precedence' => 17, 'associativity' => self::OPERATOR_LEFT),
-            '&' => array('precedence' => 18, 'associativity' => self::OPERATOR_LEFT),
-            '==' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            '===' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            '!=' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            '!==' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            '<' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            '>' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            '>=' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            '<=' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            'not in' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            'in' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            'matches' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            '..' => array('precedence' => 25, 'associativity' => self::OPERATOR_LEFT),
-            '+' => array('precedence' => 30, 'associativity' => self::OPERATOR_LEFT),
-            '-' => array('precedence' => 30, 'associativity' => self::OPERATOR_LEFT),
-            '~' => array('precedence' => 40, 'associativity' => self::OPERATOR_LEFT),
-            '*' => array('precedence' => 60, 'associativity' => self::OPERATOR_LEFT),
-            '/' => array('precedence' => 60, 'associativity' => self::OPERATOR_LEFT),
-            '%' => array('precedence' => 60, 'associativity' => self::OPERATOR_LEFT),
-            '**' => array('precedence' => 200, 'associativity' => self::OPERATOR_RIGHT),
-        );
+        $this->unaryOperators = [
+            'not' => ['precedence' => 50],
+            '!' => ['precedence' => 50],
+            '-' => ['precedence' => 500],
+            '+' => ['precedence' => 500],
+        ];
+        $this->binaryOperators = [
+            'or' => ['precedence' => 10, 'associativity' => self::OPERATOR_LEFT],
+            '||' => ['precedence' => 10, 'associativity' => self::OPERATOR_LEFT],
+            'and' => ['precedence' => 15, 'associativity' => self::OPERATOR_LEFT],
+            '&&' => ['precedence' => 15, 'associativity' => self::OPERATOR_LEFT],
+            '|' => ['precedence' => 16, 'associativity' => self::OPERATOR_LEFT],
+            '^' => ['precedence' => 17, 'associativity' => self::OPERATOR_LEFT],
+            '&' => ['precedence' => 18, 'associativity' => self::OPERATOR_LEFT],
+            '==' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            '===' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            '!=' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            '!==' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            '<' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            '>' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            '>=' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            '<=' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            'not in' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            'in' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            'matches' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            '..' => ['precedence' => 25, 'associativity' => self::OPERATOR_LEFT],
+            '+' => ['precedence' => 30, 'associativity' => self::OPERATOR_LEFT],
+            '-' => ['precedence' => 30, 'associativity' => self::OPERATOR_LEFT],
+            '~' => ['precedence' => 40, 'associativity' => self::OPERATOR_LEFT],
+            '*' => ['precedence' => 60, 'associativity' => self::OPERATOR_LEFT],
+            '/' => ['precedence' => 60, 'associativity' => self::OPERATOR_LEFT],
+            '%' => ['precedence' => 60, 'associativity' => self::OPERATOR_LEFT],
+            '**' => ['precedence' => 200, 'associativity' => self::OPERATOR_RIGHT],
+        ];
     }
 
     /**
@@ -92,7 +92,7 @@ public function __construct(array $functions)
      *
      * @throws SyntaxError
      */
-    public function parse(TokenStream $stream, $names = array())
+    public function parse(TokenStream $stream, $names = [])
     {
         $this->stream = $stream;
         $this->names = $names;
diff --git a/src/Symfony/Component/ExpressionLanguage/Resources/bin/generate_operator_regex.php b/src/Symfony/Component/ExpressionLanguage/Resources/bin/generate_operator_regex.php
index 74a100890d9ae..e1196c7f514af 100644
--- a/src/Symfony/Component/ExpressionLanguage/Resources/bin/generate_operator_regex.php
+++ b/src/Symfony/Component/ExpressionLanguage/Resources/bin/generate_operator_regex.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-$operators = array('not', '!', 'or', '||', '&&', 'and', '|', '^', '&', '==', '===', '!=', '!==', '<', '>', '>=', '<=', 'not in', 'in', '..', '+', '-', '~', '*', '/', '%', 'matches', '**');
+$operators = ['not', '!', 'or', '||', '&&', 'and', '|', '^', '&', '==', '===', '!=', '!==', '<', '>', '>=', '<=', 'not in', 'in', '..', '+', '-', '~', '*', '/', '%', 'matches', '**'];
 $operators = array_combine($operators, array_map('strlen', $operators));
 arsort($operators);
 
-$regex = array();
+$regex = [];
 foreach ($operators as $operator => $length) {
     // an operator that ends with a character must be followed by
     // a whitespace or a parenthesis
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
index a1e5b7cc7d436..3514a2d5c4da5 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
@@ -56,10 +56,10 @@ public function testCachedParse()
             ->with($cacheItemMock)
         ;
 
-        $parsedExpression = $expressionLanguage->parse('1 + 1', array());
+        $parsedExpression = $expressionLanguage->parse('1 + 1', []);
         $this->assertSame($savedParsedExpression, $parsedExpression);
 
-        $parsedExpression = $expressionLanguage->parse('1 + 1', array());
+        $parsedExpression = $expressionLanguage->parse('1 + 1', []);
         $this->assertSame($savedParsedExpression, $parsedExpression);
     }
 
@@ -115,7 +115,7 @@ public function testConstantFunction()
 
     public function testProviders()
     {
-        $expressionLanguage = new ExpressionLanguage(null, array(new TestProvider()));
+        $expressionLanguage = new ExpressionLanguage(null, [new TestProvider()]);
         $this->assertEquals('foo', $expressionLanguage->evaluate('identity("foo")'));
         $this->assertEquals('"foo"', $expressionLanguage->compile('identity("foo")'));
         $this->assertEquals('FOO', $expressionLanguage->evaluate('strtoupper("foo")'));
@@ -153,38 +153,38 @@ public function testShortCircuitOperatorsCompile($expression, array $names, $exp
     public function testParseThrowsInsteadOfNotice()
     {
         $expressionLanguage = new ExpressionLanguage();
-        $expressionLanguage->parse('node.', array('node'));
+        $expressionLanguage->parse('node.', ['node']);
     }
 
     public function shortCircuitProviderEvaluate()
     {
-        $object = $this->getMockBuilder('stdClass')->setMethods(array('foo'))->getMock();
+        $object = $this->getMockBuilder('stdClass')->setMethods(['foo'])->getMock();
         $object->expects($this->never())->method('foo');
 
-        return array(
-            array('false and object.foo()', array('object' => $object), false),
-            array('false && object.foo()', array('object' => $object), false),
-            array('true || object.foo()', array('object' => $object), true),
-            array('true or object.foo()', array('object' => $object), true),
-        );
+        return [
+            ['false and object.foo()', ['object' => $object], false],
+            ['false && object.foo()', ['object' => $object], false],
+            ['true || object.foo()', ['object' => $object], true],
+            ['true or object.foo()', ['object' => $object], true],
+        ];
     }
 
     public function shortCircuitProviderCompile()
     {
-        return array(
-            array('false and foo', array('foo' => 'foo'), false),
-            array('false && foo', array('foo' => 'foo'), false),
-            array('true || foo', array('foo' => 'foo'), true),
-            array('true or foo', array('foo' => 'foo'), true),
-        );
+        return [
+            ['false and foo', ['foo' => 'foo'], false],
+            ['false && foo', ['foo' => 'foo'], false],
+            ['true || foo', ['foo' => 'foo'], true],
+            ['true or foo', ['foo' => 'foo'], true],
+        ];
     }
 
     public function testCachingForOverriddenVariableNames()
     {
         $expressionLanguage = new ExpressionLanguage();
         $expression = 'a + b';
-        $expressionLanguage->evaluate($expression, array('a' => 1, 'b' => 1));
-        $result = $expressionLanguage->compile($expression, array('a', 'B' => 'b'));
+        $expressionLanguage->evaluate($expression, ['a' => 1, 'b' => 1]);
+        $result = $expressionLanguage->compile($expression, ['a', 'B' => 'b']);
         $this->assertSame('($a + $B)', $result);
     }
 
@@ -192,7 +192,7 @@ public function testStrictEquality()
     {
         $expressionLanguage = new ExpressionLanguage();
         $expression = '123 === a';
-        $result = $expressionLanguage->compile($expression, array('a'));
+        $result = $expressionLanguage->compile($expression, ['a']);
         $this->assertSame('(123 === $a)', $result);
     }
 
@@ -201,7 +201,7 @@ public function testCachingWithDifferentNamesOrder()
         $cacheMock = $this->getMockBuilder('Psr\Cache\CacheItemPoolInterface')->getMock();
         $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();
         $expressionLanguage = new ExpressionLanguage($cacheMock);
-        $savedParsedExpressions = array();
+        $savedParsedExpressions = [];
 
         $cacheMock
             ->expects($this->exactly(2))
@@ -234,8 +234,8 @@ public function testCachingWithDifferentNamesOrder()
         ;
 
         $expression = 'a + b';
-        $expressionLanguage->compile($expression, array('a', 'B' => 'b'));
-        $expressionLanguage->compile($expression, array('B' => 'b', 'a'));
+        $expressionLanguage->compile($expression, ['a', 'B' => 'b']);
+        $expressionLanguage->compile($expression, ['B' => 'b', 'a']);
     }
 
     /**
@@ -245,7 +245,7 @@ public function testCachingWithDifferentNamesOrder()
     public function testRegisterAfterParse($registerCallback)
     {
         $el = new ExpressionLanguage();
-        $el->parse('1 + 1', array());
+        $el->parse('1 + 1', []);
         $registerCallback($el);
     }
 
@@ -267,7 +267,7 @@ public function testRegisterAfterEval($registerCallback)
     public function testCallBadCallable()
     {
         $el = new ExpressionLanguage();
-        $el->evaluate('foo.myfunction()', array('foo' => new \stdClass()));
+        $el->evaluate('foo.myfunction()', ['foo' => new \stdClass()]);
     }
 
     /**
@@ -283,22 +283,22 @@ public function testRegisterAfterCompile($registerCallback)
 
     public function getRegisterCallbacks()
     {
-        return array(
-            array(
+        return [
+            [
                 function (ExpressionLanguage $el) {
                     $el->register('fn', function () {}, function () {});
                 },
-            ),
-            array(
+            ],
+            [
                 function (ExpressionLanguage $el) {
                     $el->addFunction(new ExpressionFunction('fn', function () {}, function () {}));
                 },
-            ),
-            array(
+            ],
+            [
                 function (ExpressionLanguage $el) {
                     $el->registerProvider(new TestProvider());
                 },
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Fixtures/TestProvider.php b/src/Symfony/Component/ExpressionLanguage/Tests/Fixtures/TestProvider.php
index 20c5182bba432..8405d4f97585b 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Fixtures/TestProvider.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Fixtures/TestProvider.php
@@ -19,7 +19,7 @@ class TestProvider implements ExpressionFunctionProviderInterface
 {
     public function getFunctions()
     {
-        return array(
+        return [
             new ExpressionFunction('identity', function ($input) {
                 return $input;
             }, function (array $values, $input) {
@@ -31,7 +31,7 @@ public function getFunctions()
             ExpressionFunction::fromPhp('\strtolower'),
 
             ExpressionFunction::fromPhp('Symfony\Component\ExpressionLanguage\Tests\Fixtures\fn_namespaced', 'fn_namespaced'),
-        );
+        ];
     }
 }
 
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php
index 16bf4508628b5..ba35e7d19a9e2 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php
@@ -59,33 +59,33 @@ public function testTokenizeThrowsErrorOnUnclosedBrace()
 
     public function getTokenizeData()
     {
-        return array(
-            array(
-                array(new Token('name', 'a', 3)),
+        return [
+            [
+                [new Token('name', 'a', 3)],
                 '  a  ',
-            ),
-            array(
-                array(new Token('name', 'a', 1)),
+            ],
+            [
+                [new Token('name', 'a', 1)],
                 'a',
-            ),
-            array(
-                array(new Token('string', 'foo', 1)),
+            ],
+            [
+                [new Token('string', 'foo', 1)],
                 '"foo"',
-            ),
-            array(
-                array(new Token('number', '3', 1)),
+            ],
+            [
+                [new Token('number', '3', 1)],
                 '3',
-            ),
-            array(
-                array(new Token('operator', '+', 1)),
+            ],
+            [
+                [new Token('operator', '+', 1)],
                 '+',
-            ),
-            array(
-                array(new Token('punctuation', '.', 1)),
+            ],
+            [
+                [new Token('punctuation', '.', 1)],
                 '.',
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     new Token('punctuation', '(', 1),
                     new Token('number', '3', 2),
                     new Token('operator', '+', 4),
@@ -101,21 +101,21 @@ public function getTokenizeData()
                     new Token('punctuation', '[', 25),
                     new Token('number', '4', 26),
                     new Token('punctuation', ']', 27),
-                ),
+                ],
                 '(3 + 5) ~ foo("bar").baz[4]',
-            ),
-            array(
-                array(new Token('operator', '..', 1)),
+            ],
+            [
+                [new Token('operator', '..', 1)],
                 '..',
-            ),
-            array(
-                array(new Token('string', '#foo', 1)),
+            ],
+            [
+                [new Token('string', '#foo', 1)],
                 "'#foo'",
-            ),
-            array(
-                array(new Token('string', '#foo', 1)),
+            ],
+            [
+                [new Token('string', '#foo', 1)],
                 '"#foo"',
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/AbstractNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/AbstractNodeTest.php
index a6f80c2f6982a..297503746e002 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/AbstractNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/AbstractNodeTest.php
@@ -19,7 +19,7 @@ abstract class AbstractNodeTest extends TestCase
     /**
      * @dataProvider getEvaluateData
      */
-    public function testEvaluate($expected, $node, $variables = array(), $functions = array())
+    public function testEvaluate($expected, $node, $variables = [], $functions = [])
     {
         $this->assertSame($expected, $node->evaluate($functions, $variables));
     }
@@ -29,7 +29,7 @@ abstract public function getEvaluateData();
     /**
      * @dataProvider getCompileData
      */
-    public function testCompile($expected, $node, $functions = array())
+    public function testCompile($expected, $node, $functions = [])
     {
         $compiler = new Compiler($functions);
         $node->compile($compiler);
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/ArgumentsNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/ArgumentsNodeTest.php
index 60a6d1ca2a71c..9d88b4ae75d6a 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/ArgumentsNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/ArgumentsNodeTest.php
@@ -17,16 +17,16 @@ class ArgumentsNodeTest extends ArrayNodeTest
 {
     public function getCompileData()
     {
-        return array(
-            array('"a", "b"', $this->getArrayNode()),
-        );
+        return [
+            ['"a", "b"', $this->getArrayNode()],
+        ];
     }
 
     public function getDumpData()
     {
-        return array(
-            array('"a", "b"', $this->getArrayNode()),
-        );
+        return [
+            ['"a", "b"', $this->getArrayNode()],
+        ];
     }
 
     protected function createArrayNode()
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/ArrayNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/ArrayNodeTest.php
index 11a35d461c059..82fbfc67b2dc2 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/ArrayNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/ArrayNodeTest.php
@@ -30,31 +30,31 @@ public function testSerialization()
 
     public function getEvaluateData()
     {
-        return array(
-            array(array('b' => 'a', 'b'), $this->getArrayNode()),
-        );
+        return [
+            [['b' => 'a', 'b'], $this->getArrayNode()],
+        ];
     }
 
     public function getCompileData()
     {
-        return array(
-            array('array("b" => "a", 0 => "b")', $this->getArrayNode()),
-        );
+        return [
+            ['array("b" => "a", 0 => "b")', $this->getArrayNode()],
+        ];
     }
 
     public function getDumpData()
     {
-        yield array('{"b": "a", 0: "b"}', $this->getArrayNode());
+        yield ['{"b": "a", 0: "b"}', $this->getArrayNode()];
 
         $array = $this->createArrayNode();
         $array->addElement(new ConstantNode('c'), new ConstantNode('a"b'));
         $array->addElement(new ConstantNode('d'), new ConstantNode('a\b'));
-        yield array('{"a\\"b": "c", "a\\\\b": "d"}', $array);
+        yield ['{"a\\"b": "c", "a\\\\b": "d"}', $array];
 
         $array = $this->createArrayNode();
         $array->addElement(new ConstantNode('c'));
         $array->addElement(new ConstantNode('d'));
-        yield array('["c", "d"]', $array);
+        yield ['["c", "d"]', $array];
     }
 
     protected function getArrayNode()
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php
index f8456f8dbb74a..4a3802085806e 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php
@@ -23,47 +23,47 @@ public function getEvaluateData()
         $array->addElement(new ConstantNode('a'));
         $array->addElement(new ConstantNode('b'));
 
-        return array(
-            array(true, new BinaryNode('or', new ConstantNode(true), new ConstantNode(false))),
-            array(true, new BinaryNode('||', new ConstantNode(true), new ConstantNode(false))),
-            array(false, new BinaryNode('and', new ConstantNode(true), new ConstantNode(false))),
-            array(false, new BinaryNode('&&', new ConstantNode(true), new ConstantNode(false))),
-
-            array(0, new BinaryNode('&', new ConstantNode(2), new ConstantNode(4))),
-            array(6, new BinaryNode('|', new ConstantNode(2), new ConstantNode(4))),
-            array(6, new BinaryNode('^', new ConstantNode(2), new ConstantNode(4))),
-
-            array(true, new BinaryNode('<', new ConstantNode(1), new ConstantNode(2))),
-            array(true, new BinaryNode('<=', new ConstantNode(1), new ConstantNode(2))),
-            array(true, new BinaryNode('<=', new ConstantNode(1), new ConstantNode(1))),
-
-            array(false, new BinaryNode('>', new ConstantNode(1), new ConstantNode(2))),
-            array(false, new BinaryNode('>=', new ConstantNode(1), new ConstantNode(2))),
-            array(true, new BinaryNode('>=', new ConstantNode(1), new ConstantNode(1))),
-
-            array(true, new BinaryNode('===', new ConstantNode(true), new ConstantNode(true))),
-            array(false, new BinaryNode('!==', new ConstantNode(true), new ConstantNode(true))),
-
-            array(false, new BinaryNode('==', new ConstantNode(2), new ConstantNode(1))),
-            array(true, new BinaryNode('!=', new ConstantNode(2), new ConstantNode(1))),
-
-            array(-1, new BinaryNode('-', new ConstantNode(1), new ConstantNode(2))),
-            array(3, new BinaryNode('+', new ConstantNode(1), new ConstantNode(2))),
-            array(4, new BinaryNode('*', new ConstantNode(2), new ConstantNode(2))),
-            array(1, new BinaryNode('/', new ConstantNode(2), new ConstantNode(2))),
-            array(1, new BinaryNode('%', new ConstantNode(5), new ConstantNode(2))),
-            array(25, new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))),
-            array('ab', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))),
-
-            array(true, new BinaryNode('in', new ConstantNode('a'), $array)),
-            array(false, new BinaryNode('in', new ConstantNode('c'), $array)),
-            array(true, new BinaryNode('not in', new ConstantNode('c'), $array)),
-            array(false, new BinaryNode('not in', new ConstantNode('a'), $array)),
-
-            array(array(1, 2, 3), new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))),
-
-            array(1, new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+$/'))),
-        );
+        return [
+            [true, new BinaryNode('or', new ConstantNode(true), new ConstantNode(false))],
+            [true, new BinaryNode('||', new ConstantNode(true), new ConstantNode(false))],
+            [false, new BinaryNode('and', new ConstantNode(true), new ConstantNode(false))],
+            [false, new BinaryNode('&&', new ConstantNode(true), new ConstantNode(false))],
+
+            [0, new BinaryNode('&', new ConstantNode(2), new ConstantNode(4))],
+            [6, new BinaryNode('|', new ConstantNode(2), new ConstantNode(4))],
+            [6, new BinaryNode('^', new ConstantNode(2), new ConstantNode(4))],
+
+            [true, new BinaryNode('<', new ConstantNode(1), new ConstantNode(2))],
+            [true, new BinaryNode('<=', new ConstantNode(1), new ConstantNode(2))],
+            [true, new BinaryNode('<=', new ConstantNode(1), new ConstantNode(1))],
+
+            [false, new BinaryNode('>', new ConstantNode(1), new ConstantNode(2))],
+            [false, new BinaryNode('>=', new ConstantNode(1), new ConstantNode(2))],
+            [true, new BinaryNode('>=', new ConstantNode(1), new ConstantNode(1))],
+
+            [true, new BinaryNode('===', new ConstantNode(true), new ConstantNode(true))],
+            [false, new BinaryNode('!==', new ConstantNode(true), new ConstantNode(true))],
+
+            [false, new BinaryNode('==', new ConstantNode(2), new ConstantNode(1))],
+            [true, new BinaryNode('!=', new ConstantNode(2), new ConstantNode(1))],
+
+            [-1, new BinaryNode('-', new ConstantNode(1), new ConstantNode(2))],
+            [3, new BinaryNode('+', new ConstantNode(1), new ConstantNode(2))],
+            [4, new BinaryNode('*', new ConstantNode(2), new ConstantNode(2))],
+            [1, new BinaryNode('/', new ConstantNode(2), new ConstantNode(2))],
+            [1, new BinaryNode('%', new ConstantNode(5), new ConstantNode(2))],
+            [25, new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))],
+            ['ab', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))],
+
+            [true, new BinaryNode('in', new ConstantNode('a'), $array)],
+            [false, new BinaryNode('in', new ConstantNode('c'), $array)],
+            [true, new BinaryNode('not in', new ConstantNode('c'), $array)],
+            [false, new BinaryNode('not in', new ConstantNode('a'), $array)],
+
+            [[1, 2, 3], new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))],
+
+            [1, new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+$/'))],
+        ];
     }
 
     public function getCompileData()
@@ -72,47 +72,47 @@ public function getCompileData()
         $array->addElement(new ConstantNode('a'));
         $array->addElement(new ConstantNode('b'));
 
-        return array(
-            array('(true || false)', new BinaryNode('or', new ConstantNode(true), new ConstantNode(false))),
-            array('(true || false)', new BinaryNode('||', new ConstantNode(true), new ConstantNode(false))),
-            array('(true && false)', new BinaryNode('and', new ConstantNode(true), new ConstantNode(false))),
-            array('(true && false)', new BinaryNode('&&', new ConstantNode(true), new ConstantNode(false))),
+        return [
+            ['(true || false)', new BinaryNode('or', new ConstantNode(true), new ConstantNode(false))],
+            ['(true || false)', new BinaryNode('||', new ConstantNode(true), new ConstantNode(false))],
+            ['(true && false)', new BinaryNode('and', new ConstantNode(true), new ConstantNode(false))],
+            ['(true && false)', new BinaryNode('&&', new ConstantNode(true), new ConstantNode(false))],
 
-            array('(2 & 4)', new BinaryNode('&', new ConstantNode(2), new ConstantNode(4))),
-            array('(2 | 4)', new BinaryNode('|', new ConstantNode(2), new ConstantNode(4))),
-            array('(2 ^ 4)', new BinaryNode('^', new ConstantNode(2), new ConstantNode(4))),
+            ['(2 & 4)', new BinaryNode('&', new ConstantNode(2), new ConstantNode(4))],
+            ['(2 | 4)', new BinaryNode('|', new ConstantNode(2), new ConstantNode(4))],
+            ['(2 ^ 4)', new BinaryNode('^', new ConstantNode(2), new ConstantNode(4))],
 
-            array('(1 < 2)', new BinaryNode('<', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 <= 2)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 <= 1)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(1))),
+            ['(1 < 2)', new BinaryNode('<', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 <= 2)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 <= 1)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(1))],
 
-            array('(1 > 2)', new BinaryNode('>', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 >= 2)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 >= 1)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(1))),
+            ['(1 > 2)', new BinaryNode('>', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 >= 2)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 >= 1)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(1))],
 
-            array('(true === true)', new BinaryNode('===', new ConstantNode(true), new ConstantNode(true))),
-            array('(true !== true)', new BinaryNode('!==', new ConstantNode(true), new ConstantNode(true))),
+            ['(true === true)', new BinaryNode('===', new ConstantNode(true), new ConstantNode(true))],
+            ['(true !== true)', new BinaryNode('!==', new ConstantNode(true), new ConstantNode(true))],
 
-            array('(2 == 1)', new BinaryNode('==', new ConstantNode(2), new ConstantNode(1))),
-            array('(2 != 1)', new BinaryNode('!=', new ConstantNode(2), new ConstantNode(1))),
+            ['(2 == 1)', new BinaryNode('==', new ConstantNode(2), new ConstantNode(1))],
+            ['(2 != 1)', new BinaryNode('!=', new ConstantNode(2), new ConstantNode(1))],
 
-            array('(1 - 2)', new BinaryNode('-', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 + 2)', new BinaryNode('+', new ConstantNode(1), new ConstantNode(2))),
-            array('(2 * 2)', new BinaryNode('*', new ConstantNode(2), new ConstantNode(2))),
-            array('(2 / 2)', new BinaryNode('/', new ConstantNode(2), new ConstantNode(2))),
-            array('(5 % 2)', new BinaryNode('%', new ConstantNode(5), new ConstantNode(2))),
-            array('pow(5, 2)', new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))),
-            array('("a" . "b")', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))),
+            ['(1 - 2)', new BinaryNode('-', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 + 2)', new BinaryNode('+', new ConstantNode(1), new ConstantNode(2))],
+            ['(2 * 2)', new BinaryNode('*', new ConstantNode(2), new ConstantNode(2))],
+            ['(2 / 2)', new BinaryNode('/', new ConstantNode(2), new ConstantNode(2))],
+            ['(5 % 2)', new BinaryNode('%', new ConstantNode(5), new ConstantNode(2))],
+            ['pow(5, 2)', new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))],
+            ['("a" . "b")', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))],
 
-            array('in_array("a", array(0 => "a", 1 => "b"))', new BinaryNode('in', new ConstantNode('a'), $array)),
-            array('in_array("c", array(0 => "a", 1 => "b"))', new BinaryNode('in', new ConstantNode('c'), $array)),
-            array('!in_array("c", array(0 => "a", 1 => "b"))', new BinaryNode('not in', new ConstantNode('c'), $array)),
-            array('!in_array("a", array(0 => "a", 1 => "b"))', new BinaryNode('not in', new ConstantNode('a'), $array)),
+            ['in_array("a", array(0 => "a", 1 => "b"))', new BinaryNode('in', new ConstantNode('a'), $array)],
+            ['in_array("c", array(0 => "a", 1 => "b"))', new BinaryNode('in', new ConstantNode('c'), $array)],
+            ['!in_array("c", array(0 => "a", 1 => "b"))', new BinaryNode('not in', new ConstantNode('c'), $array)],
+            ['!in_array("a", array(0 => "a", 1 => "b"))', new BinaryNode('not in', new ConstantNode('a'), $array)],
 
-            array('range(1, 3)', new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))),
+            ['range(1, 3)', new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))],
 
-            array('preg_match("/^[a-z]+/i\$/", "abc")', new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+/i$/'))),
-        );
+            ['preg_match("/^[a-z]+/i\$/", "abc")', new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+/i$/'))],
+        ];
     }
 
     public function getDumpData()
@@ -121,46 +121,46 @@ public function getDumpData()
         $array->addElement(new ConstantNode('a'));
         $array->addElement(new ConstantNode('b'));
 
-        return array(
-            array('(true or false)', new BinaryNode('or', new ConstantNode(true), new ConstantNode(false))),
-            array('(true || false)', new BinaryNode('||', new ConstantNode(true), new ConstantNode(false))),
-            array('(true and false)', new BinaryNode('and', new ConstantNode(true), new ConstantNode(false))),
-            array('(true && false)', new BinaryNode('&&', new ConstantNode(true), new ConstantNode(false))),
+        return [
+            ['(true or false)', new BinaryNode('or', new ConstantNode(true), new ConstantNode(false))],
+            ['(true || false)', new BinaryNode('||', new ConstantNode(true), new ConstantNode(false))],
+            ['(true and false)', new BinaryNode('and', new ConstantNode(true), new ConstantNode(false))],
+            ['(true && false)', new BinaryNode('&&', new ConstantNode(true), new ConstantNode(false))],
 
-            array('(2 & 4)', new BinaryNode('&', new ConstantNode(2), new ConstantNode(4))),
-            array('(2 | 4)', new BinaryNode('|', new ConstantNode(2), new ConstantNode(4))),
-            array('(2 ^ 4)', new BinaryNode('^', new ConstantNode(2), new ConstantNode(4))),
+            ['(2 & 4)', new BinaryNode('&', new ConstantNode(2), new ConstantNode(4))],
+            ['(2 | 4)', new BinaryNode('|', new ConstantNode(2), new ConstantNode(4))],
+            ['(2 ^ 4)', new BinaryNode('^', new ConstantNode(2), new ConstantNode(4))],
 
-            array('(1 < 2)', new BinaryNode('<', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 <= 2)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 <= 1)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(1))),
+            ['(1 < 2)', new BinaryNode('<', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 <= 2)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 <= 1)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(1))],
 
-            array('(1 > 2)', new BinaryNode('>', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 >= 2)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 >= 1)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(1))),
+            ['(1 > 2)', new BinaryNode('>', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 >= 2)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 >= 1)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(1))],
 
-            array('(true === true)', new BinaryNode('===', new ConstantNode(true), new ConstantNode(true))),
-            array('(true !== true)', new BinaryNode('!==', new ConstantNode(true), new ConstantNode(true))),
+            ['(true === true)', new BinaryNode('===', new ConstantNode(true), new ConstantNode(true))],
+            ['(true !== true)', new BinaryNode('!==', new ConstantNode(true), new ConstantNode(true))],
 
-            array('(2 == 1)', new BinaryNode('==', new ConstantNode(2), new ConstantNode(1))),
-            array('(2 != 1)', new BinaryNode('!=', new ConstantNode(2), new ConstantNode(1))),
+            ['(2 == 1)', new BinaryNode('==', new ConstantNode(2), new ConstantNode(1))],
+            ['(2 != 1)', new BinaryNode('!=', new ConstantNode(2), new ConstantNode(1))],
 
-            array('(1 - 2)', new BinaryNode('-', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 + 2)', new BinaryNode('+', new ConstantNode(1), new ConstantNode(2))),
-            array('(2 * 2)', new BinaryNode('*', new ConstantNode(2), new ConstantNode(2))),
-            array('(2 / 2)', new BinaryNode('/', new ConstantNode(2), new ConstantNode(2))),
-            array('(5 % 2)', new BinaryNode('%', new ConstantNode(5), new ConstantNode(2))),
-            array('(5 ** 2)', new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))),
-            array('("a" ~ "b")', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))),
+            ['(1 - 2)', new BinaryNode('-', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 + 2)', new BinaryNode('+', new ConstantNode(1), new ConstantNode(2))],
+            ['(2 * 2)', new BinaryNode('*', new ConstantNode(2), new ConstantNode(2))],
+            ['(2 / 2)', new BinaryNode('/', new ConstantNode(2), new ConstantNode(2))],
+            ['(5 % 2)', new BinaryNode('%', new ConstantNode(5), new ConstantNode(2))],
+            ['(5 ** 2)', new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))],
+            ['("a" ~ "b")', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))],
 
-            array('("a" in ["a", "b"])', new BinaryNode('in', new ConstantNode('a'), $array)),
-            array('("c" in ["a", "b"])', new BinaryNode('in', new ConstantNode('c'), $array)),
-            array('("c" not in ["a", "b"])', new BinaryNode('not in', new ConstantNode('c'), $array)),
-            array('("a" not in ["a", "b"])', new BinaryNode('not in', new ConstantNode('a'), $array)),
+            ['("a" in ["a", "b"])', new BinaryNode('in', new ConstantNode('a'), $array)],
+            ['("c" in ["a", "b"])', new BinaryNode('in', new ConstantNode('c'), $array)],
+            ['("c" not in ["a", "b"])', new BinaryNode('not in', new ConstantNode('c'), $array)],
+            ['("a" not in ["a", "b"])', new BinaryNode('not in', new ConstantNode('a'), $array)],
 
-            array('(1 .. 3)', new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))),
+            ['(1 .. 3)', new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))],
 
-            array('("abc" matches "/^[a-z]+/i$/")', new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+/i$/'))),
-        );
+            ['("abc" matches "/^[a-z]+/i$/")', new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+/i$/'))],
+        ];
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/ConditionalNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/ConditionalNodeTest.php
index cbf9e8d43cdea..13b7cbdec125d 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/ConditionalNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/ConditionalNodeTest.php
@@ -18,25 +18,25 @@ class ConditionalNodeTest extends AbstractNodeTest
 {
     public function getEvaluateData()
     {
-        return array(
-            array(1, new ConditionalNode(new ConstantNode(true), new ConstantNode(1), new ConstantNode(2))),
-            array(2, new ConditionalNode(new ConstantNode(false), new ConstantNode(1), new ConstantNode(2))),
-        );
+        return [
+            [1, new ConditionalNode(new ConstantNode(true), new ConstantNode(1), new ConstantNode(2))],
+            [2, new ConditionalNode(new ConstantNode(false), new ConstantNode(1), new ConstantNode(2))],
+        ];
     }
 
     public function getCompileData()
     {
-        return array(
-            array('((true) ? (1) : (2))', new ConditionalNode(new ConstantNode(true), new ConstantNode(1), new ConstantNode(2))),
-            array('((false) ? (1) : (2))', new ConditionalNode(new ConstantNode(false), new ConstantNode(1), new ConstantNode(2))),
-        );
+        return [
+            ['((true) ? (1) : (2))', new ConditionalNode(new ConstantNode(true), new ConstantNode(1), new ConstantNode(2))],
+            ['((false) ? (1) : (2))', new ConditionalNode(new ConstantNode(false), new ConstantNode(1), new ConstantNode(2))],
+        ];
     }
 
     public function getDumpData()
     {
-        return array(
-            array('(true ? 1 : 2)', new ConditionalNode(new ConstantNode(true), new ConstantNode(1), new ConstantNode(2))),
-            array('(false ? 1 : 2)', new ConditionalNode(new ConstantNode(false), new ConstantNode(1), new ConstantNode(2))),
-        );
+        return [
+            ['(true ? 1 : 2)', new ConditionalNode(new ConstantNode(true), new ConstantNode(1), new ConstantNode(2))],
+            ['(false ? 1 : 2)', new ConditionalNode(new ConstantNode(false), new ConstantNode(1), new ConstantNode(2))],
+        ];
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/ConstantNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/ConstantNodeTest.php
index af79a91c5c9c4..9add04f27e9fc 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/ConstantNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/ConstantNodeTest.php
@@ -17,44 +17,44 @@ class ConstantNodeTest extends AbstractNodeTest
 {
     public function getEvaluateData()
     {
-        return array(
-            array(false, new ConstantNode(false)),
-            array(true, new ConstantNode(true)),
-            array(null, new ConstantNode(null)),
-            array(3, new ConstantNode(3)),
-            array(3.3, new ConstantNode(3.3)),
-            array('foo', new ConstantNode('foo')),
-            array(array(1, 'b' => 'a'), new ConstantNode(array(1, 'b' => 'a'))),
-        );
+        return [
+            [false, new ConstantNode(false)],
+            [true, new ConstantNode(true)],
+            [null, new ConstantNode(null)],
+            [3, new ConstantNode(3)],
+            [3.3, new ConstantNode(3.3)],
+            ['foo', new ConstantNode('foo')],
+            [[1, 'b' => 'a'], new ConstantNode([1, 'b' => 'a'])],
+        ];
     }
 
     public function getCompileData()
     {
-        return array(
-            array('false', new ConstantNode(false)),
-            array('true', new ConstantNode(true)),
-            array('null', new ConstantNode(null)),
-            array('3', new ConstantNode(3)),
-            array('3.3', new ConstantNode(3.3)),
-            array('"foo"', new ConstantNode('foo')),
-            array('array(0 => 1, "b" => "a")', new ConstantNode(array(1, 'b' => 'a'))),
-        );
+        return [
+            ['false', new ConstantNode(false)],
+            ['true', new ConstantNode(true)],
+            ['null', new ConstantNode(null)],
+            ['3', new ConstantNode(3)],
+            ['3.3', new ConstantNode(3.3)],
+            ['"foo"', new ConstantNode('foo')],
+            ['array(0 => 1, "b" => "a")', new ConstantNode([1, 'b' => 'a'])],
+        ];
     }
 
     public function getDumpData()
     {
-        return array(
-            array('false', new ConstantNode(false)),
-            array('true', new ConstantNode(true)),
-            array('null', new ConstantNode(null)),
-            array('3', new ConstantNode(3)),
-            array('3.3', new ConstantNode(3.3)),
-            array('"foo"', new ConstantNode('foo')),
-            array('foo', new ConstantNode('foo', true)),
-            array('{0: 1, "b": "a", 1: true}', new ConstantNode(array(1, 'b' => 'a', true))),
-            array('{"a\\"b": "c", "a\\\\b": "d"}', new ConstantNode(array('a"b' => 'c', 'a\\b' => 'd'))),
-            array('["c", "d"]', new ConstantNode(array('c', 'd'))),
-            array('{"a": ["b"]}', new ConstantNode(array('a' => array('b')))),
-        );
+        return [
+            ['false', new ConstantNode(false)],
+            ['true', new ConstantNode(true)],
+            ['null', new ConstantNode(null)],
+            ['3', new ConstantNode(3)],
+            ['3.3', new ConstantNode(3.3)],
+            ['"foo"', new ConstantNode('foo')],
+            ['foo', new ConstantNode('foo', true)],
+            ['{0: 1, "b": "a", 1: true}', new ConstantNode([1, 'b' => 'a', true])],
+            ['{"a\\"b": "c", "a\\\\b": "d"}', new ConstantNode(['a"b' => 'c', 'a\\b' => 'd'])],
+            ['["c", "d"]', new ConstantNode(['c', 'd'])],
+            ['{"a": ["b"]}', new ConstantNode(['a' => ['b']])],
+        ];
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/FunctionNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/FunctionNodeTest.php
index 3bddc5e5647ee..c6cb02c1b9a43 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/FunctionNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/FunctionNodeTest.php
@@ -19,34 +19,34 @@ class FunctionNodeTest extends AbstractNodeTest
 {
     public function getEvaluateData()
     {
-        return array(
-            array('bar', new FunctionNode('foo', new Node(array(new ConstantNode('bar')))), array(), array('foo' => $this->getCallables())),
-        );
+        return [
+            ['bar', new FunctionNode('foo', new Node([new ConstantNode('bar')])), [], ['foo' => $this->getCallables()]],
+        ];
     }
 
     public function getCompileData()
     {
-        return array(
-            array('foo("bar")', new FunctionNode('foo', new Node(array(new ConstantNode('bar')))), array('foo' => $this->getCallables())),
-        );
+        return [
+            ['foo("bar")', new FunctionNode('foo', new Node([new ConstantNode('bar')])), ['foo' => $this->getCallables()]],
+        ];
     }
 
     public function getDumpData()
     {
-        return array(
-            array('foo("bar")', new FunctionNode('foo', new Node(array(new ConstantNode('bar')))), array('foo' => $this->getCallables())),
-        );
+        return [
+            ['foo("bar")', new FunctionNode('foo', new Node([new ConstantNode('bar')])), ['foo' => $this->getCallables()]],
+        ];
     }
 
     protected function getCallables()
     {
-        return array(
+        return [
             'compiler' => function ($arg) {
                 return sprintf('foo(%s)', $arg);
             },
             'evaluator' => function ($variables, $arg) {
                 return $arg;
             },
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/GetAttrNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/GetAttrNodeTest.php
index 750acaf93ee9b..59ee98deb5f9a 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/GetAttrNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/GetAttrNodeTest.php
@@ -20,41 +20,41 @@ class GetAttrNodeTest extends AbstractNodeTest
 {
     public function getEvaluateData()
     {
-        return array(
-            array('b', new GetAttrNode(new NameNode('foo'), new ConstantNode(0), $this->getArrayNode(), GetAttrNode::ARRAY_CALL), array('foo' => array('b' => 'a', 'b'))),
-            array('a', new GetAttrNode(new NameNode('foo'), new ConstantNode('b'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL), array('foo' => array('b' => 'a', 'b'))),
+        return [
+            ['b', new GetAttrNode(new NameNode('foo'), new ConstantNode(0), $this->getArrayNode(), GetAttrNode::ARRAY_CALL), ['foo' => ['b' => 'a', 'b']]],
+            ['a', new GetAttrNode(new NameNode('foo'), new ConstantNode('b'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL), ['foo' => ['b' => 'a', 'b']]],
 
-            array('bar', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::PROPERTY_CALL), array('foo' => new Obj())),
+            ['bar', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::PROPERTY_CALL), ['foo' => new Obj()]],
 
-            array('baz', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::METHOD_CALL), array('foo' => new Obj())),
-            array('a', new GetAttrNode(new NameNode('foo'), new NameNode('index'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL), array('foo' => array('b' => 'a', 'b'), 'index' => 'b')),
-        );
+            ['baz', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::METHOD_CALL), ['foo' => new Obj()]],
+            ['a', new GetAttrNode(new NameNode('foo'), new NameNode('index'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL), ['foo' => ['b' => 'a', 'b'], 'index' => 'b']],
+        ];
     }
 
     public function getCompileData()
     {
-        return array(
-            array('$foo[0]', new GetAttrNode(new NameNode('foo'), new ConstantNode(0), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)),
-            array('$foo["b"]', new GetAttrNode(new NameNode('foo'), new ConstantNode('b'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)),
+        return [
+            ['$foo[0]', new GetAttrNode(new NameNode('foo'), new ConstantNode(0), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)],
+            ['$foo["b"]', new GetAttrNode(new NameNode('foo'), new ConstantNode('b'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)],
 
-            array('$foo->foo', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::PROPERTY_CALL), array('foo' => new Obj())),
+            ['$foo->foo', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::PROPERTY_CALL), ['foo' => new Obj()]],
 
-            array('$foo->foo(array("b" => "a", 0 => "b"))', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::METHOD_CALL), array('foo' => new Obj())),
-            array('$foo[$index]', new GetAttrNode(new NameNode('foo'), new NameNode('index'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)),
-        );
+            ['$foo->foo(array("b" => "a", 0 => "b"))', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::METHOD_CALL), ['foo' => new Obj()]],
+            ['$foo[$index]', new GetAttrNode(new NameNode('foo'), new NameNode('index'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)],
+        ];
     }
 
     public function getDumpData()
     {
-        return array(
-            array('foo[0]', new GetAttrNode(new NameNode('foo'), new ConstantNode(0), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)),
-            array('foo["b"]', new GetAttrNode(new NameNode('foo'), new ConstantNode('b'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)),
+        return [
+            ['foo[0]', new GetAttrNode(new NameNode('foo'), new ConstantNode(0), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)],
+            ['foo["b"]', new GetAttrNode(new NameNode('foo'), new ConstantNode('b'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)],
 
-            array('foo.foo', new GetAttrNode(new NameNode('foo'), new NameNode('foo'), $this->getArrayNode(), GetAttrNode::PROPERTY_CALL), array('foo' => new Obj())),
+            ['foo.foo', new GetAttrNode(new NameNode('foo'), new NameNode('foo'), $this->getArrayNode(), GetAttrNode::PROPERTY_CALL), ['foo' => new Obj()]],
 
-            array('foo.foo({"b": "a", 0: "b"})', new GetAttrNode(new NameNode('foo'), new NameNode('foo'), $this->getArrayNode(), GetAttrNode::METHOD_CALL), array('foo' => new Obj())),
-            array('foo[index]', new GetAttrNode(new NameNode('foo'), new NameNode('index'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)),
-        );
+            ['foo.foo({"b": "a", 0: "b"})', new GetAttrNode(new NameNode('foo'), new NameNode('foo'), $this->getArrayNode(), GetAttrNode::METHOD_CALL), ['foo' => new Obj()]],
+            ['foo[index]', new GetAttrNode(new NameNode('foo'), new NameNode('index'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)],
+        ];
     }
 
     protected function getArrayNode()
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/NameNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/NameNodeTest.php
index 5fa2c37f29e68..a30c27b80489b 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/NameNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/NameNodeTest.php
@@ -17,22 +17,22 @@ class NameNodeTest extends AbstractNodeTest
 {
     public function getEvaluateData()
     {
-        return array(
-            array('bar', new NameNode('foo'), array('foo' => 'bar')),
-        );
+        return [
+            ['bar', new NameNode('foo'), ['foo' => 'bar']],
+        ];
     }
 
     public function getCompileData()
     {
-        return array(
-            array('$foo', new NameNode('foo')),
-        );
+        return [
+            ['$foo', new NameNode('foo')],
+        ];
     }
 
     public function getDumpData()
     {
-        return array(
-            array('foo', new NameNode('foo')),
-        );
+        return [
+            ['foo', new NameNode('foo')],
+        ];
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/NodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/NodeTest.php
index 140f1521340dc..351da05144bc3 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/NodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/NodeTest.php
@@ -19,7 +19,7 @@ class NodeTest extends TestCase
 {
     public function testToString()
     {
-        $node = new Node(array(new ConstantNode('foo')));
+        $node = new Node([new ConstantNode('foo')]);
 
         $this->assertEquals(<<<'EOF'
 Node(
@@ -31,7 +31,7 @@ public function testToString()
 
     public function testSerialization()
     {
-        $node = new Node(array('foo' => 'bar'), array('bar' => 'foo'));
+        $node = new Node(['foo' => 'bar'], ['bar' => 'foo']);
 
         $serializedNode = serialize($node);
         $unserializedNode = unserialize($serializedNode);
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php
index 1e9ffba21e534..d030600fe8fe5 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php
@@ -25,7 +25,7 @@ class ParserTest extends TestCase
     public function testParseWithInvalidName()
     {
         $lexer = new Lexer();
-        $parser = new Parser(array());
+        $parser = new Parser([]);
         $parser->parse($lexer->tokenize('foo'));
     }
 
@@ -36,17 +36,17 @@ public function testParseWithInvalidName()
     public function testParseWithZeroInNames()
     {
         $lexer = new Lexer();
-        $parser = new Parser(array());
-        $parser->parse($lexer->tokenize('foo'), array(0));
+        $parser = new Parser([]);
+        $parser->parse($lexer->tokenize('foo'), [0]);
     }
 
     /**
      * @dataProvider getParseData
      */
-    public function testParse($node, $expression, $names = array())
+    public function testParse($node, $expression, $names = [])
     {
         $lexer = new Lexer();
-        $parser = new Parser(array());
+        $parser = new Parser([]);
         $this->assertEquals($node, $parser->parse($lexer->tokenize($expression), $names));
     }
 
@@ -57,63 +57,63 @@ public function getParseData()
         $arguments->addElement(new Node\ConstantNode(2));
         $arguments->addElement(new Node\ConstantNode(true));
 
-        return array(
-            array(
+        return [
+            [
                 new Node\NameNode('a'),
                 'a',
-                array('a'),
-            ),
-            array(
+                ['a'],
+            ],
+            [
                 new Node\ConstantNode('a'),
                 '"a"',
-            ),
-            array(
+            ],
+            [
                 new Node\ConstantNode(3),
                 '3',
-            ),
-            array(
+            ],
+            [
                 new Node\ConstantNode(false),
                 'false',
-            ),
-            array(
+            ],
+            [
                 new Node\ConstantNode(true),
                 'true',
-            ),
-            array(
+            ],
+            [
                 new Node\ConstantNode(null),
                 'null',
-            ),
-            array(
+            ],
+            [
                 new Node\UnaryNode('-', new Node\ConstantNode(3)),
                 '-3',
-            ),
-            array(
+            ],
+            [
                 new Node\BinaryNode('-', new Node\ConstantNode(3), new Node\ConstantNode(3)),
                 '3 - 3',
-            ),
-            array(
+            ],
+            [
                 new Node\BinaryNode('*',
                     new Node\BinaryNode('-', new Node\ConstantNode(3), new Node\ConstantNode(3)),
                     new Node\ConstantNode(2)
                 ),
                 '(3 - 3) * 2',
-            ),
-            array(
+            ],
+            [
                 new Node\GetAttrNode(new Node\NameNode('foo'), new Node\ConstantNode('bar', true), new Node\ArgumentsNode(), Node\GetAttrNode::PROPERTY_CALL),
                 'foo.bar',
-                array('foo'),
-            ),
-            array(
+                ['foo'],
+            ],
+            [
                 new Node\GetAttrNode(new Node\NameNode('foo'), new Node\ConstantNode('bar', true), new Node\ArgumentsNode(), Node\GetAttrNode::METHOD_CALL),
                 'foo.bar()',
-                array('foo'),
-            ),
-            array(
+                ['foo'],
+            ],
+            [
                 new Node\GetAttrNode(new Node\NameNode('foo'), new Node\ConstantNode('not', true), new Node\ArgumentsNode(), Node\GetAttrNode::METHOD_CALL),
                 'foo.not()',
-                array('foo'),
-            ),
-            array(
+                ['foo'],
+            ],
+            [
                 new Node\GetAttrNode(
                     new Node\NameNode('foo'),
                     new Node\ConstantNode('bar', true),
@@ -121,24 +121,24 @@ public function getParseData()
                     Node\GetAttrNode::METHOD_CALL
                 ),
                 'foo.bar("arg1", 2, true)',
-                array('foo'),
-            ),
-            array(
+                ['foo'],
+            ],
+            [
                 new Node\GetAttrNode(new Node\NameNode('foo'), new Node\ConstantNode(3), new Node\ArgumentsNode(), Node\GetAttrNode::ARRAY_CALL),
                 'foo[3]',
-                array('foo'),
-            ),
-            array(
+                ['foo'],
+            ],
+            [
                 new Node\ConditionalNode(new Node\ConstantNode(true), new Node\ConstantNode(true), new Node\ConstantNode(false)),
                 'true ? true : false',
-            ),
-            array(
+            ],
+            [
                 new Node\BinaryNode('matches', new Node\ConstantNode('foo'), new Node\ConstantNode('/foo/')),
                 '"foo" matches "/foo/"',
-            ),
+            ],
 
             // chained calls
-            array(
+            [
                 $this->createGetAttrNode(
                     $this->createGetAttrNode(
                         $this->createGetAttrNode(
@@ -147,15 +147,15 @@ public function getParseData()
                         'baz', Node\GetAttrNode::PROPERTY_CALL),
                     '3', Node\GetAttrNode::ARRAY_CALL),
                 'foo.bar().foo().baz[3]',
-                array('foo'),
-            ),
+                ['foo'],
+            ],
 
-            array(
+            [
                 new Node\NameNode('foo'),
                 'bar',
-                array('foo' => 'bar'),
-            ),
-        );
+                ['foo' => 'bar'],
+            ],
+        ];
     }
 
     private function createGetAttrNode($node, $item, $type)
@@ -167,33 +167,33 @@ private function createGetAttrNode($node, $item, $type)
      * @dataProvider getInvalidPostfixData
      * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
      */
-    public function testParseWithInvalidPostfixData($expr, $names = array())
+    public function testParseWithInvalidPostfixData($expr, $names = [])
     {
         $lexer = new Lexer();
-        $parser = new Parser(array());
+        $parser = new Parser([]);
         $parser->parse($lexer->tokenize($expr), $names);
     }
 
     public function getInvalidPostfixData()
     {
-        return array(
-            array(
+        return [
+            [
                 'foo."#"',
-                array('foo'),
-            ),
-            array(
+                ['foo'],
+            ],
+            [
                 'foo."bar"',
-                array('foo'),
-            ),
-            array(
+                ['foo'],
+            ],
+            [
                 'foo.**',
-                array('foo'),
-            ),
-            array(
+                ['foo'],
+            ],
+            [
                 'foo.123',
-                array('foo'),
-            ),
-        );
+                ['foo'],
+            ],
+        ];
     }
 
     /**
@@ -203,8 +203,8 @@ public function getInvalidPostfixData()
     public function testNameProposal()
     {
         $lexer = new Lexer();
-        $parser = new Parser(array());
+        $parser = new Parser([]);
 
-        $parser->parse($lexer->tokenize('foo > bar'), array('foo', 'baz'));
+        $parser->parse($lexer->tokenize('foo > bar'), ['foo', 'baz']);
     }
 }
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index 08151cbf8cfa1..45f674be4c4b5 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -58,7 +58,7 @@ public function copy($originFile, $targetFile, $overwriteNewerFiles = false)
             }
 
             // Stream context created to allow files overwrite when using FTP stream wrapper - disabled by default
-            if (false === $target = @fopen($targetFile, 'w', null, stream_context_create(array('ftp' => array('overwrite' => true))))) {
+            if (false === $target = @fopen($targetFile, 'w', null, stream_context_create(['ftp' => ['overwrite' => true]]))) {
                 throw new IOException(sprintf('Failed to copy "%s" to "%s" because target file could not be opened for writing.', $originFile, $targetFile), 0, null, $originFile);
             }
 
@@ -164,7 +164,7 @@ public function remove($files)
         if ($files instanceof \Traversable) {
             $files = iterator_to_array($files, false);
         } elseif (!\is_array($files)) {
-            $files = array($files);
+            $files = [$files];
         }
         $files = array_reverse($files);
         foreach ($files as $file) {
@@ -281,7 +281,7 @@ public function rename($origin, $target, $overwrite = false)
         if (true !== @rename($origin, $target)) {
             if (is_dir($origin)) {
                 // See https://bugs.php.net/bug.php?id=54097 & http://php.net/manual/en/function.rename.php#113943
-                $this->mirror($origin, $target, null, array('override' => $overwrite, 'delete' => $overwrite));
+                $this->mirror($origin, $target, null, ['override' => $overwrite, 'delete' => $overwrite]);
                 $this->remove($origin);
 
                 return;
@@ -530,7 +530,7 @@ public function makePathRelative($endPath, $startPath)
      *
      * @throws IOException When file type is unknown
      */
-    public function mirror($originDir, $targetDir, \Traversable $iterator = null, $options = array())
+    public function mirror($originDir, $targetDir, \Traversable $iterator = null, $options = [])
     {
         $targetDir = rtrim($targetDir, '/\\');
         $originDir = rtrim($originDir, '/\\');
@@ -726,7 +726,7 @@ public function appendToFile($filename, $content)
      */
     private function toIterable($files)
     {
-        return \is_array($files) || $files instanceof \Traversable ? $files : array($files);
+        return \is_array($files) || $files instanceof \Traversable ? $files : [$files];
     }
 
     /**
@@ -740,7 +740,7 @@ private function getSchemeAndHierarchy($filename)
     {
         $components = explode('://', $filename, 2);
 
-        return 2 === \count($components) ? array($components[0], $components[1]) : array(null, $components[0]);
+        return 2 === \count($components) ? [$components[0], $components[1]] : [null, $components[0]];
     }
 
     private static function box($func)
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
index df8b8124f99a7..9d10a50ba43d6 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -197,9 +197,9 @@ public function testMkdirCreatesDirectoriesRecursively()
     public function testMkdirCreatesDirectoriesFromArray()
     {
         $basePath = $this->workspace.\DIRECTORY_SEPARATOR;
-        $directories = array(
+        $directories = [
             $basePath.'1', $basePath.'2', $basePath.'3',
-        );
+        ];
 
         $this->filesystem->mkdir($directories);
 
@@ -211,9 +211,9 @@ public function testMkdirCreatesDirectoriesFromArray()
     public function testMkdirCreatesDirectoriesFromTraversableObject()
     {
         $basePath = $this->workspace.\DIRECTORY_SEPARATOR;
-        $directories = new \ArrayObject(array(
+        $directories = new \ArrayObject([
             $basePath.'1', $basePath.'2', $basePath.'3',
-        ));
+        ]);
 
         $this->filesystem->mkdir($directories);
 
@@ -257,9 +257,9 @@ public function testTouchFails()
     public function testTouchCreatesEmptyFilesFromArray()
     {
         $basePath = $this->workspace.\DIRECTORY_SEPARATOR;
-        $files = array(
+        $files = [
             $basePath.'1', $basePath.'2', $basePath.'3',
-        );
+        ];
 
         $this->filesystem->touch($files);
 
@@ -271,9 +271,9 @@ public function testTouchCreatesEmptyFilesFromArray()
     public function testTouchCreatesEmptyFilesFromTraversableObject()
     {
         $basePath = $this->workspace.\DIRECTORY_SEPARATOR;
-        $files = new \ArrayObject(array(
+        $files = new \ArrayObject([
             $basePath.'1', $basePath.'2', $basePath.'3',
-        ));
+        ]);
 
         $this->filesystem->touch($files);
 
@@ -302,9 +302,9 @@ public function testRemoveCleansArrayOfFilesAndDirectories()
         mkdir($basePath.'dir');
         touch($basePath.'file');
 
-        $files = array(
+        $files = [
             $basePath.'dir', $basePath.'file',
-        );
+        ];
 
         $this->filesystem->remove($files);
 
@@ -319,9 +319,9 @@ public function testRemoveCleansTraversableObjectOfFilesAndDirectories()
         mkdir($basePath.'dir');
         touch($basePath.'file');
 
-        $files = new \ArrayObject(array(
+        $files = new \ArrayObject([
             $basePath.'dir', $basePath.'file',
-        ));
+        ]);
 
         $this->filesystem->remove($files);
 
@@ -335,9 +335,9 @@ public function testRemoveIgnoresNonExistingFiles()
 
         mkdir($basePath.'dir');
 
-        $files = array(
+        $files = [
             $basePath.'dir', $basePath.'file',
-        );
+        ];
 
         $this->filesystem->remove($files);
 
@@ -409,9 +409,9 @@ public function testFilesExistsTraversableObjectOfFilesAndDirectories()
         mkdir($basePath.'dir');
         touch($basePath.'file');
 
-        $files = new \ArrayObject(array(
+        $files = new \ArrayObject([
             $basePath.'dir', $basePath.'file',
-        ));
+        ]);
 
         $this->assertTrue($this->filesystem->exists($files));
     }
@@ -424,9 +424,9 @@ public function testFilesNotExistsTraversableObjectOfFilesAndDirectories()
         touch($basePath.'file');
         touch($basePath.'file2');
 
-        $files = new \ArrayObject(array(
+        $files = new \ArrayObject([
             $basePath.'dir', $basePath.'file', $basePath.'file2',
-        ));
+        ]);
 
         unlink($basePath.'file');
 
@@ -507,7 +507,7 @@ public function testChmodChangesModeOfArrayOfFiles()
 
         $directory = $this->workspace.\DIRECTORY_SEPARATOR.'directory';
         $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
-        $files = array($directory, $file);
+        $files = [$directory, $file];
 
         mkdir($directory);
         touch($file);
@@ -524,7 +524,7 @@ public function testChmodChangesModeOfTraversableFileObject()
 
         $directory = $this->workspace.\DIRECTORY_SEPARATOR.'directory';
         $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
-        $files = new \ArrayObject(array($directory, $file));
+        $files = new \ArrayObject([$directory, $file]);
 
         mkdir($directory);
         touch($file);
@@ -979,7 +979,7 @@ public function testLinkWithSeveralTargets()
 
         touch($file);
 
-        $this->filesystem->hardlink($file, array($link1, $link2));
+        $this->filesystem->hardlink($file, [$link1, $link2]);
 
         $this->assertTrue(is_file($link1));
         $this->assertEquals(fileinode($file), fileinode($link1));
@@ -997,7 +997,7 @@ public function testLinkWithSameTarget()
         touch($file);
 
         // practically same as testLinkIsNotOverwrittenIfAlreadyCreated
-        $this->filesystem->hardlink($file, array($link, $link));
+        $this->filesystem->hardlink($file, [$link, $link]);
 
         $this->assertTrue(is_file($link));
         $this->assertEquals(fileinode($file), fileinode($link));
@@ -1106,47 +1106,47 @@ public function testMakePathRelative($endPath, $startPath, $expectedPath)
 
     public function providePathsForMakePathRelative()
     {
-        $paths = array(
-            array('/var/lib/symfony/src/Symfony/', '/var/lib/symfony/src/Symfony/Component', '../'),
-            array('/var/lib/symfony/src/Symfony/', '/var/lib/symfony/src/Symfony/Component/', '../'),
-            array('/var/lib/symfony/src/Symfony', '/var/lib/symfony/src/Symfony/Component', '../'),
-            array('/var/lib/symfony/src/Symfony', '/var/lib/symfony/src/Symfony/Component/', '../'),
-            array('/usr/lib/symfony/', '/var/lib/symfony/src/Symfony/Component', '../../../../../../usr/lib/symfony/'),
-            array('/var/lib/symfony/src/Symfony/', '/var/lib/symfony/', 'src/Symfony/'),
-            array('/aa/bb', '/aa/bb', './'),
-            array('/aa/bb', '/aa/bb/', './'),
-            array('/aa/bb/', '/aa/bb', './'),
-            array('/aa/bb/', '/aa/bb/', './'),
-            array('/aa/bb/cc', '/aa/bb/cc/dd', '../'),
-            array('/aa/bb/cc', '/aa/bb/cc/dd/', '../'),
-            array('/aa/bb/cc/', '/aa/bb/cc/dd', '../'),
-            array('/aa/bb/cc/', '/aa/bb/cc/dd/', '../'),
-            array('/aa/bb/cc', '/aa', 'bb/cc/'),
-            array('/aa/bb/cc', '/aa/', 'bb/cc/'),
-            array('/aa/bb/cc/', '/aa', 'bb/cc/'),
-            array('/aa/bb/cc/', '/aa/', 'bb/cc/'),
-            array('/a/aab/bb', '/a/aa', '../aab/bb/'),
-            array('/a/aab/bb', '/a/aa/', '../aab/bb/'),
-            array('/a/aab/bb/', '/a/aa', '../aab/bb/'),
-            array('/a/aab/bb/', '/a/aa/', '../aab/bb/'),
-            array('/a/aab/bb/', '/', 'a/aab/bb/'),
-            array('/a/aab/bb/', '/b/aab', '../../a/aab/bb/'),
-            array('/aab/bb', '/aa', '../aab/bb/'),
-            array('/aab', '/aa', '../aab/'),
-            array('/aa/bb/cc', '/aa/dd/..', 'bb/cc/'),
-            array('/aa/../bb/cc', '/aa/dd/..', '../bb/cc/'),
-            array('/aa/bb/../../cc', '/aa/../dd/..', 'cc/'),
-            array('/../aa/bb/cc', '/aa/dd/..', 'bb/cc/'),
-            array('/../../aa/../bb/cc', '/aa/dd/..', '../bb/cc/'),
-            array('C:/aa/bb/cc', 'C:/aa/dd/..', 'bb/cc/'),
-            array('c:/aa/../bb/cc', 'c:/aa/dd/..', '../bb/cc/'),
-            array('C:/aa/bb/../../cc', 'C:/aa/../dd/..', 'cc/'),
-            array('C:/../aa/bb/cc', 'C:/aa/dd/..', 'bb/cc/'),
-            array('C:/../../aa/../bb/cc', 'C:/aa/dd/..', '../bb/cc/'),
-        );
+        $paths = [
+            ['/var/lib/symfony/src/Symfony/', '/var/lib/symfony/src/Symfony/Component', '../'],
+            ['/var/lib/symfony/src/Symfony/', '/var/lib/symfony/src/Symfony/Component/', '../'],
+            ['/var/lib/symfony/src/Symfony', '/var/lib/symfony/src/Symfony/Component', '../'],
+            ['/var/lib/symfony/src/Symfony', '/var/lib/symfony/src/Symfony/Component/', '../'],
+            ['/usr/lib/symfony/', '/var/lib/symfony/src/Symfony/Component', '../../../../../../usr/lib/symfony/'],
+            ['/var/lib/symfony/src/Symfony/', '/var/lib/symfony/', 'src/Symfony/'],
+            ['/aa/bb', '/aa/bb', './'],
+            ['/aa/bb', '/aa/bb/', './'],
+            ['/aa/bb/', '/aa/bb', './'],
+            ['/aa/bb/', '/aa/bb/', './'],
+            ['/aa/bb/cc', '/aa/bb/cc/dd', '../'],
+            ['/aa/bb/cc', '/aa/bb/cc/dd/', '../'],
+            ['/aa/bb/cc/', '/aa/bb/cc/dd', '../'],
+            ['/aa/bb/cc/', '/aa/bb/cc/dd/', '../'],
+            ['/aa/bb/cc', '/aa', 'bb/cc/'],
+            ['/aa/bb/cc', '/aa/', 'bb/cc/'],
+            ['/aa/bb/cc/', '/aa', 'bb/cc/'],
+            ['/aa/bb/cc/', '/aa/', 'bb/cc/'],
+            ['/a/aab/bb', '/a/aa', '../aab/bb/'],
+            ['/a/aab/bb', '/a/aa/', '../aab/bb/'],
+            ['/a/aab/bb/', '/a/aa', '../aab/bb/'],
+            ['/a/aab/bb/', '/a/aa/', '../aab/bb/'],
+            ['/a/aab/bb/', '/', 'a/aab/bb/'],
+            ['/a/aab/bb/', '/b/aab', '../../a/aab/bb/'],
+            ['/aab/bb', '/aa', '../aab/bb/'],
+            ['/aab', '/aa', '../aab/'],
+            ['/aa/bb/cc', '/aa/dd/..', 'bb/cc/'],
+            ['/aa/../bb/cc', '/aa/dd/..', '../bb/cc/'],
+            ['/aa/bb/../../cc', '/aa/../dd/..', 'cc/'],
+            ['/../aa/bb/cc', '/aa/dd/..', 'bb/cc/'],
+            ['/../../aa/../bb/cc', '/aa/dd/..', '../bb/cc/'],
+            ['C:/aa/bb/cc', 'C:/aa/dd/..', 'bb/cc/'],
+            ['c:/aa/../bb/cc', 'c:/aa/dd/..', '../bb/cc/'],
+            ['C:/aa/bb/../../cc', 'C:/aa/../dd/..', 'cc/'],
+            ['C:/../aa/bb/cc', 'C:/aa/dd/..', 'bb/cc/'],
+            ['C:/../../aa/../bb/cc', 'C:/aa/dd/..', '../bb/cc/'],
+        ];
 
         if ('\\' === \DIRECTORY_SEPARATOR) {
-            $paths[] = array('c:\var\lib/symfony/src/Symfony/', 'c:/var/lib/symfony/', 'src/Symfony/');
+            $paths[] = ['c:\var\lib/symfony/src/Symfony/', 'c:/var/lib/symfony/', 'src/Symfony/'];
         }
 
         return $paths;
@@ -1205,19 +1205,19 @@ public function testMirrorCopiesFilesAndDirectoriesRecursively()
 
         $this->filesystem->remove($file1);
 
-        $this->filesystem->mirror($sourcePath, $targetPath, null, array('delete' => false));
+        $this->filesystem->mirror($sourcePath, $targetPath, null, ['delete' => false]);
         $this->assertTrue($this->filesystem->exists($targetPath.'directory'.\DIRECTORY_SEPARATOR.'file1'));
 
-        $this->filesystem->mirror($sourcePath, $targetPath, null, array('delete' => true));
+        $this->filesystem->mirror($sourcePath, $targetPath, null, ['delete' => true]);
         $this->assertFalse($this->filesystem->exists($targetPath.'directory'.\DIRECTORY_SEPARATOR.'file1'));
 
         file_put_contents($file1, 'FILE1');
 
-        $this->filesystem->mirror($sourcePath, $targetPath, null, array('delete' => true));
+        $this->filesystem->mirror($sourcePath, $targetPath, null, ['delete' => true]);
         $this->assertTrue($this->filesystem->exists($targetPath.'directory'.\DIRECTORY_SEPARATOR.'file1'));
 
         $this->filesystem->remove($directory);
-        $this->filesystem->mirror($sourcePath, $targetPath, null, array('delete' => true));
+        $this->filesystem->mirror($sourcePath, $targetPath, null, ['delete' => true]);
         $this->assertFalse($this->filesystem->exists($targetPath.'directory'));
         $this->assertFalse($this->filesystem->exists($targetPath.'directory'.\DIRECTORY_SEPARATOR.'file1'));
     }
@@ -1339,7 +1339,7 @@ public function testMirrorContentsWithSameNameAsSourceOrTargetWithDeleteOption()
         $oldPath = getcwd();
         chdir($this->workspace);
 
-        $this->filesystem->mirror('source', 'target', null, array('delete' => true));
+        $this->filesystem->mirror('source', 'target', null, ['delete' => true]);
 
         chdir($oldPath);
 
@@ -1360,15 +1360,15 @@ public function testIsAbsolutePath($path, $expectedResult)
 
     public function providePathsForIsAbsolutePath()
     {
-        return array(
-            array('/var/lib', true),
-            array('c:\\\\var\\lib', true),
-            array('\\var\\lib', true),
-            array('var/lib', false),
-            array('../var/lib', false),
-            array('', false),
-            array(null, false),
-        );
+        return [
+            ['/var/lib', true],
+            ['c:\\\\var\\lib', true],
+            ['\\var\\lib', true],
+            ['var/lib', false],
+            ['../var/lib', false],
+            ['', false],
+            [null, false],
+        ];
     }
 
     public function testTempnam()
@@ -1498,7 +1498,7 @@ public function testDumpFileWithArray()
     {
         $filename = $this->workspace.\DIRECTORY_SEPARATOR.'foo'.\DIRECTORY_SEPARATOR.'baz.txt';
 
-        $this->filesystem->dumpFile($filename, array('bar'));
+        $this->filesystem->dumpFile($filename, ['bar']);
 
         $this->assertFileExists($filename);
         $this->assertStringEqualsFile($filename, 'bar');
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
index 642925ddee578..eb6b35ddfd621 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
@@ -18,7 +18,7 @@ class FilesystemTestCase extends TestCase
 {
     private $umask;
 
-    protected $longPathNamesWindows = array();
+    protected $longPathNamesWindows = [];
 
     /**
      * @var \Symfony\Component\Filesystem\Filesystem
@@ -84,7 +84,7 @@ protected function tearDown()
             foreach ($this->longPathNamesWindows as $path) {
                 exec('DEL '.$path);
             }
-            $this->longPathNamesWindows = array();
+            $this->longPathNamesWindows = [];
         }
 
         $this->filesystem->remove($this->workspace);
diff --git a/src/Symfony/Component/Filesystem/Tests/Fixtures/MockStream/MockStream.php b/src/Symfony/Component/Filesystem/Tests/Fixtures/MockStream/MockStream.php
index f14420fb60a1a..3d80a90582ce8 100644
--- a/src/Symfony/Component/Filesystem/Tests/Fixtures/MockStream/MockStream.php
+++ b/src/Symfony/Component/Filesystem/Tests/Fixtures/MockStream/MockStream.php
@@ -41,6 +41,6 @@ public function stream_open($path, $mode, $options, &$opened_path)
      */
     public function url_stat($path, $flags)
     {
-        return array();
+        return [];
     }
 }
diff --git a/src/Symfony/Component/Finder/Comparator/Comparator.php b/src/Symfony/Component/Finder/Comparator/Comparator.php
index ea37566df8887..6aee21cf09290 100644
--- a/src/Symfony/Component/Finder/Comparator/Comparator.php
+++ b/src/Symfony/Component/Finder/Comparator/Comparator.php
@@ -64,7 +64,7 @@ public function setOperator($operator)
             $operator = '==';
         }
 
-        if (!\in_array($operator, array('>', '<', '>=', '<=', '==', '!='))) {
+        if (!\in_array($operator, ['>', '<', '>=', '<=', '==', '!='])) {
             throw new \InvalidArgumentException(sprintf('Invalid operator "%s".', $operator));
         }
 
diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
index 050162970113e..5f79511552efa 100644
--- a/src/Symfony/Component/Finder/Finder.php
+++ b/src/Symfony/Component/Finder/Finder.php
@@ -536,13 +536,13 @@ public function ignoreUnreadableDirs($ignore = true)
      */
     public function in($dirs)
     {
-        $resolvedDirs = array();
+        $resolvedDirs = [];
 
         foreach ((array) $dirs as $dir) {
             if (is_dir($dir)) {
                 $resolvedDirs[] = $this->normalizeDir($dir);
             } elseif ($glob = glob($dir, (\defined('GLOB_BRACE') ? GLOB_BRACE : 0) | GLOB_ONLYDIR)) {
-                $resolvedDirs = array_merge($resolvedDirs, array_map(array($this, 'normalizeDir'), $glob));
+                $resolvedDirs = array_merge($resolvedDirs, array_map([$this, 'normalizeDir'], $glob));
             } else {
                 throw new \InvalidArgumentException(sprintf('The "%s" directory does not exist.', $dir));
             }
diff --git a/src/Symfony/Component/Finder/Iterator/CustomFilterIterator.php b/src/Symfony/Component/Finder/Iterator/CustomFilterIterator.php
index 6666e07ec54bb..896f7e912f087 100644
--- a/src/Symfony/Component/Finder/Iterator/CustomFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/CustomFilterIterator.php
@@ -21,7 +21,7 @@
  */
 class CustomFilterIterator extends FilterIterator
 {
-    private $filters = array();
+    private $filters = [];
 
     /**
      * @param \Iterator  $iterator The Iterator to filter
diff --git a/src/Symfony/Component/Finder/Iterator/DateRangeFilterIterator.php b/src/Symfony/Component/Finder/Iterator/DateRangeFilterIterator.php
index b01e5e3f5d885..8a47321a3c370 100644
--- a/src/Symfony/Component/Finder/Iterator/DateRangeFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/DateRangeFilterIterator.php
@@ -20,7 +20,7 @@
  */
 class DateRangeFilterIterator extends FilterIterator
 {
-    private $comparators = array();
+    private $comparators = [];
 
     /**
      * @param \Iterator        $iterator    The Iterator to filter
diff --git a/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php b/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php
index c57128c278492..bc0e6fc1e1a9f 100644
--- a/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php
@@ -20,7 +20,7 @@ class ExcludeDirectoryFilterIterator extends FilterIterator implements \Recursiv
 {
     private $iterator;
     private $isRecursive;
-    private $excludedDirs = array();
+    private $excludedDirs = [];
     private $excludedPattern;
 
     /**
@@ -31,7 +31,7 @@ public function __construct(\Iterator $iterator, array $directories)
     {
         $this->iterator = $iterator;
         $this->isRecursive = $iterator instanceof \RecursiveIterator;
-        $patterns = array();
+        $patterns = [];
         foreach ($directories as $directory) {
             $directory = rtrim($directory, '/');
             if (!$this->isRecursive || false !== strpos($directory, '/')) {
@@ -75,7 +75,7 @@ public function hasChildren()
 
     public function getChildren()
     {
-        $children = new self($this->iterator->getChildren(), array());
+        $children = new self($this->iterator->getChildren(), []);
         $children->excludedDirs = $this->excludedDirs;
         $children->excludedPattern = $this->excludedPattern;
 
diff --git a/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php b/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php
index fc8854047e342..ee365a58b084f 100644
--- a/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php
@@ -18,8 +18,8 @@
  */
 abstract class MultiplePcreFilterIterator extends FilterIterator
 {
-    protected $matchRegexps = array();
-    protected $noMatchRegexps = array();
+    protected $matchRegexps = [];
+    protected $noMatchRegexps = [];
 
     /**
      * @param \Iterator $iterator        The Iterator to filter
@@ -91,7 +91,7 @@ protected function isRegex($str)
                 return !preg_match('/[*?[:alnum:] \\\\]/', $start);
             }
 
-            foreach (array(array('{', '}'), array('(', ')'), array('[', ']'), array('<', '>')) as $delimiters) {
+            foreach ([['{', '}'], ['(', ')'], ['[', ']'], ['<', '>']] as $delimiters) {
                 if ($start === $delimiters[0] && $end === $delimiters[1]) {
                     return true;
                 }
diff --git a/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php b/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
index 3e6ef86ade59f..ab48a2b8a174d 100644
--- a/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
@@ -100,7 +100,7 @@ public function getChildren()
         } catch (\UnexpectedValueException $e) {
             if ($this->ignoreUnreadableDirs) {
                 // If directory is unreadable and finder is set to ignore it, a fake empty content is returned.
-                return new \RecursiveArrayIterator(array());
+                return new \RecursiveArrayIterator([]);
             } else {
                 throw new AccessDeniedException($e->getMessage(), $e->getCode(), $e);
             }
diff --git a/src/Symfony/Component/Finder/Iterator/SizeRangeFilterIterator.php b/src/Symfony/Component/Finder/Iterator/SizeRangeFilterIterator.php
index bd1a7fb700481..4e521c8c9040c 100644
--- a/src/Symfony/Component/Finder/Iterator/SizeRangeFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/SizeRangeFilterIterator.php
@@ -20,7 +20,7 @@
  */
 class SizeRangeFilterIterator extends FilterIterator
 {
-    private $comparators = array();
+    private $comparators = [];
 
     /**
      * @param \Iterator          $iterator    The Iterator to filter
diff --git a/src/Symfony/Component/Finder/Tests/Comparator/ComparatorTest.php b/src/Symfony/Component/Finder/Tests/Comparator/ComparatorTest.php
index 656fc57a4bc46..2f56092ed8760 100644
--- a/src/Symfony/Component/Finder/Tests/Comparator/ComparatorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Comparator/ComparatorTest.php
@@ -58,8 +58,8 @@ public function testTest($operator, $target, $match, $noMatch)
 
     public function getTestData()
     {
-        return array(
-            array('<', '1000', array('500', '999'), array('1000', '1500')),
-        );
+        return [
+            ['<', '1000', ['500', '999'], ['1000', '1500']],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Finder/Tests/Comparator/DateComparatorTest.php b/src/Symfony/Component/Finder/Tests/Comparator/DateComparatorTest.php
index 8a6c1ddfd19e2..3aebf524499f7 100644
--- a/src/Symfony/Component/Finder/Tests/Comparator/DateComparatorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Comparator/DateComparatorTest.php
@@ -51,14 +51,14 @@ public function testTest($test, $match, $noMatch)
 
     public function getTestData()
     {
-        return array(
-            array('< 2005-10-10', array(strtotime('2005-10-09')), array(strtotime('2005-10-15'))),
-            array('until 2005-10-10', array(strtotime('2005-10-09')), array(strtotime('2005-10-15'))),
-            array('before 2005-10-10', array(strtotime('2005-10-09')), array(strtotime('2005-10-15'))),
-            array('> 2005-10-10', array(strtotime('2005-10-15')), array(strtotime('2005-10-09'))),
-            array('after 2005-10-10', array(strtotime('2005-10-15')), array(strtotime('2005-10-09'))),
-            array('since 2005-10-10', array(strtotime('2005-10-15')), array(strtotime('2005-10-09'))),
-            array('!= 2005-10-10', array(strtotime('2005-10-11')), array(strtotime('2005-10-10'))),
-        );
+        return [
+            ['< 2005-10-10', [strtotime('2005-10-09')], [strtotime('2005-10-15')]],
+            ['until 2005-10-10', [strtotime('2005-10-09')], [strtotime('2005-10-15')]],
+            ['before 2005-10-10', [strtotime('2005-10-09')], [strtotime('2005-10-15')]],
+            ['> 2005-10-10', [strtotime('2005-10-15')], [strtotime('2005-10-09')]],
+            ['after 2005-10-10', [strtotime('2005-10-15')], [strtotime('2005-10-09')]],
+            ['since 2005-10-10', [strtotime('2005-10-15')], [strtotime('2005-10-09')]],
+            ['!= 2005-10-10', [strtotime('2005-10-11')], [strtotime('2005-10-10')]],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Finder/Tests/Comparator/NumberComparatorTest.php b/src/Symfony/Component/Finder/Tests/Comparator/NumberComparatorTest.php
index 30a75c738c5a4..5b49b660a7760 100644
--- a/src/Symfony/Component/Finder/Tests/Comparator/NumberComparatorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Comparator/NumberComparatorTest.php
@@ -53,39 +53,39 @@ public function testTest($test, $match, $noMatch)
 
     public function getTestData()
     {
-        return array(
-            array('< 1000', array('500', '999'), array('1000', '1500')),
+        return [
+            ['< 1000', ['500', '999'], ['1000', '1500']],
 
-            array('< 1K', array('500', '999'), array('1000', '1500')),
-            array('<1k', array('500', '999'), array('1000', '1500')),
-            array('  < 1 K ', array('500', '999'), array('1000', '1500')),
-            array('<= 1K', array('1000'), array('1001')),
-            array('> 1K', array('1001'), array('1000')),
-            array('>= 1K', array('1000'), array('999')),
+            ['< 1K', ['500', '999'], ['1000', '1500']],
+            ['<1k', ['500', '999'], ['1000', '1500']],
+            ['  < 1 K ', ['500', '999'], ['1000', '1500']],
+            ['<= 1K', ['1000'], ['1001']],
+            ['> 1K', ['1001'], ['1000']],
+            ['>= 1K', ['1000'], ['999']],
 
-            array('< 1KI', array('500', '1023'), array('1024', '1500')),
-            array('<= 1KI', array('1024'), array('1025')),
-            array('> 1KI', array('1025'), array('1024')),
-            array('>= 1KI', array('1024'), array('1023')),
+            ['< 1KI', ['500', '1023'], ['1024', '1500']],
+            ['<= 1KI', ['1024'], ['1025']],
+            ['> 1KI', ['1025'], ['1024']],
+            ['>= 1KI', ['1024'], ['1023']],
 
-            array('1KI', array('1024'), array('1023', '1025')),
-            array('==1KI', array('1024'), array('1023', '1025')),
+            ['1KI', ['1024'], ['1023', '1025']],
+            ['==1KI', ['1024'], ['1023', '1025']],
 
-            array('==1m', array('1000000'), array('999999', '1000001')),
-            array('==1mi', array(1024 * 1024), array(1024 * 1024 - 1, 1024 * 1024 + 1)),
+            ['==1m', ['1000000'], ['999999', '1000001']],
+            ['==1mi', [1024 * 1024], [1024 * 1024 - 1, 1024 * 1024 + 1]],
 
-            array('==1g', array('1000000000'), array('999999999', '1000000001')),
-            array('==1gi', array(1024 * 1024 * 1024), array(1024 * 1024 * 1024 - 1, 1024 * 1024 * 1024 + 1)),
+            ['==1g', ['1000000000'], ['999999999', '1000000001']],
+            ['==1gi', [1024 * 1024 * 1024], [1024 * 1024 * 1024 - 1, 1024 * 1024 * 1024 + 1]],
 
-            array('!= 1000', array('500', '999'), array('1000')),
-        );
+            ['!= 1000', ['500', '999'], ['1000']],
+        ];
     }
 
     public function getConstructorTestData()
     {
-        return array(
-            array(
-                array(
+        return [
+            [
+                [
                     '1', '0',
                     '3.5', '33.55', '123.456', '123456.78',
                     '.1', '.123',
@@ -94,15 +94,15 @@ public function getConstructorTestData()
                     '==1', '!=1', '<1', '>1', '<=1', '>=1',
                     '==1k', '==1ki', '==1m', '==1mi', '==1g', '==1gi',
                     '1k', '1ki', '1m', '1mi', '1g', '1gi',
-                ),
-                array(
+                ],
+                [
                     false, null, '',
                     ' ', 'foobar',
                     '=1', '===1',
                     '0 . 1', '123 .45', '234. 567',
                     '..', '.0.', '0.1.2',
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
index fbdcc36e6bad2..e3b87ef8eaff1 100644
--- a/src/Symfony/Component/Finder/Tests/FinderTest.php
+++ b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -65,7 +65,7 @@ public function testSymlinksNotResolved()
         $finder = $this->buildFinder();
 
         symlink($this->toAbsolute('foo'), $this->toAbsolute('baz'));
-        $expected = $this->toAbsolute(array('baz/bar.tmp'));
+        $expected = $this->toAbsolute(['baz/bar.tmp']);
         $in = self::$tmpDir.'/baz/';
         try {
             $this->assertIterator($expected, $finder->in($in)->files()->getIterator());
@@ -80,7 +80,7 @@ public function testBackPathNotNormalized()
     {
         $finder = $this->buildFinder();
 
-        $expected = $this->toAbsolute(array('foo/../foo/bar.tmp'));
+        $expected = $this->toAbsolute(['foo/../foo/bar.tmp']);
         $in = self::$tmpDir.'/foo/../foo/';
         $this->assertIterator($expected, $finder->in($in)->files()->getIterator());
     }
@@ -300,9 +300,9 @@ public function testInWithNonExistentDirectory()
     public function testInWithGlob()
     {
         $finder = $this->buildFinder();
-        $finder->in(array(__DIR__.'/Fixtures/*/B/C/', __DIR__.'/Fixtures/*/*/B/C/'))->getIterator();
+        $finder->in([__DIR__.'/Fixtures/*/B/C/', __DIR__.'/Fixtures/*/*/B/C/'])->getIterator();
 
-        $this->assertIterator($this->toAbsoluteFixtures(array('A/B/C/abc.dat', 'copy/A/B/C/abc.dat.copy')), $finder);
+        $this->assertIterator($this->toAbsoluteFixtures(['A/B/C/abc.dat', 'copy/A/B/C/abc.dat.copy']), $finder);
     }
 
     /**
@@ -317,9 +317,9 @@ public function testInWithNonDirectoryGlob()
     public function testInWithGlobBrace()
     {
         $finder = $this->buildFinder();
-        $finder->in(array(__DIR__.'/Fixtures/{A,copy/A}/B/C'))->getIterator();
+        $finder->in([__DIR__.'/Fixtures/{A,copy/A}/B/C'])->getIterator();
 
-        $this->assertIterator($this->toAbsoluteFixtures(array('A/B/C/abc.dat', 'copy/A/B/C/abc.dat.copy')), $finder);
+        $this->assertIterator($this->toAbsoluteFixtures(['A/B/C/abc.dat', 'copy/A/B/C/abc.dat.copy']), $finder);
     }
 
     /**
@@ -498,7 +498,7 @@ public function testContainsOnDirectory()
             ->directories()
             ->name('Fixtures')
             ->contains('abc');
-        $this->assertIterator(array(), $finder);
+        $this->assertIterator([], $finder);
     }
 
     public function testNotContainsOnDirectory()
@@ -508,7 +508,7 @@ public function testNotContainsOnDirectory()
             ->directories()
             ->name('Fixtures')
             ->notContains('abc');
-        $this->assertIterator(array(), $finder);
+        $this->assertIterator([], $finder);
     }
 
     /**
@@ -519,10 +519,10 @@ public function testNotContainsOnDirectory()
      */
     public function testMultipleLocations()
     {
-        $locations = array(
+        $locations = [
             self::$tmpDir.'/',
             self::$tmpDir.'/toto/',
-        );
+        ];
 
         // it is expected that there are test.py test.php in the tmpDir
         $finder = new Finder();
@@ -544,18 +544,18 @@ public function testMultipleLocations()
      */
     public function testMultipleLocationsWithSubDirectories()
     {
-        $locations = array(
+        $locations = [
             __DIR__.'/Fixtures/one',
             self::$tmpDir.\DIRECTORY_SEPARATOR.'toto',
-        );
+        ];
 
         $finder = $this->buildFinder();
         $finder->in($locations)->depth('< 10')->name('*.neon');
 
-        $expected = array(
+        $expected = [
             __DIR__.'/Fixtures/one'.\DIRECTORY_SEPARATOR.'b'.\DIRECTORY_SEPARATOR.'c.neon',
             __DIR__.'/Fixtures/one'.\DIRECTORY_SEPARATOR.'b'.\DIRECTORY_SEPARATOR.'d.neon',
-        );
+        ];
 
         $this->assertIterator($expected, $finder);
         $this->assertIteratorInForeach($expected, $finder);
@@ -622,26 +622,26 @@ public function testPath($matchPatterns, $noMatchPatterns, array $expected)
     public function getTestPathData()
     {
         return array(
-            array('', '', array()),
-            array('/^A\/B\/C/', '/C$/',
-                array('A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat'),
-            ),
-            array('/^A\/B/', 'foobar',
-                array(
+            ['', '', []],
+            ['/^A\/B\/C/', '/C$/',
+                ['A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat'],
+            ],
+            ['/^A\/B/', 'foobar',
+                [
                     'A'.\DIRECTORY_SEPARATOR.'B',
                     'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
                     'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat',
                     'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
-                ),
-            ),
-            array('A/B/C', 'foobar',
-                array(
+                ],
+            ],
+            ['A/B/C', 'foobar',
+                [
                     'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
                     'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
                     'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
                     'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat.copy',
-                ),
-            ),
+                ],
+            ],
             array('A/B', 'foobar',
                 array(
                     //dirs
diff --git a/src/Symfony/Component/Finder/Tests/GlobTest.php b/src/Symfony/Component/Finder/Tests/GlobTest.php
index 3a5aab3124281..2d48799c5cfa6 100644
--- a/src/Symfony/Component/Finder/Tests/GlobTest.php
+++ b/src/Symfony/Component/Finder/Tests/GlobTest.php
@@ -39,7 +39,7 @@ public function testGlobToRegexDoubleStarStrictDots()
         }
         sort($match);
 
-        $this->assertSame(array('one/b/c.neon', 'one/b/d.neon'), $match);
+        $this->assertSame(['one/b/c.neon', 'one/b/d.neon'], $match);
     }
 
     public function testGlobToRegexDoubleStarNonStrictDots()
@@ -56,7 +56,7 @@ public function testGlobToRegexDoubleStarNonStrictDots()
         }
         sort($match);
 
-        $this->assertSame(array('.dot/b/c.neon', '.dot/b/d.neon', 'one/b/c.neon', 'one/b/d.neon'), $match);
+        $this->assertSame(['.dot/b/c.neon', '.dot/b/d.neon', 'one/b/c.neon', 'one/b/d.neon'], $match);
     }
 
     public function testGlobToRegexDoubleStarWithoutLeadingSlash()
@@ -73,7 +73,7 @@ public function testGlobToRegexDoubleStarWithoutLeadingSlash()
         }
         sort($match);
 
-        $this->assertSame(array('one/a', 'one/b', 'one/b/c.neon', 'one/b/d.neon'), $match);
+        $this->assertSame(['one/a', 'one/b', 'one/b/c.neon', 'one/b/d.neon'], $match);
     }
 
     public function testGlobToRegexDoubleStarWithoutLeadingSlashNotStrictLeadingDot()
@@ -90,6 +90,6 @@ public function testGlobToRegexDoubleStarWithoutLeadingSlashNotStrictLeadingDot(
         }
         sort($match);
 
-        $this->assertSame(array('one/.dot', 'one/a', 'one/b', 'one/b/c.neon', 'one/b/d.neon'), $match);
+        $this->assertSame(['one/.dot', 'one/a', 'one/b', 'one/b/c.neon', 'one/b/d.neon'], $match);
     }
 }
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/CustomFilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/CustomFilterIteratorTest.php
index b036ad13c21b6..ad0187e032afc 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/CustomFilterIteratorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/CustomFilterIteratorTest.php
@@ -20,7 +20,7 @@ class CustomFilterIteratorTest extends IteratorTestCase
      */
     public function testWithInvalidFilter()
     {
-        new CustomFilterIterator(new Iterator(), array('foo'));
+        new CustomFilterIterator(new Iterator(), ['foo']);
     }
 
     /**
@@ -28,7 +28,7 @@ public function testWithInvalidFilter()
      */
     public function testAccept($filters, $expected)
     {
-        $inner = new Iterator(array('test.php', 'test.py', 'foo.php'));
+        $inner = new Iterator(['test.php', 'test.py', 'foo.php']);
 
         $iterator = new CustomFilterIterator($inner, $filters);
 
@@ -37,10 +37,10 @@ public function testAccept($filters, $expected)
 
     public function getAcceptData()
     {
-        return array(
-            array(array(function (\SplFileInfo $fileinfo) { return false; }), array()),
-            array(array(function (\SplFileInfo $fileinfo) { return 0 === strpos($fileinfo, 'test'); }), array('test.php', 'test.py')),
-            array(array('is_dir'), array()),
-        );
+        return [
+            [[function (\SplFileInfo $fileinfo) { return false; }], []],
+            [[function (\SplFileInfo $fileinfo) { return 0 === strpos($fileinfo, 'test'); }], ['test.php', 'test.py']],
+            [['is_dir'], []],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/FilecontentFilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/FilecontentFilterIteratorTest.php
index 744bdae12a62a..f4f70c8e8c738 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/FilecontentFilterIteratorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/FilecontentFilterIteratorTest.php
@@ -17,23 +17,23 @@ class FilecontentFilterIteratorTest extends IteratorTestCase
 {
     public function testAccept()
     {
-        $inner = new MockFileListIterator(array('test.txt'));
-        $iterator = new FilecontentFilterIterator($inner, array(), array());
-        $this->assertIterator(array('test.txt'), $iterator);
+        $inner = new MockFileListIterator(['test.txt']);
+        $iterator = new FilecontentFilterIterator($inner, [], []);
+        $this->assertIterator(['test.txt'], $iterator);
     }
 
     public function testDirectory()
     {
-        $inner = new MockFileListIterator(array('directory'));
-        $iterator = new FilecontentFilterIterator($inner, array('directory'), array());
-        $this->assertIterator(array(), $iterator);
+        $inner = new MockFileListIterator(['directory']);
+        $iterator = new FilecontentFilterIterator($inner, ['directory'], []);
+        $this->assertIterator([], $iterator);
     }
 
     public function testUnreadableFile()
     {
-        $inner = new MockFileListIterator(array('file r-'));
-        $iterator = new FilecontentFilterIterator($inner, array('file r-'), array());
-        $this->assertIterator(array(), $iterator);
+        $inner = new MockFileListIterator(['file r-']);
+        $iterator = new FilecontentFilterIterator($inner, ['file r-'], []);
+        $this->assertIterator([], $iterator);
     }
 
     /**
@@ -49,38 +49,38 @@ public function getTestFilterData()
     {
         $inner = new MockFileListIterator();
 
-        $inner[] = new MockSplFileInfo(array(
+        $inner[] = new MockSplFileInfo([
             'name' => 'a.txt',
             'contents' => 'Lorem ipsum...',
             'type' => 'file',
-            'mode' => 'r+', )
+            'mode' => 'r+', ]
         );
 
-        $inner[] = new MockSplFileInfo(array(
+        $inner[] = new MockSplFileInfo([
             'name' => 'b.yml',
             'contents' => 'dolor sit...',
             'type' => 'file',
-            'mode' => 'r+', )
+            'mode' => 'r+', ]
         );
 
-        $inner[] = new MockSplFileInfo(array(
+        $inner[] = new MockSplFileInfo([
             'name' => 'some/other/dir/third.php',
             'contents' => 'amet...',
             'type' => 'file',
-            'mode' => 'r+', )
+            'mode' => 'r+', ]
         );
 
-        $inner[] = new MockSplFileInfo(array(
+        $inner[] = new MockSplFileInfo([
             'name' => 'unreadable-file.txt',
             'contents' => false,
             'type' => 'file',
-            'mode' => 'r+', )
+            'mode' => 'r+', ]
         );
 
-        return array(
-            array($inner, array('.'), array(), array('a.txt', 'b.yml', 'some/other/dir/third.php')),
-            array($inner, array('ipsum'), array(), array('a.txt')),
-            array($inner, array('i', 'amet'), array('Lorem', 'amet'), array('b.yml')),
-        );
+        return [
+            [$inner, ['.'], [], ['a.txt', 'b.yml', 'some/other/dir/third.php']],
+            [$inner, ['ipsum'], [], ['a.txt']],
+            [$inner, ['i', 'amet'], ['Lorem', 'amet'], ['b.yml']],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/FilenameFilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/FilenameFilterIteratorTest.php
index c4b97959188c0..ca0b2fc59ff2a 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/FilenameFilterIteratorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/FilenameFilterIteratorTest.php
@@ -20,7 +20,7 @@ class FilenameFilterIteratorTest extends IteratorTestCase
      */
     public function testAccept($matchPatterns, $noMatchPatterns, $expected)
     {
-        $inner = new InnerNameIterator(array('test.php', 'test.py', 'foo.php'));
+        $inner = new InnerNameIterator(['test.php', 'test.py', 'foo.php']);
 
         $iterator = new FilenameFilterIterator($inner, $matchPatterns, $noMatchPatterns);
 
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/Iterator.php b/src/Symfony/Component/Finder/Tests/Iterator/Iterator.php
index 849bf081e2cc9..3e21a070047aa 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/Iterator.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/Iterator.php
@@ -13,9 +13,9 @@
 
 class Iterator implements \Iterator
 {
-    protected $values = array();
+    protected $values = [];
 
-    public function __construct(array $values = array())
+    public function __construct(array $values = [])
     {
         foreach ($values as $value) {
             $this->attach(new \SplFileInfo($value));
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php b/src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php
index 89f042aefadd8..796dc6ac360bb 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php
@@ -51,7 +51,7 @@ protected function assertOrderedIteratorForGroups($expected, \Traversable $itera
         $values = array_values(array_map(function (\SplFileInfo $fileinfo) { return $fileinfo->getPathname(); }, iterator_to_array($iterator)));
 
         foreach ($expected as $subarray) {
-            $temp = array();
+            $temp = [];
             while (\count($values) && \count($temp) < \count($subarray)) {
                 $temp[] = array_shift($values);
             }
@@ -69,7 +69,7 @@ protected function assertOrderedIteratorForGroups($expected, \Traversable $itera
      */
     protected function assertIteratorInForeach($expected, \Traversable $iterator)
     {
-        $values = array();
+        $values = [];
         foreach ($iterator as $file) {
             $this->assertInstanceOf('Symfony\\Component\\Finder\\SplFileInfo', $file);
             $values[] = $file->getPathname();
@@ -89,7 +89,7 @@ protected function assertIteratorInForeach($expected, \Traversable $iterator)
      */
     protected function assertOrderedIteratorInForeach($expected, \Traversable $iterator)
     {
-        $values = array();
+        $values = [];
         foreach ($iterator as $file) {
             $this->assertInstanceOf('Symfony\\Component\\Finder\\SplFileInfo', $file);
             $values[] = $file->getPathname();
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/MockFileListIterator.php b/src/Symfony/Component/Finder/Tests/Iterator/MockFileListIterator.php
index eb0adfad0a4c3..670478d7a7524 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/MockFileListIterator.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/MockFileListIterator.php
@@ -13,7 +13,7 @@
 
 class MockFileListIterator extends \ArrayIterator
 {
-    public function __construct(array $filesArray = array())
+    public function __construct(array $filesArray = [])
     {
         $files = array_map(function ($file) { return new MockSplFileInfo($file); }, $filesArray);
         parent::__construct($files);
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php b/src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php
index a5ac93a46c82f..58bb5979e97a3 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php
@@ -28,14 +28,14 @@ public function __construct($param)
         if (\is_string($param)) {
             parent::__construct($param);
         } elseif (\is_array($param)) {
-            $defaults = array(
+            $defaults = [
                 'name' => 'file.txt',
                 'contents' => null,
                 'mode' => null,
                 'type' => null,
                 'relativePath' => null,
                 'relativePathname' => null,
-            );
+            ];
             $defaults = array_merge($defaults, $param);
             parent::__construct($defaults['name']);
             $this->setContents($defaults['contents']);
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php
index f2c1cd2414c84..955677695ba0d 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php
@@ -27,24 +27,24 @@ public function testIsRegex($string, $isRegex, $message)
 
     public function getIsRegexFixtures()
     {
-        return array(
-            array('foo', false, 'string'),
-            array(' foo ', false, '" " is not a valid delimiter'),
-            array('\\foo\\', false, '"\\" is not a valid delimiter'),
-            array('afooa', false, '"a" is not a valid delimiter'),
-            array('//', false, 'the pattern should contain at least 1 character'),
-            array('/a/', true, 'valid regex'),
-            array('/foo/', true, 'valid regex'),
-            array('/foo/i', true, 'valid regex with a single modifier'),
-            array('/foo/imsxu', true, 'valid regex with multiple modifiers'),
-            array('#foo#', true, '"#" is a valid delimiter'),
-            array('{foo}', true, '"{,}" is a valid delimiter pair'),
-            array('[foo]', true, '"[,]" is a valid delimiter pair'),
-            array('(foo)', true, '"(,)" is a valid delimiter pair'),
-            array('<foo>', true, '"<,>" is a valid delimiter pair'),
-            array('*foo.*', false, '"*" is not considered as a valid delimiter'),
-            array('?foo.?', false, '"?" is not considered as a valid delimiter'),
-        );
+        return [
+            ['foo', false, 'string'],
+            [' foo ', false, '" " is not a valid delimiter'],
+            ['\\foo\\', false, '"\\" is not a valid delimiter'],
+            ['afooa', false, '"a" is not a valid delimiter'],
+            ['//', false, 'the pattern should contain at least 1 character'],
+            ['/a/', true, 'valid regex'],
+            ['/foo/', true, 'valid regex'],
+            ['/foo/i', true, 'valid regex with a single modifier'],
+            ['/foo/imsxu', true, 'valid regex with multiple modifiers'],
+            ['#foo#', true, '"#" is a valid delimiter'],
+            ['{foo}', true, '"{,}" is a valid delimiter pair'],
+            ['[foo]', true, '"[,]" is a valid delimiter pair'],
+            ['(foo)', true, '"(,)" is a valid delimiter pair'],
+            ['<foo>', true, '"<,>" is a valid delimiter pair'],
+            ['*foo.*', false, '"*" is not considered as a valid delimiter'],
+            ['?foo.?', false, '"?" is not considered as a valid delimiter'],
+        ];
     }
 }
 
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/PathFilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/PathFilterIteratorTest.php
index 38ed966a61039..d44651771f86c 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/PathFilterIteratorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/PathFilterIteratorTest.php
@@ -29,54 +29,54 @@ public function getTestFilterData()
         $inner = new MockFileListIterator();
 
         //PATH:   A/B/C/abc.dat
-        $inner[] = new MockSplFileInfo(array(
+        $inner[] = new MockSplFileInfo([
             'name' => 'abc.dat',
             'relativePathname' => 'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
-        ));
+        ]);
 
         //PATH:   A/B/ab.dat
-        $inner[] = new MockSplFileInfo(array(
+        $inner[] = new MockSplFileInfo([
             'name' => 'ab.dat',
             'relativePathname' => 'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat',
-        ));
+        ]);
 
         //PATH:   A/a.dat
-        $inner[] = new MockSplFileInfo(array(
+        $inner[] = new MockSplFileInfo([
             'name' => 'a.dat',
             'relativePathname' => 'A'.\DIRECTORY_SEPARATOR.'a.dat',
-        ));
+        ]);
 
         //PATH:   copy/A/B/C/abc.dat.copy
-        $inner[] = new MockSplFileInfo(array(
+        $inner[] = new MockSplFileInfo([
             'name' => 'abc.dat.copy',
             'relativePathname' => 'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
-        ));
+        ]);
 
         //PATH:   copy/A/B/ab.dat.copy
-        $inner[] = new MockSplFileInfo(array(
+        $inner[] = new MockSplFileInfo([
             'name' => 'ab.dat.copy',
             'relativePathname' => 'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat',
-        ));
+        ]);
 
         //PATH:   copy/A/a.dat.copy
-        $inner[] = new MockSplFileInfo(array(
+        $inner[] = new MockSplFileInfo([
             'name' => 'a.dat.copy',
             'relativePathname' => 'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'a.dat',
-        ));
+        ]);
 
-        return array(
-            array($inner, array('/^A/'),       array(), array('abc.dat', 'ab.dat', 'a.dat')),
-            array($inner, array('/^A\/B/'),    array(), array('abc.dat', 'ab.dat')),
-            array($inner, array('/^A\/B\/C/'), array(), array('abc.dat')),
-            array($inner, array('/A\/B\/C/'),  array(), array('abc.dat', 'abc.dat.copy')),
+        return [
+            [$inner, ['/^A/'],       [], ['abc.dat', 'ab.dat', 'a.dat']],
+            [$inner, ['/^A\/B/'],    [], ['abc.dat', 'ab.dat']],
+            [$inner, ['/^A\/B\/C/'], [], ['abc.dat']],
+            [$inner, ['/A\/B\/C/'],  [], ['abc.dat', 'abc.dat.copy']],
 
-            array($inner, array('A'),      array(), array('abc.dat', 'ab.dat', 'a.dat', 'abc.dat.copy', 'ab.dat.copy', 'a.dat.copy')),
-            array($inner, array('A/B'),    array(), array('abc.dat', 'ab.dat', 'abc.dat.copy', 'ab.dat.copy')),
-            array($inner, array('A/B/C'),  array(), array('abc.dat', 'abc.dat.copy')),
+            [$inner, ['A'],      [], ['abc.dat', 'ab.dat', 'a.dat', 'abc.dat.copy', 'ab.dat.copy', 'a.dat.copy']],
+            [$inner, ['A/B'],    [], ['abc.dat', 'ab.dat', 'abc.dat.copy', 'ab.dat.copy']],
+            [$inner, ['A/B/C'],  [], ['abc.dat', 'abc.dat.copy']],
 
-            array($inner, array('copy/A'),      array(), array('abc.dat.copy', 'ab.dat.copy', 'a.dat.copy')),
-            array($inner, array('copy/A/B'),    array(), array('abc.dat.copy', 'ab.dat.copy')),
-            array($inner, array('copy/A/B/C'),  array(), array('abc.dat.copy')),
-        );
+            [$inner, ['copy/A'],      [], ['abc.dat.copy', 'ab.dat.copy', 'a.dat.copy']],
+            [$inner, ['copy/A/B'],    [], ['abc.dat.copy', 'ab.dat.copy']],
+            [$inner, ['copy/A/B/C'],  [], ['abc.dat.copy']],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/RealIteratorTestCase.php b/src/Symfony/Component/Finder/Tests/Iterator/RealIteratorTestCase.php
index b0223b782b6a6..241b1cd597ae6 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/RealIteratorTestCase.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/RealIteratorTestCase.php
@@ -88,7 +88,7 @@ protected static function toAbsolute($files = null)
         }
 
         if (\is_array($files)) {
-            $f = array();
+            $f = [];
             foreach ($files as $file) {
                 if (\is_array($file)) {
                     $f[] = self::toAbsolute($file);
@@ -109,7 +109,7 @@ protected static function toAbsolute($files = null)
 
     protected static function toAbsoluteFixtures($files)
     {
-        $f = array();
+        $f = [];
         foreach ($files as $file) {
             $f[] = realpath(__DIR__.\DIRECTORY_SEPARATOR.'..'.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR.$file);
         }
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
index 0c9aca24b936e..037810aea799f 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
@@ -42,11 +42,11 @@ public function testSeekOnFtp()
             $this->markTestSkipped('Unsupported stream "ftp".');
         }
 
-        $contains = array(
+        $contains = [
             'ftp://speedtest.tele2.net'.\DIRECTORY_SEPARATOR.'1000GB.zip',
             'ftp://speedtest.tele2.net'.\DIRECTORY_SEPARATOR.'100GB.zip',
-        );
-        $actual = array();
+        ];
+        $actual = [];
 
         $i->seek(0);
         $actual[] = $i->getPathname();
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/SortableIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/SortableIteratorTest.php
index a35a12b5bee55..a0c400d78503a 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/SortableIteratorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/SortableIteratorTest.php
@@ -18,7 +18,7 @@ class SortableIteratorTest extends RealIteratorTestCase
     public function testConstructor()
     {
         try {
-            new SortableIterator(new Iterator(array()), 'foobar');
+            new SortableIterator(new Iterator([]), 'foobar');
             $this->fail('__construct() throws an \InvalidArgumentException exception if the mode is not valid');
         } catch (\Exception $e) {
             $this->assertInstanceOf('InvalidArgumentException', $e, '__construct() throws an \InvalidArgumentException exception if the mode is not valid');
@@ -73,7 +73,7 @@ public function testAccept($mode, $expected)
 
     public function getAcceptData()
     {
-        $sortByName = array(
+        $sortByName = [
             '.bar',
             '.foo',
             '.foo/.bar',
@@ -86,7 +86,7 @@ public function getAcceptData()
             'test.py',
             'toto',
             'toto/.git',
-        );
+        ];
 
         $sortByType = array(
             '.foo',
diff --git a/src/Symfony/Component/Form/AbstractExtension.php b/src/Symfony/Component/Form/AbstractExtension.php
index 61497aba6b623..f4ac2e5ce2b0f 100644
--- a/src/Symfony/Component/Form/AbstractExtension.php
+++ b/src/Symfony/Component/Form/AbstractExtension.php
@@ -86,7 +86,7 @@ public function getTypeExtensions($name)
 
         return isset($this->typeExtensions[$name])
             ? $this->typeExtensions[$name]
-            : array();
+            : [];
     }
 
     /**
@@ -120,7 +120,7 @@ public function getTypeGuesser()
      */
     protected function loadTypes()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -130,7 +130,7 @@ protected function loadTypes()
      */
     protected function loadTypeExtensions()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -149,7 +149,7 @@ protected function loadTypeGuesser()
      */
     private function initTypes()
     {
-        $this->types = array();
+        $this->types = [];
 
         foreach ($this->loadTypes() as $type) {
             if (!$type instanceof FormTypeInterface) {
@@ -168,7 +168,7 @@ private function initTypes()
      */
     private function initTypeExtensions()
     {
-        $this->typeExtensions = array();
+        $this->typeExtensions = [];
 
         foreach ($this->loadTypeExtensions() as $extension) {
             if (!$extension instanceof FormTypeExtensionInterface) {
diff --git a/src/Symfony/Component/Form/AbstractRendererEngine.php b/src/Symfony/Component/Form/AbstractRendererEngine.php
index c56d751ec30c1..ca807e5109816 100644
--- a/src/Symfony/Component/Form/AbstractRendererEngine.php
+++ b/src/Symfony/Component/Form/AbstractRendererEngine.php
@@ -24,11 +24,11 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface
     const CACHE_KEY_VAR = 'cache_key';
 
     protected $defaultThemes;
-    protected $themes = array();
-    protected $useDefaultThemes = array();
-    protected $resources = array();
+    protected $themes = [];
+    protected $useDefaultThemes = [];
+    protected $resources = [];
 
-    private $resourceHierarchyLevels = array();
+    private $resourceHierarchyLevels = [];
 
     /**
      * Creates a new renderer engine.
@@ -36,7 +36,7 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface
      * @param array $defaultThemes The default themes. The type of these
      *                             themes is open to the implementation.
      */
-    public function __construct(array $defaultThemes = array())
+    public function __construct(array $defaultThemes = [])
     {
         $this->defaultThemes = $defaultThemes;
     }
diff --git a/src/Symfony/Component/Form/Button.php b/src/Symfony/Component/Form/Button.php
index b72e6ae9ee0c6..8ae4946c565e0 100644
--- a/src/Symfony/Component/Form/Button.php
+++ b/src/Symfony/Component/Form/Button.php
@@ -132,7 +132,7 @@ public function getParent()
      *
      * @throws BadMethodCallException
      */
-    public function add($child, $type = null, array $options = array())
+    public function add($child, $type = null, array $options = [])
     {
         throw new BadMethodCallException('Buttons cannot have children.');
     }
@@ -182,7 +182,7 @@ public function remove($name)
      */
     public function all()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -190,7 +190,7 @@ public function all()
      */
     public function getErrors($deep = false, $flatten = true)
     {
-        return new FormErrorIterator($this, array());
+        return new FormErrorIterator($this, []);
     }
 
     /**
@@ -234,7 +234,7 @@ public function getViewData()
      */
     public function getExtraData()
     {
-        return array();
+        return [];
     }
 
     /**
diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
index 9524f68782d61..15aac018b8cc9 100644
--- a/src/Symfony/Component/Form/ButtonBuilder.php
+++ b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -45,7 +45,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
     /**
      * @var array
      */
-    private $attributes = array();
+    private $attributes = [];
 
     /**
      * @var array
@@ -82,7 +82,7 @@ public function __construct($name, array $options = array())
      *
      * @throws BadMethodCallException
      */
-    public function add($child, $type = null, array $options = array())
+    public function add($child, $type = null, array $options = [])
     {
         throw new BadMethodCallException('Buttons cannot have children.');
     }
@@ -98,7 +98,7 @@ public function add($child, $type = null, array $options = array())
      *
      * @throws BadMethodCallException
      */
-    public function create($name, $type = null, array $options = array())
+    public function create($name, $type = null, array $options = [])
     {
         throw new BadMethodCallException('Buttons cannot have children.');
     }
@@ -150,7 +150,7 @@ public function has($name)
      */
     public function all()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -588,7 +588,7 @@ public function getType()
      */
     public function getViewTransformers()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -598,7 +598,7 @@ public function getViewTransformers()
      */
     public function getModelTransformers()
     {
-        return array();
+        return [];
     }
 
     /**
diff --git a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
index 0554304f5333e..c33dda70ca6df 100644
--- a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
+++ b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
@@ -132,7 +132,7 @@ public function getOriginalKeys()
      */
     public function getChoicesForValues(array $values)
     {
-        $choices = array();
+        $choices = [];
 
         foreach ($values as $i => $givenValue) {
             if (array_key_exists($givenValue, $this->choices)) {
@@ -148,11 +148,11 @@ public function getChoicesForValues(array $values)
      */
     public function getValuesForChoices(array $choices)
     {
-        $values = array();
+        $values = [];
 
         // Use the value callback to compare choices by their values, if present
         if ($this->valueCallback) {
-            $givenValues = array();
+            $givenValues = [];
 
             foreach ($choices as $i => $givenChoice) {
                 $givenValues[$i] = (string) \call_user_func($this->valueCallback, $givenChoice);
@@ -190,9 +190,9 @@ public function getValuesForChoices(array $choices)
     protected function flatten(array $choices, $value, &$choicesByValues, &$keysByValues, &$structuredValues)
     {
         if (null === $choicesByValues) {
-            $choicesByValues = array();
-            $keysByValues = array();
-            $structuredValues = array();
+            $choicesByValues = [];
+            $keysByValues = [];
+            $structuredValues = [];
         }
 
         foreach ($choices as $key => $choice) {
@@ -219,7 +219,7 @@ protected function flatten(array $choices, $value, &$choicesByValues, &$keysByVa
      * @return bool returns true if the choices can be cast to strings and
      *              false otherwise
      */
-    private function castableToString(array $choices, array &$cache = array())
+    private function castableToString(array $choices, array &$cache = [])
     {
         foreach ($choices as $choice) {
             if (\is_array($choice)) {
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
index dba025bc6487a..8a9fac82aec61 100644
--- a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
@@ -27,12 +27,12 @@ class CachingFactoryDecorator implements ChoiceListFactoryInterface
     /**
      * @var ChoiceListInterface[]
      */
-    private $lists = array();
+    private $lists = [];
 
     /**
      * @var ChoiceListView[]
      */
-    private $views = array();
+    private $views = [];
 
     /**
      * Generates a SHA-256 hash for the given value.
@@ -73,7 +73,7 @@ public static function generateHash($value, $namespace = '')
     private static function flatten(array $array, &$output)
     {
         if (null === $output) {
-            $output = array();
+            $output = [];
         }
 
         foreach ($array as $key => $value) {
@@ -118,7 +118,7 @@ public function createListFromChoices($choices, $value = null)
         // choice list is returned.
         self::flatten($choices, $flatChoices);
 
-        $hash = self::generateHash(array($flatChoices, $value), 'fromChoices');
+        $hash = self::generateHash([$flatChoices, $value], 'fromChoices');
 
         if (!isset($this->lists[$hash])) {
             $this->lists[$hash] = $this->decoratedFactory->createListFromChoices($choices, $value);
@@ -132,7 +132,7 @@ public function createListFromChoices($choices, $value = null)
      */
     public function createListFromLoader(ChoiceLoaderInterface $loader, $value = null)
     {
-        $hash = self::generateHash(array($loader, $value), 'fromLoader');
+        $hash = self::generateHash([$loader, $value], 'fromLoader');
 
         if (!isset($this->lists[$hash])) {
             $this->lists[$hash] = $this->decoratedFactory->createListFromLoader($loader, $value);
@@ -148,7 +148,7 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
     {
         // The input is not validated on purpose. This way, the decorated
         // factory may decide which input to accept and which not.
-        $hash = self::generateHash(array($list, $preferredChoices, $label, $index, $groupBy, $attr));
+        $hash = self::generateHash([$list, $preferredChoices, $label, $index, $groupBy, $attr]);
 
         if (!isset($this->views[$hash])) {
             $this->views[$hash] = $this->decoratedFactory->createView(
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
index 5dfe8fcd4defc..87c68d2b6cea3 100644
--- a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
@@ -47,8 +47,8 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, $value = nul
      */
     public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null)
     {
-        $preferredViews = array();
-        $otherViews = array();
+        $preferredViews = [];
+        $otherViews = [];
         $choices = $list->getChoices();
         $keys = $list->getOriginalKeys();
 
@@ -157,8 +157,8 @@ private static function addChoiceViewsGroupedBy($groupBy, $label, $choices, $key
 
             // Add the contents of groups to new ChoiceGroupView instances
             if (\is_array($value)) {
-                $preferredViewsForGroup = array();
-                $otherViewsForGroup = array();
+                $preferredViewsForGroup = [];
+                $otherViewsForGroup = [];
 
                 self::addChoiceViewsGroupedBy(
                     $value,
diff --git a/src/Symfony/Component/Form/ChoiceList/Loader/CallbackChoiceLoader.php b/src/Symfony/Component/Form/ChoiceList/Loader/CallbackChoiceLoader.php
index b2825051afda5..07c048bba1a4a 100644
--- a/src/Symfony/Component/Form/ChoiceList/Loader/CallbackChoiceLoader.php
+++ b/src/Symfony/Component/Form/ChoiceList/Loader/CallbackChoiceLoader.php
@@ -56,7 +56,7 @@ public function loadChoicesForValues(array $values, $value = null)
     {
         // Optimize
         if (empty($values)) {
-            return array();
+            return [];
         }
 
         return $this->loadChoiceList($value)->getChoicesForValues($values);
@@ -69,7 +69,7 @@ public function loadValuesForChoices(array $choices, $value = null)
     {
         // Optimize
         if (empty($choices)) {
-            return array();
+            return [];
         }
 
         return $this->loadChoiceList($value)->getValuesForChoices($choices);
diff --git a/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php b/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php
index 17546182d5443..dd80486c9acea 100644
--- a/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php
+++ b/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php
@@ -27,7 +27,7 @@ class ChoiceGroupView implements \IteratorAggregate
      * @param string                         $label   The label of the group
      * @param ChoiceGroupView[]|ChoiceView[] $choices the choice views in the group
      */
-    public function __construct($label, array $choices = array())
+    public function __construct($label, array $choices = [])
     {
         $this->label = $label;
         $this->choices = $choices;
diff --git a/src/Symfony/Component/Form/ChoiceList/View/ChoiceListView.php b/src/Symfony/Component/Form/ChoiceList/View/ChoiceListView.php
index add892aab69ff..586269b51637a 100644
--- a/src/Symfony/Component/Form/ChoiceList/View/ChoiceListView.php
+++ b/src/Symfony/Component/Form/ChoiceList/View/ChoiceListView.php
@@ -31,7 +31,7 @@ class ChoiceListView
      * @param ChoiceGroupView[]|ChoiceView[] $choices          The choice views
      * @param ChoiceGroupView[]|ChoiceView[] $preferredChoices the preferred choice views
      */
-    public function __construct(array $choices = array(), array $preferredChoices = array())
+    public function __construct(array $choices = [], array $preferredChoices = [])
     {
         $this->choices = $choices;
         $this->preferredChoices = $preferredChoices;
diff --git a/src/Symfony/Component/Form/Command/DebugCommand.php b/src/Symfony/Component/Form/Command/DebugCommand.php
index 7ad84d8701c01..71bc18ca8f5b3 100644
--- a/src/Symfony/Component/Form/Command/DebugCommand.php
+++ b/src/Symfony/Component/Form/Command/DebugCommand.php
@@ -38,7 +38,7 @@ class DebugCommand extends Command
     private $extensions;
     private $guessers;
 
-    public function __construct(FormRegistryInterface $formRegistry, array $namespaces = array('Symfony\Component\Form\Extension\Core\Type'), array $types = array(), array $extensions = array(), array $guessers = array())
+    public function __construct(FormRegistryInterface $formRegistry, array $namespaces = ['Symfony\Component\Form\Extension\Core\Type'], array $types = [], array $extensions = [], array $guessers = [])
     {
         parent::__construct();
 
@@ -139,7 +139,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
     private function getFqcnTypeClass(InputInterface $input, SymfonyStyle $io, $shortClassName)
     {
-        $classes = array();
+        $classes = [];
         sort($this->namespaces);
         foreach ($this->namespaces as $namespace) {
             if (class_exists($fqcn = $namespace.'\\'.$shortClassName)) {
@@ -186,7 +186,7 @@ private function getCoreTypes()
 
     private function findAlternatives($name, array $collection)
     {
-        $alternatives = array();
+        $alternatives = [];
         foreach ($collection as $item) {
             $lev = levenshtein($name, $item);
             if ($lev <= \strlen($name) / 3 || false !== strpos($item, $name)) {
diff --git a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
index bfa4302da2210..9d7a9ce226de0 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
@@ -32,20 +32,20 @@ abstract class Descriptor implements DescriptorInterface
     /** @var OutputStyle */
     protected $output;
     protected $type;
-    protected $ownOptions = array();
-    protected $overriddenOptions = array();
-    protected $parentOptions = array();
-    protected $extensionOptions = array();
-    protected $requiredOptions = array();
-    protected $parents = array();
-    protected $extensions = array();
+    protected $ownOptions = [];
+    protected $overriddenOptions = [];
+    protected $parentOptions = [];
+    protected $extensionOptions = [];
+    protected $requiredOptions = [];
+    protected $parents = [];
+    protected $extensions = [];
 
     /**
      * {@inheritdoc}
      */
-    public function describe(OutputInterface $output, $object, array $options = array())
+    public function describe(OutputInterface $output, $object, array $options = [])
     {
-        $this->output = $output instanceof OutputStyle ? $output : new SymfonyStyle(new ArrayInput(array()), $output);
+        $this->output = $output instanceof OutputStyle ? $output : new SymfonyStyle(new ArrayInput([]), $output);
 
         switch (true) {
             case null === $object:
@@ -64,14 +64,14 @@ public function describe(OutputInterface $output, $object, array $options = arra
 
     abstract protected function describeDefaults(array $options);
 
-    abstract protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedFormType, array $options = array());
+    abstract protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedFormType, array $options = []);
 
     abstract protected function describeOption(OptionsResolver $optionsResolver, array $options);
 
     protected function collectOptions(ResolvedFormTypeInterface $type)
     {
-        $this->parents = array();
-        $this->extensions = array();
+        $this->parents = [];
+        $this->extensions = [];
 
         if (null !== $type->getParent()) {
             $optionsResolver = clone $this->getParentOptionsResolver($type->getParent());
@@ -83,7 +83,7 @@ protected function collectOptions(ResolvedFormTypeInterface $type)
         $this->ownOptions = array_diff($ownOptionsResolver->getDefinedOptions(), $optionsResolver->getDefinedOptions());
         $overriddenOptions = array_intersect(array_merge($ownOptionsResolver->getDefinedOptions(), $ownOptionsResolver->getUndefinedOptions()), $optionsResolver->getDefinedOptions());
 
-        $this->parentOptions = array();
+        $this->parentOptions = [];
         foreach ($this->parents as $class => $parentOptions) {
             $this->overriddenOptions[$class] = array_intersect($overriddenOptions, $parentOptions);
             $this->parentOptions[$class] = array_diff($parentOptions, $overriddenOptions);
@@ -91,7 +91,7 @@ protected function collectOptions(ResolvedFormTypeInterface $type)
 
         $type->getInnerType()->configureOptions($optionsResolver);
         $this->collectTypeExtensionsOptions($type, $optionsResolver);
-        $this->extensionOptions = array();
+        $this->extensionOptions = [];
         foreach ($this->extensions as $class => $extensionOptions) {
             $this->overriddenOptions[$class] = array_intersect($overriddenOptions, $extensionOptions);
             $this->extensionOptions[$class] = array_diff($extensionOptions, $overriddenOptions);
@@ -133,7 +133,7 @@ protected function getOptionDefinition(OptionsResolver $optionsResolver, $option
 
     private function getParentOptionsResolver(ResolvedFormTypeInterface $type)
     {
-        $this->parents[$class = \get_class($type->getInnerType())] = array();
+        $this->parents[$class = \get_class($type->getInnerType())] = [];
 
         if (null !== $type->getParent()) {
             $optionsResolver = clone $this->getParentOptionsResolver($type->getParent());
diff --git a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
index ac8a8bb232ff9..7758b795407b8 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
@@ -138,7 +138,7 @@ private function normalizeAndSortOptionsColumns(array $options)
                 }
 
                 if (!$sorted) {
-                    $options[$group] = array();
+                    $options[$group] = [];
                 } else {
                     $options[$group][] = null;
                 }
@@ -161,15 +161,15 @@ private function normalizeAndSortOptionsColumns(array $options)
     private function getDumpFunction()
     {
         $cloner = new VarCloner();
-        $cloner->addCasters(array('Closure' => function ($c, $a) {
+        $cloner->addCasters(['Closure' => function ($c, $a) {
             $prefix = Caster::PREFIX_VIRTUAL;
 
-            return array(
+            return [
                 $prefix.'parameters' => isset($a[$prefix.'parameters']) ? \count($a[$prefix.'parameters']->value) : 0,
                 $prefix.'file' => $a[$prefix.'file'],
                 $prefix.'line' => $a[$prefix.'line'],
-            );
-        }));
+            ];
+        }]);
         $dumper = new CliDumper(null, null, CliDumper::DUMP_LIGHT_ARRAY | CliDumper::DUMP_COMMA_SEPARATOR);
         $dumper->setColors($this->output->isDecorated());
 
diff --git a/src/Symfony/Component/Form/DependencyInjection/FormPass.php b/src/Symfony/Component/Form/DependencyInjection/FormPass.php
index 778d2b9ed036e..a398ad5fedf31 100644
--- a/src/Symfony/Component/Form/DependencyInjection/FormPass.php
+++ b/src/Symfony/Component/Form/DependencyInjection/FormPass.php
@@ -51,7 +51,7 @@ public function process(ContainerBuilder $container)
         }
 
         $definition = $container->getDefinition($this->formExtensionService);
-        if (new IteratorArgument(array()) != $definition->getArgument(2)) {
+        if (new IteratorArgument([]) != $definition->getArgument(2)) {
             return;
         }
         $definition->replaceArgument(0, $this->processFormTypes($container));
@@ -62,8 +62,8 @@ public function process(ContainerBuilder $container)
     private function processFormTypes(ContainerBuilder $container)
     {
         // Get service locator argument
-        $servicesMap = array();
-        $namespaces = array('Symfony\Component\Form\Extension\Core\Type' => true);
+        $servicesMap = [];
+        $namespaces = ['Symfony\Component\Form\Extension\Core\Type' => true];
 
         // Builds an array with fully-qualified type class names as keys and service IDs as values
         foreach ($container->findTaggedServiceIds($this->formTypeTag, true) as $serviceId => $tag) {
@@ -84,8 +84,8 @@ private function processFormTypes(ContainerBuilder $container)
 
     private function processFormTypeExtensions(ContainerBuilder $container)
     {
-        $typeExtensions = array();
-        $typeExtensionsClasses = array();
+        $typeExtensions = [];
+        $typeExtensionsClasses = [];
         foreach ($this->findAndSortTaggedServices($this->formTypeExtensionTag, $container) as $reference) {
             $serviceId = (string) $reference;
             $serviceDefinition = $container->getDefinition($serviceId);
@@ -115,8 +115,8 @@ private function processFormTypeExtensions(ContainerBuilder $container)
 
     private function processFormTypeGuessers(ContainerBuilder $container)
     {
-        $guessers = array();
-        $guessersClasses = array();
+        $guessers = [];
+        $guessersClasses = [];
         foreach ($container->findTaggedServiceIds($this->formTypeGuesserTag, true) as $serviceId => $tags) {
             $guessers[] = new Reference($serviceId);
 
diff --git a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php
index 5b01e9e90acd4..4eb980bf9cdff 100644
--- a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php
+++ b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php
@@ -41,7 +41,7 @@ public function __construct(PropertyAccessorInterface $propertyAccessor = null,
 
     protected function loadTypes()
     {
-        return array(
+        return [
             new Type\FormType($this->propertyAccessor),
             new Type\BirthdayType(),
             new Type\CheckboxType(),
@@ -76,13 +76,13 @@ protected function loadTypes()
             new Type\CurrencyType(),
             new Type\TelType(),
             new Type\ColorType(),
-        );
+        ];
     }
 
     protected function loadTypeExtensions()
     {
-        return array(
+        return [
             new TransformationFailureExtension($this->translator),
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Form/Extension/Core/DataMapper/CheckboxListMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/CheckboxListMapper.php
index 5e2101022278f..ddc771fe25ae8 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataMapper/CheckboxListMapper.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataMapper/CheckboxListMapper.php
@@ -31,7 +31,7 @@ class CheckboxListMapper implements DataMapperInterface
     public function mapDataToForms($choices, $checkboxes)
     {
         if (null === $choices) {
-            $choices = array();
+            $choices = [];
         }
 
         if (!\is_array($choices)) {
@@ -53,7 +53,7 @@ public function mapFormsToData($checkboxes, &$choices)
             throw new UnexpectedTypeException($choices, 'array');
         }
 
-        $values = array();
+        $values = [];
 
         foreach ($checkboxes as $checkbox) {
             if ($checkbox->getData()) {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php
index 9e86310b22391..92187d772ccc5 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php
@@ -35,7 +35,7 @@ public function __construct(PropertyAccessorInterface $propertyAccessor = null)
      */
     public function mapDataToForms($data, $forms)
     {
-        $empty = null === $data || array() === $data;
+        $empty = null === $data || [] === $data;
 
         if (!$empty && !\is_array($data) && !\is_object($data)) {
             throw new UnexpectedTypeException($data, 'object, array or empty');
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToPartsTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToPartsTransformer.php
index b09fba8532d48..2879dffdbc466 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToPartsTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToPartsTransformer.php
@@ -29,14 +29,14 @@ public function __construct(array $partMapping)
     public function transform($array)
     {
         if (null === $array) {
-            $array = array();
+            $array = [];
         }
 
         if (!\is_array($array)) {
             throw new TransformationFailedException('Expected an array.');
         }
 
-        $result = array();
+        $result = [];
 
         foreach ($this->partMapping as $partKey => $originalKeys) {
             if (empty($array)) {
@@ -55,8 +55,8 @@ public function reverseTransform($array)
             throw new TransformationFailedException('Expected an array.');
         }
 
-        $result = array();
-        $emptyKeys = array();
+        $result = [];
+        $emptyKeys = [];
 
         foreach ($this->partMapping as $partKey => $originalKeys) {
             if (!empty($array[$partKey])) {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php
index 46265828f2331..845ba88f04958 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php
@@ -17,13 +17,13 @@
 
 abstract class BaseDateTimeTransformer implements DataTransformerInterface
 {
-    protected static $formats = array(
+    protected static $formats = [
         \IntlDateFormatter::NONE,
         \IntlDateFormatter::FULL,
         \IntlDateFormatter::LONG,
         \IntlDateFormatter::MEDIUM,
         \IntlDateFormatter::SHORT,
-    );
+    ];
 
     protected $inputTimezone;
 
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php
index 1154ad08a5934..fae30857fff85 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php
@@ -29,7 +29,7 @@ public function __construct(ChoiceListInterface $choiceList)
 
     public function transform($choice)
     {
-        return (string) current($this->choiceList->getValuesForChoices(array($choice)));
+        return (string) current($this->choiceList->getValuesForChoices([$choice]));
     }
 
     public function reverseTransform($value)
@@ -38,7 +38,7 @@ public function reverseTransform($value)
             throw new TransformationFailedException('Expected a string or null.');
         }
 
-        $choices = $this->choiceList->getChoicesForValues(array((string) $value));
+        $choices = $this->choiceList->getChoicesForValues([(string) $value]);
 
         if (1 !== \count($choices)) {
             if (null === $value || '' === $value) {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php
index 835d51cddbb34..ac2108f0c43aa 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php
@@ -35,7 +35,7 @@ public function __construct(ChoiceListInterface $choiceList)
     public function transform($array)
     {
         if (null === $array) {
-            return array();
+            return [];
         }
 
         if (!\is_array($array)) {
@@ -55,7 +55,7 @@ public function transform($array)
     public function reverseTransform($array)
     {
         if (null === $array) {
-            return array();
+            return [];
         }
 
         if (!\is_array($array)) {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php
index e194ec4f74a1b..7cf2de51fef7f 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php
@@ -30,7 +30,7 @@ class DateIntervalToArrayTransformer implements DataTransformerInterface
     const SECONDS = 'seconds';
     const INVERT = 'invert';
 
-    private static $availableFields = array(
+    private static $availableFields = [
         self::YEARS => 'y',
         self::MONTHS => 'm',
         self::DAYS => 'd',
@@ -38,7 +38,7 @@ class DateIntervalToArrayTransformer implements DataTransformerInterface
         self::MINUTES => 'i',
         self::SECONDS => 's',
         self::INVERT => 'r',
-    );
+    ];
     private $fields;
     private $pad;
 
@@ -49,7 +49,7 @@ class DateIntervalToArrayTransformer implements DataTransformerInterface
     public function __construct(array $fields = null, $pad = false)
     {
         if (null === $fields) {
-            $fields = array('years', 'months', 'days', 'hours', 'minutes', 'seconds', 'invert');
+            $fields = ['years', 'months', 'days', 'hours', 'minutes', 'seconds', 'invert'];
         }
         $this->fields = $fields;
         $this->pad = (bool) $pad;
@@ -68,7 +68,7 @@ public function transform($dateInterval)
     {
         if (null === $dateInterval) {
             return array_intersect_key(
-                array(
+                [
                     'years' => '',
                     'months' => '',
                     'weeks' => '',
@@ -77,14 +77,14 @@ public function transform($dateInterval)
                     'minutes' => '',
                     'seconds' => '',
                     'invert' => false,
-                ),
+                ],
                 array_flip($this->fields)
             );
         }
         if (!$dateInterval instanceof \DateInterval) {
             throw new UnexpectedTypeException($dateInterval, '\DateInterval');
         }
-        $result = array();
+        $result = [];
         foreach (self::$availableFields as $field => $char) {
             $result[$field] = $dateInterval->format('%'.($this->pad ? strtoupper($char) : $char));
         }
@@ -122,7 +122,7 @@ public function reverseTransform($value)
         if ('' === implode('', $value)) {
             return;
         }
-        $emptyFields = array();
+        $emptyFields = [];
         foreach ($this->fields as $field) {
             if (!isset($value[$field])) {
                 $emptyFields[] = $field;
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
index 28b19547b4c2c..5249ed30bf934 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
@@ -39,7 +39,7 @@ public function __construct($inputTimezone = null, $outputTimezone = null, array
         parent::__construct($inputTimezone, $outputTimezone);
 
         if (null === $fields) {
-            $fields = array('year', 'month', 'day', 'hour', 'minute', 'second');
+            $fields = ['year', 'month', 'day', 'hour', 'minute', 'second'];
         }
 
         $this->fields = $fields;
@@ -58,14 +58,14 @@ public function __construct($inputTimezone = null, $outputTimezone = null, array
     public function transform($dateTime)
     {
         if (null === $dateTime) {
-            return array_intersect_key(array(
+            return array_intersect_key([
                 'year' => '',
                 'month' => '',
                 'day' => '',
                 'hour' => '',
                 'minute' => '',
                 'second' => '',
-            ), array_flip($this->fields));
+            ], array_flip($this->fields));
         }
 
         if (!$dateTime instanceof \DateTimeInterface) {
@@ -80,14 +80,14 @@ public function transform($dateTime)
             $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
         }
 
-        $result = array_intersect_key(array(
+        $result = array_intersect_key([
             'year' => $dateTime->format('Y'),
             'month' => $dateTime->format('m'),
             'day' => $dateTime->format('d'),
             'hour' => $dateTime->format('H'),
             'minute' => $dateTime->format('i'),
             'second' => $dateTime->format('s'),
-        ), array_flip($this->fields));
+        ], array_flip($this->fields));
 
         if (!$this->pad) {
             foreach ($result as &$entry) {
@@ -125,7 +125,7 @@ public function reverseTransform($value)
             return;
         }
 
-        $emptyFields = array();
+        $emptyFields = [];
 
         foreach ($this->fields as $field) {
             if (!isset($value[$field])) {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeZoneToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeZoneToStringTransformer.php
index cd3ac47b28b93..32fa5d1129d5e 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeZoneToStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeZoneToStringTransformer.php
@@ -42,7 +42,7 @@ public function transform($dateTimeZone)
                 throw new TransformationFailedException('Expected an array.');
             }
 
-            return array_map(array(new self(), 'transform'), $dateTimeZone);
+            return array_map([new self(), 'transform'], $dateTimeZone);
         }
 
         if (!$dateTimeZone instanceof \DateTimeZone) {
@@ -66,7 +66,7 @@ public function reverseTransform($value)
                 throw new TransformationFailedException('Expected an array.');
             }
 
-            return array_map(array(new self(), 'reverseTransform'), $value);
+            return array_map([new self(), 'reverseTransform'], $value);
         }
 
         if (!\is_string($value)) {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
index 3e125bc82be36..638885e4226e6 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -121,7 +121,7 @@ public function transform($value)
         }
 
         // Convert non-breaking and narrow non-breaking spaces to normal ones
-        $value = str_replace(array("\xc2\xa0", "\xe2\x80\xaf"), ' ', $value);
+        $value = str_replace(["\xc2\xa0", "\xe2\x80\xaf"], ' ', $value);
 
         return $value;
     }
@@ -146,7 +146,7 @@ public function reverseTransform($value)
             return;
         }
 
-        if (\in_array($value, array('NaN', 'NAN', 'nan'), true)) {
+        if (\in_array($value, ['NaN', 'NAN', 'nan'], true)) {
             throw new TransformationFailedException('"NaN" is not a valid number');
         }
 
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
index 170c2b3d11237..b01a8d204c9b2 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
@@ -26,10 +26,10 @@ class PercentToLocalizedStringTransformer implements DataTransformerInterface
     const FRACTIONAL = 'fractional';
     const INTEGER = 'integer';
 
-    protected static $types = array(
+    protected static $types = [
         self::FRACTIONAL,
         self::INTEGER,
-    );
+    ];
 
     private $type;
     private $scale;
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php
index 49032a6777c83..72e34f4544609 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php
@@ -35,7 +35,7 @@ public function __construct(array $keys)
      */
     public function transform($value)
     {
-        $result = array();
+        $result = [];
 
         foreach ($this->keys as $key) {
             $result[$key] = $value;
@@ -59,10 +59,10 @@ public function reverseTransform($array)
         }
 
         $result = current($array);
-        $emptyKeys = array();
+        $emptyKeys = [];
 
         foreach ($this->keys as $key) {
-            if (isset($array[$key]) && '' !== $array[$key] && false !== $array[$key] && array() !== $array[$key]) {
+            if (isset($array[$key]) && '' !== $array[$key] && false !== $array[$key] && [] !== $array[$key]) {
                 if ($array[$key] !== $result) {
                     throw new TransformationFailedException('All values in the array should be the same');
                 }
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
index 2ad44caba8bfa..8af36f6bd7c42 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
@@ -43,6 +43,6 @@ public function onSubmit(FormEvent $event)
 
     public static function getSubscribedEvents()
     {
-        return array(FormEvents::SUBMIT => 'onSubmit');
+        return [FormEvents::SUBMIT => 'onSubmit'];
     }
 }
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
index f8405e1a1af2e..71f47ae97442c 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
@@ -36,9 +36,9 @@ public function __construct($allowAdd = false, $allowDelete = false)
 
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             FormEvents::SUBMIT => 'onSubmit',
-        );
+        ];
     }
 
     public function onSubmit(FormEvent $event)
@@ -47,7 +47,7 @@ public function onSubmit(FormEvent $event)
         $data = $event->getData();
 
         if (null === $data) {
-            $data = array();
+            $data = [];
         }
 
         if (!\is_array($data) && !($data instanceof \Traversable && $data instanceof \ArrayAccess)) {
@@ -73,7 +73,7 @@ public function onSubmit(FormEvent $event)
         } else {
             // Calculate delta
             $itemsToAdd = \is_object($data) ? clone $data : $data;
-            $itemsToDelete = array();
+            $itemsToDelete = [];
 
             foreach ($dataToMergeInto as $beforeKey => $beforeItem) {
                 foreach ($data as $afterKey => $afterItem) {
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
index 3ef78741e3147..e6f5d90988536 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
@@ -49,12 +49,12 @@ public function __construct($type, array $options = array(), $allowAdd = false,
 
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             FormEvents::PRE_SET_DATA => 'preSetData',
             FormEvents::PRE_SUBMIT => 'preSubmit',
             // (MergeCollectionListener, MergeDoctrineCollectionListener)
-            FormEvents::SUBMIT => array('onSubmit', 50),
-        );
+            FormEvents::SUBMIT => ['onSubmit', 50],
+        ];
     }
 
     public function preSetData(FormEvent $event)
@@ -63,7 +63,7 @@ public function preSetData(FormEvent $event)
         $data = $event->getData();
 
         if (null === $data) {
-            $data = array();
+            $data = [];
         }
 
         if (!\is_array($data) && !($data instanceof \Traversable && $data instanceof \ArrayAccess)) {
@@ -77,9 +77,9 @@ public function preSetData(FormEvent $event)
 
         // Then add all rows again in the correct order
         foreach ($data as $name => $value) {
-            $form->add($name, $this->type, array_replace(array(
+            $form->add($name, $this->type, array_replace([
                 'property_path' => '['.$name.']',
-            ), $this->options));
+            ], $this->options));
         }
     }
 
@@ -109,9 +109,9 @@ public function preSubmit(FormEvent $event)
         if ($this->allowAdd) {
             foreach ($data as $name => $value) {
                 if (!$form->has($name)) {
-                    $form->add($name, $this->type, array_replace(array(
+                    $form->add($name, $this->type, array_replace([
                         'property_path' => '['.$name.']',
-                    ), $this->options));
+                    ], $this->options));
                 }
             }
         }
@@ -127,7 +127,7 @@ public function onSubmit(FormEvent $event)
         // entries, so we need to manually unset removed entries in the collection.
 
         if (null === $data) {
-            $data = array();
+            $data = [];
         }
 
         if (!\is_array($data) && !($data instanceof \Traversable && $data instanceof \ArrayAccess)) {
@@ -153,7 +153,7 @@ public function onSubmit(FormEvent $event)
         // The data mapper only adds, but does not remove items, so do this
         // here
         if ($this->allowDelete) {
-            $toDelete = array();
+            $toDelete = [];
 
             foreach ($data as $name => $child) {
                 if (!$form->has($name)) {
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php
index f46eb499e0cf9..835a0283150f7 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php
@@ -31,9 +31,9 @@ public function __construct(TranslatorInterface $translator = null)
 
     public static function getSubscribedEvents()
     {
-        return array(
-            FormEvents::POST_SUBMIT => array('convertTransformationFailureToFormError', -1024),
-        );
+        return [
+            FormEvents::POST_SUBMIT => ['convertTransformationFailureToFormError', -1024],
+        ];
     }
 
     public function convertTransformationFailureToFormError(FormEvent $event)
@@ -54,11 +54,11 @@ public function convertTransformationFailureToFormError(FormEvent $event)
         $messageTemplate = 'The value {{ value }} is not valid.';
 
         if (null !== $this->translator) {
-            $message = $this->translator->trans($messageTemplate, array('{{ value }}' => $clientDataAsString));
+            $message = $this->translator->trans($messageTemplate, ['{{ value }}' => $clientDataAsString]);
         } else {
-            $message = strtr($messageTemplate, array('{{ value }}' => $clientDataAsString));
+            $message = strtr($messageTemplate, ['{{ value }}' => $clientDataAsString]);
         }
 
-        $form->addError(new FormError($message, $messageTemplate, array('{{ value }}' => $clientDataAsString), null, $form->getTransformationFailure()));
+        $form->addError(new FormError($message, $messageTemplate, ['{{ value }}' => $clientDataAsString], null, $form->getTransformationFailure()));
     }
 }
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php
index 59f1a242f8fa3..be8c38a854ccb 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php
@@ -36,6 +36,6 @@ public function preSubmit(FormEvent $event)
 
     public static function getSubscribedEvents()
     {
-        return array(FormEvents::PRE_SUBMIT => 'preSubmit');
+        return [FormEvents::PRE_SUBMIT => 'preSubmit'];
     }
 }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php b/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
index d68337e3bc8c1..32825ab7af9cf 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
@@ -75,13 +75,13 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             $id = ltrim($id, '_0123456789');
         }
 
-        $blockPrefixes = array();
+        $blockPrefixes = [];
         for ($type = $form->getConfig()->getType(); null !== $type; $type = $type->getParent()) {
             array_unshift($blockPrefixes, $type->getBlockPrefix());
         }
         $blockPrefixes[] = $uniqueBlockPrefix;
 
-        $view->vars = array_replace($view->vars, array(
+        $view->vars = array_replace($view->vars, [
             'form' => $view,
             'id' => $id,
             'name' => $name,
@@ -101,7 +101,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             // be rendered differently.
             // https://github.com/symfony/symfony/issues/5038
             'cache_key' => $uniqueBlockPrefix.'_'.$form->getConfig()->getType()->getBlockPrefix(),
-        ));
+        ]);
     }
 
     /**
@@ -109,15 +109,15 @@ public function buildView(FormView $view, FormInterface $form, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'block_name' => null,
             'disabled' => false,
             'label' => null,
             'label_format' => null,
-            'attr' => array(),
+            'attr' => [],
             'translation_domain' => null,
             'auto_initialize' => true,
-        ));
+        ]);
 
         $resolver->setAllowedTypes('attr', 'array');
     }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ButtonType.php b/src/Symfony/Component/Form/Extension/Core/Type/ButtonType.php
index 3a62eb8a471a2..2b60f4f31e1e5 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ButtonType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ButtonType.php
@@ -43,8 +43,8 @@ public function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
 
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'auto_initialize' => false,
-        ));
+        ]);
     }
 }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
index 1661caa07c492..bbffc475d6a1e 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
@@ -40,10 +40,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars = array_replace($view->vars, array(
+        $view->vars = array_replace($view->vars, [
             'value' => $options['value'],
             'checked' => null !== $form->getViewData(),
-        ));
+        ]);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index 00eb88f7c3606..9bdaf0d0c134f 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -70,7 +70,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
             // Check if the choices already contain the empty value
             // Only add the placeholder option if this is not the case
-            if (null !== $options['placeholder'] && 0 === \count($choiceList->getChoicesForValues(array('')))) {
+            if (null !== $options['placeholder'] && 0 === \count($choiceList->getChoicesForValues(['']))) {
                 $placeholderView = new ChoiceView(null, '', $options['placeholder']);
 
                 // "placeholder" is a reserved name
@@ -108,7 +108,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 $unknownValues = $valueMap;
 
                 // Reconstruct the data as mapping from child names to values
-                $data = array();
+                $data = [];
 
                 /** @var FormInterface $child */
                 foreach ($form as $child) {
@@ -184,7 +184,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             ? $form->getConfig()->getAttribute('choice_list_view')
             : $this->createChoiceListView($choiceList, $options);
 
-        $view->vars = array_replace($view->vars, array(
+        $view->vars = array_replace($view->vars, [
             'multiple' => $options['multiple'],
             'expanded' => $options['expanded'],
             'preferred_choices' => $choiceListView->preferredChoices,
@@ -192,7 +192,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             'separator' => '-------------------',
             'placeholder' => null,
             'choice_translation_domain' => $choiceTranslationDomain,
-        ));
+        ]);
 
         // The decision, whether a choice is selected, is potentially done
         // thousand of times during the rendering of a template. Provide a
@@ -255,7 +255,7 @@ public function configureOptions(OptionsResolver $resolver)
             }
 
             if ($options['multiple']) {
-                return array();
+                return [];
             }
 
             return '';
@@ -385,13 +385,13 @@ private function addSubForms(FormBuilderInterface $builder, array $choiceViews,
      */
     private function addSubForm(FormBuilderInterface $builder, $name, ChoiceView $choiceView, array $options)
     {
-        $choiceOpts = array(
+        $choiceOpts = [
             'value' => $choiceView->value,
             'label' => $choiceView->label,
             'attr' => $choiceView->attr,
             'translation_domain' => $options['translation_domain'],
             'block_name' => 'entry',
-        );
+        ];
 
         if ($options['multiple']) {
             $choiceType = __NAMESPACE__.'\CheckboxType';
@@ -415,7 +415,7 @@ private function createChoiceList(array $options)
         }
 
         // Harden against NULL values (like in EntityType and ModelType)
-        $choices = null !== $options['choices'] ? $options['choices'] : array();
+        $choices = null !== $options['choices'] ? $options['choices'] : [];
 
         return $this->choiceListFactory->createListFromChoices($choices, $options['choice_value']);
     }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
index 1cdc99019e6d2..fc36cca6da937 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
@@ -27,10 +27,10 @@ class CollectionType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         if ($options['allow_add'] && $options['prototype']) {
-            $prototypeOptions = array_replace(array(
+            $prototypeOptions = array_replace([
                 'required' => $options['required'],
                 'label' => $options['prototype_name'].'label__',
-            ), $options['entry_options']);
+            ], $options['entry_options']);
 
             if (null !== $options['prototype_data']) {
                 $prototypeOptions['data'] = $options['prototype_data'];
@@ -56,10 +56,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars = array_replace($view->vars, array(
+        $view->vars = array_replace($view->vars, [
             'allow_add' => $options['allow_add'],
             'allow_delete' => $options['allow_delete'],
-        ));
+        ]);
 
         if ($form->getConfig()->hasAttribute('prototype')) {
             $prototype = $form->getConfig()->getAttribute('prototype');
@@ -88,19 +88,19 @@ public function configureOptions(OptionsResolver $resolver)
             return $value;
         };
 
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'allow_add' => false,
             'allow_delete' => false,
             'prototype' => true,
             'prototype_data' => null,
             'prototype_name' => '__name__',
             'entry_type' => __NAMESPACE__.'\TextType',
-            'entry_options' => array(),
+            'entry_options' => [],
             'delete_empty' => false,
-        ));
+        ]);
 
         $resolver->setNormalizer('entry_options', $entryOptionsNormalizer);
-        $resolver->setAllowedTypes('delete_empty', array('bool', 'callable'));
+        $resolver->setAllowedTypes('delete_empty', ['bool', 'callable']);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
index 670d55f280867..2156f672f0327 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
@@ -86,7 +86,7 @@ public function loadChoicesForValues(array $values, $value = null)
         // Optimize
         $values = array_filter($values);
         if (empty($values)) {
-            return array();
+            return [];
         }
 
         return $this->loadChoiceList($value)->getChoicesForValues($values);
@@ -100,7 +100,7 @@ public function loadValuesForChoices(array $choices, $value = null)
         // Optimize
         $choices = array_filter($choices);
         if (empty($choices)) {
-            return array();
+            return [];
         }
 
         // If no callable is set, choices are the same as values
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php b/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
index 1c5526283ff9c..0f3c5370204f0 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
@@ -86,7 +86,7 @@ public function loadChoicesForValues(array $values, $value = null)
         // Optimize
         $values = array_filter($values);
         if (empty($values)) {
-            return array();
+            return [];
         }
 
         return $this->loadChoiceList($value)->getChoicesForValues($values);
@@ -100,7 +100,7 @@ public function loadValuesForChoices(array $choices, $value = null)
         // Optimize
         $choices = array_filter($choices);
         if (empty($choices)) {
-            return array();
+            return [];
         }
 
         // If no callable is set, choices are the same as values
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
index 29e122a7882ea..181ce74993d64 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
@@ -28,7 +28,7 @@
  */
 class DateIntervalType extends AbstractType
 {
-    private $timeParts = array(
+    private $timeParts = [
         'years',
         'months',
         'weeks',
@@ -36,12 +36,12 @@ class DateIntervalType extends AbstractType
         'hours',
         'minutes',
         'seconds',
-    );
-    private static $widgets = array(
+    ];
+    private static $widgets = [
         'text' => TextType::class,
         'integer' => IntegerType::class,
         'choice' => ChoiceType::class,
-    );
+    ];
 
     /**
      * {@inheritdoc}
@@ -58,7 +58,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             throw new InvalidConfigurationException('You can not enable weeks and days fields together.');
         }
         $format = 'P';
-        $parts = array();
+        $parts = [];
         if ($options['with_years']) {
             $format .= '%yY';
             $parts[] = 'years';
@@ -98,7 +98,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         } else {
             foreach ($this->timeParts as $part) {
                 if ($options['with_'.$part]) {
-                    $childOptions = array(
+                    $childOptions = [
                         'error_bubbling' => true,
                         'label' => $options['labels'][$part],
                         // Append generic carry-along options
@@ -106,7 +106,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'translation_domain' => $options['translation_domain'],
                         // when compound the array entries are ignored, we need to cascade the configuration here
                         'empty_data' => isset($options['empty_data'][$part]) ? $options['empty_data'][$part] : null,
-                    );
+                    ];
                     if ('choice' === $options['widget']) {
                         $childOptions['choice_translation_domain'] = false;
                         $childOptions['choices'] = $options[$part];
@@ -124,12 +124,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 }
             }
             if ($options['with_invert']) {
-                $builder->add('invert', CheckboxType::class, array(
+                $builder->add('invert', CheckboxType::class, [
                     'label' => $options['labels']['invert'],
                     'error_bubbling' => true,
                     'required' => false,
                     'translation_domain' => $options['translation_domain'],
-                ));
+                ]);
             }
             $builder->addViewTransformer(new DateIntervalToArrayTransformer($parts, 'text' === $options['widget']));
         }
@@ -153,10 +153,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $vars = array(
+        $vars = [
             'widget' => $options['widget'],
             'with_invert' => $options['with_invert'],
-        );
+        ];
         foreach ($this->timeParts as $part) {
             $vars['with_'.$part] = $options['with_'.$part];
         }
@@ -173,7 +173,7 @@ public function configureOptions(OptionsResolver $resolver)
             return 'single_text' !== $options['widget'];
         };
         $emptyData = function (Options $options) {
-            return 'single_text' === $options['widget'] ? '' : array();
+            return 'single_text' === $options['widget'] ? '' : [];
         };
 
         $placeholderDefault = function (Options $options) {
@@ -191,7 +191,7 @@ public function configureOptions(OptionsResolver $resolver)
         };
 
         $labelsNormalizer = function (Options $options, array $labels) {
-            return array_replace(array(
+            return array_replace([
                 'years' => null,
                 'months' => null,
                 'days' => null,
@@ -200,13 +200,13 @@ public function configureOptions(OptionsResolver $resolver)
                 'minutes' => null,
                 'seconds' => null,
                 'invert' => 'Negative interval',
-            ), array_filter($labels, function ($label) {
+            ], array_filter($labels, function ($label) {
                 return null !== $label;
             }));
         };
 
         $resolver->setDefaults(
-            array(
+            [
                 'with_years' => true,
                 'with_months' => true,
                 'with_days' => true,
@@ -234,28 +234,28 @@ public function configureOptions(OptionsResolver $resolver)
                 'data_class' => null,
                 'compound' => $compound,
                 'empty_data' => $emptyData,
-                'labels' => array(),
-            )
+                'labels' => [],
+            ]
         );
         $resolver->setNormalizer('placeholder', $placeholderNormalizer);
         $resolver->setNormalizer('labels', $labelsNormalizer);
 
         $resolver->setAllowedValues(
             'input',
-            array(
+            [
                 'dateinterval',
                 'string',
                 'array',
-            )
+            ]
         );
         $resolver->setAllowedValues(
             'widget',
-            array(
+            [
                 'single_text',
                 'text',
                 'integer',
                 'choice',
-            )
+            ]
         );
         // Don't clone \DateInterval classes, as i.e. format()
         // does not work after that
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
index 56d895cf00f71..516b2eec1afa6 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
@@ -38,21 +38,21 @@ class DateTimeType extends AbstractType
      */
     const HTML5_FORMAT = "yyyy-MM-dd'T'HH:mm:ss";
 
-    private static $acceptedFormats = array(
+    private static $acceptedFormats = [
         \IntlDateFormatter::FULL,
         \IntlDateFormatter::LONG,
         \IntlDateFormatter::MEDIUM,
         \IntlDateFormatter::SHORT,
-    );
+    ];
 
     /**
      * {@inheritdoc}
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $parts = array('year', 'month', 'day', 'hour');
-        $dateParts = array('year', 'month', 'day');
-        $timeParts = array('hour');
+        $parts = ['year', 'month', 'day', 'hour'];
+        $dateParts = ['year', 'month', 'day'];
+        $timeParts = ['hour'];
 
         if ($options['with_minutes']) {
             $parts[] = 'minute';
@@ -92,9 +92,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         } else {
             // when the form is compound the entries of the array are ignored in favor of children data
             // so we need to handle the cascade setting here
-            $emptyData = $builder->getEmptyData() ?: array();
+            $emptyData = $builder->getEmptyData() ?: [];
             // Only pass a subset of the options to children
-            $dateOptions = array_intersect_key($options, array_flip(array(
+            $dateOptions = array_intersect_key($options, array_flip([
                 'years',
                 'months',
                 'days',
@@ -105,13 +105,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'html5',
                 'invalid_message',
                 'invalid_message_parameters',
-            )));
+            ]));
 
             if (isset($emptyData['date'])) {
                 $dateOptions['empty_data'] = $emptyData['date'];
             }
 
-            $timeOptions = array_intersect_key($options, array_flip(array(
+            $timeOptions = array_intersect_key($options, array_flip([
                 'hours',
                 'minutes',
                 'seconds',
@@ -124,7 +124,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'html5',
                 'invalid_message',
                 'invalid_message_parameters',
-            )));
+            ]));
 
             if (isset($emptyData['time'])) {
                 $timeOptions['empty_data'] = $emptyData['time'];
@@ -151,13 +151,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $dateOptions['error_bubbling'] = $timeOptions['error_bubbling'] = true;
 
             $builder
-                ->addViewTransformer(new DataTransformerChain(array(
+                ->addViewTransformer(new DataTransformerChain([
                     new DateTimeToArrayTransformer($options['model_timezone'], $options['view_timezone'], $parts),
-                    new ArrayToPartsTransformer(array(
+                    new ArrayToPartsTransformer([
                         'date' => $dateParts,
                         'time' => $timeParts,
-                    )),
-                )))
+                    ]),
+                ]))
                 ->add('date', __NAMESPACE__.'\DateType', $dateOptions)
                 ->add('time', __NAMESPACE__.'\TimeType', $timeOptions)
             ;
@@ -213,7 +213,7 @@ public function configureOptions(OptionsResolver $resolver)
             return $options['widget'];
         };
 
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'input' => 'datetime',
             'model_timezone' => null,
             'view_timezone' => null,
@@ -236,9 +236,9 @@ public function configureOptions(OptionsResolver $resolver)
             'data_class' => null,
             'compound' => $compound,
             'empty_data' => function (Options $options) {
-                return $options['compound'] ? array() : '';
+                return $options['compound'] ? [] : '';
             },
-        ));
+        ]);
 
         // Don't add some defaults in order to preserve the defaults
         // set in DateType and TimeType
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
index 7384921af4336..8f3f6a020a19e 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -29,17 +29,17 @@ class DateType extends AbstractType
     const DEFAULT_FORMAT = \IntlDateFormatter::MEDIUM;
     const HTML5_FORMAT = 'yyyy-MM-dd';
 
-    private static $acceptedFormats = array(
+    private static $acceptedFormats = [
         \IntlDateFormatter::FULL,
         \IntlDateFormatter::LONG,
         \IntlDateFormatter::MEDIUM,
         \IntlDateFormatter::SHORT,
-    );
+    ];
 
-    private static $widgets = array(
+    private static $widgets = [
         'text' => 'Symfony\Component\Form\Extension\Core\Type\TextType',
         'choice' => 'Symfony\Component\Form\Extension\Core\Type\ChoiceType',
-    );
+    ];
 
     /**
      * {@inheritdoc}
@@ -73,13 +73,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 throw new InvalidOptionsException(sprintf('The "format" option should contain the letters "y", "M" and "d". Its current value is "%s".', $pattern));
             }
 
-            $yearOptions = $monthOptions = $dayOptions = array(
+            $yearOptions = $monthOptions = $dayOptions = [
                 'error_bubbling' => true,
                 'empty_data' => '',
-            );
+            ];
             // when the form is compound the entries of the array are ignored in favor of children data
             // so we need to handle the cascade setting here
-            $emptyData = $builder->getEmptyData() ?: array();
+            $emptyData = $builder->getEmptyData() ?: [];
 
             if (isset($emptyData['year'])) {
                 $yearOptions['empty_data'] = $emptyData['year'];
@@ -134,7 +134,7 @@ class_exists('IntlTimeZone', false) ? \IntlTimeZone::createDefault() : null,
             }
 
             // Append generic carry-along options
-            foreach (array('required', 'translation_domain') as $passOpt) {
+            foreach (['required', 'translation_domain'] as $passOpt) {
                 $yearOptions[$passOpt] = $monthOptions[$passOpt] = $dayOptions[$passOpt] = $options[$passOpt];
             }
 
@@ -143,7 +143,7 @@ class_exists('IntlTimeZone', false) ? \IntlTimeZone::createDefault() : null,
                 ->add('month', self::$widgets[$options['widget']], $monthOptions)
                 ->add('day', self::$widgets[$options['widget']], $dayOptions)
                 ->addViewTransformer(new DateTimeToArrayTransformer(
-                    $options['model_timezone'], $options['view_timezone'], array('year', 'month', 'day')
+                    $options['model_timezone'], $options['view_timezone'], ['year', 'month', 'day']
                 ))
                 ->setAttribute('formatter', $formatter)
             ;
@@ -159,7 +159,7 @@ class_exists('IntlTimeZone', false) ? \IntlTimeZone::createDefault() : null,
             ));
         } elseif ('array' === $options['input']) {
             $builder->addModelTransformer(new ReversedTransformer(
-                new DateTimeToArrayTransformer($options['model_timezone'], $options['model_timezone'], array('year', 'month', 'day'))
+                new DateTimeToArrayTransformer($options['model_timezone'], $options['model_timezone'], ['year', 'month', 'day'])
             ));
         }
     }
@@ -194,7 +194,7 @@ public function finishView(FormView $view, FormInterface $form, array $options)
             // set right order with respect to locale (e.g.: de_DE=dd.MM.yy; en_US=M/d/yy)
             // lookup various formats at http://userguide.icu-project.org/formatparse/datetime
             if (preg_match('/^([yMd]+)[^yMd]*([yMd]+)[^yMd]*([yMd]+)$/', $pattern)) {
-                $pattern = preg_replace(array('/y+/', '/M+/', '/d+/'), array('{{ year }}', '{{ month }}', '{{ day }}'), $pattern);
+                $pattern = preg_replace(['/y+/', '/M+/', '/d+/'], ['{{ year }}', '{{ month }}', '{{ day }}'], $pattern);
             } else {
                 // default fallback
                 $pattern = '{{ year }}{{ month }}{{ day }}';
@@ -222,16 +222,16 @@ public function configureOptions(OptionsResolver $resolver)
                 $default = $placeholderDefault($options);
 
                 return array_merge(
-                    array('year' => $default, 'month' => $default, 'day' => $default),
+                    ['year' => $default, 'month' => $default, 'day' => $default],
                     $placeholder
                 );
             }
 
-            return array(
+            return [
                 'year' => $placeholder,
                 'month' => $placeholder,
                 'day' => $placeholder,
-            );
+            ];
         };
 
         $choiceTranslationDomainNormalizer = function (Options $options, $choiceTranslationDomain) {
@@ -239,16 +239,16 @@ public function configureOptions(OptionsResolver $resolver)
                 $default = false;
 
                 return array_replace(
-                    array('year' => $default, 'month' => $default, 'day' => $default),
+                    ['year' => $default, 'month' => $default, 'day' => $default],
                     $choiceTranslationDomain
                 );
             }
 
-            return array(
+            return [
                 'year' => $choiceTranslationDomain,
                 'month' => $choiceTranslationDomain,
                 'day' => $choiceTranslationDomain,
-            );
+            ];
         };
 
         $format = function (Options $options) {
@@ -315,7 +315,7 @@ private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $
     {
         $pattern = $formatter->getPattern();
         $timezone = $formatter->getTimeZoneId();
-        $formattedTimestamps = array();
+        $formattedTimestamps = [];
 
         $formatter->setTimeZone('UTC');
 
@@ -338,7 +338,7 @@ private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $
 
     private function listYears(array $years)
     {
-        $result = array();
+        $result = [];
 
         foreach ($years as $year) {
             if (false !== $y = gmmktime(0, 0, 0, 6, 15, $year)) {
@@ -351,7 +351,7 @@ private function listYears(array $years)
 
     private function listMonths(array $months)
     {
-        $result = array();
+        $result = [];
 
         foreach ($months as $month) {
             $result[gmmktime(0, 0, 0, $month, 15)] = $month;
@@ -362,7 +362,7 @@ private function listMonths(array $months)
 
     private function listDays(array $days)
     {
-        $result = array();
+        $result = [];
 
         foreach ($days as $day) {
             $result[gmmktime(0, 0, 0, 5, $day)] = $day;
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
index 56fcfe17e9bf7..59c72889d6683 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
@@ -33,11 +33,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $requestHandler = $form->getConfig()->getRequestHandler();
 
             if ($options['multiple']) {
-                $data = array();
+                $data = [];
                 $files = $event->getData();
 
                 if (!\is_array($files)) {
-                    $files = array();
+                    $files = [];
                 }
 
                 foreach ($files as $file) {
@@ -48,7 +48,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
                 // Since the array is never considered empty in the view data format
                 // on submission, we need to evaluate the configured empty data here
-                if (array() === $data) {
+                if ([] === $data) {
                     $emptyData = $form->getConfig()->getEmptyData();
                     $data = $emptyData instanceof \Closure ? $emptyData($form, $data) : $emptyData;
                 }
@@ -70,10 +70,10 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             $view->vars['attr']['multiple'] = 'multiple';
         }
 
-        $view->vars = array_replace($view->vars, array(
+        $view->vars = array_replace($view->vars, [
             'type' => 'file',
             'value' => '',
-        ));
+        ]);
     }
 
     /**
@@ -97,16 +97,16 @@ public function configureOptions(OptionsResolver $resolver)
         }
 
         $emptyData = function (Options $options) {
-            return $options['multiple'] ? array() : null;
+            return $options['multiple'] ? [] : null;
         };
 
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'compound' => false,
             'data_class' => $dataClass,
             'empty_data' => $emptyData,
             'multiple' => false,
             'allow_file_upload' => true,
-        ));
+        ]);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
index 89b9dd8ff5335..1f25552dd4f99 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -81,7 +81,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         }
 
         $formConfig = $form->getConfig();
-        $view->vars = array_replace($view->vars, array(
+        $view->vars = array_replace($view->vars, [
             'errors' => $form->getErrors(),
             'valid' => $form->isSubmitted() ? $form->isValid() : true,
             'value' => $form->getViewData(),
@@ -93,7 +93,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             'method' => $formConfig->getMethod(),
             'action' => $formConfig->getAction(),
             'submitted' => $form->isSubmitted(),
-        ));
+        ]);
     }
 
     /**
@@ -136,7 +136,7 @@ public function configureOptions(OptionsResolver $resolver)
             }
 
             return function (FormInterface $form) {
-                return $form->getConfig()->getCompound() ? array() : '';
+                return $form->getConfig()->getCompound() ? [] : '';
             };
         };
 
@@ -155,9 +155,9 @@ public function configureOptions(OptionsResolver $resolver)
 
         // If data is given, the form is locked to that data
         // (independent of its value)
-        $resolver->setDefined(array(
+        $resolver->setDefined([
             'data',
-        ));
+        ]);
 
         $resolver->setDefaults(array(
             'data_class' => $dataClass,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/HiddenType.php b/src/Symfony/Component/Form/Extension/Core/Type/HiddenType.php
index 10377501fda83..dae7f2bd3d91f 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/HiddenType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/HiddenType.php
@@ -21,13 +21,13 @@ class HiddenType extends AbstractType
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             // hidden fields cannot have a required attribute
             'required' => false,
             // Pass errors to the parent
             'error_bubbling' => true,
             'compound' => false,
-        ));
+        ]);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
index 1e82b9850569f..267b8149ddd55 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
@@ -86,7 +86,7 @@ public function loadChoicesForValues(array $values, $value = null)
         // Optimize
         $values = array_filter($values);
         if (empty($values)) {
-            return array();
+            return [];
         }
 
         return $this->loadChoiceList($value)->getChoicesForValues($values);
@@ -100,7 +100,7 @@ public function loadValuesForChoices(array $choices, $value = null)
         // Optimize
         $choices = array_filter($choices);
         if (empty($choices)) {
-            return array();
+            return [];
         }
 
         // If no callable is set, choices are the same as values
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
index 3499ca06af133..433a2acc7f6a0 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
@@ -86,7 +86,7 @@ public function loadChoicesForValues(array $values, $value = null)
         // Optimize
         $values = array_filter($values);
         if (empty($values)) {
-            return array();
+            return [];
         }
 
         return $this->loadChoiceList($value)->getChoicesForValues($values);
@@ -100,7 +100,7 @@ public function loadValuesForChoices(array $choices, $value = null)
         // Optimize
         $choices = array_filter($choices);
         if (empty($choices)) {
-            return array();
+            return [];
         }
 
         // If no callable is set, choices are the same as values
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
index 4ca60105ce157..945a22f95beef 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
@@ -20,7 +20,7 @@
 
 class MoneyType extends AbstractType
 {
-    protected static $patterns = array();
+    protected static $patterns = [];
 
     /**
      * {@inheritdoc}
@@ -84,7 +84,7 @@ protected static function getPattern($currency)
         $locale = \Locale::getDefault();
 
         if (!isset(self::$patterns[$locale])) {
-            self::$patterns[$locale] = array();
+            self::$patterns[$locale] = [];
         }
 
         if (!isset(self::$patterns[$locale][$currency])) {
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
index 4ef1cac13ddd8..1054b5899bd13 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
@@ -35,15 +35,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             // default scale is locale specific (usually around 3)
             'scale' => null,
             'grouping' => false,
             'rounding_mode' => NumberToLocalizedStringTransformer::ROUND_HALF_UP,
             'compound' => false,
-        ));
+        ]);
 
-        $resolver->setAllowedValues('rounding_mode', array(
+        $resolver->setAllowedValues('rounding_mode', [
             NumberToLocalizedStringTransformer::ROUND_FLOOR,
             NumberToLocalizedStringTransformer::ROUND_DOWN,
             NumberToLocalizedStringTransformer::ROUND_HALF_DOWN,
@@ -51,9 +51,9 @@ public function configureOptions(OptionsResolver $resolver)
             NumberToLocalizedStringTransformer::ROUND_HALF_UP,
             NumberToLocalizedStringTransformer::ROUND_UP,
             NumberToLocalizedStringTransformer::ROUND_CEILING,
-        ));
+        ]);
 
-        $resolver->setAllowedTypes('scale', array('null', 'int'));
+        $resolver->setAllowedTypes('scale', ['null', 'int']);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php b/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php
index e651ee8df5787..5a5b2605a4222 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php
@@ -33,10 +33,10 @@ public function buildView(FormView $view, FormInterface $form, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'always_empty' => true,
             'trim' => false,
-        ));
+        ]);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php b/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php
index ff4d7168f9105..dedb9e8cdd1cb 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php
@@ -31,16 +31,16 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'scale' => 0,
             'type' => 'fractional',
             'compound' => false,
-        ));
+        ]);
 
-        $resolver->setAllowedValues('type', array(
+        $resolver->setAllowedValues('type', [
             'fractional',
             'integer',
-        ));
+        ]);
 
         $resolver->setAllowedTypes('scale', 'int');
     }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php b/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php
index 1189190f09801..5f9ee5329cc09 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php
@@ -32,10 +32,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
 
         $builder
-            ->addViewTransformer(new ValueToDuplicatesTransformer(array(
+            ->addViewTransformer(new ValueToDuplicatesTransformer([
                 $options['first_name'],
                 $options['second_name'],
-            )))
+            ]))
             ->add($options['first_name'], $options['type'], array_merge($options['options'], $options['first_options']))
             ->add($options['second_name'], $options['type'], array_merge($options['options'], $options['second_options']))
         ;
@@ -46,15 +46,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'type' => __NAMESPACE__.'\TextType',
-            'options' => array(),
-            'first_options' => array(),
-            'second_options' => array(),
+            'options' => [],
+            'first_options' => [],
+            'second_options' => [],
             'first_name' => 'first',
             'second_name' => 'second',
             'error_bubbling' => false,
-        ));
+        ]);
 
         $resolver->setAllowedTypes('options', 'array');
         $resolver->setAllowedTypes('first_options', 'array');
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TextType.php b/src/Symfony/Component/Form/Extension/Core/Type/TextType.php
index 0944c38b61a2c..9b3c59db85bb4 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TextType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TextType.php
@@ -35,9 +35,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'compound' => false,
-        ));
+        ]);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
index cff079d2b7fce..92b7f79be55ca 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -27,17 +27,17 @@
 
 class TimeType extends AbstractType
 {
-    private static $widgets = array(
+    private static $widgets = [
         'text' => 'Symfony\Component\Form\Extension\Core\Type\TextType',
         'choice' => 'Symfony\Component\Form\Extension\Core\Type\ChoiceType',
-    );
+    ];
 
     /**
      * {@inheritdoc}
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $parts = array('hour');
+        $parts = ['hour'];
         $format = 'H';
 
         if ($options['with_seconds'] && !$options['with_minutes']) {
@@ -68,13 +68,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 });
             }
         } else {
-            $hourOptions = $minuteOptions = $secondOptions = array(
+            $hourOptions = $minuteOptions = $secondOptions = [
                 'error_bubbling' => true,
                 'empty_data' => '',
-            );
+            ];
             // when the form is compound the entries of the array are ignored in favor of children data
             // so we need to handle the cascade setting here
-            $emptyData = $builder->getEmptyData() ?: array();
+            $emptyData = $builder->getEmptyData() ?: [];
 
             if (isset($emptyData['hour'])) {
                 $hourOptions['empty_data'] = $emptyData['hour'];
@@ -93,7 +93,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             }
 
             if ('choice' === $options['widget']) {
-                $hours = $minutes = array();
+                $hours = $minutes = [];
 
                 foreach ($options['hours'] as $hour) {
                     $hours[str_pad($hour, 2, '0', STR_PAD_LEFT)] = $hour;
@@ -115,7 +115,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 }
 
                 if ($options['with_seconds']) {
-                    $seconds = array();
+                    $seconds = [];
 
                     foreach ($options['seconds'] as $second) {
                         $seconds[str_pad($second, 2, '0', STR_PAD_LEFT)] = $second;
@@ -127,7 +127,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 }
 
                 // Append generic carry-along options
-                foreach (array('required', 'translation_domain') as $passOpt) {
+                foreach (['required', 'translation_domain'] as $passOpt) {
                     $hourOptions[$passOpt] = $options[$passOpt];
 
                     if ($options['with_minutes']) {
@@ -179,11 +179,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars = array_replace($view->vars, array(
+        $view->vars = array_replace($view->vars, [
             'widget' => $options['widget'],
             'with_minutes' => $options['with_minutes'],
             'with_seconds' => $options['with_seconds'],
-        ));
+        ]);
 
         // Change the input to a HTML5 time input if
         //  * the widget is set to "single_text"
@@ -219,16 +219,16 @@ public function configureOptions(OptionsResolver $resolver)
                 $default = $placeholderDefault($options);
 
                 return array_merge(
-                    array('hour' => $default, 'minute' => $default, 'second' => $default),
+                    ['hour' => $default, 'minute' => $default, 'second' => $default],
                     $placeholder
                 );
             }
 
-            return array(
+            return [
                 'hour' => $placeholder,
                 'minute' => $placeholder,
                 'second' => $placeholder,
-            );
+            ];
         };
 
         $choiceTranslationDomainNormalizer = function (Options $options, $choiceTranslationDomain) {
@@ -236,16 +236,16 @@ public function configureOptions(OptionsResolver $resolver)
                 $default = false;
 
                 return array_replace(
-                    array('hour' => $default, 'minute' => $default, 'second' => $default),
+                    ['hour' => $default, 'minute' => $default, 'second' => $default],
                     $choiceTranslationDomain
                 );
             }
 
-            return array(
+            return [
                 'hour' => $choiceTranslationDomain,
                 'minute' => $choiceTranslationDomain,
                 'second' => $choiceTranslationDomain,
-            );
+            ];
         };
 
         $resolver->setDefaults(array(
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
index 6bad499350b01..62fb44d608301 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
@@ -48,7 +48,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'choice_loader' => function (Options $options) {
                 if ($options['choices']) {
                     @trigger_error(sprintf('Using the "choices" option in %s has been deprecated since Symfony 3.3 and will be ignored in 4.0. Override the "choice_loader" option instead or set it to null.', __CLASS__), E_USER_DEPRECATED);
@@ -65,9 +65,9 @@ public function configureOptions(OptionsResolver $resolver)
             'choice_translation_domain' => false,
             'input' => 'string',
             'regions' => \DateTimeZone::ALL,
-        ));
+        ]);
 
-        $resolver->setAllowedValues('input', array('string', 'datetimezone'));
+        $resolver->setAllowedValues('input', ['string', 'datetimezone']);
 
         $resolver->setAllowedTypes('regions', 'int');
     }
@@ -159,7 +159,7 @@ public function loadValuesForChoices(array $choices, $value = null)
      */
     private static function getTimezones($regions)
     {
-        $timezones = array();
+        $timezones = [];
 
         foreach (\DateTimeZone::listIdentifiers($regions) as $timezone) {
             $parts = explode('/', $timezone);
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php b/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php
index 689a2a10051a9..17460688b7fd6 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php
@@ -35,7 +35,7 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefault('default_protocol', 'http');
 
-        $resolver->setAllowedTypes('default_protocol', array('null', 'string'));
+        $resolver->setAllowedTypes('default_protocol', ['null', 'string']);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php
index c6959c6efeab8..0fd919fe8449f 100644
--- a/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php
+++ b/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php
@@ -43,8 +43,8 @@ public function __construct(CsrfTokenManagerInterface $tokenManager, TranslatorI
      */
     protected function loadTypeExtensions()
     {
-        return array(
+        return [
             new Type\FormTypeCsrfExtension($this->tokenManager, true, '_token', $this->translator, $this->translationDomain),
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
index 0e9c6456e7c8b..452bca443f5e9 100644
--- a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
+++ b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
@@ -35,9 +35,9 @@ class CsrfValidationListener implements EventSubscriberInterface
 
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             FormEvents::PRE_SUBMIT => 'preSubmit',
-        );
+        ];
     }
 
     public function __construct($fieldName, CsrfTokenManagerInterface $tokenManager, $tokenId, $errorMessage, TranslatorInterface $translator = null, $translationDomain = null, ServerParams $serverParams = null)
@@ -63,7 +63,7 @@ public function preSubmit(FormEvent $event)
                 $errorMessage = $this->errorMessage;
 
                 if (null !== $this->translator) {
-                    $errorMessage = $this->translator->trans($errorMessage, array(), $this->translationDomain);
+                    $errorMessage = $this->translator->trans($errorMessage, [], $this->translationDomain);
                 }
 
                 $form->addError(new FormError($errorMessage));
diff --git a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
index bcfc3cdf721d8..927c7157e5ff9 100644
--- a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
+++ b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
@@ -90,9 +90,9 @@ public function finishView(FormView $view, FormInterface $form, array $options)
             $tokenId = $options['csrf_token_id'] ?: ($form->getName() ?: \get_class($form->getConfig()->getType()->getInnerType()));
             $data = (string) $options['csrf_token_manager']->getToken($tokenId);
 
-            $csrfForm = $factory->createNamed($options['csrf_field_name'], 'Symfony\Component\Form\Extension\Core\Type\HiddenType', $data, array(
+            $csrfForm = $factory->createNamed($options['csrf_field_name'], 'Symfony\Component\Form\Extension\Core\Type\HiddenType', $data, [
                 'mapped' => false,
-            ));
+            ]);
 
             $view->children[$options['csrf_field_name']] = $csrfForm->createView($view);
         }
@@ -103,13 +103,13 @@ public function finishView(FormView $view, FormInterface $form, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'csrf_protection' => $this->defaultEnabled,
             'csrf_field_name' => $this->defaultFieldName,
             'csrf_message' => 'The CSRF token is invalid. Please try to resubmit the form.',
             'csrf_token_manager' => $this->defaultTokenManager,
             'csrf_token_id' => null,
-        ));
+        ]);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php b/src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php
index 5b60cfbbcd78a..4b23513b7cf73 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php
@@ -33,8 +33,8 @@ public function __construct(FormDataCollectorInterface $dataCollector)
      */
     protected function loadTypeExtensions()
     {
-        return array(
+        return [
             new Type\DataCollectorTypeExtension($this->dataCollector),
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php b/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php
index 1ae6e9f3ec3d4..77595ab38acea 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php
@@ -36,12 +36,12 @@ public function __construct(FormDataCollectorInterface $dataCollector)
      */
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             // High priority in order to be called as soon as possible
-            FormEvents::POST_SET_DATA => array('postSetData', 255),
+            FormEvents::POST_SET_DATA => ['postSetData', 255],
             // Low priority in order to be called as late as possible
-            FormEvents::POST_SUBMIT => array('postSubmit', -255),
-        );
+            FormEvents::POST_SUBMIT => ['postSubmit', -255],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
index d76944cce9012..88fa453a62580 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
@@ -84,11 +84,11 @@ public function collect(Request $request, Response $response, \Exception $except
 
     public function reset()
     {
-        $this->data = array(
-            'forms' => array(),
-            'forms_by_hash' => array(),
+        $this->data = [
+            'forms' => [],
+            'forms_by_hash' => [],
             'nb_errors' => 0,
-        );
+        ];
     }
 
     /**
@@ -107,7 +107,7 @@ public function collectConfiguration(FormInterface $form)
         $hash = spl_object_hash($form);
 
         if (!isset($this->dataByForm[$hash])) {
-            $this->dataByForm[$hash] = array();
+            $this->dataByForm[$hash] = [];
         }
 
         $this->dataByForm[$hash] = array_replace(
@@ -128,7 +128,7 @@ public function collectDefaultData(FormInterface $form)
         $hash = spl_object_hash($form);
 
         if (!isset($this->dataByForm[$hash])) {
-            $this->dataByForm[$hash] = array();
+            $this->dataByForm[$hash] = [];
         }
 
         $this->dataByForm[$hash] = array_replace(
@@ -183,7 +183,7 @@ public function collectViewVariables(FormView $view)
         $hash = spl_object_hash($view);
 
         if (!isset($this->dataByView[$hash])) {
-            $this->dataByView[$hash] = array();
+            $this->dataByView[$hash] = [];
         }
 
         $this->dataByView[$hash] = array_replace(
@@ -246,9 +246,9 @@ public function serialize()
      */
     protected function getCasters()
     {
-        return parent::getCasters() + array(
+        return parent::getCasters() + [
             \Exception::class => function (\Exception $e, array $a, Stub $s) {
-                foreach (array("\0Exception\0previous", "\0Exception\0trace") as $k) {
+                foreach (["\0Exception\0previous", "\0Exception\0trace"] as $k) {
                     if (isset($a[$k])) {
                         unset($a[$k]);
                         ++$s->cut;
@@ -258,20 +258,20 @@ protected function getCasters()
                 return $a;
             },
             FormInterface::class => function (FormInterface $f, array $a) {
-                return array(
+                return [
                     Caster::PREFIX_VIRTUAL.'name' => $f->getName(),
                     Caster::PREFIX_VIRTUAL.'type_class' => new ClassStub(\get_class($f->getConfig()->getType()->getInnerType())),
-                );
+                ];
             },
-            FormView::class => array(StubCaster::class, 'cutInternals'),
+            FormView::class => [StubCaster::class, 'cutInternals'],
             ConstraintViolationInterface::class => function (ConstraintViolationInterface $v, array $a) {
-                return array(
+                return [
                     Caster::PREFIX_VIRTUAL.'root' => $v->getRoot(),
                     Caster::PREFIX_VIRTUAL.'path' => $v->getPropertyPath(),
                     Caster::PREFIX_VIRTUAL.'value' => $v->getInvalidValue(),
-                );
+                ];
             },
-        );
+        ];
     }
 
     private function &recursiveBuildPreliminaryFormTree(FormInterface $form, array &$outputByHash)
@@ -281,9 +281,9 @@ private function &recursiveBuildPreliminaryFormTree(FormInterface $form, array &
         $output = &$outputByHash[$hash];
         $output = isset($this->dataByForm[$hash])
             ? $this->dataByForm[$hash]
-            : array();
+            : [];
 
-        $output['children'] = array();
+        $output['children'] = [];
 
         foreach ($form as $name => $child) {
             $output['children'][$name] = &$this->recursiveBuildPreliminaryFormTree($child, $outputByHash);
@@ -311,18 +311,18 @@ private function &recursiveBuildFinalFormTree(FormInterface $form = null, FormVi
 
         $output = isset($this->dataByView[$viewHash])
             ? $this->dataByView[$viewHash]
-            : array();
+            : [];
 
         if (null !== $formHash) {
             $output = array_replace(
                 $output,
                 isset($this->dataByForm[$formHash])
                     ? $this->dataByForm[$formHash]
-                    : array()
+                    : []
             );
         }
 
-        $output['children'] = array();
+        $output['children'] = [];
 
         foreach ($view->children as $name => $childView) {
             // The CSRF token, for example, is never added to the form tree.
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php
index c7f65f442b956..75691c26b4f44 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php
@@ -38,16 +38,16 @@ public function __construct(ValueExporter $valueExporter = null, $triggerDepreca
      */
     public function extractConfiguration(FormInterface $form)
     {
-        $data = array(
+        $data = [
             'id' => $this->buildId($form),
             'name' => $form->getName(),
             'type_class' => \get_class($form->getConfig()->getType()->getInnerType()),
             'synchronized' => $form->isSynchronized(),
-            'passed_options' => array(),
-            'resolved_options' => array(),
-        );
+            'passed_options' => [],
+            'resolved_options' => [],
+        ];
 
-        foreach ($form->getConfig()->getAttribute('data_collector/passed_options', array()) as $option => $value) {
+        foreach ($form->getConfig()->getAttribute('data_collector/passed_options', []) as $option => $value) {
             $data['passed_options'][$option] = $value;
         }
 
@@ -66,12 +66,12 @@ public function extractConfiguration(FormInterface $form)
      */
     public function extractDefaultData(FormInterface $form)
     {
-        $data = array(
-            'default_data' => array(
+        $data = [
+            'default_data' => [
                 'norm' => $form->getNormData(),
-            ),
-            'submitted_data' => array(),
-        );
+            ],
+            'submitted_data' => [],
+        ];
 
         if ($form->getData() !== $form->getNormData()) {
             $data['default_data']['model'] = $form->getData();
@@ -89,12 +89,12 @@ public function extractDefaultData(FormInterface $form)
      */
     public function extractSubmittedData(FormInterface $form)
     {
-        $data = array(
-            'submitted_data' => array(
+        $data = [
+            'submitted_data' => [
                 'norm' => $form->getNormData(),
-            ),
-            'errors' => array(),
-        );
+            ],
+            'errors' => [],
+        ];
 
         if ($form->getViewData() !== $form->getNormData()) {
             $data['submitted_data']['view'] = $form->getViewData();
@@ -105,13 +105,13 @@ public function extractSubmittedData(FormInterface $form)
         }
 
         foreach ($form->getErrors() as $error) {
-            $errorData = array(
+            $errorData = [
                 'message' => $error->getMessage(),
                 'origin' => \is_object($error->getOrigin())
                     ? spl_object_hash($error->getOrigin())
                     : null,
-                'trace' => array(),
-            );
+                'trace' => [],
+            ];
 
             $cause = $error->getCause();
 
@@ -148,11 +148,11 @@ public function extractSubmittedData(FormInterface $form)
      */
     public function extractViewVariables(FormView $view)
     {
-        $data = array(
+        $data = [
             'id' => isset($view->vars['id']) ? $view->vars['id'] : null,
             'name' => isset($view->vars['name']) ? $view->vars['name'] : null,
-            'view_vars' => array(),
-        );
+            'view_vars' => [],
+        ];
 
         foreach ($view->vars as $varName => $value) {
             $data['view_vars'][$varName] = $value;
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php
index c403be374b2d4..53a76c8490d79 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php
@@ -69,7 +69,7 @@ public function getTypeExtensions()
     /**
      * {@inheritdoc}
      */
-    public function createBuilder(FormFactoryInterface $factory, $name, array $options = array())
+    public function createBuilder(FormFactoryInterface $factory, $name, array $options = [])
     {
         $builder = $this->proxiedType->createBuilder($factory, $name, $options);
 
diff --git a/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php b/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
index 4d89bdb66ccf4..6479c85939d93 100644
--- a/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
+++ b/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
@@ -76,7 +76,7 @@ public function hasType($name)
 
     public function getTypeExtensions($name)
     {
-        $extensions = array();
+        $extensions = [];
 
         if (isset($this->typeExtensionServices[$name])) {
             foreach ($this->typeExtensionServices[$name] as $serviceId => $extension) {
@@ -105,7 +105,7 @@ public function getTypeGuesser()
     {
         if (!$this->guesserLoaded) {
             $this->guesserLoaded = true;
-            $guessers = array();
+            $guessers = [];
 
             foreach ($this->guesserServices as $serviceId => $service) {
                 if (null !== $this->guesserServiceIds) {
diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationExtension.php b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationExtension.php
index 08bd89c9e4471..27305ada41e97 100644
--- a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationExtension.php
+++ b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationExtension.php
@@ -22,8 +22,8 @@ class HttpFoundationExtension extends AbstractExtension
 {
     protected function loadTypeExtensions()
     {
-        return array(
+        return [
             new Type\FormTypeHttpFoundationExtension(),
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php
index 0a1297d3ab21a..75ee65443f450 100644
--- a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php
+++ b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php
@@ -75,7 +75,7 @@ public function handleRequest(FormInterface $form, $request = null)
                 $form->addError(new FormError(
                     \call_user_func($form->getConfig()->getOption('upload_max_size_message')),
                     null,
-                    array('{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize())
+                    ['{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize()]
                 ));
 
                 return;
@@ -85,7 +85,7 @@ public function handleRequest(FormInterface $form, $request = null)
                 $params = $request->request->all();
                 $files = $request->files->all();
             } elseif ($request->request->has($name) || $request->files->has($name)) {
-                $default = $form->getConfig()->getCompound() ? array() : null;
+                $default = $form->getConfig()->getCompound() ? [] : null;
                 $params = $request->request->get($name, $default);
                 $files = $request->files->get($name, $default);
             } else {
diff --git a/src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php b/src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php
index 903f7c75b48e9..84dcb1eda9f26 100644
--- a/src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php
+++ b/src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php
@@ -24,10 +24,10 @@
  */
 class TemplatingExtension extends AbstractExtension
 {
-    public function __construct(PhpEngine $engine, CsrfTokenManagerInterface $csrfTokenManager = null, array $defaultThemes = array())
+    public function __construct(PhpEngine $engine, CsrfTokenManagerInterface $csrfTokenManager = null, array $defaultThemes = [])
     {
-        $engine->addHelpers(array(
+        $engine->addHelpers([
             new FormHelper(new FormRenderer(new TemplatingRendererEngine($engine, $defaultThemes), $csrfTokenManager)),
-        ));
+        ]);
     }
 }
diff --git a/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php b/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php
index b26c9ef1ddb33..4805a66bba83d 100644
--- a/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php
+++ b/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php
@@ -22,7 +22,7 @@ class TemplatingRendererEngine extends AbstractRendererEngine
 {
     private $engine;
 
-    public function __construct(EngineInterface $engine, array $defaultThemes = array())
+    public function __construct(EngineInterface $engine, array $defaultThemes = [])
     {
         parent::__construct($defaultThemes);
 
@@ -32,7 +32,7 @@ public function __construct(EngineInterface $engine, array $defaultThemes = arra
     /**
      * {@inheritdoc}
      */
-    public function renderBlock(FormView $view, $resource, $blockName, array $variables = array())
+    public function renderBlock(FormView $view, $resource, $blockName, array $variables = [])
     {
         return trim($this->engine->render($resource, $variables));
     }
diff --git a/src/Symfony/Component/Form/Extension/Validator/Constraints/Form.php b/src/Symfony/Component/Form/Extension/Validator/Constraints/Form.php
index 9abb14189dc0e..7d2d751525946 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Constraints/Form.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Constraints/Form.php
@@ -21,10 +21,10 @@ class Form extends Constraint
     const NOT_SYNCHRONIZED_ERROR = '1dafa156-89e1-4736-b832-419c2e501fca';
     const NO_SUCH_FIELD_ERROR = '6e5212ed-a197-4339-99aa-5654798a4854';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::NOT_SYNCHRONIZED_ERROR => 'NOT_SYNCHRONIZED_ERROR',
         self::NO_SUCH_FIELD_ERROR => 'NO_SUCH_FIELD_ERROR',
-    );
+    ];
 
     /**
      * {@inheritdoc}
diff --git a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
index 02f8237a4608c..08d679a4b5d4c 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
@@ -55,7 +55,7 @@ public function validate($form, Constraint $constraint)
 
             // Validate the data against the constraints defined
             // in the form
-            $constraints = $config->getOption('constraints', array());
+            $constraints = $config->getOption('constraints', []);
 
             if ($groups instanceof GroupSequence) {
                 $validator->atPath('data')->validate($form->getData(), $constraints, $groups);
@@ -115,7 +115,7 @@ public function validate($form, Constraint $constraint)
 
                 $this->context->setConstraint($constraint);
                 $this->context->buildViolation($config->getOption('invalid_message'))
-                    ->setParameters(array_replace(array('{{ value }}' => $clientDataAsString), $config->getOption('invalid_message_parameters')))
+                    ->setParameters(array_replace(['{{ value }}' => $clientDataAsString], $config->getOption('invalid_message_parameters')))
                     ->setInvalidValue($form->getViewData())
                     ->setCode(Form::NOT_SYNCHRONIZED_ERROR)
                     ->setCause($form->getTransformationFailure())
@@ -166,7 +166,7 @@ private static function getValidationGroups(FormInterface $form)
             $form = $form->getParent();
         } while (null !== $form);
 
-        return array(Constraint::DEFAULT_GROUP);
+        return [Constraint::DEFAULT_GROUP];
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php b/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php
index cbcc3e3e55d07..80c94dc66e4d0 100644
--- a/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php
+++ b/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php
@@ -32,7 +32,7 @@ class ValidationListener implements EventSubscriberInterface
      */
     public static function getSubscribedEvents()
     {
-        return array(FormEvents::POST_SUBMIT => 'validateForm');
+        return [FormEvents::POST_SUBMIT => 'validateForm'];
     }
 
     public function __construct(ValidatorInterface $validator, ViolationMapperInterface $violationMapper)
diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
index 431bf5ecfb6c1..63505ba2333db 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
@@ -32,7 +32,7 @@ public function configureOptions(OptionsResolver $resolver)
         // Make sure that validation groups end up as null, closure or array
         $validationGroupsNormalizer = function (Options $options, $groups) {
             if (false === $groups) {
-                return array();
+                return [];
             }
 
             if (empty($groups)) {
@@ -50,9 +50,9 @@ public function configureOptions(OptionsResolver $resolver)
             return (array) $groups;
         };
 
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'validation_groups' => null,
-        ));
+        ]);
 
         $resolver->setNormalizer('validation_groups', $validationGroupsNormalizer);
     }
diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
index b83c2030c0f0e..aafd479e56a6b 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
@@ -49,17 +49,17 @@ public function configureOptions(OptionsResolver $resolver)
 
         // Constraint should always be converted to an array
         $constraintsNormalizer = function (Options $options, $constraints) {
-            return \is_object($constraints) ? array($constraints) : (array) $constraints;
+            return \is_object($constraints) ? [$constraints] : (array) $constraints;
         };
 
-        $resolver->setDefaults(array(
-            'error_mapping' => array(),
-            'constraints' => array(),
+        $resolver->setDefaults([
+            'error_mapping' => [],
+            'constraints' => [],
             'invalid_message' => 'This value is not valid.',
-            'invalid_message_parameters' => array(),
+            'invalid_message_parameters' => [],
             'allow_extra_fields' => false,
             'extra_fields_message' => 'This form should not contain extra fields.',
-        ));
+        ]);
 
         $resolver->setNormalizer('constraints', $constraintsNormalizer);
     }
diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
index ff27fbdb474fe..ddffdc1b7a8e3 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
@@ -27,12 +27,12 @@ public function configureOptions(OptionsResolver $resolver)
     {
         // Map errors to the first field
         $errorMapping = function (Options $options) {
-            return array('.' => $options['first_name']);
+            return ['.' => $options['first_name']];
         };
 
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'error_mapping' => $errorMapping,
-        ));
+        ]);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php
index 8e90a54da46c7..a5e38859c0888 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php
@@ -49,10 +49,10 @@ public function loadTypeGuesser()
 
     protected function loadTypeExtensions()
     {
-        return array(
+        return [
             new Type\FormTypeValidatorExtension($this->validator),
             new Type\RepeatedTypeValidatorExtension(),
             new Type\SubmitTypeValidatorExtension(),
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
index d784c13e69493..22cc7726d4a79 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
@@ -81,77 +81,77 @@ public function guessTypeForConstraint(Constraint $constraint)
             case 'Symfony\Component\Validator\Constraints\Type':
                 switch ($constraint->type) {
                     case 'array':
-                        return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CollectionType', array(), Guess::MEDIUM_CONFIDENCE);
+                        return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CollectionType', [], Guess::MEDIUM_CONFIDENCE);
                     case 'boolean':
                     case 'bool':
-                        return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CheckboxType', array(), Guess::MEDIUM_CONFIDENCE);
+                        return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CheckboxType', [], Guess::MEDIUM_CONFIDENCE);
 
                     case 'double':
                     case 'float':
                     case 'numeric':
                     case 'real':
-                        return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\NumberType', array(), Guess::MEDIUM_CONFIDENCE);
+                        return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\NumberType', [], Guess::MEDIUM_CONFIDENCE);
 
                     case 'integer':
                     case 'int':
                     case 'long':
-                        return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\IntegerType', array(), Guess::MEDIUM_CONFIDENCE);
+                        return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\IntegerType', [], Guess::MEDIUM_CONFIDENCE);
 
                     case '\DateTime':
-                        return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', array(), Guess::MEDIUM_CONFIDENCE);
+                        return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', [], Guess::MEDIUM_CONFIDENCE);
 
                     case 'string':
-                        return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', array(), Guess::LOW_CONFIDENCE);
+                        return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', [], Guess::LOW_CONFIDENCE);
                 }
                 break;
 
             case 'Symfony\Component\Validator\Constraints\Country':
-                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CountryType', array(), Guess::HIGH_CONFIDENCE);
+                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CountryType', [], Guess::HIGH_CONFIDENCE);
 
             case 'Symfony\Component\Validator\Constraints\Currency':
-                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CurrencyType', array(), Guess::HIGH_CONFIDENCE);
+                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CurrencyType', [], Guess::HIGH_CONFIDENCE);
 
             case 'Symfony\Component\Validator\Constraints\Date':
-                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', array('input' => 'string'), Guess::HIGH_CONFIDENCE);
+                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', ['input' => 'string'], Guess::HIGH_CONFIDENCE);
 
             case 'Symfony\Component\Validator\Constraints\DateTime':
-                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateTimeType', array('input' => 'string'), Guess::HIGH_CONFIDENCE);
+                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateTimeType', ['input' => 'string'], Guess::HIGH_CONFIDENCE);
 
             case 'Symfony\Component\Validator\Constraints\Email':
-                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\EmailType', array(), Guess::HIGH_CONFIDENCE);
+                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\EmailType', [], Guess::HIGH_CONFIDENCE);
 
             case 'Symfony\Component\Validator\Constraints\File':
             case 'Symfony\Component\Validator\Constraints\Image':
-                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\FileType', array(), Guess::HIGH_CONFIDENCE);
+                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\FileType', [], Guess::HIGH_CONFIDENCE);
 
             case 'Symfony\Component\Validator\Constraints\Language':
-                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\LanguageType', array(), Guess::HIGH_CONFIDENCE);
+                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\LanguageType', [], Guess::HIGH_CONFIDENCE);
 
             case 'Symfony\Component\Validator\Constraints\Locale':
-                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\LocaleType', array(), Guess::HIGH_CONFIDENCE);
+                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\LocaleType', [], Guess::HIGH_CONFIDENCE);
 
             case 'Symfony\Component\Validator\Constraints\Time':
-                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TimeType', array('input' => 'string'), Guess::HIGH_CONFIDENCE);
+                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TimeType', ['input' => 'string'], Guess::HIGH_CONFIDENCE);
 
             case 'Symfony\Component\Validator\Constraints\Url':
-                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\UrlType', array(), Guess::HIGH_CONFIDENCE);
+                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\UrlType', [], Guess::HIGH_CONFIDENCE);
 
             case 'Symfony\Component\Validator\Constraints\Ip':
-                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', array(), Guess::MEDIUM_CONFIDENCE);
+                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', [], Guess::MEDIUM_CONFIDENCE);
 
             case 'Symfony\Component\Validator\Constraints\Length':
             case 'Symfony\Component\Validator\Constraints\Regex':
-                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', array(), Guess::LOW_CONFIDENCE);
+                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', [], Guess::LOW_CONFIDENCE);
 
             case 'Symfony\Component\Validator\Constraints\Range':
-                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\NumberType', array(), Guess::LOW_CONFIDENCE);
+                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\NumberType', [], Guess::LOW_CONFIDENCE);
 
             case 'Symfony\Component\Validator\Constraints\Count':
-                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CollectionType', array(), Guess::LOW_CONFIDENCE);
+                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CollectionType', [], Guess::LOW_CONFIDENCE);
 
             case 'Symfony\Component\Validator\Constraints\IsTrue':
             case 'Symfony\Component\Validator\Constraints\IsFalse':
-                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CheckboxType', array(), Guess::MEDIUM_CONFIDENCE);
+                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CheckboxType', [], Guess::MEDIUM_CONFIDENCE);
         }
     }
 
@@ -185,7 +185,7 @@ public function guessMaxLengthForConstraint(Constraint $constraint)
                 break;
 
             case 'Symfony\Component\Validator\Constraints\Type':
-                if (\in_array($constraint->type, array('double', 'float', 'numeric', 'real'))) {
+                if (\in_array($constraint->type, ['double', 'float', 'numeric', 'real'])) {
                     return new ValueGuess(null, Guess::MEDIUM_CONFIDENCE);
                 }
                 break;
@@ -227,7 +227,7 @@ public function guessPatternForConstraint(Constraint $constraint)
                 break;
 
             case 'Symfony\Component\Validator\Constraints\Type':
-                if (\in_array($constraint->type, array('double', 'float', 'numeric', 'real'))) {
+                if (\in_array($constraint->type, ['double', 'float', 'numeric', 'real'])) {
                     return new ValueGuess(null, Guess::MEDIUM_CONFIDENCE);
                 }
                 break;
@@ -249,7 +249,7 @@ public function guessPatternForConstraint(Constraint $constraint)
      */
     protected function guess($class, $property, \Closure $closure, $defaultValue = null)
     {
-        $guesses = array();
+        $guesses = [];
         $classMetadata = $this->metadataFactory->getMetadataFor($class);
 
         if ($classMetadata instanceof ClassMetadataInterface && $classMetadata->hasPropertyMetadata($property)) {
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
index 9671082a651cc..86a77044d13d5 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
@@ -153,7 +153,7 @@ private function matchChild(FormInterface $form, PropertyPathIteratorInterface $
         $foundAtIndex = null;
 
         // Construct mapping rules for the given form
-        $rules = array();
+        $rules = [];
 
         foreach ($form->getConfig()->getOption('error_mapping') as $propertyPath => $targetPath) {
             // Dot rules are considered at the very end
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php
index 19020c7a6926a..a38195af51627 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php
@@ -23,17 +23,17 @@ class ViolationPath implements \IteratorAggregate, PropertyPathInterface
     /**
      * @var array
      */
-    private $elements = array();
+    private $elements = [];
 
     /**
      * @var array
      */
-    private $isIndex = array();
+    private $isIndex = [];
 
     /**
      * @var array
      */
-    private $mapsForm = array();
+    private $mapsForm = [];
 
     /**
      * @var string
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
index a2d67ec2669da..1ab5d146efd61 100644
--- a/src/Symfony/Component/Form/Form.php
+++ b/src/Symfony/Component/Form/Form.php
@@ -88,7 +88,7 @@ class Form implements \IteratorAggregate, FormInterface
      *
      * @var FormError[] An array of FormError instances
      */
-    private $errors = array();
+    private $errors = [];
 
     /**
      * Whether this form was submitted.
@@ -130,7 +130,7 @@ class Form implements \IteratorAggregate, FormInterface
      *
      * @var array
      */
-    private $extraData = array();
+    private $extraData = [];
 
     /**
      * Returns the transformation failure generated during submission, if any.
@@ -507,7 +507,7 @@ public function submit($submittedData, $clearMissing = true)
 
         // Initialize errors in the very beginning so that we don't lose any
         // errors added during listeners
-        $this->errors = array();
+        $this->errors = [];
 
         // Obviously, a disabled form should not change its data upon submission.
         if ($this->isDisabled()) {
@@ -564,7 +564,7 @@ public function submit($submittedData, $clearMissing = true)
             // (think of empty collection forms)
             if ($this->config->getCompound()) {
                 if (null === $submittedData) {
-                    $submittedData = array();
+                    $submittedData = [];
                 }
 
                 if (!\is_array($submittedData)) {
@@ -814,7 +814,7 @@ public function all()
     /**
      * {@inheritdoc}
      */
-    public function add($child, $type = null, array $options = array())
+    public function add($child, $type = null, array $options = [])
     {
         if ($this->submitted) {
             throw new AlreadySubmittedException('You cannot add children to a submitted form');
@@ -877,7 +877,7 @@ public function add($child, $type = null, array $options = array())
         $child->setParent($this);
 
         if (!$this->lockSetData && $this->defaultDataSet && !$this->config->getInheritData()) {
-            $iterator = new InheritDataAwareIterator(new \ArrayIterator(array($child->getName() => $child)));
+            $iterator = new InheritDataAwareIterator(new \ArrayIterator([$child->getName() => $child]));
             $iterator = new \RecursiveIteratorIterator($iterator);
             $this->config->getDataMapper()->mapDataToForms($viewData, $iterator);
         }
diff --git a/src/Symfony/Component/Form/FormBuilder.php b/src/Symfony/Component/Form/FormBuilder.php
index a5d6ca820ac5d..d3b02db55ab32 100644
--- a/src/Symfony/Component/Form/FormBuilder.php
+++ b/src/Symfony/Component/Form/FormBuilder.php
@@ -28,14 +28,14 @@ class FormBuilder extends FormConfigBuilder implements \IteratorAggregate, FormB
      *
      * @var FormBuilderInterface[]
      */
-    private $children = array();
+    private $children = [];
 
     /**
      * The data of children who haven't been converted to form builders yet.
      *
      * @var array
      */
-    private $unresolvedChildren = array();
+    private $unresolvedChildren = [];
 
     /**
      * Creates a new form builder.
@@ -56,7 +56,7 @@ public function __construct($name, $dataClass, EventDispatcherInterface $dispatc
     /**
      * {@inheritdoc}
      */
-    public function add($child, $type = null, array $options = array())
+    public function add($child, $type = null, array $options = [])
     {
         if ($this->locked) {
             throw new BadMethodCallException('FormBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
@@ -81,10 +81,10 @@ public function add($child, $type = null, array $options = array())
 
         // Add to "children" to maintain order
         $this->children[$child] = null;
-        $this->unresolvedChildren[$child] = array(
+        $this->unresolvedChildren[$child] = [
             'type' => $type,
             'options' => $options,
-        );
+        ];
 
         return $this;
     }
@@ -92,7 +92,7 @@ public function add($child, $type = null, array $options = array())
     /**
      * {@inheritdoc}
      */
-    public function create($name, $type = null, array $options = array())
+    public function create($name, $type = null, array $options = [])
     {
         if ($this->locked) {
             throw new BadMethodCallException('FormBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
@@ -197,8 +197,8 @@ public function getFormConfig()
         /** @var $config self */
         $config = parent::getFormConfig();
 
-        $config->children = array();
-        $config->unresolvedChildren = array();
+        $config->children = [];
+        $config->unresolvedChildren = [];
 
         return $config;
     }
@@ -269,6 +269,6 @@ private function resolveChildren()
             $this->children[$name] = $this->create($name, $info['type'], $info['options']);
         }
 
-        $this->unresolvedChildren = array();
+        $this->unresolvedChildren = [];
     }
 }
diff --git a/src/Symfony/Component/Form/FormBuilderInterface.php b/src/Symfony/Component/Form/FormBuilderInterface.php
index 32582336aba9e..1ed695ed044d8 100644
--- a/src/Symfony/Component/Form/FormBuilderInterface.php
+++ b/src/Symfony/Component/Form/FormBuilderInterface.php
@@ -29,7 +29,7 @@ interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuild
      *
      * @return self
      */
-    public function add($child, $type = null, array $options = array());
+    public function add($child, $type = null, array $options = []);
 
     /**
      * Creates a form builder.
@@ -40,7 +40,7 @@ public function add($child, $type = null, array $options = array());
      *
      * @return self
      */
-    public function create($name, $type = null, array $options = array());
+    public function create($name, $type = null, array $options = []);
 
     /**
      * Returns a child by name.
diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php
index 7f5574203fded..5cc4bf5a3fa58 100644
--- a/src/Symfony/Component/Form/FormConfigBuilder.php
+++ b/src/Symfony/Component/Form/FormConfigBuilder.php
@@ -95,12 +95,12 @@ class FormConfigBuilder implements FormConfigBuilderInterface
     /**
      * @var array
      */
-    private $viewTransformers = array();
+    private $viewTransformers = [];
 
     /**
      * @var array
      */
-    private $modelTransformers = array();
+    private $modelTransformers = [];
 
     /**
      * @var DataMapperInterface
@@ -130,7 +130,7 @@ class FormConfigBuilder implements FormConfigBuilderInterface
     /**
      * @var array
      */
-    private $attributes = array();
+    private $attributes = [];
 
     /**
      * @var mixed
@@ -257,7 +257,7 @@ public function resetViewTransformers()
             throw new BadMethodCallException('FormConfigBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
         }
 
-        $this->viewTransformers = array();
+        $this->viewTransformers = [];
 
         return $this;
     }
@@ -289,7 +289,7 @@ public function resetModelTransformers()
             throw new BadMethodCallException('FormConfigBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
         }
 
-        $this->modelTransformers = array();
+        $this->modelTransformers = [];
 
         return $this;
     }
diff --git a/src/Symfony/Component/Form/FormError.php b/src/Symfony/Component/Form/FormError.php
index 7384cb2805de8..499f797b0bf61 100644
--- a/src/Symfony/Component/Form/FormError.php
+++ b/src/Symfony/Component/Form/FormError.php
@@ -141,13 +141,13 @@ public function getOrigin()
      */
     public function serialize()
     {
-        return serialize(array(
+        return serialize([
             $this->message,
             $this->messageTemplate,
             $this->messageParameters,
             $this->messagePluralization,
             $this->cause,
-        ));
+        ]);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/FormErrorIterator.php b/src/Symfony/Component/Form/FormErrorIterator.php
index a534918406bc0..2cc53c0923f94 100644
--- a/src/Symfony/Component/Form/FormErrorIterator.php
+++ b/src/Symfony/Component/Form/FormErrorIterator.php
@@ -261,7 +261,7 @@ public function seek($position)
     public function findByCodes($codes)
     {
         $codes = (array) $codes;
-        $errors = array();
+        $errors = [];
         foreach ($this as $error) {
             $cause = $error->getCause();
             if ($cause instanceof ConstraintViolation && \in_array($cause->getCode(), $codes, true)) {
diff --git a/src/Symfony/Component/Form/FormFactory.php b/src/Symfony/Component/Form/FormFactory.php
index 3f18ccf3259c3..d474d5903f86f 100644
--- a/src/Symfony/Component/Form/FormFactory.php
+++ b/src/Symfony/Component/Form/FormFactory.php
@@ -25,7 +25,7 @@ public function __construct(FormRegistryInterface $registry)
     /**
      * {@inheritdoc}
      */
-    public function create($type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = array())
+    public function create($type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = [])
     {
         return $this->createBuilder($type, $data, $options)->getForm();
     }
@@ -33,7 +33,7 @@ public function create($type = 'Symfony\Component\Form\Extension\Core\Type\FormT
     /**
      * {@inheritdoc}
      */
-    public function createNamed($name, $type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = array())
+    public function createNamed($name, $type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = [])
     {
         return $this->createNamedBuilder($name, $type, $data, $options)->getForm();
     }
@@ -41,7 +41,7 @@ public function createNamed($name, $type = 'Symfony\Component\Form\Extension\Cor
     /**
      * {@inheritdoc}
      */
-    public function createForProperty($class, $property, $data = null, array $options = array())
+    public function createForProperty($class, $property, $data = null, array $options = [])
     {
         return $this->createBuilderForProperty($class, $property, $data, $options)->getForm();
     }
@@ -49,7 +49,7 @@ public function createForProperty($class, $property, $data = null, array $option
     /**
      * {@inheritdoc}
      */
-    public function createBuilder($type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = array())
+    public function createBuilder($type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = [])
     {
         if (!\is_string($type)) {
             throw new UnexpectedTypeException($type, 'string');
@@ -61,7 +61,7 @@ public function createBuilder($type = 'Symfony\Component\Form\Extension\Core\Typ
     /**
      * {@inheritdoc}
      */
-    public function createNamedBuilder($name, $type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = array())
+    public function createNamedBuilder($name, $type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = [])
     {
         if (null !== $data && !array_key_exists('data', $options)) {
             $options['data'] = $data;
@@ -85,7 +85,7 @@ public function createNamedBuilder($name, $type = 'Symfony\Component\Form\Extens
     /**
      * {@inheritdoc}
      */
-    public function createBuilderForProperty($class, $property, $data = null, array $options = array())
+    public function createBuilderForProperty($class, $property, $data = null, array $options = [])
     {
         if (null === $guesser = $this->registry->getTypeGuesser()) {
             return $this->createNamedBuilder($property, 'Symfony\Component\Form\Extension\Core\Type\TextType', $data, $options);
@@ -102,23 +102,23 @@ public function createBuilderForProperty($class, $property, $data = null, array
         $pattern = $patternGuess ? $patternGuess->getValue() : null;
 
         if (null !== $pattern) {
-            $options = array_replace_recursive(array('attr' => array('pattern' => $pattern)), $options);
+            $options = array_replace_recursive(['attr' => ['pattern' => $pattern]], $options);
         }
 
         if (null !== $maxLength) {
-            $options = array_replace_recursive(array('attr' => array('maxlength' => $maxLength)), $options);
+            $options = array_replace_recursive(['attr' => ['maxlength' => $maxLength]], $options);
         }
 
         if ($requiredGuess) {
-            $options = array_merge(array('required' => $requiredGuess->getValue()), $options);
+            $options = array_merge(['required' => $requiredGuess->getValue()], $options);
         }
 
         // user options may override guessed options
         if ($typeGuess) {
-            $attrs = array();
+            $attrs = [];
             $typeGuessOptions = $typeGuess->getOptions();
             if (isset($typeGuessOptions['attr']) && isset($options['attr'])) {
-                $attrs = array('attr' => array_merge($typeGuessOptions['attr'], $options['attr']));
+                $attrs = ['attr' => array_merge($typeGuessOptions['attr'], $options['attr'])];
             }
 
             $options = array_merge($typeGuessOptions, $options, $attrs);
diff --git a/src/Symfony/Component/Form/FormFactoryBuilder.php b/src/Symfony/Component/Form/FormFactoryBuilder.php
index 3afe1f5359605..bccb86f40791d 100644
--- a/src/Symfony/Component/Form/FormFactoryBuilder.php
+++ b/src/Symfony/Component/Form/FormFactoryBuilder.php
@@ -26,22 +26,22 @@ class FormFactoryBuilder implements FormFactoryBuilderInterface
     /**
      * @var FormExtensionInterface[]
      */
-    private $extensions = array();
+    private $extensions = [];
 
     /**
      * @var FormTypeInterface[]
      */
-    private $types = array();
+    private $types = [];
 
     /**
      * @var FormTypeExtensionInterface[]
      */
-    private $typeExtensions = array();
+    private $typeExtensions = [];
 
     /**
      * @var FormTypeGuesserInterface[]
      */
-    private $typeGuessers = array();
+    private $typeGuessers = [];
 
     /**
      * {@inheritdoc}
diff --git a/src/Symfony/Component/Form/FormFactoryInterface.php b/src/Symfony/Component/Form/FormFactoryInterface.php
index 7014cda159cf9..597537ad88c1c 100644
--- a/src/Symfony/Component/Form/FormFactoryInterface.php
+++ b/src/Symfony/Component/Form/FormFactoryInterface.php
@@ -29,7 +29,7 @@ interface FormFactoryInterface
      *
      * @throws \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException if any given option is not applicable to the given type
      */
-    public function create($type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = array());
+    public function create($type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = []);
 
     /**
      * Returns a form.
@@ -45,7 +45,7 @@ public function create($type = 'Symfony\Component\Form\Extension\Core\Type\FormT
      *
      * @throws \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException if any given option is not applicable to the given type
      */
-    public function createNamed($name, $type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = array());
+    public function createNamed($name, $type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = []);
 
     /**
      * Returns a form for a property of a class.
@@ -61,7 +61,7 @@ public function createNamed($name, $type = 'Symfony\Component\Form\Extension\Cor
      *
      * @throws \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException if any given option is not applicable to the form type
      */
-    public function createForProperty($class, $property, $data = null, array $options = array());
+    public function createForProperty($class, $property, $data = null, array $options = []);
 
     /**
      * Returns a form builder.
@@ -74,7 +74,7 @@ public function createForProperty($class, $property, $data = null, array $option
      *
      * @throws \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException if any given option is not applicable to the given type
      */
-    public function createBuilder($type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = array());
+    public function createBuilder($type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = []);
 
     /**
      * Returns a form builder.
@@ -88,7 +88,7 @@ public function createBuilder($type = 'Symfony\Component\Form\Extension\Core\Typ
      *
      * @throws \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException if any given option is not applicable to the given type
      */
-    public function createNamedBuilder($name, $type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = array());
+    public function createNamedBuilder($name, $type = 'Symfony\Component\Form\Extension\Core\Type\FormType', $data = null, array $options = []);
 
     /**
      * Returns a form builder for a property of a class.
@@ -105,5 +105,5 @@ public function createNamedBuilder($name, $type = 'Symfony\Component\Form\Extens
      *
      * @throws \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException if any given option is not applicable to the form type
      */
-    public function createBuilderForProperty($class, $property, $data = null, array $options = array());
+    public function createBuilderForProperty($class, $property, $data = null, array $options = []);
 }
diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php
index 253f28dd7a1ef..146cd290f7b63 100644
--- a/src/Symfony/Component/Form/FormInterface.php
+++ b/src/Symfony/Component/Form/FormInterface.php
@@ -51,7 +51,7 @@ public function getParent();
      * @throws Exception\LogicException            when trying to add a child to a non-compound form
      * @throws Exception\UnexpectedTypeException   if $child or $type has an unexpected type
      */
-    public function add($child, $type = null, array $options = array());
+    public function add($child, $type = null, array $options = []);
 
     /**
      * Returns the child with the given name.
diff --git a/src/Symfony/Component/Form/FormRegistry.php b/src/Symfony/Component/Form/FormRegistry.php
index 67d1146080325..1446976191c6d 100644
--- a/src/Symfony/Component/Form/FormRegistry.php
+++ b/src/Symfony/Component/Form/FormRegistry.php
@@ -28,12 +28,12 @@ class FormRegistry implements FormRegistryInterface
      *
      * @var FormExtensionInterface[] An array of FormExtensionInterface
      */
-    private $extensions = array();
+    private $extensions = [];
 
     /**
      * @var ResolvedFormTypeInterface[]
      */
-    private $types = array();
+    private $types = [];
 
     /**
      * @var FormTypeGuesserInterface|false|null
@@ -45,7 +45,7 @@ class FormRegistry implements FormRegistryInterface
      */
     private $resolvedTypeFactory;
 
-    private $checkedTypes = array();
+    private $checkedTypes = [];
 
     /**
      * @param FormExtensionInterface[]         $extensions          An array of FormExtensionInterface
@@ -108,12 +108,12 @@ public function getType($name)
      */
     private function resolveType(FormTypeInterface $type)
     {
-        $typeExtensions = array();
+        $typeExtensions = [];
         $parentType = $type->getParent();
         $fqcn = \get_class($type);
 
         if (isset($this->checkedTypes[$fqcn])) {
-            $types = implode(' > ', array_merge(array_keys($this->checkedTypes), array($fqcn)));
+            $types = implode(' > ', array_merge(array_keys($this->checkedTypes), [$fqcn]));
             throw new LogicException(sprintf('Circular reference detected for form type "%s" (%s).', $fqcn, $types));
         }
 
@@ -161,7 +161,7 @@ public function hasType($name)
     public function getTypeGuesser()
     {
         if (false === $this->guesser) {
-            $guessers = array();
+            $guessers = [];
 
             foreach ($this->extensions as $extension) {
                 $guesser = $extension->getTypeGuesser();
diff --git a/src/Symfony/Component/Form/FormRenderer.php b/src/Symfony/Component/Form/FormRenderer.php
index 3bc7bc909b6f3..6bec50652d968 100644
--- a/src/Symfony/Component/Form/FormRenderer.php
+++ b/src/Symfony/Component/Form/FormRenderer.php
@@ -27,9 +27,9 @@ class FormRenderer implements FormRendererInterface
 
     private $engine;
     private $csrfTokenManager;
-    private $blockNameHierarchyMap = array();
-    private $hierarchyLevelMap = array();
-    private $variableStack = array();
+    private $blockNameHierarchyMap = [];
+    private $hierarchyLevelMap = [];
+    private $variableStack = [];
 
     public function __construct(FormRendererEngineInterface $engine, CsrfTokenManagerInterface $csrfTokenManager = null)
     {
@@ -69,7 +69,7 @@ public function renderCsrfToken($tokenId)
     /**
      * {@inheritdoc}
      */
-    public function renderBlock(FormView $view, $blockName, array $variables = array())
+    public function renderBlock(FormView $view, $blockName, array $variables = [])
     {
         $resource = $this->engine->getResourceForBlockName($view, $blockName);
 
@@ -82,7 +82,7 @@ public function renderBlock(FormView $view, $blockName, array $variables = array
         // The variables are cached globally for a view (instead of for the
         // current suffix)
         if (!isset($this->variableStack[$viewCacheKey])) {
-            $this->variableStack[$viewCacheKey] = array();
+            $this->variableStack[$viewCacheKey] = [];
 
             // The default variable scope contains all view variables, merged with
             // the variables passed explicitly to the helper
@@ -128,7 +128,7 @@ public function renderBlock(FormView $view, $blockName, array $variables = array
     /**
      * {@inheritdoc}
      */
-    public function searchAndRenderBlock(FormView $view, $blockNameSuffix, array $variables = array())
+    public function searchAndRenderBlock(FormView $view, $blockNameSuffix, array $variables = [])
     {
         $renderOnlyOnce = 'row' === $blockNameSuffix || 'widget' === $blockNameSuffix;
 
@@ -171,7 +171,7 @@ public function searchAndRenderBlock(FormView $view, $blockNameSuffix, array $va
             // INITIAL CALL
             // Calculate the hierarchy of template blocks and start on
             // the bottom level of the hierarchy (= "_<id>_<section>" block)
-            $blockNameHierarchy = array();
+            $blockNameHierarchy = [];
             foreach ($view->vars['block_prefixes'] as $blockNamePrefix) {
                 $blockNameHierarchy[] = $blockNamePrefix.'_'.$blockNameSuffix;
             }
@@ -191,7 +191,7 @@ public function searchAndRenderBlock(FormView $view, $blockNameSuffix, array $va
         // The variables are cached globally for a view (instead of for the
         // current suffix)
         if (!isset($this->variableStack[$viewCacheKey])) {
-            $this->variableStack[$viewCacheKey] = array();
+            $this->variableStack[$viewCacheKey] = [];
 
             // The default variable scope contains all view variables, merged with
             // the variables passed explicitly to the helper
@@ -282,7 +282,7 @@ public function searchAndRenderBlock(FormView $view, $blockNameSuffix, array $va
      */
     public function humanize($text)
     {
-        return ucfirst(strtolower(trim(preg_replace(array('/([A-Z])/', '/[_\s]+/'), array('_$1', ' '), $text))));
+        return ucfirst(strtolower(trim(preg_replace(['/([A-Z])/', '/[_\s]+/'], ['_$1', ' '], $text))));
     }
 
     /**
diff --git a/src/Symfony/Component/Form/FormRendererEngineInterface.php b/src/Symfony/Component/Form/FormRendererEngineInterface.php
index d3632d3c263c8..9ae5233f46273 100644
--- a/src/Symfony/Component/Form/FormRendererEngineInterface.php
+++ b/src/Symfony/Component/Form/FormRendererEngineInterface.php
@@ -136,5 +136,5 @@ public function getResourceHierarchyLevel(FormView $view, array $blockNameHierar
      *
      * @return string The HTML markup
      */
-    public function renderBlock(FormView $view, $resource, $blockName, array $variables = array());
+    public function renderBlock(FormView $view, $resource, $blockName, array $variables = []);
 }
diff --git a/src/Symfony/Component/Form/FormRendererInterface.php b/src/Symfony/Component/Form/FormRendererInterface.php
index 4396e5b5831cf..65d6480ef033a 100644
--- a/src/Symfony/Component/Form/FormRendererInterface.php
+++ b/src/Symfony/Component/Form/FormRendererInterface.php
@@ -45,7 +45,7 @@ public function setTheme(FormView $view, $themes /*, $useDefaultThemes = true */
      *
      * @return string The HTML markup
      */
-    public function renderBlock(FormView $view, $blockName, array $variables = array());
+    public function renderBlock(FormView $view, $blockName, array $variables = []);
 
     /**
      * Searches and renders a block for a given name suffix.
@@ -63,7 +63,7 @@ public function renderBlock(FormView $view, $blockName, array $variables = array
      *
      * @return string The HTML markup
      */
-    public function searchAndRenderBlock(FormView $view, $blockNameSuffix, array $variables = array());
+    public function searchAndRenderBlock(FormView $view, $blockNameSuffix, array $variables = []);
 
     /**
      * Renders a CSRF token.
diff --git a/src/Symfony/Component/Form/FormTypeGuesserChain.php b/src/Symfony/Component/Form/FormTypeGuesserChain.php
index 08f8cfd066596..f38ba8e5d431a 100644
--- a/src/Symfony/Component/Form/FormTypeGuesserChain.php
+++ b/src/Symfony/Component/Form/FormTypeGuesserChain.php
@@ -16,7 +16,7 @@
 
 class FormTypeGuesserChain implements FormTypeGuesserInterface
 {
-    private $guessers = array();
+    private $guessers = [];
 
     /**
      * @param FormTypeGuesserInterface[] $guessers Guessers as instances of FormTypeGuesserInterface
@@ -93,7 +93,7 @@ public function guessPattern($class, $property)
      */
     private function guess(\Closure $closure)
     {
-        $guesses = array();
+        $guesses = [];
 
         foreach ($this->guessers as $guesser) {
             if ($guess = $closure($guesser)) {
diff --git a/src/Symfony/Component/Form/FormView.php b/src/Symfony/Component/Form/FormView.php
index 25e9980f316ce..0d1310b22d11c 100644
--- a/src/Symfony/Component/Form/FormView.php
+++ b/src/Symfony/Component/Form/FormView.php
@@ -21,10 +21,10 @@ class FormView implements \ArrayAccess, \IteratorAggregate, \Countable
     /**
      * The variables assigned to this view.
      */
-    public $vars = array(
+    public $vars = [
         'value' => null,
-        'attr' => array(),
-    );
+        'attr' => [],
+    ];
 
     /**
      * The parent view.
@@ -36,7 +36,7 @@ class FormView implements \ArrayAccess, \IteratorAggregate, \Countable
      *
      * @var FormView[]
      */
-    public $children = array();
+    public $children = [];
 
     /**
      * Is the form attached to this renderer rendered?
diff --git a/src/Symfony/Component/Form/NativeRequestHandler.php b/src/Symfony/Component/Form/NativeRequestHandler.php
index 94210d51e85a5..ffe91ba7604dc 100644
--- a/src/Symfony/Component/Form/NativeRequestHandler.php
+++ b/src/Symfony/Component/Form/NativeRequestHandler.php
@@ -26,13 +26,13 @@ class NativeRequestHandler implements RequestHandlerInterface
     /**
      * The allowed keys of the $_FILES array.
      */
-    private static $fileKeys = array(
+    private static $fileKeys = [
         'error',
         'name',
         'size',
         'tmp_name',
         'type',
-    );
+    ];
 
     public function __construct(ServerParams $params = null)
     {
@@ -80,13 +80,13 @@ public function handleRequest(FormInterface $form, $request = null)
                 $form->addError(new FormError(
                     \call_user_func($form->getConfig()->getOption('upload_max_size_message')),
                     null,
-                    array('{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize())
+                    ['{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize()]
                 ));
 
                 return;
             }
 
-            $fixedFiles = array();
+            $fixedFiles = [];
             foreach ($_FILES as $fileKey => $file) {
                 $fixedFiles[$fileKey] = self::stripEmptyFiles(self::fixPhpFilesArray($file));
             }
@@ -95,7 +95,7 @@ public function handleRequest(FormInterface $form, $request = null)
                 $params = $_POST;
                 $files = $fixedFiles;
             } elseif (array_key_exists($name, $_POST) || array_key_exists($name, $fixedFiles)) {
-                $default = $form->getConfig()->getCompound() ? array() : null;
+                $default = $form->getConfig()->getCompound() ? [] : null;
                 $params = array_key_exists($name, $_POST) ? $_POST[$name] : $default;
                 $files = array_key_exists($name, $fixedFiles) ? $fixedFiles[$name] : $default;
             } else {
@@ -183,13 +183,13 @@ private static function fixPhpFilesArray($data)
         }
 
         foreach ($data['name'] as $key => $name) {
-            $files[$key] = self::fixPhpFilesArray(array(
+            $files[$key] = self::fixPhpFilesArray([
                 'error' => $data['error'][$key],
                 'name' => $name,
                 'type' => $data['type'][$key],
                 'tmp_name' => $data['tmp_name'][$key],
                 'size' => $data['size'][$key],
-            ));
+            ]);
         }
 
         return $files;
diff --git a/src/Symfony/Component/Form/PreloadedExtension.php b/src/Symfony/Component/Form/PreloadedExtension.php
index b26dbe638d8c0..759ae9ad17b7e 100644
--- a/src/Symfony/Component/Form/PreloadedExtension.php
+++ b/src/Symfony/Component/Form/PreloadedExtension.php
@@ -20,8 +20,8 @@
  */
 class PreloadedExtension implements FormExtensionInterface
 {
-    private $types = array();
-    private $typeExtensions = array();
+    private $types = [];
+    private $typeExtensions = [];
     private $typeGuesser;
 
     /**
@@ -68,7 +68,7 @@ public function getTypeExtensions($name)
     {
         return isset($this->typeExtensions[$name])
             ? $this->typeExtensions[$name]
-            : array();
+            : [];
     }
 
     /**
diff --git a/src/Symfony/Component/Form/ResolvedFormType.php b/src/Symfony/Component/Form/ResolvedFormType.php
index 4a0c9588a7d59..e4ca7bbd94dda 100644
--- a/src/Symfony/Component/Form/ResolvedFormType.php
+++ b/src/Symfony/Component/Form/ResolvedFormType.php
@@ -42,7 +42,7 @@ class ResolvedFormType implements ResolvedFormTypeInterface
      */
     private $optionsResolver;
 
-    public function __construct(FormTypeInterface $innerType, array $typeExtensions = array(), ResolvedFormTypeInterface $parent = null)
+    public function __construct(FormTypeInterface $innerType, array $typeExtensions = [], ResolvedFormTypeInterface $parent = null)
     {
         foreach ($typeExtensions as $extension) {
             if (!$extension instanceof FormTypeExtensionInterface) {
@@ -90,7 +90,7 @@ public function getTypeExtensions()
     /**
      * {@inheritdoc}
      */
-    public function createBuilder(FormFactoryInterface $factory, $name, array $options = array())
+    public function createBuilder(FormFactoryInterface $factory, $name, array $options = [])
     {
         $options = $this->getOptionsResolver()->resolve($options);
 
diff --git a/src/Symfony/Component/Form/ResolvedFormTypeInterface.php b/src/Symfony/Component/Form/ResolvedFormTypeInterface.php
index dc3b81d2fa2a8..c4ab1d6477807 100644
--- a/src/Symfony/Component/Form/ResolvedFormTypeInterface.php
+++ b/src/Symfony/Component/Form/ResolvedFormTypeInterface.php
@@ -57,7 +57,7 @@ public function getTypeExtensions();
      *
      * @return FormBuilderInterface The created form builder
      */
-    public function createBuilder(FormFactoryInterface $factory, $name, array $options = array());
+    public function createBuilder(FormFactoryInterface $factory, $name, array $options = []);
 
     /**
      * Creates a new form view for a form of this type.
diff --git a/src/Symfony/Component/Form/Test/FormIntegrationTestCase.php b/src/Symfony/Component/Form/Test/FormIntegrationTestCase.php
index 28e6cb385efa9..7aa7c1c438ba8 100644
--- a/src/Symfony/Component/Form/Test/FormIntegrationTestCase.php
+++ b/src/Symfony/Component/Form/Test/FormIntegrationTestCase.php
@@ -37,21 +37,21 @@ protected function setUp()
 
     protected function getExtensions()
     {
-        return array();
+        return [];
     }
 
     protected function getTypeExtensions()
     {
-        return array();
+        return [];
     }
 
     protected function getTypes()
     {
-        return array();
+        return [];
     }
 
     protected function getTypeGuessers()
     {
-        return array();
+        return [];
     }
 }
diff --git a/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php b/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php
index d5bcb04a4df6d..2c174f6664428 100644
--- a/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php
+++ b/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php
@@ -31,9 +31,9 @@ protected function getValidatorExtension()
         }
 
         $this->validator = $this->getMockBuilder(ValidatorInterface::class)->getMock();
-        $metadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->setMethods(array('addPropertyConstraint'))->getMock();
+        $metadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->setMethods(['addPropertyConstraint'])->getMock();
         $this->validator->expects($this->any())->method('getMetadataFor')->will($this->returnValue($metadata));
-        $this->validator->expects($this->any())->method('validate')->will($this->returnValue(array()));
+        $this->validator->expects($this->any())->method('validate')->will($this->returnValue([]));
 
         return new ValidatorExtension($this->validator);
     }
diff --git a/src/Symfony/Component/Form/Test/TypeTestCase.php b/src/Symfony/Component/Form/Test/TypeTestCase.php
index aa7516f56358a..41e0333b0954b 100644
--- a/src/Symfony/Component/Form/Test/TypeTestCase.php
+++ b/src/Symfony/Component/Form/Test/TypeTestCase.php
@@ -44,7 +44,7 @@ protected function tearDown()
 
     protected function getExtensions()
     {
-        $extensions = array();
+        $extensions = [];
 
         if (\in_array(ValidatorExtensionTrait::class, class_uses($this))) {
             $extensions[] = $this->getValidatorExtension();
diff --git a/src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php
index 36bb31c301515..ab8444974959d 100644
--- a/src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php
@@ -39,11 +39,11 @@ public function testRow()
     public function testRowOverrideVariables()
     {
         $view = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType')->createView();
-        $html = $this->renderRow($view, array(
-            'attr' => array('class' => 'my&class'),
+        $html = $this->renderRow($view, [
+            'attr' => ['class' => 'my&class'],
             'label' => 'foo&bar',
-            'label_attr' => array('class' => 'my&label&class'),
-        ));
+            'label_attr' => ['class' => 'my&label&class'],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/div
@@ -283,11 +283,11 @@ public function testRestAndRepeatedWithWidgetPerChild()
 
     public function testCollection()
     {
-        $form = $this->factory->createNamed('names', 'Symfony\Component\Form\Extension\Core\Type\CollectionType', array('a', 'b'), array(
+        $form = $this->factory->createNamed('names', 'Symfony\Component\Form\Extension\Core\Type\CollectionType', ['a', 'b'], [
             'entry_type' => 'Symfony\Component\Form\Extension\Core\Type\TextType',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div[./input[@type="text"][@value="a"]]
@@ -301,15 +301,15 @@ public function testCollection()
     // https://github.com/symfony/symfony/issues/5038
     public function testCollectionWithAlternatingRowTypes()
     {
-        $data = array(
-            array('title' => 'a'),
-            array('title' => 'b'),
-        );
-        $form = $this->factory->createNamed('names', 'Symfony\Component\Form\Extension\Core\Type\CollectionType', $data, array(
+        $data = [
+            ['title' => 'a'],
+            ['title' => 'b'],
+        ];
+        $form = $this->factory->createNamed('names', 'Symfony\Component\Form\Extension\Core\Type\CollectionType', $data, [
             'entry_type' => 'Symfony\Component\Form\Tests\Fixtures\AlternatingRowType',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div[./div/div/input[@type="text"][@value="a"]]
@@ -323,11 +323,11 @@ public function testCollectionWithAlternatingRowTypes()
 
     public function testEmptyCollection()
     {
-        $form = $this->factory->createNamed('names', 'Symfony\Component\Form\Extension\Core\Type\CollectionType', array(), array(
+        $form = $this->factory->createNamed('names', 'Symfony\Component\Form\Extension\Core\Type\CollectionType', [], [
             'entry_type' => 'Symfony\Component\Form\Extension\Core\Type\TextType',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [./input[@type="hidden"][@id="names__token"]]
     [count(./div)=0]
@@ -340,15 +340,15 @@ public function testCollectionRow()
         $collection = $this->factory->createNamedBuilder(
             'collection',
             'Symfony\Component\Form\Extension\Core\Type\CollectionType',
-            array('a', 'b'),
-            array('entry_type' => 'Symfony\Component\Form\Extension\Core\Type\TextType')
+            ['a', 'b'],
+            ['entry_type' => 'Symfony\Component\Form\Extension\Core\Type\TextType']
         );
 
         $form = $this->factory->createNamedBuilder('form', 'Symfony\Component\Form\Extension\Core\Type\FormType')
             ->add($collection)
             ->getForm();
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -385,10 +385,10 @@ public function testForm()
             ->getForm();
 
         // include ampersands everywhere to validate escaping
-        $html = $this->renderForm($form->createView(), array(
+        $html = $this->renderForm($form->createView(), [
             'id' => 'my&id',
-            'attr' => array('class' => 'my&class'),
-        ));
+            'attr' => ['class' => 'my&class'],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/form
@@ -426,7 +426,7 @@ public function testFormWidget()
             ->add('lastName', 'Symfony\Component\Form\Extension\Core\Type\TextType')
             ->getForm();
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -451,14 +451,14 @@ public function testNestedFormError()
     {
         $form = $this->factory->createNamedBuilder('name', 'Symfony\Component\Form\Extension\Core\Type\FormType')
             ->add($this->factory
-                ->createNamedBuilder('child', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, array('error_bubbling' => false))
+                ->createNamedBuilder('child', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, ['error_bubbling' => false])
                 ->add('grandChild', 'Symfony\Component\Form\Extension\Core\Type\FormType')
             )
             ->getForm();
 
         $form->get('child')->addError(new FormError('[trans]Error![/trans]'));
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div/label
@@ -483,7 +483,7 @@ public function testCsrf()
             )
             ->getForm();
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -496,11 +496,11 @@ public function testCsrf()
 
     public function testRepeated()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RepeatedType', 'foobar', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RepeatedType', 'foobar', [
             'type' => 'Symfony\Component\Form\Extension\Core\Type\TextType',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -522,13 +522,13 @@ public function testRepeated()
 
     public function testRepeatedWithCustomOptions()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RepeatedType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RepeatedType', null, [
             // the global required value cannot be overridden
-            'first_options' => array('label' => 'Test', 'required' => false),
-            'second_options' => array('label' => 'Test2'),
-        ));
+            'first_options' => ['label' => 'Test', 'required' => false],
+            'second_options' => ['label' => 'Test2'],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -554,7 +554,7 @@ public function testSearchInputName()
             ->add('name', 'Symfony\Component\Form\Extension\Core\Type\SearchType')
             ->getForm();
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -586,9 +586,9 @@ public function testLabelHasNoId()
 
     public function testLabelIsNotRenderedWhenSetToFalse()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
             'label' => false,
-        ));
+        ]);
         $html = $this->renderRow($form->createView());
 
         $this->assertMatchesXpath($html,
@@ -637,7 +637,7 @@ public function testThemeInheritance($parentTheme, $childTheme)
         $this->setTheme($view, $parentTheme);
         $this->setTheme($view['child'], $childTheme);
 
-        $this->assertWidgetMatchesXpath($view, array(),
+        $this->assertWidgetMatchesXpath($view, [],
 '/div
     [
         ./div
@@ -669,11 +669,11 @@ public function testThemeInheritance($parentTheme, $childTheme)
      */
     public function testCollectionRowWithCustomBlock()
     {
-        $collection = array('one', 'two', 'three');
+        $collection = ['one', 'two', 'three'];
         $form = $this->factory->createNamedBuilder('names', 'Symfony\Component\Form\Extension\Core\Type\CollectionType', $collection)
             ->getForm();
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div[./label[.="Custom label: [trans]0[/trans]"]]
@@ -690,13 +690,13 @@ public function testCollectionRowWithCustomBlock()
      */
     public function testChoiceRowWithCustomBlock()
     {
-        $form = $this->factory->createNamedBuilder('name_c', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', 'a', array(
-                'choices' => array('ChoiceA' => 'a', 'ChoiceB' => 'b'),
+        $form = $this->factory->createNamedBuilder('name_c', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', 'a', [
+                'choices' => ['ChoiceA' => 'a', 'ChoiceB' => 'b'],
                 'expanded' => true,
-            ))
+            ])
             ->getForm();
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./label[.="Custom name label: [trans]ChoiceA[/trans]"]
@@ -708,14 +708,14 @@ public function testChoiceRowWithCustomBlock()
 
     public function testSingleChoiceExpandedWithLabelsAsFalse()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'choice_label' => false,
             'multiple' => false,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
             '/div
     [
         ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
@@ -730,8 +730,8 @@ public function testSingleChoiceExpandedWithLabelsAsFalse()
 
     public function testSingleChoiceExpandedWithLabelsSetByCallable()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
             'choice_label' => function ($choice, $label, $value) {
                 if ('&b' === $choice) {
                     return false;
@@ -741,9 +741,9 @@ public function testSingleChoiceExpandedWithLabelsSetByCallable()
             },
             'multiple' => false,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
             '/div
     [
         ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
@@ -761,16 +761,16 @@ public function testSingleChoiceExpandedWithLabelsSetByCallable()
 
     public function testSingleChoiceExpandedWithLabelsSetFalseByCallable()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'choice_label' => function () {
                 return false;
             },
             'multiple' => false,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
             '/div
     [
         ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
@@ -785,14 +785,14 @@ public function testSingleChoiceExpandedWithLabelsSetFalseByCallable()
 
     public function testMultipleChoiceExpandedWithLabelsAsFalse()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'choice_label' => false,
             'multiple' => true,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@value="&a"][@checked]
@@ -807,8 +807,8 @@ public function testMultipleChoiceExpandedWithLabelsAsFalse()
 
     public function testMultipleChoiceExpandedWithLabelsSetByCallable()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
             'choice_label' => function ($choice, $label, $value) {
                 if ('&b' === $choice) {
                     return false;
@@ -818,9 +818,9 @@ public function testMultipleChoiceExpandedWithLabelsSetByCallable()
             },
             'multiple' => true,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@value="&a"][@checked]
@@ -838,16 +838,16 @@ public function testMultipleChoiceExpandedWithLabelsSetByCallable()
 
     public function testMultipleChoiceExpandedWithLabelsSetFalseByCallable()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'choice_label' => function () {
                 return false;
             },
             'multiple' => true,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@value="&a"][@checked]
@@ -901,16 +901,16 @@ public function testFormEndWithoutRest()
         $this->renderWidget($view['field1']);
 
         // Rest should only contain field2, but isn't rendered
-        $html = $this->renderEnd($view, array('render_rest' => false));
+        $html = $this->renderEnd($view, ['render_rest' => false]);
 
         $this->assertEquals('</form>', $html);
     }
 
     public function testWidgetContainerAttributes()
     {
-        $form = $this->factory->createNamed('form', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
-            'attr' => array('class' => 'foobar', 'data-foo' => 'bar'),
-        ));
+        $form = $this->factory->createNamed('form', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'attr' => ['class' => 'foobar', 'data-foo' => 'bar'],
+        ]);
 
         $form->add('text', 'Symfony\Component\Form\Extension\Core\Type\TextType');
 
@@ -922,9 +922,9 @@ public function testWidgetContainerAttributes()
 
     public function testWidgetContainerAttributeNameRepeatedIfTrue()
     {
-        $form = $this->factory->createNamed('form', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
-            'attr' => array('foo' => true),
-        ));
+        $form = $this->factory->createNamed('form', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'attr' => ['foo' => true],
+        ]);
 
         $html = $this->renderWidget($form->createView());
 
diff --git a/src/Symfony/Component/Form/Tests/AbstractExtensionTest.php b/src/Symfony/Component/Form/Tests/AbstractExtensionTest.php
index 815b4f808a1f1..c3fa1b6cf9f3f 100644
--- a/src/Symfony/Component/Form/Tests/AbstractExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractExtensionTest.php
@@ -35,7 +35,7 @@ class ConcreteExtension extends AbstractExtension
 {
     protected function loadTypes()
     {
-        return array(new FooType());
+        return [new FooType()];
     }
 
     protected function loadTypeGuesser()
diff --git a/src/Symfony/Component/Form/Tests/AbstractFormTest.php b/src/Symfony/Component/Form/Tests/AbstractFormTest.php
index 977b5f40e0ec4..0ea55f9208b1b 100644
--- a/src/Symfony/Component/Form/Tests/AbstractFormTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractFormTest.php
@@ -60,7 +60,7 @@ abstract protected function createForm();
      *
      * @return FormBuilder
      */
-    protected function getBuilder($name = 'name', EventDispatcherInterface $dispatcher = null, $dataClass = null, array $options = array())
+    protected function getBuilder($name = 'name', EventDispatcherInterface $dispatcher = null, $dataClass = null, array $options = [])
     {
         return new FormBuilder($name, $dataClass, $dispatcher ?: $this->dispatcher, $this->factory, $options);
     }
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
index 278bdbe85478a..e37b9f9a6b352 100644
--- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -19,7 +19,7 @@
 abstract class AbstractLayoutTest extends FormIntegrationTestCase
 {
     protected $csrfTokenManager;
-    protected $testableFeatures = array();
+    protected $testableFeatures = [];
 
     protected function setUp()
     {
@@ -36,9 +36,9 @@ protected function setUp()
 
     protected function getExtensions()
     {
-        return array(
+        return [
             new CsrfExtension($this->csrfTokenManager),
-        );
+        ];
     }
 
     protected function tearDown()
@@ -91,10 +91,10 @@ protected function assertMatchesXpath($html, $expression, $count = 1)
     protected function assertWidgetMatchesXpath(FormView $view, array $vars, $xpath)
     {
         // include ampersands everywhere to validate escaping
-        $html = $this->renderWidget($view, array_merge(array(
+        $html = $this->renderWidget($view, array_merge([
             'id' => 'my&id',
-            'attr' => array('class' => 'my&class'),
-        ), $vars));
+            'attr' => ['class' => 'my&class'],
+        ], $vars));
 
         if (!isset($vars['id'])) {
             $xpath = trim($xpath).'
@@ -131,7 +131,7 @@ public function testLabel()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
         $view = $form->createView();
-        $this->renderWidget($view, array('label' => 'foo'));
+        $this->renderWidget($view, ['label' => 'foo']);
         $html = $this->renderLabel($view);
 
         $this->assertMatchesXpath($html,
@@ -144,9 +144,9 @@ public function testLabel()
 
     public function testLabelWithoutTranslation()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
             'translation_domain' => false,
-        ));
+        ]);
 
         $this->assertMatchesXpath($this->renderLabel($form->createView()),
 '/label
@@ -160,7 +160,7 @@ public function testLabelOnForm()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType');
         $view = $form->createView();
-        $this->renderWidget($view, array('label' => 'foo'));
+        $this->renderWidget($view, ['label' => 'foo']);
         $html = $this->renderLabel($view);
 
         $this->assertMatchesXpath($html,
@@ -173,9 +173,9 @@ public function testLabelOnForm()
 
     public function testLabelWithCustomTextPassedAsOption()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
             'label' => 'Custom label',
-        ));
+        ]);
         $html = $this->renderLabel($form->createView());
 
         $this->assertMatchesXpath($html,
@@ -201,9 +201,9 @@ public function testLabelWithCustomTextPassedDirectly()
 
     public function testLabelWithCustomTextPassedAsOptionAndDirectly()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
             'label' => 'Custom label',
-        ));
+        ]);
         $html = $this->renderLabel($form->createView(), 'Overridden label');
 
         $this->assertMatchesXpath($html,
@@ -217,11 +217,11 @@ public function testLabelWithCustomTextPassedAsOptionAndDirectly()
     public function testLabelDoesNotRenderFieldAttributes()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
-        $html = $this->renderLabel($form->createView(), null, array(
-            'attr' => array(
+        $html = $this->renderLabel($form->createView(), null, [
+            'attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -234,11 +234,11 @@ public function testLabelDoesNotRenderFieldAttributes()
     public function testLabelWithCustomAttributesPassedDirectly()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
-        $html = $this->renderLabel($form->createView(), null, array(
-            'label_attr' => array(
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -251,11 +251,11 @@ public function testLabelWithCustomAttributesPassedDirectly()
     public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
-        $html = $this->renderLabel($form->createView(), 'Custom label', array(
-            'label_attr' => array(
+        $html = $this->renderLabel($form->createView(), 'Custom label', [
+            'label_attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -269,14 +269,14 @@ public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
     // https://github.com/symfony/symfony/issues/5029
     public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
             'label' => 'Custom label',
-        ));
-        $html = $this->renderLabel($form->createView(), null, array(
-            'label_attr' => array(
+        ]);
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
                 'class' => 'my&class',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertMatchesXpath($html,
             '/label
@@ -293,7 +293,7 @@ public function testLabelFormatName()
             ->add('myfield', 'Symfony\Component\Form\Extension\Core\Type\TextType')
             ->getForm();
         $view = $form->get('myfield')->createView();
-        $html = $this->renderLabel($view, null, array('label_format' => 'form.%name%'));
+        $html = $this->renderLabel($view, null, ['label_format' => 'form.%name%']);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -309,7 +309,7 @@ public function testLabelFormatId()
             ->add('myfield', 'Symfony\Component\Form\Extension\Core\Type\TextType')
             ->getForm();
         $view = $form->get('myfield')->createView();
-        $html = $this->renderLabel($view, null, array('label_format' => 'form.%id%'));
+        $html = $this->renderLabel($view, null, ['label_format' => 'form.%id%']);
 
         $this->assertMatchesXpath($html,
 '/label
@@ -321,7 +321,7 @@ public function testLabelFormatId()
 
     public function testLabelFormatAsFormOption()
     {
-        $options = array('label_format' => 'form.%name%');
+        $options = ['label_format' => 'form.%name%'];
 
         $form = $this->factory->createNamedBuilder('myform', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, $options)
             ->add('myfield', 'Symfony\Component\Form\Extension\Core\Type\TextType')
@@ -339,10 +339,10 @@ public function testLabelFormatAsFormOption()
 
     public function testLabelFormatOverriddenOption()
     {
-        $options = array('label_format' => 'form.%name%');
+        $options = ['label_format' => 'form.%name%'];
 
         $form = $this->factory->createNamedBuilder('myform', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, $options)
-            ->add('myfield', 'Symfony\Component\Form\Extension\Core\Type\TextType', array('label_format' => 'field.%name%'))
+            ->add('myfield', 'Symfony\Component\Form\Extension\Core\Type\TextType', ['label_format' => 'field.%name%'])
             ->getForm();
         $view = $form->get('myfield')->createView();
         $html = $this->renderLabel($view);
@@ -357,9 +357,9 @@ public function testLabelFormatOverriddenOption()
 
     public function testLabelWithoutTranslationOnButton()
     {
-        $form = $this->factory->createNamedBuilder('myform', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->createNamedBuilder('myform', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                 'translation_domain' => false,
-            ))
+            ])
             ->add('mybutton', 'Symfony\Component\Form\Extension\Core\Type\ButtonType')
             ->getForm();
         $view = $form->get('mybutton')->createView();
@@ -380,7 +380,7 @@ public function testLabelFormatOnButton()
             ->add('mybutton', 'Symfony\Component\Form\Extension\Core\Type\ButtonType')
             ->getForm();
         $view = $form->get('mybutton')->createView();
-        $html = $this->renderWidget($view, array('label_format' => 'form.%name%'));
+        $html = $this->renderWidget($view, ['label_format' => 'form.%name%']);
 
         $this->assertMatchesXpath($html,
 '/button
@@ -397,7 +397,7 @@ public function testLabelFormatOnButtonId()
             ->add('mybutton', 'Symfony\Component\Form\Extension\Core\Type\ButtonType')
             ->getForm();
         $view = $form->get('mybutton')->createView();
-        $html = $this->renderWidget($view, array('label_format' => 'form.%id%'));
+        $html = $this->renderWidget($view, ['label_format' => 'form.%id%']);
 
         $this->assertMatchesXpath($html,
 '/button
@@ -449,7 +449,7 @@ public function testCheckedCheckbox()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', true);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="checkbox"]
     [@name="name"]
@@ -463,7 +463,7 @@ public function testUncheckedCheckbox()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', false);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="checkbox"]
     [@name="name"]
@@ -474,11 +474,11 @@ public function testUncheckedCheckbox()
 
     public function testCheckboxWithValue()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', false, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', false, [
             'value' => 'foo&bar',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="checkbox"]
     [@name="name"]
@@ -489,11 +489,11 @@ public function testCheckboxWithValue()
 
     public function testSingleChoice()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
         // If the field is collapsed, has no "multiple" attribute, is required but
         // has *no* empty value, the "required" must not be added, otherwise
@@ -507,7 +507,7 @@ public function testSingleChoice()
         //  have a multiple attribute specified, and has a display size of 1,
         //  then the select element must have a placeholder label option."
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name"]
     [not(@required)]
@@ -522,14 +522,14 @@ public function testSingleChoice()
 
     public function testSelectWithSizeBiggerThanOneCanBeRequired()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array(
-            'choices' => array('a', 'b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, [
+            'choices' => ['a', 'b'],
             'multiple' => false,
             'expanded' => false,
-            'attr' => array('size' => 2),
-        ));
+            'attr' => ['size' => 2],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name"]
     [@required="required"]
@@ -541,14 +541,14 @@ public function testSelectWithSizeBiggerThanOneCanBeRequired()
 
     public function testSingleChoiceWithoutTranslation()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => false,
             'choice_translation_domain' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name"]
     [not(@required)]
@@ -563,16 +563,16 @@ public function testSingleChoiceWithoutTranslation()
 
     public function testSingleChoiceWithPlaceholderWithoutTranslation()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => false,
             'required' => false,
             'translation_domain' => false,
             'placeholder' => 'Placeholder&Not&Translated',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name"]
     [not(@required)]
@@ -588,14 +588,14 @@ public function testSingleChoiceWithPlaceholderWithoutTranslation()
 
     public function testSingleChoiceAttributes()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-            'choice_attr' => array('Choice&B' => array('class' => 'foo&bar')),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_attr' => ['Choice&B' => ['class' => 'foo&bar']],
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name"]
     [not(@required)]
@@ -610,14 +610,14 @@ public function testSingleChoiceAttributes()
 
     public function testSingleChoiceAttributesWithMainAttributes()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => false,
-            'attr' => array('class' => 'bar&baz'),
-        ));
+            'attr' => ['class' => 'bar&baz'],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'bar&baz')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'bar&baz']],
 '/select
     [@name="name"]
     [@class="bar&baz"]
@@ -633,14 +633,14 @@ public function testSingleChoiceAttributesWithMainAttributes()
 
     public function testSingleExpandedChoiceAttributesWithMainAttributes()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => true,
-            'attr' => array('class' => 'bar&baz'),
-        ));
+            'attr' => ['class' => 'bar&baz'],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'bar&baz')),
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'bar&baz']],
 '/div
     [@class="bar&baz"]
     [
@@ -657,14 +657,14 @@ public function testSingleExpandedChoiceAttributesWithMainAttributes()
 
     public function testSingleChoiceWithPreferred()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-            'preferred_choices' => array('&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'preferred_choices' => ['&b'],
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('separator' => '-- sep --'),
+        $this->assertWidgetMatchesXpath($form->createView(), ['separator' => '-- sep --'],
 '/select
     [@name="name"]
     [not(@required)]
@@ -680,14 +680,14 @@ public function testSingleChoiceWithPreferred()
 
     public function testSingleChoiceWithPreferredAndNoSeparator()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-            'preferred_choices' => array('&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'preferred_choices' => ['&b'],
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('separator' => null),
+        $this->assertWidgetMatchesXpath($form->createView(), ['separator' => null],
 '/select
     [@name="name"]
     [not(@required)]
@@ -702,14 +702,14 @@ public function testSingleChoiceWithPreferredAndNoSeparator()
 
     public function testSingleChoiceWithPreferredAndBlankSeparator()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-            'preferred_choices' => array('&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'preferred_choices' => ['&b'],
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('separator' => ''),
+        $this->assertWidgetMatchesXpath($form->createView(), ['separator' => ''],
 '/select
     [@name="name"]
     [not(@required)]
@@ -725,14 +725,14 @@ public function testSingleChoiceWithPreferredAndBlankSeparator()
 
     public function testChoiceWithOnlyPreferred()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-            'preferred_choices' => array('&a', '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'preferred_choices' => ['&a', '&b'],
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [count(./option)=2]
 '
@@ -741,14 +741,14 @@ public function testChoiceWithOnlyPreferred()
 
     public function testSingleChoiceNonRequired()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'required' => false,
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name"]
     [not(@required)]
@@ -764,14 +764,14 @@ public function testSingleChoiceNonRequired()
 
     public function testSingleChoiceNonRequiredNoneSelected()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'required' => false,
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name"]
     [not(@required)]
@@ -787,15 +787,15 @@ public function testSingleChoiceNonRequiredNoneSelected()
 
     public function testSingleChoiceNonRequiredWithPlaceholder()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => false,
             'required' => false,
             'placeholder' => 'Select&Anything&Not&Me',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name"]
     [not(@required)]
@@ -811,18 +811,18 @@ public function testSingleChoiceNonRequiredWithPlaceholder()
 
     public function testSingleChoiceRequiredWithPlaceholder()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'required' => true,
             'multiple' => false,
             'expanded' => false,
             'placeholder' => 'Test&Me',
-        ));
+        ]);
 
         // The "disabled" attribute was removed again due to a bug in the
         // BlackBerry 10 browser.
         // See https://github.com/symfony/symfony/pull/7678
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name"]
     [@required="required"]
@@ -838,17 +838,17 @@ public function testSingleChoiceRequiredWithPlaceholder()
 
     public function testSingleChoiceRequiredWithPlaceholderViaView()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'required' => true,
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
         // The "disabled" attribute was removed again due to a bug in the
         // BlackBerry 10 browser.
         // See https://github.com/symfony/symfony/pull/7678
-        $this->assertWidgetMatchesXpath($form->createView(), array('placeholder' => ''),
+        $this->assertWidgetMatchesXpath($form->createView(), ['placeholder' => ''],
 '/select
     [@name="name"]
     [@required="required"]
@@ -864,16 +864,16 @@ public function testSingleChoiceRequiredWithPlaceholderViaView()
 
     public function testSingleChoiceGrouped()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array(
-                'Group&1' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-                'Group&2' => array('Choice&C' => '&c'),
-            ),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => [
+                'Group&1' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+                'Group&2' => ['Choice&C' => '&c'],
+            ],
             'multiple' => false,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name"]
     [./optgroup[@label="[trans]Group&1[/trans]"]
@@ -894,14 +894,14 @@ public function testSingleChoiceGrouped()
 
     public function testMultipleChoice()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'required' => true,
             'multiple' => true,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name[]"]
     [@required="required"]
@@ -917,15 +917,15 @@ public function testMultipleChoice()
 
     public function testMultipleChoiceAttributes()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-            'choice_attr' => array('Choice&B' => array('class' => 'foo&bar')),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_attr' => ['Choice&B' => ['class' => 'foo&bar']],
             'required' => true,
             'multiple' => true,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name[]"]
     [@required="required"]
@@ -941,14 +941,14 @@ public function testMultipleChoiceAttributes()
 
     public function testMultipleChoiceSkipsPlaceholder()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => true,
             'expanded' => false,
             'placeholder' => 'Test&Me',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name[]"]
     [@multiple="multiple"]
@@ -963,14 +963,14 @@ public function testMultipleChoiceSkipsPlaceholder()
 
     public function testMultipleChoiceNonRequired()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'required' => false,
             'multiple' => true,
             'expanded' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name[]"]
     [@multiple="multiple"]
@@ -985,13 +985,13 @@ public function testMultipleChoiceNonRequired()
 
     public function testSingleChoiceExpanded()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
@@ -1007,15 +1007,15 @@ public function testSingleChoiceExpanded()
 
     public function testSingleChoiceExpandedWithoutTranslation()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => true,
             'choice_translation_domain' => false,
             'placeholder' => 'Placeholder&Not&Translated',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
@@ -1031,14 +1031,14 @@ public function testSingleChoiceExpandedWithoutTranslation()
 
     public function testSingleChoiceExpandedAttributes()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
-            'choice_attr' => array('Choice&B' => array('class' => 'foo&bar')),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_attr' => ['Choice&B' => ['class' => 'foo&bar']],
             'multiple' => false,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
@@ -1054,15 +1054,15 @@ public function testSingleChoiceExpandedAttributes()
 
     public function testSingleChoiceExpandedWithPlaceholder()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => true,
             'placeholder' => 'Test&Me',
             'required' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./input[@type="radio"][@name="name"][@id="name_placeholder"][not(@checked)]
@@ -1080,16 +1080,16 @@ public function testSingleChoiceExpandedWithPlaceholder()
 
     public function testSingleChoiceExpandedWithPlaceholderWithoutTranslation()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
             'multiple' => false,
             'expanded' => true,
             'required' => false,
             'choice_translation_domain' => false,
             'placeholder' => 'Placeholder&Not&Translated',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./input[@type="radio"][@name="name"][@id="name_placeholder"][not(@checked)]
@@ -1107,13 +1107,13 @@ public function testSingleChoiceExpandedWithPlaceholderWithoutTranslation()
 
     public function testSingleChoiceExpandedWithBooleanValue()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', true, array(
-            'choices' => array('Choice&A' => '1', 'Choice&B' => '0'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', true, [
+            'choices' => ['Choice&A' => '1', 'Choice&B' => '0'],
             'multiple' => false,
             'expanded' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./input[@type="radio"][@name="name"][@id="name_0"][@checked]
@@ -1129,14 +1129,14 @@ public function testSingleChoiceExpandedWithBooleanValue()
 
     public function testMultipleChoiceExpanded()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a', '&c'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a', '&c'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
             'multiple' => true,
             'expanded' => true,
             'required' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)]
@@ -1154,15 +1154,15 @@ public function testMultipleChoiceExpanded()
 
     public function testMultipleChoiceExpandedWithoutTranslation()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a', '&c'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a', '&c'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
             'multiple' => true,
             'expanded' => true,
             'required' => true,
             'choice_translation_domain' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)]
@@ -1180,15 +1180,15 @@ public function testMultipleChoiceExpandedWithoutTranslation()
 
     public function testMultipleChoiceExpandedAttributes()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array('&a', '&c'), array(
-            'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'),
-            'choice_attr' => array('Choice&B' => array('class' => 'foo&bar')),
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a', '&c'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b', 'Choice&C' => '&c'],
+            'choice_attr' => ['Choice&B' => ['class' => 'foo&bar']],
             'multiple' => true,
             'expanded' => true,
             'required' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)]
@@ -1208,7 +1208,7 @@ public function testCountry()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CountryType', 'AT');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name"]
     [./option[@value="AT"][@selected="selected"][.="Austria"]]
@@ -1219,12 +1219,12 @@ public function testCountry()
 
     public function testCountryWithPlaceholder()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CountryType', 'AT', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CountryType', 'AT', [
             'placeholder' => 'Select&Country',
             'required' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name"]
     [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Select&Country[/trans]"]]
@@ -1236,12 +1236,12 @@ public function testCountryWithPlaceholder()
 
     public function testDateTime()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', date('Y').'-02-03 04:05:06', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', date('Y').'-02-03 04:05:06', [
             'input' => 'string',
             'with_seconds' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -1275,13 +1275,13 @@ public function testDateTime()
 
     public function testDateTimeWithPlaceholderGlobal()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', null, [
             'input' => 'string',
             'placeholder' => 'Change&Me',
             'required' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -1315,14 +1315,14 @@ public function testDateTimeWithPlaceholderGlobal()
 
     public function testDateTimeWithHourAndMinute()
     {
-        $data = array('year' => date('Y'), 'month' => '2', 'day' => '3', 'hour' => '4', 'minute' => '5');
+        $data = ['year' => date('Y'), 'month' => '2', 'day' => '3', 'hour' => '4', 'minute' => '5'];
 
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', $data, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', $data, [
             'input' => 'array',
             'required' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -1356,12 +1356,12 @@ public function testDateTimeWithHourAndMinute()
 
     public function testDateTimeWithSeconds()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', date('Y').'-02-03 04:05:06', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', date('Y').'-02-03 04:05:06', [
             'input' => 'string',
             'with_seconds' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./div
@@ -1398,13 +1398,13 @@ public function testDateTimeWithSeconds()
 
     public function testDateTimeSingleText()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', [
             'input' => 'string',
             'date_widget' => 'single_text',
             'time_widget' => 'single_text',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./input
@@ -1424,14 +1424,14 @@ public function testDateTimeSingleText()
 
     public function testDateTimeWithWidgetSingleText()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', [
             'input' => 'string',
             'widget' => 'single_text',
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="datetime-local"]
     [@name="name"]
@@ -1442,16 +1442,16 @@ public function testDateTimeWithWidgetSingleText()
 
     public function testDateTimeWithWidgetSingleTextIgnoreDateAndTimeWidgets()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', [
             'input' => 'string',
             'date_widget' => 'choice',
             'time_widget' => 'choice',
             'widget' => 'single_text',
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="datetime-local"]
     [@name="name"]
@@ -1462,12 +1462,12 @@ public function testDateTimeWithWidgetSingleTextIgnoreDateAndTimeWidgets()
 
     public function testDateChoice()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', date('Y').'-02-03', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', date('Y').'-02-03', [
             'input' => 'string',
             'widget' => 'choice',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./select
@@ -1487,14 +1487,14 @@ public function testDateChoice()
 
     public function testDateChoiceWithPlaceholderGlobal()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', null, [
             'input' => 'string',
             'widget' => 'choice',
             'placeholder' => 'Change&Me',
             'required' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./select
@@ -1514,14 +1514,14 @@ public function testDateChoiceWithPlaceholderGlobal()
 
     public function testDateChoiceWithPlaceholderOnYear()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', null, [
             'input' => 'string',
             'widget' => 'choice',
             'required' => false,
-            'placeholder' => array('year' => 'Change&Me'),
-        ));
+            'placeholder' => ['year' => 'Change&Me'],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./select
@@ -1541,12 +1541,12 @@ public function testDateChoiceWithPlaceholderOnYear()
 
     public function testDateText()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', '2011-02-03', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', '2011-02-03', [
             'input' => 'string',
             'widget' => 'text',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./input
@@ -1569,12 +1569,12 @@ public function testDateText()
 
     public function testDateSingleText()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', '2011-02-03', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', '2011-02-03', [
             'input' => 'string',
             'widget' => 'single_text',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="date"]
     [@name="name"]
@@ -1597,11 +1597,11 @@ public function testDateErrorBubbling()
 
     public function testBirthDay()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\BirthdayType', '2000-02-03', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\BirthdayType', '2000-02-03', [
             'input' => 'string',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./select
@@ -1621,13 +1621,13 @@ public function testBirthDay()
 
     public function testBirthDayWithPlaceholder()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\BirthdayType', '1950-01-01', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\BirthdayType', '1950-01-01', [
             'input' => 'string',
             'placeholder' => '',
             'required' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./select
@@ -1652,7 +1652,7 @@ public function testEmail()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\EmailType', 'foo&bar');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="email"]
     [@name="name"]
@@ -1664,11 +1664,11 @@ public function testEmail()
 
     public function testEmailWithMaxLength()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\EmailType', 'foo&bar', array(
-            'attr' => array('maxlength' => 123),
-        ));
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\EmailType', 'foo&bar', [
+            'attr' => ['maxlength' => 123],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="email"]
     [@name="name"]
@@ -1682,7 +1682,7 @@ public function testFile()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\FileType');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="file"]
 '
@@ -1693,7 +1693,7 @@ public function testHidden()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\HiddenType', 'foo&bar');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="hidden"]
     [@name="name"]
@@ -1704,11 +1704,11 @@ public function testHidden()
 
     public function testDisabled()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
             'disabled' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="text"]
     [@name="name"]
@@ -1721,7 +1721,7 @@ public function testInteger()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\IntegerType', 123);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="number"]
     [@name="name"]
@@ -1734,7 +1734,7 @@ public function testLanguage()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\LanguageType', 'de');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name"]
     [./option[@value="de"][@selected="selected"][.="German"]]
@@ -1747,7 +1747,7 @@ public function testLocale()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\LocaleType', 'de_AT');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name"]
     [./option[@value="de_AT"][@selected="selected"][.="German (Austria)"]]
@@ -1758,11 +1758,11 @@ public function testLocale()
 
     public function testMoney()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\MoneyType', 1234.56, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\MoneyType', 1234.56, [
             'currency' => 'EUR',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="text"]
     [@name="name"]
@@ -1776,7 +1776,7 @@ public function testNumber()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\NumberType', 1234.56);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="text"]
     [@name="name"]
@@ -1789,7 +1789,7 @@ public function testPassword()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', 'foo&bar');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="password"]
     [@name="name"]
@@ -1799,12 +1799,12 @@ public function testPassword()
 
     public function testPasswordSubmittedWithNotAlwaysEmpty()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', null, [
             'always_empty' => false,
-        ));
+        ]);
         $form->submit('foo&bar');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="password"]
     [@name="name"]
@@ -1815,11 +1815,11 @@ public function testPasswordSubmittedWithNotAlwaysEmpty()
 
     public function testPasswordWithMaxLength()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', 'foo&bar', array(
-            'attr' => array('maxlength' => 123),
-        ));
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', 'foo&bar', [
+            'attr' => ['maxlength' => 123],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="password"]
     [@name="name"]
@@ -1832,7 +1832,7 @@ public function testPercent()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\PercentType', 0.1);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="text"]
     [@name="name"]
@@ -1846,7 +1846,7 @@ public function testCheckedRadio()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RadioType', true);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="radio"]
     [@name="name"]
@@ -1860,7 +1860,7 @@ public function testUncheckedRadio()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RadioType', false);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="radio"]
     [@name="name"]
@@ -1871,11 +1871,11 @@ public function testUncheckedRadio()
 
     public function testRadioWithValue()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RadioType', false, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RadioType', false, [
             'value' => 'foo&bar',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="radio"]
     [@name="name"]
@@ -1886,9 +1886,9 @@ public function testRadioWithValue()
 
     public function testRange()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RangeType', 42, array('attr' => array('min' => 5)));
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RangeType', 42, ['attr' => ['min' => 5]]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="range"]
     [@name="name"]
@@ -1900,9 +1900,9 @@ public function testRange()
 
     public function testRangeWithMinMaxValues()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RangeType', 42, array('attr' => array('min' => 5, 'max' => 57)));
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RangeType', 42, ['attr' => ['min' => 5, 'max' => 57]]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="range"]
     [@name="name"]
@@ -1915,11 +1915,11 @@ public function testRangeWithMinMaxValues()
 
     public function testTextarea()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextareaType', 'foo&bar', array(
-            'attr' => array('pattern' => 'foo'),
-        ));
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextareaType', 'foo&bar', [
+            'attr' => ['pattern' => 'foo'],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/textarea
     [@name="name"]
     [@pattern="foo"]
@@ -1932,7 +1932,7 @@ public function testText()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'foo&bar');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="text"]
     [@name="name"]
@@ -1944,11 +1944,11 @@ public function testText()
 
     public function testTextWithMaxLength()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'foo&bar', array(
-            'attr' => array('maxlength' => 123),
-        ));
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'foo&bar', [
+            'attr' => ['maxlength' => 123],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="text"]
     [@name="name"]
@@ -1962,7 +1962,7 @@ public function testSearch()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\SearchType', 'foo&bar');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="search"]
     [@name="name"]
@@ -1974,12 +1974,12 @@ public function testSearch()
 
     public function testTime()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', [
             'input' => 'string',
             'with_seconds' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./select
@@ -1998,12 +1998,12 @@ public function testTime()
 
     public function testTimeWithSeconds()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', [
             'input' => 'string',
             'with_seconds' => true,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./select
@@ -2029,12 +2029,12 @@ public function testTimeWithSeconds()
 
     public function testTimeText()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', [
             'input' => 'string',
             'widget' => 'text',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./input
@@ -2059,12 +2059,12 @@ public function testTimeText()
 
     public function testTimeSingleText()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', [
             'input' => 'string',
             'widget' => 'single_text',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="time"]
     [@name="name"]
@@ -2076,13 +2076,13 @@ public function testTimeSingleText()
 
     public function testTimeWithPlaceholderGlobal()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', null, [
             'input' => 'string',
             'placeholder' => 'Change&Me',
             'required' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./select
@@ -2101,13 +2101,13 @@ public function testTimeWithPlaceholderGlobal()
 
     public function testTimeWithPlaceholderOnYear()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', null, [
             'input' => 'string',
             'required' => false,
-            'placeholder' => array('hour' => 'Change&Me'),
-        ));
+            'placeholder' => ['hour' => 'Change&Me'],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/div
     [
         ./select
@@ -2140,7 +2140,7 @@ public function testTimezone()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimezoneType', 'Europe/Vienna');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [@name="name"]
     [not(@required)]
@@ -2156,12 +2156,12 @@ public function testTimezone()
 
     public function testTimezoneWithPlaceholder()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimezoneType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimezoneType', null, [
             'placeholder' => 'Select&Timezone',
             'required' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/select
     [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Select&Timezone[/trans]"]]
     [count(./optgroup)>10]
@@ -2175,7 +2175,7 @@ public function testUrl()
         $url = 'http://www.google.com?foo1=bar1&foo2=bar2';
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\UrlType', $url);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/input
     [@type="url"]
     [@name="name"]
@@ -2186,8 +2186,8 @@ public function testUrl()
 
     public function testCollectionPrototype()
     {
-        $form = $this->factory->createNamedBuilder('name', 'Symfony\Component\Form\Extension\Core\Type\FormType', array('items' => array('one', 'two', 'three')))
-            ->add('items', 'Symfony\Component\Form\Extension\Core\Type\CollectionType', array('allow_add' => true))
+        $form = $this->factory->createNamedBuilder('name', 'Symfony\Component\Form\Extension\Core\Type\FormType', ['items' => ['one', 'two', 'three']])
+            ->add('items', 'Symfony\Component\Form\Extension\Core\Type\CollectionType', ['allow_add' => true])
             ->getForm()
             ->createView();
 
@@ -2216,7 +2216,7 @@ public function testButton()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ButtonType');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
             '/button[@type="button"][@name="name"][.="[trans]Name[/trans]"]'
         );
     }
@@ -2230,11 +2230,11 @@ public function testButtonLabelIsEmpty()
 
     public function testButtonlabelWithoutTranslation()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ButtonType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ButtonType', null, [
             'translation_domain' => false,
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
             '/button[@type="button"][@name="name"][.="Name"]'
         );
     }
@@ -2243,7 +2243,7 @@ public function testSubmit()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\SubmitType');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
             '/button[@type="submit"][@name="name"]'
         );
     }
@@ -2252,17 +2252,17 @@ public function testReset()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ResetType');
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
             '/button[@type="reset"][@name="name"]'
         );
     }
 
     public function testStartTag()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'get',
             'action' => 'http://example.com/directory',
-        ));
+        ]);
 
         $html = $this->renderStart($form->createView());
 
@@ -2271,10 +2271,10 @@ public function testStartTag()
 
     public function testStartTagForPutRequest()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'put',
             'action' => 'http://example.com/directory',
-        ));
+        ]);
 
         $html = $this->renderStart($form->createView());
 
@@ -2288,25 +2288,25 @@ public function testStartTagForPutRequest()
 
     public function testStartTagWithOverriddenVars()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'put',
             'action' => 'http://example.com/directory',
-        ));
+        ]);
 
-        $html = $this->renderStart($form->createView(), array(
+        $html = $this->renderStart($form->createView(), [
             'method' => 'post',
             'action' => 'http://foo.com/directory',
-        ));
+        ]);
 
         $this->assertSame('<form name="form" method="post" action="http://foo.com/directory">', $html);
     }
 
     public function testStartTagForMultipartForm()
     {
-        $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                 'method' => 'get',
                 'action' => 'http://example.com/directory',
-            ))
+            ])
             ->add('file', 'Symfony\Component\Form\Extension\Core\Type\FileType')
             ->getForm();
 
@@ -2317,25 +2317,25 @@ public function testStartTagForMultipartForm()
 
     public function testStartTagWithExtraAttributes()
     {
-        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
             'method' => 'get',
             'action' => 'http://example.com/directory',
-        ));
+        ]);
 
-        $html = $this->renderStart($form->createView(), array(
-            'attr' => array('class' => 'foobar'),
-        ));
+        $html = $this->renderStart($form->createView(), [
+            'attr' => ['class' => 'foobar'],
+        ]);
 
         $this->assertSame('<form name="form" method="get" action="http://example.com/directory" class="foobar">', $html);
     }
 
     public function testWidgetAttributes()
     {
-        $form = $this->factory->createNamed('text', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'value', array(
+        $form = $this->factory->createNamed('text', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'value', [
             'required' => true,
             'disabled' => true,
-            'attr' => array('readonly' => true, 'maxlength' => 10, 'pattern' => '\d+', 'class' => 'foobar', 'data-foo' => 'bar'),
-        ));
+            'attr' => ['readonly' => true, 'maxlength' => 10, 'pattern' => '\d+', 'class' => 'foobar', 'data-foo' => 'bar'],
+        ]);
 
         $html = $this->renderWidget($form->createView());
 
@@ -2345,9 +2345,9 @@ public function testWidgetAttributes()
 
     public function testWidgetAttributeNameRepeatedIfTrue()
     {
-        $form = $this->factory->createNamed('text', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'value', array(
-            'attr' => array('foo' => true),
-        ));
+        $form = $this->factory->createNamed('text', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'value', [
+            'attr' => ['foo' => true],
+        ]);
 
         $html = $this->renderWidget($form->createView());
 
@@ -2357,9 +2357,9 @@ public function testWidgetAttributeNameRepeatedIfTrue()
 
     public function testWidgetAttributeHiddenIfFalse()
     {
-        $form = $this->factory->createNamed('text', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'value', array(
-            'attr' => array('foo' => false),
-        ));
+        $form = $this->factory->createNamed('text', 'Symfony\Component\Form\Extension\Core\Type\TextType', 'value', [
+            'attr' => ['foo' => false],
+        ]);
 
         $html = $this->renderWidget($form->createView());
 
@@ -2368,10 +2368,10 @@ public function testWidgetAttributeHiddenIfFalse()
 
     public function testButtonAttributes()
     {
-        $form = $this->factory->createNamed('button', 'Symfony\Component\Form\Extension\Core\Type\ButtonType', null, array(
+        $form = $this->factory->createNamed('button', 'Symfony\Component\Form\Extension\Core\Type\ButtonType', null, [
             'disabled' => true,
-            'attr' => array('class' => 'foobar', 'data-foo' => 'bar'),
-        ));
+            'attr' => ['class' => 'foobar', 'data-foo' => 'bar'],
+        ]);
 
         $html = $this->renderWidget($form->createView());
 
@@ -2381,9 +2381,9 @@ public function testButtonAttributes()
 
     public function testButtonAttributeNameRepeatedIfTrue()
     {
-        $form = $this->factory->createNamed('button', 'Symfony\Component\Form\Extension\Core\Type\ButtonType', null, array(
-            'attr' => array('foo' => true),
-        ));
+        $form = $this->factory->createNamed('button', 'Symfony\Component\Form\Extension\Core\Type\ButtonType', null, [
+            'attr' => ['foo' => true],
+        ]);
 
         $html = $this->renderWidget($form->createView());
 
@@ -2393,9 +2393,9 @@ public function testButtonAttributeNameRepeatedIfTrue()
 
     public function testButtonAttributeHiddenIfFalse()
     {
-        $form = $this->factory->createNamed('button', 'Symfony\Component\Form\Extension\Core\Type\ButtonType', null, array(
-            'attr' => array('foo' => false),
-        ));
+        $form = $this->factory->createNamed('button', 'Symfony\Component\Form\Extension\Core\Type\ButtonType', null, [
+            'attr' => ['foo' => false],
+        ]);
 
         $html = $this->renderWidget($form->createView());
 
@@ -2413,7 +2413,7 @@ public function testTextareaWithWhitespaceOnlyContentRetainsValue()
 
     public function testTextareaWithWhitespaceOnlyContentRetainsValueWhenRenderingForm()
     {
-        $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', array('textarea' => '  '))
+        $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', ['textarea' => '  '])
             ->add('textarea', 'Symfony\Component\Form\Extension\Core\Type\TextareaType')
             ->getForm();
 
@@ -2424,9 +2424,9 @@ public function testTextareaWithWhitespaceOnlyContentRetainsValueWhenRenderingFo
 
     public function testWidgetContainerAttributeHiddenIfFalse()
     {
-        $form = $this->factory->createNamed('form', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
-            'attr' => array('foo' => false),
-        ));
+        $form = $this->factory->createNamed('form', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'attr' => ['foo' => false],
+        ]);
 
         $html = $this->renderWidget($form->createView());
 
@@ -2437,8 +2437,8 @@ public function testWidgetContainerAttributeHiddenIfFalse()
     public function testTranslatedAttributes()
     {
         $view = $this->factory->createNamedBuilder('name', 'Symfony\Component\Form\Extension\Core\Type\FormType')
-            ->add('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType', array('attr' => array('title' => 'Foo')))
-            ->add('lastName', 'Symfony\Component\Form\Extension\Core\Type\TextType', array('attr' => array('placeholder' => 'Bar')))
+            ->add('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType', ['attr' => ['title' => 'Foo']])
+            ->add('lastName', 'Symfony\Component\Form\Extension\Core\Type\TextType', ['attr' => ['placeholder' => 'Bar']])
             ->getForm()
             ->createView();
 
@@ -2450,11 +2450,11 @@ public function testTranslatedAttributes()
 
     public function testAttributesNotTranslatedWhenTranslationDomainIsFalse()
     {
-        $view = $this->factory->createNamedBuilder('name', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+        $view = $this->factory->createNamedBuilder('name', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                 'translation_domain' => false,
-            ))
-            ->add('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType', array('attr' => array('title' => 'Foo')))
-            ->add('lastName', 'Symfony\Component\Form\Extension\Core\Type\TextType', array('attr' => array('placeholder' => 'Bar')))
+            ])
+            ->add('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType', ['attr' => ['title' => 'Foo']])
+            ->add('lastName', 'Symfony\Component\Form\Extension\Core\Type\TextType', ['attr' => ['placeholder' => 'Bar']])
             ->getForm()
             ->createView();
 
@@ -2469,7 +2469,7 @@ public function testTel()
         $tel = '0102030405';
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TelType', $tel);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
             '/input
     [@type="tel"]
     [@name="name"]
@@ -2483,7 +2483,7 @@ public function testColor()
         $color = '#0000ff';
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ColorType', $color);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
             '/input
     [@type="color"]
     [@name="name"]
diff --git a/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php b/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php
index 7bc1a65219b98..2c3de1184b63c 100644
--- a/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php
@@ -38,7 +38,7 @@ abstract class AbstractRequestHandlerTest extends TestCase
 
     protected function setUp()
     {
-        $this->serverParams = $this->getMockBuilder('Symfony\Component\Form\Util\ServerParams')->setMethods(array('getNormalizedIniPostMaxSize', 'getContentLength'))->getMock();
+        $this->serverParams = $this->getMockBuilder('Symfony\Component\Form\Util\ServerParams')->setMethods(['getNormalizedIniPostMaxSize', 'getContentLength'])->getMock();
         $this->requestHandler = $this->getRequestHandler();
         $this->factory = Forms::createFormFactoryBuilder()->getFormFactory();
         $this->request = null;
@@ -46,19 +46,19 @@ protected function setUp()
 
     public function methodExceptGetProvider()
     {
-        return array(
-            array('POST'),
-            array('PUT'),
-            array('DELETE'),
-            array('PATCH'),
-        );
+        return [
+            ['POST'],
+            ['PUT'],
+            ['DELETE'],
+            ['PATCH'],
+        ];
     }
 
     public function methodProvider()
     {
-        return array_merge(array(
-            array('GET'),
-        ), $this->methodExceptGetProvider());
+        return array_merge([
+            ['GET'],
+        ], $this->methodExceptGetProvider());
     }
 
     /**
@@ -68,9 +68,9 @@ public function testSubmitIfNameInRequest($method)
     {
         $form = $this->getMockForm('param1', $method);
 
-        $this->setRequestData($method, array(
+        $this->setRequestData($method, [
             'param1' => 'DATA',
-        ));
+        ]);
 
         $form->expects($this->once())
             ->method('submit')
@@ -88,9 +88,9 @@ public function testDoNotSubmitIfWrongRequestMethod($method)
 
         $otherMethod = 'POST' === $method ? 'PUT' : 'POST';
 
-        $this->setRequestData($otherMethod, array(
+        $this->setRequestData($otherMethod, [
             'param1' => 'DATA',
-        ));
+        ]);
 
         $form->expects($this->never())
             ->method('submit');
@@ -105,9 +105,9 @@ public function testDoNoSubmitSimpleFormIfNameNotInRequestAndNotGetRequest($meth
     {
         $form = $this->getMockForm('param1', $method, false);
 
-        $this->setRequestData($method, array(
-            'paramx' => array(),
-        ));
+        $this->setRequestData($method, [
+            'paramx' => [],
+        ]);
 
         $form->expects($this->never())
             ->method('submit');
@@ -122,9 +122,9 @@ public function testDoNotSubmitCompoundFormIfNameNotInRequestAndNotGetRequest($m
     {
         $form = $this->getMockForm('param1', $method, true);
 
-        $this->setRequestData($method, array(
-            'paramx' => array(),
-        ));
+        $this->setRequestData($method, [
+            'paramx' => [],
+        ]);
 
         $form->expects($this->never())
             ->method('submit');
@@ -136,9 +136,9 @@ public function testDoNotSubmitIfNameNotInRequestAndGetRequest()
     {
         $form = $this->getMockForm('param1', 'GET');
 
-        $this->setRequestData('GET', array(
-            'paramx' => array(),
-        ));
+        $this->setRequestData('GET', [
+            'paramx' => [],
+        ]);
 
         $form->expects($this->never())
             ->method('submit');
@@ -154,15 +154,15 @@ public function testSubmitFormWithEmptyNameIfAtLeastOneFieldInRequest($method)
         $form = $this->getMockForm('', $method);
         $form->expects($this->any())
             ->method('all')
-            ->will($this->returnValue(array(
+            ->will($this->returnValue([
                 'param1' => $this->getMockForm('param1'),
                 'param2' => $this->getMockForm('param2'),
-            )));
+            ]));
 
-        $this->setRequestData($method, $requestData = array(
+        $this->setRequestData($method, $requestData = [
             'param1' => 'submitted value',
             'paramx' => 'submitted value',
-        ));
+        ]);
 
         $form->expects($this->once())
             ->method('submit')
@@ -179,14 +179,14 @@ public function testDoNotSubmitFormWithEmptyNameIfNoFieldInRequest($method)
         $form = $this->getMockForm('', $method);
         $form->expects($this->any())
             ->method('all')
-            ->will($this->returnValue(array(
+            ->will($this->returnValue([
                 'param1' => $this->getMockForm('param1'),
                 'param2' => $this->getMockForm('param2'),
-            )));
+            ]));
 
-        $this->setRequestData($method, array(
+        $this->setRequestData($method, [
             'paramx' => 'submitted value',
-        ));
+        ]);
 
         $form->expects($this->never())
             ->method('submit');
@@ -202,22 +202,22 @@ public function testMergeParamsAndFiles($method)
         $form = $this->getMockForm('param1', $method);
         $file = $this->getMockFile();
 
-        $this->setRequestData($method, array(
-            'param1' => array(
+        $this->setRequestData($method, [
+            'param1' => [
                 'field1' => 'DATA',
-            ),
-        ), array(
-            'param1' => array(
+            ],
+        ], [
+            'param1' => [
                 'field2' => $file,
-            ),
-        ));
+            ],
+        ]);
 
         $form->expects($this->once())
             ->method('submit')
-            ->with(array(
+            ->with([
                 'field1' => 'DATA',
                 'field2' => $file,
-            ), 'PATCH' !== $method);
+            ], 'PATCH' !== $method);
 
         $this->requestHandler->handleRequest($form, $this->request);
     }
@@ -230,11 +230,11 @@ public function testParamTakesPrecedenceOverFile($method)
         $form = $this->getMockForm('param1', $method);
         $file = $this->getMockFile();
 
-        $this->setRequestData($method, array(
+        $this->setRequestData($method, [
             'param1' => 'DATA',
-        ), array(
+        ], [
             'param1' => $file,
-        ));
+        ]);
 
         $form->expects($this->once())
             ->method('submit')
@@ -251,11 +251,11 @@ public function testSubmitFileIfNoParam($method)
         $form = $this->getMockForm('param1', $method);
         $file = $this->getMockFile();
 
-        $this->setRequestData($method, array(
+        $this->setRequestData($method, [
             'param1' => null,
-        ), array(
+        ], [
             'param1' => $file,
-        ));
+        ]);
 
         $form->expects($this->once())
             ->method('submit')
@@ -272,13 +272,13 @@ public function testSubmitMultipleFiles($method)
         $form = $this->getMockForm('param1', $method);
         $file = $this->getMockFile();
 
-        $this->setRequestData($method, array(
+        $this->setRequestData($method, [
             'param1' => null,
-        ), array(
+        ], [
             'param2' => $this->getMockFile('2'),
             'param1' => $file,
             'param3' => $this->getMockFile('3'),
-        ));
+        ]);
 
         $form->expects($this->once())
              ->method('submit')
@@ -295,11 +295,11 @@ public function testSubmitFileWithNamelessForm($method)
         $form = $this->getMockForm(null, $method);
         $file = $this->getMockFile();
 
-        $this->setRequestData($method, array(
+        $this->setRequestData($method, [
             '' => null,
-        ), array(
+        ], [
             '' => $file,
-        ));
+        ]);
 
         $form->expects($this->once())
              ->method('submit')
@@ -311,7 +311,7 @@ public function testSubmitFileWithNamelessForm($method)
     /**
      * @dataProvider getPostMaxSizeFixtures
      */
-    public function testAddFormErrorIfPostMaxSizeExceeded($contentLength, $iniMax, $shouldFail, array $errorParams = array())
+    public function testAddFormErrorIfPostMaxSizeExceeded($contentLength, $iniMax, $shouldFail, array $errorParams = [])
     {
         $this->serverParams->expects($this->once())
             ->method('getContentLength')
@@ -320,9 +320,9 @@ public function testAddFormErrorIfPostMaxSizeExceeded($contentLength, $iniMax, $
             ->method('getNormalizedIniPostMaxSize')
             ->will($this->returnValue($iniMax));
 
-        $options = array('post_max_size_message' => 'Max {{ max }}!');
+        $options = ['post_max_size_message' => 'Max {{ max }}!'];
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, $options);
-        $this->setRequestData('POST', array(), array());
+        $this->setRequestData('POST', [], []);
 
         $this->requestHandler->handleRequest($form, $this->request);
 
@@ -330,7 +330,7 @@ public function testAddFormErrorIfPostMaxSizeExceeded($contentLength, $iniMax, $
             $error = new FormError($options['post_max_size_message'], null, $errorParams);
             $error->setOrigin($form);
 
-            $this->assertEquals(array($error), iterator_to_array($form->getErrors()));
+            $this->assertEquals([$error], iterator_to_array($form->getErrors()));
             $this->assertTrue($form->isSubmitted());
         } else {
             $this->assertCount(0, $form->getErrors());
@@ -340,17 +340,17 @@ public function testAddFormErrorIfPostMaxSizeExceeded($contentLength, $iniMax, $
 
     public function getPostMaxSizeFixtures()
     {
-        return array(
-            array(pow(1024, 3) + 1, '1G', true, array('{{ max }}' => '1G')),
-            array(pow(1024, 3), '1G', false),
-            array(pow(1024, 2) + 1, '1M', true, array('{{ max }}' => '1M')),
-            array(pow(1024, 2), '1M', false),
-            array(1024 + 1, '1K', true, array('{{ max }}' => '1K')),
-            array(1024, '1K', false),
-            array(null, '1K', false),
-            array(1024, '', false),
-            array(1024, 0, false),
-        );
+        return [
+            [pow(1024, 3) + 1, '1G', true, ['{{ max }}' => '1G']],
+            [pow(1024, 3), '1G', false],
+            [pow(1024, 2) + 1, '1M', true, ['{{ max }}' => '1M']],
+            [pow(1024, 2), '1M', false],
+            [1024 + 1, '1K', true, ['{{ max }}' => '1K']],
+            [1024, '1K', false],
+            [null, '1K', false],
+            [1024, '', false],
+            [1024, 0, false],
+        ];
     }
 
     public function testUploadedFilesAreAccepted()
@@ -363,7 +363,7 @@ public function testInvalidFilesAreRejected()
         $this->assertFalse($this->requestHandler->isFileUpload($this->getInvalidFile()));
     }
 
-    abstract protected function setRequestData($method, $data, $files = array());
+    abstract protected function setRequestData($method, $data, $files = []);
 
     abstract protected function getRequestHandler();
 
diff --git a/src/Symfony/Component/Form/Tests/AbstractTableLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractTableLayoutTest.php
index 9902a6dc089f6..1873a58f0d078 100644
--- a/src/Symfony/Component/Form/Tests/AbstractTableLayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractTableLayoutTest.php
@@ -42,9 +42,9 @@ public function testRow()
 
     public function testLabelIsNotRenderedWhenSetToFalse()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
             'label' => false,
-        ));
+        ]);
         $html = $this->renderRow($form->createView());
 
         $this->assertMatchesXpath($html,
@@ -194,11 +194,11 @@ public function testRest()
 
     public function testCollection()
     {
-        $form = $this->factory->createNamed('names', 'Symfony\Component\Form\Extension\Core\Type\CollectionType', array('a', 'b'), array(
+        $form = $this->factory->createNamed('names', 'Symfony\Component\Form\Extension\Core\Type\CollectionType', ['a', 'b'], [
             'entry_type' => 'Symfony\Component\Form\Extension\Core\Type\TextType',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/table
     [
         ./tr[./td/input[@type="text"][@value="a"]]
@@ -212,11 +212,11 @@ public function testCollection()
 
     public function testEmptyCollection()
     {
-        $form = $this->factory->createNamed('names', 'Symfony\Component\Form\Extension\Core\Type\CollectionType', array(), array(
+        $form = $this->factory->createNamed('names', 'Symfony\Component\Form\Extension\Core\Type\CollectionType', [], [
             'entry_type' => 'Symfony\Component\Form\Extension\Core\Type\TextType',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/table
     [./tr[@style="display: none"][./td[@colspan="2"]/input[@type="hidden"][@id="names__token"]]]
     [count(./tr[./td/input])=1]
@@ -234,10 +234,10 @@ public function testForm()
             ->getForm()
             ->createView();
 
-        $html = $this->renderForm($view, array(
+        $html = $this->renderForm($view, [
             'id' => 'my&id',
-            'attr' => array('class' => 'my&class'),
-        ));
+            'attr' => ['class' => 'my&class'],
+        ]);
 
         $this->assertMatchesXpath($html,
 '/form
@@ -284,7 +284,7 @@ public function testFormWidget()
             ->getForm()
             ->createView();
 
-        $this->assertWidgetMatchesXpath($view, array(),
+        $this->assertWidgetMatchesXpath($view, [],
 '/table
     [
         ./tr
@@ -317,14 +317,14 @@ public function testNestedFormError()
     {
         $form = $this->factory->createNamedBuilder('name', 'Symfony\Component\Form\Extension\Core\Type\FormType')
             ->add($this->factory
-                ->createNamedBuilder('child', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, array('error_bubbling' => false))
+                ->createNamedBuilder('child', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, ['error_bubbling' => false])
                 ->add('grandChild', 'Symfony\Component\Form\Extension\Core\Type\FormType')
             )
             ->getForm();
 
         $form->get('child')->addError(new FormError('[trans]Error![/trans]'));
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/table
     [
         ./tr/td/ul[./li[.="[trans]Error![/trans]"]]
@@ -349,7 +349,7 @@ public function testCsrf()
             )
             ->getForm();
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/table
     [
         ./tr[@style="display: none"]
@@ -365,11 +365,11 @@ public function testCsrf()
 
     public function testRepeated()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RepeatedType', 'foobar', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RepeatedType', 'foobar', [
             'type' => 'Symfony\Component\Form\Extension\Core\Type\TextType',
-        ));
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/table
     [
         ./tr
@@ -399,13 +399,13 @@ public function testRepeated()
 
     public function testRepeatedWithCustomOptions()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RepeatedType', 'foobar', array(
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RepeatedType', 'foobar', [
             'type' => 'Symfony\Component\Form\Extension\Core\Type\PasswordType',
-            'first_options' => array('label' => 'Test', 'required' => false),
-            'second_options' => array('label' => 'Test2'),
-        ));
+            'first_options' => ['label' => 'Test', 'required' => false],
+            'second_options' => ['label' => 'Test2'],
+        ]);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/table
     [
         ./tr
@@ -439,11 +439,11 @@ public function testRepeatedWithCustomOptions()
      */
     public function testCollectionRowWithCustomBlock()
     {
-        $collection = array('one', 'two', 'three');
+        $collection = ['one', 'two', 'three'];
         $form = $this->factory->createNamedBuilder('names', 'Symfony\Component\Form\Extension\Core\Type\CollectionType', $collection)
             ->getForm();
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertWidgetMatchesXpath($form->createView(), [],
 '/table
     [
         ./tr[./td/label[.="Custom label: [trans]0[/trans]"]]
@@ -503,16 +503,16 @@ public function testFormEndWithoutRest()
         $this->renderWidget($view['field1']);
 
         // Rest should only contain field2, but isn't rendered
-        $html = $this->renderEnd($view, array('render_rest' => false));
+        $html = $this->renderEnd($view, ['render_rest' => false]);
 
         $this->assertEquals('</form>', $html);
     }
 
     public function testWidgetContainerAttributes()
     {
-        $form = $this->factory->createNamed('form', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
-            'attr' => array('class' => 'foobar', 'data-foo' => 'bar'),
-        ));
+        $form = $this->factory->createNamed('form', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'attr' => ['class' => 'foobar', 'data-foo' => 'bar'],
+        ]);
 
         $form->add('text', 'Symfony\Component\Form\Extension\Core\Type\TextType');
 
@@ -524,9 +524,9 @@ public function testWidgetContainerAttributes()
 
     public function testWidgetContainerAttributeNameRepeatedIfTrue()
     {
-        $form = $this->factory->createNamed('form', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
-            'attr' => array('foo' => true),
-        ));
+        $form = $this->factory->createNamed('form', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+            'attr' => ['foo' => true],
+        ]);
 
         $html = $this->renderWidget($form->createView());
 
diff --git a/src/Symfony/Component/Form/Tests/ButtonBuilderTest.php b/src/Symfony/Component/Form/Tests/ButtonBuilderTest.php
index 014a5ae179b13..ced54a4588b59 100644
--- a/src/Symfony/Component/Form/Tests/ButtonBuilderTest.php
+++ b/src/Symfony/Component/Form/Tests/ButtonBuilderTest.php
@@ -22,14 +22,14 @@ class ButtonBuilderTest extends TestCase
 {
     public function getValidNames()
     {
-        return array(
-            array('reset'),
-            array('submit'),
-            array('foo'),
-            array('0'),
-            array(0),
-            array('button[]'),
-        );
+        return [
+            ['reset'],
+            ['submit'],
+            ['foo'],
+            ['0'],
+            [0],
+            ['button[]'],
+        ];
     }
 
     /**
@@ -42,11 +42,11 @@ public function testValidNames($name)
 
     public function getInvalidNames()
     {
-        return array(
-            array(''),
-            array(false),
-            array(null),
-        );
+        return [
+            [''],
+            [false],
+            [null],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/ButtonTest.php b/src/Symfony/Component/Form/Tests/ButtonTest.php
index a81c2db5511c1..6115640242bc4 100644
--- a/src/Symfony/Component/Form/Tests/ButtonTest.php
+++ b/src/Symfony/Component/Form/Tests/ButtonTest.php
@@ -66,13 +66,13 @@ public function testDisabledIfParentIsDisabled($parentDisabled, $buttonDisabled,
 
     public function getDisabledStates()
     {
-        return array(
+        return [
             // parent, button, result
-            array(true, true, true),
-            array(true, false, true),
-            array(false, true, true),
-            array(false, false, false),
-        );
+            [true, true, true],
+            [true, false, true],
+            [false, true, true],
+            [false, false, false],
+        ];
     }
 
     private function getButtonBuilder($name)
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/AbstractChoiceListTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/AbstractChoiceListTest.php
index fc25cffc1fc2c..aca967daba16a 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/AbstractChoiceListTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/AbstractChoiceListTest.php
@@ -154,66 +154,66 @@ public function testGetOriginalKeys()
 
     public function testGetChoicesForValues()
     {
-        $values = array($this->value1, $this->value2);
-        $this->assertSame(array($this->choice1, $this->choice2), $this->list->getChoicesForValues($values));
+        $values = [$this->value1, $this->value2];
+        $this->assertSame([$this->choice1, $this->choice2], $this->list->getChoicesForValues($values));
     }
 
     public function testGetChoicesForValuesPreservesKeys()
     {
-        $values = array(5 => $this->value1, 8 => $this->value2);
-        $this->assertSame(array(5 => $this->choice1, 8 => $this->choice2), $this->list->getChoicesForValues($values));
+        $values = [5 => $this->value1, 8 => $this->value2];
+        $this->assertSame([5 => $this->choice1, 8 => $this->choice2], $this->list->getChoicesForValues($values));
     }
 
     public function testGetChoicesForValuesPreservesOrder()
     {
-        $values = array($this->value2, $this->value1);
-        $this->assertSame(array($this->choice2, $this->choice1), $this->list->getChoicesForValues($values));
+        $values = [$this->value2, $this->value1];
+        $this->assertSame([$this->choice2, $this->choice1], $this->list->getChoicesForValues($values));
     }
 
     public function testGetChoicesForValuesIgnoresNonExistingValues()
     {
-        $values = array($this->value1, $this->value2, 'foobar');
-        $this->assertSame(array($this->choice1, $this->choice2), $this->list->getChoicesForValues($values));
+        $values = [$this->value1, $this->value2, 'foobar'];
+        $this->assertSame([$this->choice1, $this->choice2], $this->list->getChoicesForValues($values));
     }
 
     // https://github.com/symfony/symfony/issues/3446
     public function testGetChoicesForValuesEmpty()
     {
-        $this->assertSame(array(), $this->list->getChoicesForValues(array()));
+        $this->assertSame([], $this->list->getChoicesForValues([]));
     }
 
     public function testGetValuesForChoices()
     {
-        $choices = array($this->choice1, $this->choice2);
-        $this->assertSame(array($this->value1, $this->value2), $this->list->getValuesForChoices($choices));
+        $choices = [$this->choice1, $this->choice2];
+        $this->assertSame([$this->value1, $this->value2], $this->list->getValuesForChoices($choices));
     }
 
     public function testGetValuesForChoicesPreservesKeys()
     {
-        $choices = array(5 => $this->choice1, 8 => $this->choice2);
-        $this->assertSame(array(5 => $this->value1, 8 => $this->value2), $this->list->getValuesForChoices($choices));
+        $choices = [5 => $this->choice1, 8 => $this->choice2];
+        $this->assertSame([5 => $this->value1, 8 => $this->value2], $this->list->getValuesForChoices($choices));
     }
 
     public function testGetValuesForChoicesPreservesOrder()
     {
-        $choices = array($this->choice2, $this->choice1);
-        $this->assertSame(array($this->value2, $this->value1), $this->list->getValuesForChoices($choices));
+        $choices = [$this->choice2, $this->choice1];
+        $this->assertSame([$this->value2, $this->value1], $this->list->getValuesForChoices($choices));
     }
 
     public function testGetValuesForChoicesIgnoresNonExistingChoices()
     {
-        $choices = array($this->choice1, $this->choice2, 'foobar');
-        $this->assertSame(array($this->value1, $this->value2), $this->list->getValuesForChoices($choices));
+        $choices = [$this->choice1, $this->choice2, 'foobar'];
+        $this->assertSame([$this->value1, $this->value2], $this->list->getValuesForChoices($choices));
     }
 
     public function testGetValuesForChoicesEmpty()
     {
-        $this->assertSame(array(), $this->list->getValuesForChoices(array()));
+        $this->assertSame([], $this->list->getValuesForChoices([]));
     }
 
     public function testGetChoicesForValuesWithNull()
     {
-        $values = $this->list->getValuesForChoices(array(null));
+        $values = $this->list->getValuesForChoices([null]);
 
         $this->assertNotEmpty($this->list->getChoicesForValues($values));
     }
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php
index 37b8dddbbe477..c71fd75bcf7f6 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php
@@ -34,12 +34,12 @@ protected function createChoiceList()
 
     protected function getChoices()
     {
-        return array(0, 1, 1.5, '1', 'a', false, true, $this->object, null);
+        return [0, 1, 1.5, '1', 'a', false, true, $this->object, null];
     }
 
     protected function getValues()
     {
-        return array('0', '1', '2', '3', '4', '5', '6', '7', '8');
+        return ['0', '1', '2', '3', '4', '5', '6', '7', '8'];
     }
 
     public function testCreateChoiceListWithValueCallback()
@@ -48,65 +48,65 @@ public function testCreateChoiceListWithValueCallback()
             return ':'.$choice;
         };
 
-        $choiceList = new ArrayChoiceList(array(2 => 'foo', 7 => 'bar', 10 => 'baz'), $callback);
+        $choiceList = new ArrayChoiceList([2 => 'foo', 7 => 'bar', 10 => 'baz'], $callback);
 
-        $this->assertSame(array(':foo', ':bar', ':baz'), $choiceList->getValues());
-        $this->assertSame(array(':foo' => 'foo', ':bar' => 'bar', ':baz' => 'baz'), $choiceList->getChoices());
-        $this->assertSame(array(':foo' => 2, ':bar' => 7, ':baz' => 10), $choiceList->getOriginalKeys());
-        $this->assertSame(array(1 => 'foo', 2 => 'baz'), $choiceList->getChoicesForValues(array(1 => ':foo', 2 => ':baz')));
-        $this->assertSame(array(1 => ':foo', 2 => ':baz'), $choiceList->getValuesForChoices(array(1 => 'foo', 2 => 'baz')));
+        $this->assertSame([':foo', ':bar', ':baz'], $choiceList->getValues());
+        $this->assertSame([':foo' => 'foo', ':bar' => 'bar', ':baz' => 'baz'], $choiceList->getChoices());
+        $this->assertSame([':foo' => 2, ':bar' => 7, ':baz' => 10], $choiceList->getOriginalKeys());
+        $this->assertSame([1 => 'foo', 2 => 'baz'], $choiceList->getChoicesForValues([1 => ':foo', 2 => ':baz']));
+        $this->assertSame([1 => ':foo', 2 => ':baz'], $choiceList->getValuesForChoices([1 => 'foo', 2 => 'baz']));
     }
 
     public function testCreateChoiceListWithoutValueCallbackAndDuplicateFreeToStringChoices()
     {
-        $choiceList = new ArrayChoiceList(array(2 => 'foo', 7 => 'bar', 10 => 123));
+        $choiceList = new ArrayChoiceList([2 => 'foo', 7 => 'bar', 10 => 123]);
 
-        $this->assertSame(array('foo', 'bar', '123'), $choiceList->getValues());
-        $this->assertSame(array('foo' => 'foo', 'bar' => 'bar', '123' => 123), $choiceList->getChoices());
-        $this->assertSame(array('foo' => 2, 'bar' => 7, '123' => 10), $choiceList->getOriginalKeys());
-        $this->assertSame(array(1 => 'foo', 2 => 123), $choiceList->getChoicesForValues(array(1 => 'foo', 2 => '123')));
-        $this->assertSame(array(1 => 'foo', 2 => '123'), $choiceList->getValuesForChoices(array(1 => 'foo', 2 => 123)));
+        $this->assertSame(['foo', 'bar', '123'], $choiceList->getValues());
+        $this->assertSame(['foo' => 'foo', 'bar' => 'bar', '123' => 123], $choiceList->getChoices());
+        $this->assertSame(['foo' => 2, 'bar' => 7, '123' => 10], $choiceList->getOriginalKeys());
+        $this->assertSame([1 => 'foo', 2 => 123], $choiceList->getChoicesForValues([1 => 'foo', 2 => '123']));
+        $this->assertSame([1 => 'foo', 2 => '123'], $choiceList->getValuesForChoices([1 => 'foo', 2 => 123]));
     }
 
     public function testCreateChoiceListWithoutValueCallbackAndToStringDuplicates()
     {
-        $choiceList = new ArrayChoiceList(array(2 => 'foo', 7 => '123', 10 => 123));
+        $choiceList = new ArrayChoiceList([2 => 'foo', 7 => '123', 10 => 123]);
 
-        $this->assertSame(array('0', '1', '2'), $choiceList->getValues());
-        $this->assertSame(array('0' => 'foo', '1' => '123', '2' => 123), $choiceList->getChoices());
-        $this->assertSame(array('0' => 2, '1' => 7, '2' => 10), $choiceList->getOriginalKeys());
-        $this->assertSame(array(1 => 'foo', 2 => 123), $choiceList->getChoicesForValues(array(1 => '0', 2 => '2')));
-        $this->assertSame(array(1 => '0', 2 => '2'), $choiceList->getValuesForChoices(array(1 => 'foo', 2 => 123)));
+        $this->assertSame(['0', '1', '2'], $choiceList->getValues());
+        $this->assertSame(['0' => 'foo', '1' => '123', '2' => 123], $choiceList->getChoices());
+        $this->assertSame(['0' => 2, '1' => 7, '2' => 10], $choiceList->getOriginalKeys());
+        $this->assertSame([1 => 'foo', 2 => 123], $choiceList->getChoicesForValues([1 => '0', 2 => '2']));
+        $this->assertSame([1 => '0', 2 => '2'], $choiceList->getValuesForChoices([1 => 'foo', 2 => 123]));
     }
 
     public function testCreateChoiceListWithoutValueCallbackAndMixedChoices()
     {
         $object = new \stdClass();
-        $choiceList = new ArrayChoiceList(array(2 => 'foo', 5 => array(7 => '123'), 10 => $object));
+        $choiceList = new ArrayChoiceList([2 => 'foo', 5 => [7 => '123'], 10 => $object]);
 
-        $this->assertSame(array('0', '1', '2'), $choiceList->getValues());
-        $this->assertSame(array('0' => 'foo', '1' => '123', '2' => $object), $choiceList->getChoices());
-        $this->assertSame(array('0' => 2, '1' => 7, '2' => 10), $choiceList->getOriginalKeys());
-        $this->assertSame(array(1 => 'foo', 2 => $object), $choiceList->getChoicesForValues(array(1 => '0', 2 => '2')));
-        $this->assertSame(array(1 => '0', 2 => '2'), $choiceList->getValuesForChoices(array(1 => 'foo', 2 => $object)));
+        $this->assertSame(['0', '1', '2'], $choiceList->getValues());
+        $this->assertSame(['0' => 'foo', '1' => '123', '2' => $object], $choiceList->getChoices());
+        $this->assertSame(['0' => 2, '1' => 7, '2' => 10], $choiceList->getOriginalKeys());
+        $this->assertSame([1 => 'foo', 2 => $object], $choiceList->getChoicesForValues([1 => '0', 2 => '2']));
+        $this->assertSame([1 => '0', 2 => '2'], $choiceList->getValuesForChoices([1 => 'foo', 2 => $object]));
     }
 
     public function testCreateChoiceListWithGroupedChoices()
     {
-        $choiceList = new ArrayChoiceList(array(
-            'Group 1' => array('A' => 'a', 'B' => 'b'),
-            'Group 2' => array('C' => 'c', 'D' => 'd'),
-        ));
-
-        $this->assertSame(array('a', 'b', 'c', 'd'), $choiceList->getValues());
-        $this->assertSame(array(
-            'Group 1' => array('A' => 'a', 'B' => 'b'),
-            'Group 2' => array('C' => 'c', 'D' => 'd'),
-        ), $choiceList->getStructuredValues());
-        $this->assertSame(array('a' => 'a', 'b' => 'b', 'c' => 'c', 'd' => 'd'), $choiceList->getChoices());
-        $this->assertSame(array('a' => 'A', 'b' => 'B', 'c' => 'C', 'd' => 'D'), $choiceList->getOriginalKeys());
-        $this->assertSame(array(1 => 'a', 2 => 'b'), $choiceList->getChoicesForValues(array(1 => 'a', 2 => 'b')));
-        $this->assertSame(array(1 => 'a', 2 => 'b'), $choiceList->getValuesForChoices(array(1 => 'a', 2 => 'b')));
+        $choiceList = new ArrayChoiceList([
+            'Group 1' => ['A' => 'a', 'B' => 'b'],
+            'Group 2' => ['C' => 'c', 'D' => 'd'],
+        ]);
+
+        $this->assertSame(['a', 'b', 'c', 'd'], $choiceList->getValues());
+        $this->assertSame([
+            'Group 1' => ['A' => 'a', 'B' => 'b'],
+            'Group 2' => ['C' => 'c', 'D' => 'd'],
+        ], $choiceList->getStructuredValues());
+        $this->assertSame(['a' => 'a', 'b' => 'b', 'c' => 'c', 'd' => 'd'], $choiceList->getChoices());
+        $this->assertSame(['a' => 'A', 'b' => 'B', 'c' => 'C', 'd' => 'D'], $choiceList->getOriginalKeys());
+        $this->assertSame([1 => 'a', 2 => 'b'], $choiceList->getChoicesForValues([1 => 'a', 2 => 'b']));
+        $this->assertSame([1 => 'a', 2 => 'b'], $choiceList->getValuesForChoices([1 => 'a', 2 => 'b']));
     }
 
     public function testCompareChoicesByIdentityByDefault()
@@ -115,52 +115,52 @@ public function testCompareChoicesByIdentityByDefault()
             return $choice->value;
         };
 
-        $obj1 = (object) array('value' => 'value1');
-        $obj2 = (object) array('value' => 'value2');
+        $obj1 = (object) ['value' => 'value1'];
+        $obj2 = (object) ['value' => 'value2'];
 
-        $choiceList = new ArrayChoiceList(array($obj1, $obj2), $callback);
-        $this->assertSame(array(2 => 'value2'), $choiceList->getValuesForChoices(array(2 => $obj2)));
-        $this->assertSame(array(2 => 'value2'), $choiceList->getValuesForChoices(array(2 => (object) array('value' => 'value2'))));
+        $choiceList = new ArrayChoiceList([$obj1, $obj2], $callback);
+        $this->assertSame([2 => 'value2'], $choiceList->getValuesForChoices([2 => $obj2]));
+        $this->assertSame([2 => 'value2'], $choiceList->getValuesForChoices([2 => (object) ['value' => 'value2']]));
     }
 
     public function testGetChoicesForValuesWithContainingNull()
     {
-        $choiceList = new ArrayChoiceList(array('Null' => null));
+        $choiceList = new ArrayChoiceList(['Null' => null]);
 
-        $this->assertSame(array(0 => null), $choiceList->getChoicesForValues(array('0')));
+        $this->assertSame([0 => null], $choiceList->getChoicesForValues(['0']));
     }
 
     public function testGetChoicesForValuesWithContainingFalseAndNull()
     {
-        $choiceList = new ArrayChoiceList(array('False' => false, 'Null' => null));
+        $choiceList = new ArrayChoiceList(['False' => false, 'Null' => null]);
 
-        $this->assertSame(array(0 => null), $choiceList->getChoicesForValues(array('1')));
-        $this->assertSame(array(0 => false), $choiceList->getChoicesForValues(array('0')));
+        $this->assertSame([0 => null], $choiceList->getChoicesForValues(['1']));
+        $this->assertSame([0 => false], $choiceList->getChoicesForValues(['0']));
     }
 
     public function testGetChoicesForValuesWithContainingEmptyStringAndNull()
     {
-        $choiceList = new ArrayChoiceList(array('Empty String' => '', 'Null' => null));
+        $choiceList = new ArrayChoiceList(['Empty String' => '', 'Null' => null]);
 
-        $this->assertSame(array(0 => ''), $choiceList->getChoicesForValues(array('0')));
-        $this->assertSame(array(0 => null), $choiceList->getChoicesForValues(array('1')));
+        $this->assertSame([0 => ''], $choiceList->getChoicesForValues(['0']));
+        $this->assertSame([0 => null], $choiceList->getChoicesForValues(['1']));
     }
 
     public function testGetChoicesForValuesWithContainingEmptyStringAndBooleans()
     {
-        $choiceList = new ArrayChoiceList(array('Empty String' => '', 'True' => true, 'False' => false));
+        $choiceList = new ArrayChoiceList(['Empty String' => '', 'True' => true, 'False' => false]);
 
-        $this->assertSame(array(0 => ''), $choiceList->getChoicesForValues(array('')));
-        $this->assertSame(array(0 => true), $choiceList->getChoicesForValues(array('1')));
-        $this->assertSame(array(0 => false), $choiceList->getChoicesForValues(array('0')));
+        $this->assertSame([0 => ''], $choiceList->getChoicesForValues(['']));
+        $this->assertSame([0 => true], $choiceList->getChoicesForValues(['1']));
+        $this->assertSame([0 => false], $choiceList->getChoicesForValues(['0']));
     }
 
     public function testGetChoicesForValuesWithContainingEmptyStringAndFloats()
     {
-        $choiceList = new ArrayChoiceList(array('Empty String' => '', '1/3' => 0.3, '1/2' => 0.5));
+        $choiceList = new ArrayChoiceList(['Empty String' => '', '1/3' => 0.3, '1/2' => 0.5]);
 
-        $this->assertSame(array(0 => ''), $choiceList->getChoicesForValues(array('')));
-        $this->assertSame(array(0 => 0.3), $choiceList->getChoicesForValues(array('0.3')));
-        $this->assertSame(array(0 => 0.5), $choiceList->getChoicesForValues(array('0.5')));
+        $this->assertSame([0 => ''], $choiceList->getChoicesForValues(['']));
+        $this->assertSame([0 => 0.3], $choiceList->getChoicesForValues(['0.3']));
+        $this->assertSame([0 => 0.5], $choiceList->getChoicesForValues(['0.5']));
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php
index dd6c968bd84b7..9732ab6e2c7dc 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php
@@ -41,18 +41,18 @@ public function testCreateFromChoicesEmpty()
 
         $this->decoratedFactory->expects($this->once())
             ->method('createListFromChoices')
-            ->with(array())
+            ->with([])
             ->will($this->returnValue($list));
 
-        $this->assertSame($list, $this->factory->createListFromChoices(array()));
-        $this->assertSame($list, $this->factory->createListFromChoices(array()));
+        $this->assertSame($list, $this->factory->createListFromChoices([]));
+        $this->assertSame($list, $this->factory->createListFromChoices([]));
     }
 
     public function testCreateFromChoicesComparesTraversableChoicesAsArray()
     {
         // The top-most traversable is converted to an array
-        $choices1 = new \ArrayIterator(array('A' => 'a'));
-        $choices2 = array('A' => 'a');
+        $choices1 = new \ArrayIterator(['A' => 'a']);
+        $choices2 = ['A' => 'a'];
         $list = new \stdClass();
 
         $this->decoratedFactory->expects($this->once())
@@ -66,8 +66,8 @@ public function testCreateFromChoicesComparesTraversableChoicesAsArray()
 
     public function testCreateFromChoicesFlattensChoices()
     {
-        $choices1 = array('key' => array('A' => 'a'));
-        $choices2 = array('A' => 'a');
+        $choices1 = ['key' => ['A' => 'a']];
+        $choices2 = ['A' => 'a'];
         $list = new \stdClass();
 
         $this->decoratedFactory->expects($this->once())
@@ -84,8 +84,8 @@ public function testCreateFromChoicesFlattensChoices()
      */
     public function testCreateFromChoicesSameChoices($choice1, $choice2)
     {
-        $choices1 = array($choice1);
-        $choices2 = array($choice2);
+        $choices1 = [$choice1];
+        $choices2 = [$choice2];
         $list = new \stdClass();
 
         $this->decoratedFactory->expects($this->once())
@@ -102,8 +102,8 @@ public function testCreateFromChoicesSameChoices($choice1, $choice2)
      */
     public function testCreateFromChoicesDifferentChoices($choice1, $choice2)
     {
-        $choices1 = array($choice1);
-        $choices2 = array($choice2);
+        $choices1 = [$choice1];
+        $choices2 = [$choice2];
         $list1 = new \stdClass();
         $list2 = new \stdClass();
 
@@ -122,7 +122,7 @@ public function testCreateFromChoicesDifferentChoices($choice1, $choice2)
 
     public function testCreateFromChoicesSameValueClosure()
     {
-        $choices = array(1);
+        $choices = [1];
         $list = new \stdClass();
         $closure = function () {};
 
@@ -137,7 +137,7 @@ public function testCreateFromChoicesSameValueClosure()
 
     public function testCreateFromChoicesDifferentValueClosure()
     {
-        $choices = array(1);
+        $choices = [1];
         $list1 = new \stdClass();
         $list2 = new \stdClass();
         $closure1 = function () {};
@@ -228,7 +228,7 @@ public function testCreateFromLoaderDifferentValueClosure()
 
     public function testCreateViewSamePreferredChoices()
     {
-        $preferred = array('a');
+        $preferred = ['a'];
         $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
         $view = new \stdClass();
 
@@ -243,8 +243,8 @@ public function testCreateViewSamePreferredChoices()
 
     public function testCreateViewDifferentPreferredChoices()
     {
-        $preferred1 = array('a');
-        $preferred2 = array('b');
+        $preferred1 = ['a'];
+        $preferred2 = ['b'];
         $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
         $view1 = new \stdClass();
         $view2 = new \stdClass();
@@ -408,7 +408,7 @@ public function testCreateViewDifferentGroupByClosure()
 
     public function testCreateViewSameAttributes()
     {
-        $attr = array('class' => 'foobar');
+        $attr = ['class' => 'foobar'];
         $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
         $view = new \stdClass();
 
@@ -423,8 +423,8 @@ public function testCreateViewSameAttributes()
 
     public function testCreateViewDifferentAttributes()
     {
-        $attr1 = array('class' => 'foobar1');
-        $attr2 = array('class' => 'foobar2');
+        $attr1 = ['class' => 'foobar1'];
+        $attr2 = ['class' => 'foobar2'];
         $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
         $view1 = new \stdClass();
         $view2 = new \stdClass();
@@ -480,53 +480,53 @@ public function testCreateViewDifferentAttributesClosure()
 
     public function provideSameChoices()
     {
-        $object = (object) array('foo' => 'bar');
+        $object = (object) ['foo' => 'bar'];
 
-        return array(
-            array(0, 0),
-            array('a', 'a'),
+        return [
+            [0, 0],
+            ['a', 'a'],
             // https://github.com/symfony/symfony/issues/10409
-            array(\chr(181).'meter', \chr(181).'meter'), // UTF-8
-            array($object, $object),
-        );
+            [\chr(181).'meter', \chr(181).'meter'], // UTF-8
+            [$object, $object],
+        ];
     }
 
     public function provideDistinguishedChoices()
     {
-        return array(
-            array(0, false),
-            array(0, null),
-            array(0, '0'),
-            array(0, ''),
-            array(1, true),
-            array(1, '1'),
-            array(1, 'a'),
-            array('', false),
-            array('', null),
-            array(false, null),
+        return [
+            [0, false],
+            [0, null],
+            [0, '0'],
+            [0, ''],
+            [1, true],
+            [1, '1'],
+            [1, 'a'],
+            ['', false],
+            ['', null],
+            [false, null],
             // Same properties, but not identical
-            array((object) array('foo' => 'bar'), (object) array('foo' => 'bar')),
-        );
+            [(object) ['foo' => 'bar'], (object) ['foo' => 'bar']],
+        ];
     }
 
     public function provideSameKeyChoices()
     {
         // Only test types here that can be used as array keys
-        return array(
-            array(0, 0),
-            array(0, '0'),
-            array('a', 'a'),
-            array(\chr(181).'meter', \chr(181).'meter'),
-        );
+        return [
+            [0, 0],
+            [0, '0'],
+            ['a', 'a'],
+            [\chr(181).'meter', \chr(181).'meter'],
+        ];
     }
 
     public function provideDistinguishedKeyChoices()
     {
         // Only test types here that can be used as array keys
-        return array(
-            array(0, ''),
-            array(1, 'a'),
-            array('', 'a'),
-        );
+        return [
+            [0, ''],
+            [1, 'a'],
+            ['', 'a'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
index 2450248240833..879cc3b6d93c2 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
@@ -86,28 +86,28 @@ public function getGroupAsObject($object)
 
     protected function setUp()
     {
-        $this->obj1 = (object) array('label' => 'A', 'index' => 'w', 'value' => 'a', 'preferred' => false, 'group' => 'Group 1', 'attr' => array());
-        $this->obj2 = (object) array('label' => 'B', 'index' => 'x', 'value' => 'b', 'preferred' => true, 'group' => 'Group 1', 'attr' => array('attr1' => 'value1'));
-        $this->obj3 = (object) array('label' => 'C', 'index' => 'y', 'value' => 1, 'preferred' => true, 'group' => 'Group 2', 'attr' => array('attr2' => 'value2'));
-        $this->obj4 = (object) array('label' => 'D', 'index' => 'z', 'value' => 2, 'preferred' => false, 'group' => 'Group 2', 'attr' => array());
+        $this->obj1 = (object) ['label' => 'A', 'index' => 'w', 'value' => 'a', 'preferred' => false, 'group' => 'Group 1', 'attr' => []];
+        $this->obj2 = (object) ['label' => 'B', 'index' => 'x', 'value' => 'b', 'preferred' => true, 'group' => 'Group 1', 'attr' => ['attr1' => 'value1']];
+        $this->obj3 = (object) ['label' => 'C', 'index' => 'y', 'value' => 1, 'preferred' => true, 'group' => 'Group 2', 'attr' => ['attr2' => 'value2']];
+        $this->obj4 = (object) ['label' => 'D', 'index' => 'z', 'value' => 2, 'preferred' => false, 'group' => 'Group 2', 'attr' => []];
         $this->list = new ArrayChoiceList(
-            array('A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4)
+            ['A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4]
         );
         $this->factory = new DefaultChoiceListFactory();
     }
 
     public function testCreateFromChoicesEmpty()
     {
-        $list = $this->factory->createListFromChoices(array());
+        $list = $this->factory->createListFromChoices([]);
 
-        $this->assertSame(array(), $list->getChoices());
-        $this->assertSame(array(), $list->getValues());
+        $this->assertSame([], $list->getChoices());
+        $this->assertSame([], $list->getValues());
     }
 
     public function testCreateFromChoicesFlat()
     {
         $list = $this->factory->createListFromChoices(
-            array('A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4)
+            ['A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4]
         );
 
         $this->assertObjectListWithGeneratedValues($list);
@@ -116,7 +116,7 @@ public function testCreateFromChoicesFlat()
     public function testCreateFromChoicesFlatTraversable()
     {
         $list = $this->factory->createListFromChoices(
-            new \ArrayIterator(array('A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4))
+            new \ArrayIterator(['A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4])
         );
 
         $this->assertObjectListWithGeneratedValues($list);
@@ -125,8 +125,8 @@ public function testCreateFromChoicesFlatTraversable()
     public function testCreateFromChoicesFlatValuesAsCallable()
     {
         $list = $this->factory->createListFromChoices(
-            array('A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4),
-            array($this, 'getValue')
+            ['A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4],
+            [$this, 'getValue']
         );
 
         $this->assertObjectListWithCustomValues($list);
@@ -135,7 +135,7 @@ public function testCreateFromChoicesFlatValuesAsCallable()
     public function testCreateFromChoicesFlatValuesAsClosure()
     {
         $list = $this->factory->createListFromChoices(
-            array('A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4),
+            ['A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4],
             function ($object) { return $object->value; }
         );
 
@@ -145,10 +145,10 @@ function ($object) { return $object->value; }
     public function testCreateFromChoicesGrouped()
     {
         $list = $this->factory->createListFromChoices(
-            array(
-                'Group 1' => array('A' => $this->obj1, 'B' => $this->obj2),
-                'Group 2' => array('C' => $this->obj3, 'D' => $this->obj4),
-            )
+            [
+                'Group 1' => ['A' => $this->obj1, 'B' => $this->obj2],
+                'Group 2' => ['C' => $this->obj3, 'D' => $this->obj4],
+            ]
         );
 
         $this->assertObjectListWithGeneratedValues($list);
@@ -157,10 +157,10 @@ public function testCreateFromChoicesGrouped()
     public function testCreateFromChoicesGroupedTraversable()
     {
         $list = $this->factory->createListFromChoices(
-            new \ArrayIterator(array(
-                    'Group 1' => array('A' => $this->obj1, 'B' => $this->obj2),
-                    'Group 2' => array('C' => $this->obj3, 'D' => $this->obj4),
-                ))
+            new \ArrayIterator([
+                    'Group 1' => ['A' => $this->obj1, 'B' => $this->obj2],
+                    'Group 2' => ['C' => $this->obj3, 'D' => $this->obj4],
+                ])
         );
 
         $this->assertObjectListWithGeneratedValues($list);
@@ -169,11 +169,11 @@ public function testCreateFromChoicesGroupedTraversable()
     public function testCreateFromChoicesGroupedValuesAsCallable()
     {
         $list = $this->factory->createListFromChoices(
-            array(
-                'Group 1' => array('A' => $this->obj1, 'B' => $this->obj2),
-                'Group 2' => array('C' => $this->obj3, 'D' => $this->obj4),
-            ),
-            array($this, 'getValue')
+            [
+                'Group 1' => ['A' => $this->obj1, 'B' => $this->obj2],
+                'Group 2' => ['C' => $this->obj3, 'D' => $this->obj4],
+            ],
+            [$this, 'getValue']
         );
 
         $this->assertObjectListWithCustomValues($list);
@@ -182,10 +182,10 @@ public function testCreateFromChoicesGroupedValuesAsCallable()
     public function testCreateFromChoicesGroupedValuesAsClosure()
     {
         $list = $this->factory->createListFromChoices(
-            array(
-                'Group 1' => array('A' => $this->obj1, 'B' => $this->obj2),
-                'Group 2' => array('C' => $this->obj3, 'D' => $this->obj4),
-            ),
+            [
+                'Group 1' => ['A' => $this->obj1, 'B' => $this->obj2],
+                'Group 2' => ['C' => $this->obj3, 'D' => $this->obj4],
+            ],
             function ($object) { return $object->value; }
         );
 
@@ -216,12 +216,12 @@ public function testCreateViewFlat()
         $view = $this->factory->createView($this->list);
 
         $this->assertEquals(new ChoiceListView(
-                array(
+                [
                     0 => new ChoiceView($this->obj1, '0', 'A'),
                     1 => new ChoiceView($this->obj2, '1', 'B'),
                     2 => new ChoiceView($this->obj3, '2', 'C'),
                     3 => new ChoiceView($this->obj4, '3', 'D'),
-                ), array()
+                ], []
         ), $view);
     }
 
@@ -229,7 +229,7 @@ public function testCreateViewFlatPreferredChoices()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3)
+            [$this->obj2, $this->obj3]
         );
 
         $this->assertFlatView($view);
@@ -239,16 +239,16 @@ public function testCreateViewFlatPreferredChoicesEmptyArray()
     {
         $view = $this->factory->createView(
             $this->list,
-            array()
+            []
         );
 
         $this->assertEquals(new ChoiceListView(
-                array(
+                [
                     0 => new ChoiceView($this->obj1, '0', 'A'),
                     1 => new ChoiceView($this->obj2, '1', 'B'),
                     2 => new ChoiceView($this->obj3, '2', 'C'),
                     3 => new ChoiceView($this->obj4, '3', 'D'),
-                ), array()
+                ], []
         ), $view);
     }
 
@@ -256,7 +256,7 @@ public function testCreateViewFlatPreferredChoicesAsCallable()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this, 'isPreferred')
+            [$this, 'isPreferred']
         );
 
         $this->assertFlatView($view);
@@ -305,8 +305,8 @@ public function testCreateViewFlatLabelAsCallable()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
-            array($this, 'getLabel')
+            [$this->obj2, $this->obj3],
+            [$this, 'getLabel']
         );
 
         $this->assertFlatView($view);
@@ -316,7 +316,7 @@ public function testCreateViewFlatLabelAsClosure()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             function ($object) {
                 return $object->label;
             }
@@ -329,7 +329,7 @@ public function testCreateViewFlatLabelClosureReceivesKey()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             function ($object, $key) {
                 return $key;
             }
@@ -342,7 +342,7 @@ public function testCreateViewFlatLabelClosureReceivesValue()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             function ($object, $key, $value) {
                 switch ($value) {
                     case '0': return 'A';
@@ -360,9 +360,9 @@ public function testCreateViewFlatIndexAsCallable()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             null, // label
-            array($this, 'getFormIndex')
+            [$this, 'getFormIndex']
         );
 
         $this->assertFlatViewWithCustomIndices($view);
@@ -372,7 +372,7 @@ public function testCreateViewFlatIndexAsClosure()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             null, // label
             function ($object) {
                 return $object->index;
@@ -386,7 +386,7 @@ public function testCreateViewFlatIndexClosureReceivesKey()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             null, // label
             function ($object, $key) {
                 switch ($key) {
@@ -405,7 +405,7 @@ public function testCreateViewFlatIndexClosureReceivesValue()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             null, // label
             function ($object, $key, $value) {
                 switch ($value) {
@@ -422,15 +422,15 @@ function ($object, $key, $value) {
 
     public function testCreateViewFlatGroupByOriginalStructure()
     {
-        $list = new ArrayChoiceList(array(
-            'Group 1' => array('A' => $this->obj1, 'B' => $this->obj2),
-            'Group 2' => array('C' => $this->obj3, 'D' => $this->obj4),
-            'Group empty' => array(),
-        ));
+        $list = new ArrayChoiceList([
+            'Group 1' => ['A' => $this->obj1, 'B' => $this->obj2],
+            'Group 2' => ['C' => $this->obj3, 'D' => $this->obj4],
+            'Group empty' => [],
+        ]);
 
         $view = $this->factory->createView(
             $list,
-            array($this->obj2, $this->obj3)
+            [$this->obj2, $this->obj3]
         );
 
         $this->assertGroupedView($view);
@@ -440,10 +440,10 @@ public function testCreateViewFlatGroupByEmpty()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             null, // label
             null, // index
-            array() // ignored
+            [] // ignored
         );
 
         $this->assertFlatView($view);
@@ -453,10 +453,10 @@ public function testCreateViewFlatGroupByAsCallable()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             null, // label
             null, // index
-            array($this, 'getGroup')
+            [$this, 'getGroup']
         );
 
         $this->assertGroupedView($view);
@@ -466,10 +466,10 @@ public function testCreateViewFlatGroupByObjectThatCanBeCastToString()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             null, // label
             null, // index
-            array($this, 'getGroupAsObject')
+            [$this, 'getGroupAsObject']
         );
 
         $this->assertGroupedView($view);
@@ -482,7 +482,7 @@ public function testCreateViewFlatGroupByAsClosure()
 
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             null, // label
             null, // index
             function ($object) use ($obj1, $obj2) {
@@ -497,7 +497,7 @@ public function testCreateViewFlatGroupByClosureReceivesKey()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             null, // label
             null, // index
             function ($object, $key) {
@@ -512,7 +512,7 @@ public function testCreateViewFlatGroupByClosureReceivesValue()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             null, // label
             null, // index
             function ($object, $key, $value) {
@@ -527,14 +527,14 @@ public function testCreateViewFlatAttrAsArray()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             null, // label
             null, // index
             null, // group
-            array(
-                'B' => array('attr1' => 'value1'),
-                'C' => array('attr2' => 'value2'),
-            )
+            [
+                'B' => ['attr1' => 'value1'],
+                'C' => ['attr2' => 'value2'],
+            ]
         );
 
         $this->assertFlatViewWithAttr($view);
@@ -544,11 +544,11 @@ public function testCreateViewFlatAttrEmpty()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             null, // label
             null, // index
             null, // group
-            array()
+            []
         );
 
         $this->assertFlatView($view);
@@ -558,11 +558,11 @@ public function testCreateViewFlatAttrAsCallable()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             null, // label
             null, // index
             null, // group
-            array($this, 'getAttr')
+            [$this, 'getAttr']
         );
 
         $this->assertFlatViewWithAttr($view);
@@ -572,7 +572,7 @@ public function testCreateViewFlatAttrAsClosure()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             null, // label
             null, // index
             null, // group
@@ -588,15 +588,15 @@ public function testCreateViewFlatAttrClosureReceivesKey()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             null, // label
             null, // index
             null, // group
             function ($object, $key) {
                 switch ($key) {
-                    case 'B': return array('attr1' => 'value1');
-                    case 'C': return array('attr2' => 'value2');
-                    default: return array();
+                    case 'B': return ['attr1' => 'value1'];
+                    case 'C': return ['attr2' => 'value2'];
+                    default: return [];
                 }
             }
         );
@@ -608,15 +608,15 @@ public function testCreateViewFlatAttrClosureReceivesValue()
     {
         $view = $this->factory->createView(
             $this->list,
-            array($this->obj2, $this->obj3),
+            [$this->obj2, $this->obj3],
             null, // label
             null, // index
             null, // group
             function ($object, $key, $value) {
                 switch ($value) {
-                    case '1': return array('attr1' => 'value1');
-                    case '2': return array('attr2' => 'value2');
-                    default: return array();
+                    case '1': return ['attr1' => 'value1'];
+                    case '2': return ['attr2' => 'value2'];
+                    default: return [];
                 }
             }
         );
@@ -626,151 +626,151 @@ function ($object, $key, $value) {
 
     private function assertScalarListWithChoiceValues(ChoiceListInterface $list)
     {
-        $this->assertSame(array('a', 'b', 'c', 'd'), $list->getValues());
+        $this->assertSame(['a', 'b', 'c', 'd'], $list->getValues());
 
-        $this->assertSame(array(
+        $this->assertSame([
             'a' => 'a',
             'b' => 'b',
             'c' => 'c',
             'd' => 'd',
-        ), $list->getChoices());
+        ], $list->getChoices());
 
-        $this->assertSame(array(
+        $this->assertSame([
             'a' => 'A',
             'b' => 'B',
             'c' => 'C',
             'd' => 'D',
-        ), $list->getOriginalKeys());
+        ], $list->getOriginalKeys());
     }
 
     private function assertObjectListWithGeneratedValues(ChoiceListInterface $list)
     {
-        $this->assertSame(array('0', '1', '2', '3'), $list->getValues());
+        $this->assertSame(['0', '1', '2', '3'], $list->getValues());
 
-        $this->assertSame(array(
+        $this->assertSame([
             0 => $this->obj1,
             1 => $this->obj2,
             2 => $this->obj3,
             3 => $this->obj4,
-        ), $list->getChoices());
+        ], $list->getChoices());
 
-        $this->assertSame(array(
+        $this->assertSame([
             0 => 'A',
             1 => 'B',
             2 => 'C',
             3 => 'D',
-        ), $list->getOriginalKeys());
+        ], $list->getOriginalKeys());
     }
 
     private function assertScalarListWithCustomValues(ChoiceListInterface $list)
     {
-        $this->assertSame(array('a', 'b', '1', '2'), $list->getValues());
+        $this->assertSame(['a', 'b', '1', '2'], $list->getValues());
 
-        $this->assertSame(array(
+        $this->assertSame([
             'a' => 'a',
             'b' => 'b',
             1 => 'c',
             2 => 'd',
-        ), $list->getChoices());
+        ], $list->getChoices());
 
-        $this->assertSame(array(
+        $this->assertSame([
             'a' => 'A',
             'b' => 'B',
             1 => 'C',
             2 => 'D',
-        ), $list->getOriginalKeys());
+        ], $list->getOriginalKeys());
     }
 
     private function assertObjectListWithCustomValues(ChoiceListInterface $list)
     {
-        $this->assertSame(array('a', 'b', '1', '2'), $list->getValues());
+        $this->assertSame(['a', 'b', '1', '2'], $list->getValues());
 
-        $this->assertSame(array(
+        $this->assertSame([
             'a' => $this->obj1,
             'b' => $this->obj2,
             1 => $this->obj3,
             2 => $this->obj4,
-        ), $list->getChoices());
+        ], $list->getChoices());
 
-        $this->assertSame(array(
+        $this->assertSame([
             'a' => 'A',
             'b' => 'B',
             1 => 'C',
             2 => 'D',
-        ), $list->getOriginalKeys());
+        ], $list->getOriginalKeys());
     }
 
     private function assertFlatView($view)
     {
         $this->assertEquals(new ChoiceListView(
-                array(
+                [
                     0 => new ChoiceView($this->obj1, '0', 'A'),
                     3 => new ChoiceView($this->obj4, '3', 'D'),
-                ), array(
+                ], [
                     1 => new ChoiceView($this->obj2, '1', 'B'),
                     2 => new ChoiceView($this->obj3, '2', 'C'),
-                )
+                ]
         ), $view);
     }
 
     private function assertFlatViewWithCustomIndices($view)
     {
         $this->assertEquals(new ChoiceListView(
-                array(
+                [
                     'w' => new ChoiceView($this->obj1, '0', 'A'),
                     'z' => new ChoiceView($this->obj4, '3', 'D'),
-                ), array(
+                ], [
                     'x' => new ChoiceView($this->obj2, '1', 'B'),
                     'y' => new ChoiceView($this->obj3, '2', 'C'),
-                )
+                ]
         ), $view);
     }
 
     private function assertFlatViewWithAttr($view)
     {
         $this->assertEquals(new ChoiceListView(
-                array(
+                [
                     0 => new ChoiceView($this->obj1, '0', 'A'),
                     3 => new ChoiceView($this->obj4, '3', 'D'),
-                ), array(
+                ], [
                     1 => new ChoiceView(
                         $this->obj2,
                         '1',
                         'B',
-                        array('attr1' => 'value1')
+                        ['attr1' => 'value1']
                     ),
                     2 => new ChoiceView(
                         $this->obj3,
                         '2',
                         'C',
-                        array('attr2' => 'value2')
+                        ['attr2' => 'value2']
                     ),
-                )
+                ]
         ), $view);
     }
 
     private function assertGroupedView($view)
     {
         $this->assertEquals(new ChoiceListView(
-                array(
+                [
                     'Group 1' => new ChoiceGroupView(
                         'Group 1',
-                        array(0 => new ChoiceView($this->obj1, '0', 'A'))
+                        [0 => new ChoiceView($this->obj1, '0', 'A')]
                     ),
                     'Group 2' => new ChoiceGroupView(
                         'Group 2',
-                        array(3 => new ChoiceView($this->obj4, '3', 'D'))
+                        [3 => new ChoiceView($this->obj4, '3', 'D')]
                     ),
-                ), array(
+                ], [
                     'Group 1' => new ChoiceGroupView(
                         'Group 1',
-                        array(1 => new ChoiceView($this->obj2, '1', 'B'))
+                        [1 => new ChoiceView($this->obj2, '1', 'B')]
                     ),
                     'Group 2' => new ChoiceGroupView(
                         'Group 2',
-                        array(2 => new ChoiceView($this->obj3, '2', 'C'))
+                        [2 => new ChoiceView($this->obj3, '2', 'C')]
                     ),
-                )
+                ]
         ), $view);
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php
index d100dcff4a5fd..7b8936a75dc97 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php
@@ -38,7 +38,7 @@ protected function setUp()
 
     public function testCreateFromChoicesPropertyPath()
     {
-        $choices = array((object) array('property' => 'value'));
+        $choices = [(object) ['property' => 'value']];
 
         $this->decoratedFactory->expects($this->once())
             ->method('createListFromChoices')
@@ -47,12 +47,12 @@ public function testCreateFromChoicesPropertyPath()
                 return array_map($callback, $choices);
             }));
 
-        $this->assertSame(array('value'), $this->factory->createListFromChoices($choices, 'property'));
+        $this->assertSame(['value'], $this->factory->createListFromChoices($choices, 'property'));
     }
 
     public function testCreateFromChoicesPropertyPathInstance()
     {
-        $choices = array((object) array('property' => 'value'));
+        $choices = [(object) ['property' => 'value']];
 
         $this->decoratedFactory->expects($this->once())
             ->method('createListFromChoices')
@@ -61,7 +61,7 @@ public function testCreateFromChoicesPropertyPathInstance()
                 return array_map($callback, $choices);
             }));
 
-        $this->assertSame(array('value'), $this->factory->createListFromChoices($choices, new PropertyPath('property')));
+        $this->assertSame(['value'], $this->factory->createListFromChoices($choices, new PropertyPath('property')));
     }
 
     /**
@@ -87,7 +87,7 @@ public function testCreateFromLoaderPropertyPath()
             ->method('createListFromLoader')
             ->with($loader, $this->isInstanceOf('\Closure'))
             ->will($this->returnCallback(function ($loader, $callback) {
-                return $callback((object) array('property' => 'value'));
+                return $callback((object) ['property' => 'value']);
             }));
 
         $this->assertSame('value', $this->factory->createListFromLoader($loader, 'property'));
@@ -111,7 +111,7 @@ public function testCreateFromLoaderPropertyPathWithCallableString()
     // https://github.com/symfony/symfony/issues/5494
     public function testCreateFromChoicesAssumeNullIfValuePropertyPathUnreadable()
     {
-        $choices = array(null);
+        $choices = [null];
 
         $this->decoratedFactory->expects($this->once())
             ->method('createListFromChoices')
@@ -120,7 +120,7 @@ public function testCreateFromChoicesAssumeNullIfValuePropertyPathUnreadable()
                 return array_map($callback, $choices);
             }));
 
-        $this->assertSame(array(null), $this->factory->createListFromChoices($choices, 'property'));
+        $this->assertSame([null], $this->factory->createListFromChoices($choices, 'property'));
     }
 
     // https://github.com/symfony/symfony/issues/5494
@@ -146,7 +146,7 @@ public function testCreateFromLoaderPropertyPathInstance()
             ->method('createListFromLoader')
             ->with($loader, $this->isInstanceOf('\Closure'))
             ->will($this->returnCallback(function ($loader, $callback) {
-                return $callback((object) array('property' => 'value'));
+                return $callback((object) ['property' => 'value']);
             }));
 
         $this->assertSame('value', $this->factory->createListFromLoader($loader, new PropertyPath('property')));
@@ -160,7 +160,7 @@ public function testCreateViewPreferredChoicesAsPropertyPath()
             ->method('createView')
             ->with($list, $this->isInstanceOf('\Closure'))
             ->will($this->returnCallback(function ($list, $preferred) {
-                return $preferred((object) array('property' => true));
+                return $preferred((object) ['property' => true]);
             }));
 
         $this->assertTrue($this->factory->createView(
@@ -195,7 +195,7 @@ public function testCreateViewPreferredChoicesAsPropertyPathInstance()
             ->method('createView')
             ->with($list, $this->isInstanceOf('\Closure'))
             ->will($this->returnCallback(function ($list, $preferred) {
-                return $preferred((object) array('property' => true));
+                return $preferred((object) ['property' => true]);
             }));
 
         $this->assertTrue($this->factory->createView(
@@ -213,7 +213,7 @@ public function testCreateViewAssumeNullIfPreferredChoicesPropertyPathUnreadable
             ->method('createView')
             ->with($list, $this->isInstanceOf('\Closure'))
             ->will($this->returnCallback(function ($list, $preferred) {
-                return $preferred((object) array('category' => null));
+                return $preferred((object) ['category' => null]);
             }));
 
         $this->assertFalse($this->factory->createView(
@@ -230,7 +230,7 @@ public function testCreateViewLabelsAsPropertyPath()
             ->method('createView')
             ->with($list, null, $this->isInstanceOf('\Closure'))
             ->will($this->returnCallback(function ($list, $preferred, $label) {
-                return $label((object) array('property' => 'label'));
+                return $label((object) ['property' => 'label']);
             }));
 
         $this->assertSame('label', $this->factory->createView(
@@ -267,7 +267,7 @@ public function testCreateViewLabelsAsPropertyPathInstance()
             ->method('createView')
             ->with($list, null, $this->isInstanceOf('\Closure'))
             ->will($this->returnCallback(function ($list, $preferred, $label) {
-                return $label((object) array('property' => 'label'));
+                return $label((object) ['property' => 'label']);
             }));
 
         $this->assertSame('label', $this->factory->createView(
@@ -285,7 +285,7 @@ public function testCreateViewIndicesAsPropertyPath()
             ->method('createView')
             ->with($list, null, null, $this->isInstanceOf('\Closure'))
             ->will($this->returnCallback(function ($list, $preferred, $label, $index) {
-                return $index((object) array('property' => 'index'));
+                return $index((object) ['property' => 'index']);
             }));
 
         $this->assertSame('index', $this->factory->createView(
@@ -324,7 +324,7 @@ public function testCreateViewIndicesAsPropertyPathInstance()
             ->method('createView')
             ->with($list, null, null, $this->isInstanceOf('\Closure'))
             ->will($this->returnCallback(function ($list, $preferred, $label, $index) {
-                return $index((object) array('property' => 'index'));
+                return $index((object) ['property' => 'index']);
             }));
 
         $this->assertSame('index', $this->factory->createView(
@@ -343,7 +343,7 @@ public function testCreateViewGroupsAsPropertyPath()
             ->method('createView')
             ->with($list, null, null, null, $this->isInstanceOf('\Closure'))
             ->will($this->returnCallback(function ($list, $preferred, $label, $index, $groupBy) {
-                return $groupBy((object) array('property' => 'group'));
+                return $groupBy((object) ['property' => 'group']);
             }));
 
         $this->assertSame('group', $this->factory->createView(
@@ -384,7 +384,7 @@ public function testCreateViewGroupsAsPropertyPathInstance()
             ->method('createView')
             ->with($list, null, null, null, $this->isInstanceOf('\Closure'))
             ->will($this->returnCallback(function ($list, $preferred, $label, $index, $groupBy) {
-                return $groupBy((object) array('property' => 'group'));
+                return $groupBy((object) ['property' => 'group']);
             }));
 
         $this->assertSame('group', $this->factory->createView(
@@ -405,7 +405,7 @@ public function testCreateViewAssumeNullIfGroupsPropertyPathUnreadable()
             ->method('createView')
             ->with($list, null, null, null, $this->isInstanceOf('\Closure'))
             ->will($this->returnCallback(function ($list, $preferred, $label, $index, $groupBy) {
-                return $groupBy((object) array('group' => null));
+                return $groupBy((object) ['group' => null]);
             }));
 
         $this->assertNull($this->factory->createView(
@@ -425,7 +425,7 @@ public function testCreateViewAttrAsPropertyPath()
             ->method('createView')
             ->with($list, null, null, null, null, $this->isInstanceOf('\Closure'))
             ->will($this->returnCallback(function ($list, $preferred, $label, $index, $groupBy, $attr) {
-                return $attr((object) array('property' => 'attr'));
+                return $attr((object) ['property' => 'attr']);
             }));
 
         $this->assertSame('attr', $this->factory->createView(
@@ -468,7 +468,7 @@ public function testCreateViewAttrAsPropertyPathInstance()
             ->method('createView')
             ->with($list, null, null, null, null, $this->isInstanceOf('\Closure'))
             ->will($this->returnCallback(function ($list, $preferred, $label, $index, $groupBy, $attr) {
-                return $attr((object) array('property' => 'attr'));
+                return $attr((object) ['property' => 'attr']);
             }));
 
         $this->assertSame('attr', $this->factory->createView(
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php
index 61c8a5aa0b0e3..7bfc9d3b557eb 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php
@@ -137,11 +137,11 @@ public function testGetChoicesForValuesForwardsCallIfListNotLoaded()
     {
         $this->loader->expects($this->exactly(2))
             ->method('loadChoicesForValues')
-            ->with(array('a', 'b'))
+            ->with(['a', 'b'])
             ->will($this->returnValue('RESULT'));
 
-        $this->assertSame('RESULT', $this->list->getChoicesForValues(array('a', 'b')));
-        $this->assertSame('RESULT', $this->list->getChoicesForValues(array('a', 'b')));
+        $this->assertSame('RESULT', $this->list->getChoicesForValues(['a', 'b']));
+        $this->assertSame('RESULT', $this->list->getChoicesForValues(['a', 'b']));
     }
 
     public function testGetChoicesForValuesUsesLoadedList()
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php
index 7a1a96d1e62a4..362783c91e8e6 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php
@@ -53,11 +53,11 @@ public static function setUpBeforeClass()
         self::$value = function ($choice) {
             return isset($choice->value) ? $choice->value : null;
         };
-        self::$choices = array(
-            (object) array('value' => 'choice_one'),
-            (object) array('value' => 'choice_two'),
-        );
-        self::$choiceValues = array('choice_one', 'choice_two');
+        self::$choices = [
+            (object) ['value' => 'choice_one'],
+            (object) ['value' => 'choice_two'],
+        ];
+        self::$choiceValues = ['choice_one', 'choice_two'];
         self::$lazyChoiceList = new LazyChoiceList(self::$loader, self::$value);
     }
 
@@ -95,8 +95,8 @@ public static function tearDownAfterClass()
     {
         self::$loader = null;
         self::$value = null;
-        self::$choices = array();
-        self::$choiceValues = array();
+        self::$choices = [];
+        self::$choiceValues = [];
         self::$lazyChoiceList = null;
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
index f69222c345edb..2354855e8abe5 100644
--- a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
+++ b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
@@ -24,7 +24,7 @@ class DebugCommandTest extends TestCase
     public function testDebugDefaults()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array(), array('decorated' => false));
+        $ret = $tester->execute([], ['decorated' => false]);
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
         $this->assertContains('Built-in form types', $tester->getDisplay());
@@ -33,7 +33,7 @@ public function testDebugDefaults()
     public function testDebugSingleFormType()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array('class' => 'FormType'), array('decorated' => false));
+        $ret = $tester->execute(['class' => 'FormType'], ['decorated' => false]);
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
         $this->assertContains('Symfony\Component\Form\Extension\Core\Type\FormType (Block prefix: "form")', $tester->getDisplay());
@@ -42,7 +42,7 @@ public function testDebugSingleFormType()
     public function testDebugFormTypeOption()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array('class' => 'FormType', 'option' => 'method'), array('decorated' => false));
+        $ret = $tester->execute(['class' => 'FormType', 'option' => 'method'], ['decorated' => false]);
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
         $this->assertContains('Symfony\Component\Form\Extension\Core\Type\FormType (method)', $tester->getDisplay());
@@ -55,7 +55,7 @@ public function testDebugFormTypeOption()
     public function testDebugSingleFormTypeNotFound()
     {
         $tester = $this->createCommandTester();
-        $tester->execute(array('class' => 'NonExistentType'), array('decorated' => false, 'interactive' => false));
+        $tester->execute(['class' => 'NonExistentType'], ['decorated' => false, 'interactive' => false]);
     }
 
     public function testDebugAmbiguousFormType()
@@ -75,23 +75,23 @@ public function testDebugAmbiguousFormType()
             $this->setExpectedException(InvalidArgumentException::class, $expectedMessage);
         }
 
-        $tester = $this->createCommandTester(array(
+        $tester = $this->createCommandTester([
             'Symfony\Component\Form\Tests\Fixtures\Debug\A',
             'Symfony\Component\Form\Tests\Fixtures\Debug\B',
-        ));
+        ]);
 
-        $tester->execute(array('class' => 'AmbiguousType'), array('decorated' => false, 'interactive' => false));
+        $tester->execute(['class' => 'AmbiguousType'], ['decorated' => false, 'interactive' => false]);
     }
 
     public function testDebugAmbiguousFormTypeInteractive()
     {
-        $tester = $this->createCommandTester(array(
+        $tester = $this->createCommandTester([
             'Symfony\Component\Form\Tests\Fixtures\Debug\A',
             'Symfony\Component\Form\Tests\Fixtures\Debug\B',
-        ));
+        ]);
 
-        $tester->setInputs(array(0));
-        $tester->execute(array('class' => 'AmbiguousType'), array('decorated' => false, 'interactive' => true));
+        $tester->setInputs([0]);
+        $tester->execute(['class' => 'AmbiguousType'], ['decorated' => false, 'interactive' => true]);
 
         $this->assertEquals(0, $tester->getStatusCode(), 'Returns 0 in case of success');
         $output = $tester->getDisplay(true);
diff --git a/src/Symfony/Component/Form/Tests/CompoundFormPerformanceTest.php b/src/Symfony/Component/Form/Tests/CompoundFormPerformanceTest.php
index e0a333069c003..485d41e11b315 100644
--- a/src/Symfony/Component/Form/Tests/CompoundFormPerformanceTest.php
+++ b/src/Symfony/Component/Form/Tests/CompoundFormPerformanceTest.php
@@ -31,16 +31,16 @@ public function testArrayBasedForm()
             $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType')
                 ->add('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType')
                 ->add('lastName', 'Symfony\Component\Form\Extension\Core\Type\TextType')
-                ->add('gender', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array(
-                    'choices' => array('male' => 'Male', 'female' => 'Female'),
+                ->add('gender', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', [
+                    'choices' => ['male' => 'Male', 'female' => 'Female'],
                     'required' => false,
-                ))
+                ])
                 ->add('age', 'Symfony\Component\Form\Extension\Core\Type\NumberType')
                 ->add('birthDate', 'Symfony\Component\Form\Extension\Core\Type\BirthdayType')
-                ->add('city', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array(
+                ->add('city', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', [
                     // simulate 300 different cities
                     'choices' => range(1, 300),
-                ))
+                ])
                 ->getForm();
 
             // load the form into a view
diff --git a/src/Symfony/Component/Form/Tests/CompoundFormTest.php b/src/Symfony/Component/Form/Tests/CompoundFormTest.php
index 9b5b893dabda9..78cf200e01f56 100644
--- a/src/Symfony/Component/Form/Tests/CompoundFormTest.php
+++ b/src/Symfony/Component/Form/Tests/CompoundFormTest.php
@@ -28,10 +28,10 @@ public function testValidIfAllChildrenAreValid()
         $this->form->add($this->getBuilder('firstName')->getForm());
         $this->form->add($this->getBuilder('lastName')->getForm());
 
-        $this->form->submit(array(
+        $this->form->submit([
             'firstName' => 'Bernhard',
             'lastName' => 'Schussek',
-        ));
+        ]);
 
         $this->assertTrue($this->form->isValid());
     }
@@ -41,10 +41,10 @@ public function testInvalidIfChildIsInvalid()
         $this->form->add($this->getBuilder('firstName')->getForm());
         $this->form->add($this->getBuilder('lastName')->getForm());
 
-        $this->form->submit(array(
+        $this->form->submit([
             'firstName' => 'Bernhard',
             'lastName' => 'Schussek',
-        ));
+        ]);
 
         $this->form->get('lastName')->addError(new FormError('Invalid'));
 
@@ -60,7 +60,7 @@ public function testDisabledFormsValidEvenIfChildrenInvalid()
             ->add($this->getBuilder('name'))
             ->getForm();
 
-        $form->submit(array('name' => 'Jacques Doe'));
+        $form->submit(['name' => 'Jacques Doe']);
 
         $form->get('name')->addError(new FormError('Invalid'));
 
@@ -77,7 +77,7 @@ public function testSubmitForwardsNullIfNotClearMissingButValueIsExplicitlyNull(
             ->method('submit')
             ->with($this->equalTo(null));
 
-        $this->form->submit(array('firstName' => null), false);
+        $this->form->submit(['firstName' => null], false);
     }
 
     public function testSubmitForwardsNullIfValueIsMissing()
@@ -90,7 +90,7 @@ public function testSubmitForwardsNullIfValueIsMissing()
             ->method('submit')
             ->with($this->equalTo(null));
 
-        $this->form->submit(array());
+        $this->form->submit([]);
     }
 
     public function testSubmitDoesNotForwardNullIfNotClearMissing()
@@ -102,7 +102,7 @@ public function testSubmitDoesNotForwardNullIfNotClearMissing()
         $child->expects($this->never())
             ->method('submit');
 
-        $this->form->submit(array(), false);
+        $this->form->submit([], false);
     }
 
     public function testSubmitDoesNotAddExtraFieldForNullValues()
@@ -110,10 +110,10 @@ public function testSubmitDoesNotAddExtraFieldForNullValues()
         $factory = Forms::createFormFactoryBuilder()
             ->getFormFactory();
 
-        $child = $factory->createNamed('file', 'Symfony\Component\Form\Extension\Core\Type\FileType', null, array('auto_initialize' => false));
+        $child = $factory->createNamed('file', 'Symfony\Component\Form\Extension\Core\Type\FileType', null, ['auto_initialize' => false]);
 
         $this->form->add($child);
-        $this->form->submit(array('file' => null), false);
+        $this->form->submit(['file' => null], false);
 
         $this->assertCount(0, $this->form->getExtraData());
     }
@@ -128,7 +128,7 @@ public function testClearMissingFlagIsForwarded()
             ->method('submit')
             ->with($this->equalTo('foo'), false);
 
-        $this->form->submit(array('firstName' => 'foo'), false);
+        $this->form->submit(['firstName' => 'foo'], false);
     }
 
     public function testCloneChildren()
@@ -163,7 +163,7 @@ public function testAdd()
 
         $this->assertTrue($this->form->has('foo'));
         $this->assertSame($this->form, $child->getParent());
-        $this->assertSame(array('foo' => $child), $this->form->all());
+        $this->assertSame(['foo' => $child], $this->form->all());
     }
 
     public function testAddUsingNameAndType()
@@ -172,17 +172,17 @@ public function testAddUsingNameAndType()
 
         $this->factory->expects($this->once())
             ->method('createNamed')
-            ->with('foo', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array(
+            ->with('foo', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
                 'bar' => 'baz',
                 'auto_initialize' => false,
-            ))
+            ])
             ->will($this->returnValue($child));
 
-        $this->form->add('foo', 'Symfony\Component\Form\Extension\Core\Type\TextType', array('bar' => 'baz'));
+        $this->form->add('foo', 'Symfony\Component\Form\Extension\Core\Type\TextType', ['bar' => 'baz']);
 
         $this->assertTrue($this->form->has('foo'));
         $this->assertSame($this->form, $child->getParent());
-        $this->assertSame(array('foo' => $child), $this->form->all());
+        $this->assertSame(['foo' => $child], $this->form->all());
     }
 
     public function testAddUsingIntegerNameAndType()
@@ -191,18 +191,18 @@ public function testAddUsingIntegerNameAndType()
 
         $this->factory->expects($this->once())
             ->method('createNamed')
-            ->with('0', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array(
+            ->with('0', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
                 'bar' => 'baz',
                 'auto_initialize' => false,
-            ))
+            ])
             ->will($this->returnValue($child));
 
         // in order to make casting unnecessary
-        $this->form->add(0, 'Symfony\Component\Form\Extension\Core\Type\TextType', array('bar' => 'baz'));
+        $this->form->add(0, 'Symfony\Component\Form\Extension\Core\Type\TextType', ['bar' => 'baz']);
 
         $this->assertTrue($this->form->has(0));
         $this->assertSame($this->form, $child->getParent());
-        $this->assertSame(array(0 => $child), $this->form->all());
+        $this->assertSame([0 => $child], $this->form->all());
     }
 
     public function testAddWithoutType()
@@ -218,7 +218,7 @@ public function testAddWithoutType()
 
         $this->assertTrue($this->form->has('foo'));
         $this->assertSame($this->form, $child->getParent());
-        $this->assertSame(array('foo' => $child), $this->form->all());
+        $this->assertSame(['foo' => $child], $this->form->all());
     }
 
     public function testAddUsingNameButNoType()
@@ -239,7 +239,7 @@ public function testAddUsingNameButNoType()
 
         $this->assertTrue($this->form->has('foo'));
         $this->assertSame($this->form, $child->getParent());
-        $this->assertSame(array('foo' => $child), $this->form->all());
+        $this->assertSame(['foo' => $child], $this->form->all());
     }
 
     public function testAddUsingNameButNoTypeAndOptions()
@@ -253,17 +253,17 @@ public function testAddUsingNameButNoTypeAndOptions()
 
         $this->factory->expects($this->once())
             ->method('createForProperty')
-            ->with('\stdClass', 'foo', null, array(
+            ->with('\stdClass', 'foo', null, [
                 'bar' => 'baz',
                 'auto_initialize' => false,
-            ))
+            ])
             ->will($this->returnValue($child));
 
-        $this->form->add('foo', null, array('bar' => 'baz'));
+        $this->form->add('foo', null, ['bar' => 'baz']);
 
         $this->assertTrue($this->form->has('foo'));
         $this->assertSame($this->form, $child->getParent());
-        $this->assertSame(array('foo' => $child), $this->form->all());
+        $this->assertSame(['foo' => $child], $this->form->all());
     }
 
     /**
@@ -271,7 +271,7 @@ public function testAddUsingNameButNoTypeAndOptions()
      */
     public function testAddThrowsExceptionIfAlreadySubmitted()
     {
-        $this->form->submit(array());
+        $this->form->submit([]);
         $this->form->add($this->getBuilder('foo')->getForm());
     }
 
@@ -291,7 +291,7 @@ public function testRemove()
     public function testRemoveThrowsExceptionIfAlreadySubmitted()
     {
         $this->form->add($this->getBuilder('foo')->setCompound(false)->getForm());
-        $this->form->submit(array('foo' => 'bar'));
+        $this->form->submit(['foo' => 'bar']);
         $this->form->remove('foo');
     }
 
@@ -338,10 +338,10 @@ public function testAddMapsViewDataToFormIfInitialized()
         $form = $this->getBuilder()
             ->setCompound(true)
             ->setDataMapper($mapper)
-            ->addViewTransformer(new FixedDataTransformer(array(
+            ->addViewTransformer(new FixedDataTransformer([
                 '' => '',
                 'foo' => 'bar',
-            )))
+            ]))
             ->setData('foo')
             ->getForm();
 
@@ -351,7 +351,7 @@ public function testAddMapsViewDataToFormIfInitialized()
             ->with('bar', $this->isInstanceOf('\RecursiveIteratorIterator'))
             ->will($this->returnCallback(function ($data, \RecursiveIteratorIterator $iterator) use ($child) {
                 $this->assertInstanceOf('Symfony\Component\Form\Util\InheritDataAwareIterator', $iterator->getInnerIterator());
-                $this->assertSame(array($child->getName() => $child), iterator_to_array($iterator));
+                $this->assertSame([$child->getName() => $child], iterator_to_array($iterator));
             }));
 
         $form->initialize();
@@ -422,7 +422,7 @@ public function testSetDataSupportsDynamicAdditionAndRemovalOfChildren()
             ->method('setData');
 
         // pass NULL to all children
-        $form->setData(array());
+        $form->setData([]);
     }
 
     public function testSetDataMapsViewDataToChildren()
@@ -431,10 +431,10 @@ public function testSetDataMapsViewDataToChildren()
         $form = $this->getBuilder()
             ->setCompound(true)
             ->setDataMapper($mapper)
-            ->addViewTransformer(new FixedDataTransformer(array(
+            ->addViewTransformer(new FixedDataTransformer([
                 '' => '',
                 'foo' => 'bar',
-            )))
+            ]))
             ->getForm();
 
         $form->add($child1 = $this->getBuilder('firstName')->getForm());
@@ -445,7 +445,7 @@ public function testSetDataMapsViewDataToChildren()
             ->with('bar', $this->isInstanceOf('\RecursiveIteratorIterator'))
             ->will($this->returnCallback(function ($data, \RecursiveIteratorIterator $iterator) use ($child1, $child2) {
                 $this->assertInstanceOf('Symfony\Component\Form\Util\InheritDataAwareIterator', $iterator->getInnerIterator());
-                $this->assertSame(array('firstName' => $child1, 'lastName' => $child2), iterator_to_array($iterator));
+                $this->assertSame(['firstName' => $child1, 'lastName' => $child2], iterator_to_array($iterator));
             }));
 
         $form->setData('foo');
@@ -476,7 +476,7 @@ public function testSubmitSupportsDynamicAdditionAndRemovalOfChildren()
             ->method('submit');
 
         // pass NULL to all children
-        $this->form->submit(array());
+        $this->form->submit([]);
     }
 
     public function testSubmitMapsSubmittedChildrenOntoExistingViewData()
@@ -485,10 +485,10 @@ public function testSubmitMapsSubmittedChildrenOntoExistingViewData()
         $form = $this->getBuilder()
             ->setCompound(true)
             ->setDataMapper($mapper)
-            ->addViewTransformer(new FixedDataTransformer(array(
+            ->addViewTransformer(new FixedDataTransformer([
                 '' => '',
                 'foo' => 'bar',
-            )))
+            ]))
             ->setData('foo')
             ->getForm();
 
@@ -500,15 +500,15 @@ public function testSubmitMapsSubmittedChildrenOntoExistingViewData()
             ->with($this->isInstanceOf('\RecursiveIteratorIterator'), 'bar')
             ->will($this->returnCallback(function (\RecursiveIteratorIterator $iterator) use ($child1, $child2) {
                 $this->assertInstanceOf('Symfony\Component\Form\Util\InheritDataAwareIterator', $iterator->getInnerIterator());
-                $this->assertSame(array('firstName' => $child1, 'lastName' => $child2), iterator_to_array($iterator));
+                $this->assertSame(['firstName' => $child1, 'lastName' => $child2], iterator_to_array($iterator));
                 $this->assertEquals('Bernhard', $child1->getData());
                 $this->assertEquals('Schussek', $child2->getData());
             }));
 
-        $form->submit(array(
+        $form->submit([
             'firstName' => 'Bernhard',
             'lastName' => 'Schussek',
-        ));
+        ]);
     }
 
     public function testMapFormsToDataIsNotInvokedIfInheritData()
@@ -518,10 +518,10 @@ public function testMapFormsToDataIsNotInvokedIfInheritData()
             ->setCompound(true)
             ->setDataMapper($mapper)
             ->setInheritData(true)
-            ->addViewTransformer(new FixedDataTransformer(array(
+            ->addViewTransformer(new FixedDataTransformer([
                 '' => '',
                 'foo' => 'bar',
-            )))
+            ]))
             ->getForm();
 
         $form->add($child1 = $this->getBuilder('firstName')->setCompound(false)->getForm());
@@ -530,10 +530,10 @@ public function testMapFormsToDataIsNotInvokedIfInheritData()
         $mapper->expects($this->never())
             ->method('mapFormsToData');
 
-        $form->submit(array(
+        $form->submit([
             'firstName' => 'Bernhard',
             'lastName' => 'Schussek',
-        ));
+        ]);
     }
 
     /*
@@ -549,7 +549,7 @@ public function testSubmitRestoresViewDataIfCompoundAndEmpty()
             ->setData($object)
             ->getForm();
 
-        $form->submit(array());
+        $form->submit([]);
 
         $this->assertSame($object, $form->getData());
     }
@@ -572,22 +572,22 @@ public function testSubmitMapsSubmittedChildrenOntoEmptyData()
             ->with($this->isInstanceOf('\RecursiveIteratorIterator'), $object)
             ->will($this->returnCallback(function (\RecursiveIteratorIterator $iterator) use ($child) {
                 $this->assertInstanceOf('Symfony\Component\Form\Util\InheritDataAwareIterator', $iterator->getInnerIterator());
-                $this->assertSame(array('name' => $child), iterator_to_array($iterator));
+                $this->assertSame(['name' => $child], iterator_to_array($iterator));
             }));
 
-        $form->submit(array(
+        $form->submit([
             'name' => 'Bernhard',
-        ));
+        ]);
     }
 
     public function requestMethodProvider()
     {
-        return array(
-            array('POST'),
-            array('PUT'),
-            array('DELETE'),
-            array('PATCH'),
-        );
+        return [
+            ['POST'],
+            ['PUT'],
+            ['DELETE'],
+            ['PATCH'],
+        ];
     }
 
     /**
@@ -680,7 +680,7 @@ public function testSubmitPostOrPutRequestWithEmptyRootFormName($method)
 
         $this->assertEquals('Bernhard', $form['name']->getData());
         $this->assertEquals($file, $form['image']->getData());
-        $this->assertEquals(array('extra' => 'data'), $form->getExtraData());
+        $this->assertEquals(['extra' => 'data'], $form->getExtraData());
 
         unlink($path);
     }
@@ -729,13 +729,13 @@ public function testSubmitPostOrPutRequestWithSingleChildFormUploadedFile($metho
         $path = tempnam(sys_get_temp_dir(), 'sf2');
         touch($path);
 
-        $values = array(
+        $values = [
             'name' => 'Bernhard',
-        );
+        ];
 
-        $request = new Request(array(), $values, array(), array(), array(), array(
+        $request = new Request([], $values, [], [], [], [
             'REQUEST_METHOD' => $method,
-        ));
+        ]);
 
         $form = $this->getBuilder('name')
             ->setMethod($method)
@@ -751,16 +751,16 @@ public function testSubmitPostOrPutRequestWithSingleChildFormUploadedFile($metho
 
     public function testSubmitGetRequest()
     {
-        $values = array(
-            'author' => array(
+        $values = [
+            'author' => [
                 'firstName' => 'Bernhard',
                 'lastName' => 'Schussek',
-            ),
-        );
+            ],
+        ];
 
-        $request = new Request($values, array(), array(), array(), array(), array(
+        $request = new Request($values, [], [], [], [], [
             'REQUEST_METHOD' => 'GET',
-        ));
+        ]);
 
         $form = $this->getBuilder('author')
             ->setMethod('GET')
@@ -779,15 +779,15 @@ public function testSubmitGetRequest()
 
     public function testSubmitGetRequestWithEmptyRootFormName()
     {
-        $values = array(
+        $values = [
             'firstName' => 'Bernhard',
             'lastName' => 'Schussek',
             'extra' => 'data',
-        );
+        ];
 
-        $request = new Request($values, array(), array(), array(), array(), array(
+        $request = new Request($values, [], [], [], [], [
             'REQUEST_METHOD' => 'GET',
-        ));
+        ]);
 
         $form = $this->getBuilder('')
             ->setMethod('GET')
@@ -802,7 +802,7 @@ public function testSubmitGetRequestWithEmptyRootFormName()
 
         $this->assertEquals('Bernhard', $form['firstName']->getData());
         $this->assertEquals('Schussek', $form['lastName']->getData());
-        $this->assertEquals(array('extra' => 'data'), $form->getExtraData());
+        $this->assertEquals(['extra' => 'data'], $form->getExtraData());
     }
 
     public function testGetErrors()
@@ -818,7 +818,7 @@ public function testGetErrors()
              (string) $errors
         );
 
-        $this->assertSame(array($error1, $error2), iterator_to_array($errors));
+        $this->assertSame([$error1, $error2], iterator_to_array($errors));
     }
 
     public function testGetErrorsDeep()
@@ -840,7 +840,7 @@ public function testGetErrorsDeep()
         );
 
         $this->assertSame(
-             array($error1, $error2, $nestedError),
+             [$error1, $error2, $nestedError],
              iterator_to_array($errors)
         );
     }
@@ -880,7 +880,7 @@ public function testGetErrorsDeepRecursive()
     public function testCreateViewWithChildren()
     {
         $type = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormTypeInterface')->getMock();
-        $options = array('a' => 'Foo', 'b' => 'Bar');
+        $options = ['a' => 'Foo', 'b' => 'Bar'];
         $field1 = $this->getMockForm('foo');
         $field2 = $this->getMockForm('bar');
         $view = new FormView();
@@ -910,7 +910,7 @@ public function testCreateViewWithChildren()
         $type->expects($this->once())
             ->method('buildView')
             ->with($view, $this->form, $options)
-            ->will($this->returnCallback($assertChildViewsEqual(array())));
+            ->will($this->returnCallback($assertChildViewsEqual([])));
 
         // Then add the first child form
         $field1->expects($this->once())
@@ -927,7 +927,7 @@ public function testCreateViewWithChildren()
         $type->expects($this->once())
             ->method('finishView')
             ->with($view, $this->form, $options)
-            ->will($this->returnCallback($assertChildViewsEqual(array('foo' => $field1View, 'bar' => $field2View))));
+            ->will($this->returnCallback($assertChildViewsEqual(['foo' => $field1View, 'bar' => $field2View])));
 
         $this->assertSame($view, $this->form->createView());
     }
@@ -940,8 +940,8 @@ public function testNoClickedButtonBeforeSubmission()
     public function testNoClickedButton()
     {
         $button = $this->getMockBuilder('Symfony\Component\Form\SubmitButton')
-            ->setConstructorArgs(array(new SubmitButtonBuilder('submit')))
-            ->setMethods(array('isClicked'))
+            ->setConstructorArgs([new SubmitButtonBuilder('submit')])
+            ->setMethods(['isClicked'])
             ->getMock();
 
         $button->expects($this->any())
@@ -954,7 +954,7 @@ public function testNoClickedButton()
         $this->form->setParent($parentForm);
         $this->form->add($button);
         $this->form->add($nestedForm);
-        $this->form->submit(array());
+        $this->form->submit([]);
 
         $this->assertNull($this->form->getClickedButton());
     }
@@ -962,8 +962,8 @@ public function testNoClickedButton()
     public function testClickedButton()
     {
         $button = $this->getMockBuilder('Symfony\Component\Form\SubmitButton')
-            ->setConstructorArgs(array(new SubmitButtonBuilder('submit')))
-            ->setMethods(array('isClicked'))
+            ->setConstructorArgs([new SubmitButtonBuilder('submit')])
+            ->setMethods(['isClicked'])
             ->getMock();
 
         $button->expects($this->any())
@@ -971,7 +971,7 @@ public function testClickedButton()
             ->will($this->returnValue(true));
 
         $this->form->add($button);
-        $this->form->submit(array());
+        $this->form->submit([]);
 
         $this->assertSame($button, $this->form->getClickedButton());
     }
@@ -981,8 +981,8 @@ public function testClickedButtonFromNestedForm()
         $button = $this->getBuilder('submit')->getForm();
 
         $nestedForm = $this->getMockBuilder('Symfony\Component\Form\Form')
-            ->setConstructorArgs(array($this->getBuilder('nested')))
-            ->setMethods(array('getClickedButton'))
+            ->setConstructorArgs([$this->getBuilder('nested')])
+            ->setMethods(['getClickedButton'])
             ->getMock();
 
         $nestedForm->expects($this->any())
@@ -990,7 +990,7 @@ public function testClickedButtonFromNestedForm()
             ->will($this->returnValue($button));
 
         $this->form->add($nestedForm);
-        $this->form->submit(array());
+        $this->form->submit([]);
 
         $this->assertSame($button, $this->form->getClickedButton());
     }
@@ -1000,8 +1000,8 @@ public function testClickedButtonFromParentForm()
         $button = $this->getBuilder('submit')->getForm();
 
         $parentForm = $this->getMockBuilder('Symfony\Component\Form\Form')
-            ->setConstructorArgs(array($this->getBuilder('parent')))
-            ->setMethods(array('getClickedButton'))
+            ->setConstructorArgs([$this->getBuilder('parent')])
+            ->setMethods(['getClickedButton'])
             ->getMock();
 
         $parentForm->expects($this->any())
@@ -1009,7 +1009,7 @@ public function testClickedButtonFromParentForm()
             ->will($this->returnValue($button));
 
         $this->form->setParent($parentForm);
-        $this->form->submit(array());
+        $this->form->submit([]);
 
         $this->assertSame($button, $this->form->getClickedButton());
     }
@@ -1026,10 +1026,10 @@ public function testDisabledButtonIsNotSubmitted()
             ->add($submit)
         ;
 
-        $form->submit(array(
+        $form->submit([
             'text' => '',
             'submit' => '',
-        ));
+        ]);
 
         $this->assertTrue($submit->isDisabled());
         $this->assertFalse($submit->isClicked());
@@ -1039,17 +1039,17 @@ public function testDisabledButtonIsNotSubmitted()
     public function testArrayTransformationFailureOnSubmit()
     {
         $this->form->add($this->getBuilder('foo')->setCompound(false)->getForm());
-        $this->form->add($this->getBuilder('bar', null, null, array('multiple' => false))->setCompound(false)->getForm());
+        $this->form->add($this->getBuilder('bar', null, null, ['multiple' => false])->setCompound(false)->getForm());
 
-        $this->form->submit(array(
-            'foo' => array('foo'),
-            'bar' => array('bar'),
-        ));
+        $this->form->submit([
+            'foo' => ['foo'],
+            'bar' => ['bar'],
+        ]);
 
         $this->assertNull($this->form->get('foo')->getData());
         $this->assertSame('Submitted data was expected to be text or number, array given.', $this->form->get('foo')->getTransformationFailure()->getMessage());
 
-        $this->assertSame(array('bar'), $this->form->get('bar')->getData());
+        $this->assertSame(['bar'], $this->form->get('bar')->getData());
     }
 
     public function testFileUpload()
diff --git a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php
index c29e3fe2fc5e6..1dc13b7aee489 100644
--- a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php
+++ b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php
@@ -113,7 +113,7 @@ abstract protected function getFormat();
     private function getObjectDescription($object, array $options)
     {
         $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, $options['decorated']);
-        $io = new SymfonyStyle(new ArrayInput(array()), $output);
+        $io = new SymfonyStyle(new ArrayInput([]), $output);
 
         $this->getDescriptor()->describe($io, $object, $options);
 
@@ -140,11 +140,11 @@ public function configureOptions(OptionsResolver $resolver)
             $foo = $options['foo'];
 
             return function (FormInterface $form) use ($foo) {
-                return $form->getConfig()->getCompound() ? array($foo) : $foo;
+                return $form->getConfig()->getCompound() ? [$foo] : $foo;
             };
         });
         $resolver->setAllowedTypes('foo', 'string');
-        $resolver->setAllowedValues('foo', array('bar', 'baz'));
+        $resolver->setAllowedValues('foo', ['bar', 'baz']);
         $resolver->setNormalizer('foo', function (Options $options, $value) {
             return (string) $value;
         });
diff --git a/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php b/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
index f5939b40e09c7..c5f0993b26baf 100644
--- a/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
+++ b/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
@@ -58,10 +58,10 @@ public function testAddTaggedTypes()
         $extDefinition = $container->getDefinition('form.extension');
 
         $this->assertEquals(
-            (new Definition(ServiceLocator::class, array(array(
+            (new Definition(ServiceLocator::class, [[
                 __CLASS__.'_Type1' => new ServiceClosureArgument(new Reference('my.type1')),
                 __CLASS__.'_Type2' => new ServiceClosureArgument(new Reference('my.type2')),
-            ))))->addTag('container.service_locator')->setPublic(false),
+            ]]))->addTag('container.service_locator')->setPublic(false),
             $extDefinition->getArgument(0)
         );
     }
@@ -80,10 +80,10 @@ public function testAddTaggedTypesToDebugCommand()
         $cmdDefinition = $container->getDefinition('console.command.form_debug');
 
         $this->assertEquals(
-            array(
+            [
                 'Symfony\Component\Form\Extension\Core\Type',
                 __NAMESPACE__,
-            ),
+            ],
             $cmdDefinition->getArgument(1)
         );
     }
@@ -112,44 +112,44 @@ public function testAddTaggedTypeExtensions(array $extensions, array $expectedRe
      */
     public function addTaggedTypeExtensionsDataProvider()
     {
-        return array(
-            array(
-                array(
-                    'my.type_extension1' => array('extended_type' => 'type1'),
-                    'my.type_extension2' => array('extended_type' => 'type1'),
-                    'my.type_extension3' => array('extended_type' => 'type2'),
-                ),
-                array(
-                    'type1' => new IteratorArgument(array(
+        return [
+            [
+                [
+                    'my.type_extension1' => ['extended_type' => 'type1'],
+                    'my.type_extension2' => ['extended_type' => 'type1'],
+                    'my.type_extension3' => ['extended_type' => 'type2'],
+                ],
+                [
+                    'type1' => new IteratorArgument([
                         new Reference('my.type_extension1'),
                         new Reference('my.type_extension2'),
-                    )),
-                    'type2' => new IteratorArgument(array(new Reference('my.type_extension3'))),
-                ),
-            ),
-            array(
-                array(
-                    'my.type_extension1' => array('extended_type' => 'type1', 'priority' => 1),
-                    'my.type_extension2' => array('extended_type' => 'type1', 'priority' => 2),
-                    'my.type_extension3' => array('extended_type' => 'type1', 'priority' => -1),
-                    'my.type_extension4' => array('extended_type' => 'type2', 'priority' => 2),
-                    'my.type_extension5' => array('extended_type' => 'type2', 'priority' => 1),
-                    'my.type_extension6' => array('extended_type' => 'type2', 'priority' => 1),
-                ),
-                array(
-                    'type1' => new IteratorArgument(array(
+                    ]),
+                    'type2' => new IteratorArgument([new Reference('my.type_extension3')]),
+                ],
+            ],
+            [
+                [
+                    'my.type_extension1' => ['extended_type' => 'type1', 'priority' => 1],
+                    'my.type_extension2' => ['extended_type' => 'type1', 'priority' => 2],
+                    'my.type_extension3' => ['extended_type' => 'type1', 'priority' => -1],
+                    'my.type_extension4' => ['extended_type' => 'type2', 'priority' => 2],
+                    'my.type_extension5' => ['extended_type' => 'type2', 'priority' => 1],
+                    'my.type_extension6' => ['extended_type' => 'type2', 'priority' => 1],
+                ],
+                [
+                    'type1' => new IteratorArgument([
                         new Reference('my.type_extension2'),
                         new Reference('my.type_extension1'),
                         new Reference('my.type_extension3'),
-                    )),
-                    'type2' => new IteratorArgument(array(
+                    ]),
+                    'type2' => new IteratorArgument([
                         new Reference('my.type_extension4'),
                         new Reference('my.type_extension5'),
                         new Reference('my.type_extension6'),
-                    )),
-                ),
-            ),
-        );
+                    ]),
+                ],
+            ],
+        ];
     }
 
     /**
@@ -186,10 +186,10 @@ public function testAddTaggedGuessers()
         $extDefinition = $container->getDefinition('form.extension');
 
         $this->assertEquals(
-            new IteratorArgument(array(
+            new IteratorArgument([
                 new Reference('my.guesser1'),
                 new Reference('my.guesser2'),
-            )),
+            ]),
             $extDefinition->getArgument(2)
         );
     }
@@ -263,11 +263,11 @@ private function createDebugCommandDefinition()
     {
         $definition = new Definition('Symfony\Component\Form\Command\DebugCommand');
         $definition->setPublic(true);
-        $definition->setArguments(array(
+        $definition->setArguments([
             $formRegistry = $this->getMockBuilder(FormRegistryInterface::class)->getMock(),
-            array(),
-            array('Symfony\Component\Form\Extension\Core\Type'),
-        ));
+            [],
+            ['Symfony\Component\Form\Extension\Core\Type'],
+        ]);
 
         return $definition;
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
index 8632b4c6db803..901af61ce94fb 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
@@ -46,8 +46,8 @@ protected function setUp()
     private function getPropertyPath($path)
     {
         return $this->getMockBuilder('Symfony\Component\PropertyAccess\PropertyPath')
-            ->setConstructorArgs(array($path))
-            ->setMethods(array('getValue', 'setValue'))
+            ->setConstructorArgs([$path])
+            ->setMethods(['getValue', 'setValue'])
             ->getMock();
     }
 
@@ -61,8 +61,8 @@ private function getPropertyPath($path)
     private function getForm(FormConfigInterface $config, $synchronized = true, $submitted = true)
     {
         $form = $this->getMockBuilder('Symfony\Component\Form\Form')
-            ->setConstructorArgs(array($config))
-            ->setMethods(array('isSynchronized', 'isSubmitted'))
+            ->setConstructorArgs([$config])
+            ->setMethods(['isSynchronized', 'isSubmitted'])
             ->getMock();
 
         $form->expects($this->any())
@@ -92,7 +92,7 @@ public function testMapDataToFormsPassesObjectRefIfByReference()
         $config->setPropertyPath($propertyPath);
         $form = $this->getForm($config);
 
-        $this->mapper->mapDataToForms($car, array($form));
+        $this->mapper->mapDataToForms($car, [$form]);
 
         // Can't use isIdentical() above because mocks always clone their
         // arguments which can't be disabled in PHPUnit 3.6
@@ -115,7 +115,7 @@ public function testMapDataToFormsPassesObjectCloneIfNotByReference()
         $config->setPropertyPath($propertyPath);
         $form = $this->getForm($config);
 
-        $this->mapper->mapDataToForms($car, array($form));
+        $this->mapper->mapDataToForms($car, [$form]);
 
         $this->assertNotSame($engine, $form->getData());
         $this->assertEquals($engine, $form->getData());
@@ -131,7 +131,7 @@ public function testMapDataToFormsIgnoresEmptyPropertyPath()
 
         $this->assertNull($form->getPropertyPath());
 
-        $this->mapper->mapDataToForms($car, array($form));
+        $this->mapper->mapDataToForms($car, [$form]);
 
         $this->assertNull($form->getData());
     }
@@ -150,7 +150,7 @@ public function testMapDataToFormsIgnoresUnmapped()
         $config->setPropertyPath($propertyPath);
         $form = $this->getForm($config);
 
-        $this->mapper->mapDataToForms($car, array($form));
+        $this->mapper->mapDataToForms($car, [$form]);
 
         $this->assertNull($form->getData());
     }
@@ -169,15 +169,15 @@ public function testMapDataToFormsSetsDefaultDataIfPassedDataIsNull()
         $config->setData($default);
 
         $form = $this->getMockBuilder('Symfony\Component\Form\Form')
-            ->setConstructorArgs(array($config))
-            ->setMethods(array('setData'))
+            ->setConstructorArgs([$config])
+            ->setMethods(['setData'])
             ->getMock();
 
         $form->expects($this->once())
             ->method('setData')
             ->with($default);
 
-        $this->mapper->mapDataToForms(null, array($form));
+        $this->mapper->mapDataToForms(null, [$form]);
     }
 
     public function testMapDataToFormsSetsDefaultDataIfPassedDataIsEmptyArray()
@@ -194,15 +194,15 @@ public function testMapDataToFormsSetsDefaultDataIfPassedDataIsEmptyArray()
         $config->setData($default);
 
         $form = $this->getMockBuilder('Symfony\Component\Form\Form')
-            ->setConstructorArgs(array($config))
-            ->setMethods(array('setData'))
+            ->setConstructorArgs([$config])
+            ->setMethods(['setData'])
             ->getMock();
 
         $form->expects($this->once())
             ->method('setData')
             ->with($default);
 
-        $this->mapper->mapDataToForms(array(), array($form));
+        $this->mapper->mapDataToForms([], [$form]);
     }
 
     public function testMapFormsToDataWritesBackIfNotByReference()
@@ -221,7 +221,7 @@ public function testMapFormsToDataWritesBackIfNotByReference()
         $config->setData($engine);
         $form = $this->getForm($config);
 
-        $this->mapper->mapFormsToData(array($form), $car);
+        $this->mapper->mapFormsToData([$form], $car);
     }
 
     public function testMapFormsToDataWritesBackIfByReferenceButNoReference()
@@ -240,7 +240,7 @@ public function testMapFormsToDataWritesBackIfByReferenceButNoReference()
         $config->setData($engine);
         $form = $this->getForm($config);
 
-        $this->mapper->mapFormsToData(array($form), $car);
+        $this->mapper->mapFormsToData([$form], $car);
     }
 
     public function testMapFormsToDataWritesBackIfByReferenceAndReference()
@@ -264,7 +264,7 @@ public function testMapFormsToDataWritesBackIfByReferenceAndReference()
         $config->setData($engine);
         $form = $this->getForm($config);
 
-        $this->mapper->mapFormsToData(array($form), $car);
+        $this->mapper->mapFormsToData([$form], $car);
     }
 
     public function testMapFormsToDataIgnoresUnmapped()
@@ -283,7 +283,7 @@ public function testMapFormsToDataIgnoresUnmapped()
         $config->setMapped(false);
         $form = $this->getForm($config);
 
-        $this->mapper->mapFormsToData(array($form), $car);
+        $this->mapper->mapFormsToData([$form], $car);
     }
 
     public function testMapFormsToDataIgnoresUnsubmittedForms()
@@ -301,7 +301,7 @@ public function testMapFormsToDataIgnoresUnsubmittedForms()
         $config->setData($engine);
         $form = $this->getForm($config, true, false);
 
-        $this->mapper->mapFormsToData(array($form), $car);
+        $this->mapper->mapFormsToData([$form], $car);
     }
 
     public function testMapFormsToDataIgnoresEmptyData()
@@ -318,7 +318,7 @@ public function testMapFormsToDataIgnoresEmptyData()
         $config->setData(null);
         $form = $this->getForm($config);
 
-        $this->mapper->mapFormsToData(array($form), $car);
+        $this->mapper->mapFormsToData([$form], $car);
     }
 
     public function testMapFormsToDataIgnoresUnsynchronized()
@@ -336,7 +336,7 @@ public function testMapFormsToDataIgnoresUnsynchronized()
         $config->setData($engine);
         $form = $this->getForm($config, false);
 
-        $this->mapper->mapFormsToData(array($form), $car);
+        $this->mapper->mapFormsToData([$form], $car);
     }
 
     public function testMapFormsToDataIgnoresDisabled()
@@ -355,7 +355,7 @@ public function testMapFormsToDataIgnoresDisabled()
         $config->setDisabled(true);
         $form = $this->getForm($config);
 
-        $this->mapper->mapFormsToData(array($form), $car);
+        $this->mapper->mapFormsToData([$form], $car);
     }
 
     /**
@@ -363,7 +363,7 @@ public function testMapFormsToDataIgnoresDisabled()
      */
     public function testMapFormsToDataDoesNotChangeEqualDateTimeInstance($date)
     {
-        $article = array();
+        $article = [];
         $publishedAt = $date;
         $article['publishedAt'] = clone $publishedAt;
         $propertyPath = $this->getPropertyPath('[publishedAt]');
@@ -382,14 +382,14 @@ public function testMapFormsToDataDoesNotChangeEqualDateTimeInstance($date)
         $config->setData($publishedAt);
         $form = $this->getForm($config);
 
-        $this->mapper->mapFormsToData(array($form), $article);
+        $this->mapper->mapFormsToData([$form], $article);
     }
 
     public function provideDate()
     {
-        return array(
-            array(new \DateTime()),
-            array(new \DateTimeImmutable()),
-        );
+        return [
+            [new \DateTime()],
+            [new \DateTimeImmutable()],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php
index 220a367655216..4f11c7f7966d1 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php
@@ -20,10 +20,10 @@ class ArrayToPartsTransformerTest extends TestCase
 
     protected function setUp()
     {
-        $this->transformer = new ArrayToPartsTransformer(array(
-            'first' => array('a', 'b', 'c'),
-            'second' => array('d', 'e', 'f'),
-        ));
+        $this->transformer = new ArrayToPartsTransformer([
+            'first' => ['a', 'b', 'c'],
+            'second' => ['d', 'e', 'f'],
+        ]);
     }
 
     protected function tearDown()
@@ -33,37 +33,37 @@ protected function tearDown()
 
     public function testTransform()
     {
-        $input = array(
+        $input = [
             'a' => '1',
             'b' => '2',
             'c' => '3',
             'd' => '4',
             'e' => '5',
             'f' => '6',
-        );
+        ];
 
-        $output = array(
-            'first' => array(
+        $output = [
+            'first' => [
                 'a' => '1',
                 'b' => '2',
                 'c' => '3',
-            ),
-            'second' => array(
+            ],
+            'second' => [
                 'd' => '4',
                 'e' => '5',
                 'f' => '6',
-            ),
-        );
+            ],
+        ];
 
         $this->assertSame($output, $this->transformer->transform($input));
     }
 
     public function testTransformEmpty()
     {
-        $output = array(
+        $output = [
             'first' => null,
             'second' => null,
-        );
+        ];
 
         $this->assertSame($output, $this->transformer->transform(null));
     }
@@ -78,47 +78,47 @@ public function testTransformRequiresArray()
 
     public function testReverseTransform()
     {
-        $input = array(
-            'first' => array(
+        $input = [
+            'first' => [
                 'a' => '1',
                 'b' => '2',
                 'c' => '3',
-            ),
-            'second' => array(
+            ],
+            'second' => [
                 'd' => '4',
                 'e' => '5',
                 'f' => '6',
-            ),
-        );
+            ],
+        ];
 
-        $output = array(
+        $output = [
             'a' => '1',
             'b' => '2',
             'c' => '3',
             'd' => '4',
             'e' => '5',
             'f' => '6',
-        );
+        ];
 
         $this->assertSame($output, $this->transformer->reverseTransform($input));
     }
 
     public function testReverseTransformCompletelyEmpty()
     {
-        $input = array(
+        $input = [
             'first' => '',
             'second' => '',
-        );
+        ];
 
         $this->assertNull($this->transformer->reverseTransform($input));
     }
 
     public function testReverseTransformCompletelyNull()
     {
-        $input = array(
+        $input = [
             'first' => null,
             'second' => null,
-        );
+        ];
 
         $this->assertNull($this->transformer->reverseTransform($input));
     }
@@ -128,14 +128,14 @@ public function testReverseTransformCompletelyNull()
      */
     public function testReverseTransformPartiallyNull()
     {
-        $input = array(
-            'first' => array(
+        $input = [
+            'first' => [
                 'a' => '1',
                 'b' => '2',
                 'c' => '3',
-            ),
+            ],
             'second' => null,
-        );
+        ];
 
         $this->transformer->reverseTransform($input);
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php
index 385accd7f369c..283dd4a81d1bc 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php
@@ -21,7 +21,7 @@ class BaseDateTimeTransformerTest extends TestCase
      */
     public function testConstructFailsIfInputTimezoneIsInvalid()
     {
-        $this->getMockBuilder('Symfony\Component\Form\Extension\Core\DataTransformer\BaseDateTimeTransformer')->setConstructorArgs(array('this_timezone_does_not_exist'))->getMock();
+        $this->getMockBuilder('Symfony\Component\Form\Extension\Core\DataTransformer\BaseDateTimeTransformer')->setConstructorArgs(['this_timezone_does_not_exist'])->getMock();
     }
 
     /**
@@ -30,6 +30,6 @@ public function testConstructFailsIfInputTimezoneIsInvalid()
      */
     public function testConstructFailsIfOutputTimezoneIsInvalid()
     {
-        $this->getMockBuilder('Symfony\Component\Form\Extension\Core\DataTransformer\BaseDateTimeTransformer')->setConstructorArgs(array(null, 'that_timezone_does_not_exist'))->getMock();
+        $this->getMockBuilder('Symfony\Component\Form\Extension\Core\DataTransformer\BaseDateTimeTransformer')->setConstructorArgs([null, 'that_timezone_does_not_exist'])->getMock();
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php
index cf5dbaa6af7dc..da41a89729512 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php
@@ -22,8 +22,8 @@ class ChoiceToValueTransformerTest extends TestCase
 
     protected function setUp()
     {
-        $list = new ArrayChoiceList(array('', false, 'X', true));
-        $listWithNull = new ArrayChoiceList(array('', false, 'X', null));
+        $list = new ArrayChoiceList(['', false, 'X', true]);
+        $listWithNull = new ArrayChoiceList(['', false, 'X', null]);
 
         $this->transformer = new ChoiceToValueTransformer($list);
         $this->transformerWithNull = new ChoiceToValueTransformer($listWithNull);
@@ -37,13 +37,13 @@ protected function tearDown()
 
     public function transformProvider()
     {
-        return array(
+        return [
             // more extensive test set can be found in FormUtilTest
-            array('', '', '', '0'),
-            array(false, '0', false, '1'),
-            array('X', 'X', 'X', '2'),
-            array(true, '1', null, '3'),
-        );
+            ['', '', '', '0'],
+            [false, '0', false, '1'],
+            ['X', 'X', 'X', '2'],
+            [true, '1', null, '3'],
+        ];
     }
 
     /**
@@ -57,14 +57,14 @@ public function testTransform($in, $out, $inWithNull, $outWithNull)
 
     public function reverseTransformProvider()
     {
-        return array(
+        return [
             // values are expected to be valid choice keys already and stay
             // the same
-            array('', '', '0', ''),
-            array('0', false, '1', false),
-            array('X', 'X', '2', 'X'),
-            array('1', true, '3', null),
-        );
+            ['', '', '0', ''],
+            ['0', false, '1', false],
+            ['X', 'X', '2', 'X'],
+            ['1', true, '3', null],
+        ];
     }
 
     /**
@@ -78,12 +78,12 @@ public function testReverseTransform($in, $out, $inWithNull, $outWithNull)
 
     public function reverseTransformExpectsStringOrNullProvider()
     {
-        return array(
-            array(0),
-            array(true),
-            array(false),
-            array(array()),
-        );
+        return [
+            [0],
+            [true],
+            [false],
+            [[]],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php
index aa4936f82263e..9e7a666ba8b2e 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php
@@ -22,8 +22,8 @@ class ChoicesToValuesTransformerTest extends TestCase
 
     protected function setUp()
     {
-        $list = new ArrayChoiceList(array('', false, 'X'));
-        $listWithNull = new ArrayChoiceList(array('', false, 'X', null));
+        $list = new ArrayChoiceList(['', false, 'X']);
+        $listWithNull = new ArrayChoiceList(['', false, 'X', null]);
 
         $this->transformer = new ChoicesToValuesTransformer($list);
         $this->transformerWithNull = new ChoicesToValuesTransformer($listWithNull);
@@ -37,20 +37,20 @@ protected function tearDown()
 
     public function testTransform()
     {
-        $in = array('', false, 'X');
-        $out = array('', '0', 'X');
+        $in = ['', false, 'X'];
+        $out = ['', '0', 'X'];
 
         $this->assertSame($out, $this->transformer->transform($in));
 
         $in[] = null;
-        $outWithNull = array('0', '1', '2', '3');
+        $outWithNull = ['0', '1', '2', '3'];
 
         $this->assertSame($outWithNull, $this->transformerWithNull->transform($in));
     }
 
     public function testTransformNull()
     {
-        $this->assertSame(array(), $this->transformer->transform(null));
+        $this->assertSame([], $this->transformer->transform(null));
     }
 
     /**
@@ -64,12 +64,12 @@ public function testTransformExpectsArray()
     public function testReverseTransform()
     {
         // values are expected to be valid choices and stay the same
-        $in = array('', '0', 'X');
-        $out = array('', false, 'X');
+        $in = ['', '0', 'X'];
+        $out = ['', false, 'X'];
 
         $this->assertSame($out, $this->transformer->reverseTransform($in));
         // values are expected to be valid choices and stay the same
-        $inWithNull = array('0', '1', '2', '3');
+        $inWithNull = ['0', '1', '2', '3'];
         $out[] = null;
 
         $this->assertSame($out, $this->transformerWithNull->reverseTransform($inWithNull));
@@ -77,8 +77,8 @@ public function testReverseTransform()
 
     public function testReverseTransformNull()
     {
-        $this->assertSame(array(), $this->transformer->reverseTransform(null));
-        $this->assertSame(array(), $this->transformerWithNull->reverseTransform(null));
+        $this->assertSame([], $this->transformer->reverseTransform(null));
+        $this->assertSame([], $this->transformerWithNull->reverseTransform(null));
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DataTransformerChainTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DataTransformerChainTest.php
index 16302b3483692..f62d3c52110f1 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DataTransformerChainTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DataTransformerChainTest.php
@@ -29,7 +29,7 @@ public function testTransform()
             ->with($this->identicalTo('bar'))
             ->will($this->returnValue('baz'));
 
-        $chain = new DataTransformerChain(array($transformer1, $transformer2));
+        $chain = new DataTransformerChain([$transformer1, $transformer2]);
 
         $this->assertEquals('baz', $chain->transform('foo'));
     }
@@ -47,7 +47,7 @@ public function testReverseTransform()
             ->with($this->identicalTo('bar'))
             ->will($this->returnValue('baz'));
 
-        $chain = new DataTransformerChain(array($transformer1, $transformer2));
+        $chain = new DataTransformerChain([$transformer1, $transformer2]);
 
         $this->assertEquals('baz', $chain->reverseTransform('foo'));
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateIntervalToArrayTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateIntervalToArrayTransformerTest.php
index a75fe1145c57e..ead142709d75a 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateIntervalToArrayTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateIntervalToArrayTransformerTest.php
@@ -24,7 +24,7 @@ public function testTransform()
     {
         $transformer = new DateIntervalToArrayTransformer();
         $input = new \DateInterval('P1Y2M3DT4H5M6S');
-        $output = array(
+        $output = [
             'years' => '1',
             'months' => '2',
             'days' => '3',
@@ -32,14 +32,14 @@ public function testTransform()
             'minutes' => '5',
             'seconds' => '6',
             'invert' => false,
-        );
+        ];
         $this->assertSame($output, $transformer->transform($input));
     }
 
     public function testTransformEmpty()
     {
         $transformer = new DateIntervalToArrayTransformer();
-        $output = array(
+        $output = [
             'years' => '',
             'months' => '',
             'days' => '',
@@ -47,43 +47,43 @@ public function testTransformEmpty()
             'minutes' => '',
             'seconds' => '',
             'invert' => false,
-        );
+        ];
         $this->assertSame($output, $transformer->transform(null));
     }
 
     public function testTransformEmptyWithFields()
     {
-        $transformer = new DateIntervalToArrayTransformer(array('years', 'weeks', 'minutes', 'seconds'));
-        $output = array(
+        $transformer = new DateIntervalToArrayTransformer(['years', 'weeks', 'minutes', 'seconds']);
+        $output = [
             'years' => '',
             'weeks' => '',
             'minutes' => '',
             'seconds' => '',
-        );
+        ];
         $this->assertSame($output, $transformer->transform(null));
     }
 
     public function testTransformWithFields()
     {
-        $transformer = new DateIntervalToArrayTransformer(array('years', 'minutes', 'seconds'));
+        $transformer = new DateIntervalToArrayTransformer(['years', 'minutes', 'seconds']);
         $input = new \DateInterval('P1Y2M3DT4H5M6S');
-        $output = array(
+        $output = [
             'years' => '1',
             'minutes' => '5',
             'seconds' => '6',
-        );
+        ];
         $this->assertSame($output, $transformer->transform($input));
     }
 
     public function testTransformWithWeek()
     {
-        $transformer = new DateIntervalToArrayTransformer(array('weeks', 'minutes', 'seconds'));
+        $transformer = new DateIntervalToArrayTransformer(['weeks', 'minutes', 'seconds']);
         $input = new \DateInterval('P1Y2M3WT4H5M6S');
-        $output = array(
+        $output = [
             'weeks' => '3',
             'minutes' => '5',
             'seconds' => '6',
-        );
+        ];
         $input = $transformer->transform($input);
         ksort($input);
         ksort($output);
@@ -92,13 +92,13 @@ public function testTransformWithWeek()
 
     public function testTransformWithZeroWeek()
     {
-        $transformer = new DateIntervalToArrayTransformer(array('weeks', 'minutes', 'seconds'));
+        $transformer = new DateIntervalToArrayTransformer(['weeks', 'minutes', 'seconds']);
         $input = new \DateInterval('P1Y2M0WT4H5M6S');
-        $output = array(
+        $output = [
             'weeks' => '0',
             'minutes' => '5',
             'seconds' => '6',
-        );
+        ];
         $input = $transformer->transform($input);
         ksort($input);
         ksort($output);
@@ -107,13 +107,13 @@ public function testTransformWithZeroWeek()
 
     public function testTransformDaysToWeeks()
     {
-        $transformer = new DateIntervalToArrayTransformer(array('weeks', 'minutes', 'seconds'));
+        $transformer = new DateIntervalToArrayTransformer(['weeks', 'minutes', 'seconds']);
         $input = new \DateInterval('P1Y2M23DT4H5M6S');
-        $output = array(
+        $output = [
             'weeks' => '3',
             'minutes' => '5',
             'seconds' => '6',
-        );
+        ];
         $input = $transformer->transform($input);
         ksort($input);
         ksort($output);
@@ -122,25 +122,25 @@ public function testTransformDaysToWeeks()
 
     public function testTransformDaysNotOverflowingToWeeks()
     {
-        $transformer = new DateIntervalToArrayTransformer(array('days', 'minutes', 'seconds'));
+        $transformer = new DateIntervalToArrayTransformer(['days', 'minutes', 'seconds']);
         $input = new \DateInterval('P1Y2M23DT4H5M6S');
-        $output = array(
+        $output = [
             'days' => '23',
             'minutes' => '5',
             'seconds' => '6',
-        );
+        ];
         $this->assertSame($output, $transformer->transform($input));
     }
 
     public function testTransformWithInvert()
     {
-        $transformer = new DateIntervalToArrayTransformer(array('years', 'invert'));
+        $transformer = new DateIntervalToArrayTransformer(['years', 'invert']);
         $input = new \DateInterval('P1Y');
         $input->invert = 1;
-        $output = array(
+        $output = [
             'years' => '1',
             'invert' => true,
-        );
+        ];
         $this->assertSame($output, $transformer->transform($input));
     }
 
@@ -148,7 +148,7 @@ public function testTransformWithPadding()
     {
         $transformer = new DateIntervalToArrayTransformer(null, true);
         $input = new \DateInterval('P1Y2M3DT4H5M6S');
-        $output = array(
+        $output = [
             'years' => '01',
             'months' => '02',
             'days' => '03',
@@ -156,19 +156,19 @@ public function testTransformWithPadding()
             'minutes' => '05',
             'seconds' => '06',
             'invert' => false,
-        );
+        ];
         $this->assertSame($output, $transformer->transform($input));
     }
 
     public function testTransformWithFieldsAndPadding()
     {
-        $transformer = new DateIntervalToArrayTransformer(array('years', 'minutes', 'seconds'), true);
+        $transformer = new DateIntervalToArrayTransformer(['years', 'minutes', 'seconds'], true);
         $input = new \DateInterval('P1Y2M3DT4H5M6S');
-        $output = array(
+        $output = [
             'years' => '01',
             'minutes' => '05',
             'seconds' => '06',
-        );
+        ];
         $this->assertSame($output, $transformer->transform($input));
     }
 
@@ -183,19 +183,19 @@ public function testReverseTransformRequiresDateTime()
     public function testReverseTransformWithUnsetFields()
     {
         $transformer = new DateIntervalToArrayTransformer();
-        $input = array('years' => '1');
+        $input = ['years' => '1'];
         $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(TransformationFailedException::class);
         $transformer->reverseTransform($input);
     }
 
     public function testReverseTransformWithEmptyFields()
     {
-        $transformer = new DateIntervalToArrayTransformer(array('years', 'minutes', 'seconds'));
-        $input = array(
+        $transformer = new DateIntervalToArrayTransformer(['years', 'minutes', 'seconds']);
+        $input = [
             'years' => '1',
             'minutes' => '',
             'seconds' => '6',
-        );
+        ];
         if (method_exists($this, 'expectException')) {
             $this->expectException(TransformationFailedException::class);
             $this->expectExceptionMessage('This amount of "minutes" is invalid');
@@ -207,10 +207,10 @@ public function testReverseTransformWithEmptyFields()
 
     public function testReverseTransformWithWrongInvertType()
     {
-        $transformer = new DateIntervalToArrayTransformer(array('invert'));
-        $input = array(
+        $transformer = new DateIntervalToArrayTransformer(['invert']);
+        $input = [
             'invert' => '1',
-        );
+        ];
         if (method_exists($this, 'expectException')) {
             $this->expectException(TransformationFailedException::class);
             $this->expectExceptionMessage('The value of "invert" must be boolean');
@@ -223,7 +223,7 @@ public function testReverseTransformWithWrongInvertType()
     public function testReverseTransform()
     {
         $transformer = new DateIntervalToArrayTransformer();
-        $input = array(
+        $input = [
             'years' => '1',
             'months' => '2',
             'days' => '3',
@@ -231,7 +231,7 @@ public function testReverseTransform()
             'minutes' => '5',
             'seconds' => '6',
             'invert' => false,
-        );
+        ];
         $output = new \DateInterval('P01Y02M03DT04H05M06S');
         $this->assertDateIntervalEquals($output, $transformer->reverseTransform($input));
     }
@@ -239,28 +239,28 @@ public function testReverseTransform()
     public function testReverseTransformWithWeek()
     {
         $transformer = new DateIntervalToArrayTransformer(
-            array('years', 'months', 'weeks', 'hours', 'minutes', 'seconds')
+            ['years', 'months', 'weeks', 'hours', 'minutes', 'seconds']
         );
-        $input = array(
+        $input = [
             'years' => '1',
             'months' => '2',
             'weeks' => '3',
             'hours' => '4',
             'minutes' => '5',
             'seconds' => '6',
-        );
+        ];
         $output = new \DateInterval('P1Y2M21DT4H5M6S');
         $this->assertDateIntervalEquals($output, $transformer->reverseTransform($input));
     }
 
     public function testReverseTransformWithFields()
     {
-        $transformer = new DateIntervalToArrayTransformer(array('years', 'minutes', 'seconds'));
-        $input = array(
+        $transformer = new DateIntervalToArrayTransformer(['years', 'minutes', 'seconds']);
+        $input = [
             'years' => '1',
             'minutes' => '5',
             'seconds' => '6',
-        );
+        ];
         $output = new \DateInterval('P1Y0M0DT0H5M6S');
         $this->assertDateIntervalEquals($output, $transformer->reverseTransform($input));
     }
@@ -268,17 +268,17 @@ public function testReverseTransformWithFields()
     public function testBothTransformsWithWeek()
     {
         $transformer = new DateIntervalToArrayTransformer(
-            array('years', 'months', 'weeks', 'hours', 'minutes', 'seconds')
+            ['years', 'months', 'weeks', 'hours', 'minutes', 'seconds']
         );
         $interval = new \DateInterval('P1Y2M21DT4H5M6S');
-        $array = array(
+        $array = [
             'years' => '1',
             'months' => '2',
             'weeks' => '3',
             'hours' => '4',
             'minutes' => '5',
             'seconds' => '6',
-        );
+        ];
         $input = $transformer->transform($interval);
         ksort($input);
         ksort($array);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateIntervalToStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateIntervalToStringTransformerTest.php
index 389e0c161d04a..84b037838c65f 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateIntervalToStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateIntervalToStringTransformerTest.php
@@ -22,36 +22,36 @@ class DateIntervalToStringTransformerTest extends DateIntervalTestCase
 {
     public function dataProviderISO()
     {
-        $data = array(
-            array('P%YY%MM%DDT%HH%IM%SS', 'P00Y00M00DT00H00M00S', 'PT0S'),
-            array('P%yY%mM%dDT%hH%iM%sS', 'P0Y0M0DT0H0M0S', 'PT0S'),
-            array('P%yY%mM%dDT%hH%iM%sS', 'P10Y2M3DT16H5M6S', 'P10Y2M3DT16H5M6S'),
-            array('P%yY%mM%dDT%hH%iM', 'P10Y2M3DT16H5M', 'P10Y2M3DT16H5M'),
-            array('P%yY%mM%dDT%hH', 'P10Y2M3DT16H', 'P10Y2M3DT16H'),
-            array('P%yY%mM%dD', 'P10Y2M3D', 'P10Y2M3DT0H'),
-        );
+        $data = [
+            ['P%YY%MM%DDT%HH%IM%SS', 'P00Y00M00DT00H00M00S', 'PT0S'],
+            ['P%yY%mM%dDT%hH%iM%sS', 'P0Y0M0DT0H0M0S', 'PT0S'],
+            ['P%yY%mM%dDT%hH%iM%sS', 'P10Y2M3DT16H5M6S', 'P10Y2M3DT16H5M6S'],
+            ['P%yY%mM%dDT%hH%iM', 'P10Y2M3DT16H5M', 'P10Y2M3DT16H5M'],
+            ['P%yY%mM%dDT%hH', 'P10Y2M3DT16H', 'P10Y2M3DT16H'],
+            ['P%yY%mM%dD', 'P10Y2M3D', 'P10Y2M3DT0H'],
+        ];
 
         return $data;
     }
 
     public function dataProviderDate()
     {
-        $data = array(
-            array(
+        $data = [
+            [
                 '%y years %m months %d days %h hours %i minutes %s seconds',
                 '10 years 2 months 3 days 16 hours 5 minutes 6 seconds',
                 'P10Y2M3DT16H5M6S',
-            ),
-            array(
+            ],
+            [
                 '%y years %m months %d days %h hours %i minutes',
                 '10 years 2 months 3 days 16 hours 5 minutes',
                 'P10Y2M3DT16H5M',
-            ),
-            array('%y years %m months %d days %h hours', '10 years 2 months 3 days 16 hours', 'P10Y2M3DT16H'),
-            array('%y years %m months %d days', '10 years 2 months 3 days', 'P10Y2M3D'),
-            array('%y years %m months', '10 years 2 months', 'P10Y2M'),
-            array('%y year', '1 year', 'P1Y'),
-        );
+            ],
+            ['%y years %m months %d days %h hours', '10 years 2 months 3 days 16 hours', 'P10Y2M3DT16H'],
+            ['%y years %m months %d days', '10 years 2 months 3 days', 'P10Y2M3D'],
+            ['%y years %m months', '10 years 2 months', 'P10Y2M'],
+            ['%y year', '1 year', 'P1Y'],
+        ];
 
         return $data;
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php
index e9a0efb3a807a..2669d3d4af427 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php
@@ -22,14 +22,14 @@ public function testTransform()
 
         $input = new \DateTime('2010-02-03 04:05:06 UTC');
 
-        $output = array(
+        $output = [
             'year' => '2010',
             'month' => '2',
             'day' => '3',
             'hour' => '4',
             'minute' => '5',
             'second' => '6',
-        );
+        ];
 
         $this->assertSame($output, $transformer->transform($input));
     }
@@ -38,43 +38,43 @@ public function testTransformEmpty()
     {
         $transformer = new DateTimeToArrayTransformer();
 
-        $output = array(
+        $output = [
             'year' => '',
             'month' => '',
             'day' => '',
             'hour' => '',
             'minute' => '',
             'second' => '',
-        );
+        ];
 
         $this->assertSame($output, $transformer->transform(null));
     }
 
     public function testTransformEmptyWithFields()
     {
-        $transformer = new DateTimeToArrayTransformer(null, null, array('year', 'minute', 'second'));
+        $transformer = new DateTimeToArrayTransformer(null, null, ['year', 'minute', 'second']);
 
-        $output = array(
+        $output = [
             'year' => '',
             'minute' => '',
             'second' => '',
-        );
+        ];
 
         $this->assertSame($output, $transformer->transform(null));
     }
 
     public function testTransformWithFields()
     {
-        $transformer = new DateTimeToArrayTransformer('UTC', 'UTC', array('year', 'month', 'minute', 'second'));
+        $transformer = new DateTimeToArrayTransformer('UTC', 'UTC', ['year', 'month', 'minute', 'second']);
 
         $input = new \DateTime('2010-02-03 04:05:06 UTC');
 
-        $output = array(
+        $output = [
             'year' => '2010',
             'month' => '2',
             'minute' => '5',
             'second' => '6',
-        );
+        ];
 
         $this->assertSame($output, $transformer->transform($input));
     }
@@ -85,14 +85,14 @@ public function testTransformWithPadding()
 
         $input = new \DateTime('2010-02-03 04:05:06 UTC');
 
-        $output = array(
+        $output = [
             'year' => '2010',
             'month' => '02',
             'day' => '03',
             'hour' => '04',
             'minute' => '05',
             'second' => '06',
-        );
+        ];
 
         $this->assertSame($output, $transformer->transform($input));
     }
@@ -105,14 +105,14 @@ public function testTransformDifferentTimezones()
 
         $dateTime = new \DateTime('2010-02-03 04:05:06 America/New_York');
         $dateTime->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
-        $output = array(
+        $output = [
             'year' => (string) (int) $dateTime->format('Y'),
             'month' => (string) (int) $dateTime->format('m'),
             'day' => (string) (int) $dateTime->format('d'),
             'hour' => (string) (int) $dateTime->format('H'),
             'minute' => (string) (int) $dateTime->format('i'),
             'second' => (string) (int) $dateTime->format('s'),
-        );
+        ];
 
         $this->assertSame($output, $transformer->transform($input));
     }
@@ -125,14 +125,14 @@ public function testTransformDateTimeImmutable()
 
         $dateTime = new \DateTimeImmutable('2010-02-03 04:05:06 America/New_York');
         $dateTime = $dateTime->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
-        $output = array(
+        $output = [
             'year' => (string) (int) $dateTime->format('Y'),
             'month' => (string) (int) $dateTime->format('m'),
             'day' => (string) (int) $dateTime->format('d'),
             'hour' => (string) (int) $dateTime->format('H'),
             'minute' => (string) (int) $dateTime->format('i'),
             'second' => (string) (int) $dateTime->format('s'),
-        );
+        ];
 
         $this->assertSame($output, $transformer->transform($input));
     }
@@ -150,14 +150,14 @@ public function testReverseTransform()
     {
         $transformer = new DateTimeToArrayTransformer('UTC', 'UTC');
 
-        $input = array(
+        $input = [
             'year' => '2010',
             'month' => '2',
             'day' => '3',
             'hour' => '4',
             'minute' => '5',
             'second' => '6',
-        );
+        ];
 
         $output = new \DateTime('2010-02-03 04:05:06 UTC');
 
@@ -168,14 +168,14 @@ public function testReverseTransformWithSomeZero()
     {
         $transformer = new DateTimeToArrayTransformer('UTC', 'UTC');
 
-        $input = array(
+        $input = [
             'year' => '2010',
             'month' => '2',
             'day' => '3',
             'hour' => '4',
             'minute' => '0',
             'second' => '0',
-        );
+        ];
 
         $output = new \DateTime('2010-02-03 04:00:00 UTC');
 
@@ -186,27 +186,27 @@ public function testReverseTransformCompletelyEmpty()
     {
         $transformer = new DateTimeToArrayTransformer();
 
-        $input = array(
+        $input = [
             'year' => '',
             'month' => '',
             'day' => '',
             'hour' => '',
             'minute' => '',
             'second' => '',
-        );
+        ];
 
         $this->assertNull($transformer->reverseTransform($input));
     }
 
     public function testReverseTransformCompletelyEmptySubsetOfFields()
     {
-        $transformer = new DateTimeToArrayTransformer(null, null, array('year', 'month', 'day'));
+        $transformer = new DateTimeToArrayTransformer(null, null, ['year', 'month', 'day']);
 
-        $input = array(
+        $input = [
             'year' => '',
             'month' => '',
             'day' => '',
-        );
+        ];
 
         $this->assertNull($transformer->reverseTransform($input));
     }
@@ -217,13 +217,13 @@ public function testReverseTransformCompletelyEmptySubsetOfFields()
     public function testReverseTransformPartiallyEmptyYear()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'month' => '2',
             'day' => '3',
             'hour' => '4',
             'minute' => '5',
             'second' => '6',
-        ));
+        ]);
     }
 
     /**
@@ -232,13 +232,13 @@ public function testReverseTransformPartiallyEmptyYear()
     public function testReverseTransformPartiallyEmptyMonth()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => '2010',
             'day' => '3',
             'hour' => '4',
             'minute' => '5',
             'second' => '6',
-        ));
+        ]);
     }
 
     /**
@@ -247,13 +247,13 @@ public function testReverseTransformPartiallyEmptyMonth()
     public function testReverseTransformPartiallyEmptyDay()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => '2010',
             'month' => '2',
             'hour' => '4',
             'minute' => '5',
             'second' => '6',
-        ));
+        ]);
     }
 
     /**
@@ -262,13 +262,13 @@ public function testReverseTransformPartiallyEmptyDay()
     public function testReverseTransformPartiallyEmptyHour()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => '2010',
             'month' => '2',
             'day' => '3',
             'minute' => '5',
             'second' => '6',
-        ));
+        ]);
     }
 
     /**
@@ -277,13 +277,13 @@ public function testReverseTransformPartiallyEmptyHour()
     public function testReverseTransformPartiallyEmptyMinute()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => '2010',
             'month' => '2',
             'day' => '3',
             'hour' => '4',
             'second' => '6',
-        ));
+        ]);
     }
 
     /**
@@ -292,13 +292,13 @@ public function testReverseTransformPartiallyEmptyMinute()
     public function testReverseTransformPartiallyEmptySecond()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => '2010',
             'month' => '2',
             'day' => '3',
             'hour' => '4',
             'minute' => '5',
-        ));
+        ]);
     }
 
     public function testReverseTransformNull()
@@ -312,14 +312,14 @@ public function testReverseTransformDifferentTimezones()
     {
         $transformer = new DateTimeToArrayTransformer('America/New_York', 'Asia/Hong_Kong');
 
-        $input = array(
+        $input = [
             'year' => '2010',
             'month' => '2',
             'day' => '3',
             'hour' => '4',
             'minute' => '5',
             'second' => '6',
-        );
+        ];
 
         $output = new \DateTime('2010-02-03 04:05:06 Asia/Hong_Kong');
         $output->setTimezone(new \DateTimeZone('America/New_York'));
@@ -331,14 +331,14 @@ public function testReverseTransformToDifferentTimezone()
     {
         $transformer = new DateTimeToArrayTransformer('Asia/Hong_Kong', 'UTC');
 
-        $input = array(
+        $input = [
             'year' => '2010',
             'month' => '2',
             'day' => '3',
             'hour' => '4',
             'minute' => '5',
             'second' => '6',
-        );
+        ];
 
         $output = new \DateTime('2010-02-03 04:05:06 UTC');
         $output->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
@@ -361,14 +361,14 @@ public function testReverseTransformRequiresArray()
     public function testReverseTransformWithNegativeYear()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => '-1',
             'month' => '2',
             'day' => '3',
             'hour' => '4',
             'minute' => '5',
             'second' => '6',
-        ));
+        ]);
     }
 
     /**
@@ -377,14 +377,14 @@ public function testReverseTransformWithNegativeYear()
     public function testReverseTransformWithNegativeMonth()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => '2010',
             'month' => '-1',
             'day' => '3',
             'hour' => '4',
             'minute' => '5',
             'second' => '6',
-        ));
+        ]);
     }
 
     /**
@@ -393,14 +393,14 @@ public function testReverseTransformWithNegativeMonth()
     public function testReverseTransformWithNegativeDay()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => '2010',
             'month' => '2',
             'day' => '-1',
             'hour' => '4',
             'minute' => '5',
             'second' => '6',
-        ));
+        ]);
     }
 
     /**
@@ -409,14 +409,14 @@ public function testReverseTransformWithNegativeDay()
     public function testReverseTransformWithNegativeHour()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => '2010',
             'month' => '2',
             'day' => '3',
             'hour' => '-1',
             'minute' => '5',
             'second' => '6',
-        ));
+        ]);
     }
 
     /**
@@ -425,14 +425,14 @@ public function testReverseTransformWithNegativeHour()
     public function testReverseTransformWithNegativeMinute()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => '2010',
             'month' => '2',
             'day' => '3',
             'hour' => '4',
             'minute' => '-1',
             'second' => '6',
-        ));
+        ]);
     }
 
     /**
@@ -441,14 +441,14 @@ public function testReverseTransformWithNegativeMinute()
     public function testReverseTransformWithNegativeSecond()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => '2010',
             'month' => '2',
             'day' => '3',
             'hour' => '4',
             'minute' => '5',
             'second' => '-1',
-        ));
+        ]);
     }
 
     /**
@@ -457,14 +457,14 @@ public function testReverseTransformWithNegativeSecond()
     public function testReverseTransformWithInvalidMonth()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => '2010',
             'month' => '13',
             'day' => '3',
             'hour' => '4',
             'minute' => '5',
             'second' => '6',
-        ));
+        ]);
     }
 
     /**
@@ -473,14 +473,14 @@ public function testReverseTransformWithInvalidMonth()
     public function testReverseTransformWithInvalidDay()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => '2010',
             'month' => '2',
             'day' => '31',
             'hour' => '4',
             'minute' => '5',
             'second' => '6',
-        ));
+        ]);
     }
 
     /**
@@ -489,14 +489,14 @@ public function testReverseTransformWithInvalidDay()
     public function testReverseTransformWithStringDay()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => '2010',
             'month' => '2',
             'day' => 'bazinga',
             'hour' => '4',
             'minute' => '5',
             'second' => '6',
-        ));
+        ]);
     }
 
     /**
@@ -505,14 +505,14 @@ public function testReverseTransformWithStringDay()
     public function testReverseTransformWithStringMonth()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => '2010',
             'month' => 'bazinga',
             'day' => '31',
             'hour' => '4',
             'minute' => '5',
             'second' => '6',
-        ));
+        ]);
     }
 
     /**
@@ -521,14 +521,14 @@ public function testReverseTransformWithStringMonth()
     public function testReverseTransformWithStringYear()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => 'bazinga',
             'month' => '2',
             'day' => '31',
             'hour' => '4',
             'minute' => '5',
             'second' => '6',
-        ));
+        ]);
     }
 
     /**
@@ -537,14 +537,14 @@ public function testReverseTransformWithStringYear()
     public function testReverseTransformWithEmptyStringHour()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => '2010',
             'month' => '2',
             'day' => '31',
             'hour' => '',
             'minute' => '5',
             'second' => '6',
-        ));
+        ]);
     }
 
     /**
@@ -553,14 +553,14 @@ public function testReverseTransformWithEmptyStringHour()
     public function testReverseTransformWithEmptyStringMinute()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => '2010',
             'month' => '2',
             'day' => '31',
             'hour' => '4',
             'minute' => '',
             'second' => '6',
-        ));
+        ]);
     }
 
     /**
@@ -569,13 +569,13 @@ public function testReverseTransformWithEmptyStringMinute()
     public function testReverseTransformWithEmptyStringSecond()
     {
         $transformer = new DateTimeToArrayTransformer();
-        $transformer->reverseTransform(array(
+        $transformer->reverseTransform([
             'year' => '2010',
             'month' => '2',
             'day' => '31',
             'hour' => '4',
             'minute' => '5',
             'second' => '',
-        ));
+        ]);
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php
index 6046022e45899..e66331aa284e4 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php
@@ -28,34 +28,34 @@ public static function assertEquals($expected, $actual, $message = '', $delta =
 
     public function transformProvider()
     {
-        return array(
-            array('UTC', 'UTC', '2010-02-03 04:05:06 UTC', '2010-02-03T04:05:06'),
-            array('UTC', 'UTC', null, ''),
-            array('America/New_York', 'Asia/Hong_Kong', '2010-02-03 04:05:06 America/New_York', '2010-02-03T17:05:06'),
-            array('America/New_York', 'Asia/Hong_Kong', null, ''),
-            array('UTC', 'Asia/Hong_Kong', '2010-02-03 04:05:06 UTC', '2010-02-03T12:05:06'),
-            array('America/New_York', 'UTC', '2010-02-03 04:05:06 America/New_York', '2010-02-03T09:05:06'),
-        );
+        return [
+            ['UTC', 'UTC', '2010-02-03 04:05:06 UTC', '2010-02-03T04:05:06'],
+            ['UTC', 'UTC', null, ''],
+            ['America/New_York', 'Asia/Hong_Kong', '2010-02-03 04:05:06 America/New_York', '2010-02-03T17:05:06'],
+            ['America/New_York', 'Asia/Hong_Kong', null, ''],
+            ['UTC', 'Asia/Hong_Kong', '2010-02-03 04:05:06 UTC', '2010-02-03T12:05:06'],
+            ['America/New_York', 'UTC', '2010-02-03 04:05:06 America/New_York', '2010-02-03T09:05:06'],
+        ];
     }
 
     public function reverseTransformProvider()
     {
-        return array(
+        return [
             // format without seconds, as appears in some browsers
-            array('UTC', 'UTC', '2010-02-03 04:05:06 UTC', '2010-02-03T04:05:06'),
-            array('UTC', 'UTC', null, ''),
-            array('America/New_York', 'Asia/Hong_Kong', '2010-02-03 04:05:06 America/New_York', '2010-02-03T17:05:06'),
-            array('America/New_York', 'Asia/Hong_Kong', null, ''),
-            array('UTC', 'Asia/Hong_Kong', '2010-02-03 04:05:06 UTC', '2010-02-03T12:05:06'),
-            array('America/New_York', 'UTC', '2010-02-03 04:05:06 America/New_York', '2010-02-03T09:05:06'),
-            array('UTC', 'UTC', '2010-02-03 04:05:00 UTC', '2010-02-03T04:05'),
-            array('America/New_York', 'Asia/Hong_Kong', '2010-02-03 04:05:00 America/New_York', '2010-02-03T17:05'),
-            array('Europe/Amsterdam', 'Europe/Amsterdam', '2013-08-21 10:30:00 Europe/Amsterdam', '2013-08-21T10:30:00'),
-            array('UTC', 'UTC', '2018-09-15T10:00:00Z', '2018-09-15T10:00:00Z'),
-            array('Europe/Berlin', 'Europe/Berlin', '2018-09-15T10:00:00+02:00', '2018-09-15T10:00:00+02:00'),
-            array('Europe/Berlin', 'Europe/Berlin', '2018-09-15T10:00:00+0200', '2018-09-15T10:00:00+0200'),
-            array('UTC', 'UTC', '2018-10-03T10:00:00.000Z', '2018-10-03T10:00:00.000Z'),
-        );
+            ['UTC', 'UTC', '2010-02-03 04:05:06 UTC', '2010-02-03T04:05:06'],
+            ['UTC', 'UTC', null, ''],
+            ['America/New_York', 'Asia/Hong_Kong', '2010-02-03 04:05:06 America/New_York', '2010-02-03T17:05:06'],
+            ['America/New_York', 'Asia/Hong_Kong', null, ''],
+            ['UTC', 'Asia/Hong_Kong', '2010-02-03 04:05:06 UTC', '2010-02-03T12:05:06'],
+            ['America/New_York', 'UTC', '2010-02-03 04:05:06 America/New_York', '2010-02-03T09:05:06'],
+            ['UTC', 'UTC', '2010-02-03 04:05:00 UTC', '2010-02-03T04:05'],
+            ['America/New_York', 'Asia/Hong_Kong', '2010-02-03 04:05:00 America/New_York', '2010-02-03T17:05'],
+            ['Europe/Amsterdam', 'Europe/Amsterdam', '2013-08-21 10:30:00 Europe/Amsterdam', '2013-08-21T10:30:00'],
+            ['UTC', 'UTC', '2018-09-15T10:00:00Z', '2018-09-15T10:00:00Z'],
+            ['Europe/Berlin', 'Europe/Berlin', '2018-09-15T10:00:00+02:00', '2018-09-15T10:00:00+02:00'],
+            ['Europe/Berlin', 'Europe/Berlin', '2018-09-15T10:00:00+0200', '2018-09-15T10:00:00+0200'],
+            ['UTC', 'UTC', '2018-10-03T10:00:00.000Z', '2018-10-03T10:00:00.000Z'],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
index 8e7ad393ebe7c..8cf5986c130a4 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
@@ -51,36 +51,36 @@ public static function assertEquals($expected, $actual, $message = '', $delta =
 
     public function dataProvider()
     {
-        return array(
-            array(\IntlDateFormatter::SHORT, null, null, '03.02.10, 04:05', '2010-02-03 04:05:00 UTC'),
-            array(\IntlDateFormatter::MEDIUM, null, null, '03.02.2010, 04:05', '2010-02-03 04:05:00 UTC'),
-            array(\IntlDateFormatter::LONG, null, null, '3. Februar 2010 um 04:05', '2010-02-03 04:05:00 UTC'),
-            array(\IntlDateFormatter::FULL, null, null, 'Mittwoch, 3. Februar 2010 um 04:05', '2010-02-03 04:05:00 UTC'),
-            array(\IntlDateFormatter::SHORT, \IntlDateFormatter::NONE, null, '03.02.10', '2010-02-03 00:00:00 UTC'),
-            array(\IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE, null, '03.02.2010', '2010-02-03 00:00:00 UTC'),
-            array(\IntlDateFormatter::LONG, \IntlDateFormatter::NONE, null, '3. Februar 2010', '2010-02-03 00:00:00 UTC'),
-            array(\IntlDateFormatter::FULL, \IntlDateFormatter::NONE, null, 'Mittwoch, 3. Februar 2010', '2010-02-03 00:00:00 UTC'),
-            array(null, \IntlDateFormatter::SHORT, null, '03.02.2010, 04:05', '2010-02-03 04:05:00 UTC'),
-            array(null, \IntlDateFormatter::MEDIUM, null, '03.02.2010, 04:05:06', '2010-02-03 04:05:06 UTC'),
-            array(null, \IntlDateFormatter::LONG, null, '03.02.2010, 04:05:06 UTC', '2010-02-03 04:05:06 UTC'),
-            array(null, \IntlDateFormatter::LONG, null, '03.02.2010, 04:05:06 UTC', '2010-02-03 04:05:06 GMT'),
+        return [
+            [\IntlDateFormatter::SHORT, null, null, '03.02.10, 04:05', '2010-02-03 04:05:00 UTC'],
+            [\IntlDateFormatter::MEDIUM, null, null, '03.02.2010, 04:05', '2010-02-03 04:05:00 UTC'],
+            [\IntlDateFormatter::LONG, null, null, '3. Februar 2010 um 04:05', '2010-02-03 04:05:00 UTC'],
+            [\IntlDateFormatter::FULL, null, null, 'Mittwoch, 3. Februar 2010 um 04:05', '2010-02-03 04:05:00 UTC'],
+            [\IntlDateFormatter::SHORT, \IntlDateFormatter::NONE, null, '03.02.10', '2010-02-03 00:00:00 UTC'],
+            [\IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE, null, '03.02.2010', '2010-02-03 00:00:00 UTC'],
+            [\IntlDateFormatter::LONG, \IntlDateFormatter::NONE, null, '3. Februar 2010', '2010-02-03 00:00:00 UTC'],
+            [\IntlDateFormatter::FULL, \IntlDateFormatter::NONE, null, 'Mittwoch, 3. Februar 2010', '2010-02-03 00:00:00 UTC'],
+            [null, \IntlDateFormatter::SHORT, null, '03.02.2010, 04:05', '2010-02-03 04:05:00 UTC'],
+            [null, \IntlDateFormatter::MEDIUM, null, '03.02.2010, 04:05:06', '2010-02-03 04:05:06 UTC'],
+            [null, \IntlDateFormatter::LONG, null, '03.02.2010, 04:05:06 UTC', '2010-02-03 04:05:06 UTC'],
+            [null, \IntlDateFormatter::LONG, null, '03.02.2010, 04:05:06 UTC', '2010-02-03 04:05:06 GMT'],
             // see below for extra test case for time format FULL
-            array(\IntlDateFormatter::NONE, \IntlDateFormatter::SHORT, null, '04:05', '1970-01-01 04:05:00 UTC'),
-            array(\IntlDateFormatter::NONE, \IntlDateFormatter::MEDIUM, null, '04:05:06', '1970-01-01 04:05:06 UTC'),
-            array(\IntlDateFormatter::NONE, \IntlDateFormatter::LONG, null, '04:05:06 UTC', '1970-01-01 04:05:06 GMT'),
-            array(\IntlDateFormatter::NONE, \IntlDateFormatter::LONG, null, '04:05:06 UTC', '1970-01-01 04:05:06 UTC'),
-            array(null, null, 'yyyy-MM-dd HH:mm:00', '2010-02-03 04:05:00', '2010-02-03 04:05:00 UTC'),
-            array(null, null, 'yyyy-MM-dd HH:mm', '2010-02-03 04:05', '2010-02-03 04:05:00 UTC'),
-            array(null, null, 'yyyy-MM-dd HH', '2010-02-03 04', '2010-02-03 04:00:00 UTC'),
-            array(null, null, 'yyyy-MM-dd', '2010-02-03', '2010-02-03 00:00:00 UTC'),
-            array(null, null, 'yyyy-MM', '2010-02', '2010-02-01 00:00:00 UTC'),
-            array(null, null, 'yyyy', '2010', '2010-01-01 00:00:00 UTC'),
-            array(null, null, 'dd-MM-yyyy', '03-02-2010', '2010-02-03 00:00:00 UTC'),
-            array(null, null, 'HH:mm:ss', '04:05:06', '1970-01-01 04:05:06 UTC'),
-            array(null, null, 'HH:mm:00', '04:05:00', '1970-01-01 04:05:00 UTC'),
-            array(null, null, 'HH:mm', '04:05', '1970-01-01 04:05:00 UTC'),
-            array(null, null, 'HH', '04', '1970-01-01 04:00:00 UTC'),
-        );
+            [\IntlDateFormatter::NONE, \IntlDateFormatter::SHORT, null, '04:05', '1970-01-01 04:05:00 UTC'],
+            [\IntlDateFormatter::NONE, \IntlDateFormatter::MEDIUM, null, '04:05:06', '1970-01-01 04:05:06 UTC'],
+            [\IntlDateFormatter::NONE, \IntlDateFormatter::LONG, null, '04:05:06 UTC', '1970-01-01 04:05:06 GMT'],
+            [\IntlDateFormatter::NONE, \IntlDateFormatter::LONG, null, '04:05:06 UTC', '1970-01-01 04:05:06 UTC'],
+            [null, null, 'yyyy-MM-dd HH:mm:00', '2010-02-03 04:05:00', '2010-02-03 04:05:00 UTC'],
+            [null, null, 'yyyy-MM-dd HH:mm', '2010-02-03 04:05', '2010-02-03 04:05:00 UTC'],
+            [null, null, 'yyyy-MM-dd HH', '2010-02-03 04', '2010-02-03 04:00:00 UTC'],
+            [null, null, 'yyyy-MM-dd', '2010-02-03', '2010-02-03 00:00:00 UTC'],
+            [null, null, 'yyyy-MM', '2010-02', '2010-02-01 00:00:00 UTC'],
+            [null, null, 'yyyy', '2010', '2010-01-01 00:00:00 UTC'],
+            [null, null, 'dd-MM-yyyy', '03-02-2010', '2010-02-03 00:00:00 UTC'],
+            [null, null, 'HH:mm:ss', '04:05:06', '1970-01-01 04:05:06 UTC'],
+            [null, null, 'HH:mm:00', '04:05:00', '1970-01-01 04:05:00 UTC'],
+            [null, null, 'HH:mm', '04:05', '1970-01-01 04:05:00 UTC'],
+            [null, null, 'HH', '04', '1970-01-01 04:00:00 UTC'],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
index 053cb628644a3..2352ea6cc3514 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
@@ -45,14 +45,14 @@ public static function assertEquals($expected, $actual, $message = '', $delta =
 
     public function allProvider()
     {
-        return array(
-            array('UTC', 'UTC', '2010-02-03 04:05:06 UTC', '2010-02-03T04:05:06Z'),
-            array('UTC', 'UTC', null, ''),
-            array('America/New_York', 'Asia/Hong_Kong', '2010-02-03 04:05:06 America/New_York', '2010-02-03T17:05:06+08:00'),
-            array('America/New_York', 'Asia/Hong_Kong', null, ''),
-            array('UTC', 'Asia/Hong_Kong', '2010-02-03 04:05:06 UTC', '2010-02-03T12:05:06+08:00'),
-            array('America/New_York', 'UTC', '2010-02-03 04:05:06 America/New_York', '2010-02-03T09:05:06Z'),
-        );
+        return [
+            ['UTC', 'UTC', '2010-02-03 04:05:06 UTC', '2010-02-03T04:05:06Z'],
+            ['UTC', 'UTC', null, ''],
+            ['America/New_York', 'Asia/Hong_Kong', '2010-02-03 04:05:06 America/New_York', '2010-02-03T17:05:06+08:00'],
+            ['America/New_York', 'Asia/Hong_Kong', null, ''],
+            ['UTC', 'Asia/Hong_Kong', '2010-02-03 04:05:06 UTC', '2010-02-03T12:05:06+08:00'],
+            ['America/New_York', 'UTC', '2010-02-03 04:05:06 America/New_York', '2010-02-03T09:05:06Z'],
+        ];
     }
 
     public function transformProvider()
@@ -62,13 +62,13 @@ public function transformProvider()
 
     public function reverseTransformProvider()
     {
-        return array_merge($this->allProvider(), array(
+        return array_merge($this->allProvider(), [
             // format without seconds, as appears in some browsers
-            array('UTC', 'UTC', '2010-02-03 04:05:00 UTC', '2010-02-03T04:05Z'),
-            array('America/New_York', 'Asia/Hong_Kong', '2010-02-03 04:05:00 America/New_York', '2010-02-03T17:05+08:00'),
-            array('Europe/Amsterdam', 'Europe/Amsterdam', '2013-08-21 10:30:00 Europe/Amsterdam', '2013-08-21T08:30:00Z'),
-            array('UTC', 'UTC', '2018-10-03T10:00:00.000Z', '2018-10-03T10:00:00.000Z'),
-        ));
+            ['UTC', 'UTC', '2010-02-03 04:05:00 UTC', '2010-02-03T04:05Z'],
+            ['America/New_York', 'Asia/Hong_Kong', '2010-02-03 04:05:00 America/New_York', '2010-02-03T17:05+08:00'],
+            ['Europe/Amsterdam', 'Europe/Amsterdam', '2013-08-21 10:30:00 Europe/Amsterdam', '2013-08-21T08:30:00Z'],
+            ['UTC', 'UTC', '2018-10-03T10:00:00.000Z', '2018-10-03T10:00:00.000Z'],
+        ]);
     }
 
     /**
@@ -146,13 +146,13 @@ public function testReverseTransformExpectsValidDateString($date)
 
     public function invalidDateStringProvider()
     {
-        return array(
-            'invalid month' => array('2010-2010-01'),
-            'invalid day' => array('2010-10-2010'),
-            'no date' => array('x'),
-            'cookie format' => array('Saturday, 01-May-2010 04:05:00 Z'),
-            'RFC 822 format' => array('Sat, 01 May 10 04:05:00 +0000'),
-            'RSS format' => array('Sat, 01 May 2010 04:05:00 +0000'),
-        );
+        return [
+            'invalid month' => ['2010-2010-01'],
+            'invalid day' => ['2010-10-2010'],
+            'no date' => ['x'],
+            'cookie format' => ['Saturday, 01-May-2010 04:05:00 Z'],
+            'RFC 822 format' => ['Sat, 01 May 10 04:05:00 +0000'],
+            'RSS format' => ['Sat, 01 May 2010 04:05:00 +0000'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php
index c4d04e0e0f5f5..7619fcc473f66 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php
@@ -18,24 +18,24 @@ class DateTimeToStringTransformerTest extends TestCase
 {
     public function dataProvider()
     {
-        $data = array(
-            array('Y-m-d H:i:s', '2010-02-03 16:05:06', '2010-02-03 16:05:06 UTC'),
-            array('Y-m-d H:i:00', '2010-02-03 16:05:00', '2010-02-03 16:05:00 UTC'),
-            array('Y-m-d H:i', '2010-02-03 16:05', '2010-02-03 16:05:00 UTC'),
-            array('Y-m-d H', '2010-02-03 16', '2010-02-03 16:00:00 UTC'),
-            array('Y-m-d', '2010-02-03', '2010-02-03 00:00:00 UTC'),
-            array('Y-m', '2010-12', '2010-12-01 00:00:00 UTC'),
-            array('Y', '2010', '2010-01-01 00:00:00 UTC'),
-            array('d-m-Y', '03-02-2010', '2010-02-03 00:00:00 UTC'),
-            array('H:i:s', '16:05:06', '1970-01-01 16:05:06 UTC'),
-            array('H:i:00', '16:05:00', '1970-01-01 16:05:00 UTC'),
-            array('H:i', '16:05', '1970-01-01 16:05:00 UTC'),
-            array('H', '16', '1970-01-01 16:00:00 UTC'),
-            array('Y-z', '2010-33', '2010-02-03 00:00:00 UTC'),
+        $data = [
+            ['Y-m-d H:i:s', '2010-02-03 16:05:06', '2010-02-03 16:05:06 UTC'],
+            ['Y-m-d H:i:00', '2010-02-03 16:05:00', '2010-02-03 16:05:00 UTC'],
+            ['Y-m-d H:i', '2010-02-03 16:05', '2010-02-03 16:05:00 UTC'],
+            ['Y-m-d H', '2010-02-03 16', '2010-02-03 16:00:00 UTC'],
+            ['Y-m-d', '2010-02-03', '2010-02-03 00:00:00 UTC'],
+            ['Y-m', '2010-12', '2010-12-01 00:00:00 UTC'],
+            ['Y', '2010', '2010-01-01 00:00:00 UTC'],
+            ['d-m-Y', '03-02-2010', '2010-02-03 00:00:00 UTC'],
+            ['H:i:s', '16:05:06', '1970-01-01 16:05:06 UTC'],
+            ['H:i:00', '16:05:00', '1970-01-01 16:05:00 UTC'],
+            ['H:i', '16:05', '1970-01-01 16:05:00 UTC'],
+            ['H', '16', '1970-01-01 16:00:00 UTC'],
+            ['Y-z', '2010-33', '2010-02-03 00:00:00 UTC'],
 
             // different day representations
-            array('Y-m-j', '2010-02-3', '2010-02-03 00:00:00 UTC'),
-            array('z', '33', '1970-02-03 00:00:00 UTC'),
+            ['Y-m-j', '2010-02-3', '2010-02-03 00:00:00 UTC'],
+            ['z', '33', '1970-02-03 00:00:00 UTC'],
 
             // not bijective
             // this will not work as PHP will use actual date to replace missing info
@@ -45,23 +45,23 @@ public function dataProvider()
             //array('Y-m-l', '2010-02-Wednesday', '2010-02-03 00:00:00 UTC'),
 
             // different month representations
-            array('Y-n-d', '2010-2-03', '2010-02-03 00:00:00 UTC'),
-            array('Y-M-d', '2010-Feb-03', '2010-02-03 00:00:00 UTC'),
-            array('Y-F-d', '2010-February-03', '2010-02-03 00:00:00 UTC'),
+            ['Y-n-d', '2010-2-03', '2010-02-03 00:00:00 UTC'],
+            ['Y-M-d', '2010-Feb-03', '2010-02-03 00:00:00 UTC'],
+            ['Y-F-d', '2010-February-03', '2010-02-03 00:00:00 UTC'],
 
             // different year representations
-            array('y-m-d', '10-02-03', '2010-02-03 00:00:00 UTC'),
+            ['y-m-d', '10-02-03', '2010-02-03 00:00:00 UTC'],
 
             // different time representations
-            array('G:i:s', '16:05:06', '1970-01-01 16:05:06 UTC'),
-            array('g:i:s a', '4:05:06 pm', '1970-01-01 16:05:06 UTC'),
-            array('h:i:s a', '04:05:06 pm', '1970-01-01 16:05:06 UTC'),
+            ['G:i:s', '16:05:06', '1970-01-01 16:05:06 UTC'],
+            ['g:i:s a', '4:05:06 pm', '1970-01-01 16:05:06 UTC'],
+            ['h:i:s a', '04:05:06 pm', '1970-01-01 16:05:06 UTC'],
 
             // seconds since Unix
-            array('U', '1265213106', '2010-02-03 16:05:06 UTC'),
+            ['U', '1265213106', '2010-02-03 16:05:06 UTC'],
 
-            array('Y-z', '2010-33', '2010-02-03 00:00:00 UTC'),
-        );
+            ['Y-z', '2010-33', '2010-02-03 00:00:00 UTC'],
+        ];
 
         return $data;
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeZoneToStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeZoneToStringTransformerTest.php
index e6560d7558f39..6aefe3cab53fb 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeZoneToStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeZoneToStringTransformerTest.php
@@ -34,8 +34,8 @@ public function testMultiple()
         $this->assertNull($transformer->transform(null));
         $this->assertNull($transformer->reverseTransform(null));
 
-        $this->assertSame(array('Europe/Amsterdam'), $transformer->transform(array(new \DateTimeZone('Europe/Amsterdam'))));
-        $this->assertEquals(array(new \DateTimeZone('Europe/Amsterdam')), $transformer->reverseTransform(array('Europe/Amsterdam')));
+        $this->assertSame(['Europe/Amsterdam'], $transformer->transform([new \DateTimeZone('Europe/Amsterdam')]));
+        $this->assertEquals([new \DateTimeZone('Europe/Amsterdam')], $transformer->reverseTransform(['Europe/Amsterdam']));
     }
 
     /**
@@ -51,6 +51,6 @@ public function testInvalidTimezone()
      */
     public function testUnknownTimezone()
     {
-        (new DateTimeZoneToStringTransformer(true))->reverseTransform(array('Foo/Bar'));
+        (new DateTimeZoneToStringTransformer(true))->reverseTransform(['Foo/Bar']);
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php
index fe1f7d31792fd..193aba91ab3b8 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php
@@ -26,53 +26,53 @@ protected function setUp()
 
     public function transformWithRoundingProvider()
     {
-        return array(
+        return [
             // towards positive infinity (1.6 -> 2, -1.6 -> -1)
-            array(1234.5, '1235', IntegerToLocalizedStringTransformer::ROUND_CEILING),
-            array(1234.4, '1235', IntegerToLocalizedStringTransformer::ROUND_CEILING),
-            array(-1234.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_CEILING),
-            array(-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_CEILING),
+            [1234.5, '1235', IntegerToLocalizedStringTransformer::ROUND_CEILING],
+            [1234.4, '1235', IntegerToLocalizedStringTransformer::ROUND_CEILING],
+            [-1234.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_CEILING],
+            [-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_CEILING],
             // towards negative infinity (1.6 -> 1, -1.6 -> -2)
-            array(1234.5, '1234', IntegerToLocalizedStringTransformer::ROUND_FLOOR),
-            array(1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_FLOOR),
-            array(-1234.5, '-1235', IntegerToLocalizedStringTransformer::ROUND_FLOOR),
-            array(-1234.4, '-1235', IntegerToLocalizedStringTransformer::ROUND_FLOOR),
+            [1234.5, '1234', IntegerToLocalizedStringTransformer::ROUND_FLOOR],
+            [1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_FLOOR],
+            [-1234.5, '-1235', IntegerToLocalizedStringTransformer::ROUND_FLOOR],
+            [-1234.4, '-1235', IntegerToLocalizedStringTransformer::ROUND_FLOOR],
             // away from zero (1.6 -> 2, -1.6 -> 2)
-            array(1234.5, '1235', IntegerToLocalizedStringTransformer::ROUND_UP),
-            array(1234.4, '1235', IntegerToLocalizedStringTransformer::ROUND_UP),
-            array(-1234.5, '-1235', IntegerToLocalizedStringTransformer::ROUND_UP),
-            array(-1234.4, '-1235', IntegerToLocalizedStringTransformer::ROUND_UP),
+            [1234.5, '1235', IntegerToLocalizedStringTransformer::ROUND_UP],
+            [1234.4, '1235', IntegerToLocalizedStringTransformer::ROUND_UP],
+            [-1234.5, '-1235', IntegerToLocalizedStringTransformer::ROUND_UP],
+            [-1234.4, '-1235', IntegerToLocalizedStringTransformer::ROUND_UP],
             // towards zero (1.6 -> 1, -1.6 -> -1)
-            array(1234.5, '1234', IntegerToLocalizedStringTransformer::ROUND_DOWN),
-            array(1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_DOWN),
-            array(-1234.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_DOWN),
-            array(-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_DOWN),
+            [1234.5, '1234', IntegerToLocalizedStringTransformer::ROUND_DOWN],
+            [1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_DOWN],
+            [-1234.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_DOWN],
+            [-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_DOWN],
             // round halves (.5) to the next even number
-            array(1234.6, '1235', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1234.5, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1233.5, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1232.5, '1232', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(-1234.6, '-1235', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(-1234.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(-1233.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(-1232.5, '-1232', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
+            [1234.6, '1235', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1234.5, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1233.5, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1232.5, '1232', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [-1234.6, '-1235', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [-1234.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [-1233.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [-1232.5, '-1232', IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
             // round halves (.5) away from zero
-            array(1234.6, '1235', IntegerToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(1234.5, '1235', IntegerToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(-1234.6, '-1235', IntegerToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(-1234.5, '-1235', IntegerToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_UP),
+            [1234.6, '1235', IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
+            [1234.5, '1235', IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
+            [1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
+            [-1234.6, '-1235', IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
+            [-1234.5, '-1235', IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
+            [-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
             // round halves (.5) towards zero
-            array(1234.6, '1235', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(1234.5, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(-1234.6, '-1235', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(-1234.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN),
-        );
+            [1234.6, '1235', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [1234.5, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [1234.4, '1234', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [-1234.6, '-1235', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [-1234.5, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [-1234.4, '-1234', IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
+        ];
     }
 
     /**
@@ -124,53 +124,53 @@ public function testReverseTransformWithGrouping()
 
     public function reverseTransformWithRoundingProvider()
     {
-        return array(
+        return [
             // towards positive infinity (1.6 -> 2, -1.6 -> -1)
-            array('1234,5', 1235, IntegerToLocalizedStringTransformer::ROUND_CEILING),
-            array('1234,4', 1235, IntegerToLocalizedStringTransformer::ROUND_CEILING),
-            array('-1234,5', -1234, IntegerToLocalizedStringTransformer::ROUND_CEILING),
-            array('-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_CEILING),
+            ['1234,5', 1235, IntegerToLocalizedStringTransformer::ROUND_CEILING],
+            ['1234,4', 1235, IntegerToLocalizedStringTransformer::ROUND_CEILING],
+            ['-1234,5', -1234, IntegerToLocalizedStringTransformer::ROUND_CEILING],
+            ['-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_CEILING],
             // towards negative infinity (1.6 -> 1, -1.6 -> -2)
-            array('1234,5', 1234, IntegerToLocalizedStringTransformer::ROUND_FLOOR),
-            array('1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_FLOOR),
-            array('-1234,5', -1235, IntegerToLocalizedStringTransformer::ROUND_FLOOR),
-            array('-1234,4', -1235, IntegerToLocalizedStringTransformer::ROUND_FLOOR),
+            ['1234,5', 1234, IntegerToLocalizedStringTransformer::ROUND_FLOOR],
+            ['1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_FLOOR],
+            ['-1234,5', -1235, IntegerToLocalizedStringTransformer::ROUND_FLOOR],
+            ['-1234,4', -1235, IntegerToLocalizedStringTransformer::ROUND_FLOOR],
             // away from zero (1.6 -> 2, -1.6 -> 2)
-            array('1234,5', 1235, IntegerToLocalizedStringTransformer::ROUND_UP),
-            array('1234,4', 1235, IntegerToLocalizedStringTransformer::ROUND_UP),
-            array('-1234,5', -1235, IntegerToLocalizedStringTransformer::ROUND_UP),
-            array('-1234,4', -1235, IntegerToLocalizedStringTransformer::ROUND_UP),
+            ['1234,5', 1235, IntegerToLocalizedStringTransformer::ROUND_UP],
+            ['1234,4', 1235, IntegerToLocalizedStringTransformer::ROUND_UP],
+            ['-1234,5', -1235, IntegerToLocalizedStringTransformer::ROUND_UP],
+            ['-1234,4', -1235, IntegerToLocalizedStringTransformer::ROUND_UP],
             // towards zero (1.6 -> 1, -1.6 -> -1)
-            array('1234,5', 1234, IntegerToLocalizedStringTransformer::ROUND_DOWN),
-            array('1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_DOWN),
-            array('-1234,5', -1234, IntegerToLocalizedStringTransformer::ROUND_DOWN),
-            array('-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_DOWN),
+            ['1234,5', 1234, IntegerToLocalizedStringTransformer::ROUND_DOWN],
+            ['1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_DOWN],
+            ['-1234,5', -1234, IntegerToLocalizedStringTransformer::ROUND_DOWN],
+            ['-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_DOWN],
             // round halves (.5) to the next even number
-            array('1234,6', 1235, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array('1234,5', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array('1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array('1233,5', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array('1232,5', 1232, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array('-1234,6', -1235, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array('-1234,5', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array('-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array('-1233,5', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array('-1232,5', -1232, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN),
+            ['1234,6', 1235, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            ['1234,5', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            ['1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            ['1233,5', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            ['1232,5', 1232, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            ['-1234,6', -1235, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            ['-1234,5', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            ['-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            ['-1233,5', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            ['-1232,5', -1232, IntegerToLocalizedStringTransformer::ROUND_HALF_EVEN],
             // round halves (.5) away from zero
-            array('1234,6', 1235, IntegerToLocalizedStringTransformer::ROUND_HALF_UP),
-            array('1234,5', 1235, IntegerToLocalizedStringTransformer::ROUND_HALF_UP),
-            array('1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_UP),
-            array('-1234,6', -1235, IntegerToLocalizedStringTransformer::ROUND_HALF_UP),
-            array('-1234,5', -1235, IntegerToLocalizedStringTransformer::ROUND_HALF_UP),
-            array('-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_UP),
+            ['1234,6', 1235, IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
+            ['1234,5', 1235, IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
+            ['1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
+            ['-1234,6', -1235, IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
+            ['-1234,5', -1235, IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
+            ['-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_UP],
             // round halves (.5) towards zero
-            array('1234,6', 1235, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array('1234,5', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array('1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array('-1234,6', -1235, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array('-1234,5', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array('-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN),
-        );
+            ['1234,6', 1235, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            ['1234,5', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            ['1234,4', 1234, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            ['-1234,6', -1235, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            ['-1234,5', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            ['-1234,4', -1234, IntegerToLocalizedStringTransformer::ROUND_HALF_DOWN],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
index 176d3a9a58f9e..1f05af6128ca7 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
@@ -26,15 +26,15 @@ protected function setUp()
 
     public function provideTransformations()
     {
-        return array(
-            array(null, '', 'de_AT'),
-            array(1, '1', 'de_AT'),
-            array(1.5, '1,5', 'de_AT'),
-            array(1234.5, '1234,5', 'de_AT'),
-            array(12345.912, '12345,912', 'de_AT'),
-            array(1234.5, '1234,5', 'ru'),
-            array(1234.5, '1234,5', 'fi'),
-        );
+        return [
+            [null, '', 'de_AT'],
+            [1, '1', 'de_AT'],
+            [1.5, '1,5', 'de_AT'],
+            [1234.5, '1234,5', 'de_AT'],
+            [12345.912, '12345,912', 'de_AT'],
+            [1234.5, '1234,5', 'ru'],
+            [1234.5, '1234,5', 'fi'],
+        ];
     }
 
     /**
@@ -54,13 +54,13 @@ public function testTransform($from, $to, $locale)
 
     public function provideTransformationsWithGrouping()
     {
-        return array(
-            array(1234.5, '1.234,5', 'de_DE'),
-            array(12345.912, '12.345,912', 'de_DE'),
-            array(1234.5, '1 234,5', 'fr'),
-            array(1234.5, '1 234,5', 'ru'),
-            array(1234.5, '1 234,5', 'fi'),
-        );
+        return [
+            [1234.5, '1.234,5', 'de_DE'],
+            [12345.912, '12.345,912', 'de_DE'],
+            [1234.5, '1 234,5', 'fr'],
+            [1234.5, '1 234,5', 'ru'],
+            [1234.5, '1 234,5', 'fi'],
+        ];
     }
 
     /**
@@ -93,91 +93,91 @@ public function testTransformWithScale()
 
     public function transformWithRoundingProvider()
     {
-        return array(
+        return [
             // towards positive infinity (1.6 -> 2, -1.6 -> -1)
-            array(0, 1234.5, '1235', NumberToLocalizedStringTransformer::ROUND_CEILING),
-            array(0, 1234.4, '1235', NumberToLocalizedStringTransformer::ROUND_CEILING),
-            array(0, -1234.5, '-1234', NumberToLocalizedStringTransformer::ROUND_CEILING),
-            array(0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_CEILING),
-            array(1, 123.45, '123,5', NumberToLocalizedStringTransformer::ROUND_CEILING),
-            array(1, 123.44, '123,5', NumberToLocalizedStringTransformer::ROUND_CEILING),
-            array(1, -123.45, '-123,4', NumberToLocalizedStringTransformer::ROUND_CEILING),
-            array(1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_CEILING),
+            [0, 1234.5, '1235', NumberToLocalizedStringTransformer::ROUND_CEILING],
+            [0, 1234.4, '1235', NumberToLocalizedStringTransformer::ROUND_CEILING],
+            [0, -1234.5, '-1234', NumberToLocalizedStringTransformer::ROUND_CEILING],
+            [0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_CEILING],
+            [1, 123.45, '123,5', NumberToLocalizedStringTransformer::ROUND_CEILING],
+            [1, 123.44, '123,5', NumberToLocalizedStringTransformer::ROUND_CEILING],
+            [1, -123.45, '-123,4', NumberToLocalizedStringTransformer::ROUND_CEILING],
+            [1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_CEILING],
             // towards negative infinity (1.6 -> 1, -1.6 -> -2)
-            array(0, 1234.5, '1234', NumberToLocalizedStringTransformer::ROUND_FLOOR),
-            array(0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_FLOOR),
-            array(0, -1234.5, '-1235', NumberToLocalizedStringTransformer::ROUND_FLOOR),
-            array(0, -1234.4, '-1235', NumberToLocalizedStringTransformer::ROUND_FLOOR),
-            array(1, 123.45, '123,4', NumberToLocalizedStringTransformer::ROUND_FLOOR),
-            array(1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_FLOOR),
-            array(1, -123.45, '-123,5', NumberToLocalizedStringTransformer::ROUND_FLOOR),
-            array(1, -123.44, '-123,5', NumberToLocalizedStringTransformer::ROUND_FLOOR),
+            [0, 1234.5, '1234', NumberToLocalizedStringTransformer::ROUND_FLOOR],
+            [0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_FLOOR],
+            [0, -1234.5, '-1235', NumberToLocalizedStringTransformer::ROUND_FLOOR],
+            [0, -1234.4, '-1235', NumberToLocalizedStringTransformer::ROUND_FLOOR],
+            [1, 123.45, '123,4', NumberToLocalizedStringTransformer::ROUND_FLOOR],
+            [1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_FLOOR],
+            [1, -123.45, '-123,5', NumberToLocalizedStringTransformer::ROUND_FLOOR],
+            [1, -123.44, '-123,5', NumberToLocalizedStringTransformer::ROUND_FLOOR],
             // away from zero (1.6 -> 2, -1.6 -> 2)
-            array(0, 1234.5, '1235', NumberToLocalizedStringTransformer::ROUND_UP),
-            array(0, 1234.4, '1235', NumberToLocalizedStringTransformer::ROUND_UP),
-            array(0, -1234.5, '-1235', NumberToLocalizedStringTransformer::ROUND_UP),
-            array(0, -1234.4, '-1235', NumberToLocalizedStringTransformer::ROUND_UP),
-            array(1, 123.45, '123,5', NumberToLocalizedStringTransformer::ROUND_UP),
-            array(1, 123.44, '123,5', NumberToLocalizedStringTransformer::ROUND_UP),
-            array(1, -123.45, '-123,5', NumberToLocalizedStringTransformer::ROUND_UP),
-            array(1, -123.44, '-123,5', NumberToLocalizedStringTransformer::ROUND_UP),
+            [0, 1234.5, '1235', NumberToLocalizedStringTransformer::ROUND_UP],
+            [0, 1234.4, '1235', NumberToLocalizedStringTransformer::ROUND_UP],
+            [0, -1234.5, '-1235', NumberToLocalizedStringTransformer::ROUND_UP],
+            [0, -1234.4, '-1235', NumberToLocalizedStringTransformer::ROUND_UP],
+            [1, 123.45, '123,5', NumberToLocalizedStringTransformer::ROUND_UP],
+            [1, 123.44, '123,5', NumberToLocalizedStringTransformer::ROUND_UP],
+            [1, -123.45, '-123,5', NumberToLocalizedStringTransformer::ROUND_UP],
+            [1, -123.44, '-123,5', NumberToLocalizedStringTransformer::ROUND_UP],
             // towards zero (1.6 -> 1, -1.6 -> -1)
-            array(0, 1234.5, '1234', NumberToLocalizedStringTransformer::ROUND_DOWN),
-            array(0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_DOWN),
-            array(0, -1234.5, '-1234', NumberToLocalizedStringTransformer::ROUND_DOWN),
-            array(0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_DOWN),
-            array(1, 123.45, '123,4', NumberToLocalizedStringTransformer::ROUND_DOWN),
-            array(1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_DOWN),
-            array(1, -123.45, '-123,4', NumberToLocalizedStringTransformer::ROUND_DOWN),
-            array(1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_DOWN),
+            [0, 1234.5, '1234', NumberToLocalizedStringTransformer::ROUND_DOWN],
+            [0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_DOWN],
+            [0, -1234.5, '-1234', NumberToLocalizedStringTransformer::ROUND_DOWN],
+            [0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_DOWN],
+            [1, 123.45, '123,4', NumberToLocalizedStringTransformer::ROUND_DOWN],
+            [1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_DOWN],
+            [1, -123.45, '-123,4', NumberToLocalizedStringTransformer::ROUND_DOWN],
+            [1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_DOWN],
             // round halves (.5) to the next even number
-            array(0, 1234.6, '1235', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(0, 1234.5, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(0, 1233.5, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(0, 1232.5, '1232', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(0, -1234.6, '-1235', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(0, -1234.5, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(0, -1233.5, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(0, -1232.5, '-1232', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, 123.46, '123,5', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, 123.45, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, 123.35, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, 123.25, '123,2', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, -123.46, '-123,5', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, -123.45, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, -123.35, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, -123.25, '-123,2', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
+            [0, 1234.6, '1235', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [0, 1234.5, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [0, 1233.5, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [0, 1232.5, '1232', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [0, -1234.6, '-1235', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [0, -1234.5, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [0, -1233.5, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [0, -1232.5, '-1232', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, 123.46, '123,5', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, 123.45, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, 123.35, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, 123.25, '123,2', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, -123.46, '-123,5', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, -123.45, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, -123.35, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, -123.25, '-123,2', NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
             // round halves (.5) away from zero
-            array(0, 1234.6, '1235', NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(0, 1234.5, '1235', NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(0, -1234.6, '-1235', NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(0, -1234.5, '-1235', NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(1, 123.46, '123,5', NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(1, 123.45, '123,5', NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(1, -123.46, '-123,5', NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(1, -123.45, '-123,5', NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_UP),
+            [0, 1234.6, '1235', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [0, 1234.5, '1235', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [0, -1234.6, '-1235', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [0, -1234.5, '-1235', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [1, 123.46, '123,5', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [1, 123.45, '123,5', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [1, -123.46, '-123,5', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [1, -123.45, '-123,5', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_UP],
             // round halves (.5) towards zero
-            array(0, 1234.6, '1235', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(0, 1234.5, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(0, -1234.6, '-1235', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(0, -1234.5, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(1, 123.46, '123,5', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(1, 123.45, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(1, -123.46, '-123,5', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(1, -123.45, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-        );
+            [0, 1234.6, '1235', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [0, 1234.5, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [0, 1234.4, '1234', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [0, -1234.6, '-1235', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [0, -1234.5, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [0, -1234.4, '-1234', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [1, 123.46, '123,5', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [1, 123.45, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [1, 123.44, '123,4', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [1, -123.46, '-123,5', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [1, -123.45, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [1, -123.44, '-123,4', NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+        ];
     }
 
     /**
@@ -268,93 +268,93 @@ public function testReverseTransformWithGroupingButWithoutGroupSeparator()
 
     public function reverseTransformWithRoundingProvider()
     {
-        return array(
+        return [
             // towards positive infinity (1.6 -> 2, -1.6 -> -1)
-            array(0, '1234,5', 1235, NumberToLocalizedStringTransformer::ROUND_CEILING),
-            array(0, '1234,4', 1235, NumberToLocalizedStringTransformer::ROUND_CEILING),
-            array(0, '-1234,5', -1234, NumberToLocalizedStringTransformer::ROUND_CEILING),
-            array(0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_CEILING),
-            array(1, '123,45', 123.5, NumberToLocalizedStringTransformer::ROUND_CEILING),
-            array(1, '123,44', 123.5, NumberToLocalizedStringTransformer::ROUND_CEILING),
-            array(1, '-123,45', -123.4, NumberToLocalizedStringTransformer::ROUND_CEILING),
-            array(1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_CEILING),
+            [0, '1234,5', 1235, NumberToLocalizedStringTransformer::ROUND_CEILING],
+            [0, '1234,4', 1235, NumberToLocalizedStringTransformer::ROUND_CEILING],
+            [0, '-1234,5', -1234, NumberToLocalizedStringTransformer::ROUND_CEILING],
+            [0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_CEILING],
+            [1, '123,45', 123.5, NumberToLocalizedStringTransformer::ROUND_CEILING],
+            [1, '123,44', 123.5, NumberToLocalizedStringTransformer::ROUND_CEILING],
+            [1, '-123,45', -123.4, NumberToLocalizedStringTransformer::ROUND_CEILING],
+            [1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_CEILING],
             // towards negative infinity (1.6 -> 1, -1.6 -> -2)
-            array(0, '1234,5', 1234, NumberToLocalizedStringTransformer::ROUND_FLOOR),
-            array(0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_FLOOR),
-            array(0, '-1234,5', -1235, NumberToLocalizedStringTransformer::ROUND_FLOOR),
-            array(0, '-1234,4', -1235, NumberToLocalizedStringTransformer::ROUND_FLOOR),
-            array(1, '123,45', 123.4, NumberToLocalizedStringTransformer::ROUND_FLOOR),
-            array(1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_FLOOR),
-            array(1, '-123,45', -123.5, NumberToLocalizedStringTransformer::ROUND_FLOOR),
-            array(1, '-123,44', -123.5, NumberToLocalizedStringTransformer::ROUND_FLOOR),
+            [0, '1234,5', 1234, NumberToLocalizedStringTransformer::ROUND_FLOOR],
+            [0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_FLOOR],
+            [0, '-1234,5', -1235, NumberToLocalizedStringTransformer::ROUND_FLOOR],
+            [0, '-1234,4', -1235, NumberToLocalizedStringTransformer::ROUND_FLOOR],
+            [1, '123,45', 123.4, NumberToLocalizedStringTransformer::ROUND_FLOOR],
+            [1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_FLOOR],
+            [1, '-123,45', -123.5, NumberToLocalizedStringTransformer::ROUND_FLOOR],
+            [1, '-123,44', -123.5, NumberToLocalizedStringTransformer::ROUND_FLOOR],
             // away from zero (1.6 -> 2, -1.6 -> 2)
-            array(0, '1234,5', 1235, NumberToLocalizedStringTransformer::ROUND_UP),
-            array(0, '1234,4', 1235, NumberToLocalizedStringTransformer::ROUND_UP),
-            array(0, '-1234,5', -1235, NumberToLocalizedStringTransformer::ROUND_UP),
-            array(0, '-1234,4', -1235, NumberToLocalizedStringTransformer::ROUND_UP),
-            array(1, '123,45', 123.5, NumberToLocalizedStringTransformer::ROUND_UP),
-            array(1, '123,44', 123.5, NumberToLocalizedStringTransformer::ROUND_UP),
-            array(1, '-123,45', -123.5, NumberToLocalizedStringTransformer::ROUND_UP),
-            array(1, '-123,44', -123.5, NumberToLocalizedStringTransformer::ROUND_UP),
+            [0, '1234,5', 1235, NumberToLocalizedStringTransformer::ROUND_UP],
+            [0, '1234,4', 1235, NumberToLocalizedStringTransformer::ROUND_UP],
+            [0, '-1234,5', -1235, NumberToLocalizedStringTransformer::ROUND_UP],
+            [0, '-1234,4', -1235, NumberToLocalizedStringTransformer::ROUND_UP],
+            [1, '123,45', 123.5, NumberToLocalizedStringTransformer::ROUND_UP],
+            [1, '123,44', 123.5, NumberToLocalizedStringTransformer::ROUND_UP],
+            [1, '-123,45', -123.5, NumberToLocalizedStringTransformer::ROUND_UP],
+            [1, '-123,44', -123.5, NumberToLocalizedStringTransformer::ROUND_UP],
             // towards zero (1.6 -> 1, -1.6 -> -1)
-            array(0, '1234,5', 1234, NumberToLocalizedStringTransformer::ROUND_DOWN),
-            array(0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_DOWN),
-            array(0, '-1234,5', -1234, NumberToLocalizedStringTransformer::ROUND_DOWN),
-            array(0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_DOWN),
-            array(1, '123,45', 123.4, NumberToLocalizedStringTransformer::ROUND_DOWN),
-            array(1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_DOWN),
-            array(1, '-123,45', -123.4, NumberToLocalizedStringTransformer::ROUND_DOWN),
-            array(1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_DOWN),
-            array(2, '37.37', 37.37, NumberToLocalizedStringTransformer::ROUND_DOWN),
-            array(2, '2.01', 2.01, NumberToLocalizedStringTransformer::ROUND_DOWN),
+            [0, '1234,5', 1234, NumberToLocalizedStringTransformer::ROUND_DOWN],
+            [0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_DOWN],
+            [0, '-1234,5', -1234, NumberToLocalizedStringTransformer::ROUND_DOWN],
+            [0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_DOWN],
+            [1, '123,45', 123.4, NumberToLocalizedStringTransformer::ROUND_DOWN],
+            [1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_DOWN],
+            [1, '-123,45', -123.4, NumberToLocalizedStringTransformer::ROUND_DOWN],
+            [1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_DOWN],
+            [2, '37.37', 37.37, NumberToLocalizedStringTransformer::ROUND_DOWN],
+            [2, '2.01', 2.01, NumberToLocalizedStringTransformer::ROUND_DOWN],
             // round halves (.5) to the next even number
-            array(0, '1234,6', 1235, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(0, '1234,5', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(0, '1233,5', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(0, '1232,5', 1232, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(0, '-1234,6', -1235, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(0, '-1234,5', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(0, '-1233,5', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(0, '-1232,5', -1232, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, '123,46', 123.5, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, '123,45', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, '123,35', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, '123,25', 123.2, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, '-123,46', -123.5, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, '-123,45', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, '-123,35', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
-            array(1, '-123,25', -123.2, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN),
+            [0, '1234,6', 1235, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [0, '1234,5', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [0, '1233,5', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [0, '1232,5', 1232, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [0, '-1234,6', -1235, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [0, '-1234,5', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [0, '-1233,5', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [0, '-1232,5', -1232, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, '123,46', 123.5, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, '123,45', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, '123,35', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, '123,25', 123.2, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, '-123,46', -123.5, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, '-123,45', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, '-123,35', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
+            [1, '-123,25', -123.2, NumberToLocalizedStringTransformer::ROUND_HALF_EVEN],
             // round halves (.5) away from zero
-            array(0, '1234,6', 1235, NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(0, '1234,5', 1235, NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(0, '-1234,6', -1235, NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(0, '-1234,5', -1235, NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(1, '123,46', 123.5, NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(1, '123,45', 123.5, NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(1, '-123,46', -123.5, NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(1, '-123,45', -123.5, NumberToLocalizedStringTransformer::ROUND_HALF_UP),
-            array(1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_UP),
+            [0, '1234,6', 1235, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [0, '1234,5', 1235, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [0, '-1234,6', -1235, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [0, '-1234,5', -1235, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [1, '123,46', 123.5, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [1, '123,45', 123.5, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [1, '-123,46', -123.5, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [1, '-123,45', -123.5, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
+            [1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_UP],
             // round halves (.5) towards zero
-            array(0, '1234,6', 1235, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(0, '1234,5', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(0, '-1234,6', -1235, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(0, '-1234,5', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(1, '123,46', 123.5, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(1, '123,45', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(1, '-123,46', -123.5, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(1, '-123,45', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-            array(1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN),
-        );
+            [0, '1234,6', 1235, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [0, '1234,5', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [0, '1234,4', 1234, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [0, '-1234,6', -1235, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [0, '-1234,5', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [0, '-1234,4', -1234, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [1, '123,46', 123.5, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [1, '123,45', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [1, '123,44', 123.4, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [1, '-123,46', -123.5, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [1, '-123,45', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+            [1, '-123,44', -123.4, NumberToLocalizedStringTransformer::ROUND_HALF_DOWN],
+        ];
     }
 
     /**
@@ -527,11 +527,11 @@ public function testReverseTransformDisallowsNaN($nan)
 
     public function nanRepresentationProvider()
     {
-        return array(
-            array('nan'),
-            array('NaN'), // see https://github.com/symfony/symfony/issues/3161
-            array('NAN'),
-        );
+        return [
+            ['nan'],
+            ['NaN'], // see https://github.com/symfony/symfony/issues/3161
+            ['NAN'],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
index 3467e891c9bdd..c6007a398b861 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
@@ -226,8 +226,8 @@ public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsCommaButNoGro
         $formatter->setAttribute(\NumberFormatter::GROUPING_USED, false);
 
         $transformer = $this->getMockBuilder('Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer')
-            ->setMethods(array('getNumberFormatter'))
-            ->setConstructorArgs(array(1, 'integer'))
+            ->setMethods(['getNumberFormatter'])
+            ->setConstructorArgs([1, 'integer'])
             ->getMock();
         $transformer->expects($this->any())
             ->method('getNumberFormatter')
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php
index 5c1d56264ed80..3ef681da66b4d 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php
@@ -20,7 +20,7 @@ class ValueToDuplicatesTransformerTest extends TestCase
 
     protected function setUp()
     {
-        $this->transformer = new ValueToDuplicatesTransformer(array('a', 'b', 'c'));
+        $this->transformer = new ValueToDuplicatesTransformer(['a', 'b', 'c']);
     }
 
     protected function tearDown()
@@ -30,77 +30,77 @@ protected function tearDown()
 
     public function testTransform()
     {
-        $output = array(
+        $output = [
             'a' => 'Foo',
             'b' => 'Foo',
             'c' => 'Foo',
-        );
+        ];
 
         $this->assertSame($output, $this->transformer->transform('Foo'));
     }
 
     public function testTransformEmpty()
     {
-        $output = array(
+        $output = [
             'a' => null,
             'b' => null,
             'c' => null,
-        );
+        ];
 
         $this->assertSame($output, $this->transformer->transform(null));
     }
 
     public function testReverseTransform()
     {
-        $input = array(
+        $input = [
             'a' => 'Foo',
             'b' => 'Foo',
             'c' => 'Foo',
-        );
+        ];
 
         $this->assertSame('Foo', $this->transformer->reverseTransform($input));
     }
 
     public function testReverseTransformCompletelyEmpty()
     {
-        $input = array(
+        $input = [
             'a' => '',
             'b' => '',
             'c' => '',
-        );
+        ];
 
         $this->assertNull($this->transformer->reverseTransform($input));
     }
 
     public function testReverseTransformCompletelyNull()
     {
-        $input = array(
+        $input = [
             'a' => null,
             'b' => null,
             'c' => null,
-        );
+        ];
 
         $this->assertNull($this->transformer->reverseTransform($input));
     }
 
     public function testReverseTransformEmptyArray()
     {
-        $input = array(
-            'a' => array(),
-            'b' => array(),
-            'c' => array(),
-        );
+        $input = [
+            'a' => [],
+            'b' => [],
+            'c' => [],
+        ];
 
         $this->assertNull($this->transformer->reverseTransform($input));
     }
 
     public function testReverseTransformZeroString()
     {
-        $input = array(
+        $input = [
             'a' => '0',
             'b' => '0',
             'c' => '0',
-        );
+        ];
 
         $this->assertSame('0', $this->transformer->reverseTransform($input));
     }
@@ -110,11 +110,11 @@ public function testReverseTransformZeroString()
      */
     public function testReverseTransformPartiallyNull()
     {
-        $input = array(
+        $input = [
             'a' => 'Foo',
             'b' => 'Foo',
             'c' => null,
-        );
+        ];
 
         $this->transformer->reverseTransform($input);
     }
@@ -124,11 +124,11 @@ public function testReverseTransformPartiallyNull()
      */
     public function testReverseTransformDifferences()
     {
-        $input = array(
+        $input = [
             'a' => 'Foo',
             'b' => 'Bar',
             'c' => 'Foo',
-        );
+        ];
 
         $this->transformer->reverseTransform($input);
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php
index 454aaa85617c8..7861e12197e41 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php
@@ -43,13 +43,13 @@ public function testSkipKnownUrl()
 
     public function provideUrlsWithSupportedProtocols()
     {
-        return array(
-            array('ftp://www.symfony.com'),
-            array('chrome-extension://foo'),
-            array('h323://foo'),
-            array('iris.beep://foo'),
-            array('foo+bar://foo'),
-        );
+        return [
+            ['ftp://www.symfony.com'],
+            ['chrome-extension://foo'],
+            ['h323://foo'],
+            ['iris.beep://foo'],
+            ['foo+bar://foo'],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php
index 627d7bb3f1e6f..41b7d18bd5be4 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php
@@ -51,20 +51,20 @@ protected function getMockForm()
 
     public function getBooleanMatrix1()
     {
-        return array(
-            array(true),
-            array(false),
-        );
+        return [
+            [true],
+            [false],
+        ];
     }
 
     public function getBooleanMatrix2()
     {
-        return array(
-            array(true, true),
-            array(true, false),
-            array(false, true),
-            array(false, false),
-        );
+        return [
+            [true, true],
+            [true, false],
+            [false, true],
+            [false, false],
+        ];
     }
 
     abstract protected function getData(array $data);
@@ -74,8 +74,8 @@ abstract protected function getData(array $data);
      */
     public function testAddExtraEntriesIfAllowAdd($allowDelete)
     {
-        $originalData = $this->getData(array(1 => 'second'));
-        $newData = $this->getData(array(0 => 'first', 1 => 'second', 2 => 'third'));
+        $originalData = $this->getData([1 => 'second']);
+        $newData = $this->getData([0 => 'first', 1 => 'second', 2 => 'third']);
 
         $listener = new MergeCollectionListener(true, $allowDelete);
 
@@ -98,8 +98,8 @@ public function testAddExtraEntriesIfAllowAdd($allowDelete)
      */
     public function testAddExtraEntriesIfAllowAddDontOverwriteExistingIndices($allowDelete)
     {
-        $originalData = $this->getData(array(1 => 'first'));
-        $newData = $this->getData(array(0 => 'first', 1 => 'second'));
+        $originalData = $this->getData([1 => 'first']);
+        $newData = $this->getData([0 => 'first', 1 => 'second']);
 
         $listener = new MergeCollectionListener(true, $allowDelete);
 
@@ -114,7 +114,7 @@ public function testAddExtraEntriesIfAllowAddDontOverwriteExistingIndices($allow
         }
 
         // The original object matches the new object
-        $this->assertEquals($this->getData(array(1 => 'first', 2 => 'second')), $event->getData());
+        $this->assertEquals($this->getData([1 => 'first', 2 => 'second']), $event->getData());
     }
 
     /**
@@ -122,9 +122,9 @@ public function testAddExtraEntriesIfAllowAddDontOverwriteExistingIndices($allow
      */
     public function testDoNothingIfNotAllowAdd($allowDelete)
     {
-        $originalDataArray = array(1 => 'second');
+        $originalDataArray = [1 => 'second'];
         $originalData = $this->getData($originalDataArray);
-        $newData = $this->getData(array(0 => 'first', 1 => 'second', 2 => 'third'));
+        $newData = $this->getData([0 => 'first', 1 => 'second', 2 => 'third']);
 
         $listener = new MergeCollectionListener(false, $allowDelete);
 
@@ -147,8 +147,8 @@ public function testDoNothingIfNotAllowAdd($allowDelete)
      */
     public function testRemoveMissingEntriesIfAllowDelete($allowAdd)
     {
-        $originalData = $this->getData(array(0 => 'first', 1 => 'second', 2 => 'third'));
-        $newData = $this->getData(array(1 => 'second'));
+        $originalData = $this->getData([0 => 'first', 1 => 'second', 2 => 'third']);
+        $newData = $this->getData([1 => 'second']);
 
         $listener = new MergeCollectionListener($allowAdd, true);
 
@@ -171,9 +171,9 @@ public function testRemoveMissingEntriesIfAllowDelete($allowAdd)
      */
     public function testDoNothingIfNotAllowDelete($allowAdd)
     {
-        $originalDataArray = array(0 => 'first', 1 => 'second', 2 => 'third');
+        $originalDataArray = [0 => 'first', 1 => 'second', 2 => 'third'];
         $originalData = $this->getData($originalDataArray);
-        $newData = $this->getData(array(1 => 'second'));
+        $newData = $this->getData([1 => 'second']);
 
         $listener = new MergeCollectionListener($allowAdd, false);
 
@@ -205,7 +205,7 @@ public function testRequireArrayOrTraversable($allowAdd, $allowDelete)
 
     public function testDealWithNullData()
     {
-        $originalData = $this->getData(array(0 => 'first', 1 => 'second', 2 => 'third'));
+        $originalData = $this->getData([0 => 'first', 1 => 'second', 2 => 'third']);
         $newData = null;
 
         $listener = new MergeCollectionListener(false, false);
@@ -224,7 +224,7 @@ public function testDealWithNullData()
     public function testDealWithNullOriginalDataIfAllowAdd($allowDelete)
     {
         $originalData = null;
-        $newData = $this->getData(array(0 => 'first', 1 => 'second', 2 => 'third'));
+        $newData = $this->getData([0 => 'first', 1 => 'second', 2 => 'third']);
 
         $listener = new MergeCollectionListener(true, $allowDelete);
 
@@ -242,7 +242,7 @@ public function testDealWithNullOriginalDataIfAllowAdd($allowDelete)
     public function testDontDealWithNullOriginalDataIfNotAllowAdd($allowDelete)
     {
         $originalData = null;
-        $newData = $this->getData(array(0 => 'first', 1 => 'second', 2 => 'third'));
+        $newData = $this->getData([0 => 'first', 1 => 'second', 2 => 'third']);
 
         $listener = new MergeCollectionListener(false, $allowDelete);
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
index 017c1bdc040c9..daa3a8de0948a 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
@@ -70,16 +70,16 @@ public function testPreSetDataResizesForm()
 
         $this->factory->expects($this->at(0))
             ->method('createNamed')
-            ->with(1, 'text', null, array('property_path' => '[1]', 'attr' => array('maxlength' => 10), 'auto_initialize' => false))
+            ->with(1, 'text', null, ['property_path' => '[1]', 'attr' => ['maxlength' => 10], 'auto_initialize' => false])
             ->will($this->returnValue($this->getForm('1')));
         $this->factory->expects($this->at(1))
             ->method('createNamed')
-            ->with(2, 'text', null, array('property_path' => '[2]', 'attr' => array('maxlength' => 10), 'auto_initialize' => false))
+            ->with(2, 'text', null, ['property_path' => '[2]', 'attr' => ['maxlength' => 10], 'auto_initialize' => false])
             ->will($this->returnValue($this->getForm('2')));
 
-        $data = array(1 => 'string', 2 => 'string');
+        $data = [1 => 'string', 2 => 'string'];
         $event = new FormEvent($this->form, $data);
-        $listener = new ResizeFormListener('text', array('attr' => array('maxlength' => 10)), false, false);
+        $listener = new ResizeFormListener('text', ['attr' => ['maxlength' => 10]], false, false);
         $listener->preSetData($event);
 
         $this->assertFalse($this->form->has('0'));
@@ -94,7 +94,7 @@ public function testPreSetDataRequiresArrayOrTraversable()
     {
         $data = 'no array or traversable';
         $event = new FormEvent($this->form, $data);
-        $listener = new ResizeFormListener('text', array(), false, false);
+        $listener = new ResizeFormListener('text', [], false, false);
         $listener->preSetData($event);
     }
 
@@ -104,7 +104,7 @@ public function testPreSetDataDealsWithNullData()
 
         $data = null;
         $event = new FormEvent($this->form, $data);
-        $listener = new ResizeFormListener('text', array(), false, false);
+        $listener = new ResizeFormListener('text', [], false, false);
         $listener->preSetData($event);
     }
 
@@ -114,12 +114,12 @@ public function testPreSubmitResizesUpIfAllowAdd()
 
         $this->factory->expects($this->once())
             ->method('createNamed')
-            ->with(1, 'text', null, array('property_path' => '[1]', 'attr' => array('maxlength' => 10), 'auto_initialize' => false))
+            ->with(1, 'text', null, ['property_path' => '[1]', 'attr' => ['maxlength' => 10], 'auto_initialize' => false])
             ->will($this->returnValue($this->getForm('1')));
 
-        $data = array(0 => 'string', 1 => 'string');
+        $data = [0 => 'string', 1 => 'string'];
         $event = new FormEvent($this->form, $data);
-        $listener = new ResizeFormListener('text', array('attr' => array('maxlength' => 10)), true, false);
+        $listener = new ResizeFormListener('text', ['attr' => ['maxlength' => 10]], true, false);
         $listener->preSubmit($event);
 
         $this->assertTrue($this->form->has('0'));
@@ -131,9 +131,9 @@ public function testPreSubmitResizesDownIfAllowDelete()
         $this->form->add($this->getForm('0'));
         $this->form->add($this->getForm('1'));
 
-        $data = array(0 => 'string');
+        $data = [0 => 'string'];
         $event = new FormEvent($this->form, $data);
-        $listener = new ResizeFormListener('text', array(), false, true);
+        $listener = new ResizeFormListener('text', [], false, true);
         $listener->preSubmit($event);
 
         $this->assertTrue($this->form->has('0'));
@@ -145,9 +145,9 @@ public function testPreSubmitRemovesZeroKeys()
     {
         $this->form->add($this->getForm('0'));
 
-        $data = array();
+        $data = [];
         $event = new FormEvent($this->form, $data);
-        $listener = new ResizeFormListener('text', array(), false, true);
+        $listener = new ResizeFormListener('text', [], false, true);
         $listener->preSubmit($event);
 
         $this->assertFalse($this->form->has('0'));
@@ -158,9 +158,9 @@ public function testPreSubmitDoesNothingIfNotAllowAddNorAllowDelete()
         $this->form->add($this->getForm('0'));
         $this->form->add($this->getForm('1'));
 
-        $data = array(0 => 'string', 2 => 'string');
+        $data = [0 => 'string', 2 => 'string'];
         $event = new FormEvent($this->form, $data);
-        $listener = new ResizeFormListener('text', array(), false, false);
+        $listener = new ResizeFormListener('text', [], false, false);
         $listener->preSubmit($event);
 
         $this->assertTrue($this->form->has('0'));
@@ -172,7 +172,7 @@ public function testPreSubmitDealsWithNoArrayOrTraversable()
     {
         $data = 'no array or traversable';
         $event = new FormEvent($this->form, $data);
-        $listener = new ResizeFormListener('text', array(), false, false);
+        $listener = new ResizeFormListener('text', [], false, false);
         $listener->preSubmit($event);
 
         $this->assertFalse($this->form->has('1'));
@@ -184,7 +184,7 @@ public function testPreSubmitDealsWithNullData()
 
         $data = null;
         $event = new FormEvent($this->form, $data);
-        $listener = new ResizeFormListener('text', array(), false, true);
+        $listener = new ResizeFormListener('text', [], false, true);
         $listener->preSubmit($event);
 
         $this->assertFalse($this->form->has('1'));
@@ -197,7 +197,7 @@ public function testPreSubmitDealsWithEmptyData()
 
         $data = '';
         $event = new FormEvent($this->form, $data);
-        $listener = new ResizeFormListener('text', array(), false, true);
+        $listener = new ResizeFormListener('text', [], false, true);
         $listener->preSubmit($event);
 
         $this->assertFalse($this->form->has('1'));
@@ -207,21 +207,21 @@ public function testOnSubmitNormDataRemovesEntriesMissingInTheFormIfAllowDelete(
     {
         $this->form->add($this->getForm('1'));
 
-        $data = array(0 => 'first', 1 => 'second', 2 => 'third');
+        $data = [0 => 'first', 1 => 'second', 2 => 'third'];
         $event = new FormEvent($this->form, $data);
-        $listener = new ResizeFormListener('text', array(), false, true);
+        $listener = new ResizeFormListener('text', [], false, true);
         $listener->onSubmit($event);
 
-        $this->assertEquals(array(1 => 'second'), $event->getData());
+        $this->assertEquals([1 => 'second'], $event->getData());
     }
 
     public function testOnSubmitNormDataDoesNothingIfNotAllowDelete()
     {
         $this->form->add($this->getForm('1'));
 
-        $data = array(0 => 'first', 1 => 'second', 2 => 'third');
+        $data = [0 => 'first', 1 => 'second', 2 => 'third'];
         $event = new FormEvent($this->form, $data);
-        $listener = new ResizeFormListener('text', array(), false, false);
+        $listener = new ResizeFormListener('text', [], false, false);
         $listener->onSubmit($event);
 
         $this->assertEquals($data, $event->getData());
@@ -234,7 +234,7 @@ public function testOnSubmitNormDataRequiresArrayOrTraversable()
     {
         $data = 'no array or traversable';
         $event = new FormEvent($this->form, $data);
-        $listener = new ResizeFormListener('text', array(), false, false);
+        $listener = new ResizeFormListener('text', [], false, false);
         $listener->onSubmit($event);
     }
 
@@ -244,19 +244,19 @@ public function testOnSubmitNormDataDealsWithNullData()
 
         $data = null;
         $event = new FormEvent($this->form, $data);
-        $listener = new ResizeFormListener('text', array(), false, true);
+        $listener = new ResizeFormListener('text', [], false, true);
         $listener->onSubmit($event);
 
-        $this->assertEquals(array(), $event->getData());
+        $this->assertEquals([], $event->getData());
     }
 
     public function testOnSubmitDealsWithObjectBackedIteratorAggregate()
     {
         $this->form->add($this->getForm('1'));
 
-        $data = new \ArrayObject(array(0 => 'first', 1 => 'second', 2 => 'third'));
+        $data = new \ArrayObject([0 => 'first', 1 => 'second', 2 => 'third']);
         $event = new FormEvent($this->form, $data);
-        $listener = new ResizeFormListener('text', array(), false, true);
+        $listener = new ResizeFormListener('text', [], false, true);
         $listener->onSubmit($event);
 
         $this->assertArrayNotHasKey(0, $event->getData());
@@ -267,9 +267,9 @@ public function testOnSubmitDealsWithArrayBackedIteratorAggregate()
     {
         $this->form->add($this->getForm('1'));
 
-        $data = new ArrayCollection(array(0 => 'first', 1 => 'second', 2 => 'third'));
+        $data = new ArrayCollection([0 => 'first', 1 => 'second', 2 => 'third']);
         $event = new FormEvent($this->form, $data);
-        $listener = new ResizeFormListener('text', array(), false, true);
+        $listener = new ResizeFormListener('text', [], false, true);
         $listener->onSubmit($event);
 
         $this->assertArrayNotHasKey(0, $event->getData());
@@ -278,24 +278,24 @@ public function testOnSubmitDealsWithArrayBackedIteratorAggregate()
 
     public function testOnSubmitDeleteEmptyNotCompoundEntriesIfAllowDelete()
     {
-        $this->form->setData(array('0' => 'first', '1' => 'second'));
+        $this->form->setData(['0' => 'first', '1' => 'second']);
         $this->form->add($this->getForm('0'));
         $this->form->add($this->getForm('1'));
 
-        $data = array(0 => 'first', 1 => '');
+        $data = [0 => 'first', 1 => ''];
         foreach ($data as $child => $dat) {
             $this->form->get($child)->setData($dat);
         }
         $event = new FormEvent($this->form, $data);
-        $listener = new ResizeFormListener('text', array(), false, true, true);
+        $listener = new ResizeFormListener('text', [], false, true, true);
         $listener->onSubmit($event);
 
-        $this->assertEquals(array(0 => 'first'), $event->getData());
+        $this->assertEquals([0 => 'first'], $event->getData());
     }
 
     public function testOnSubmitDeleteEmptyCompoundEntriesIfAllowDelete()
     {
-        $this->form->setData(array('0' => array('name' => 'John'), '1' => array('name' => 'Jane')));
+        $this->form->setData(['0' => ['name' => 'John'], '1' => ['name' => 'Jane']]);
         $form1 = $this->getBuilder('0')
             ->setCompound(true)
             ->setDataMapper($this->getDataMapper())
@@ -309,7 +309,7 @@ public function testOnSubmitDeleteEmptyCompoundEntriesIfAllowDelete()
         $this->form->add($form1);
         $this->form->add($form2);
 
-        $data = array('0' => array('name' => 'John'), '1' => array('name' => ''));
+        $data = ['0' => ['name' => 'John'], '1' => ['name' => '']];
         foreach ($data as $child => $dat) {
             $this->form->get($child)->setData($dat);
         }
@@ -317,9 +317,9 @@ public function testOnSubmitDeleteEmptyCompoundEntriesIfAllowDelete()
         $callback = function ($data) {
             return '' === $data['name'];
         };
-        $listener = new ResizeFormListener('text', array(), false, true, $callback);
+        $listener = new ResizeFormListener('text', [], false, true, $callback);
         $listener->onSubmit($event);
 
-        $this->assertEquals(array('0' => array('name' => 'John')), $event->getData());
+        $this->assertEquals(['0' => ['name' => 'John']], $event->getData());
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php
index da3f48b486621..92eff38669ff2 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php
@@ -22,7 +22,7 @@ abstract class BaseTypeTest extends TypeTestCase
 
     public function testPassDisabledAsOption()
     {
-        $form = $this->factory->create($this->getTestedType(), null, array('disabled' => true));
+        $form = $this->factory->create($this->getTestedType(), null, ['disabled' => true]);
 
         $this->assertTrue($form->isDisabled());
     }
@@ -73,9 +73,9 @@ public function testPassIdAndNameToViewWithGrandParent()
 
     public function testPassTranslationDomainToView()
     {
-        $view = $this->factory->create($this->getTestedType(), null, array(
+        $view = $this->factory->create($this->getTestedType(), null, [
             'translation_domain' => 'domain',
-        ))
+        ])
             ->createView();
 
         $this->assertSame('domain', $view->vars['translation_domain']);
@@ -84,9 +84,9 @@ public function testPassTranslationDomainToView()
     public function testInheritTranslationDomainFromParent()
     {
         $view = $this->factory
-            ->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, array(
+            ->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, [
                 'translation_domain' => 'domain',
-            ))
+            ])
             ->add('child', $this->getTestedType())
             ->getForm()
             ->createView();
@@ -97,12 +97,12 @@ public function testInheritTranslationDomainFromParent()
     public function testPreferOwnTranslationDomain()
     {
         $view = $this->factory
-            ->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, array(
+            ->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, [
                 'translation_domain' => 'parent_domain',
-            ))
-            ->add('child', $this->getTestedType(), array(
+            ])
+            ->add('child', $this->getTestedType(), [
                 'translation_domain' => 'domain',
-            ))
+            ])
             ->getForm()
             ->createView();
 
@@ -121,7 +121,7 @@ public function testDefaultTranslationDomain()
 
     public function testPassLabelToView()
     {
-        $view = $this->factory->createNamed('__test___field', $this->getTestedType(), null, array('label' => 'My label'))
+        $view = $this->factory->createNamed('__test___field', $this->getTestedType(), null, ['label' => 'My label'])
             ->createView();
 
         $this->assertSame('My label', $view->vars['label']);
@@ -150,7 +150,7 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expect
         $builder = $this->factory->createBuilder($this->getTestedType());
 
         if ($builder->getCompound()) {
-            $emptyData = array();
+            $emptyData = [];
             foreach ($builder as $field) {
                 // empty children should map null (model data) in the compound view data
                 $emptyData[$field->getName()] = null;
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BirthdayTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BirthdayTypeTest.php
index 7f9130b90ee41..ffadf8c844dc9 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BirthdayTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BirthdayTypeTest.php
@@ -23,8 +23,8 @@ class BirthdayTypeTest extends DateTypeTest
      */
     public function testSetInvalidYearsOption()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->factory->create(static::TESTED_TYPE, null, [
             'years' => 'bad value',
-        ));
+        ]);
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php
index 3084ba582679c..fb2d571884ad0 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php
@@ -28,7 +28,7 @@ public function testDataIsFalseByDefault()
 
     public function testPassValueToView()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array('value' => 'foobar'))
+        $view = $this->factory->create(static::TESTED_TYPE, null, ['value' => 'foobar'])
             ->createView();
 
         $this->assertEquals('foobar', $view->vars['value']);
@@ -45,7 +45,7 @@ public function testCheckedIfDataTrue()
 
     public function testCheckedIfDataTrueWithEmptyValue()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array('value' => ''))
+        $view = $this->factory->create(static::TESTED_TYPE, null, ['value' => ''])
             ->setData(true)
             ->createView();
 
@@ -63,9 +63,9 @@ public function testNotCheckedIfDataFalse()
 
     public function testSubmitWithValueChecked()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'value' => 'foobar',
-        ));
+        ]);
         $form->submit('foobar');
 
         $this->assertTrue($form->getData());
@@ -74,9 +74,9 @@ public function testSubmitWithValueChecked()
 
     public function testSubmitWithRandomValueChecked()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'value' => 'foobar',
-        ));
+        ]);
         $form->submit('krixikraxi');
 
         $this->assertTrue($form->getData());
@@ -85,9 +85,9 @@ public function testSubmitWithRandomValueChecked()
 
     public function testSubmitWithValueUnchecked()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'value' => 'foobar',
-        ));
+        ]);
         $form->submit(null);
 
         $this->assertFalse($form->getData());
@@ -96,9 +96,9 @@ public function testSubmitWithValueUnchecked()
 
     public function testSubmitWithEmptyValueChecked()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'value' => '',
-        ));
+        ]);
         $form->submit('');
 
         $this->assertTrue($form->getData());
@@ -107,9 +107,9 @@ public function testSubmitWithEmptyValueChecked()
 
     public function testSubmitWithEmptyValueUnchecked()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'value' => '',
-        ));
+        ]);
         $form->submit(null);
 
         $this->assertFalse($form->getData());
@@ -118,9 +118,9 @@ public function testSubmitWithEmptyValueUnchecked()
 
     public function testSubmitWithEmptyValueAndFalseUnchecked()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'value' => '',
-        ));
+        ]);
         $form->submit(false);
 
         $this->assertFalse($form->getData());
@@ -129,9 +129,9 @@ public function testSubmitWithEmptyValueAndFalseUnchecked()
 
     public function testSubmitWithEmptyValueAndTrueChecked()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'value' => '',
-        ));
+        ]);
         $form->submit(true);
 
         $this->assertTrue($form->getData());
@@ -167,10 +167,10 @@ function ($value) {
 
     public function provideCustomModelTransformerData()
     {
-        return array(
-            array('checked', true),
-            array('unchecked', false),
-        );
+        return [
+            ['checked', true],
+            ['unchecked', false],
+        ];
     }
 
     public function testSubmitNull($expected = null, $norm = null, $view = null)
@@ -180,9 +180,9 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
 
     public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expectedData = true)
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'empty_data' => $emptyData,
-        ));
+        ]);
         $form->submit(null);
 
         // view data is transformed to the string true value
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypePerformanceTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypePerformanceTest.php
index 3e0ea22f9dbfa..3616a139c1560 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypePerformanceTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypePerformanceTest.php
@@ -30,9 +30,9 @@ public function testSameChoiceFieldCreatedMultipleTimes()
         $choices = range(1, 300);
 
         for ($i = 0; $i < 100; ++$i) {
-            $this->factory->create('Symfony\Component\Form\Extension\Core\Type\ChoiceType', mt_rand(1, 400), array(
+            $this->factory->create('Symfony\Component\Form\Extension\Core\Type\ChoiceType', mt_rand(1, 400), [
                 'choices' => $choices,
-            ));
+            ]);
         }
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
index cb4d182b30ef2..4a7f006f6f2ec 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -18,59 +18,59 @@ class ChoiceTypeTest extends BaseTypeTest
 {
     const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\ChoiceType';
 
-    private $choices = array(
+    private $choices = [
         'Bernhard' => 'a',
         'Fabien' => 'b',
         'Kris' => 'c',
         'Jon' => 'd',
         'Roman' => 'e',
-    );
+    ];
 
-    private $scalarChoices = array(
+    private $scalarChoices = [
         'Yes' => true,
         'No' => false,
         'n/a' => '',
-    );
+    ];
 
-    private $booleanChoicesWithNull = array(
+    private $booleanChoicesWithNull = [
         'Yes' => true,
         'No' => false,
         'n/a' => null,
-    );
+    ];
 
-    private $numericChoicesFlipped = array(
+    private $numericChoicesFlipped = [
         0 => 'Bernhard',
         1 => 'Fabien',
         2 => 'Kris',
         3 => 'Jon',
         4 => 'Roman',
-    );
+    ];
 
     private $objectChoices;
 
-    protected $groupedChoices = array(
-        'Symfony' => array(
+    protected $groupedChoices = [
+        'Symfony' => [
             'Bernhard' => 'a',
             'Fabien' => 'b',
             'Kris' => 'c',
-        ),
-        'Doctrine' => array(
+        ],
+        'Doctrine' => [
             'Jon' => 'd',
             'Roman' => 'e',
-        ),
-    );
+        ],
+    ];
 
     protected function setUp()
     {
         parent::setUp();
 
-        $this->objectChoices = array(
-            (object) array('id' => 1, 'name' => 'Bernhard'),
-            (object) array('id' => 2, 'name' => 'Fabien'),
-            (object) array('id' => 3, 'name' => 'Kris'),
-            (object) array('id' => 4, 'name' => 'Jon'),
-            (object) array('id' => 5, 'name' => 'Roman'),
-        );
+        $this->objectChoices = [
+            (object) ['id' => 1, 'name' => 'Bernhard'],
+            (object) ['id' => 2, 'name' => 'Fabien'],
+            (object) ['id' => 3, 'name' => 'Kris'],
+            (object) ['id' => 4, 'name' => 'Jon'],
+            (object) ['id' => 5, 'name' => 'Roman'],
+        ];
     }
 
     protected function tearDown()
@@ -85,9 +85,9 @@ protected function tearDown()
      */
     public function testChoicesOptionExpectsArrayOrTraversable()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->factory->create(static::TESTED_TYPE, null, [
             'choices' => new \stdClass(),
-        ));
+        ]);
     }
 
     /**
@@ -95,31 +95,31 @@ public function testChoicesOptionExpectsArrayOrTraversable()
      */
     public function testChoiceLoaderOptionExpectsChoiceLoaderInterface()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->factory->create(static::TESTED_TYPE, null, [
             'choice_loader' => new \stdClass(),
-        ));
+        ]);
     }
 
     public function testChoiceListAndChoicesCanBeEmpty()
     {
-        $this->assertInstanceOf('Symfony\Component\Form\FormInterface', $this->factory->create(static::TESTED_TYPE, null, array()));
+        $this->assertInstanceOf('Symfony\Component\Form\FormInterface', $this->factory->create(static::TESTED_TYPE, null, []));
     }
 
     public function testExpandedChoicesOptionsTurnIntoChildren()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'expanded' => true,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $this->assertCount(\count($this->choices), $form, 'Each choice should become a new field');
     }
 
     public function testChoiceListWithScalarValues()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'choices' => $this->scalarChoices,
-        ))->createView();
+        ])->createView();
 
         $this->assertSame('1', $view->vars['choices'][0]->value);
         $this->assertSame('0', $view->vars['choices'][1]->value);
@@ -131,19 +131,19 @@ public function testChoiceListWithScalarValues()
 
     public function testChoiceListWithScalarValuesAndFalseAsPreSetData()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, false, array(
+        $view = $this->factory->create(static::TESTED_TYPE, false, [
             'choices' => $this->scalarChoices,
-        ))->createView();
+        ])->createView();
 
         $this->assertTrue($view->vars['is_selected']($view->vars['choices'][1]->value, $view->vars['value']), 'False value should be pre selected');
     }
 
     public function testExpandedChoiceListWithScalarValues()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'choices' => $this->scalarChoices,
             'expanded' => true,
-        ))->createView();
+        ])->createView();
 
         $this->assertFalse($view->children[0]->vars['checked'], 'True value should not be pre selected');
         $this->assertFalse($view->children[1]->vars['checked'], 'False value should not be pre selected');
@@ -152,10 +152,10 @@ public function testExpandedChoiceListWithScalarValues()
 
     public function testExpandedChoiceListWithBooleanAndNullValues()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'choices' => $this->booleanChoicesWithNull,
             'expanded' => true,
-        ))->createView();
+        ])->createView();
 
         $this->assertFalse($view->children[0]->vars['checked'], 'True value should not be pre selected');
         $this->assertFalse($view->children[1]->vars['checked'], 'False value should not be pre selected');
@@ -164,10 +164,10 @@ public function testExpandedChoiceListWithBooleanAndNullValues()
 
     public function testExpandedChoiceListWithScalarValuesAndFalseAsPreSetData()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, false, array(
+        $view = $this->factory->create(static::TESTED_TYPE, false, [
             'choices' => $this->scalarChoices,
             'expanded' => true,
-        ))->createView();
+        ])->createView();
 
         $this->assertSame('1', $view->vars['choices'][0]->value);
         $this->assertSame('0', $view->vars['choices'][1]->value);
@@ -177,10 +177,10 @@ public function testExpandedChoiceListWithScalarValuesAndFalseAsPreSetData()
 
     public function testExpandedChoiceListWithBooleanAndNullValuesAndFalseAsPreSetData()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, false, array(
+        $view = $this->factory->create(static::TESTED_TYPE, false, [
             'choices' => $this->booleanChoicesWithNull,
             'expanded' => true,
-        ))->createView();
+        ])->createView();
 
         $this->assertFalse($view->children[0]->vars['checked'], 'True value should not be pre selected');
         $this->assertTrue($view->children[1]->vars['checked'], 'False value should be pre selected');
@@ -189,12 +189,12 @@ public function testExpandedChoiceListWithBooleanAndNullValuesAndFalseAsPreSetDa
 
     public function testPlaceholderPresentOnNonRequiredExpandedSingleChoice()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => false,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $this->assertArrayHasKey('placeholder', $form);
         $this->assertCount(\count($this->choices) + 1, $form, 'Each choice should become a new field');
@@ -202,12 +202,12 @@ public function testPlaceholderPresentOnNonRequiredExpandedSingleChoice()
 
     public function testPlaceholderNotPresentIfRequired()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => true,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $this->assertArrayNotHasKey('placeholder', $form);
         $this->assertCount(\count($this->choices), $form, 'Each choice should become a new field');
@@ -215,12 +215,12 @@ public function testPlaceholderNotPresentIfRequired()
 
     public function testPlaceholderNotPresentIfMultiple()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => true,
             'required' => false,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $this->assertArrayNotHasKey('placeholder', $form);
         $this->assertCount(\count($this->choices), $form, 'Each choice should become a new field');
@@ -228,15 +228,15 @@ public function testPlaceholderNotPresentIfMultiple()
 
     public function testPlaceholderNotPresentIfEmptyChoice()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => false,
-            'choices' => array(
+            'choices' => [
                 'Empty' => '',
                 'Not empty' => 1,
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertArrayNotHasKey('placeholder', $form);
         $this->assertCount(2, $form, 'Each choice should become a new field');
@@ -244,16 +244,16 @@ public function testPlaceholderNotPresentIfEmptyChoice()
 
     public function testPlaceholderWithBooleanChoices()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
             'required' => false,
-            'choices' => array(
+            'choices' => [
                 'Yes' => true,
                 'No' => false,
-            ),
+            ],
             'placeholder' => 'Select an option',
-        ))
+        ])
             ->createView();
 
         $this->assertSame('', $view->vars['value'], 'Value should be empty');
@@ -264,16 +264,16 @@ public function testPlaceholderWithBooleanChoices()
 
     public function testPlaceholderWithBooleanChoicesWithFalseAsPreSetData()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, false, array(
+        $view = $this->factory->create(static::TESTED_TYPE, false, [
             'multiple' => false,
             'expanded' => false,
             'required' => false,
-            'choices' => array(
+            'choices' => [
                 'Yes' => true,
                 'No' => false,
-            ),
+            ],
             'placeholder' => 'Select an option',
-        ))
+        ])
             ->createView();
 
         $this->assertSame('0', $view->vars['value'], 'Value should be "0"');
@@ -284,16 +284,16 @@ public function testPlaceholderWithBooleanChoicesWithFalseAsPreSetData()
 
     public function testPlaceholderWithExpandedBooleanChoices()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => false,
-            'choices' => array(
+            'choices' => [
                 'Yes' => true,
                 'No' => false,
-            ),
+            ],
             'placeholder' => 'Select an option',
-        ));
+        ]);
 
         $this->assertArrayHasKey('placeholder', $form, 'Placeholder should be set');
         $this->assertCount(3, $form, 'Each choice should become a new field, placeholder included');
@@ -308,16 +308,16 @@ public function testPlaceholderWithExpandedBooleanChoices()
 
     public function testPlaceholderWithExpandedBooleanChoicesAndWithFalseAsPreSetData()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, false, array(
+        $form = $this->factory->create(static::TESTED_TYPE, false, [
             'multiple' => false,
             'expanded' => true,
             'required' => false,
-            'choices' => array(
+            'choices' => [
                 'Yes' => true,
                 'No' => false,
-            ),
+            ],
             'placeholder' => 'Select an option',
-        ));
+        ]);
 
         $this->assertArrayHasKey('placeholder', $form, 'Placeholder should be set');
         $this->assertCount(3, $form, 'Each choice should become a new field, placeholder included');
@@ -332,12 +332,12 @@ public function testPlaceholderWithExpandedBooleanChoicesAndWithFalseAsPreSetDat
 
     public function testExpandedChoicesOptionsAreFlattened()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'expanded' => true,
             'choices' => $this->groupedChoices,
-        ));
+        ]);
 
-        $flattened = array();
+        $flattened = [];
         foreach ($this->groupedChoices as $choices) {
             $flattened = array_merge($flattened, array_keys($choices));
         }
@@ -351,20 +351,20 @@ public function testExpandedChoicesOptionsAreFlattened()
 
     public function testExpandedChoicesOptionsAreFlattenedObjectChoices()
     {
-        $obj1 = (object) array('id' => 1, 'name' => 'Bernhard');
-        $obj2 = (object) array('id' => 2, 'name' => 'Fabien');
-        $obj3 = (object) array('id' => 3, 'name' => 'Kris');
-        $obj4 = (object) array('id' => 4, 'name' => 'Jon');
-        $obj5 = (object) array('id' => 5, 'name' => 'Roman');
+        $obj1 = (object) ['id' => 1, 'name' => 'Bernhard'];
+        $obj2 = (object) ['id' => 2, 'name' => 'Fabien'];
+        $obj3 = (object) ['id' => 3, 'name' => 'Kris'];
+        $obj4 = (object) ['id' => 4, 'name' => 'Jon'];
+        $obj5 = (object) ['id' => 5, 'name' => 'Roman'];
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'expanded' => true,
-            'choices' => array(
-                'Symfony' => array($obj1, $obj2, $obj3),
-                'Doctrine' => array($obj4, $obj5),
-            ),
+            'choices' => [
+                'Symfony' => [$obj1, $obj2, $obj3],
+                'Doctrine' => [$obj4, $obj5],
+            ],
             'choice_name' => 'id',
-        ));
+        ]);
 
         $this->assertSame(5, $form->count(), 'Each nested choice should become a new field, not the groups');
         $this->assertTrue($form->has(1));
@@ -376,12 +376,12 @@ public function testExpandedChoicesOptionsAreFlattenedObjectChoices()
 
     public function testExpandedCheckboxesAreNeverRequired()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => true,
             'required' => true,
             'choices' => $this->choices,
-        ));
+        ]);
 
         foreach ($form as $child) {
             $this->assertFalse($child->isRequired());
@@ -390,12 +390,12 @@ public function testExpandedCheckboxesAreNeverRequired()
 
     public function testExpandedRadiosAreRequiredIfChoiceChildIsRequired()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => true,
             'choices' => $this->choices,
-        ));
+        ]);
 
         foreach ($form as $child) {
             $this->assertTrue($child->isRequired());
@@ -404,12 +404,12 @@ public function testExpandedRadiosAreRequiredIfChoiceChildIsRequired()
 
     public function testExpandedRadiosAreNotRequiredIfChoiceChildIsNotRequired()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => false,
             'choices' => $this->choices,
-        ));
+        ]);
 
         foreach ($form as $child) {
             $this->assertFalse($child->isRequired());
@@ -418,11 +418,11 @@ public function testExpandedRadiosAreNotRequiredIfChoiceChildIsNotRequired()
 
     public function testSubmitSingleNonExpanded()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $form->submit('b');
 
@@ -433,11 +433,11 @@ public function testSubmitSingleNonExpanded()
 
     public function testSubmitSingleNonExpandedInvalidChoice()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $form->submit('foobar');
 
@@ -448,11 +448,11 @@ public function testSubmitSingleNonExpandedInvalidChoice()
 
     public function testSubmitSingleNonExpandedNull()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $form->submit(null);
 
@@ -466,11 +466,11 @@ public function testSubmitSingleNonExpandedNull()
     // choices are available.
     public function testSubmitNull($expected = null, $norm = null, $view = null)
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
-            'choices' => array(),
-        ));
+            'choices' => [],
+        ]);
 
         $form->submit(null);
 
@@ -482,11 +482,11 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
 
     public function testSubmitSingleNonExpandedEmpty()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $form->submit('');
 
@@ -497,16 +497,16 @@ public function testSubmitSingleNonExpandedEmpty()
 
     public function testSubmitSingleNonExpandedEmptyExplicitEmptyChoice()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
-            'choices' => array(
+            'choices' => [
                 'Empty' => 'EMPTY_CHOICE',
-            ),
+            ],
             'choice_value' => function () {
                 return '';
             },
-        ));
+        ]);
 
         $form->submit('');
 
@@ -520,11 +520,11 @@ public function testSubmitSingleNonExpandedEmptyExplicitEmptyChoice()
     // choices are available.
     public function testSubmitSingleNonExpandedEmptyNoChoices()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
-            'choices' => array(),
-        ));
+            'choices' => [],
+        ]);
 
         $form->submit('');
 
@@ -535,11 +535,11 @@ public function testSubmitSingleNonExpandedEmptyNoChoices()
 
     public function testSubmitSingleNonExpandedFalse()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $form->submit(false);
 
@@ -553,11 +553,11 @@ public function testSubmitSingleNonExpandedFalse()
     // choices are available.
     public function testSubmitSingleNonExpandedFalseNoChoices()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
-            'choices' => array(),
-        ));
+            'choices' => [],
+        ]);
 
         $form->submit(false);
 
@@ -568,13 +568,13 @@ public function testSubmitSingleNonExpandedFalseNoChoices()
 
     public function testSubmitSingleNonExpandedObjectChoices()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
             'choices' => $this->objectChoices,
             'choice_label' => 'name',
             'choice_value' => 'id',
-        ));
+        ]);
 
         // "id" value of the second entry
         $form->submit('2');
@@ -586,13 +586,13 @@ public function testSubmitSingleNonExpandedObjectChoices()
 
     public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expectedData = null)
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
             // empty data must match string choice value
-            'choices' => array($emptyData),
+            'choices' => [$emptyData],
             'empty_data' => $emptyData,
-        ));
+        ]);
 
         $form->submit(null);
 
@@ -601,12 +601,12 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expect
 
     public function testSubmitSingleChoiceWithEmptyDataAndInitialData()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, 'initial', array(
+        $form = $this->factory->create(static::TESTED_TYPE, 'initial', [
             'multiple' => false,
             'expanded' => false,
-            'choices' => array('initial', 'test'),
+            'choices' => ['initial', 'test'],
             'empty_data' => 'test',
-        ));
+        ]);
 
         $form->submit(null);
 
@@ -615,54 +615,54 @@ public function testSubmitSingleChoiceWithEmptyDataAndInitialData()
 
     public function testSubmitMultipleChoiceWithEmptyData()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => false,
-            'choices' => array('test'),
-            'empty_data' => array('test'),
-        ));
+            'choices' => ['test'],
+            'empty_data' => ['test'],
+        ]);
 
         $form->submit(null);
 
-        $this->assertSame(array('test'), $form->getData());
+        $this->assertSame(['test'], $form->getData());
     }
 
     public function testSubmitMultipleChoiceWithEmptyDataAndInitialEmptyArray()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, array(), array(
+        $form = $this->factory->create(static::TESTED_TYPE, [], [
             'multiple' => true,
             'expanded' => false,
-            'choices' => array('test'),
-            'empty_data' => array('test'),
-        ));
+            'choices' => ['test'],
+            'empty_data' => ['test'],
+        ]);
 
         $form->submit(null);
 
-        $this->assertSame(array('test'), $form->getData());
+        $this->assertSame(['test'], $form->getData());
     }
 
     public function testSubmitMultipleChoiceWithEmptyDataAndInitialData()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, array('initial'), array(
+        $form = $this->factory->create(static::TESTED_TYPE, ['initial'], [
             'multiple' => true,
             'expanded' => false,
-            'choices' => array('initial', 'test'),
-            'empty_data' => array('test'),
-        ));
+            'choices' => ['initial', 'test'],
+            'empty_data' => ['test'],
+        ]);
 
         $form->submit(null);
 
-        $this->assertSame(array('test'), $form->getData());
+        $this->assertSame(['test'], $form->getData());
     }
 
     public function testSubmitSingleChoiceExpandedWithEmptyData()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
-            'choices' => array('test'),
+            'choices' => ['test'],
             'empty_data' => 'test',
-        ));
+        ]);
 
         $form->submit(null);
 
@@ -671,12 +671,12 @@ public function testSubmitSingleChoiceExpandedWithEmptyData()
 
     public function testSubmitSingleChoiceExpandedWithEmptyDataAndInitialData()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, 'initial', array(
+        $form = $this->factory->create(static::TESTED_TYPE, 'initial', [
             'multiple' => false,
             'expanded' => true,
-            'choices' => array('initial', 'test'),
+            'choices' => ['initial', 'test'],
             'empty_data' => 'test',
-        ));
+        ]);
 
         $form->submit(null);
 
@@ -685,44 +685,44 @@ public function testSubmitSingleChoiceExpandedWithEmptyDataAndInitialData()
 
     public function testSubmitMultipleChoiceExpandedWithEmptyData()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => true,
-            'choices' => array('test'),
-            'empty_data' => array('test'),
-        ));
+            'choices' => ['test'],
+            'empty_data' => ['test'],
+        ]);
 
         $form->submit(null);
 
-        $this->assertSame(array('test'), $form->getData());
+        $this->assertSame(['test'], $form->getData());
     }
 
     public function testSubmitMultipleChoiceExpandedWithEmptyDataAndInitialEmptyArray()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, array(), array(
+        $form = $this->factory->create(static::TESTED_TYPE, [], [
             'multiple' => true,
             'expanded' => true,
-            'choices' => array('test'),
-            'empty_data' => array('test'),
-        ));
+            'choices' => ['test'],
+            'empty_data' => ['test'],
+        ]);
 
         $form->submit(null);
 
-        $this->assertSame(array('test'), $form->getData());
+        $this->assertSame(['test'], $form->getData());
     }
 
     public function testSubmitMultipleChoiceExpandedWithEmptyDataAndInitialData()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, array('init'), array(
+        $form = $this->factory->create(static::TESTED_TYPE, ['init'], [
             'multiple' => true,
             'expanded' => true,
-            'choices' => array('init', 'test'),
-            'empty_data' => array('test'),
-        ));
+            'choices' => ['init', 'test'],
+            'empty_data' => ['test'],
+        ]);
 
         $form->submit(null);
 
-        $this->assertSame(array('test'), $form->getData());
+        $this->assertSame(['test'], $form->getData());
     }
 
     /**
@@ -730,11 +730,11 @@ public function testSubmitMultipleChoiceExpandedWithEmptyDataAndInitialData()
      */
     public function testLegacyNullChoices()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => false,
             'choices' => null,
-        ));
+        ]);
         $this->assertNull($form->getConfig()->getOption('choices'));
         $this->assertFalse($form->getConfig()->getOption('multiple'));
         $this->assertFalse($form->getConfig()->getOption('expanded'));
@@ -742,31 +742,31 @@ public function testLegacyNullChoices()
 
     public function testSubmitMultipleNonExpanded()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => false,
             'choices' => $this->choices,
-        ));
+        ]);
 
-        $form->submit(array('a', 'b'));
+        $form->submit(['a', 'b']);
 
-        $this->assertEquals(array('a', 'b'), $form->getData());
-        $this->assertEquals(array('a', 'b'), $form->getViewData());
+        $this->assertEquals(['a', 'b'], $form->getData());
+        $this->assertEquals(['a', 'b'], $form->getViewData());
         $this->assertTrue($form->isSynchronized());
     }
 
     public function testSubmitMultipleNonExpandedEmpty()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => false,
             'choices' => $this->choices,
-        ));
+        ]);
 
-        $form->submit(array());
+        $form->submit([]);
 
-        $this->assertSame(array(), $form->getData());
-        $this->assertSame(array(), $form->getViewData());
+        $this->assertSame([], $form->getData());
+        $this->assertSame([], $form->getViewData());
         $this->assertTrue($form->isSynchronized());
     }
 
@@ -775,26 +775,26 @@ public function testSubmitMultipleNonExpandedEmpty()
     // choices are available.
     public function testSubmitMultipleNonExpandedEmptyNoChoices()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => false,
-            'choices' => array(),
-        ));
+            'choices' => [],
+        ]);
 
-        $form->submit(array());
+        $form->submit([]);
 
-        $this->assertSame(array(), $form->getData());
-        $this->assertSame(array(), $form->getViewData());
+        $this->assertSame([], $form->getData());
+        $this->assertSame([], $form->getViewData());
         $this->assertTrue($form->isSynchronized());
     }
 
     public function testSubmitMultipleNonExpandedInvalidScalarChoice()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => false,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $form->submit('foobar');
 
@@ -805,44 +805,44 @@ public function testSubmitMultipleNonExpandedInvalidScalarChoice()
 
     public function testSubmitMultipleNonExpandedInvalidArrayChoice()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => false,
             'choices' => $this->choices,
-        ));
+        ]);
 
-        $form->submit(array('a', 'foobar'));
+        $form->submit(['a', 'foobar']);
 
         $this->assertNull($form->getData());
-        $this->assertEquals(array('a', 'foobar'), $form->getViewData());
+        $this->assertEquals(['a', 'foobar'], $form->getViewData());
         $this->assertFalse($form->isSynchronized());
     }
 
     public function testSubmitMultipleNonExpandedObjectChoices()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => false,
             'choices' => $this->objectChoices,
             'choice_label' => 'name',
             'choice_value' => 'id',
-        ));
+        ]);
 
-        $form->submit(array('2', '3'));
+        $form->submit(['2', '3']);
 
-        $this->assertEquals(array($this->objectChoices[1], $this->objectChoices[2]), $form->getData());
-        $this->assertEquals(array('2', '3'), $form->getViewData());
+        $this->assertEquals([$this->objectChoices[1], $this->objectChoices[2]], $form->getData());
+        $this->assertEquals(['2', '3'], $form->getViewData());
         $this->assertTrue($form->isSynchronized());
     }
 
     public function testSubmitSingleExpandedRequired()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => true,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $form->submit('b');
 
@@ -865,12 +865,12 @@ public function testSubmitSingleExpandedRequired()
 
     public function testSubmitSingleExpandedRequiredInvalidChoice()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => true,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $form->submit('foobar');
 
@@ -893,12 +893,12 @@ public function testSubmitSingleExpandedRequiredInvalidChoice()
 
     public function testSubmitSingleExpandedNonRequired()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => false,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $form->submit('b');
 
@@ -923,12 +923,12 @@ public function testSubmitSingleExpandedNonRequired()
 
     public function testSubmitSingleExpandedNonRequiredInvalidChoice()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => false,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $form->submit('foobar');
 
@@ -951,18 +951,18 @@ public function testSubmitSingleExpandedNonRequiredInvalidChoice()
 
     public function testSubmitSingleExpandedRequiredNull()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => true,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $form->submit(null);
 
         $this->assertNull($form->getData());
         $this->assertSame('', $form->getViewData(), 'View data should always be a string');
-        $this->assertSame(array(), $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
+        $this->assertSame([], $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
         $this->assertTrue($form->isSynchronized());
 
         $this->assertFalse($form[0]->getData());
@@ -982,35 +982,35 @@ public function testSubmitSingleExpandedRequiredNull()
     // choices are available.
     public function testSubmitSingleExpandedRequiredNullNoChoices()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => true,
-            'choices' => array(),
-        ));
+            'choices' => [],
+        ]);
 
         $form->submit(null);
 
         $this->assertNull($form->getData());
         $this->assertSame('', $form->getViewData(), 'View data should always be a string');
-        $this->assertSame(array(), $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
+        $this->assertSame([], $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
         $this->assertTrue($form->isSynchronized());
     }
 
     public function testSubmitSingleExpandedRequiredEmpty()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => true,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $form->submit('');
 
         $this->assertNull($form->getData());
         $this->assertSame('', $form->getViewData(), 'View data should always be a string');
-        $this->assertSame(array(), $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
+        $this->assertSame([], $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
         $this->assertTrue($form->isSynchronized());
 
         $this->assertFalse($form[0]->getData());
@@ -1030,35 +1030,35 @@ public function testSubmitSingleExpandedRequiredEmpty()
     // choices are available.
     public function testSubmitSingleExpandedRequiredEmptyNoChoices()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => true,
-            'choices' => array(),
-        ));
+            'choices' => [],
+        ]);
 
         $form->submit('');
 
         $this->assertNull($form->getData());
         $this->assertSame('', $form->getViewData(), 'View data should always be a string');
-        $this->assertSame(array(), $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
+        $this->assertSame([], $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
         $this->assertTrue($form->isSynchronized());
     }
 
     public function testSubmitSingleExpandedRequiredFalse()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => true,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $form->submit(false);
 
         $this->assertNull($form->getData());
         $this->assertSame('', $form->getViewData(), 'View data should always be a string');
-        $this->assertSame(array(), $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
+        $this->assertSame([], $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
         $this->assertTrue($form->isSynchronized());
 
         $this->assertFalse($form[0]->getData());
@@ -1078,35 +1078,35 @@ public function testSubmitSingleExpandedRequiredFalse()
     // choices are available.
     public function testSubmitSingleExpandedRequiredFalseNoChoices()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => true,
-            'choices' => array(),
-        ));
+            'choices' => [],
+        ]);
 
         $form->submit(false);
 
         $this->assertNull($form->getData());
         $this->assertSame('', $form->getViewData(), 'View data should always be a string');
-        $this->assertSame(array(), $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
+        $this->assertSame([], $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
         $this->assertTrue($form->isSynchronized());
     }
 
     public function testSubmitSingleExpandedNonRequiredNull()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => false,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $form->submit(null);
 
         $this->assertNull($form->getData());
         $this->assertSame('', $form->getViewData(), 'View data should always be a string');
-        $this->assertSame(array(), $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
+        $this->assertSame([], $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
         $this->assertTrue($form->isSynchronized());
 
         $this->assertTrue($form['placeholder']->getData());
@@ -1128,35 +1128,35 @@ public function testSubmitSingleExpandedNonRequiredNull()
     // choices are available.
     public function testSubmitSingleExpandedNonRequiredNullNoChoices()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => false,
-            'choices' => array(),
-        ));
+            'choices' => [],
+        ]);
 
         $form->submit(null);
 
         $this->assertNull($form->getData());
         $this->assertSame('', $form->getViewData(), 'View data should always be a string');
-        $this->assertSame(array(), $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
+        $this->assertSame([], $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
         $this->assertTrue($form->isSynchronized());
     }
 
     public function testSubmitSingleExpandedNonRequiredEmpty()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => false,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $form->submit('');
 
         $this->assertNull($form->getData());
         $this->assertSame('', $form->getViewData(), 'View data should always be a string');
-        $this->assertSame(array(), $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
+        $this->assertSame([], $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
         $this->assertTrue($form->isSynchronized());
 
         $this->assertTrue($form['placeholder']->getData());
@@ -1178,35 +1178,35 @@ public function testSubmitSingleExpandedNonRequiredEmpty()
     // choices are available.
     public function testSubmitSingleExpandedNonRequiredEmptyNoChoices()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => false,
-            'choices' => array(),
-        ));
+            'choices' => [],
+        ]);
 
         $form->submit('');
 
         $this->assertNull($form->getData());
         $this->assertSame('', $form->getViewData(), 'View data should always be a string');
-        $this->assertSame(array(), $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
+        $this->assertSame([], $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
         $this->assertTrue($form->isSynchronized());
     }
 
     public function testSubmitSingleExpandedNonRequiredFalse()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => false,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $form->submit(false);
 
         $this->assertNull($form->getData());
         $this->assertSame('', $form->getViewData(), 'View data should always be a string');
-        $this->assertSame(array(), $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
+        $this->assertSame([], $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
         $this->assertTrue($form->isSynchronized());
 
         $this->assertTrue($form['placeholder']->getData());
@@ -1228,31 +1228,31 @@ public function testSubmitSingleExpandedNonRequiredFalse()
     // choices are available.
     public function testSubmitSingleExpandedNonRequiredFalseNoChoices()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => false,
-            'choices' => array(),
-        ));
+            'choices' => [],
+        ]);
 
         $form->submit(false);
 
         $this->assertNull($form->getData());
         $this->assertSame('', $form->getViewData(), 'View data should always be a string');
-        $this->assertSame(array(), $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
+        $this->assertSame([], $form->getExtraData(), 'ChoiceType is compound when expanded, extra data should always be an array');
         $this->assertTrue($form->isSynchronized());
     }
 
     public function testSubmitSingleExpandedWithEmptyChild()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
-            'choices' => array(
+            'choices' => [
                 'Empty' => '',
                 'Not empty' => 1,
-            ),
-        ));
+            ],
+        ]);
 
         $form->submit('');
 
@@ -1267,13 +1267,13 @@ public function testSubmitSingleExpandedWithEmptyChild()
 
     public function testSubmitSingleExpandedObjectChoices()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'choices' => $this->objectChoices,
             'choice_label' => 'name',
             'choice_value' => 'id',
-        ));
+        ]);
 
         $form->submit('2');
 
@@ -1294,16 +1294,16 @@ public function testSubmitSingleExpandedObjectChoices()
 
     public function testSubmitMultipleExpanded()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => true,
             'choices' => $this->choices,
-        ));
+        ]);
 
-        $form->submit(array('a', 'c'));
+        $form->submit(['a', 'c']);
 
-        $this->assertSame(array('a', 'c'), $form->getData());
-        $this->assertSame(array('a', 'c'), $form->getViewData());
+        $this->assertSame(['a', 'c'], $form->getData());
+        $this->assertSame(['a', 'c'], $form->getViewData());
         $this->assertEmpty($form->getExtraData());
         $this->assertTrue($form->isSynchronized());
 
@@ -1321,11 +1321,11 @@ public function testSubmitMultipleExpanded()
 
     public function testSubmitMultipleExpandedInvalidScalarChoice()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => true,
             'choices' => $this->choices,
-        ));
+        ]);
 
         $form->submit('foobar');
 
@@ -1348,16 +1348,16 @@ public function testSubmitMultipleExpandedInvalidScalarChoice()
 
     public function testSubmitMultipleExpandedInvalidArrayChoice()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => true,
             'choices' => $this->choices,
-        ));
+        ]);
 
-        $form->submit(array('a', 'foobar'));
+        $form->submit(['a', 'foobar']);
 
         $this->assertNull($form->getData());
-        $this->assertSame(array('a', 'foobar'), $form->getViewData());
+        $this->assertSame(['a', 'foobar'], $form->getViewData());
         $this->assertEmpty($form->getExtraData());
         $this->assertFalse($form->isSynchronized());
 
@@ -1375,15 +1375,15 @@ public function testSubmitMultipleExpandedInvalidArrayChoice()
 
     public function testSubmitMultipleExpandedEmpty()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => true,
             'choices' => $this->choices,
-        ));
+        ]);
 
-        $form->submit(array());
+        $form->submit([]);
 
-        $this->assertSame(array(), $form->getData());
+        $this->assertSame([], $form->getData());
         $this->assertTrue($form->isSynchronized());
 
         $this->assertFalse($form[0]->getData());
@@ -1403,33 +1403,33 @@ public function testSubmitMultipleExpandedEmpty()
     // choices are available.
     public function testSubmitMultipleExpandedEmptyNoChoices()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => true,
-            'choices' => array(),
-        ));
+            'choices' => [],
+        ]);
 
-        $form->submit(array());
+        $form->submit([]);
 
-        $this->assertSame(array(), $form->getData());
+        $this->assertSame([], $form->getData());
         $this->assertTrue($form->isSynchronized());
     }
 
     public function testSubmitMultipleExpandedWithEmptyChild()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => true,
-            'choices' => array(
+            'choices' => [
                 'Empty' => '',
                 'Not Empty' => 1,
                 'Not Empty 2' => 2,
-            ),
-        ));
+            ],
+        ]);
 
-        $form->submit(array('', '2'));
+        $form->submit(['', '2']);
 
-        $this->assertSame(array('', 2), $form->getData());
+        $this->assertSame(['', 2], $form->getData());
         $this->assertTrue($form->isSynchronized());
 
         $this->assertTrue($form[0]->getData());
@@ -1442,17 +1442,17 @@ public function testSubmitMultipleExpandedWithEmptyChild()
 
     public function testSubmitMultipleExpandedObjectChoices()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => true,
             'choices' => $this->objectChoices,
             'choice_label' => 'name',
             'choice_value' => 'id',
-        ));
+        ]);
 
-        $form->submit(array('1', '2'));
+        $form->submit(['1', '2']);
 
-        $this->assertSame(array($this->objectChoices[0], $this->objectChoices[1]), $form->getData());
+        $this->assertSame([$this->objectChoices[0], $this->objectChoices[1]], $form->getData());
         $this->assertTrue($form->isSynchronized());
 
         $this->assertTrue($form[0]->getData());
@@ -1469,25 +1469,25 @@ public function testSubmitMultipleExpandedObjectChoices()
 
     public function testSubmitMultipleChoicesInts()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'choices' => array_flip($this->numericChoicesFlipped),
-        ));
+        ]);
 
-        $form->submit(array(1, 2));
+        $form->submit([1, 2]);
 
         $this->assertTrue($form->isSynchronized());
     }
 
     public function testSingleSelectedObjectChoices()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, $this->objectChoices[3], array(
+        $view = $this->factory->create(static::TESTED_TYPE, $this->objectChoices[3], [
             'multiple' => false,
             'expanded' => false,
             'choices' => $this->objectChoices,
             'choice_label' => 'name',
             'choice_value' => 'id',
-        ))
+        ])
             ->createView();
 
         /** @var callable $selectedChecker */
@@ -1499,13 +1499,13 @@ public function testSingleSelectedObjectChoices()
 
     public function testMultipleSelectedObjectChoices()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, array($this->objectChoices[3]), array(
+        $view = $this->factory->create(static::TESTED_TYPE, [$this->objectChoices[3]], [
             'multiple' => true,
             'expanded' => false,
             'choices' => $this->objectChoices,
             'choice_label' => 'name',
             'choice_value' => 'id',
-        ))
+        ])
             ->createView();
 
         /** @var callable $selectedChecker */
@@ -1517,9 +1517,9 @@ public function testMultipleSelectedObjectChoices()
 
     public function testPassRequiredToView()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'choices' => $this->choices,
-        ))
+        ])
             ->createView();
 
         $this->assertTrue($view->vars['required']);
@@ -1527,10 +1527,10 @@ public function testPassRequiredToView()
 
     public function testPassNonRequiredToView()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => false,
             'choices' => $this->choices,
-        ))
+        ])
             ->createView();
 
         $this->assertFalse($view->vars['required']);
@@ -1538,10 +1538,10 @@ public function testPassNonRequiredToView()
 
     public function testPassMultipleToView()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
             'choices' => $this->choices,
-        ))
+        ])
             ->createView();
 
         $this->assertTrue($view->vars['multiple']);
@@ -1549,10 +1549,10 @@ public function testPassMultipleToView()
 
     public function testPassExpandedToView()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'expanded' => true,
             'choices' => $this->choices,
-        ))
+        ])
             ->createView();
 
         $this->assertTrue($view->vars['expanded']);
@@ -1560,9 +1560,9 @@ public function testPassExpandedToView()
 
     public function testPassChoiceTranslationDomainToView()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'choices' => $this->choices,
-        ))
+        ])
             ->createView();
 
         $this->assertNull($view->vars['choice_translation_domain']);
@@ -1570,10 +1570,10 @@ public function testPassChoiceTranslationDomainToView()
 
     public function testChoiceTranslationDomainWithTrueValueToView()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'choices' => $this->choices,
             'choice_translation_domain' => true,
-        ))
+        ])
             ->createView();
 
         $this->assertNull($view->vars['choice_translation_domain']);
@@ -1581,10 +1581,10 @@ public function testChoiceTranslationDomainWithTrueValueToView()
 
     public function testDefaultChoiceTranslationDomainIsSameAsTranslationDomainToView()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'choices' => $this->choices,
             'translation_domain' => 'foo',
-        ))
+        ])
             ->createView();
 
         $this->assertEquals('foo', $view->vars['choice_translation_domain']);
@@ -1593,9 +1593,9 @@ public function testDefaultChoiceTranslationDomainIsSameAsTranslationDomainToVie
     public function testInheritChoiceTranslationDomainFromParent()
     {
         $view = $this->factory
-            ->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, array(
+            ->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, [
                 'translation_domain' => 'domain',
-            ))
+            ])
             ->add('child', static::TESTED_TYPE)
             ->getForm()
             ->createView();
@@ -1605,11 +1605,11 @@ public function testInheritChoiceTranslationDomainFromParent()
 
     public function testPlaceholderIsNullByDefaultIfRequired()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'required' => true,
             'choices' => $this->choices,
-        ))
+        ])
             ->createView();
 
         $this->assertNull($view->vars['placeholder']);
@@ -1617,11 +1617,11 @@ public function testPlaceholderIsNullByDefaultIfRequired()
 
     public function testPlaceholderIsEmptyStringByDefaultIfNotRequired()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'required' => false,
             'choices' => $this->choices,
-        ))
+        ])
             ->createView();
 
         $this->assertSame('', $view->vars['placeholder']);
@@ -1632,13 +1632,13 @@ public function testPlaceholderIsEmptyStringByDefaultIfNotRequired()
      */
     public function testPassPlaceholderToView($multiple, $expanded, $required, $placeholder, $viewValue)
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => $multiple,
             'expanded' => $expanded,
             'required' => $required,
             'placeholder' => $placeholder,
             'choices' => $this->choices,
-        ))
+        ])
             ->createView();
 
         $this->assertSame($viewValue, $view->vars['placeholder']);
@@ -1650,13 +1650,13 @@ public function testPassPlaceholderToView($multiple, $expanded, $required, $plac
      */
     public function testDontPassPlaceholderIfContainedInChoices($multiple, $expanded, $required, $placeholder, $viewValue)
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => $multiple,
             'expanded' => $expanded,
             'required' => $required,
             'placeholder' => $placeholder,
-            'choices' => array('Empty' => '', 'A' => 'a'),
-        ))
+            'choices' => ['Empty' => '', 'A' => 'a'],
+        ])
             ->createView();
 
         $this->assertNull($view->vars['placeholder']);
@@ -1665,138 +1665,138 @@ public function testDontPassPlaceholderIfContainedInChoices($multiple, $expanded
 
     public function getOptionsWithPlaceholder()
     {
-        return array(
+        return [
             // single non-expanded
-            array(false, false, false, 'foobar', 'foobar'),
-            array(false, false, false, '', ''),
-            array(false, false, false, null, null),
-            array(false, false, false, false, null),
-            array(false, false, true, 'foobar', 'foobar'),
-            array(false, false, true, '', ''),
-            array(false, false, true, null, null),
-            array(false, false, true, false, null),
+            [false, false, false, 'foobar', 'foobar'],
+            [false, false, false, '', ''],
+            [false, false, false, null, null],
+            [false, false, false, false, null],
+            [false, false, true, 'foobar', 'foobar'],
+            [false, false, true, '', ''],
+            [false, false, true, null, null],
+            [false, false, true, false, null],
             // single expanded
-            array(false, true, false, 'foobar', 'foobar'),
+            [false, true, false, 'foobar', 'foobar'],
             // radios should never have an empty label
-            array(false, true, false, '', 'None'),
-            array(false, true, false, null, null),
-            array(false, true, false, false, null),
+            [false, true, false, '', 'None'],
+            [false, true, false, null, null],
+            [false, true, false, false, null],
             // required radios should never have a placeholder
-            array(false, true, true, 'foobar', null),
-            array(false, true, true, '', null),
-            array(false, true, true, null, null),
-            array(false, true, true, false, null),
+            [false, true, true, 'foobar', null],
+            [false, true, true, '', null],
+            [false, true, true, null, null],
+            [false, true, true, false, null],
             // multiple non-expanded
-            array(true, false, false, 'foobar', null),
-            array(true, false, false, '', null),
-            array(true, false, false, null, null),
-            array(true, false, false, false, null),
-            array(true, false, true, 'foobar', null),
-            array(true, false, true, '', null),
-            array(true, false, true, null, null),
-            array(true, false, true, false, null),
+            [true, false, false, 'foobar', null],
+            [true, false, false, '', null],
+            [true, false, false, null, null],
+            [true, false, false, false, null],
+            [true, false, true, 'foobar', null],
+            [true, false, true, '', null],
+            [true, false, true, null, null],
+            [true, false, true, false, null],
             // multiple expanded
-            array(true, true, false, 'foobar', null),
-            array(true, true, false, '', null),
-            array(true, true, false, null, null),
-            array(true, true, false, false, null),
-            array(true, true, true, 'foobar', null),
-            array(true, true, true, '', null),
-            array(true, true, true, null, null),
-            array(true, true, true, false, null),
-        );
+            [true, true, false, 'foobar', null],
+            [true, true, false, '', null],
+            [true, true, false, null, null],
+            [true, true, false, false, null],
+            [true, true, true, 'foobar', null],
+            [true, true, true, '', null],
+            [true, true, true, null, null],
+            [true, true, true, false, null],
+        ];
     }
 
     public function testPassChoicesToView()
     {
-        $choices = array('A' => 'a', 'B' => 'b', 'C' => 'c', 'D' => 'd');
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $choices = ['A' => 'a', 'B' => 'b', 'C' => 'c', 'D' => 'd'];
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'choices' => $choices,
-        ))
+        ])
             ->createView();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ChoiceView('a', 'a', 'A'),
             new ChoiceView('b', 'b', 'B'),
             new ChoiceView('c', 'c', 'C'),
             new ChoiceView('d', 'd', 'D'),
-        ), $view->vars['choices']);
+        ], $view->vars['choices']);
     }
 
     public function testPassPreferredChoicesToView()
     {
-        $choices = array('A' => 'a', 'B' => 'b', 'C' => 'c', 'D' => 'd');
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $choices = ['A' => 'a', 'B' => 'b', 'C' => 'c', 'D' => 'd'];
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'choices' => $choices,
-            'preferred_choices' => array('b', 'd'),
-        ))
+            'preferred_choices' => ['b', 'd'],
+        ])
             ->createView();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             0 => new ChoiceView('a', 'a', 'A'),
             2 => new ChoiceView('c', 'c', 'C'),
-        ), $view->vars['choices']);
-        $this->assertEquals(array(
+        ], $view->vars['choices']);
+        $this->assertEquals([
             1 => new ChoiceView('b', 'b', 'B'),
             3 => new ChoiceView('d', 'd', 'D'),
-        ), $view->vars['preferred_choices']);
+        ], $view->vars['preferred_choices']);
     }
 
     public function testPassHierarchicalChoicesToView()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'choices' => $this->groupedChoices,
-            'preferred_choices' => array('b', 'd'),
-        ))
+            'preferred_choices' => ['b', 'd'],
+        ])
             ->createView();
 
-        $this->assertEquals(array(
-            'Symfony' => new ChoiceGroupView('Symfony', array(
+        $this->assertEquals([
+            'Symfony' => new ChoiceGroupView('Symfony', [
                 0 => new ChoiceView('a', 'a', 'Bernhard'),
                 2 => new ChoiceView('c', 'c', 'Kris'),
-            )),
-            'Doctrine' => new ChoiceGroupView('Doctrine', array(
+            ]),
+            'Doctrine' => new ChoiceGroupView('Doctrine', [
                 4 => new ChoiceView('e', 'e', 'Roman'),
-            )),
-        ), $view->vars['choices']);
-        $this->assertEquals(array(
-            'Symfony' => new ChoiceGroupView('Symfony', array(
+            ]),
+        ], $view->vars['choices']);
+        $this->assertEquals([
+            'Symfony' => new ChoiceGroupView('Symfony', [
                 1 => new ChoiceView('b', 'b', 'Fabien'),
-            )),
-            'Doctrine' => new ChoiceGroupView('Doctrine', array(
+            ]),
+            'Doctrine' => new ChoiceGroupView('Doctrine', [
                 3 => new ChoiceView('d', 'd', 'Jon'),
-            )),
-        ), $view->vars['preferred_choices']);
+            ]),
+        ], $view->vars['preferred_choices']);
     }
 
     public function testPassChoiceDataToView()
     {
-        $obj1 = (object) array('value' => 'a', 'label' => 'A');
-        $obj2 = (object) array('value' => 'b', 'label' => 'B');
-        $obj3 = (object) array('value' => 'c', 'label' => 'C');
-        $obj4 = (object) array('value' => 'd', 'label' => 'D');
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
-            'choices' => array($obj1, $obj2, $obj3, $obj4),
+        $obj1 = (object) ['value' => 'a', 'label' => 'A'];
+        $obj2 = (object) ['value' => 'b', 'label' => 'B'];
+        $obj3 = (object) ['value' => 'c', 'label' => 'C'];
+        $obj4 = (object) ['value' => 'd', 'label' => 'D'];
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
+            'choices' => [$obj1, $obj2, $obj3, $obj4],
             'choice_label' => 'label',
             'choice_value' => 'value',
-        ))
+        ])
             ->createView();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ChoiceView($obj1, 'a', 'A'),
             new ChoiceView($obj2, 'b', 'B'),
             new ChoiceView($obj3, 'c', 'C'),
             new ChoiceView($obj4, 'd', 'D'),
-        ), $view->vars['choices']);
+        ], $view->vars['choices']);
     }
 
     public function testAdjustFullNameForMultipleNonExpanded()
     {
-        $view = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $view = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'multiple' => true,
             'expanded' => false,
             'choices' => $this->choices,
-        ))
+        ])
             ->createView();
 
         $this->assertSame('name[]', $view->vars['full_name']);
@@ -1805,26 +1805,26 @@ public function testAdjustFullNameForMultipleNonExpanded()
     // https://github.com/symfony/symfony/issues/3298
     public function testInitializeWithEmptyChoices()
     {
-        $this->assertInstanceOf('Symfony\Component\Form\FormInterface', $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
-            'choices' => array(),
-        )));
+        $this->assertInstanceOf('Symfony\Component\Form\FormInterface', $this->factory->createNamed('name', static::TESTED_TYPE, null, [
+            'choices' => [],
+        ]));
     }
 
     public function testInitializeWithDefaultObjectChoice()
     {
-        $obj1 = (object) array('value' => 'a', 'label' => 'A');
-        $obj2 = (object) array('value' => 'b', 'label' => 'B');
-        $obj3 = (object) array('value' => 'c', 'label' => 'C');
-        $obj4 = (object) array('value' => 'd', 'label' => 'D');
+        $obj1 = (object) ['value' => 'a', 'label' => 'A'];
+        $obj2 = (object) ['value' => 'b', 'label' => 'B'];
+        $obj3 = (object) ['value' => 'c', 'label' => 'C'];
+        $obj4 = (object) ['value' => 'd', 'label' => 'D'];
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
-            'choices' => array($obj1, $obj2, $obj3, $obj4),
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'choices' => [$obj1, $obj2, $obj3, $obj4],
             'choice_label' => 'label',
             'choice_value' => 'value',
             // Used to break because "data_class" was inferred, which needs to
             // remain null in every case (because it refers to the view format)
             'data' => $obj3,
-        ));
+        ]);
 
         // Trigger data initialization
         $this->assertSame('c', $form->getViewData());
@@ -1840,12 +1840,12 @@ public function testInitializeWithDefaultObjectChoice()
     public function testCustomChoiceTypeDoesNotInheritChoiceLabels()
     {
         $builder = $this->factory->createBuilder();
-        $builder->add('choice', static::TESTED_TYPE, array(
-                'choices' => array(
+        $builder->add('choice', static::TESTED_TYPE, [
+                'choices' => [
                     '1' => '1',
                     '2' => '2',
-                ),
-            )
+                ],
+            ]
         );
         $builder->add('subChoice', 'Symfony\Component\Form\Tests\Fixtures\ChoiceSubType');
         $form = $builder->getForm();
@@ -1861,11 +1861,11 @@ public function testCustomChoiceTypeDoesNotInheritChoiceLabels()
      */
     public function testSubmitInvalidNestedValue($multiple, $expanded, $submissionData)
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'choices' => $this->choices,
             'multiple' => $multiple,
             'expanded' => $expanded,
-        ));
+        ]);
 
         $form->submit($submissionData);
         $this->assertFalse($form->isSynchronized());
@@ -1874,20 +1874,20 @@ public function testSubmitInvalidNestedValue($multiple, $expanded, $submissionDa
 
     public function invalidNestedValueTestMatrix()
     {
-        return array(
-            'non-multiple, non-expanded' => array(false, false, array(array())),
-            'non-multiple, expanded' => array(false, true, array(array())),
-            'multiple, non-expanded' => array(true, false, array(array())),
-            'multiple, expanded' => array(true, true, array(array())),
-        );
+        return [
+            'non-multiple, non-expanded' => [false, false, [[]]],
+            'non-multiple, expanded' => [false, true, [[]]],
+            'multiple, non-expanded' => [true, false, [[]]],
+            'multiple, expanded' => [true, true, [[]]],
+        ];
     }
 
     public function testInheritTranslationDomainFromParent()
     {
         $view = $this->factory
-            ->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, array(
+            ->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, [
                 'translation_domain' => 'domain',
-            ))
+            ])
             ->add('child', static::TESTED_TYPE)
             ->getForm()
             ->createView();
@@ -1897,9 +1897,9 @@ public function testInheritTranslationDomainFromParent()
 
     public function testPassTranslationDomainToView()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'translation_domain' => 'domain',
-        ))
+        ])
             ->createView();
 
         $this->assertSame('domain', $view->vars['translation_domain']);
@@ -1908,12 +1908,12 @@ public function testPassTranslationDomainToView()
     public function testPreferOwnTranslationDomain()
     {
         $view = $this->factory
-            ->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, array(
+            ->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, [
                 'translation_domain' => 'parent_domain',
-            ))
-            ->add('child', static::TESTED_TYPE, array(
+            ])
+            ->add('child', static::TESTED_TYPE, [
                 'translation_domain' => 'domain',
-            ))
+            ])
             ->getForm()
             ->createView();
 
@@ -1940,9 +1940,9 @@ public function testPassMultipartFalseToView()
 
     public function testPassLabelToView()
     {
-        $view = $this->factory->createNamed('__test___field', static::TESTED_TYPE, null, array(
+        $view = $this->factory->createNamed('__test___field', static::TESTED_TYPE, null, [
             'label' => 'My label',
-        ))
+        ])
             ->createView();
 
         $this->assertSame('My label', $view->vars['label']);
@@ -1974,9 +1974,9 @@ public function testPassIdAndNameToViewWithParent()
 
     public function testPassDisabledAsOption()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'disabled' => true,
-        ));
+        ]);
 
         $this->assertTrue($form->isDisabled());
     }
@@ -2006,13 +2006,13 @@ public function testStripLeadingUnderscoresAndDigitsFromId()
      */
     public function testTrimIsDisabled($multiple, $expanded)
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => $multiple,
             'expanded' => $expanded,
-            'choices' => array(
+            'choices' => [
                 'a' => '1',
-            ),
-        ));
+            ],
+        ]);
 
         $submittedData = ' 1';
 
@@ -2030,13 +2030,13 @@ public function testSubmitValueWithWhiteSpace($multiple, $expanded)
     {
         $valueWhitWhiteSpace = '1 ';
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => $multiple,
             'expanded' => $expanded,
-            'choices' => array(
+            'choices' => [
                 'a' => $valueWhitWhiteSpace,
-            ),
-        ));
+            ],
+        ]);
 
         $form->submit($multiple ? (array) $valueWhitWhiteSpace : $valueWhitWhiteSpace);
 
@@ -2046,11 +2046,11 @@ public function testSubmitValueWithWhiteSpace($multiple, $expanded)
 
     public function provideTrimCases()
     {
-        return array(
-            'Simple' => array(false, false),
-            'Multiple' => array(true, false),
-            'Simple expanded' => array(false, true),
-            'Multiple expanded' => array(true, true),
-        );
+        return [
+            'Simple' => [false, false],
+            'Multiple' => [true, false],
+            'Simple expanded' => [false, true],
+            'Multiple expanded' => [true, true],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
index 9393c99dc0fd8..50355a1d64542 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
@@ -20,22 +20,22 @@ class CollectionTypeTest extends BaseTypeTest
 
     public function testContainsNoChildByDefault()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'entry_type' => TextTypeTest::TESTED_TYPE,
-        ));
+        ]);
 
         $this->assertCount(0, $form);
     }
 
     public function testSetDataAdjustsSize()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'entry_type' => TextTypeTest::TESTED_TYPE,
-            'entry_options' => array(
-                'attr' => array('maxlength' => 20),
-            ),
-        ));
-        $form->setData(array('foo@foo.com', 'foo@bar.com'));
+            'entry_options' => [
+                'attr' => ['maxlength' => 20],
+            ],
+        ]);
+        $form->setData(['foo@foo.com', 'foo@bar.com']);
 
         $this->assertInstanceOf('Symfony\Component\Form\Form', $form[0]);
         $this->assertInstanceOf('Symfony\Component\Form\Form', $form[1]);
@@ -47,7 +47,7 @@ public function testSetDataAdjustsSize()
         $this->assertEquals(20, $formAttrs0['maxlength']);
         $this->assertEquals(20, $formAttrs1['maxlength']);
 
-        $form->setData(array('foo@baz.com'));
+        $form->setData(['foo@baz.com']);
         $this->assertInstanceOf('Symfony\Component\Form\Form', $form[0]);
         $this->assertArrayNotHasKey(1, $form);
         $this->assertCount(1, $form);
@@ -58,20 +58,20 @@ public function testSetDataAdjustsSize()
 
     public function testThrowsExceptionIfObjectIsNotTraversable()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'entry_type' => TextTypeTest::TESTED_TYPE,
-        ));
+        ]);
         $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\UnexpectedTypeException');
         $form->setData(new \stdClass());
     }
 
     public function testNotResizedIfSubmittedWithMissingData()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'entry_type' => TextTypeTest::TESTED_TYPE,
-        ));
-        $form->setData(array('foo@foo.com', 'bar@bar.com'));
-        $form->submit(array('foo@bar.com'));
+        ]);
+        $form->setData(['foo@foo.com', 'bar@bar.com']);
+        $form->submit(['foo@bar.com']);
 
         $this->assertTrue($form->has('0'));
         $this->assertTrue($form->has('1'));
@@ -81,106 +81,106 @@ public function testNotResizedIfSubmittedWithMissingData()
 
     public function testResizedDownIfSubmittedWithMissingDataAndAllowDelete()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'entry_type' => TextTypeTest::TESTED_TYPE,
             'allow_delete' => true,
-        ));
-        $form->setData(array('foo@foo.com', 'bar@bar.com'));
-        $form->submit(array('foo@foo.com'));
+        ]);
+        $form->setData(['foo@foo.com', 'bar@bar.com']);
+        $form->submit(['foo@foo.com']);
 
         $this->assertTrue($form->has('0'));
         $this->assertFalse($form->has('1'));
         $this->assertEquals('foo@foo.com', $form[0]->getData());
-        $this->assertEquals(array('foo@foo.com'), $form->getData());
+        $this->assertEquals(['foo@foo.com'], $form->getData());
     }
 
     public function testResizedDownIfSubmittedWithEmptyDataAndDeleteEmpty()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'entry_type' => TextTypeTest::TESTED_TYPE,
             'allow_delete' => true,
             'delete_empty' => true,
-        ));
+        ]);
 
-        $form->setData(array('foo@foo.com', 'bar@bar.com'));
-        $form->submit(array('foo@foo.com', ''));
+        $form->setData(['foo@foo.com', 'bar@bar.com']);
+        $form->submit(['foo@foo.com', '']);
 
         $this->assertTrue($form->has('0'));
         $this->assertFalse($form->has('1'));
         $this->assertEquals('foo@foo.com', $form[0]->getData());
-        $this->assertEquals(array('foo@foo.com'), $form->getData());
+        $this->assertEquals(['foo@foo.com'], $form->getData());
     }
 
     public function testResizedDownWithDeleteEmptyCallable()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'entry_type' => AuthorType::class,
             'allow_delete' => true,
             'delete_empty' => function (Author $obj = null) {
                 return null === $obj || empty($obj->firstName);
             },
-        ));
+        ]);
 
-        $form->setData(array(new Author('Bob'), new Author('Alice')));
-        $form->submit(array(array('firstName' => 'Bob'), array('firstName' => '')));
+        $form->setData([new Author('Bob'), new Author('Alice')]);
+        $form->submit([['firstName' => 'Bob'], ['firstName' => '']]);
 
         $this->assertTrue($form->has('0'));
         $this->assertFalse($form->has('1'));
         $this->assertEquals(new Author('Bob'), $form[0]->getData());
-        $this->assertEquals(array(new Author('Bob')), $form->getData());
+        $this->assertEquals([new Author('Bob')], $form->getData());
     }
 
     public function testResizedDownIfSubmittedWithCompoundEmptyDataDeleteEmptyAndNoDataClass()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'entry_type' => AuthorType::class,
             // If the field is not required, no new Author will be created if the
             // form is completely empty
-            'entry_options' => array('data_class' => null),
+            'entry_options' => ['data_class' => null],
             'allow_add' => true,
             'allow_delete' => true,
             'delete_empty' => function ($author) {
                 return empty($author['firstName']);
             },
-        ));
-        $form->setData(array(array('firstName' => 'first', 'lastName' => 'last')));
-        $form->submit(array(
-            array('firstName' => 's_first', 'lastName' => 's_last'),
-            array('firstName' => '', 'lastName' => ''),
-        ));
+        ]);
+        $form->setData([['firstName' => 'first', 'lastName' => 'last']]);
+        $form->submit([
+            ['firstName' => 's_first', 'lastName' => 's_last'],
+            ['firstName' => '', 'lastName' => ''],
+        ]);
         $this->assertTrue($form->has('0'));
         $this->assertFalse($form->has('1'));
-        $this->assertEquals(array('firstName' => 's_first', 'lastName' => 's_last'), $form[0]->getData());
-        $this->assertEquals(array(array('firstName' => 's_first', 'lastName' => 's_last')), $form->getData());
+        $this->assertEquals(['firstName' => 's_first', 'lastName' => 's_last'], $form[0]->getData());
+        $this->assertEquals([['firstName' => 's_first', 'lastName' => 's_last']], $form->getData());
     }
 
     public function testDontAddEmptyDataIfDeleteEmpty()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'entry_type' => TextTypeTest::TESTED_TYPE,
             'allow_add' => true,
             'delete_empty' => true,
-        ));
+        ]);
 
-        $form->setData(array('foo@foo.com'));
-        $form->submit(array('foo@foo.com', ''));
+        $form->setData(['foo@foo.com']);
+        $form->submit(['foo@foo.com', '']);
 
         $this->assertTrue($form->has('0'));
         $this->assertFalse($form->has('1'));
         $this->assertEquals('foo@foo.com', $form[0]->getData());
-        $this->assertEquals(array('foo@foo.com'), $form->getData());
+        $this->assertEquals(['foo@foo.com'], $form->getData());
     }
 
     public function testNoDeleteEmptyIfDeleteNotAllowed()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'entry_type' => TextTypeTest::TESTED_TYPE,
             'allow_delete' => false,
             'delete_empty' => true,
-        ));
+        ]);
 
-        $form->setData(array('foo@foo.com'));
-        $form->submit(array(''));
+        $form->setData(['foo@foo.com']);
+        $form->submit(['']);
 
         $this->assertTrue($form->has('0'));
         $this->assertEquals('', $form[0]->getData());
@@ -188,34 +188,34 @@ public function testNoDeleteEmptyIfDeleteNotAllowed()
 
     public function testResizedDownIfSubmittedWithCompoundEmptyDataAndDeleteEmpty()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'entry_type' => 'Symfony\Component\Form\Tests\Fixtures\AuthorType',
             // If the field is not required, no new Author will be created if the
             // form is completely empty
-            'entry_options' => array('required' => false),
+            'entry_options' => ['required' => false],
             'allow_add' => true,
             'delete_empty' => true,
-        ));
+        ]);
 
-        $form->setData(array(new Author('first', 'last')));
-        $form->submit(array(
-            array('firstName' => 's_first', 'lastName' => 's_last'),
-            array('firstName' => '', 'lastName' => ''),
-        ));
+        $form->setData([new Author('first', 'last')]);
+        $form->submit([
+            ['firstName' => 's_first', 'lastName' => 's_last'],
+            ['firstName' => '', 'lastName' => ''],
+        ]);
 
         $this->assertTrue($form->has('0'));
         $this->assertFalse($form->has('1'));
         $this->assertEquals(new Author('s_first', 's_last'), $form[0]->getData());
-        $this->assertEquals(array(new Author('s_first', 's_last')), $form->getData());
+        $this->assertEquals([new Author('s_first', 's_last')], $form->getData());
     }
 
     public function testNotResizedIfSubmittedWithExtraData()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'entry_type' => TextTypeTest::TESTED_TYPE,
-        ));
-        $form->setData(array('foo@bar.com'));
-        $form->submit(array('foo@foo.com', 'bar@bar.com'));
+        ]);
+        $form->setData(['foo@bar.com']);
+        $form->submit(['foo@foo.com', 'bar@bar.com']);
 
         $this->assertTrue($form->has('0'));
         $this->assertFalse($form->has('1'));
@@ -224,27 +224,27 @@ public function testNotResizedIfSubmittedWithExtraData()
 
     public function testResizedUpIfSubmittedWithExtraDataAndAllowAdd()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'entry_type' => TextTypeTest::TESTED_TYPE,
             'allow_add' => true,
-        ));
-        $form->setData(array('foo@bar.com'));
-        $form->submit(array('foo@bar.com', 'bar@bar.com'));
+        ]);
+        $form->setData(['foo@bar.com']);
+        $form->submit(['foo@bar.com', 'bar@bar.com']);
 
         $this->assertTrue($form->has('0'));
         $this->assertTrue($form->has('1'));
         $this->assertEquals('foo@bar.com', $form[0]->getData());
         $this->assertEquals('bar@bar.com', $form[1]->getData());
-        $this->assertEquals(array('foo@bar.com', 'bar@bar.com'), $form->getData());
+        $this->assertEquals(['foo@bar.com', 'bar@bar.com'], $form->getData());
     }
 
     public function testAllowAddButNoPrototype()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'entry_type' => FormTypeTest::TESTED_TYPE,
             'allow_add' => true,
             'prototype' => false,
-        ));
+        ]);
 
         $this->assertFalse($form->has('__name__'));
     }
@@ -252,11 +252,11 @@ public function testAllowAddButNoPrototype()
     public function testPrototypeMultipartPropagation()
     {
         $form = $this->factory
-            ->create(static::TESTED_TYPE, null, array(
+            ->create(static::TESTED_TYPE, null, [
                 'entry_type' => FileTypeTest::TESTED_TYPE,
                 'allow_add' => true,
                 'prototype' => true,
-            ))
+            ])
         ;
 
         $this->assertTrue($form->createView()->vars['multipart']);
@@ -264,11 +264,11 @@ public function testPrototypeMultipartPropagation()
 
     public function testGetDataDoesNotContainsPrototypeNameBeforeDataAreSet()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, array(), array(
+        $form = $this->factory->create(static::TESTED_TYPE, [], [
             'entry_type' => FileTypeTest::TESTED_TYPE,
             'prototype' => true,
             'allow_add' => true,
-        ));
+        ]);
 
         $data = $form->getData();
         $this->assertArrayNotHasKey('__name__', $data);
@@ -276,61 +276,61 @@ public function testGetDataDoesNotContainsPrototypeNameBeforeDataAreSet()
 
     public function testGetDataDoesNotContainsPrototypeNameAfterDataAreSet()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, array(), array(
+        $form = $this->factory->create(static::TESTED_TYPE, [], [
             'entry_type' => FileTypeTest::TESTED_TYPE,
             'allow_add' => true,
             'prototype' => true,
-        ));
+        ]);
 
-        $form->setData(array('foobar.png'));
+        $form->setData(['foobar.png']);
         $data = $form->getData();
         $this->assertArrayNotHasKey('__name__', $data);
     }
 
     public function testPrototypeNameOption()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'entry_type' => FormTypeTest::TESTED_TYPE,
             'prototype' => true,
             'allow_add' => true,
-        ));
+        ]);
 
         $this->assertSame('__name__', $form->getConfig()->getAttribute('prototype')->getName(), '__name__ is the default');
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'entry_type' => FormTypeTest::TESTED_TYPE,
             'prototype' => true,
             'allow_add' => true,
             'prototype_name' => '__test__',
-        ));
+        ]);
 
         $this->assertSame('__test__', $form->getConfig()->getAttribute('prototype')->getName());
     }
 
     public function testPrototypeDefaultLabel()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, array(), array(
+        $form = $this->factory->create(static::TESTED_TYPE, [], [
             'entry_type' => FileTypeTest::TESTED_TYPE,
             'allow_add' => true,
             'prototype' => true,
             'prototype_name' => '__test__',
-        ));
+        ]);
 
         $this->assertSame('__test__label__', $form->createView()->vars['prototype']->vars['label']);
     }
 
     public function testPrototypeData()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, array(), array(
+        $form = $this->factory->create(static::TESTED_TYPE, [], [
             'allow_add' => true,
             'prototype' => true,
             'prototype_data' => 'foo',
             'entry_type' => TextTypeTest::TESTED_TYPE,
-            'entry_options' => array(
+            'entry_options' => [
                 'data' => 'bar',
                 'label' => false,
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertSame('foo', $form->createView()->vars['prototype']->vars['value']);
         $this->assertFalse($form->createView()->vars['prototype']->vars['label']);
@@ -338,25 +338,25 @@ public function testPrototypeData()
 
     public function testPrototypeDefaultRequired()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, array(), array(
+        $form = $this->factory->create(static::TESTED_TYPE, [], [
             'entry_type' => FileTypeTest::TESTED_TYPE,
             'allow_add' => true,
             'prototype' => true,
             'prototype_name' => '__test__',
-        ));
+        ]);
 
         $this->assertTrue($form->createView()->vars['prototype']->vars['required']);
     }
 
     public function testPrototypeSetNotRequired()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, array(), array(
+        $form = $this->factory->create(static::TESTED_TYPE, [], [
             'entry_type' => FileTypeTest::TESTED_TYPE,
             'allow_add' => true,
             'prototype' => true,
             'prototype_name' => '__test__',
             'required' => false,
-        ));
+        ]);
 
         $this->assertFalse($form->createView()->vars['required'], 'collection is not required');
         $this->assertFalse($form->createView()->vars['prototype']->vars['required'], '"prototype" should not be required');
@@ -364,16 +364,16 @@ public function testPrototypeSetNotRequired()
 
     public function testPrototypeSetNotRequiredIfParentNotRequired()
     {
-        $child = $this->factory->create(static::TESTED_TYPE, array(), array(
+        $child = $this->factory->create(static::TESTED_TYPE, [], [
             'entry_type' => FileTypeTest::TESTED_TYPE,
             'allow_add' => true,
             'prototype' => true,
             'prototype_name' => '__test__',
-        ));
+        ]);
 
-        $parent = $this->factory->create(FormTypeTest::TESTED_TYPE, array(), array(
+        $parent = $this->factory->create(FormTypeTest::TESTED_TYPE, [], [
             'required' => false,
-        ));
+        ]);
 
         $child->setParent($parent);
         $this->assertFalse($parent->createView()->vars['required'], 'Parent is not required');
@@ -383,19 +383,19 @@ public function testPrototypeSetNotRequiredIfParentNotRequired()
 
     public function testPrototypeNotOverrideRequiredByEntryOptionsInFavorOfParent()
     {
-        $child = $this->factory->create(static::TESTED_TYPE, array(), array(
+        $child = $this->factory->create(static::TESTED_TYPE, [], [
             'entry_type' => FileTypeTest::TESTED_TYPE,
             'allow_add' => true,
             'prototype' => true,
             'prototype_name' => '__test__',
-            'entry_options' => array(
+            'entry_options' => [
                 'required' => true,
-            ),
-        ));
+            ],
+        ]);
 
-        $parent = $this->factory->create(FormTypeTest::TESTED_TYPE, array(), array(
+        $parent = $this->factory->create(FormTypeTest::TESTED_TYPE, [], [
             'required' => false,
-        ));
+        ]);
 
         $child->setParent($parent);
 
@@ -406,10 +406,10 @@ public function testPrototypeNotOverrideRequiredByEntryOptionsInFavorOfParent()
 
     public function testSubmitNull($expected = null, $norm = null, $view = null)
     {
-        parent::testSubmitNull(array(), array(), array());
+        parent::testSubmitNull([], [], []);
     }
 
-    public function testSubmitNullUsesDefaultEmptyData($emptyData = array(), $expectedData = array())
+    public function testSubmitNullUsesDefaultEmptyData($emptyData = [], $expectedData = [])
     {
         // resize form listener always set an empty array
         parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php
index 9831f795895c3..96fce79f21d33 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php
@@ -44,7 +44,7 @@ public function testUnknownCountryIsNotIncluded()
         $choices = $this->factory->create(static::TESTED_TYPE, 'country')
             ->createView()->vars['choices'];
 
-        $countryCodes = array();
+        $countryCodes = [];
 
         foreach ($choices as $choice) {
             $countryCodes[] = $choice->value;
@@ -67,6 +67,6 @@ public function testInvalidChoiceValuesAreDropped()
     {
         $type = new CountryType();
 
-        $this->assertSame(array(), $type->loadChoicesForValues(array('foo')));
+        $this->assertSame([], $type->loadChoicesForValues(['foo']));
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CurrencyTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CurrencyTypeTest.php
index c91f7c0ff51e3..ae8c960cc1502 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CurrencyTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CurrencyTypeTest.php
@@ -50,6 +50,6 @@ public function testInvalidChoiceValuesAreDropped()
     {
         $type = new CurrencyType();
 
-        $this->assertSame(array(), $type->loadChoicesForValues(array('foo')));
+        $this->assertSame([], $type->loadChoicesForValues(['foo']));
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php
index 9e7cecebffe25..6e19b9fc3d22d 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php
@@ -21,39 +21,39 @@ class DateIntervalTypeTest extends BaseTypeTest
 
     public function testSubmitDateInterval()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array('input' => 'dateinterval'));
+        $form = $this->factory->create(static::TESTED_TYPE, null, ['input' => 'dateinterval']);
 
-        $form->submit(array(
+        $form->submit([
             'years' => '7',
             'months' => '6',
             'days' => '5',
-        ));
+        ]);
 
         $this->assertDateIntervalEquals(new \DateInterval('P7Y6M5D'), $form->getData());
     }
 
     public function testSubmitString()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array('input' => 'string'));
+        $form = $this->factory->create(static::TESTED_TYPE, null, ['input' => 'string']);
 
-        $form->submit(array(
+        $form->submit([
             'years' => '7',
             'months' => '6',
             'days' => '5',
-        ));
+        ]);
 
         $this->assertSame('P7Y6M5D', $form->getData());
     }
 
     public function testSubmitArray()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array('input' => 'array'));
+        $form = $this->factory->create(static::TESTED_TYPE, null, ['input' => 'array']);
 
-        $input = array(
+        $input = [
             'years' => '7',
             'months' => '6',
             'days' => '5',
-        );
+        ];
 
         $form->submit($input);
 
@@ -64,16 +64,16 @@ public function testSubmitWithoutMonths()
     {
         $interval = new \DateInterval('P7Y5D');
 
-        $form = $this->factory->create(static::TESTED_TYPE, $interval, array(
+        $form = $this->factory->create(static::TESTED_TYPE, $interval, [
             'input' => 'dateinterval',
             'with_months' => false,
-        ));
+        ]);
 
-        $form->submit(array(
+        $form->submit([
             'years' => '7',
             'months' => '6',
             'days' => '5',
-        ));
+        ]);
 
         $this->assertDateIntervalEquals($interval, $form->getData());
         $this->assertTrue($form->isSynchronized());
@@ -82,21 +82,21 @@ public function testSubmitWithoutMonths()
     public function testSubmitWithTime()
     {
         $interval = new \DateInterval('P7Y6M5DT4H3M2S');
-        $form = $this->factory->create(static::TESTED_TYPE, $interval, array(
+        $form = $this->factory->create(static::TESTED_TYPE, $interval, [
             'input' => 'dateinterval',
             'with_hours' => true,
             'with_minutes' => true,
             'with_seconds' => true,
-        ));
+        ]);
 
-        $form->submit(array(
+        $form->submit([
             'years' => '7',
             'months' => '6',
             'days' => '5',
             'hours' => '4',
             'minutes' => '3',
             'seconds' => '2',
-        ));
+        ]);
 
         $this->assertDateIntervalEquals($interval, $form->getData());
         $this->assertTrue($form->isSynchronized());
@@ -104,34 +104,34 @@ public function testSubmitWithTime()
 
     public function testSubmitWithWeeks()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, new \DateInterval('P0Y'), array(
+        $form = $this->factory->create(static::TESTED_TYPE, new \DateInterval('P0Y'), [
             'input' => 'dateinterval',
             'with_years' => false,
             'with_months' => false,
             'with_weeks' => true,
             'with_days' => false,
-        ));
+        ]);
 
-        $form->submit(array(
+        $form->submit([
             'weeks' => '30',
-        ));
+        ]);
 
         $this->assertDateIntervalEquals(new \DateInterval('P30W'), $form->getData());
     }
 
     public function testSubmitWithInvert()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'input' => 'dateinterval',
             'with_invert' => true,
-        ));
+        ]);
 
-        $form->submit(array(
+        $form->submit([
             'years' => '7',
             'months' => '6',
             'days' => '5',
             'invert' => true,
-        ));
+        ]);
 
         $interval = new \DateInterval('P7Y6M5D');
         $interval->invert = 1;
@@ -141,10 +141,10 @@ public function testSubmitWithInvert()
 
     public function testSubmitStringSingleText()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'input' => 'string',
             'widget' => 'single_text',
-        ));
+        ]);
 
         $interval = 'P7Y6M5D';
 
@@ -156,13 +156,13 @@ public function testSubmitStringSingleText()
 
     public function testSubmitStringSingleTextWithSeconds()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'input' => 'string',
             'widget' => 'single_text',
             'with_hours' => true,
             'with_minutes' => true,
             'with_seconds' => true,
-        ));
+        ]);
 
         $interval = 'P7Y6M5DT4H3M2S';
 
@@ -174,19 +174,19 @@ public function testSubmitStringSingleTextWithSeconds()
 
     public function testSubmitArrayInteger()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'integer',
             'with_invert' => true,
-        ));
+        ]);
 
         $years = '7';
 
-        $form->submit(array(
+        $form->submit([
             'years' => '7',
             'months' => '6',
             'days' => '5',
             'invert' => true,
-        ));
+        ]);
 
         $this->assertSame($years, $form['years']->getData());
         $this->assertSame($years, $form['years']->getViewData());
@@ -201,10 +201,10 @@ public function testInitializeWithDateInterval()
 
     public function testPassDefaultPlaceholderToViewIfNotRequired()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => false,
             'with_seconds' => true,
-        ))
+        ])
             ->createView();
 
         $this->assertSame('', $view['years']->vars['placeholder']);
@@ -215,10 +215,10 @@ public function testPassDefaultPlaceholderToViewIfNotRequired()
 
     public function testPassNoPlaceholderToViewIfRequired()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => true,
             'with_seconds' => true,
-        ))
+        ])
             ->createView();
 
         $this->assertNull($view['years']->vars['placeholder']);
@@ -229,10 +229,10 @@ public function testPassNoPlaceholderToViewIfRequired()
 
     public function testPassPlaceholderAsString()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'placeholder' => 'Empty',
             'with_seconds' => true,
-        ))
+        ])
             ->createView();
 
         $this->assertSame('Empty', $view['years']->vars['placeholder']);
@@ -243,19 +243,19 @@ public function testPassPlaceholderAsString()
 
     public function testPassPlaceholderAsArray()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
-            'placeholder' => array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
+            'placeholder' => [
                 'years' => 'Empty years',
                 'months' => 'Empty months',
                 'days' => 'Empty days',
                 'hours' => 'Empty hours',
                 'minutes' => 'Empty minutes',
                 'seconds' => 'Empty seconds',
-            ),
+            ],
             'with_hours' => true,
             'with_minutes' => true,
             'with_seconds' => true,
-        ))
+        ])
             ->createView();
 
         $this->assertSame('Empty years', $view['years']->vars['placeholder']);
@@ -268,18 +268,18 @@ public function testPassPlaceholderAsArray()
 
     public function testPassPlaceholderAsPartialArrayAddEmptyIfNotRequired()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => false,
-            'placeholder' => array(
+            'placeholder' => [
                 'years' => 'Empty years',
                 'days' => 'Empty days',
                 'hours' => 'Empty hours',
                 'seconds' => 'Empty seconds',
-            ),
+            ],
             'with_hours' => true,
             'with_minutes' => true,
             'with_seconds' => true,
-        ))
+        ])
             ->createView();
 
         $this->assertSame('Empty years', $view['years']->vars['placeholder']);
@@ -292,18 +292,18 @@ public function testPassPlaceholderAsPartialArrayAddEmptyIfNotRequired()
 
     public function testPassPlaceholderAsPartialArrayAddNullIfRequired()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => true,
-            'placeholder' => array(
+            'placeholder' => [
                 'years' => 'Empty years',
                 'days' => 'Empty days',
                 'hours' => 'Empty hours',
                 'seconds' => 'Empty seconds',
-            ),
+            ],
             'with_hours' => true,
             'with_minutes' => true,
             'with_seconds' => true,
-        ))
+        ])
             ->createView();
 
         $this->assertSame('Empty years', $view['years']->vars['placeholder']);
@@ -321,18 +321,18 @@ public function testDateTypeChoiceErrorsBubbleUp()
 
         $form['years']->addError($error);
 
-        $this->assertSame(array(), iterator_to_array($form['years']->getErrors()));
-        $this->assertSame(array($error), iterator_to_array($form->getErrors()));
+        $this->assertSame([], iterator_to_array($form['years']->getErrors()));
+        $this->assertSame([$error], iterator_to_array($form->getErrors()));
     }
 
     public function testTranslationsAreDisabledForChoiceWidget()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'choice',
             'with_hours' => true,
             'with_minutes' => true,
             'with_seconds' => true,
-        ));
+        ]);
 
         $this->assertFalse($form->get('years')->getConfig()->getOption('choice_translation_domain'));
         $this->assertFalse($form->get('months')->getConfig()->getOption('choice_translation_domain'));
@@ -344,11 +344,11 @@ public function testTranslationsAreDisabledForChoiceWidget()
 
     public function testInvertDoesNotInheritRequiredOption()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'input' => 'dateinterval',
             'with_invert' => true,
             'required' => true,
-        ));
+        ]);
 
         $this->assertFalse($form->get('invert')->getConfig()->getOption('required'));
     }
@@ -358,13 +358,13 @@ public function testCanChangeTimeFieldsLabels()
         $form = $this->factory->create(
             static::TESTED_TYPE,
             null,
-            array(
+            [
                 'required' => true,
                 'with_invert' => true,
                 'with_hours' => true,
                 'with_minutes' => true,
                 'with_seconds' => true,
-                'labels' => array(
+                'labels' => [
                     'invert' => 'form.trans.invert',
                     'years' => 'form.trans.years',
                     'months' => 'form.trans.months',
@@ -372,8 +372,8 @@ public function testCanChangeTimeFieldsLabels()
                     'hours' => 'form.trans.hours',
                     'minutes' => 'form.trans.minutes',
                     'seconds' => 'form.trans.seconds',
-                ),
-            )
+                ],
+            ]
         );
 
         $view = $form->createView();
@@ -388,15 +388,15 @@ public function testCanChangeTimeFieldsLabels()
 
     public function testInvertDefaultLabel()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array('with_invert' => true));
+        $form = $this->factory->create(static::TESTED_TYPE, null, ['with_invert' => true]);
 
         $view = $form->createView();
         $this->assertSame('Negative interval', $view['invert']->vars['label']);
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'with_invert' => true,
-            'labels' => array('invert' => null),
-        ));
+            'labels' => ['invert' => null],
+        ]);
 
         $view = $form->createView();
         $this->assertSame('Negative interval', $view['invert']->vars['label']);
@@ -404,22 +404,22 @@ public function testInvertDefaultLabel()
 
     public function testSubmitNull($expected = null, $norm = null, $view = null)
     {
-        parent::testSubmitNull($expected, $norm, array(
+        parent::testSubmitNull($expected, $norm, [
             'years' => '',
             'months' => '',
             'days' => '',
-        ));
+        ]);
     }
 
-    public function testSubmitNullUsesDefaultEmptyData($emptyData = array(), $expectedData = null)
+    public function testSubmitNullUsesDefaultEmptyData($emptyData = [], $expectedData = null)
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'empty_data' => $emptyData,
-        ));
+        ]);
         $form->submit(null);
 
         // view transformer writes back empty strings in the view data
-        $this->assertSame(array('years' => '', 'months' => '', 'days' => ''), $form->getViewData());
+        $this->assertSame(['years' => '', 'months' => '', 'days' => ''], $form->getViewData());
         $this->assertSame($expectedData, $form->getNormData());
         $this->assertSame($expectedData, $form->getData());
     }
@@ -429,10 +429,10 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = array(), $expect
      */
     public function testSubmitNullUsesDateEmptyData($widget, $emptyData, $expectedData)
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => $widget,
             'empty_data' => $emptyData,
-        ));
+        ]);
         $form->submit(null);
 
         $this->assertSame($emptyData, $form->getViewData());
@@ -444,11 +444,11 @@ public function provideEmptyData()
     {
         $expectedData = \DateInterval::createFromDateString('6 years and 4 months');
 
-        return array(
-            'Simple field' => array('single_text', 'P6Y4M0D', $expectedData),
-            'Compound text field' => array('text', array('years' => '06', 'months' => '04', 'days' => '00'), $expectedData),
-            'Compound integer field' => array('integer', array('years' => '6', 'months' => '4', 'days' => '0'), $expectedData),
-            'Compound choice field' => array('choice', array('years' => '6', 'months' => '4', 'days' => '0'), $expectedData),
-        );
+        return [
+            'Simple field' => ['single_text', 'P6Y4M0D', $expectedData],
+            'Compound text field' => ['text', ['years' => '06', 'months' => '04', 'days' => '00'], $expectedData],
+            'Compound integer field' => ['integer', ['years' => '6', 'months' => '4', 'days' => '0'], $expectedData],
+            'Compound choice field' => ['choice', ['years' => '6', 'months' => '4', 'days' => '0'], $expectedData],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
index d219d9e387f1d..e3f3b729d3ec7 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
@@ -26,26 +26,26 @@ protected function setUp()
 
     public function testSubmitDateTime()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'date_widget' => 'choice',
-            'years' => array(2010),
+            'years' => [2010],
             'time_widget' => 'choice',
             'input' => 'datetime',
-        ));
+        ]);
 
-        $form->submit(array(
-            'date' => array(
+        $form->submit([
+            'date' => [
                 'day' => '2',
                 'month' => '6',
                 'year' => '2010',
-            ),
-            'time' => array(
+            ],
+            'time' => [
                 'hour' => '3',
                 'minute' => '4',
-            ),
-        ));
+            ],
+        ]);
 
         $dateTime = new \DateTime('2010-06-02 03:04:00 UTC');
 
@@ -54,52 +54,52 @@ public function testSubmitDateTime()
 
     public function testSubmitString()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'string',
             'date_widget' => 'choice',
-            'years' => array(2010),
+            'years' => [2010],
             'time_widget' => 'choice',
-        ));
+        ]);
 
-        $form->submit(array(
-            'date' => array(
+        $form->submit([
+            'date' => [
                 'day' => '2',
                 'month' => '6',
                 'year' => '2010',
-            ),
-            'time' => array(
+            ],
+            'time' => [
                 'hour' => '3',
                 'minute' => '4',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertEquals('2010-06-02 03:04:00', $form->getData());
     }
 
     public function testSubmitTimestamp()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'timestamp',
             'date_widget' => 'choice',
-            'years' => array(2010),
+            'years' => [2010],
             'time_widget' => 'choice',
-        ));
+        ]);
 
-        $form->submit(array(
-            'date' => array(
+        $form->submit([
+            'date' => [
                 'day' => '2',
                 'month' => '6',
                 'year' => '2010',
-            ),
-            'time' => array(
+            ],
+            'time' => [
                 'hour' => '3',
                 'minute' => '4',
-            ),
-        ));
+            ],
+        ]);
 
         $dateTime = new \DateTime('2010-06-02 03:04:00 UTC');
 
@@ -108,28 +108,28 @@ public function testSubmitTimestamp()
 
     public function testSubmitWithoutMinutes()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'date_widget' => 'choice',
-            'years' => array(2010),
+            'years' => [2010],
             'time_widget' => 'choice',
             'input' => 'datetime',
             'with_minutes' => false,
-        ));
+        ]);
 
         $form->setData(new \DateTime());
 
-        $input = array(
-            'date' => array(
+        $input = [
+            'date' => [
                 'day' => '2',
                 'month' => '6',
                 'year' => '2010',
-            ),
-            'time' => array(
+            ],
+            'time' => [
                 'hour' => '3',
-            ),
-        );
+            ],
+        ];
 
         $form->submit($input);
 
@@ -138,30 +138,30 @@ public function testSubmitWithoutMinutes()
 
     public function testSubmitWithSeconds()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'date_widget' => 'choice',
-            'years' => array(2010),
+            'years' => [2010],
             'time_widget' => 'choice',
             'input' => 'datetime',
             'with_seconds' => true,
-        ));
+        ]);
 
         $form->setData(new \DateTime());
 
-        $input = array(
-            'date' => array(
+        $input = [
+            'date' => [
                 'day' => '2',
                 'month' => '6',
                 'year' => '2010',
-            ),
-            'time' => array(
+            ],
+            'time' => [
                 'hour' => '3',
                 'minute' => '4',
                 'second' => '5',
-            ),
-        );
+            ],
+        ];
 
         $form->submit($input);
 
@@ -170,30 +170,30 @@ public function testSubmitWithSeconds()
 
     public function testSubmitDifferentTimezones()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'America/New_York',
             'view_timezone' => 'Pacific/Tahiti',
             'date_widget' => 'choice',
-            'years' => array(2010),
+            'years' => [2010],
             'time_widget' => 'choice',
             'input' => 'string',
             'with_seconds' => true,
-        ));
+        ]);
 
         $dateTime = new \DateTime('2010-06-02 03:04:05 Pacific/Tahiti');
 
-        $form->submit(array(
-            'date' => array(
+        $form->submit([
+            'date' => [
                 'day' => (int) $dateTime->format('d'),
                 'month' => (int) $dateTime->format('m'),
                 'year' => (int) $dateTime->format('Y'),
-            ),
-            'time' => array(
+            ],
+            'time' => [
                 'hour' => (int) $dateTime->format('H'),
                 'minute' => (int) $dateTime->format('i'),
                 'second' => (int) $dateTime->format('s'),
-            ),
-        ));
+            ],
+        ]);
 
         $dateTime->setTimezone(new \DateTimeZone('America/New_York'));
 
@@ -202,12 +202,12 @@ public function testSubmitDifferentTimezones()
 
     public function testSubmitDifferentTimezonesDateTime()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'America/New_York',
             'view_timezone' => 'Pacific/Tahiti',
             'widget' => 'single_text',
             'input' => 'datetime',
-        ));
+        ]);
 
         $outputTime = new \DateTime('2010-06-02 03:04:00 Pacific/Tahiti');
 
@@ -221,12 +221,12 @@ public function testSubmitDifferentTimezonesDateTime()
 
     public function testSubmitStringSingleText()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'string',
             'widget' => 'single_text',
-        ));
+        ]);
 
         $form->submit('2010-06-02T03:04:00');
 
@@ -236,13 +236,13 @@ public function testSubmitStringSingleText()
 
     public function testSubmitStringSingleTextWithSeconds()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'string',
             'widget' => 'single_text',
             'with_seconds' => true,
-        ));
+        ]);
 
         $form->submit('2010-06-02T03:04:05');
 
@@ -252,19 +252,19 @@ public function testSubmitStringSingleTextWithSeconds()
 
     public function testSubmitDifferentPattern()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'date_format' => 'MM*yyyy*dd',
             'date_widget' => 'single_text',
             'time_widget' => 'single_text',
             'input' => 'datetime',
-        ));
+        ]);
 
         $dateTime = new \DateTime('2010-06-02 03:04');
 
-        $form->submit(array(
+        $form->submit([
             'date' => '06*2010*02',
             'time' => '03:04',
-        ));
+        ]);
 
         $this->assertEquals($dateTime, $form->getData());
     }
@@ -278,9 +278,9 @@ public function testInitializeWithDateTime()
 
     public function testSingleTextWidgetShouldUseTheRightInputType()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'single_text',
-        ))
+        ])
             ->createView();
 
         $this->assertEquals('datetime-local', $view->vars['type']);
@@ -288,10 +288,10 @@ public function testSingleTextWidgetShouldUseTheRightInputType()
 
     public function testPassDefaultPlaceholderToViewIfNotRequired()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => false,
             'with_seconds' => true,
-        ))
+        ])
             ->createView();
 
         $this->assertSame('', $view['date']['year']->vars['placeholder']);
@@ -304,10 +304,10 @@ public function testPassDefaultPlaceholderToViewIfNotRequired()
 
     public function testPassNoPlaceholderToViewIfRequired()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => true,
             'with_seconds' => true,
-        ))
+        ])
             ->createView();
 
         $this->assertNull($view['date']['year']->vars['placeholder']);
@@ -320,10 +320,10 @@ public function testPassNoPlaceholderToViewIfRequired()
 
     public function testPassPlaceholderAsString()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'placeholder' => 'Empty',
             'with_seconds' => true,
-        ))
+        ])
             ->createView();
 
         $this->assertSame('Empty', $view['date']['year']->vars['placeholder']);
@@ -336,17 +336,17 @@ public function testPassPlaceholderAsString()
 
     public function testPassPlaceholderAsArray()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
-            'placeholder' => array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
+            'placeholder' => [
                 'year' => 'Empty year',
                 'month' => 'Empty month',
                 'day' => 'Empty day',
                 'hour' => 'Empty hour',
                 'minute' => 'Empty minute',
                 'second' => 'Empty second',
-            ),
+            ],
             'with_seconds' => true,
-        ))
+        ])
             ->createView();
 
         $this->assertSame('Empty year', $view['date']['year']->vars['placeholder']);
@@ -359,16 +359,16 @@ public function testPassPlaceholderAsArray()
 
     public function testPassPlaceholderAsPartialArrayAddEmptyIfNotRequired()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => false,
-            'placeholder' => array(
+            'placeholder' => [
                 'year' => 'Empty year',
                 'day' => 'Empty day',
                 'hour' => 'Empty hour',
                 'second' => 'Empty second',
-            ),
+            ],
             'with_seconds' => true,
-        ))
+        ])
             ->createView();
 
         $this->assertSame('Empty year', $view['date']['year']->vars['placeholder']);
@@ -381,16 +381,16 @@ public function testPassPlaceholderAsPartialArrayAddEmptyIfNotRequired()
 
     public function testPassPlaceholderAsPartialArrayAddNullIfRequired()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => true,
-            'placeholder' => array(
+            'placeholder' => [
                 'year' => 'Empty year',
                 'day' => 'Empty day',
                 'hour' => 'Empty hour',
                 'second' => 'Empty second',
-            ),
+            ],
             'with_seconds' => true,
-        ))
+        ])
             ->createView();
 
         $this->assertSame('Empty year', $view['date']['year']->vars['placeholder']);
@@ -403,9 +403,9 @@ public function testPassPlaceholderAsPartialArrayAddNullIfRequired()
 
     public function testPassHtml5TypeIfSingleTextAndHtml5Format()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'single_text',
-        ))
+        ])
             ->createView();
 
         $this->assertSame('datetime-local', $view->vars['type']);
@@ -413,10 +413,10 @@ public function testPassHtml5TypeIfSingleTextAndHtml5Format()
 
     public function testDontPassHtml5TypeIfHtml5NotAllowed()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'single_text',
             'html5' => false,
-        ))
+        ])
             ->createView();
 
         $this->assertArrayNotHasKey('type', $view->vars);
@@ -424,10 +424,10 @@ public function testDontPassHtml5TypeIfHtml5NotAllowed()
 
     public function testDontPassHtml5TypeIfNotHtml5Format()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'single_text',
             'format' => 'yyyy-MM-dd HH:mm',
-        ))
+        ])
             ->createView();
 
         $this->assertArrayNotHasKey('type', $view->vars);
@@ -435,9 +435,9 @@ public function testDontPassHtml5TypeIfNotHtml5Format()
 
     public function testDontPassHtml5TypeIfNotSingleText()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'text',
-        ))
+        ])
             ->createView();
 
         $this->assertArrayNotHasKey('type', $view->vars);
@@ -450,21 +450,21 @@ public function testDateTypeChoiceErrorsBubbleUp()
 
         $form['date']->addError($error);
 
-        $this->assertSame(array(), iterator_to_array($form['date']->getErrors()));
-        $this->assertSame(array($error), iterator_to_array($form->getErrors()));
+        $this->assertSame([], iterator_to_array($form['date']->getErrors()));
+        $this->assertSame([$error], iterator_to_array($form->getErrors()));
     }
 
     public function testDateTypeSingleTextErrorsBubbleUp()
     {
         $error = new FormError('Invalid!');
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'date_widget' => 'single_text',
-        ));
+        ]);
 
         $form['date']->addError($error);
 
-        $this->assertSame(array(), iterator_to_array($form['date']->getErrors()));
-        $this->assertSame(array($error), iterator_to_array($form->getErrors()));
+        $this->assertSame([], iterator_to_array($form['date']->getErrors()));
+        $this->assertSame([$error], iterator_to_array($form->getErrors()));
     }
 
     public function testTimeTypeChoiceErrorsBubbleUp()
@@ -474,28 +474,28 @@ public function testTimeTypeChoiceErrorsBubbleUp()
 
         $form['time']->addError($error);
 
-        $this->assertSame(array(), iterator_to_array($form['time']->getErrors()));
-        $this->assertSame(array($error), iterator_to_array($form->getErrors()));
+        $this->assertSame([], iterator_to_array($form['time']->getErrors()));
+        $this->assertSame([$error], iterator_to_array($form->getErrors()));
     }
 
     public function testTimeTypeSingleTextErrorsBubbleUp()
     {
         $error = new FormError('Invalid!');
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'time_widget' => 'single_text',
-        ));
+        ]);
 
         $form['time']->addError($error);
 
-        $this->assertSame(array(), iterator_to_array($form['time']->getErrors()));
-        $this->assertSame(array($error), iterator_to_array($form->getErrors()));
+        $this->assertSame([], iterator_to_array($form['time']->getErrors()));
+        $this->assertSame([$error], iterator_to_array($form->getErrors()));
     }
 
     public function testPassDefaultChoiceTranslationDomain()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'with_seconds' => true,
-        ));
+        ]);
 
         $view = $form->createView();
 
@@ -509,10 +509,10 @@ public function testPassDefaultChoiceTranslationDomain()
 
     public function testPassChoiceTranslationDomainAsString()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'choice_translation_domain' => 'messages',
             'with_seconds' => true,
-        ));
+        ]);
 
         $view = $form->createView();
         $this->assertSame('messages', $view['date']['year']->vars['choice_translation_domain']);
@@ -525,15 +525,15 @@ public function testPassChoiceTranslationDomainAsString()
 
     public function testPassChoiceTranslationDomainAsArray()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
-            'choice_translation_domain' => array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'choice_translation_domain' => [
                 'year' => 'foo',
                 'month' => 'test',
                 'hour' => 'foo',
                 'second' => 'test',
-            ),
+            ],
             'with_seconds' => true,
-        ));
+        ]);
 
         $view = $form->createView();
         $this->assertSame('foo', $view['date']['year']->vars['choice_translation_domain']);
@@ -546,34 +546,34 @@ public function testPassChoiceTranslationDomainAsArray()
 
     public function testSubmitNull($expected = null, $norm = null, $view = null)
     {
-        parent::testSubmitNull($expected, $norm, array(
+        parent::testSubmitNull($expected, $norm, [
             // View data is an array of choice values array
-            'date' => array('year' => '', 'month' => '', 'day' => ''),
-            'time' => array('hour' => '', 'minute' => ''),
-        ));
+            'date' => ['year' => '', 'month' => '', 'day' => ''],
+            'time' => ['hour' => '', 'minute' => ''],
+        ]);
     }
 
     public function testSubmitNullWithText()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'text',
-        ));
+        ]);
         $form->submit(null);
 
         $this->assertNull($form->getData());
         $this->assertNull($form->getNormData());
-        $this->assertSame(array(
+        $this->assertSame([
             // View data is an array of choice values array
-            'date' => array('year' => '', 'month' => '', 'day' => ''),
-            'time' => array('hour' => '', 'minute' => ''),
-        ), $form->getViewData());
+            'date' => ['year' => '', 'month' => '', 'day' => ''],
+            'time' => ['hour' => '', 'minute' => ''],
+        ], $form->getViewData());
     }
 
     public function testSubmitNullWithSingleText()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'single_text',
-        ));
+        ]);
         $form->submit(null);
 
         $this->assertNull($form->getData());
@@ -581,16 +581,16 @@ public function testSubmitNullWithSingleText()
         $this->assertSame('', $form->getViewData());
     }
 
-    public function testSubmitNullUsesDefaultEmptyData($emptyData = array(), $expectedData = null)
+    public function testSubmitNullUsesDefaultEmptyData($emptyData = [], $expectedData = null)
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'empty_data' => $emptyData,
-        ));
+        ]);
         $form->submit(null);
 
         // view transformer writes back empty strings in the view data
         $this->assertSame(
-            array('date' => array('year' => '', 'month' => '', 'day' => ''), 'time' => array('hour' => '', 'minute' => '')),
+            ['date' => ['year' => '', 'month' => '', 'day' => ''], 'time' => ['hour' => '', 'minute' => '']],
             $form->getViewData()
         );
         $this->assertSame($expectedData, $form->getNormData());
@@ -602,10 +602,10 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = array(), $expect
      */
     public function testSubmitNullUsesDateEmptyData($widget, $emptyData, $expectedData)
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => $widget,
             'empty_data' => $emptyData,
-        ));
+        ]);
         $form->submit(null);
 
         $this->assertSame($emptyData, $form->getViewData());
@@ -617,10 +617,10 @@ public function provideEmptyData()
     {
         $expectedData = \DateTime::createFromFormat('Y-m-d H:i', '2018-11-11 21:23');
 
-        return array(
-            'Simple field' => array('single_text', '2018-11-11T21:23:00', $expectedData),
-            'Compound text field' => array('text', array('date' => array('year' => '2018', 'month' => '11', 'day' => '11'), 'time' => array('hour' => '21', 'minute' => '23')), $expectedData),
-            'Compound choice field' => array('choice', array('date' => array('year' => '2018', 'month' => '11', 'day' => '11'), 'time' => array('hour' => '21', 'minute' => '23')), $expectedData),
-        );
+        return [
+            'Simple field' => ['single_text', '2018-11-11T21:23:00', $expectedData],
+            'Compound text field' => ['text', ['date' => ['year' => '2018', 'month' => '11', 'day' => '11'], 'time' => ['hour' => '21', 'minute' => '23']], $expectedData],
+            'Compound choice field' => ['choice', ['date' => ['year' => '2018', 'month' => '11', 'day' => '11'], 'time' => ['hour' => '21', 'minute' => '23']], $expectedData],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
index 169d18b61bdea..247a5d4b37861 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
@@ -38,9 +38,9 @@ protected function tearDown()
      */
     public function testInvalidWidgetOption()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'fake_widget',
-        ));
+        ]);
     }
 
     /**
@@ -48,19 +48,19 @@ public function testInvalidWidgetOption()
      */
     public function testInvalidInputOption()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->factory->create(static::TESTED_TYPE, null, [
             'input' => 'fake_input',
-        ));
+        ]);
     }
 
     public function testSubmitFromSingleTextDateTimeWithDefaultFormat()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'widget' => 'single_text',
             'input' => 'datetime',
-        ));
+        ]);
 
         $form->submit('2010-06-02');
 
@@ -70,13 +70,13 @@ public function testSubmitFromSingleTextDateTimeWithDefaultFormat()
 
     public function testSubmitFromSingleTextDateTimeWithCustomFormat()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'widget' => 'single_text',
             'input' => 'datetime',
             'format' => 'yyyy',
-        ));
+        ]);
 
         $form->submit('2010');
 
@@ -91,13 +91,13 @@ public function testSubmitFromSingleTextDateTime()
 
         \Locale::setDefault('de_DE');
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'format' => \IntlDateFormatter::MEDIUM,
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'widget' => 'single_text',
             'input' => 'datetime',
-        ));
+        ]);
 
         $form->submit('2.6.2010');
 
@@ -112,13 +112,13 @@ public function testSubmitFromSingleTextString()
 
         \Locale::setDefault('de_DE');
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'format' => \IntlDateFormatter::MEDIUM,
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'widget' => 'single_text',
             'input' => 'string',
-        ));
+        ]);
 
         $form->submit('2.6.2010');
 
@@ -133,13 +133,13 @@ public function testSubmitFromSingleTextTimestamp()
 
         \Locale::setDefault('de_DE');
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'format' => \IntlDateFormatter::MEDIUM,
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'widget' => 'single_text',
             'input' => 'timestamp',
-        ));
+        ]);
 
         $form->submit('2.6.2010');
 
@@ -156,21 +156,21 @@ public function testSubmitFromSingleTextRaw()
 
         \Locale::setDefault('de_DE');
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'format' => \IntlDateFormatter::MEDIUM,
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'widget' => 'single_text',
             'input' => 'array',
-        ));
+        ]);
 
         $form->submit('2.6.2010');
 
-        $output = array(
+        $output = [
             'day' => '2',
             'month' => '6',
             'year' => '2010',
-        );
+        ];
 
         $this->assertEquals($output, $form->getData());
         $this->assertEquals('02.06.2010', $form->getViewData());
@@ -178,17 +178,17 @@ public function testSubmitFromSingleTextRaw()
 
     public function testSubmitFromText()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'widget' => 'text',
-        ));
+        ]);
 
-        $text = array(
+        $text = [
             'day' => '2',
             'month' => '6',
             'year' => '2010',
-        );
+        ];
 
         $form->submit($text);
 
@@ -200,18 +200,18 @@ public function testSubmitFromText()
 
     public function testSubmitFromChoice()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'widget' => 'choice',
-            'years' => array(2010),
-        ));
+            'years' => [2010],
+        ]);
 
-        $text = array(
+        $text = [
             'day' => '2',
             'month' => '6',
             'year' => '2010',
-        );
+        ];
 
         $form->submit($text);
 
@@ -223,18 +223,18 @@ public function testSubmitFromChoice()
 
     public function testSubmitFromChoiceEmpty()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'widget' => 'choice',
             'required' => false,
-        ));
+        ]);
 
-        $text = array(
+        $text = [
             'day' => '',
             'month' => '',
             'year' => '',
-        );
+        ];
 
         $form->submit($text);
 
@@ -244,13 +244,13 @@ public function testSubmitFromChoiceEmpty()
 
     public function testSubmitFromInputDateTimeDifferentPattern()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'format' => 'MM*yyyy*dd',
             'widget' => 'single_text',
             'input' => 'datetime',
-        ));
+        ]);
 
         $form->submit('06*2010*02');
 
@@ -260,13 +260,13 @@ public function testSubmitFromInputDateTimeDifferentPattern()
 
     public function testSubmitFromInputStringDifferentPattern()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'format' => 'MM*yyyy*dd',
             'widget' => 'single_text',
             'input' => 'string',
-        ));
+        ]);
 
         $form->submit('06*2010*02');
 
@@ -276,13 +276,13 @@ public function testSubmitFromInputStringDifferentPattern()
 
     public function testSubmitFromInputTimestampDifferentPattern()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'format' => 'MM*yyyy*dd',
             'widget' => 'single_text',
             'input' => 'timestamp',
-        ));
+        ]);
 
         $form->submit('06*2010*02');
 
@@ -294,21 +294,21 @@ public function testSubmitFromInputTimestampDifferentPattern()
 
     public function testSubmitFromInputRawDifferentPattern()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'format' => 'MM*yyyy*dd',
             'widget' => 'single_text',
             'input' => 'array',
-        ));
+        ]);
 
         $form->submit('06*2010*02');
 
-        $output = array(
+        $output = [
             'day' => '2',
             'month' => '6',
             'year' => '2010',
-        );
+        ];
 
         $this->assertEquals($output, $form->getData());
         $this->assertEquals('06*2010*02', $form->getViewData());
@@ -319,9 +319,9 @@ public function testSubmitFromInputRawDifferentPattern()
      */
     public function testDatePatternWithFormatOption($format, $pattern)
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'format' => $format,
-        ))
+        ])
             ->createView();
 
         $this->assertEquals($pattern, $view->vars['date_pattern']);
@@ -329,11 +329,11 @@ public function testDatePatternWithFormatOption($format, $pattern)
 
     public function provideDateFormats()
     {
-        return array(
-            array('dMy', '{{ day }}{{ month }}{{ year }}'),
-            array('d-M-yyyy', '{{ day }}-{{ month }}-{{ year }}'),
-            array('M d y', '{{ month }} {{ day }} {{ year }}'),
-        );
+        return [
+            ['dMy', '{{ day }}{{ month }}{{ year }}'],
+            ['d-M-yyyy', '{{ day }}-{{ month }}-{{ year }}'],
+            ['M d y', '{{ month }} {{ day }} {{ year }}'],
+        ];
     }
 
     /**
@@ -344,11 +344,11 @@ public function provideDateFormats()
      */
     public function testThrowExceptionIfFormatIsNoPattern()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->factory->create(static::TESTED_TYPE, null, [
             'format' => '0',
             'widget' => 'single_text',
             'input' => 'string',
-        ));
+        ]);
     }
 
     /**
@@ -357,10 +357,10 @@ public function testThrowExceptionIfFormatIsNoPattern()
      */
     public function testThrowExceptionIfFormatDoesNotContainYearMonthAndDay()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
-            'months' => array(6, 7),
+        $this->factory->create(static::TESTED_TYPE, null, [
+            'months' => [6, 7],
             'format' => 'yy',
-        ));
+        ]);
     }
 
     /**
@@ -369,10 +369,10 @@ public function testThrowExceptionIfFormatDoesNotContainYearMonthAndDay()
      */
     public function testThrowExceptionIfFormatMissesYearMonthAndDayWithSingleTextWidget()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'single_text',
             'format' => 'wrong',
-        ));
+        ]);
     }
 
     /**
@@ -380,9 +380,9 @@ public function testThrowExceptionIfFormatMissesYearMonthAndDayWithSingleTextWid
      */
     public function testThrowExceptionIfFormatIsNoConstant()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->factory->create(static::TESTED_TYPE, null, [
             'format' => 105,
-        ));
+        ]);
     }
 
     /**
@@ -390,9 +390,9 @@ public function testThrowExceptionIfFormatIsNoConstant()
      */
     public function testThrowExceptionIfFormatIsInvalid()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
-            'format' => array(),
-        ));
+        $this->factory->create(static::TESTED_TYPE, null, [
+            'format' => [],
+        ]);
     }
 
     /**
@@ -400,9 +400,9 @@ public function testThrowExceptionIfFormatIsInvalid()
      */
     public function testThrowExceptionIfYearsIsInvalid()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->factory->create(static::TESTED_TYPE, null, [
             'years' => 'bad value',
-        ));
+        ]);
     }
 
     /**
@@ -410,9 +410,9 @@ public function testThrowExceptionIfYearsIsInvalid()
      */
     public function testThrowExceptionIfMonthsIsInvalid()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->factory->create(static::TESTED_TYPE, null, [
             'months' => 'bad value',
-        ));
+        ]);
     }
 
     /**
@@ -420,9 +420,9 @@ public function testThrowExceptionIfMonthsIsInvalid()
      */
     public function testThrowExceptionIfDaysIsInvalid()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->factory->create(static::TESTED_TYPE, null, [
             'days' => 'bad value',
-        ));
+        ]);
     }
 
     public function testSetDataWithNegativeTimezoneOffsetStringInput()
@@ -432,13 +432,13 @@ public function testSetDataWithNegativeTimezoneOffsetStringInput()
 
         \Locale::setDefault('de_DE');
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'format' => \IntlDateFormatter::MEDIUM,
             'model_timezone' => 'UTC',
             'view_timezone' => 'America/New_York',
             'input' => 'string',
             'widget' => 'single_text',
-        ));
+        ]);
 
         $form->setData('2010-06-02');
 
@@ -454,13 +454,13 @@ public function testSetDataWithNegativeTimezoneOffsetDateTimeInput()
 
         \Locale::setDefault('de_DE');
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'format' => \IntlDateFormatter::MEDIUM,
             'model_timezone' => 'UTC',
             'view_timezone' => 'America/New_York',
             'input' => 'datetime',
             'widget' => 'single_text',
-        ));
+        ]);
 
         $dateTime = new \DateTime('2010-06-02 UTC');
 
@@ -474,31 +474,31 @@ public function testSetDataWithNegativeTimezoneOffsetDateTimeInput()
 
     public function testYearsOption()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
-            'years' => array(2010, 2011),
-        ));
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'years' => [2010, 2011],
+        ]);
 
         $view = $form->createView();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ChoiceView('2010', '2010', '2010'),
             new ChoiceView('2011', '2011', '2011'),
-        ), $view['year']->vars['choices']);
+        ], $view['year']->vars['choices']);
     }
 
     public function testMonthsOption()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
-            'months' => array(6, 7),
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'months' => [6, 7],
             'format' => \IntlDateFormatter::SHORT,
-        ));
+        ]);
 
         $view = $form->createView();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ChoiceView(6, '6', '06'),
             new ChoiceView(7, '7', '07'),
-        ), $view['month']->vars['choices']);
+        ], $view['month']->vars['choices']);
     }
 
     public function testMonthsOptionShortFormat()
@@ -508,17 +508,17 @@ public function testMonthsOptionShortFormat()
 
         \Locale::setDefault('de_AT');
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
-            'months' => array(1, 4),
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'months' => [1, 4],
             'format' => 'dd.MMM.yy',
-        ));
+        ]);
 
         $view = $form->createView();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ChoiceView(1, '1', 'Jän.'),
             new ChoiceView(4, '4', 'Apr.'),
-        ), $view['month']->vars['choices']);
+        ], $view['month']->vars['choices']);
     }
 
     public function testMonthsOptionLongFormat()
@@ -528,16 +528,16 @@ public function testMonthsOptionLongFormat()
 
         \Locale::setDefault('de_AT');
 
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
-            'months' => array(1, 4),
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
+            'months' => [1, 4],
             'format' => 'dd.MMMM.yy',
-        ))
+        ])
             ->createView();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ChoiceView(1, '1', 'Jänner'),
             new ChoiceView(4, '4', 'April'),
-        ), $view['month']->vars['choices']);
+        ], $view['month']->vars['choices']);
     }
 
     public function testMonthsOptionLongFormatWithDifferentTimezone()
@@ -547,78 +547,78 @@ public function testMonthsOptionLongFormatWithDifferentTimezone()
 
         \Locale::setDefault('de_AT');
 
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
-            'months' => array(1, 4),
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
+            'months' => [1, 4],
             'format' => 'dd.MMMM.yy',
-        ))
+        ])
             ->createView();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ChoiceView(1, '1', 'Jänner'),
             new ChoiceView(4, '4', 'April'),
-        ), $view['month']->vars['choices']);
+        ], $view['month']->vars['choices']);
     }
 
     public function testIsDayWithinRangeReturnsTrueIfWithin()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
-            'days' => array(6, 7),
-        ))
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
+            'days' => [6, 7],
+        ])
             ->createView();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ChoiceView(6, '6', '06'),
             new ChoiceView(7, '7', '07'),
-        ), $view['day']->vars['choices']);
+        ], $view['day']->vars['choices']);
     }
 
     public function testIsSynchronizedReturnsTrueIfChoiceAndCompletelyEmpty()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'widget' => 'choice',
-        ));
+        ]);
 
-        $form->submit(array(
+        $form->submit([
             'day' => '',
             'month' => '',
             'year' => '',
-        ));
+        ]);
 
         $this->assertTrue($form->isSynchronized());
     }
 
     public function testIsSynchronizedReturnsTrueIfChoiceAndCompletelyFilled()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, new \DateTime(), array(
+        $form = $this->factory->create(static::TESTED_TYPE, new \DateTime(), [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'widget' => 'choice',
-        ));
+        ]);
 
-        $form->submit(array(
+        $form->submit([
             'day' => '1',
             'month' => '6',
             'year' => '2010',
-        ));
+        ]);
 
         $this->assertTrue($form->isSynchronized());
     }
 
     public function testIsSynchronizedReturnsFalseIfChoiceAndDayEmpty()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'widget' => 'choice',
-        ));
+        ]);
 
-        $form->submit(array(
+        $form->submit([
             'day' => '',
             'month' => '6',
             'year' => '2010',
-        ));
+        ]);
 
         $this->assertFalse($form->isSynchronized());
     }
@@ -643,9 +643,9 @@ public function testPassDatePatternToViewDifferentFormat()
 
         \Locale::setDefault('de_AT');
 
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'format' => \IntlDateFormatter::LONG,
-        ))
+        ])
             ->createView();
 
         $this->assertSame('{{ day }}{{ month }}{{ year }}', $view->vars['date_pattern']);
@@ -653,9 +653,9 @@ public function testPassDatePatternToViewDifferentFormat()
 
     public function testPassDatePatternToViewDifferentPattern()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'format' => 'MMyyyydd',
-        ))
+        ])
             ->createView();
 
         $this->assertSame('{{ month }}{{ year }}{{ day }}', $view->vars['date_pattern']);
@@ -663,9 +663,9 @@ public function testPassDatePatternToViewDifferentPattern()
 
     public function testPassDatePatternToViewDifferentPatternWithSeparators()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'format' => 'MM*yyyy*dd',
-        ))
+        ])
             ->createView();
 
         $this->assertSame('{{ month }}*{{ year }}*{{ day }}', $view->vars['date_pattern']);
@@ -673,9 +673,9 @@ public function testPassDatePatternToViewDifferentPatternWithSeparators()
 
     public function testDontPassDatePatternIfText()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'single_text',
-        ))
+        ])
             ->createView();
 
         $this->assertArrayNotHasKey('date_pattern', $view->vars);
@@ -688,10 +688,10 @@ public function testDatePatternFormatWithQuotedStrings()
 
         \Locale::setDefault('es_ES');
 
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             // EEEE, d 'de' MMMM 'de' y
             'format' => \IntlDateFormatter::FULL,
-        ))
+        ])
             ->createView();
 
         $this->assertEquals('{{ day }}{{ month }}{{ year }}', $view->vars['date_pattern']);
@@ -699,9 +699,9 @@ public function testDatePatternFormatWithQuotedStrings()
 
     public function testPassWidgetToView()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'single_text',
-        ))
+        ])
             ->createView();
 
         $this->assertSame('single_text', $view->vars['widget']);
@@ -716,9 +716,9 @@ public function testInitializeWithDateTime()
 
     public function testSingleTextWidgetShouldUseTheRightInputType()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'single_text',
-        ))
+        ])
             ->createView();
 
         $this->assertEquals('date', $view->vars['type']);
@@ -726,9 +726,9 @@ public function testSingleTextWidgetShouldUseTheRightInputType()
 
     public function testPassDefaultPlaceholderToViewIfNotRequired()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => false,
-        ))
+        ])
             ->createView();
 
         $this->assertSame('', $view['year']->vars['placeholder']);
@@ -738,9 +738,9 @@ public function testPassDefaultPlaceholderToViewIfNotRequired()
 
     public function testPassNoPlaceholderToViewIfRequired()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => true,
-        ))
+        ])
             ->createView();
 
         $this->assertNull($view['year']->vars['placeholder']);
@@ -750,9 +750,9 @@ public function testPassNoPlaceholderToViewIfRequired()
 
     public function testPassPlaceholderAsString()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'placeholder' => 'Empty',
-        ))
+        ])
             ->createView();
 
         $this->assertSame('Empty', $view['year']->vars['placeholder']);
@@ -762,13 +762,13 @@ public function testPassPlaceholderAsString()
 
     public function testPassPlaceholderAsArray()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
-            'placeholder' => array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
+            'placeholder' => [
                 'year' => 'Empty year',
                 'month' => 'Empty month',
                 'day' => 'Empty day',
-            ),
-        ))
+            ],
+        ])
             ->createView();
 
         $this->assertSame('Empty year', $view['year']->vars['placeholder']);
@@ -778,13 +778,13 @@ public function testPassPlaceholderAsArray()
 
     public function testPassPlaceholderAsPartialArrayAddEmptyIfNotRequired()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => false,
-            'placeholder' => array(
+            'placeholder' => [
                 'year' => 'Empty year',
                 'day' => 'Empty day',
-            ),
-        ))
+            ],
+        ])
             ->createView();
 
         $this->assertSame('Empty year', $view['year']->vars['placeholder']);
@@ -794,13 +794,13 @@ public function testPassPlaceholderAsPartialArrayAddEmptyIfNotRequired()
 
     public function testPassPlaceholderAsPartialArrayAddNullIfRequired()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => true,
-            'placeholder' => array(
+            'placeholder' => [
                 'year' => 'Empty year',
                 'day' => 'Empty day',
-            ),
-        ))
+            ],
+        ])
             ->createView();
 
         $this->assertSame('Empty year', $view['year']->vars['placeholder']);
@@ -810,9 +810,9 @@ public function testPassPlaceholderAsPartialArrayAddNullIfRequired()
 
     public function testPassHtml5TypeIfSingleTextAndHtml5Format()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'single_text',
-        ))
+        ])
             ->createView();
 
         $this->assertSame('date', $view->vars['type']);
@@ -820,10 +820,10 @@ public function testPassHtml5TypeIfSingleTextAndHtml5Format()
 
     public function testDontPassHtml5TypeIfHtml5NotAllowed()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'single_text',
             'html5' => false,
-        ))
+        ])
             ->createView();
 
         $this->assertArrayNotHasKey('type', $view->vars);
@@ -831,10 +831,10 @@ public function testDontPassHtml5TypeIfHtml5NotAllowed()
 
     public function testDontPassHtml5TypeIfNotHtml5Format()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'single_text',
             'format' => \IntlDateFormatter::MEDIUM,
-        ))
+        ])
             ->createView();
 
         $this->assertArrayNotHasKey('type', $view->vars);
@@ -842,9 +842,9 @@ public function testDontPassHtml5TypeIfNotHtml5Format()
 
     public function testDontPassHtml5TypeIfNotSingleText()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'text',
-        ))
+        ])
             ->createView();
 
         $this->assertArrayNotHasKey('type', $view->vars);
@@ -852,10 +852,10 @@ public function testDontPassHtml5TypeIfNotSingleText()
 
     public function provideCompoundWidgets()
     {
-        return array(
-            array('text'),
-            array('choice'),
-        );
+        return [
+            ['text'],
+            ['choice'],
+        ];
     }
 
     /**
@@ -864,13 +864,13 @@ public function provideCompoundWidgets()
     public function testYearErrorsBubbleUp($widget)
     {
         $error = new FormError('Invalid!');
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => $widget,
-        ));
+        ]);
         $form['year']->addError($error);
 
-        $this->assertSame(array(), iterator_to_array($form['year']->getErrors()));
-        $this->assertSame(array($error), iterator_to_array($form->getErrors()));
+        $this->assertSame([], iterator_to_array($form['year']->getErrors()));
+        $this->assertSame([$error], iterator_to_array($form->getErrors()));
     }
 
     /**
@@ -879,13 +879,13 @@ public function testYearErrorsBubbleUp($widget)
     public function testMonthErrorsBubbleUp($widget)
     {
         $error = new FormError('Invalid!');
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => $widget,
-        ));
+        ]);
         $form['month']->addError($error);
 
-        $this->assertSame(array(), iterator_to_array($form['month']->getErrors()));
-        $this->assertSame(array($error), iterator_to_array($form->getErrors()));
+        $this->assertSame([], iterator_to_array($form['month']->getErrors()));
+        $this->assertSame([$error], iterator_to_array($form->getErrors()));
     }
 
     /**
@@ -894,13 +894,13 @@ public function testMonthErrorsBubbleUp($widget)
     public function testDayErrorsBubbleUp($widget)
     {
         $error = new FormError('Invalid!');
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => $widget,
-        ));
+        ]);
         $form['day']->addError($error);
 
-        $this->assertSame(array(), iterator_to_array($form['day']->getErrors()));
-        $this->assertSame(array($error), iterator_to_array($form->getErrors()));
+        $this->assertSame([], iterator_to_array($form['day']->getErrors()));
+        $this->assertSame([$error], iterator_to_array($form->getErrors()));
     }
 
     public function testYearsFor32BitsMachines()
@@ -909,12 +909,12 @@ public function testYearsFor32BitsMachines()
             $this->markTestSkipped('PHP 32 bit is required.');
         }
 
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
             'years' => range(1900, 2040),
-        ))
+        ])
             ->createView();
 
-        $listChoices = array();
+        $listChoices = [];
         foreach (range(1902, 2037) as $y) {
             $listChoices[] = new ChoiceView($y, $y, $y);
         }
@@ -934,9 +934,9 @@ public function testPassDefaultChoiceTranslationDomain()
 
     public function testPassChoiceTranslationDomainAsString()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'choice_translation_domain' => 'messages',
-        ));
+        ]);
 
         $view = $form->createView();
         $this->assertSame('messages', $view['year']->vars['choice_translation_domain']);
@@ -946,12 +946,12 @@ public function testPassChoiceTranslationDomainAsString()
 
     public function testPassChoiceTranslationDomainAsArray()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
-            'choice_translation_domain' => array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'choice_translation_domain' => [
                 'year' => 'foo',
                 'day' => 'test',
-            ),
-        ));
+            ],
+        ]);
 
         $view = $form->createView();
         $this->assertSame('foo', $view['year']->vars['choice_translation_domain']);
@@ -961,14 +961,14 @@ public function testPassChoiceTranslationDomainAsArray()
 
     public function testSubmitNull($expected = null, $norm = null, $view = null)
     {
-        parent::testSubmitNull($expected, $norm, array('year' => '', 'month' => '', 'day' => ''));
+        parent::testSubmitNull($expected, $norm, ['year' => '', 'month' => '', 'day' => '']);
     }
 
     public function testSubmitNullWithSingleText()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'single_text',
-        ));
+        ]);
         $form->submit(null);
 
         $this->assertNull($form->getData());
@@ -976,15 +976,15 @@ public function testSubmitNullWithSingleText()
         $this->assertSame('', $form->getViewData());
     }
 
-    public function testSubmitNullUsesDefaultEmptyData($emptyData = array(), $expectedData = null)
+    public function testSubmitNullUsesDefaultEmptyData($emptyData = [], $expectedData = null)
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'empty_data' => $emptyData,
-        ));
+        ]);
         $form->submit(null);
 
         // view transformer writes back empty strings in the view data
-        $this->assertSame(array('year' => '', 'month' => '', 'day' => ''), $form->getViewData());
+        $this->assertSame(['year' => '', 'month' => '', 'day' => ''], $form->getViewData());
         $this->assertSame($expectedData, $form->getNormData());
         $this->assertSame($expectedData, $form->getData());
     }
@@ -994,10 +994,10 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = array(), $expect
      */
     public function testSubmitNullUsesDateEmptyData($widget, $emptyData, $expectedData)
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => $widget,
             'empty_data' => $emptyData,
-        ));
+        ]);
         $form->submit(null);
 
         $this->assertSame($emptyData, $form->getViewData());
@@ -1009,10 +1009,10 @@ public function provideEmptyData()
     {
         $expectedData = \DateTime::createFromFormat('Y-m-d H:i:s', '2018-11-11 00:00:00');
 
-        return array(
-            'Simple field' => array('single_text', '2018-11-11', $expectedData),
-            'Compound text fields' => array('text', array('year' => '2018', 'month' => '11', 'day' => '11'), $expectedData),
-            'Compound choice fields' => array('choice', array('year' => '2018', 'month' => '11', 'day' => '11'), $expectedData),
-        );
+        return [
+            'Simple field' => ['single_text', '2018-11-11', $expectedData],
+            'Compound text fields' => ['text', ['year' => '2018', 'month' => '11', 'day' => '11'], $expectedData],
+            'Compound choice fields' => ['choice', ['year' => '2018', 'month' => '11', 'day' => '11'], $expectedData],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ExtendedChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ExtendedChoiceTypeTest.php
index 959ae488a1ee7..aa76b1335951e 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ExtendedChoiceTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ExtendedChoiceTypeTest.php
@@ -48,7 +48,7 @@ public function testChoicesAreOverridden($type)
             ->getFormFactory()
         ;
 
-        $choices = $factory->create($type, null, array('choice_loader' => null))->createView()->vars['choices'];
+        $choices = $factory->create($type, null, ['choice_loader' => null])->createView()->vars['choices'];
 
         $this->assertCount(2, $choices);
         $this->assertSame('A', $choices[0]->label);
@@ -78,10 +78,10 @@ public function testChoiceLoaderIsOverridden($type)
 
     public function provideTestedTypes()
     {
-        yield array(CountryTypeTest::TESTED_TYPE);
-        yield array(CurrencyTypeTest::TESTED_TYPE);
-        yield array(LanguageTypeTest::TESTED_TYPE);
-        yield array(LocaleTypeTest::TESTED_TYPE);
-        yield array(TimezoneTypeTest::TESTED_TYPE);
+        yield [CountryTypeTest::TESTED_TYPE];
+        yield [CurrencyTypeTest::TESTED_TYPE];
+        yield [LanguageTypeTest::TESTED_TYPE];
+        yield [LocaleTypeTest::TESTED_TYPE];
+        yield [TimezoneTypeTest::TESTED_TYPE];
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
index 5ba1dc5a5101d..d9ee8e79e4014 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
@@ -25,7 +25,7 @@ public function testSetData()
     {
         $form = $this->factory->createBuilder(static::TESTED_TYPE)->getForm();
         $data = $this->getMockBuilder('Symfony\Component\HttpFoundation\File\File')
-            ->setConstructorArgs(array(__DIR__.'/../../../Fixtures/foo', 'foo'))
+            ->setConstructorArgs([__DIR__.'/../../../Fixtures/foo', 'foo'])
             ->getMock();
 
         $form->setData($data);
@@ -52,14 +52,14 @@ public function testSubmit(RequestHandlerInterface $requestHandler)
      */
     public function testSetDataMultiple(RequestHandlerInterface $requestHandler)
     {
-        $form = $this->factory->createBuilder(static::TESTED_TYPE, null, array(
+        $form = $this->factory->createBuilder(static::TESTED_TYPE, null, [
             'multiple' => true,
-        ))->setRequestHandler($requestHandler)->getForm();
+        ])->setRequestHandler($requestHandler)->getForm();
 
-        $data = array(
+        $data = [
             $this->createUploadedFileMock($requestHandler, __DIR__.'/../../../Fixtures/foo', 'foo.jpg'),
             $this->createUploadedFileMock($requestHandler, __DIR__.'/../../../Fixtures/foo2', 'foo2.jpg'),
-        );
+        ];
 
         $form->setData($data);
         $this->assertSame($data, $form->getData());
@@ -70,14 +70,14 @@ public function testSetDataMultiple(RequestHandlerInterface $requestHandler)
      */
     public function testSubmitMultiple(RequestHandlerInterface $requestHandler)
     {
-        $form = $this->factory->createBuilder(static::TESTED_TYPE, null, array(
+        $form = $this->factory->createBuilder(static::TESTED_TYPE, null, [
             'multiple' => true,
-        ))->setRequestHandler($requestHandler)->getForm();
+        ])->setRequestHandler($requestHandler)->getForm();
 
-        $data = array(
+        $data = [
             $this->createUploadedFileMock($requestHandler, __DIR__.'/../../../Fixtures/foo', 'foo.jpg'),
             $this->createUploadedFileMock($requestHandler, __DIR__.'/../../../Fixtures/foo2', 'foo2.jpg'),
-        );
+        ];
 
         $form->submit($data);
         $this->assertSame($data, $form->getData());
@@ -93,9 +93,9 @@ public function testSubmitMultiple(RequestHandlerInterface $requestHandler)
     public function testDontPassValueToView(RequestHandlerInterface $requestHandler)
     {
         $form = $this->factory->createBuilder(static::TESTED_TYPE)->setRequestHandler($requestHandler)->getForm();
-        $form->submit(array(
+        $form->submit([
             'file' => $this->createUploadedFileMock($requestHandler, __DIR__.'/../../../Fixtures/foo', 'foo.jpg'),
-        ));
+        ]);
 
         $this->assertEquals('', $form->createView()->vars['value']);
     }
@@ -115,15 +115,15 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
 
     public function testSubmitNullWhenMultiple()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => true,
-        ));
+        ]);
         // submitted data when an input file is uploaded without choosing any file
-        $form->submit(array(null));
+        $form->submit([null]);
 
-        $this->assertSame(array(), $form->getData());
-        $this->assertSame(array(), $form->getNormData());
-        $this->assertSame(array(), $form->getViewData());
+        $this->assertSame([], $form->getData());
+        $this->assertSame([], $form->getNormData());
+        $this->assertSame([], $form->getViewData());
     }
 
     /**
@@ -145,16 +145,16 @@ public function testSubmittedFilePathsAreDropped(RequestHandlerInterface $reques
     public function testMultipleSubmittedFilePathsAreDropped(RequestHandlerInterface $requestHandler)
     {
         $form = $this->factory
-            ->createBuilder(static::TESTED_TYPE, null, array(
+            ->createBuilder(static::TESTED_TYPE, null, [
                 'multiple' => true,
-            ))
+            ])
             ->setRequestHandler($requestHandler)
             ->getForm();
-        $form->submit(array(
+        $form->submit([
             'file:///etc/passwd',
             $this->createUploadedFileMock(new HttpFoundationRequestHandler(), __DIR__.'/../../../Fixtures/foo', 'foo.jpg'),
             $this->createUploadedFileMock(new NativeRequestHandler(), __DIR__.'/../../../Fixtures/foo2', 'foo2.jpg'),
-        ));
+        ]);
 
         $this->assertCount(1, $form->getData());
     }
@@ -165,24 +165,24 @@ public function testMultipleSubmittedFilePathsAreDropped(RequestHandlerInterface
     public function testSubmitNonArrayValueWhenMultiple(RequestHandlerInterface $requestHandler)
     {
         $form = $this->factory
-            ->createBuilder(static::TESTED_TYPE, null, array(
+            ->createBuilder(static::TESTED_TYPE, null, [
                 'multiple' => true,
-            ))
+            ])
             ->setRequestHandler($requestHandler)
             ->getForm();
         $form->submit(null);
 
-        $this->assertSame(array(), $form->getData());
-        $this->assertSame(array(), $form->getNormData());
-        $this->assertSame(array(), $form->getViewData());
+        $this->assertSame([], $form->getData());
+        $this->assertSame([], $form->getNormData());
+        $this->assertSame([], $form->getViewData());
     }
 
     public function requestHandlerProvider()
     {
-        return array(
-            array(new HttpFoundationRequestHandler()),
-            array(new NativeRequestHandler()),
-        );
+        return [
+            [new HttpFoundationRequestHandler()],
+            [new NativeRequestHandler()],
+        ];
     }
 
     private function createUploadedFileMock(RequestHandlerInterface $requestHandler, $path, $originalName)
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
index 68f30ef16bc05..960d94ebb49f2 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
@@ -60,11 +60,11 @@ public function testCreateFormInstances()
 
     public function testPassRequiredAsOption()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array('required' => false));
+        $form = $this->factory->create(static::TESTED_TYPE, null, ['required' => false]);
 
         $this->assertFalse($form->isRequired());
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array('required' => true));
+        $form = $this->factory->create(static::TESTED_TYPE, null, ['required' => true]);
 
         $this->assertTrue($form->isRequired());
     }
@@ -72,10 +72,10 @@ public function testPassRequiredAsOption()
     public function testSubmittedDataIsTrimmedBeforeTransforming()
     {
         $form = $this->factory->createBuilder(static::TESTED_TYPE)
-            ->addViewTransformer(new FixedDataTransformer(array(
+            ->addViewTransformer(new FixedDataTransformer([
                 '' => '',
                 'reverse[a]' => 'a',
-            )))
+            ]))
             ->setCompound(false)
             ->getForm();
 
@@ -87,11 +87,11 @@ public function testSubmittedDataIsTrimmedBeforeTransforming()
 
     public function testSubmittedDataIsNotTrimmedBeforeTransformingIfNoTrimming()
     {
-        $form = $this->factory->createBuilder(static::TESTED_TYPE, null, array('trim' => false))
-            ->addViewTransformer(new FixedDataTransformer(array(
+        $form = $this->factory->createBuilder(static::TESTED_TYPE, null, ['trim' => false])
+            ->addViewTransformer(new FixedDataTransformer([
                 '' => '',
                 'reverse[ a ]' => ' a ',
-            )))
+            ]))
             ->setCompound(false)
             ->getForm();
 
@@ -103,7 +103,7 @@ public function testSubmittedDataIsNotTrimmedBeforeTransformingIfNoTrimming()
 
     public function testNonReadOnlyFormWithReadOnlyParentIsReadOnly()
     {
-        $view = $this->factory->createNamedBuilder('parent', static::TESTED_TYPE, null, array('attr' => array('readonly' => true)))
+        $view = $this->factory->createNamedBuilder('parent', static::TESTED_TYPE, null, ['attr' => ['readonly' => true]])
             ->add('child', static::TESTED_TYPE)
             ->getForm()
             ->createView();
@@ -114,7 +114,7 @@ public function testNonReadOnlyFormWithReadOnlyParentIsReadOnly()
     public function testReadOnlyFormWithNonReadOnlyParentIsReadOnly()
     {
         $view = $this->factory->createNamedBuilder('parent', static::TESTED_TYPE)
-            ->add('child', static::TESTED_TYPE, array('attr' => array('readonly' => true)))
+            ->add('child', static::TESTED_TYPE, ['attr' => ['readonly' => true]])
             ->getForm()
             ->createView();
 
@@ -133,7 +133,7 @@ public function testNonReadOnlyFormWithNonReadOnlyParentIsNotReadOnly()
 
     public function testPassMaxLengthToView()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array('attr' => array('maxlength' => 10)))
+        $view = $this->factory->create(static::TESTED_TYPE, null, ['attr' => ['maxlength' => 10]])
             ->createView();
 
         $this->assertSame(10, $view->vars['attr']['maxlength']);
@@ -141,23 +141,23 @@ public function testPassMaxLengthToView()
 
     public function testDataClassMayBeNull()
     {
-        $this->assertInstanceOf('Symfony\Component\Form\FormBuilderInterface', $this->factory->createBuilder(static::TESTED_TYPE, null, array(
+        $this->assertInstanceOf('Symfony\Component\Form\FormBuilderInterface', $this->factory->createBuilder(static::TESTED_TYPE, null, [
             'data_class' => null,
-        )));
+        ]));
     }
 
     public function testDataClassMayBeAbstractClass()
     {
-        $this->assertInstanceOf('Symfony\Component\Form\FormBuilderInterface', $this->factory->createBuilder(static::TESTED_TYPE, null, array(
+        $this->assertInstanceOf('Symfony\Component\Form\FormBuilderInterface', $this->factory->createBuilder(static::TESTED_TYPE, null, [
             'data_class' => 'Symfony\Component\Form\Tests\Fixtures\AbstractAuthor',
-        )));
+        ]));
     }
 
     public function testDataClassMayBeInterface()
     {
-        $this->assertInstanceOf('Symfony\Component\Form\FormBuilderInterface', $this->factory->createBuilder(static::TESTED_TYPE, null, array(
+        $this->assertInstanceOf('Symfony\Component\Form\FormBuilderInterface', $this->factory->createBuilder(static::TESTED_TYPE, null, [
             'data_class' => 'Symfony\Component\Form\Tests\Fixtures\AuthorInterface',
-        )));
+        ]));
     }
 
     /**
@@ -165,22 +165,22 @@ public function testDataClassMayBeInterface()
      */
     public function testDataClassMustBeValidClassOrInterface()
     {
-        $this->factory->createBuilder(static::TESTED_TYPE, null, array(
+        $this->factory->createBuilder(static::TESTED_TYPE, null, [
             'data_class' => 'foobar',
-        ));
+        ]);
     }
 
-    public function testSubmitNullUsesDefaultEmptyData($emptyData = array(), $expectedData = array())
+    public function testSubmitNullUsesDefaultEmptyData($emptyData = [], $expectedData = [])
     {
         parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
     }
 
     public function testSubmitWithEmptyDataCreatesObjectIfClassAvailable()
     {
-        $form = $this->factory->createBuilder(static::TESTED_TYPE, null, array(
+        $form = $this->factory->createBuilder(static::TESTED_TYPE, null, [
             'data_class' => 'Symfony\Component\Form\Tests\Fixtures\Author',
             'required' => false,
-        ))
+        ])
             ->add('firstName', TextTypeTest::TESTED_TYPE)
             ->add('lastName', TextTypeTest::TESTED_TYPE)
             ->getForm();
@@ -188,7 +188,7 @@ public function testSubmitWithEmptyDataCreatesObjectIfClassAvailable()
         $this->assertNull($form->getData());
 
         // partially empty, still an object is created
-        $form->submit(array('firstName' => 'Bernhard', 'lastName' => ''));
+        $form->submit(['firstName' => 'Bernhard', 'lastName' => '']);
 
         $author = new Author();
         $author->firstName = 'Bernhard';
@@ -200,17 +200,17 @@ public function testSubmitWithEmptyDataCreatesObjectIfClassAvailable()
     public function testSubmitWithDefaultDataDontCreateObject()
     {
         $defaultAuthor = new Author();
-        $form = $this->factory->createBuilder(static::TESTED_TYPE, null, array(
+        $form = $this->factory->createBuilder(static::TESTED_TYPE, null, [
             // data class is inferred from the passed object
             'data' => $defaultAuthor,
             'required' => false,
-        ))
+        ])
             ->add('firstName', TextTypeTest::TESTED_TYPE)
             ->add('lastName', TextTypeTest::TESTED_TYPE)
             ->getForm();
 
         // partially empty
-        $form->submit(array('firstName' => 'Bernhard', 'lastName' => ''));
+        $form->submit(['firstName' => 'Bernhard', 'lastName' => '']);
 
         $author = new Author();
         $author->firstName = 'Bernhard';
@@ -222,50 +222,50 @@ public function testSubmitWithDefaultDataDontCreateObject()
 
     public function testSubmitWithEmptyDataCreatesArrayIfDataClassIsNull()
     {
-        $form = $this->factory->createBuilder(static::TESTED_TYPE, null, array(
+        $form = $this->factory->createBuilder(static::TESTED_TYPE, null, [
             'data_class' => null,
             'required' => false,
-        ))
+        ])
             ->add('firstName', TextTypeTest::TESTED_TYPE)
             ->getForm();
 
         $this->assertNull($form->getData());
 
-        $form->submit(array('firstName' => 'Bernhard'));
+        $form->submit(['firstName' => 'Bernhard']);
 
-        $this->assertSame(array('firstName' => 'Bernhard'), $form->getData());
+        $this->assertSame(['firstName' => 'Bernhard'], $form->getData());
     }
 
     public function testSubmitEmptyWithEmptyDataDontCreateObjectIfNotRequired()
     {
-        $form = $this->factory->createBuilder(static::TESTED_TYPE, null, array(
+        $form = $this->factory->createBuilder(static::TESTED_TYPE, null, [
             'data_class' => 'Symfony\Component\Form\Tests\Fixtures\Author',
             'required' => false,
-        ))
+        ])
             ->add('firstName', TextTypeTest::TESTED_TYPE)
             ->add('lastName', TextTypeTest::TESTED_TYPE)
             ->getForm();
 
         $this->assertNull($form->getData());
 
-        $form->submit(array('firstName' => '', 'lastName' => ''));
+        $form->submit(['firstName' => '', 'lastName' => '']);
 
         $this->assertNull($form->getData());
     }
 
     public function testSubmitEmptyWithEmptyDataCreatesObjectIfRequired()
     {
-        $form = $this->factory->createBuilder(static::TESTED_TYPE, null, array(
+        $form = $this->factory->createBuilder(static::TESTED_TYPE, null, [
             'data_class' => 'Symfony\Component\Form\Tests\Fixtures\Author',
             'required' => true,
-        ))
+        ])
             ->add('firstName', TextTypeTest::TESTED_TYPE)
             ->add('lastName', TextTypeTest::TESTED_TYPE)
             ->getForm();
 
         $this->assertNull($form->getData());
 
-        $form->submit(array('firstName' => '', 'lastName' => ''));
+        $form->submit(['firstName' => '', 'lastName' => '']);
 
         $this->assertEquals(new Author(), $form->getData());
     }
@@ -281,20 +281,20 @@ public function testSubmitWithEmptyDataStoresArrayIfNoClassAvailable()
 
         $this->assertNull($form->getData());
 
-        $form->submit(array('firstName' => 'Bernhard'));
+        $form->submit(['firstName' => 'Bernhard']);
 
-        $this->assertSame(array('firstName' => 'Bernhard'), $form->getData());
+        $this->assertSame(['firstName' => 'Bernhard'], $form->getData());
     }
 
     public function testSubmitWithEmptyDataPassesEmptyStringToTransformerIfNotCompound()
     {
         $form = $this->factory->createBuilder(static::TESTED_TYPE)
-            ->addViewTransformer(new FixedDataTransformer(array(
+            ->addViewTransformer(new FixedDataTransformer([
                 // required for the initial, internal setData(null)
                 '' => 'null',
                 // required to test that submit(null) is converted to ''
                 'empty' => '',
-            )))
+            ]))
             ->setCompound(false)
             ->getForm();
 
@@ -313,17 +313,17 @@ public function testSubmitWithEmptyDataUsesEmptyDataOption()
     {
         $author = new Author();
 
-        $form = $this->factory->createBuilder(static::TESTED_TYPE, null, array(
+        $form = $this->factory->createBuilder(static::TESTED_TYPE, null, [
             'data_class' => 'Symfony\Component\Form\Tests\Fixtures\Author',
             'empty_data' => $author,
-        ))
+        ])
             ->add('firstName', TextTypeTest::TESTED_TYPE)
             ->getForm();
 
         $this->assertNull($form->getData());
         $this->assertNull($form->getViewData());
 
-        $form->submit(array('firstName' => 'Bernhard'));
+        $form->submit(['firstName' => 'Bernhard']);
 
         $this->assertSame($author, $form->getData());
         $this->assertEquals('Bernhard', $author->firstName);
@@ -334,7 +334,7 @@ public function testSubmitWithEmptyDataUsesEmptyDataOption()
      */
     public function testAttributesException()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array('attr' => ''));
+        $this->factory->create(static::TESTED_TYPE, null, ['attr' => '']);
     }
 
     public function testNameCanBeEmptyString()
@@ -349,18 +349,18 @@ public function testSubformDoesntCallSettersForReferences()
         $author = new FormTest_AuthorWithoutRefSetter(new Author());
 
         $builder = $this->factory->createBuilder(static::TESTED_TYPE, $author);
-        $builder->add('reference', static::TESTED_TYPE, array(
+        $builder->add('reference', static::TESTED_TYPE, [
             'data_class' => 'Symfony\Component\Form\Tests\Fixtures\Author',
-        ));
+        ]);
         $builder->get('reference')->add('firstName', TextTypeTest::TESTED_TYPE);
         $form = $builder->getForm();
 
-        $form->submit(array(
+        $form->submit([
             // reference has a getter, but no setter
-            'reference' => array(
+            'reference' => [
                 'firstName' => 'Foo',
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertEquals('Foo', $author->getReference()->firstName);
     }
@@ -372,20 +372,20 @@ public function testSubformCallsSettersIfTheObjectChanged()
         $newReference = new Author();
 
         $builder = $this->factory->createBuilder(static::TESTED_TYPE, $author);
-        $builder->add('referenceCopy', static::TESTED_TYPE, array(
+        $builder->add('referenceCopy', static::TESTED_TYPE, [
             'data_class' => 'Symfony\Component\Form\Tests\Fixtures\Author',
-        ));
+        ]);
         $builder->get('referenceCopy')->add('firstName', TextTypeTest::TESTED_TYPE);
         $form = $builder->getForm();
 
         $form['referenceCopy']->setData($newReference); // new author object
 
-        $form->submit(array(
+        $form->submit([
             // referenceCopy has a getter that returns a copy
-            'referenceCopy' => array(
+            'referenceCopy' => [
                 'firstName' => 'Foo',
-        ),
-        ));
+        ],
+        ]);
 
         $this->assertEquals('Foo', $author->getReferenceCopy()->firstName);
     }
@@ -395,19 +395,19 @@ public function testSubformCallsSettersIfByReferenceIsFalse()
         $author = new FormTest_AuthorWithoutRefSetter(new Author());
 
         $builder = $this->factory->createBuilder(static::TESTED_TYPE, $author);
-        $builder->add('referenceCopy', static::TESTED_TYPE, array(
+        $builder->add('referenceCopy', static::TESTED_TYPE, [
             'data_class' => 'Symfony\Component\Form\Tests\Fixtures\Author',
             'by_reference' => false,
-        ));
+        ]);
         $builder->get('referenceCopy')->add('firstName', TextTypeTest::TESTED_TYPE);
         $form = $builder->getForm();
 
-        $form->submit(array(
+        $form->submit([
             // referenceCopy has a getter that returns a copy
-            'referenceCopy' => array(
+            'referenceCopy' => [
                 'firstName' => 'Foo',
-            ),
-        ));
+            ],
+        ]);
 
         // firstName can only be updated if setReferenceCopy() was called
         $this->assertEquals('Foo', $author->getReferenceCopy()->firstName);
@@ -427,9 +427,9 @@ function ($value) { // reverseTransform
         ));
         $form = $builder->getForm();
 
-        $form->submit(array(
-            'referenceCopy' => array(), // doesn't matter actually
-        ));
+        $form->submit([
+            'referenceCopy' => [], // doesn't matter actually
+        ]);
 
         // firstName can only be updated if setReferenceCopy() was called
         $this->assertEquals('foobar', $author->getReferenceCopy());
@@ -439,7 +439,7 @@ public function testSubformAlwaysInsertsIntoArrays()
     {
         $ref1 = new Author();
         $ref2 = new Author();
-        $author = array('referenceCopy' => $ref1);
+        $author = ['referenceCopy' => $ref1];
 
         $builder = $this->factory->createBuilder(static::TESTED_TYPE);
         $builder->setData($author);
@@ -452,9 +452,9 @@ function ($value) use ($ref2) { // reverseTransform
         ));
         $form = $builder->getForm();
 
-        $form->submit(array(
-            'referenceCopy' => array(), // doesn't matter actually
-        ));
+        $form->submit([
+            'referenceCopy' => [], // doesn't matter actually
+        ]);
 
         // the new reference was inserted into the array
         $author = $form->getData();
@@ -491,28 +491,28 @@ public function testErrorBubblingIfCompound()
 
     public function testNoErrorBubblingIfNotCompound()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'compound' => false,
-        ));
+        ]);
 
         $this->assertFalse($form->getConfig()->getErrorBubbling());
     }
 
     public function testOverrideErrorBubbling()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'compound' => false,
             'error_bubbling' => true,
-        ));
+        ]);
 
         $this->assertTrue($form->getConfig()->getErrorBubbling());
     }
 
     public function testPropertyPath()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'property_path' => 'foo',
-        ));
+        ]);
 
         $this->assertEquals(new PropertyPath('foo'), $form->getPropertyPath());
         $this->assertTrue($form->getConfig()->getMapped());
@@ -520,9 +520,9 @@ public function testPropertyPath()
 
     public function testPropertyPathNullImpliesDefault()
     {
-        $form = $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $form = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'property_path' => null,
-        ));
+        ]);
 
         $this->assertEquals(new PropertyPath('name'), $form->getPropertyPath());
         $this->assertTrue($form->getConfig()->getMapped());
@@ -530,10 +530,10 @@ public function testPropertyPathNullImpliesDefault()
 
     public function testNotMapped()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'property_path' => 'foo',
             'mapped' => false,
-        ));
+        ]);
 
         $this->assertEquals(new PropertyPath('foo'), $form->getPropertyPath());
         $this->assertFalse($form->getConfig()->getMapped());
@@ -550,7 +550,7 @@ public function testViewValidNotSubmitted()
     public function testViewNotValidSubmitted()
     {
         $form = $this->factory->create(static::TESTED_TYPE);
-        $form->submit(array());
+        $form->submit([]);
         $form->addError(new FormError('An error'));
 
         $this->assertFalse($form->createView()->vars['valid']);
@@ -567,17 +567,17 @@ public function testViewSubmittedNotSubmitted()
     public function testViewSubmittedSubmitted()
     {
         $form = $this->factory->create(static::TESTED_TYPE);
-        $form->submit(array());
+        $form->submit([]);
 
         $this->assertTrue($form->createView()->vars['submitted']);
     }
 
     public function testDataOptionSupersedesSetDataCalls()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'data' => 'default',
             'compound' => false,
-        ));
+        ]);
 
         $form->setData('foobar');
 
@@ -586,9 +586,9 @@ public function testDataOptionSupersedesSetDataCalls()
 
     public function testPassedDataSupersedesSetDataCalls()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, 'default', array(
+        $form = $this->factory->create(static::TESTED_TYPE, 'default', [
             'compound' => false,
-        ));
+        ]);
 
         $form->setData('foobar');
 
@@ -597,10 +597,10 @@ public function testPassedDataSupersedesSetDataCalls()
 
     public function testDataOptionSupersedesSetDataCallsIfNull()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'data' => null,
             'compound' => false,
-        ));
+        ]);
 
         $form->setData('foobar');
 
@@ -610,12 +610,12 @@ public function testDataOptionSupersedesSetDataCallsIfNull()
     public function testNormDataIsPassedToView()
     {
         $view = $this->factory->createBuilder(static::TESTED_TYPE)
-            ->addModelTransformer(new FixedDataTransformer(array(
+            ->addModelTransformer(new FixedDataTransformer([
                 'foo' => 'bar',
-            )))
-            ->addViewTransformer(new FixedDataTransformer(array(
+            ]))
+            ->addViewTransformer(new FixedDataTransformer([
                 'bar' => 'baz',
-            )))
+            ]))
             ->setData('foo')
             ->getForm()
             ->createView();
@@ -627,9 +627,9 @@ public function testNormDataIsPassedToView()
     // https://github.com/symfony/symfony/issues/6862
     public function testPassZeroLabelToView()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array(
+        $view = $this->factory->create(static::TESTED_TYPE, null, [
                 'label' => '0',
-            ))
+            ])
             ->createView();
 
         $this->assertSame('0', $view->vars['label']);
@@ -637,6 +637,6 @@ public function testPassZeroLabelToView()
 
     public function testSubmitNull($expected = null, $norm = null, $view = null)
     {
-        parent::testSubmitNull(array(), array(), array());
+        parent::testSubmitNull([], [], []);
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php
index fd3c2faf6aea2..273402aefeb32 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php
@@ -41,9 +41,9 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
 
     public function testSubmitNullUsesDefaultEmptyData($emptyData = '10', $expectedData = 10)
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'empty_data' => $emptyData,
-        ));
+        ]);
         $form->submit(null);
 
         $this->assertSame($emptyData, $form->getViewData());
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php
index 8d469d2b41ba7..60614a97177f7 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php
@@ -60,6 +60,6 @@ public function testInvalidChoiceValuesAreDropped()
     {
         $type = new LanguageType();
 
-        $this->assertSame(array(), $type->loadChoicesForValues(array('foo')));
+        $this->assertSame([], $type->loadChoicesForValues(['foo']));
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php
index ac1a65ad1fb99..e5b3ec9d2ab1b 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php
@@ -50,6 +50,6 @@ public function testInvalidChoiceValuesAreDropped()
     {
         $type = new LocaleType();
 
-        $this->assertSame(array(), $type->loadChoicesForValues(array('foo')));
+        $this->assertSame([], $type->loadChoicesForValues(['foo']));
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php
index 3371a1ee2d9c6..f75ea90249059 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php
@@ -40,7 +40,7 @@ public function testMoneyPatternWorksForYen()
     {
         \Locale::setDefault('en_US');
 
-        $view = $this->factory->create(static::TESTED_TYPE, null, array('currency' => 'JPY'))
+        $view = $this->factory->create(static::TESTED_TYPE, null, ['currency' => 'JPY'])
             ->createView();
 
         $this->assertSame('¥ {{ widget }}', $view->vars['money_pattern']);
@@ -51,8 +51,8 @@ public function testPassDifferentPatternsForDifferentCurrencies()
     {
         \Locale::setDefault('de_DE');
 
-        $view1 = $this->factory->create(static::TESTED_TYPE, null, array('currency' => 'GBP'))->createView();
-        $view2 = $this->factory->create(static::TESTED_TYPE, null, array('currency' => 'EUR'))->createView();
+        $view1 = $this->factory->create(static::TESTED_TYPE, null, ['currency' => 'GBP'])->createView();
+        $view2 = $this->factory->create(static::TESTED_TYPE, null, ['currency' => 'EUR'])->createView();
 
         $this->assertSame('{{ widget }} £', $view1->vars['money_pattern']);
         $this->assertSame('{{ widget }} €', $view2->vars['money_pattern']);
@@ -65,7 +65,7 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
 
     public function testMoneyPatternWithoutCurrency()
     {
-        $view = $this->factory->create(static::TESTED_TYPE, null, array('currency' => false))
+        $view = $this->factory->create(static::TESTED_TYPE, null, ['currency' => false])
             ->createView();
 
         $this->assertSame('{{ widget }}', $view->vars['money_pattern']);
@@ -73,9 +73,9 @@ public function testMoneyPatternWithoutCurrency()
 
     public function testSubmitNullUsesDefaultEmptyData($emptyData = '10.00', $expectedData = 10.0)
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'empty_data' => $emptyData,
-        ));
+        ]);
         $form->submit(null);
 
         $this->assertSame($emptyData, $form->getViewData());
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php
index a15d6f664245b..c19c82b117697 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php
@@ -37,7 +37,7 @@ public function testDefaultFormatting()
 
     public function testDefaultFormattingWithGrouping()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array('grouping' => true));
+        $form = $this->factory->create(static::TESTED_TYPE, null, ['grouping' => true]);
         $form->setData('12345.67890');
 
         $this->assertSame('12.345,679', $form->createView()->vars['value']);
@@ -45,7 +45,7 @@ public function testDefaultFormattingWithGrouping()
 
     public function testDefaultFormattingWithScale()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array('scale' => 2));
+        $form = $this->factory->create(static::TESTED_TYPE, null, ['scale' => 2]);
         $form->setData('12345.67890');
 
         $this->assertSame('12345,68', $form->createView()->vars['value']);
@@ -53,7 +53,7 @@ public function testDefaultFormattingWithScale()
 
     public function testDefaultFormattingWithRounding()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array('scale' => 0, 'rounding_mode' => \NumberFormatter::ROUND_UP));
+        $form = $this->factory->create(static::TESTED_TYPE, null, ['scale' => 0, 'rounding_mode' => \NumberFormatter::ROUND_UP]);
         $form->setData('12345.54321');
 
         $this->assertSame('12346', $form->createView()->vars['value']);
@@ -66,9 +66,9 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
 
     public function testSubmitNullUsesDefaultEmptyData($emptyData = '10', $expectedData = 10.0)
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'empty_data' => $emptyData,
-        ));
+        ]);
         $form->submit(null);
 
         $this->assertSame($emptyData, $form->getViewData());
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php
index c48240c651f21..872311b91df0e 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php
@@ -33,7 +33,7 @@ public function testEmptyIfSubmitted()
 
     public function testNotEmptyIfSubmittedAndNotAlwaysEmpty()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array('always_empty' => false));
+        $form = $this->factory->create(static::TESTED_TYPE, null, ['always_empty' => false]);
         $form->submit('pAs5w0rd');
 
         $this->assertSame('pAs5w0rd', $form->createView()->vars['value']);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php
index 8021abdb84986..c380c0590b8cf 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php
@@ -26,9 +26,9 @@ protected function setUp()
     {
         parent::setUp();
 
-        $this->form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->form = $this->factory->create(static::TESTED_TYPE, null, [
             'type' => TextTypeTest::TESTED_TYPE,
-        ));
+        ]);
     }
 
     public function testSetData()
@@ -41,10 +41,10 @@ public function testSetData()
 
     public function testSetOptions()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'type' => TextTypeTest::TESTED_TYPE,
-            'options' => array('label' => 'Global'),
-        ));
+            'options' => ['label' => 'Global'],
+        ]);
 
         $this->assertSame('Global', $form['first']->getConfig()->getOption('label'));
         $this->assertSame('Global', $form['second']->getConfig()->getOption('label'));
@@ -54,12 +54,12 @@ public function testSetOptions()
 
     public function testSetOptionsPerChild()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             // the global required value cannot be overridden
             'type' => TextTypeTest::TESTED_TYPE,
-            'first_options' => array('label' => 'Test', 'required' => false),
-            'second_options' => array('label' => 'Test2'),
-        ));
+            'first_options' => ['label' => 'Test', 'required' => false],
+            'second_options' => ['label' => 'Test2'],
+        ]);
 
         $this->assertSame('Test', $form['first']->getConfig()->getOption('label'));
         $this->assertSame('Test2', $form['second']->getConfig()->getOption('label'));
@@ -69,10 +69,10 @@ public function testSetOptionsPerChild()
 
     public function testSetRequired()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => false,
             'type' => TextTypeTest::TESTED_TYPE,
-        ));
+        ]);
 
         $this->assertFalse($form['first']->isRequired());
         $this->assertFalse($form['second']->isRequired());
@@ -83,10 +83,10 @@ public function testSetRequired()
      */
     public function testSetInvalidOptions()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->factory->create(static::TESTED_TYPE, null, [
             'type' => TextTypeTest::TESTED_TYPE,
             'options' => 'bad value',
-        ));
+        ]);
     }
 
     /**
@@ -94,10 +94,10 @@ public function testSetInvalidOptions()
      */
     public function testSetInvalidFirstOptions()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->factory->create(static::TESTED_TYPE, null, [
             'type' => TextTypeTest::TESTED_TYPE,
             'first_options' => 'bad value',
-        ));
+        ]);
     }
 
     /**
@@ -105,17 +105,17 @@ public function testSetInvalidFirstOptions()
      */
     public function testSetInvalidSecondOptions()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->factory->create(static::TESTED_TYPE, null, [
             'type' => TextTypeTest::TESTED_TYPE,
             'second_options' => 'bad value',
-        ));
+        ]);
     }
 
     public function testSetErrorBubblingToTrue()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'error_bubbling' => true,
-        ));
+        ]);
 
         $this->assertTrue($form->getConfig()->getOption('error_bubbling'));
         $this->assertTrue($form['first']->getConfig()->getOption('error_bubbling'));
@@ -124,9 +124,9 @@ public function testSetErrorBubblingToTrue()
 
     public function testSetErrorBubblingToFalse()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'error_bubbling' => false,
-        ));
+        ]);
 
         $this->assertFalse($form->getConfig()->getOption('error_bubbling'));
         $this->assertFalse($form['first']->getConfig()->getOption('error_bubbling'));
@@ -135,11 +135,11 @@ public function testSetErrorBubblingToFalse()
 
     public function testSetErrorBubblingIndividually()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'error_bubbling' => true,
-            'options' => array('error_bubbling' => false),
-            'second_options' => array('error_bubbling' => true),
-        ));
+            'options' => ['error_bubbling' => false],
+            'second_options' => ['error_bubbling' => true],
+        ]);
 
         $this->assertTrue($form->getConfig()->getOption('error_bubbling'));
         $this->assertFalse($form['first']->getConfig()->getOption('error_bubbling'));
@@ -148,11 +148,11 @@ public function testSetErrorBubblingIndividually()
 
     public function testSetOptionsPerChildAndOverwrite()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'type' => TextTypeTest::TESTED_TYPE,
-            'options' => array('label' => 'Label'),
-            'second_options' => array('label' => 'Second label'),
-        ));
+            'options' => ['label' => 'Label'],
+            'second_options' => ['label' => 'Second label'],
+        ]);
 
         $this->assertSame('Label', $form['first']->getConfig()->getOption('label'));
         $this->assertSame('Second label', $form['second']->getConfig()->getOption('label'));
@@ -162,7 +162,7 @@ public function testSetOptionsPerChildAndOverwrite()
 
     public function testSubmitUnequal()
     {
-        $input = array('first' => 'foo', 'second' => 'bar');
+        $input = ['first' => 'foo', 'second' => 'bar'];
 
         $this->form->submit($input);
 
@@ -175,7 +175,7 @@ public function testSubmitUnequal()
 
     public function testSubmitEqual()
     {
-        $input = array('first' => 'foo', 'second' => 'foo');
+        $input = ['first' => 'foo', 'second' => 'foo'];
 
         $this->form->submit($input);
 
@@ -188,6 +188,6 @@ public function testSubmitEqual()
 
     public function testSubmitNull($expected = null, $norm = null, $view = null)
     {
-        parent::testSubmitNull($expected, $norm, array('first' => null, 'second' => null));
+        parent::testSubmitNull($expected, $norm, ['first' => null, 'second' => null]);
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TextTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TextTypeTest.php
index c4dba3734876a..42853f607f6b5 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TextTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TextTypeTest.php
@@ -22,9 +22,9 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
 
     public function testSubmitNullReturnsNullWithEmptyDataAsString()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, 'name', array(
+        $form = $this->factory->create(static::TESTED_TYPE, 'name', [
             'empty_data' => '',
-        ));
+        ]);
 
         $form->submit(null);
         $this->assertSame('', $form->getData());
@@ -34,11 +34,11 @@ public function testSubmitNullReturnsNullWithEmptyDataAsString()
 
     public function provideZeros()
     {
-        return array(
-            array(0, '0'),
-            array('0', '0'),
-            array('00000', '00000'),
-        );
+        return [
+            [0, '0'],
+            ['0', '0'],
+            ['00000', '00000'],
+        ];
     }
 
     /**
@@ -48,9 +48,9 @@ public function provideZeros()
      */
     public function testSetDataThroughParamsWithZero($data, $dataAsString)
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'data' => $data,
-        ));
+        ]);
         $view = $form->createView();
 
         $this->assertFalse($form->isEmpty());
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
index a9ba7f022e30e..b445c8c5bfecd 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
@@ -20,16 +20,16 @@ class TimeTypeTest extends BaseTypeTest
 
     public function testSubmitDateTime()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'datetime',
-        ));
+        ]);
 
-        $input = array(
+        $input = [
             'hour' => '3',
             'minute' => '4',
-        );
+        ];
 
         $form->submit($input);
 
@@ -41,16 +41,16 @@ public function testSubmitDateTime()
 
     public function testSubmitString()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'string',
-        ));
+        ]);
 
-        $input = array(
+        $input = [
             'hour' => '3',
             'minute' => '4',
-        );
+        ];
 
         $form->submit($input);
 
@@ -60,16 +60,16 @@ public function testSubmitString()
 
     public function testSubmitTimestamp()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'timestamp',
-        ));
+        ]);
 
-        $input = array(
+        $input = [
             'hour' => '3',
             'minute' => '4',
-        );
+        ];
 
         $form->submit($input);
 
@@ -81,16 +81,16 @@ public function testSubmitTimestamp()
 
     public function testSubmitArray()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'array',
-        ));
+        ]);
 
-        $input = array(
+        $input = [
             'hour' => '3',
             'minute' => '4',
-        );
+        ];
 
         $form->submit($input);
 
@@ -100,12 +100,12 @@ public function testSubmitArray()
 
     public function testSubmitDatetimeSingleText()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'datetime',
             'widget' => 'single_text',
-        ));
+        ]);
 
         $form->submit('03:04');
 
@@ -115,13 +115,13 @@ public function testSubmitDatetimeSingleText()
 
     public function testSubmitDatetimeSingleTextWithoutMinutes()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'datetime',
             'widget' => 'single_text',
             'with_minutes' => false,
-        ));
+        ]);
 
         $form->submit('03');
 
@@ -131,17 +131,17 @@ public function testSubmitDatetimeSingleTextWithoutMinutes()
 
     public function testSubmitArraySingleText()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'array',
             'widget' => 'single_text',
-        ));
+        ]);
 
-        $data = array(
+        $data = [
             'hour' => '3',
             'minute' => '4',
-        );
+        ];
 
         $form->submit('03:04');
 
@@ -151,17 +151,17 @@ public function testSubmitArraySingleText()
 
     public function testSubmitArraySingleTextWithoutMinutes()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'array',
             'widget' => 'single_text',
             'with_minutes' => false,
-        ));
+        ]);
 
-        $data = array(
+        $data = [
             'hour' => '3',
-        );
+        ];
 
         $form->submit('03');
 
@@ -171,19 +171,19 @@ public function testSubmitArraySingleTextWithoutMinutes()
 
     public function testSubmitArraySingleTextWithSeconds()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'array',
             'widget' => 'single_text',
             'with_seconds' => true,
-        ));
+        ]);
 
-        $data = array(
+        $data = [
             'hour' => '3',
             'minute' => '4',
             'second' => '5',
-        );
+        ];
 
         $form->submit('03:04:05');
 
@@ -193,12 +193,12 @@ public function testSubmitArraySingleTextWithSeconds()
 
     public function testSubmitStringSingleText()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'string',
             'widget' => 'single_text',
-        ));
+        ]);
 
         $form->submit('03:04');
 
@@ -208,13 +208,13 @@ public function testSubmitStringSingleText()
 
     public function testSubmitStringSingleTextWithoutMinutes()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'string',
             'widget' => 'single_text',
             'with_minutes' => false,
-        ));
+        ]);
 
         $form->submit('03');
 
@@ -224,13 +224,13 @@ public function testSubmitStringSingleTextWithoutMinutes()
 
     public function testSubmitWithSecondsAndBrowserOmissionSeconds()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'string',
             'widget' => 'single_text',
             'with_seconds' => true,
-        ));
+        ]);
 
         $form->submit('03:04');
 
@@ -240,40 +240,40 @@ public function testSubmitWithSecondsAndBrowserOmissionSeconds()
 
     public function testSetDataWithoutMinutes()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'datetime',
             'with_minutes' => false,
-        ));
+        ]);
 
         $form->setData(new \DateTime('03:04:05 UTC'));
 
-        $this->assertEquals(array('hour' => 3), $form->getViewData());
+        $this->assertEquals(['hour' => 3], $form->getViewData());
     }
 
     public function testSetDataWithSeconds()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'datetime',
             'with_seconds' => true,
-        ));
+        ]);
 
         $form->setData(new \DateTime('03:04:05 UTC'));
 
-        $this->assertEquals(array('hour' => 3, 'minute' => 4, 'second' => 5), $form->getViewData());
+        $this->assertEquals(['hour' => 3, 'minute' => 4, 'second' => 5], $form->getViewData());
     }
 
     public function testSetDataDifferentTimezones()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'America/New_York',
             'view_timezone' => 'Asia/Hong_Kong',
             'input' => 'string',
             'with_seconds' => true,
-        ));
+        ]);
 
         $dateTime = new \DateTime('2013-01-01 12:04:05');
         $dateTime->setTimezone(new \DateTimeZone('America/New_York'));
@@ -283,23 +283,23 @@ public function testSetDataDifferentTimezones()
         $outputTime = clone $dateTime;
         $outputTime->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
 
-        $displayedData = array(
+        $displayedData = [
             'hour' => (int) $outputTime->format('H'),
             'minute' => (int) $outputTime->format('i'),
             'second' => (int) $outputTime->format('s'),
-        );
+        ];
 
         $this->assertEquals($displayedData, $form->getViewData());
     }
 
     public function testSetDataDifferentTimezonesDateTime()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'America/New_York',
             'view_timezone' => 'Asia/Hong_Kong',
             'input' => 'datetime',
             'with_seconds' => true,
-        ));
+        ]);
 
         $dateTime = new \DateTime('12:04:05');
         $dateTime->setTimezone(new \DateTimeZone('America/New_York'));
@@ -309,11 +309,11 @@ public function testSetDataDifferentTimezonesDateTime()
         $outputTime = clone $dateTime;
         $outputTime->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
 
-        $displayedData = array(
+        $displayedData = [
             'hour' => (int) $outputTime->format('H'),
             'minute' => (int) $outputTime->format('i'),
             'second' => (int) $outputTime->format('s'),
-        );
+        ];
 
         $this->assertEquals($dateTime, $form->getData());
         $this->assertEquals($displayedData, $form->getViewData());
@@ -321,59 +321,59 @@ public function testSetDataDifferentTimezonesDateTime()
 
     public function testHoursOption()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
-            'hours' => array(6, 7),
-        ));
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'hours' => [6, 7],
+        ]);
 
         $view = $form->createView();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ChoiceView('6', '6', '06'),
             new ChoiceView('7', '7', '07'),
-        ), $view['hour']->vars['choices']);
+        ], $view['hour']->vars['choices']);
     }
 
     public function testIsMinuteWithinRangeReturnsTrueIfWithin()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
-            'minutes' => array(6, 7),
-        ));
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'minutes' => [6, 7],
+        ]);
 
         $view = $form->createView();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ChoiceView('6', '6', '06'),
             new ChoiceView('7', '7', '07'),
-        ), $view['minute']->vars['choices']);
+        ], $view['minute']->vars['choices']);
     }
 
     public function testIsSecondWithinRangeReturnsTrueIfWithin()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
-            'seconds' => array(6, 7),
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'seconds' => [6, 7],
             'with_seconds' => true,
-        ));
+        ]);
 
         $view = $form->createView();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ChoiceView('6', '6', '06'),
             new ChoiceView('7', '7', '07'),
-        ), $view['second']->vars['choices']);
+        ], $view['second']->vars['choices']);
     }
 
     public function testIsPartiallyFilledReturnsFalseIfCompletelyEmpty()
     {
         $this->markTestIncomplete('Needs to be reimplemented using validators');
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'choice',
-        ));
+        ]);
 
-        $form->submit(array(
+        $form->submit([
             'hour' => '',
             'minute' => '',
-        ));
+        ]);
 
         $this->assertFalse($form->isPartiallyFilled());
     }
@@ -382,16 +382,16 @@ public function testIsPartiallyFilledReturnsFalseIfCompletelyEmptyWithSeconds()
     {
         $this->markTestIncomplete('Needs to be reimplemented using validators');
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'choice',
             'with_seconds' => true,
-        ));
+        ]);
 
-        $form->submit(array(
+        $form->submit([
             'hour' => '',
             'minute' => '',
             'second' => '',
-        ));
+        ]);
 
         $this->assertFalse($form->isPartiallyFilled());
     }
@@ -400,14 +400,14 @@ public function testIsPartiallyFilledReturnsFalseIfCompletelyFilled()
     {
         $this->markTestIncomplete('Needs to be reimplemented using validators');
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'choice',
-        ));
+        ]);
 
-        $form->submit(array(
+        $form->submit([
             'hour' => '0',
             'minute' => '0',
-        ));
+        ]);
 
         $this->assertFalse($form->isPartiallyFilled());
     }
@@ -416,16 +416,16 @@ public function testIsPartiallyFilledReturnsFalseIfCompletelyFilledWithSeconds()
     {
         $this->markTestIncomplete('Needs to be reimplemented using validators');
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'choice',
             'with_seconds' => true,
-        ));
+        ]);
 
-        $form->submit(array(
+        $form->submit([
             'hour' => '0',
             'minute' => '0',
             'second' => '0',
-        ));
+        ]);
 
         $this->assertFalse($form->isPartiallyFilled());
     }
@@ -434,16 +434,16 @@ public function testIsPartiallyFilledReturnsTrueIfChoiceAndHourEmpty()
     {
         $this->markTestIncomplete('Needs to be reimplemented using validators');
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'choice',
             'with_seconds' => true,
-        ));
+        ]);
 
-        $form->submit(array(
+        $form->submit([
             'hour' => '',
             'minute' => '0',
             'second' => '0',
-        ));
+        ]);
 
         $this->assertTrue($form->isPartiallyFilled());
     }
@@ -452,16 +452,16 @@ public function testIsPartiallyFilledReturnsTrueIfChoiceAndMinuteEmpty()
     {
         $this->markTestIncomplete('Needs to be reimplemented using validators');
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'choice',
             'with_seconds' => true,
-        ));
+        ]);
 
-        $form->submit(array(
+        $form->submit([
             'hour' => '0',
             'minute' => '',
             'second' => '0',
-        ));
+        ]);
 
         $this->assertTrue($form->isPartiallyFilled());
     }
@@ -470,16 +470,16 @@ public function testIsPartiallyFilledReturnsTrueIfChoiceAndSecondsEmpty()
     {
         $this->markTestIncomplete('Needs to be reimplemented using validators');
 
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'choice',
             'with_seconds' => true,
-        ));
+        ]);
 
-        $form->submit(array(
+        $form->submit([
             'hour' => '0',
             'minute' => '0',
             'second' => '',
-        ));
+        ]);
 
         $this->assertTrue($form->isPartiallyFilled());
     }
@@ -493,9 +493,9 @@ public function testInitializeWithDateTime()
 
     public function testSingleTextWidgetShouldUseTheRightInputType()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'single_text',
-        ));
+        ]);
 
         $view = $form->createView();
         $this->assertEquals('time', $view->vars['type']);
@@ -503,10 +503,10 @@ public function testSingleTextWidgetShouldUseTheRightInputType()
 
     public function testSingleTextWidgetWithSecondsShouldHaveRightStepAttribute()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'single_text',
             'with_seconds' => true,
-        ));
+        ]);
 
         $view = $form->createView();
         $this->assertArrayHasKey('step', $view->vars['attr']);
@@ -515,13 +515,13 @@ public function testSingleTextWidgetWithSecondsShouldHaveRightStepAttribute()
 
     public function testSingleTextWidgetWithSecondsShouldNotOverrideStepAttribute()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'single_text',
             'with_seconds' => true,
-            'attr' => array(
+            'attr' => [
                 'step' => 30,
-            ),
-        ));
+            ],
+        ]);
 
         $view = $form->createView();
         $this->assertArrayHasKey('step', $view->vars['attr']);
@@ -530,10 +530,10 @@ public function testSingleTextWidgetWithSecondsShouldNotOverrideStepAttribute()
 
     public function testDontPassHtml5TypeIfHtml5NotAllowed()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => 'single_text',
             'html5' => false,
-        ));
+        ]);
 
         $view = $form->createView();
         $this->assertArrayNotHasKey('type', $view->vars);
@@ -541,10 +541,10 @@ public function testDontPassHtml5TypeIfHtml5NotAllowed()
 
     public function testPassDefaultPlaceholderToViewIfNotRequired()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => false,
             'with_seconds' => true,
-        ));
+        ]);
 
         $view = $form->createView();
         $this->assertSame('', $view['hour']->vars['placeholder']);
@@ -554,10 +554,10 @@ public function testPassDefaultPlaceholderToViewIfNotRequired()
 
     public function testPassNoPlaceholderToViewIfRequired()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => true,
             'with_seconds' => true,
-        ));
+        ]);
 
         $view = $form->createView();
         $this->assertNull($view['hour']->vars['placeholder']);
@@ -567,10 +567,10 @@ public function testPassNoPlaceholderToViewIfRequired()
 
     public function testPassPlaceholderAsString()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'placeholder' => 'Empty',
             'with_seconds' => true,
-        ));
+        ]);
 
         $view = $form->createView();
         $this->assertSame('Empty', $view['hour']->vars['placeholder']);
@@ -580,14 +580,14 @@ public function testPassPlaceholderAsString()
 
     public function testPassPlaceholderAsArray()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
-            'placeholder' => array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'placeholder' => [
                 'hour' => 'Empty hour',
                 'minute' => 'Empty minute',
                 'second' => 'Empty second',
-            ),
+            ],
             'with_seconds' => true,
-        ));
+        ]);
 
         $view = $form->createView();
         $this->assertSame('Empty hour', $view['hour']->vars['placeholder']);
@@ -597,14 +597,14 @@ public function testPassPlaceholderAsArray()
 
     public function testPassPlaceholderAsPartialArrayAddEmptyIfNotRequired()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => false,
-            'placeholder' => array(
+            'placeholder' => [
                 'hour' => 'Empty hour',
                 'second' => 'Empty second',
-            ),
+            ],
             'with_seconds' => true,
-        ));
+        ]);
 
         $view = $form->createView();
         $this->assertSame('Empty hour', $view['hour']->vars['placeholder']);
@@ -614,14 +614,14 @@ public function testPassPlaceholderAsPartialArrayAddEmptyIfNotRequired()
 
     public function testPassPlaceholderAsPartialArrayAddNullIfRequired()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => true,
-            'placeholder' => array(
+            'placeholder' => [
                 'hour' => 'Empty hour',
                 'second' => 'Empty second',
-            ),
+            ],
             'with_seconds' => true,
-        ));
+        ]);
 
         $view = $form->createView();
         $this->assertSame('Empty hour', $view['hour']->vars['placeholder']);
@@ -631,10 +631,10 @@ public function testPassPlaceholderAsPartialArrayAddNullIfRequired()
 
     public function provideCompoundWidgets()
     {
-        return array(
-            array('text'),
-            array('choice'),
-        );
+        return [
+            ['text'],
+            ['choice'],
+        ];
     }
 
     /**
@@ -643,13 +643,13 @@ public function provideCompoundWidgets()
     public function testHourErrorsBubbleUp($widget)
     {
         $error = new FormError('Invalid!');
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => $widget,
-        ));
+        ]);
         $form['hour']->addError($error);
 
-        $this->assertSame(array(), iterator_to_array($form['hour']->getErrors()));
-        $this->assertSame(array($error), iterator_to_array($form->getErrors()));
+        $this->assertSame([], iterator_to_array($form['hour']->getErrors()));
+        $this->assertSame([$error], iterator_to_array($form->getErrors()));
     }
 
     /**
@@ -658,13 +658,13 @@ public function testHourErrorsBubbleUp($widget)
     public function testMinuteErrorsBubbleUp($widget)
     {
         $error = new FormError('Invalid!');
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => $widget,
-        ));
+        ]);
         $form['minute']->addError($error);
 
-        $this->assertSame(array(), iterator_to_array($form['minute']->getErrors()));
-        $this->assertSame(array($error), iterator_to_array($form->getErrors()));
+        $this->assertSame([], iterator_to_array($form['minute']->getErrors()));
+        $this->assertSame([$error], iterator_to_array($form->getErrors()));
     }
 
     /**
@@ -673,14 +673,14 @@ public function testMinuteErrorsBubbleUp($widget)
     public function testSecondErrorsBubbleUp($widget)
     {
         $error = new FormError('Invalid!');
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => $widget,
             'with_seconds' => true,
-        ));
+        ]);
         $form['second']->addError($error);
 
-        $this->assertSame(array(), iterator_to_array($form['second']->getErrors()));
-        $this->assertSame(array($error), iterator_to_array($form->getErrors()));
+        $this->assertSame([], iterator_to_array($form['second']->getErrors()));
+        $this->assertSame([$error], iterator_to_array($form->getErrors()));
     }
 
     /**
@@ -688,10 +688,10 @@ public function testSecondErrorsBubbleUp($widget)
      */
     public function testInitializeWithSecondsAndWithoutMinutes()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->factory->create(static::TESTED_TYPE, null, [
             'with_minutes' => false,
             'with_seconds' => true,
-        ));
+        ]);
     }
 
     /**
@@ -699,9 +699,9 @@ public function testInitializeWithSecondsAndWithoutMinutes()
      */
     public function testThrowExceptionIfHoursIsInvalid()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->factory->create(static::TESTED_TYPE, null, [
             'hours' => 'bad value',
-        ));
+        ]);
     }
 
     /**
@@ -709,9 +709,9 @@ public function testThrowExceptionIfHoursIsInvalid()
      */
     public function testThrowExceptionIfMinutesIsInvalid()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->factory->create(static::TESTED_TYPE, null, [
             'minutes' => 'bad value',
-        ));
+        ]);
     }
 
     /**
@@ -719,9 +719,9 @@ public function testThrowExceptionIfMinutesIsInvalid()
      */
     public function testThrowExceptionIfSecondsIsInvalid()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->factory->create(static::TESTED_TYPE, null, [
             'seconds' => 'bad value',
-        ));
+        ]);
     }
 
     public function testPassDefaultChoiceTranslationDomain()
@@ -735,10 +735,10 @@ public function testPassDefaultChoiceTranslationDomain()
 
     public function testPassChoiceTranslationDomainAsString()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'choice_translation_domain' => 'messages',
             'with_seconds' => true,
-        ));
+        ]);
 
         $view = $form->createView();
         $this->assertSame('messages', $view['hour']->vars['choice_translation_domain']);
@@ -748,13 +748,13 @@ public function testPassChoiceTranslationDomainAsString()
 
     public function testPassChoiceTranslationDomainAsArray()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
-            'choice_translation_domain' => array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'choice_translation_domain' => [
                 'hour' => 'foo',
                 'second' => 'test',
-            ),
+            ],
             'with_seconds' => true,
-        ));
+        ]);
 
         $view = $form->createView();
         $this->assertSame('foo', $view['hour']->vars['choice_translation_domain']);
@@ -764,20 +764,20 @@ public function testPassChoiceTranslationDomainAsArray()
 
     public function testSubmitNull($expected = null, $norm = null, $view = null)
     {
-        $view = array('hour' => '', 'minute' => '');
+        $view = ['hour' => '', 'minute' => ''];
 
         parent::testSubmitNull($expected, $norm, $view);
     }
 
-    public function testSubmitNullUsesDefaultEmptyData($emptyData = array(), $expectedData = null)
+    public function testSubmitNullUsesDefaultEmptyData($emptyData = [], $expectedData = null)
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'empty_data' => $emptyData,
-        ));
+        ]);
         $form->submit(null);
 
         // view transformer writes back empty strings in the view data
-        $this->assertSame(array('hour' => '', 'minute' => ''), $form->getViewData());
+        $this->assertSame(['hour' => '', 'minute' => ''], $form->getViewData());
         $this->assertSame($expectedData, $form->getNormData());
         $this->assertSame($expectedData, $form->getData());
     }
@@ -787,10 +787,10 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = array(), $expect
      */
     public function testSubmitNullUsesDateEmptyData($widget, $emptyData, $expectedData)
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'widget' => $widget,
             'empty_data' => $emptyData,
-        ));
+        ]);
         $form->submit(null);
 
         $this->assertSame($emptyData, $form->getViewData());
@@ -802,10 +802,10 @@ public function provideEmptyData()
     {
         $expectedData = \DateTime::createFromFormat('Y-m-d H:i', '1970-01-01 21:23');
 
-        return array(
-            'Simple field' => array('single_text', '21:23', $expectedData),
-            'Compound text field' => array('text', array('hour' => '21', 'minute' => '23'), $expectedData),
-            'Compound choice field' => array('choice', array('hour' => '21', 'minute' => '23'), $expectedData),
-        );
+        return [
+            'Simple field' => ['single_text', '21:23', $expectedData],
+            'Compound text field' => ['text', ['hour' => '21', 'minute' => '23'], $expectedData],
+            'Compound choice field' => ['choice', ['hour' => '21', 'minute' => '23'], $expectedData],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
index fa02456f72a45..009595ab43cd9 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
@@ -36,9 +36,9 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
 
     public function testSubmitNullUsesDefaultEmptyData($emptyData = 'Africa/Kinshasa', $expectedData = 'Africa/Kinshasa')
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'empty_data' => $emptyData,
-        ));
+        ]);
         $form->submit(null);
 
         $this->assertSame($emptyData, $form->getViewData());
@@ -48,7 +48,7 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = 'Africa/Kinshasa
 
     public function testDateTimeZoneInput()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, new \DateTimeZone('America/New_York'), array('input' => 'datetimezone'));
+        $form = $this->factory->create(static::TESTED_TYPE, new \DateTimeZone('America/New_York'), ['input' => 'datetimezone']);
 
         $this->assertSame('America/New_York', $form->createView()->vars['value']);
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php
index c80a8b7cfb2e5..a5608557dd1dc 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php
@@ -27,9 +27,9 @@ public function testSubmitAddsDefaultProtocolIfNoneIsIncluded()
 
     public function testSubmitAddsNoDefaultProtocolIfAlreadyIncluded()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'default_protocol' => 'http',
-        ));
+        ]);
 
         $form->submit('ftp://www.domain.com');
 
@@ -39,9 +39,9 @@ public function testSubmitAddsNoDefaultProtocolIfAlreadyIncluded()
 
     public function testSubmitAddsNoDefaultProtocolIfEmpty()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'default_protocol' => 'http',
-        ));
+        ]);
 
         $form->submit('');
 
@@ -51,9 +51,9 @@ public function testSubmitAddsNoDefaultProtocolIfEmpty()
 
     public function testSubmitAddsNoDefaultProtocolIfNull()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'default_protocol' => 'http',
-        ));
+        ]);
 
         $form->submit(null);
 
@@ -63,9 +63,9 @@ public function testSubmitAddsNoDefaultProtocolIfNull()
 
     public function testSubmitAddsNoDefaultProtocolIfSetToNull()
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'default_protocol' => null,
-        ));
+        ]);
 
         $form->submit('www.domain.com');
 
@@ -78,16 +78,16 @@ public function testSubmitAddsNoDefaultProtocolIfSetToNull()
      */
     public function testThrowExceptionIfDefaultProtocolIsInvalid()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
-            'default_protocol' => array(),
-        ));
+        $this->factory->create(static::TESTED_TYPE, null, [
+            'default_protocol' => [],
+        ]);
     }
 
     public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expectedData = 'http://empty')
     {
-        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
             'empty_data' => $emptyData,
-        ));
+        ]);
         $form->submit(null);
 
         // listener normalizes data on submit
diff --git a/src/Symfony/Component/Form/Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php
index e9d9947774bc1..33783d6a043a5 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php
@@ -43,7 +43,7 @@ protected function tearDown()
 
     protected function getBuilder($name = 'name')
     {
-        return new FormBuilder($name, null, $this->dispatcher, $this->factory, array('compound' => true));
+        return new FormBuilder($name, null, $this->dispatcher, $this->factory, ['compound' => true]);
     }
 
     protected function getForm($name = 'name')
@@ -88,7 +88,7 @@ public function testMaxPostSizeExceeded()
             ->willReturn(true)
         ;
 
-        $event = new FormEvent($this->form, array('csrf' => 'token'));
+        $event = new FormEvent($this->form, ['csrf' => 'token']);
         $validation = new CsrfValidationListener('csrf', $this->tokenManager, 'unknown', 'Error message', null, null, $serverParams);
 
         $validation->preSubmit($event);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
index 599a14a3e6655..083f1c956792d 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
@@ -58,18 +58,18 @@ protected function tearDown()
 
     protected function getExtensions()
     {
-        return array_merge(parent::getExtensions(), array(
+        return array_merge(parent::getExtensions(), [
             new CsrfExtension($this->tokenManager, $this->translator),
-        ));
+        ]);
     }
 
     public function testCsrfProtectionByDefaultIfRootAndCompound()
     {
         $view = $this->factory
-            ->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+            ->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                 'csrf_field_name' => 'csrf',
                 'compound' => true,
-            ))
+            ])
             ->createView();
 
         $this->assertArrayHasKey('csrf', $view);
@@ -80,10 +80,10 @@ public function testNoCsrfProtectionByDefaultIfCompoundButNotRoot()
         $view = $this->factory
             ->createNamedBuilder('root', 'Symfony\Component\Form\Extension\Core\Type\FormType')
             ->add($this->factory
-                ->createNamedBuilder('form', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+                ->createNamedBuilder('form', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                     'csrf_field_name' => 'csrf',
                     'compound' => true,
-                ))
+                ])
             )
             ->getForm()
             ->get('form')
@@ -95,10 +95,10 @@ public function testNoCsrfProtectionByDefaultIfCompoundButNotRoot()
     public function testNoCsrfProtectionByDefaultIfRootButNotCompound()
     {
         $view = $this->factory
-            ->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+            ->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                 'csrf_field_name' => 'csrf',
                 'compound' => false,
-            ))
+            ])
             ->createView();
 
         $this->assertArrayNotHasKey('csrf', $view);
@@ -107,11 +107,11 @@ public function testNoCsrfProtectionByDefaultIfRootButNotCompound()
     public function testCsrfProtectionCanBeDisabled()
     {
         $view = $this->factory
-            ->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+            ->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                 'csrf_field_name' => 'csrf',
                 'csrf_protection' => false,
                 'compound' => true,
-            ))
+            ])
             ->createView();
 
         $this->assertArrayNotHasKey('csrf', $view);
@@ -125,12 +125,12 @@ public function testGenerateCsrfToken()
             ->will($this->returnValue(new CsrfToken('TOKEN_ID', 'token')));
 
         $view = $this->factory
-            ->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+            ->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                 'csrf_field_name' => 'csrf',
                 'csrf_token_manager' => $this->tokenManager,
                 'csrf_token_id' => 'TOKEN_ID',
                 'compound' => true,
-            ))
+            ])
             ->createView();
 
         $this->assertEquals('token', $view['csrf']->vars['value']);
@@ -144,11 +144,11 @@ public function testGenerateCsrfTokenUsesFormNameAsIntentionByDefault()
             ->will($this->returnValue('token'));
 
         $view = $this->factory
-            ->createNamed('FORM_NAME', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+            ->createNamed('FORM_NAME', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                 'csrf_field_name' => 'csrf',
                 'csrf_token_manager' => $this->tokenManager,
                 'compound' => true,
-            ))
+            ])
             ->createView();
 
         $this->assertEquals('token', $view['csrf']->vars['value']);
@@ -162,11 +162,11 @@ public function testGenerateCsrfTokenUsesTypeClassAsIntentionIfEmptyFormName()
             ->will($this->returnValue('token'));
 
         $view = $this->factory
-            ->createNamed('', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+            ->createNamed('', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                 'csrf_field_name' => 'csrf',
                 'csrf_token_manager' => $this->tokenManager,
                 'compound' => true,
-            ))
+            ])
             ->createView();
 
         $this->assertEquals('token', $view['csrf']->vars['value']);
@@ -174,10 +174,10 @@ public function testGenerateCsrfTokenUsesTypeClassAsIntentionIfEmptyFormName()
 
     public function provideBoolean()
     {
-        return array(
-            array(true),
-            array(false),
-        );
+        return [
+            [true],
+            [false],
+        ];
     }
 
     /**
@@ -191,22 +191,22 @@ public function testValidateTokenOnSubmitIfRootAndCompound($valid)
             ->will($this->returnValue($valid));
 
         $form = $this->factory
-            ->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+            ->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                 'csrf_field_name' => 'csrf',
                 'csrf_token_manager' => $this->tokenManager,
                 'csrf_token_id' => 'TOKEN_ID',
                 'compound' => true,
-            ))
+            ])
             ->add('child', 'Symfony\Component\Form\Extension\Core\Type\TextType')
             ->getForm();
 
-        $form->submit(array(
+        $form->submit([
             'child' => 'foobar',
             'csrf' => 'token',
-        ));
+        ]);
 
         // Remove token from data
-        $this->assertSame(array('child' => 'foobar'), $form->getData());
+        $this->assertSame(['child' => 'foobar'], $form->getData());
 
         // Validate accordingly
         $this->assertSame($valid, $form->isValid());
@@ -223,21 +223,21 @@ public function testValidateTokenOnSubmitIfRootAndCompoundUsesFormNameAsIntentio
             ->will($this->returnValue($valid));
 
         $form = $this->factory
-            ->createNamedBuilder('FORM_NAME', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+            ->createNamedBuilder('FORM_NAME', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                 'csrf_field_name' => 'csrf',
                 'csrf_token_manager' => $this->tokenManager,
                 'compound' => true,
-            ))
+            ])
             ->add('child', 'Symfony\Component\Form\Extension\Core\Type\TextType')
             ->getForm();
 
-        $form->submit(array(
+        $form->submit([
             'child' => 'foobar',
             'csrf' => 'token',
-        ));
+        ]);
 
         // Remove token from data
-        $this->assertSame(array('child' => 'foobar'), $form->getData());
+        $this->assertSame(['child' => 'foobar'], $form->getData());
 
         // Validate accordingly
         $this->assertSame($valid, $form->isValid());
@@ -254,21 +254,21 @@ public function testValidateTokenOnSubmitIfRootAndCompoundUsesTypeClassAsIntenti
             ->will($this->returnValue($valid));
 
         $form = $this->factory
-            ->createNamedBuilder('', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+            ->createNamedBuilder('', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                 'csrf_field_name' => 'csrf',
                 'csrf_token_manager' => $this->tokenManager,
                 'compound' => true,
-            ))
+            ])
             ->add('child', 'Symfony\Component\Form\Extension\Core\Type\TextType')
             ->getForm();
 
-        $form->submit(array(
+        $form->submit([
             'child' => 'foobar',
             'csrf' => 'token',
-        ));
+        ]);
 
         // Remove token from data
-        $this->assertSame(array('child' => 'foobar'), $form->getData());
+        $this->assertSame(['child' => 'foobar'], $form->getData());
 
         // Validate accordingly
         $this->assertSame($valid, $form->isValid());
@@ -280,22 +280,22 @@ public function testFailIfRootAndCompoundAndTokenMissing()
             ->method('isTokenValid');
 
         $form = $this->factory
-            ->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+            ->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                 'csrf_field_name' => 'csrf',
                 'csrf_token_manager' => $this->tokenManager,
                 'csrf_token_id' => 'TOKEN_ID',
                 'compound' => true,
-            ))
+            ])
             ->add('child', 'Symfony\Component\Form\Extension\Core\Type\TextType')
             ->getForm();
 
-        $form->submit(array(
+        $form->submit([
             'child' => 'foobar',
             // token is missing
-        ));
+        ]);
 
         // Remove token from data
-        $this->assertSame(array('child' => 'foobar'), $form->getData());
+        $this->assertSame(['child' => 'foobar'], $form->getData());
 
         // Validate accordingly
         $this->assertFalse($form->isValid());
@@ -309,20 +309,20 @@ public function testDontValidateTokenIfCompoundButNoRoot()
         $form = $this->factory
             ->createNamedBuilder('root', 'Symfony\Component\Form\Extension\Core\Type\FormType')
             ->add($this->factory
-                ->createNamedBuilder('form', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+                ->createNamedBuilder('form', 'Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                     'csrf_field_name' => 'csrf',
                     'csrf_token_manager' => $this->tokenManager,
                     'csrf_token_id' => 'TOKEN_ID',
                     'compound' => true,
-                ))
+                ])
             )
             ->getForm()
             ->get('form');
 
-        $form->submit(array(
+        $form->submit([
             'child' => 'foobar',
             'csrf' => 'token',
-        ));
+        ]);
     }
 
     public function testDontValidateTokenIfRootButNotCompound()
@@ -331,29 +331,29 @@ public function testDontValidateTokenIfRootButNotCompound()
             ->method('isTokenValid');
 
         $form = $this->factory
-            ->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+            ->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                 'csrf_field_name' => 'csrf',
                 'csrf_token_manager' => $this->tokenManager,
                 'csrf_token_id' => 'TOKEN_ID',
                 'compound' => false,
-            ));
+            ]);
 
-        $form->submit(array(
+        $form->submit([
             'csrf' => 'token',
-        ));
+        ]);
     }
 
     public function testNoCsrfProtectionOnPrototype()
     {
         $prototypeView = $this->factory
-            ->create('Symfony\Component\Form\Extension\Core\Type\CollectionType', null, array(
+            ->create('Symfony\Component\Form\Extension\Core\Type\CollectionType', null, [
                 'entry_type' => __CLASS__.'_ChildType',
-                'entry_options' => array(
+                'entry_options' => [
                     'csrf_field_name' => 'csrf',
-                ),
+                ],
                 'prototype' => true,
                 'allow_add' => true,
-            ))
+            ])
             ->createView()
             ->vars['prototype'];
 
@@ -374,18 +374,18 @@ public function testsTranslateCustomErrorMessage()
              ->will($this->returnValue('[trans]Foobar[/trans]'));
 
         $form = $this->factory
-            ->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', null, array(
+            ->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
                 'csrf_field_name' => 'csrf',
                 'csrf_token_manager' => $this->tokenManager,
                 'csrf_message' => 'Foobar',
                 'csrf_token_id' => 'TOKEN_ID',
                 'compound' => true,
-            ))
+            ])
             ->getForm();
 
-        $form->submit(array(
+        $form->submit([
             'csrf' => 'token',
-        ));
+        ]);
 
         $errors = $form->getErrors();
         $expected = new FormError('[trans]Foobar[/trans]');
diff --git a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php
index 3bfef602531f8..2ca0f95f3c6e3 100644
--- a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php
@@ -84,62 +84,62 @@ public function testBuildPreliminaryFormTree()
         $this->dataExtractor->expects($this->at(0))
             ->method('extractConfiguration')
             ->with($this->form)
-            ->will($this->returnValue(array('config' => 'foo')));
+            ->will($this->returnValue(['config' => 'foo']));
         $this->dataExtractor->expects($this->at(1))
             ->method('extractConfiguration')
             ->with($this->childForm)
-            ->will($this->returnValue(array('config' => 'bar')));
+            ->will($this->returnValue(['config' => 'bar']));
 
         $this->dataExtractor->expects($this->at(2))
             ->method('extractDefaultData')
             ->with($this->form)
-            ->will($this->returnValue(array('default_data' => 'foo')));
+            ->will($this->returnValue(['default_data' => 'foo']));
         $this->dataExtractor->expects($this->at(3))
             ->method('extractDefaultData')
             ->with($this->childForm)
-            ->will($this->returnValue(array('default_data' => 'bar')));
+            ->will($this->returnValue(['default_data' => 'bar']));
 
         $this->dataExtractor->expects($this->at(4))
             ->method('extractSubmittedData')
             ->with($this->form)
-            ->will($this->returnValue(array('submitted_data' => 'foo')));
+            ->will($this->returnValue(['submitted_data' => 'foo']));
         $this->dataExtractor->expects($this->at(5))
             ->method('extractSubmittedData')
             ->with($this->childForm)
-            ->will($this->returnValue(array('submitted_data' => 'bar')));
+            ->will($this->returnValue(['submitted_data' => 'bar']));
 
         $this->dataCollector->collectConfiguration($this->form);
         $this->dataCollector->collectDefaultData($this->form);
         $this->dataCollector->collectSubmittedData($this->form);
         $this->dataCollector->buildPreliminaryFormTree($this->form);
 
-        $childFormData = array(
+        $childFormData = [
              'config' => 'bar',
              'default_data' => 'bar',
              'submitted_data' => 'bar',
-             'children' => array(),
-         );
+             'children' => [],
+         ];
 
-        $formData = array(
+        $formData = [
              'config' => 'foo',
              'default_data' => 'foo',
              'submitted_data' => 'foo',
              'has_children_error' => false,
-             'children' => array(
+             'children' => [
                  'child' => $childFormData,
-             ),
-         );
+             ],
+         ];
 
-        $this->assertSame(array(
-            'forms' => array(
+        $this->assertSame([
+            'forms' => [
                 'name' => $formData,
-            ),
-            'forms_by_hash' => array(
+            ],
+            'forms_by_hash' => [
                 spl_object_hash($this->form) => $formData,
                 spl_object_hash($this->childForm) => $childFormData,
-            ),
+            ],
             'nb_errors' => 0,
-         ), $this->dataCollector->getData());
+         ], $this->dataCollector->getData());
     }
 
     public function testBuildMultiplePreliminaryFormTrees()
@@ -150,49 +150,49 @@ public function testBuildMultiplePreliminaryFormTrees()
         $this->dataExtractor->expects($this->at(0))
             ->method('extractConfiguration')
             ->with($form1)
-            ->will($this->returnValue(array('config' => 'foo')));
+            ->will($this->returnValue(['config' => 'foo']));
         $this->dataExtractor->expects($this->at(1))
             ->method('extractConfiguration')
             ->with($form2)
-            ->will($this->returnValue(array('config' => 'bar')));
+            ->will($this->returnValue(['config' => 'bar']));
 
         $this->dataCollector->collectConfiguration($form1);
         $this->dataCollector->collectConfiguration($form2);
         $this->dataCollector->buildPreliminaryFormTree($form1);
 
-        $form1Data = array(
+        $form1Data = [
             'config' => 'foo',
-            'children' => array(),
-        );
+            'children' => [],
+        ];
 
-        $this->assertSame(array(
-            'forms' => array(
+        $this->assertSame([
+            'forms' => [
                 'form1' => $form1Data,
-            ),
-            'forms_by_hash' => array(
+            ],
+            'forms_by_hash' => [
                 spl_object_hash($form1) => $form1Data,
-            ),
+            ],
             'nb_errors' => 0,
-        ), $this->dataCollector->getData());
+        ], $this->dataCollector->getData());
 
         $this->dataCollector->buildPreliminaryFormTree($form2);
 
-        $form2Data = array(
+        $form2Data = [
             'config' => 'bar',
-            'children' => array(),
-        );
+            'children' => [],
+        ];
 
-        $this->assertSame(array(
-            'forms' => array(
+        $this->assertSame([
+            'forms' => [
                 'form1' => $form1Data,
                 'form2' => $form2Data,
-            ),
-            'forms_by_hash' => array(
+            ],
+            'forms_by_hash' => [
                 spl_object_hash($form1) => $form1Data,
                 spl_object_hash($form2) => $form2Data,
-            ),
+            ],
             'nb_errors' => 0,
-        ), $this->dataCollector->getData());
+        ], $this->dataCollector->getData());
     }
 
     public function testBuildSamePreliminaryFormTreeMultipleTimes()
@@ -200,68 +200,68 @@ public function testBuildSamePreliminaryFormTreeMultipleTimes()
         $this->dataExtractor->expects($this->at(0))
             ->method('extractConfiguration')
             ->with($this->form)
-            ->will($this->returnValue(array('config' => 'foo')));
+            ->will($this->returnValue(['config' => 'foo']));
 
         $this->dataExtractor->expects($this->at(1))
             ->method('extractDefaultData')
             ->with($this->form)
-            ->will($this->returnValue(array('default_data' => 'foo')));
+            ->will($this->returnValue(['default_data' => 'foo']));
 
         $this->dataCollector->collectConfiguration($this->form);
         $this->dataCollector->buildPreliminaryFormTree($this->form);
 
-        $formData = array(
+        $formData = [
             'config' => 'foo',
-            'children' => array(),
-        );
+            'children' => [],
+        ];
 
-        $this->assertSame(array(
-            'forms' => array(
+        $this->assertSame([
+            'forms' => [
                 'name' => $formData,
-            ),
-            'forms_by_hash' => array(
+            ],
+            'forms_by_hash' => [
                 spl_object_hash($this->form) => $formData,
-            ),
+            ],
             'nb_errors' => 0,
-        ), $this->dataCollector->getData());
+        ], $this->dataCollector->getData());
 
         $this->dataCollector->collectDefaultData($this->form);
         $this->dataCollector->buildPreliminaryFormTree($this->form);
 
-        $formData = array(
+        $formData = [
             'config' => 'foo',
             'default_data' => 'foo',
-            'children' => array(),
-        );
+            'children' => [],
+        ];
 
-        $this->assertSame(array(
-            'forms' => array(
+        $this->assertSame([
+            'forms' => [
                 'name' => $formData,
-            ),
-            'forms_by_hash' => array(
+            ],
+            'forms_by_hash' => [
                 spl_object_hash($this->form) => $formData,
-            ),
+            ],
             'nb_errors' => 0,
-        ), $this->dataCollector->getData());
+        ], $this->dataCollector->getData());
     }
 
     public function testBuildPreliminaryFormTreeWithoutCollectingAnyData()
     {
         $this->dataCollector->buildPreliminaryFormTree($this->form);
 
-        $formData = array(
-            'children' => array(),
-        );
+        $formData = [
+            'children' => [],
+        ];
 
-        $this->assertSame(array(
-            'forms' => array(
+        $this->assertSame([
+            'forms' => [
                 'name' => $formData,
-            ),
-            'forms_by_hash' => array(
+            ],
+            'forms_by_hash' => [
                 spl_object_hash($this->form) => $formData,
-            ),
+            ],
             'nb_errors' => 0,
-        ), $this->dataCollector->getData());
+        ], $this->dataCollector->getData());
     }
 
     public function testBuildFinalFormTree()
@@ -272,39 +272,39 @@ public function testBuildFinalFormTree()
         $this->dataExtractor->expects($this->at(0))
             ->method('extractConfiguration')
             ->with($this->form)
-            ->will($this->returnValue(array('config' => 'foo')));
+            ->will($this->returnValue(['config' => 'foo']));
         $this->dataExtractor->expects($this->at(1))
             ->method('extractConfiguration')
             ->with($this->childForm)
-            ->will($this->returnValue(array('config' => 'bar')));
+            ->will($this->returnValue(['config' => 'bar']));
 
         $this->dataExtractor->expects($this->at(2))
             ->method('extractDefaultData')
             ->with($this->form)
-            ->will($this->returnValue(array('default_data' => 'foo')));
+            ->will($this->returnValue(['default_data' => 'foo']));
         $this->dataExtractor->expects($this->at(3))
             ->method('extractDefaultData')
             ->with($this->childForm)
-            ->will($this->returnValue(array('default_data' => 'bar')));
+            ->will($this->returnValue(['default_data' => 'bar']));
 
         $this->dataExtractor->expects($this->at(4))
             ->method('extractSubmittedData')
             ->with($this->form)
-            ->will($this->returnValue(array('submitted_data' => 'foo')));
+            ->will($this->returnValue(['submitted_data' => 'foo']));
         $this->dataExtractor->expects($this->at(5))
             ->method('extractSubmittedData')
             ->with($this->childForm)
-            ->will($this->returnValue(array('submitted_data' => 'bar')));
+            ->will($this->returnValue(['submitted_data' => 'bar']));
 
         $this->dataExtractor->expects($this->at(6))
             ->method('extractViewVariables')
             ->with($this->view)
-            ->will($this->returnValue(array('view_vars' => 'foo')));
+            ->will($this->returnValue(['view_vars' => 'foo']));
 
         $this->dataExtractor->expects($this->at(7))
             ->method('extractViewVariables')
             ->with($this->childView)
-            ->will($this->returnValue(array('view_vars' => 'bar')));
+            ->will($this->returnValue(['view_vars' => 'bar']));
 
         $this->dataCollector->collectConfiguration($this->form);
         $this->dataCollector->collectDefaultData($this->form);
@@ -312,35 +312,35 @@ public function testBuildFinalFormTree()
         $this->dataCollector->collectViewVariables($this->view);
         $this->dataCollector->buildFinalFormTree($this->form, $this->view);
 
-        $childFormData = array(
+        $childFormData = [
             'view_vars' => 'bar',
             'config' => 'bar',
             'default_data' => 'bar',
             'submitted_data' => 'bar',
-            'children' => array(),
-        );
+            'children' => [],
+        ];
 
-        $formData = array(
+        $formData = [
             'view_vars' => 'foo',
             'config' => 'foo',
             'default_data' => 'foo',
             'submitted_data' => 'foo',
             'has_children_error' => false,
-            'children' => array(
+            'children' => [
                 'child' => $childFormData,
-            ),
-        );
+            ],
+        ];
 
-        $this->assertSame(array(
-            'forms' => array(
+        $this->assertSame([
+            'forms' => [
                 'name' => $formData,
-            ),
-            'forms_by_hash' => array(
+            ],
+            'forms_by_hash' => [
                 spl_object_hash($this->form) => $formData,
                 spl_object_hash($this->childForm) => $childFormData,
-            ),
+            ],
             'nb_errors' => 0,
-        ), $this->dataCollector->getData());
+        ], $this->dataCollector->getData());
     }
 
     public function testSerializeWithFormAddedMultipleTimes()
@@ -365,76 +365,76 @@ public function testSerializeWithFormAddedMultipleTimes()
         $this->dataExtractor->expects($this->at(0))
             ->method('extractConfiguration')
             ->with($form1)
-            ->will($this->returnValue(array('config' => 'foo')));
+            ->will($this->returnValue(['config' => 'foo']));
         $this->dataExtractor->expects($this->at(1))
             ->method('extractConfiguration')
             ->with($child1)
-            ->will($this->returnValue(array('config' => 'bar')));
+            ->will($this->returnValue(['config' => 'bar']));
 
         $this->dataExtractor->expects($this->at(2))
             ->method('extractDefaultData')
             ->with($form1)
-            ->will($this->returnValue(array('default_data' => 'foo')));
+            ->will($this->returnValue(['default_data' => 'foo']));
         $this->dataExtractor->expects($this->at(3))
             ->method('extractDefaultData')
             ->with($child1)
-            ->will($this->returnValue(array('default_data' => 'bar')));
+            ->will($this->returnValue(['default_data' => 'bar']));
 
         $this->dataExtractor->expects($this->at(4))
             ->method('extractSubmittedData')
             ->with($form1)
-            ->will($this->returnValue(array('submitted_data' => 'foo')));
+            ->will($this->returnValue(['submitted_data' => 'foo']));
         $this->dataExtractor->expects($this->at(5))
             ->method('extractSubmittedData')
             ->with($child1)
-            ->will($this->returnValue(array('submitted_data' => 'bar')));
+            ->will($this->returnValue(['submitted_data' => 'bar']));
 
         $this->dataExtractor->expects($this->at(6))
             ->method('extractViewVariables')
             ->with($form1View)
-            ->will($this->returnValue(array('view_vars' => 'foo')));
+            ->will($this->returnValue(['view_vars' => 'foo']));
 
         $this->dataExtractor->expects($this->at(7))
             ->method('extractViewVariables')
             ->with($child1View)
-            ->will($this->returnValue(array('view_vars' => $child1View->vars)));
+            ->will($this->returnValue(['view_vars' => $child1View->vars]));
 
         $this->dataExtractor->expects($this->at(8))
             ->method('extractConfiguration')
             ->with($form2)
-            ->will($this->returnValue(array('config' => 'foo')));
+            ->will($this->returnValue(['config' => 'foo']));
         $this->dataExtractor->expects($this->at(9))
             ->method('extractConfiguration')
             ->with($child1)
-            ->will($this->returnValue(array('config' => 'bar')));
+            ->will($this->returnValue(['config' => 'bar']));
 
         $this->dataExtractor->expects($this->at(10))
             ->method('extractDefaultData')
             ->with($form2)
-            ->will($this->returnValue(array('default_data' => 'foo')));
+            ->will($this->returnValue(['default_data' => 'foo']));
         $this->dataExtractor->expects($this->at(11))
             ->method('extractDefaultData')
             ->with($child1)
-            ->will($this->returnValue(array('default_data' => 'bar')));
+            ->will($this->returnValue(['default_data' => 'bar']));
 
         $this->dataExtractor->expects($this->at(12))
             ->method('extractSubmittedData')
             ->with($form2)
-            ->will($this->returnValue(array('submitted_data' => 'foo')));
+            ->will($this->returnValue(['submitted_data' => 'foo']));
         $this->dataExtractor->expects($this->at(13))
             ->method('extractSubmittedData')
             ->with($child1)
-            ->will($this->returnValue(array('submitted_data' => 'bar')));
+            ->will($this->returnValue(['submitted_data' => 'bar']));
 
         $this->dataExtractor->expects($this->at(14))
             ->method('extractViewVariables')
             ->with($form2View)
-            ->will($this->returnValue(array('view_vars' => 'foo')));
+            ->will($this->returnValue(['view_vars' => 'foo']));
 
         $this->dataExtractor->expects($this->at(15))
             ->method('extractViewVariables')
             ->with($child1View)
-            ->will($this->returnValue(array('view_vars' => $child1View->vars)));
+            ->will($this->returnValue(['view_vars' => $child1View->vars]));
 
         $this->dataCollector->collectConfiguration($form1);
         $this->dataCollector->collectDefaultData($form1);
@@ -460,53 +460,53 @@ public function testFinalFormReliesOnFormViewStructure()
 
         $this->dataCollector->buildPreliminaryFormTree($this->form);
 
-        $child1Data = array(
-            'children' => array(),
-        );
+        $child1Data = [
+            'children' => [],
+        ];
 
-        $child2Data = array(
-            'children' => array(),
-        );
+        $child2Data = [
+            'children' => [],
+        ];
 
-        $formData = array(
-            'children' => array(
+        $formData = [
+            'children' => [
                 'first' => $child1Data,
                 'second' => $child2Data,
-            ),
-        );
+            ],
+        ];
 
-        $this->assertSame(array(
-            'forms' => array(
+        $this->assertSame([
+            'forms' => [
                 'name' => $formData,
-            ),
-            'forms_by_hash' => array(
+            ],
+            'forms_by_hash' => [
                 spl_object_hash($this->form) => $formData,
                 spl_object_hash($child1) => $child1Data,
                 spl_object_hash($child2) => $child2Data,
-            ),
+            ],
             'nb_errors' => 0,
-        ), $this->dataCollector->getData());
+        ], $this->dataCollector->getData());
 
         $this->dataCollector->buildFinalFormTree($this->form, $this->view);
 
-        $formData = array(
-            'children' => array(
+        $formData = [
+            'children' => [
                 // "first" not present in FormView
                 'second' => $child2Data,
-            ),
-        );
+            ],
+        ];
 
-        $this->assertSame(array(
-            'forms' => array(
+        $this->assertSame([
+            'forms' => [
                 'name' => $formData,
-            ),
-            'forms_by_hash' => array(
+            ],
+            'forms_by_hash' => [
                 spl_object_hash($this->form) => $formData,
                 spl_object_hash($child1) => $child1Data,
                 spl_object_hash($child2) => $child2Data,
-            ),
+            ],
             'nb_errors' => 0,
-        ), $this->dataCollector->getData());
+        ], $this->dataCollector->getData());
     }
 
     public function testChildViewsCanBeWithoutCorrespondingChildForms()
@@ -518,11 +518,11 @@ public function testChildViewsCanBeWithoutCorrespondingChildForms()
         $this->dataExtractor->expects($this->at(0))
             ->method('extractConfiguration')
             ->with($this->form)
-            ->will($this->returnValue(array('config' => 'foo')));
+            ->will($this->returnValue(['config' => 'foo']));
         $this->dataExtractor->expects($this->at(1))
             ->method('extractConfiguration')
             ->with($this->childForm)
-            ->will($this->returnValue(array('config' => 'bar')));
+            ->will($this->returnValue(['config' => 'bar']));
 
         // explicitly call collectConfiguration(), since $this->childForm is not
         // contained in the form tree
@@ -530,28 +530,28 @@ public function testChildViewsCanBeWithoutCorrespondingChildForms()
         $this->dataCollector->collectConfiguration($this->childForm);
         $this->dataCollector->buildFinalFormTree($this->form, $this->view);
 
-        $childFormData = array(
+        $childFormData = [
             // no "config" key
-            'children' => array(),
-        );
+            'children' => [],
+        ];
 
-        $formData = array(
+        $formData = [
             'config' => 'foo',
-            'children' => array(
+            'children' => [
                 'child' => $childFormData,
-            ),
-        );
+            ],
+        ];
 
-        $this->assertSame(array(
-            'forms' => array(
+        $this->assertSame([
+            'forms' => [
                 'name' => $formData,
-            ),
-            'forms_by_hash' => array(
+            ],
+            'forms_by_hash' => [
                 spl_object_hash($this->form) => $formData,
                 // no child entry
-            ),
+            ],
             'nb_errors' => 0,
-        ), $this->dataCollector->getData());
+        ], $this->dataCollector->getData());
     }
 
     public function testChildViewsWithoutCorrespondingChildFormsMayBeExplicitlyAssociated()
@@ -566,11 +566,11 @@ public function testChildViewsWithoutCorrespondingChildFormsMayBeExplicitlyAssoc
         $this->dataExtractor->expects($this->at(0))
             ->method('extractConfiguration')
             ->with($this->form)
-            ->will($this->returnValue(array('config' => 'foo')));
+            ->will($this->returnValue(['config' => 'foo']));
         $this->dataExtractor->expects($this->at(1))
             ->method('extractConfiguration')
             ->with($this->childForm)
-            ->will($this->returnValue(array('config' => 'bar')));
+            ->will($this->returnValue(['config' => 'bar']));
 
         // explicitly call collectConfiguration(), since $this->childForm is not
         // contained in the form tree
@@ -578,28 +578,28 @@ public function testChildViewsWithoutCorrespondingChildFormsMayBeExplicitlyAssoc
         $this->dataCollector->collectConfiguration($this->childForm);
         $this->dataCollector->buildFinalFormTree($this->form, $this->view);
 
-        $childFormData = array(
+        $childFormData = [
             'config' => 'bar',
-            'children' => array(),
-        );
+            'children' => [],
+        ];
 
-        $formData = array(
+        $formData = [
             'config' => 'foo',
-            'children' => array(
+            'children' => [
                 'child' => $childFormData,
-            ),
-        );
+            ],
+        ];
 
-        $this->assertSame(array(
-            'forms' => array(
+        $this->assertSame([
+            'forms' => [
                 'name' => $formData,
-            ),
-            'forms_by_hash' => array(
+            ],
+            'forms_by_hash' => [
                 spl_object_hash($this->form) => $formData,
                 spl_object_hash($this->childForm) => $childFormData,
-            ),
+            ],
             'nb_errors' => 0,
-        ), $this->dataCollector->getData());
+        ], $this->dataCollector->getData());
     }
 
     public function testCollectSubmittedDataCountsErrors()
@@ -611,22 +611,22 @@ public function testCollectSubmittedDataCountsErrors()
         $form1->add($childForm1);
         $this->dataExtractor
              ->method('extractConfiguration')
-             ->will($this->returnValue(array()));
+             ->will($this->returnValue([]));
         $this->dataExtractor
              ->method('extractDefaultData')
-             ->will($this->returnValue(array()));
+             ->will($this->returnValue([]));
         $this->dataExtractor->expects($this->at(4))
             ->method('extractSubmittedData')
             ->with($form1)
-            ->will($this->returnValue(array('errors' => array('foo'))));
+            ->will($this->returnValue(['errors' => ['foo']]));
         $this->dataExtractor->expects($this->at(5))
             ->method('extractSubmittedData')
             ->with($childForm1)
-            ->will($this->returnValue(array('errors' => array('bar', 'bam'))));
+            ->will($this->returnValue(['errors' => ['bar', 'bam']]));
         $this->dataExtractor->expects($this->at(8))
             ->method('extractSubmittedData')
             ->with($form2)
-            ->will($this->returnValue(array('errors' => array('baz'))));
+            ->will($this->returnValue(['errors' => ['baz']]));
 
         $this->dataCollector->collectSubmittedData($form1);
 
@@ -653,30 +653,30 @@ public function testCollectSubmittedDataExpandedFormsErrors()
 
         $this->dataExtractor
             ->method('extractConfiguration')
-            ->will($this->returnValue(array()));
+            ->will($this->returnValue([]));
         $this->dataExtractor
             ->method('extractDefaultData')
-            ->will($this->returnValue(array()));
+            ->will($this->returnValue([]));
         $this->dataExtractor->expects($this->at(10))
             ->method('extractSubmittedData')
             ->with($this->form)
-            ->will($this->returnValue(array('errors' => array())));
+            ->will($this->returnValue(['errors' => []]));
         $this->dataExtractor->expects($this->at(11))
             ->method('extractSubmittedData')
             ->with($child1Form)
-            ->will($this->returnValue(array('errors' => array())));
+            ->will($this->returnValue(['errors' => []]));
         $this->dataExtractor->expects($this->at(12))
             ->method('extractSubmittedData')
             ->with($child11Form)
-            ->will($this->returnValue(array('errors' => array('foo'))));
+            ->will($this->returnValue(['errors' => ['foo']]));
         $this->dataExtractor->expects($this->at(13))
             ->method('extractSubmittedData')
             ->with($child2Form)
-            ->will($this->returnValue(array('errors' => array())));
+            ->will($this->returnValue(['errors' => []]));
         $this->dataExtractor->expects($this->at(14))
             ->method('extractSubmittedData')
             ->with($child21Form)
-            ->will($this->returnValue(array('errors' => array())));
+            ->will($this->returnValue(['errors' => []]));
 
         $this->dataCollector->collectSubmittedData($this->form);
         $this->dataCollector->buildPreliminaryFormTree($this->form);
@@ -701,14 +701,14 @@ public function testReset()
 
         $this->dataExtractor->expects($this->any())
             ->method('extractConfiguration')
-            ->will($this->returnValue(array()));
+            ->will($this->returnValue([]));
         $this->dataExtractor->expects($this->any())
             ->method('extractDefaultData')
-            ->will($this->returnValue(array()));
+            ->will($this->returnValue([]));
         $this->dataExtractor->expects($this->any())
             ->method('extractSubmittedData')
             ->with($form)
-            ->will($this->returnValue(array('errors' => array('baz'))));
+            ->will($this->returnValue(['errors' => ['baz']]));
 
         $this->dataCollector->buildPreliminaryFormTree($form);
         $this->dataCollector->collectSubmittedData($form);
@@ -716,11 +716,11 @@ public function testReset()
         $this->dataCollector->reset();
 
         $this->assertSame(
-            array(
-                'forms' => array(),
-                'forms_by_hash' => array(),
+            [
+                'forms' => [],
+                'forms_by_hash' => [],
                 'nb_errors' => 0,
-            ),
+            ],
             $this->dataCollector->getData()
         );
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php
index 50fdfd8aa985b..093b487efdeb7 100644
--- a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php
@@ -62,14 +62,14 @@ public function testExtractConfiguration()
             ->setType($type)
             ->getForm();
 
-        $this->assertSame(array(
+        $this->assertSame([
             'id' => 'name',
             'name' => 'name',
             'type_class' => 'stdClass',
             'synchronized' => true,
-            'passed_options' => array(),
-            'resolved_options' => array(),
-        ), $this->dataExtractor->extractConfiguration($form));
+            'passed_options' => [],
+            'resolved_options' => [],
+        ], $this->dataExtractor->extractConfiguration($form));
     }
 
     public function testExtractConfigurationSortsPassedOptions()
@@ -79,11 +79,11 @@ public function testExtractConfigurationSortsPassedOptions()
             ->method('getInnerType')
             ->will($this->returnValue(new \stdClass()));
 
-        $options = array(
+        $options = [
             'b' => 'foo',
             'a' => 'bar',
             'c' => 'baz',
-        );
+        ];
 
         $form = $this->createBuilder('name')
             ->setType($type)
@@ -92,18 +92,18 @@ public function testExtractConfigurationSortsPassedOptions()
             ->setAttribute('data_collector/passed_options', $options)
             ->getForm();
 
-        $this->assertSame(array(
+        $this->assertSame([
             'id' => 'name',
             'name' => 'name',
             'type_class' => 'stdClass',
             'synchronized' => true,
-            'passed_options' => array(
+            'passed_options' => [
                 'a' => 'bar',
                 'b' => 'foo',
                 'c' => 'baz',
-            ),
-            'resolved_options' => array(),
-        ), $this->dataExtractor->extractConfiguration($form));
+            ],
+            'resolved_options' => [],
+        ], $this->dataExtractor->extractConfiguration($form));
     }
 
     public function testExtractConfigurationSortsResolvedOptions()
@@ -113,28 +113,28 @@ public function testExtractConfigurationSortsResolvedOptions()
             ->method('getInnerType')
             ->will($this->returnValue(new \stdClass()));
 
-        $options = array(
+        $options = [
             'b' => 'foo',
             'a' => 'bar',
             'c' => 'baz',
-        );
+        ];
 
         $form = $this->createBuilder('name', $options)
             ->setType($type)
             ->getForm();
 
-        $this->assertSame(array(
+        $this->assertSame([
             'id' => 'name',
             'name' => 'name',
             'type_class' => 'stdClass',
             'synchronized' => true,
-            'passed_options' => array(),
-            'resolved_options' => array(
+            'passed_options' => [],
+            'resolved_options' => [
                 'a' => 'bar',
                 'b' => 'foo',
                 'c' => 'baz',
-            ),
-        ), $this->dataExtractor->extractConfiguration($form));
+            ],
+        ], $this->dataExtractor->extractConfiguration($form));
     }
 
     public function testExtractConfigurationBuildsIdRecursively()
@@ -159,14 +159,14 @@ public function testExtractConfigurationBuildsIdRecursively()
         $grandParent->add($parent);
         $parent->add($form);
 
-        $this->assertSame(array(
+        $this->assertSame([
             'id' => 'grandParent_parent_name',
             'name' => 'name',
             'type_class' => 'stdClass',
             'synchronized' => true,
-            'passed_options' => array(),
-            'resolved_options' => array(),
-        ), $this->dataExtractor->extractConfiguration($form));
+            'passed_options' => [],
+            'resolved_options' => [],
+        ], $this->dataExtractor->extractConfiguration($form));
     }
 
     public function testExtractDefaultData()
@@ -175,50 +175,50 @@ public function testExtractDefaultData()
 
         $form->setData('Foobar');
 
-        $this->assertSame(array(
-            'default_data' => array(
+        $this->assertSame([
+            'default_data' => [
                 'norm' => 'Foobar',
-            ),
-            'submitted_data' => array(),
-        ), $this->dataExtractor->extractDefaultData($form));
+            ],
+            'submitted_data' => [],
+        ], $this->dataExtractor->extractDefaultData($form));
     }
 
     public function testExtractDefaultDataStoresModelDataIfDifferent()
     {
         $form = $this->createBuilder('name')
-            ->addModelTransformer(new FixedDataTransformer(array(
+            ->addModelTransformer(new FixedDataTransformer([
                 'Foo' => 'Bar',
-            )))
+            ]))
             ->getForm();
 
         $form->setData('Foo');
 
-        $this->assertSame(array(
-            'default_data' => array(
+        $this->assertSame([
+            'default_data' => [
                 'norm' => 'Bar',
                 'model' => 'Foo',
-            ),
-            'submitted_data' => array(),
-        ), $this->dataExtractor->extractDefaultData($form));
+            ],
+            'submitted_data' => [],
+        ], $this->dataExtractor->extractDefaultData($form));
     }
 
     public function testExtractDefaultDataStoresViewDataIfDifferent()
     {
         $form = $this->createBuilder('name')
-            ->addViewTransformer(new FixedDataTransformer(array(
+            ->addViewTransformer(new FixedDataTransformer([
                 'Foo' => 'Bar',
-            )))
+            ]))
             ->getForm();
 
         $form->setData('Foo');
 
-        $this->assertSame(array(
-            'default_data' => array(
+        $this->assertSame([
+            'default_data' => [
                 'norm' => 'Foo',
                 'view' => 'Bar',
-            ),
-            'submitted_data' => array(),
-        ), $this->dataExtractor->extractDefaultData($form));
+            ],
+            'submitted_data' => [],
+        ], $this->dataExtractor->extractDefaultData($form));
     }
 
     public function testExtractSubmittedData()
@@ -227,55 +227,55 @@ public function testExtractSubmittedData()
 
         $form->submit('Foobar');
 
-        $this->assertSame(array(
-            'submitted_data' => array(
+        $this->assertSame([
+            'submitted_data' => [
                 'norm' => 'Foobar',
-            ),
-            'errors' => array(),
+            ],
+            'errors' => [],
             'synchronized' => true,
-        ), $this->dataExtractor->extractSubmittedData($form));
+        ], $this->dataExtractor->extractSubmittedData($form));
     }
 
     public function testExtractSubmittedDataStoresModelDataIfDifferent()
     {
         $form = $this->createBuilder('name')
-            ->addModelTransformer(new FixedDataTransformer(array(
+            ->addModelTransformer(new FixedDataTransformer([
                 'Foo' => 'Bar',
                 '' => '',
-            )))
+            ]))
             ->getForm();
 
         $form->submit('Bar');
 
-        $this->assertSame(array(
-            'submitted_data' => array(
+        $this->assertSame([
+            'submitted_data' => [
                 'norm' => 'Bar',
                 'model' => 'Foo',
-            ),
-            'errors' => array(),
+            ],
+            'errors' => [],
             'synchronized' => true,
-        ), $this->dataExtractor->extractSubmittedData($form));
+        ], $this->dataExtractor->extractSubmittedData($form));
     }
 
     public function testExtractSubmittedDataStoresViewDataIfDifferent()
     {
         $form = $this->createBuilder('name')
-            ->addViewTransformer(new FixedDataTransformer(array(
+            ->addViewTransformer(new FixedDataTransformer([
                 'Foo' => 'Bar',
                 '' => '',
-            )))
+            ]))
             ->getForm();
 
         $form->submit('Bar');
 
-        $this->assertSame(array(
-            'submitted_data' => array(
+        $this->assertSame([
+            'submitted_data' => [
                 'norm' => 'Foo',
                 'view' => 'Bar',
-            ),
-            'errors' => array(),
+            ],
+            'errors' => [],
             'synchronized' => true,
-        ), $this->dataExtractor->extractSubmittedData($form));
+        ], $this->dataExtractor->extractSubmittedData($form));
     }
 
     public function testExtractSubmittedDataStoresErrors()
@@ -285,15 +285,15 @@ public function testExtractSubmittedDataStoresErrors()
         $form->submit('Foobar');
         $form->addError(new FormError('Invalid!'));
 
-        $this->assertSame(array(
-            'submitted_data' => array(
+        $this->assertSame([
+            'submitted_data' => [
                 'norm' => 'Foobar',
-            ),
-            'errors' => array(
-                array('message' => 'Invalid!', 'origin' => spl_object_hash($form), 'trace' => array()),
-            ),
+            ],
+            'errors' => [
+                ['message' => 'Invalid!', 'origin' => spl_object_hash($form), 'trace' => []],
+            ],
             'synchronized' => true,
-        ), $this->dataExtractor->extractSubmittedData($form));
+        ], $this->dataExtractor->extractSubmittedData($form));
     }
 
     public function testExtractSubmittedDataStoresErrorOrigin()
@@ -306,15 +306,15 @@ public function testExtractSubmittedDataStoresErrorOrigin()
         $form->submit('Foobar');
         $form->addError($error);
 
-        $this->assertSame(array(
-            'submitted_data' => array(
+        $this->assertSame([
+            'submitted_data' => [
                 'norm' => 'Foobar',
-            ),
-            'errors' => array(
-                array('message' => 'Invalid!', 'origin' => spl_object_hash($form), 'trace' => array()),
-            ),
+            ],
+            'errors' => [
+                ['message' => 'Invalid!', 'origin' => spl_object_hash($form), 'trace' => []],
+            ],
             'synchronized' => true,
-        ), $this->dataExtractor->extractSubmittedData($form));
+        ], $this->dataExtractor->extractSubmittedData($form));
     }
 
     public function testExtractSubmittedDataStoresErrorCause()
@@ -322,10 +322,10 @@ public function testExtractSubmittedDataStoresErrorCause()
         $form = $this->createBuilder('name')->getForm();
 
         $exception = new \Exception();
-        $violation = new ConstraintViolation('Foo', 'Foo', array(), 'Root', 'property.path', 'Invalid!', null, null, null, $exception);
+        $violation = new ConstraintViolation('Foo', 'Foo', [], 'Root', 'property.path', 'Invalid!', null, null, null, $exception);
 
         $form->submit('Foobar');
-        $form->addError(new FormError('Invalid!', null, array(), null, $violation));
+        $form->addError(new FormError('Invalid!', null, [], null, $violation));
         $origin = spl_object_hash($form);
 
         $this->assertDumpMatchesFormat(<<<EODUMP
@@ -375,39 +375,39 @@ function () {
 
         $form->submit('Foobar');
 
-        $this->assertSame(array(
-            'submitted_data' => array(
+        $this->assertSame([
+            'submitted_data' => [
                 'norm' => 'Foobar',
                 'model' => null,
-            ),
-            'errors' => array(),
+            ],
+            'errors' => [],
             'synchronized' => false,
-        ), $this->dataExtractor->extractSubmittedData($form));
+        ], $this->dataExtractor->extractSubmittedData($form));
     }
 
     public function testExtractViewVariables()
     {
         $view = new FormView();
 
-        $view->vars = array(
+        $view->vars = [
             'b' => 'foo',
             'a' => 'bar',
             'c' => 'baz',
             'id' => 'foo_bar',
             'name' => 'bar',
-        );
+        ];
 
-        $this->assertSame(array(
+        $this->assertSame([
             'id' => 'foo_bar',
             'name' => 'bar',
-            'view_vars' => array(
+            'view_vars' => [
                 'a' => 'bar',
                 'b' => 'foo',
                 'c' => 'baz',
                 'id' => 'foo_bar',
                 'name' => 'bar',
-            ),
-        ), $this->dataExtractor->extractViewVariables($view));
+            ],
+        ], $this->dataExtractor->extractViewVariables($view));
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php
index de635f64a3f45..35f38fc53aa4e 100644
--- a/src/Symfony/Component/Form/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php
@@ -44,6 +44,6 @@ public function testBuildForm()
             ->method('addEventSubscriber')
             ->with($this->isInstanceOf('Symfony\Component\Form\Extension\DataCollector\EventListener\DataCollectorListener'));
 
-        $this->extension->buildForm($builder, array());
+        $this->extension->buildForm($builder, []);
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/DependencyInjection/DependencyInjectionExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/DependencyInjection/DependencyInjectionExtensionTest.php
index 66a7bf07191d2..740e388b72ab9 100644
--- a/src/Symfony/Component/Form/Tests/Extension/DependencyInjection/DependencyInjectionExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/DependencyInjection/DependencyInjectionExtensionTest.php
@@ -117,7 +117,7 @@ public function testLegacyThrowExceptionForInvalidExtendedType()
     public function testGetTypeGuesser()
     {
         $container = $this->createContainerMock();
-        $extension = new DependencyInjectionExtension($container, array(), array($this->getMockBuilder(FormTypeGuesserInterface::class)->getMock()));
+        $extension = new DependencyInjectionExtension($container, [], [$this->getMockBuilder(FormTypeGuesserInterface::class)->getMock()]);
 
         $this->assertInstanceOf(FormTypeGuesserChain::class, $extension->getTypeGuesser());
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/HttpFoundationRequestHandlerTest.php b/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/HttpFoundationRequestHandlerTest.php
index e694e405792c4..f414a511b04c9 100644
--- a/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/HttpFoundationRequestHandlerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/HttpFoundationRequestHandlerTest.php
@@ -37,9 +37,9 @@ public function testRequestShouldBeInstanceOfRequest()
         $this->requestHandler->handleRequest($this->getMockForm('name', 'GET'), new \stdClass());
     }
 
-    protected function setRequestData($method, $data, $files = array())
+    protected function setRequestData($method, $data, $files = [])
     {
-        $this->request = Request::create('http://localhost', $method, $data, array(), $files);
+        $this->request = Request::create('http://localhost', $method, $data, [], $files);
     }
 
     protected function getRequestHandler()
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorPerformanceTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorPerformanceTest.php
index 9e957d55fe5cb..64b49d7e9fb12 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorPerformanceTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorPerformanceTest.php
@@ -22,9 +22,9 @@ class FormValidatorPerformanceTest extends FormPerformanceTestCase
 {
     protected function getExtensions()
     {
-        return array(
+        return [
             new ValidatorExtension(Validation::createValidator()),
-        );
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
index 4003ccc01edd1..5a08bb34d5208 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
@@ -48,7 +48,7 @@ protected function setUp()
     {
         $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
         $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
-        $this->serverParams = $this->getMockBuilder('Symfony\Component\Form\Extension\Validator\Util\ServerParams')->setMethods(array('getNormalizedIniPostMaxSize', 'getContentLength'))->getMock();
+        $this->serverParams = $this->getMockBuilder('Symfony\Component\Form\Extension\Validator\Util\ServerParams')->setMethods(['getNormalizedIniPostMaxSize', 'getContentLength'])->getMock();
 
         parent::setUp();
 
@@ -63,12 +63,12 @@ protected function createValidator()
     public function testValidate()
     {
         $object = $this->getMockBuilder('\stdClass')->getMock();
-        $options = array('validation_groups' => array('group1', 'group2'));
+        $options = ['validation_groups' => ['group1', 'group2']];
         $form = $this->getBuilder('name', '\stdClass', $options)
             ->setData($object)
             ->getForm();
 
-        $this->expectValidateAt(0, 'data', $object, array('group1', 'group2'));
+        $this->expectValidateAt(0, 'data', $object, ['group1', 'group2']);
 
         $this->validator->validate($form, new Form());
 
@@ -78,19 +78,19 @@ public function testValidate()
     public function testValidateConstraints()
     {
         $object = $this->getMockBuilder('\stdClass')->getMock();
-        $constraint1 = new NotNull(array('groups' => array('group1', 'group2')));
-        $constraint2 = new NotBlank(array('groups' => 'group2'));
+        $constraint1 = new NotNull(['groups' => ['group1', 'group2']]);
+        $constraint2 = new NotBlank(['groups' => 'group2']);
 
-        $options = array(
-            'validation_groups' => array('group1', 'group2'),
-            'constraints' => array($constraint1, $constraint2),
-        );
+        $options = [
+            'validation_groups' => ['group1', 'group2'],
+            'constraints' => [$constraint1, $constraint2],
+        ];
         $form = $this->getBuilder('name', '\stdClass', $options)
             ->setData($object)
             ->getForm();
 
         // First default constraints
-        $this->expectValidateAt(0, 'data', $object, array('group1', 'group2'));
+        $this->expectValidateAt(0, 'data', $object, ['group1', 'group2']);
 
         // Then custom constraints
         $this->expectValidateValueAt(1, 'data', $object, $constraint1, 'group1');
@@ -109,16 +109,16 @@ public function testValidateChildIfValidConstraint()
             ->setCompound(true)
             ->setDataMapper($this->getDataMapper())
             ->getForm();
-        $options = array(
-            'validation_groups' => array('group1', 'group2'),
-            'constraints' => array(new Valid()),
-        );
+        $options = [
+            'validation_groups' => ['group1', 'group2'],
+            'constraints' => [new Valid()],
+        ];
         $form = $this->getBuilder('name', '\stdClass', $options)->getForm();
         $parent->add($form);
 
         $form->setData($object);
 
-        $this->expectValidateAt(0, 'data', $object, array('group1', 'group2'));
+        $this->expectValidateAt(0, 'data', $object, ['group1', 'group2']);
 
         $this->validator->validate($form, new Form());
 
@@ -133,7 +133,7 @@ public function testDontValidateIfParentWithoutValidConstraint()
             ->setCompound(true)
             ->setDataMapper($this->getDataMapper())
             ->getForm();
-        $options = array('validation_groups' => array('group1', 'group2'));
+        $options = ['validation_groups' => ['group1', 'group2']];
         $form = $this->getBuilder('name', '\stdClass', $options)->getForm();
         $parent->add($form);
 
@@ -152,7 +152,7 @@ public function testMissingConstraintIndex()
         $form = new FormBuilder('name', '\stdClass', $this->dispatcher, $this->factory);
         $form = $form->setData($object)->getForm();
 
-        $this->expectValidateAt(0, 'data', $object, array('Default'));
+        $this->expectValidateAt(0, 'data', $object, ['Default']);
 
         $this->validator->validate($form, new Form());
 
@@ -162,17 +162,17 @@ public function testMissingConstraintIndex()
     public function testValidateConstraintsOptionEvenIfNoValidConstraint()
     {
         $object = $this->getMockBuilder('\stdClass')->getMock();
-        $constraint1 = new NotNull(array('groups' => array('group1', 'group2')));
-        $constraint2 = new NotBlank(array('groups' => 'group2'));
+        $constraint1 = new NotNull(['groups' => ['group1', 'group2']]);
+        $constraint2 = new NotBlank(['groups' => 'group2']);
 
         $parent = $this->getBuilder('parent', null)
             ->setCompound(true)
             ->setDataMapper($this->getDataMapper())
             ->getForm();
-        $options = array(
-            'validation_groups' => array('group1', 'group2'),
-            'constraints' => array($constraint1, $constraint2),
-        );
+        $options = [
+            'validation_groups' => ['group1', 'group2'],
+            'constraints' => [$constraint1, $constraint2],
+        ];
         $form = $this->getBuilder('name', '\stdClass', $options)
             ->setData($object)
             ->getForm();
@@ -190,9 +190,9 @@ public function testDontValidateIfNoValidationGroups()
     {
         $object = $this->getMockBuilder('\stdClass')->getMock();
 
-        $form = $this->getBuilder('name', '\stdClass', array(
-                'validation_groups' => array(),
-            ))
+        $form = $this->getBuilder('name', '\stdClass', [
+                'validation_groups' => [],
+            ])
             ->setData($object)
             ->getForm();
 
@@ -211,10 +211,10 @@ public function testDontValidateConstraintsIfNoValidationGroups()
         $constraint1 = $this->getMockBuilder('Symfony\Component\Validator\Constraint')->getMock();
         $constraint2 = $this->getMockBuilder('Symfony\Component\Validator\Constraint')->getMock();
 
-        $options = array(
-            'validation_groups' => array(),
-            'constraints' => array($constraint1, $constraint2),
-        );
+        $options = [
+            'validation_groups' => [],
+            'constraints' => [$constraint1, $constraint2],
+        ];
         $form = $this->getBuilder('name', '\stdClass', $options)
             ->setData($object)
             ->getForm();
@@ -233,13 +233,13 @@ public function testDontValidateIfNotSynchronized()
     {
         $object = $this->getMockBuilder('\stdClass')->getMock();
 
-        $form = $this->getBuilder('name', '\stdClass', array(
+        $form = $this->getBuilder('name', '\stdClass', [
                 'invalid_message' => 'invalid_message_key',
                 // Invalid message parameters must be supported, because the
                 // invalid message can be a translation key
                 // see https://github.com/symfony/symfony/issues/5144
-                'invalid_message_parameters' => array('{{ foo }}' => 'bar'),
-            ))
+                'invalid_message_parameters' => ['{{ foo }}' => 'bar'],
+            ])
             ->setData($object)
             ->addViewTransformer(new CallbackTransformer(
                 function ($data) { return $data; },
@@ -267,14 +267,14 @@ public function testAddInvalidErrorEvenIfNoValidationGroups()
     {
         $object = $this->getMockBuilder('\stdClass')->getMock();
 
-        $form = $this->getBuilder('name', '\stdClass', array(
+        $form = $this->getBuilder('name', '\stdClass', [
                 'invalid_message' => 'invalid_message_key',
                 // Invalid message parameters must be supported, because the
                 // invalid message can be a translation key
                 // see https://github.com/symfony/symfony/issues/5144
-                'invalid_message_parameters' => array('{{ foo }}' => 'bar'),
-                'validation_groups' => array(),
-            ))
+                'invalid_message_parameters' => ['{{ foo }}' => 'bar'],
+                'validation_groups' => [],
+            ])
             ->setData($object)
             ->addViewTransformer(new CallbackTransformer(
                     function ($data) { return $data; },
@@ -304,11 +304,11 @@ public function testDontValidateConstraintsIfNotSynchronized()
         $constraint1 = $this->getMockBuilder('Symfony\Component\Validator\Constraint')->getMock();
         $constraint2 = $this->getMockBuilder('Symfony\Component\Validator\Constraint')->getMock();
 
-        $options = array(
+        $options = [
             'invalid_message' => 'invalid_message_key',
-            'validation_groups' => array('group1', 'group2'),
-            'constraints' => array($constraint1, $constraint2),
-        );
+            'validation_groups' => ['group1', 'group2'],
+            'constraints' => [$constraint1, $constraint2],
+        ];
         $form = $this->getBuilder('name', '\stdClass', $options)
             ->setData($object)
             ->addViewTransformer(new CallbackTransformer(
@@ -354,7 +354,7 @@ function () { throw new TransformationFailedException(); }
             ->getForm();
 
         // Launch transformer
-        $form->submit(array('child' => 'foo'));
+        $form->submit(['child' => 'foo']);
 
         $this->expectNoValidate();
 
@@ -366,13 +366,13 @@ function () { throw new TransformationFailedException(); }
     public function testHandleGroupSequenceValidationGroups()
     {
         $object = $this->getMockBuilder('\stdClass')->getMock();
-        $options = array('validation_groups' => new GroupSequence(array('group1', 'group2')));
+        $options = ['validation_groups' => new GroupSequence(['group1', 'group2'])];
         $form = $this->getBuilder('name', '\stdClass', $options)
             ->setData($object)
             ->getForm();
 
-        $this->expectValidateAt(0, 'data', $object, new GroupSequence(array('group1', 'group2')));
-        $this->expectValidateAt(1, 'data', $object, new GroupSequence(array('group1', 'group2')));
+        $this->expectValidateAt(0, 'data', $object, new GroupSequence(['group1', 'group2']));
+        $this->expectValidateAt(1, 'data', $object, new GroupSequence(['group1', 'group2']));
 
         $this->validator->validate($form, new Form());
 
@@ -382,12 +382,12 @@ public function testHandleGroupSequenceValidationGroups()
     public function testHandleCallbackValidationGroups()
     {
         $object = $this->getMockBuilder('\stdClass')->getMock();
-        $options = array('validation_groups' => array($this, 'getValidationGroups'));
+        $options = ['validation_groups' => [$this, 'getValidationGroups']];
         $form = $this->getBuilder('name', '\stdClass', $options)
             ->setData($object)
             ->getForm();
 
-        $this->expectValidateAt(0, 'data', $object, array('group1', 'group2'));
+        $this->expectValidateAt(0, 'data', $object, ['group1', 'group2']);
 
         $this->validator->validate($form, new Form());
 
@@ -397,12 +397,12 @@ public function testHandleCallbackValidationGroups()
     public function testDontExecuteFunctionNames()
     {
         $object = $this->getMockBuilder('\stdClass')->getMock();
-        $options = array('validation_groups' => 'header');
+        $options = ['validation_groups' => 'header'];
         $form = $this->getBuilder('name', '\stdClass', $options)
             ->setData($object)
             ->getForm();
 
-        $this->expectValidateAt(0, 'data', $object, array('header'));
+        $this->expectValidateAt(0, 'data', $object, ['header']);
 
         $this->validator->validate($form, new Form());
 
@@ -412,14 +412,14 @@ public function testDontExecuteFunctionNames()
     public function testHandleClosureValidationGroups()
     {
         $object = $this->getMockBuilder('\stdClass')->getMock();
-        $options = array('validation_groups' => function (FormInterface $form) {
-            return array('group1', 'group2');
-        });
+        $options = ['validation_groups' => function (FormInterface $form) {
+            return ['group1', 'group2'];
+        }];
         $form = $this->getBuilder('name', '\stdClass', $options)
             ->setData($object)
             ->getForm();
 
-        $this->expectValidateAt(0, 'data', $object, array('group1', 'group2'));
+        $this->expectValidateAt(0, 'data', $object, ['group1', 'group2']);
 
         $this->validator->validate($form, new Form());
 
@@ -434,19 +434,19 @@ public function testUseValidationGroupOfClickedButton()
             ->setCompound(true)
             ->setDataMapper($this->getDataMapper())
             ->getForm();
-        $form = $this->getForm('name', '\stdClass', array(
+        $form = $this->getForm('name', '\stdClass', [
             'validation_groups' => 'form_group',
-            'constraints' => array(new Valid()),
-        ));
+            'constraints' => [new Valid()],
+        ]);
 
         $parent->add($form);
-        $parent->add($this->getSubmitButton('submit', array(
+        $parent->add($this->getSubmitButton('submit', [
             'validation_groups' => 'button_group',
-        )));
+        ]));
 
-        $parent->submit(array('name' => $object, 'submit' => ''));
+        $parent->submit(['name' => $object, 'submit' => '']);
 
-        $this->expectValidateAt(0, 'data', $object, array('button_group'));
+        $this->expectValidateAt(0, 'data', $object, ['button_group']);
 
         $this->validator->validate($form, new Form());
 
@@ -461,19 +461,19 @@ public function testDontUseValidationGroupOfUnclickedButton()
             ->setCompound(true)
             ->setDataMapper($this->getDataMapper())
             ->getForm();
-        $form = $this->getForm('name', '\stdClass', array(
+        $form = $this->getForm('name', '\stdClass', [
             'validation_groups' => 'form_group',
-            'constraints' => array(new Valid()),
-        ));
+            'constraints' => [new Valid()],
+        ]);
 
         $parent->add($form);
-        $parent->add($this->getSubmitButton('submit', array(
+        $parent->add($this->getSubmitButton('submit', [
             'validation_groups' => 'button_group',
-        )));
+        ]));
 
         $form->setData($object);
 
-        $this->expectValidateAt(0, 'data', $object, array('form_group'));
+        $this->expectValidateAt(0, 'data', $object, ['form_group']);
 
         $this->validator->validate($form, new Form());
 
@@ -484,18 +484,18 @@ public function testUseInheritedValidationGroup()
     {
         $object = $this->getMockBuilder('\stdClass')->getMock();
 
-        $parentOptions = array('validation_groups' => 'group');
+        $parentOptions = ['validation_groups' => 'group'];
         $parent = $this->getBuilder('parent', null, $parentOptions)
             ->setCompound(true)
             ->setDataMapper($this->getDataMapper())
             ->getForm();
-        $formOptions = array('constraints' => array(new Valid()));
+        $formOptions = ['constraints' => [new Valid()]];
         $form = $this->getBuilder('name', '\stdClass', $formOptions)->getForm();
         $parent->add($form);
 
         $form->setData($object);
 
-        $this->expectValidateAt(0, 'data', $object, array('group'));
+        $this->expectValidateAt(0, 'data', $object, ['group']);
 
         $this->validator->validate($form, new Form());
 
@@ -506,18 +506,18 @@ public function testUseInheritedCallbackValidationGroup()
     {
         $object = $this->getMockBuilder('\stdClass')->getMock();
 
-        $parentOptions = array('validation_groups' => array($this, 'getValidationGroups'));
+        $parentOptions = ['validation_groups' => [$this, 'getValidationGroups']];
         $parent = $this->getBuilder('parent', null, $parentOptions)
             ->setCompound(true)
             ->setDataMapper($this->getDataMapper())
             ->getForm();
-        $formOptions = array('constraints' => array(new Valid()));
+        $formOptions = ['constraints' => [new Valid()]];
         $form = $this->getBuilder('name', '\stdClass', $formOptions)->getForm();
         $parent->add($form);
 
         $form->setData($object);
 
-        $this->expectValidateAt(0, 'data', $object, array('group1', 'group2'));
+        $this->expectValidateAt(0, 'data', $object, ['group1', 'group2']);
 
         $this->validator->validate($form, new Form());
 
@@ -528,22 +528,22 @@ public function testUseInheritedClosureValidationGroup()
     {
         $object = $this->getMockBuilder('\stdClass')->getMock();
 
-        $parentOptions = array(
+        $parentOptions = [
             'validation_groups' => function (FormInterface $form) {
-                return array('group1', 'group2');
+                return ['group1', 'group2'];
             },
-        );
+        ];
         $parent = $this->getBuilder('parent', null, $parentOptions)
             ->setCompound(true)
             ->setDataMapper($this->getDataMapper())
             ->getForm();
-        $formOptions = array('constraints' => array(new Valid()));
+        $formOptions = ['constraints' => [new Valid()]];
         $form = $this->getBuilder('name', '\stdClass', $formOptions)->getForm();
         $parent->add($form);
 
         $form->setData($object);
 
-        $this->expectValidateAt(0, 'data', $object, array('group1', 'group2'));
+        $this->expectValidateAt(0, 'data', $object, ['group1', 'group2']);
 
         $this->validator->validate($form, new Form());
 
@@ -557,7 +557,7 @@ public function testAppendPropertyPath()
             ->setData($object)
             ->getForm();
 
-        $this->expectValidateAt(0, 'data', $object, array('Default'));
+        $this->expectValidateAt(0, 'data', $object, ['Default']);
 
         $this->validator->validate($form, new Form());
 
@@ -579,13 +579,13 @@ public function testDontWalkScalars()
 
     public function testViolationIfExtraData()
     {
-        $form = $this->getBuilder('parent', null, array('extra_fields_message' => 'Extra!'))
+        $form = $this->getBuilder('parent', null, ['extra_fields_message' => 'Extra!'])
             ->setCompound(true)
             ->setDataMapper($this->getDataMapper())
             ->add($this->getBuilder('child'))
             ->getForm();
 
-        $form->submit(array('foo' => 'bar'));
+        $form->submit(['foo' => 'bar']);
 
         $this->expectNoValidate();
 
@@ -593,20 +593,20 @@ public function testViolationIfExtraData()
 
         $this->buildViolation('Extra!')
             ->setParameter('{{ extra_fields }}', '"foo"')
-            ->setInvalidValue(array('foo' => 'bar'))
+            ->setInvalidValue(['foo' => 'bar'])
             ->setCode(Form::NO_SUCH_FIELD_ERROR)
             ->assertRaised();
     }
 
     public function testViolationFormatIfMultipleExtraFields()
     {
-        $form = $this->getBuilder('parent', null, array('extra_fields_message' => 'Extra!'))
+        $form = $this->getBuilder('parent', null, ['extra_fields_message' => 'Extra!'])
             ->setCompound(true)
             ->setDataMapper($this->getDataMapper())
             ->add($this->getBuilder('child'))
             ->getForm();
 
-        $form->submit(array('foo' => 'bar', 'baz' => 'qux', 'quux' => 'quuz'));
+        $form->submit(['foo' => 'bar', 'baz' => 'qux', 'quux' => 'quuz']);
 
         $this->expectNoValidate();
 
@@ -614,7 +614,7 @@ public function testViolationFormatIfMultipleExtraFields()
 
         $this->buildViolation('Extra!')
             ->setParameter('{{ extra_fields }}', '"foo", "baz", "quux"')
-            ->setInvalidValue(array('foo' => 'bar', 'baz' => 'qux', 'quux' => 'quuz'))
+            ->setInvalidValue(['foo' => 'bar', 'baz' => 'qux', 'quux' => 'quuz'])
             ->setCode(Form::NO_SUCH_FIELD_ERROR)
             ->assertRaised();
     }
@@ -624,13 +624,13 @@ public function testNoViolationIfAllowExtraData()
         $context = $this->getMockExecutionContext();
 
         $form = $this
-            ->getBuilder('parent', null, array('allow_extra_fields' => true))
+            ->getBuilder('parent', null, ['allow_extra_fields' => true])
             ->setCompound(true)
             ->setDataMapper($this->getDataMapper())
             ->add($this->getBuilder('child'))
             ->getForm();
 
-        $form->submit(array('foo' => 'bar'));
+        $form->submit(['foo' => 'bar']);
 
         $context->expects($this->never())
             ->method('addViolation');
@@ -646,7 +646,7 @@ public function testNoViolationIfAllowExtraData()
      */
     public function getValidationGroups(FormInterface $form)
     {
-        return array('group1', 'group2');
+        return ['group1', 'group2'];
     }
 
     private function getMockExecutionContext()
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php
index ae161819c7b53..5cda7eeaf7336 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php
@@ -62,7 +62,7 @@ protected function setUp()
         $this->listener = new ValidationListener($this->validator, $this->violationMapper);
         $this->message = 'Message';
         $this->messageTemplate = 'Message template';
-        $this->params = array('foo' => 'bar');
+        $this->params = ['foo' => 'bar'];
     }
 
     private function getConstraintViolation($code = null)
@@ -74,7 +74,7 @@ private function getBuilder($name = 'name', $propertyPath = null, $dataClass = n
     {
         $builder = new FormBuilder($name, $dataClass, $this->dispatcher, $this->factory);
         $builder->setPropertyPath(new PropertyPath($propertyPath ?: $name));
-        $builder->setAttribute('error_mapping', array());
+        $builder->setAttribute('error_mapping', []);
         $builder->setErrorBubbling(false);
         $builder->setMapped(true);
 
@@ -99,7 +99,7 @@ public function testMapViolation()
 
         $this->validator->expects($this->once())
             ->method('validate')
-            ->will($this->returnValue(array($violation)));
+            ->will($this->returnValue([$violation]));
 
         $this->violationMapper->expects($this->once())
             ->method('mapViolation')
@@ -115,7 +115,7 @@ public function testMapViolationAllowsNonSyncIfInvalid()
 
         $this->validator->expects($this->once())
             ->method('validate')
-            ->will($this->returnValue(array($violation)));
+            ->will($this->returnValue([$violation]));
 
         $this->violationMapper->expects($this->once())
             ->method('mapViolation')
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php
index e83aaaa3491dc..b90098b412714 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php
@@ -29,57 +29,57 @@ public function testValidationGroupNullByDefault()
 
     public function testValidationGroupsTransformedToArray()
     {
-        $form = $this->createForm(array(
+        $form = $this->createForm([
             'validation_groups' => 'group',
-        ));
+        ]);
 
-        $this->assertEquals(array('group'), $form->getConfig()->getOption('validation_groups'));
+        $this->assertEquals(['group'], $form->getConfig()->getOption('validation_groups'));
     }
 
     public function testValidationGroupsCanBeSetToArray()
     {
-        $form = $this->createForm(array(
-            'validation_groups' => array('group1', 'group2'),
-        ));
+        $form = $this->createForm([
+            'validation_groups' => ['group1', 'group2'],
+        ]);
 
-        $this->assertEquals(array('group1', 'group2'), $form->getConfig()->getOption('validation_groups'));
+        $this->assertEquals(['group1', 'group2'], $form->getConfig()->getOption('validation_groups'));
     }
 
     public function testValidationGroupsCanBeSetToFalse()
     {
-        $form = $this->createForm(array(
+        $form = $this->createForm([
             'validation_groups' => false,
-        ));
+        ]);
 
-        $this->assertEquals(array(), $form->getConfig()->getOption('validation_groups'));
+        $this->assertEquals([], $form->getConfig()->getOption('validation_groups'));
     }
 
     public function testValidationGroupsCanBeSetToCallback()
     {
-        $form = $this->createForm(array(
-            'validation_groups' => array($this, 'testValidationGroupsCanBeSetToCallback'),
-        ));
+        $form = $this->createForm([
+            'validation_groups' => [$this, 'testValidationGroupsCanBeSetToCallback'],
+        ]);
 
         $this->assertInternalType('callable', $form->getConfig()->getOption('validation_groups'));
     }
 
     public function testValidationGroupsCanBeSetToClosure()
     {
-        $form = $this->createForm(array(
+        $form = $this->createForm([
             'validation_groups' => function (FormInterface $form) { },
-        ));
+        ]);
 
         $this->assertInternalType('callable', $form->getConfig()->getOption('validation_groups'));
     }
 
     public function testValidationGroupsCanBeSetToGroupSequence()
     {
-        $form = $this->createForm(array(
-            'validation_groups' => new GroupSequence(array('group1', 'group2')),
-        ));
+        $form = $this->createForm([
+            'validation_groups' => new GroupSequence(['group1', 'group2']),
+        ]);
 
         $this->assertInstanceOf('Symfony\Component\Validator\Constraints\GroupSequence', $form->getConfig()->getOption('validation_groups'));
     }
 
-    abstract protected function createForm(array $options = array());
+    abstract protected function createForm(array $options = []);
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
index 449a133e44082..8437d6f0975e8 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
@@ -33,9 +33,9 @@ public function testSubmitValidatesData()
         $builder = $this->factory->createBuilder(
             FormTypeTest::TESTED_TYPE,
             null,
-            array(
+            [
                 'validation_groups' => 'group',
-            )
+            ]
         );
         $builder->add('firstName', FormTypeTest::TESTED_TYPE);
         $form = $builder->getForm();
@@ -46,14 +46,14 @@ public function testSubmitValidatesData()
             ->will($this->returnValue(new ConstraintViolationList()));
 
         // specific data is irrelevant
-        $form->submit(array());
+        $form->submit([]);
     }
 
     public function testValidConstraint()
     {
-        $form = $this->createForm(array('constraints' => $valid = new Valid()));
+        $form = $this->createForm(['constraints' => $valid = new Valid()]);
 
-        $this->assertSame(array($valid), $form->getConfig()->getOption('constraints'));
+        $this->assertSame([$valid], $form->getConfig()->getOption('constraints'));
     }
 
     public function testValidatorInterface()
@@ -69,21 +69,21 @@ public function testGroupSequenceWithConstraintsOption()
         $form = Forms::createFormFactoryBuilder()
             ->addExtension(new ValidatorExtension(Validation::createValidator()))
             ->getFormFactory()
-            ->create(FormTypeTest::TESTED_TYPE, null, (array('validation_groups' => new GroupSequence(array('First', 'Second')))))
-            ->add('field', TextTypeTest::TESTED_TYPE, array(
-                'constraints' => array(
-                    new Length(array('min' => 10, 'groups' => array('First'))),
-                    new Email(array('groups' => array('Second'))),
-                ),
-            ))
+            ->create(FormTypeTest::TESTED_TYPE, null, (['validation_groups' => new GroupSequence(['First', 'Second'])]))
+            ->add('field', TextTypeTest::TESTED_TYPE, [
+                'constraints' => [
+                    new Length(['min' => 10, 'groups' => ['First']]),
+                    new Email(['groups' => ['Second']]),
+                ],
+            ])
         ;
 
-        $form->submit(array('field' => 'wrong'));
+        $form->submit(['field' => 'wrong']);
 
         $this->assertCount(1, $form->getErrors(true));
     }
 
-    protected function createForm(array $options = array())
+    protected function createForm(array $options = [])
     {
         return $this->factory->create(FormTypeTest::TESTED_TYPE, null, $options);
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/SubmitTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/SubmitTypeValidatorExtensionTest.php
index 015b9582b5764..c347c89bce3b9 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/SubmitTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/SubmitTypeValidatorExtensionTest.php
@@ -17,7 +17,7 @@ class SubmitTypeValidatorExtensionTest extends BaseValidatorExtensionTest
 {
     use ValidatorExtensionTrait;
 
-    protected function createForm(array $options = array())
+    protected function createForm(array $options = [])
     {
         return $this->factory->create('Symfony\Component\Form\Extension\Core\Type\SubmitType', null, $options);
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Util/ServerParamsTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Util/ServerParamsTest.php
index c3ee7303efa1e..0803e18de9e83 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Util/ServerParamsTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Util/ServerParamsTest.php
@@ -31,8 +31,8 @@ public function testGetContentLengthFromSuperglobals()
 
     public function testGetContentLengthFromRequest()
     {
-        $request = Request::create('http://foo', 'GET', array(), array(), array(), array('CONTENT_LENGTH' => 1024));
-        $requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->setMethods(array('getCurrentRequest'))->getMock();
+        $request = Request::create('http://foo', 'GET', [], [], [], ['CONTENT_LENGTH' => 1024]);
+        $requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->setMethods(['getCurrentRequest'])->getMock();
         $requestStack->expects($this->once())->method('getCurrentRequest')->will($this->returnValue($request));
         $serverParams = new ServerParams($requestStack);
 
@@ -42,7 +42,7 @@ public function testGetContentLengthFromRequest()
     /** @dataProvider getGetPostMaxSizeTestData */
     public function testGetPostMaxSize($size, $bytes)
     {
-        $serverParams = $this->getMockBuilder('Symfony\Component\Form\Extension\Validator\Util\ServerParams')->setMethods(array('getNormalizedIniPostMaxSize'))->getMock();
+        $serverParams = $this->getMockBuilder('Symfony\Component\Form\Extension\Validator\Util\ServerParams')->setMethods(['getNormalizedIniPostMaxSize'])->getMock();
         $serverParams
             ->expects($this->any())
             ->method('getNormalizedIniPostMaxSize')
@@ -53,20 +53,20 @@ public function testGetPostMaxSize($size, $bytes)
 
     public function getGetPostMaxSizeTestData()
     {
-        return array(
-            array('2k', 2048),
-            array('2 k', 2048),
-            array('8m', 8 * 1024 * 1024),
-            array('+2 k', 2048),
-            array('+2???k', 2048),
-            array('0x10', 16),
-            array('0xf', 15),
-            array('010', 8),
-            array('+0x10 k', 16 * 1024),
-            array('1g', 1024 * 1024 * 1024),
-            array('-1', -1),
-            array('0', 0),
-            array('2mk', 2048), // the unit must be the last char, so in this case 'k', not 'm'
-        );
+        return [
+            ['2k', 2048],
+            ['2 k', 2048],
+            ['8m', 8 * 1024 * 1024],
+            ['+2 k', 2048],
+            ['+2???k', 2048],
+            ['0x10', 16],
+            ['0xf', 15],
+            ['010', 8],
+            ['+0x10 k', 16 * 1024],
+            ['1g', 1024 * 1024 * 1024],
+            ['-1', -1],
+            ['0', 0],
+            ['2mk', 2048], // the unit must be the last char, so in this case 'k', not 'm'
+        ];
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorExtensionTest.php
index a2b4e2ef9fb6b..ce18d0b6c5718 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorExtensionTest.php
@@ -22,7 +22,7 @@ public function test2Dot5ValidationApi()
             ->disableOriginalConstructor()
             ->getMock();
         $metadata = $this->getMockBuilder('Symfony\Component\Validator\Mapping\ClassMetadata')
-            ->setMethods(array('addConstraint', 'addPropertyConstraint'))
+            ->setMethods(['addConstraint', 'addPropertyConstraint'])
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorTypeGuesserTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorTypeGuesserTest.php
index 1a743cdfe8567..d14c89c2cbda1 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorTypeGuesserTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorTypeGuesserTest.php
@@ -62,13 +62,13 @@ protected function setUp()
 
     public function guessRequiredProvider()
     {
-        return array(
-            array(new NotNull(), new ValueGuess(true, Guess::HIGH_CONFIDENCE)),
-            array(new NotBlank(), new ValueGuess(true, Guess::HIGH_CONFIDENCE)),
-            array(new IsTrue(), new ValueGuess(true, Guess::HIGH_CONFIDENCE)),
-            array(new Length(10), new ValueGuess(false, Guess::LOW_CONFIDENCE)),
-            array(new Range(array('min' => 1, 'max' => 20)), new ValueGuess(false, Guess::LOW_CONFIDENCE)),
-        );
+        return [
+            [new NotNull(), new ValueGuess(true, Guess::HIGH_CONFIDENCE)],
+            [new NotBlank(), new ValueGuess(true, Guess::HIGH_CONFIDENCE)],
+            [new IsTrue(), new ValueGuess(true, Guess::HIGH_CONFIDENCE)],
+            [new Length(10), new ValueGuess(false, Guess::LOW_CONFIDENCE)],
+            [new Range(['min' => 1, 'max' => 20]), new ValueGuess(false, Guess::LOW_CONFIDENCE)],
+        ];
     }
 
     /**
@@ -92,7 +92,7 @@ public function testGuessRequiredReturnsFalseForUnmappedProperties()
 
     public function testGuessMaxLengthForConstraintWithMaxValue()
     {
-        $constraint = new Length(array('max' => '2'));
+        $constraint = new Length(['max' => '2']);
 
         $result = $this->guesser->guessMaxLengthForConstraint($constraint);
         $this->assertInstanceOf('Symfony\Component\Form\Guess\ValueGuess', $result);
@@ -102,7 +102,7 @@ public function testGuessMaxLengthForConstraintWithMaxValue()
 
     public function testGuessMaxLengthForConstraintWithMinValue()
     {
-        $constraint = new Length(array('min' => '2'));
+        $constraint = new Length(['min' => '2']);
 
         $result = $this->guesser->guessMaxLengthForConstraint($constraint);
         $this->assertNull($result);
@@ -110,12 +110,12 @@ public function testGuessMaxLengthForConstraintWithMinValue()
 
     public function maxLengthTypeProvider()
     {
-        return array(
-            array('double'),
-            array('float'),
-            array('numeric'),
-            array('real'),
-        );
+        return [
+            ['double'],
+            ['float'],
+            ['numeric'],
+            ['real'],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
index 66e2dafff8d5a..1278a86e22c2a 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
@@ -64,14 +64,14 @@ protected function setUp()
         $this->mapper = new ViolationMapper();
         $this->message = 'Message';
         $this->messageTemplate = 'Message template';
-        $this->params = array('foo' => 'bar');
+        $this->params = ['foo' => 'bar'];
     }
 
-    protected function getForm($name = 'name', $propertyPath = null, $dataClass = null, $errorMapping = array(), $inheritData = false, $synchronized = true)
+    protected function getForm($name = 'name', $propertyPath = null, $dataClass = null, $errorMapping = [], $inheritData = false, $synchronized = true)
     {
-        $config = new FormConfigBuilder($name, $dataClass, $this->dispatcher, array(
+        $config = new FormConfigBuilder($name, $dataClass, $this->dispatcher, [
             'error_mapping' => $errorMapping,
-        ));
+        ]);
         $config->setMapped(true);
         $config->setInheritData($inheritData);
         $config->setPropertyPath($propertyPath);
@@ -121,54 +121,54 @@ public function testMapToFormInheritingParentDataIfDataDoesNotMatch()
     {
         $violation = $this->getConstraintViolation('children[address].data.foo');
         $parent = $this->getForm('parent');
-        $child = $this->getForm('address', 'address', null, array(), true);
+        $child = $this->getForm('address', 'address', null, [], true);
         $grandChild = $this->getForm('street');
 
         $parent->add($child);
         $child->add($grandChild);
 
-        $parent->submit(array());
+        $parent->submit([]);
 
         $this->mapper->mapViolation($violation, $parent);
 
         $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
-        $this->assertEquals(array($this->getFormError($violation, $child)), iterator_to_array($child->getErrors()), $child->getName().' should have an error, but has none');
+        $this->assertEquals([$this->getFormError($violation, $child)], iterator_to_array($child->getErrors()), $child->getName().' should have an error, but has none');
         $this->assertCount(0, $grandChild->getErrors(), $grandChild->getName().' should not have an error, but has one');
     }
 
     public function testFollowDotRules()
     {
         $violation = $this->getConstraintViolation('data.foo');
-        $parent = $this->getForm('parent', null, null, array(
+        $parent = $this->getForm('parent', null, null, [
             'foo' => 'address',
-        ));
-        $child = $this->getForm('address', null, null, array(
+        ]);
+        $child = $this->getForm('address', null, null, [
             '.' => 'street',
-        ));
-        $grandChild = $this->getForm('street', null, null, array(
+        ]);
+        $grandChild = $this->getForm('street', null, null, [
             '.' => 'name',
-        ));
+        ]);
         $grandGrandChild = $this->getForm('name');
 
         $parent->add($child);
         $child->add($grandChild);
         $grandChild->add($grandGrandChild);
 
-        $parent->submit(array());
+        $parent->submit([]);
 
         $this->mapper->mapViolation($violation, $parent);
 
         $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
         $this->assertCount(0, $child->getErrors(), $child->getName().' should not have an error, but has one');
         $this->assertCount(0, $grandChild->getErrors(), $grandChild->getName().' should not have an error, but has one');
-        $this->assertEquals(array($this->getFormError($violation, $grandGrandChild)), iterator_to_array($grandGrandChild->getErrors()), $grandGrandChild->getName().' should have an error, but has none');
+        $this->assertEquals([$this->getFormError($violation, $grandGrandChild)], iterator_to_array($grandGrandChild->getErrors()), $grandGrandChild->getName().' should have an error, but has none');
     }
 
     public function testAbortMappingIfNotSynchronized()
     {
         $violation = $this->getConstraintViolation('children[address].data.street');
         $parent = $this->getForm('parent');
-        $child = $this->getForm('address', 'address', null, array(), false, false);
+        $child = $this->getForm('address', 'address', null, [], false, false);
         // even though "street" is synchronized, it should not have any errors
         // due to its parent not being synchronized
         $grandChild = $this->getForm('street', 'street');
@@ -177,7 +177,7 @@ public function testAbortMappingIfNotSynchronized()
         $child->add($grandChild);
 
         // invoke the transformer and mark the form unsynchronized
-        $parent->submit(array());
+        $parent->submit([]);
 
         $this->mapper->mapViolation($violation, $parent);
 
@@ -190,9 +190,9 @@ public function testAbortDotRuleMappingIfNotSynchronized()
     {
         $violation = $this->getConstraintViolation('data.address');
         $parent = $this->getForm('parent');
-        $child = $this->getForm('address', 'address', null, array(
+        $child = $this->getForm('address', 'address', null, [
             '.' => 'street',
-        ), false, false);
+        ], false, false);
         // even though "street" is synchronized, it should not have any errors
         // due to its parent not being synchronized
         $grandChild = $this->getForm('street');
@@ -201,7 +201,7 @@ public function testAbortDotRuleMappingIfNotSynchronized()
         $child->add($grandChild);
 
         // invoke the transformer and mark the form unsynchronized
-        $parent->submit(array());
+        $parent->submit([]);
 
         $this->mapper->mapViolation($violation, $parent);
 
@@ -221,8 +221,8 @@ public function testAbortMappingIfNotSubmitted()
         $child->add($grandChild);
 
         // Disable automatic submission of missing fields
-        $parent->submit(array(), false);
-        $child->submit(array(), false);
+        $parent->submit([], false);
+        $child->submit([], false);
 
         // $grandChild is not submitted
 
@@ -237,17 +237,17 @@ public function testAbortDotRuleMappingIfNotSubmitted()
     {
         $violation = $this->getConstraintViolation('data.address');
         $parent = $this->getForm('parent');
-        $child = $this->getForm('address', 'address', null, array(
+        $child = $this->getForm('address', 'address', null, [
             '.' => 'street',
-        ));
+        ]);
         $grandChild = $this->getForm('street');
 
         $parent->add($child);
         $child->add($grandChild);
 
         // Disable automatic submission of missing fields
-        $parent->submit(array(), false);
-        $child->submit(array(), false);
+        $parent->submit([], false);
+        $child->submit([], false);
 
         // $grandChild is not submitted
 
@@ -262,526 +262,526 @@ public function provideDefaultTests()
     {
         // The mapping must be deterministic! If a child has the property path "[street]",
         // "data[street]" should be mapped, but "data.street" should not!
-        return array(
+        return [
             // mapping target, child name, its property path, grand child name, its property path, violation path
-            array(self::LEVEL_0, 'address', 'address', 'street', 'street', ''),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'street', 'data'),
-
-            array(self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'street', 'children[address].data'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address].data.street'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address].data.street.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'street', 'children[address].data[street]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'street', 'children[address].data[street].prop'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'street', 'data.address.street'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'street', 'data.address.street.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'street', 'data.address[street]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'street', 'data.address[street].prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[address].street'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[address].street.prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[address][street]'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[address][street].prop'),
-
-            array(self::LEVEL_2, 'address', 'address', 'street', '[street]', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', 'address', 'street', '[street]', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[street]', 'children[address].data'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[street]', 'children[address].data.street'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[street]', 'children[address].data.street.prop'),
-            array(self::LEVEL_2, 'address', 'address', 'street', '[street]', 'children[address].data[street]'),
-            array(self::LEVEL_2, 'address', 'address', 'street', '[street]', 'children[address].data[street].prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[street]', 'data.address.street'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[street]', 'data.address.street.prop'),
-            array(self::LEVEL_2, 'address', 'address', 'street', '[street]', 'data.address[street]'),
-            array(self::LEVEL_2, 'address', 'address', 'street', '[street]', 'data.address[street].prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[street]', 'data[address].street'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[street]', 'data[address].street.prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[street]', 'data[address][street]'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[street]', 'data[address][street].prop'),
-
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'street', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'street', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'street', 'children[address].data'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'street', 'children[address].data.street'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'street', 'children[address].data.street.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'street', 'children[address].data[street]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'street', 'children[address].data[street].prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'street', 'data.address.street'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'street', 'data.address.street.prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'street', 'data.address[street]'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'street', 'data.address[street].prop'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'street', 'data[address].street'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'street', 'data[address].street.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'street', 'data[address][street]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'street', 'data[address][street].prop'),
-
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[street]', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[street]', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[street]', 'children[address].data'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[street]', 'children[address].data.street'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[street]', 'children[address].data.street.prop'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[street]', 'children[address].data[street]'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[street]', 'children[address].data[street].prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[street]', 'data.address.street'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[street]', 'data.address.street.prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[street]', 'data.address[street]'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[street]', 'data.address[street].prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[street]', 'data[address].street'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[street]', 'data[address].street.prop'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[street]', 'data[address][street]'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[street]', 'data[address][street].prop'),
-
-            array(self::LEVEL_2, 'address', 'person.address', 'street', 'street', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', 'person.address', 'street', 'street', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', 'person.address', 'street', 'street', 'children[address].data'),
-            array(self::LEVEL_2, 'address', 'person.address', 'street', 'street', 'children[address].data.street'),
-            array(self::LEVEL_2, 'address', 'person.address', 'street', 'street', 'children[address].data.street.prop'),
-            array(self::LEVEL_1, 'address', 'person.address', 'street', 'street', 'children[address].data[street]'),
-            array(self::LEVEL_1, 'address', 'person.address', 'street', 'street', 'children[address].data[street].prop'),
-            array(self::LEVEL_2, 'address', 'person.address', 'street', 'street', 'data.person.address.street'),
-            array(self::LEVEL_2, 'address', 'person.address', 'street', 'street', 'data.person.address.street.prop'),
-            array(self::LEVEL_1, 'address', 'person.address', 'street', 'street', 'data.person.address[street]'),
-            array(self::LEVEL_1, 'address', 'person.address', 'street', 'street', 'data.person.address[street].prop'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data.person[address].street'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data.person[address].street.prop'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data.person[address][street]'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data.person[address][street].prop'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data[person].address.street'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data[person].address.street.prop'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data[person].address[street]'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data[person].address[street].prop'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data[person][address].street'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data[person][address].street.prop'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data[person][address][street]'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data[person][address][street].prop'),
-
-            array(self::LEVEL_2, 'address', 'person.address', 'street', '[street]', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', 'person.address', 'street', '[street]', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', 'person.address', 'street', '[street]', 'children[address].data'),
-            array(self::LEVEL_1, 'address', 'person.address', 'street', '[street]', 'children[address].data.street'),
-            array(self::LEVEL_1, 'address', 'person.address', 'street', '[street]', 'children[address].data.street.prop'),
-            array(self::LEVEL_2, 'address', 'person.address', 'street', '[street]', 'children[address].data[street]'),
-            array(self::LEVEL_2, 'address', 'person.address', 'street', '[street]', 'children[address].data[street].prop'),
-            array(self::LEVEL_1, 'address', 'person.address', 'street', '[street]', 'data.person.address.street'),
-            array(self::LEVEL_1, 'address', 'person.address', 'street', '[street]', 'data.person.address.street.prop'),
-            array(self::LEVEL_2, 'address', 'person.address', 'street', '[street]', 'data.person.address[street]'),
-            array(self::LEVEL_2, 'address', 'person.address', 'street', '[street]', 'data.person.address[street].prop'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data.person[address].street'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data.person[address].street.prop'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data.person[address][street]'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data.person[address][street].prop'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data[person].address.street'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data[person].address.street.prop'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data[person].address[street]'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data[person].address[street].prop'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data[person][address].street'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data[person][address].street.prop'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data[person][address][street]'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data[person][address][street].prop'),
-
-            array(self::LEVEL_2, 'address', 'person[address]', 'street', 'street', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', 'person[address]', 'street', 'street', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', 'person[address]', 'street', 'street', 'children[address].data'),
-            array(self::LEVEL_2, 'address', 'person[address]', 'street', 'street', 'children[address].data.street'),
-            array(self::LEVEL_2, 'address', 'person[address]', 'street', 'street', 'children[address].data.street.prop'),
-            array(self::LEVEL_1, 'address', 'person[address]', 'street', 'street', 'children[address].data[street]'),
-            array(self::LEVEL_1, 'address', 'person[address]', 'street', 'street', 'children[address].data[street].prop'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data.person.address.street'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data.person.address.street.prop'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data.person.address[street]'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data.person.address[street].prop'),
-            array(self::LEVEL_2, 'address', 'person[address]', 'street', 'street', 'data.person[address].street'),
-            array(self::LEVEL_2, 'address', 'person[address]', 'street', 'street', 'data.person[address].street.prop'),
-            array(self::LEVEL_1, 'address', 'person[address]', 'street', 'street', 'data.person[address][street]'),
-            array(self::LEVEL_1, 'address', 'person[address]', 'street', 'street', 'data.person[address][street].prop'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data[person].address.street'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data[person].address.street.prop'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data[person].address[street]'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data[person].address[street].prop'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data[person][address].street'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data[person][address].street.prop'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data[person][address][street]'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data[person][address][street].prop'),
-
-            array(self::LEVEL_2, 'address', 'person[address]', 'street', '[street]', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', 'person[address]', 'street', '[street]', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', 'person[address]', 'street', '[street]', 'children[address].data'),
-            array(self::LEVEL_1, 'address', 'person[address]', 'street', '[street]', 'children[address].data.street'),
-            array(self::LEVEL_1, 'address', 'person[address]', 'street', '[street]', 'children[address].data.street.prop'),
-            array(self::LEVEL_2, 'address', 'person[address]', 'street', '[street]', 'children[address].data[street]'),
-            array(self::LEVEL_2, 'address', 'person[address]', 'street', '[street]', 'children[address].data[street].prop'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data.person.address.street'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data.person.address.street.prop'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data.person.address[street]'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data.person.address[street].prop'),
-            array(self::LEVEL_1, 'address', 'person[address]', 'street', '[street]', 'data.person[address].street'),
-            array(self::LEVEL_1, 'address', 'person[address]', 'street', '[street]', 'data.person[address].street.prop'),
-            array(self::LEVEL_2, 'address', 'person[address]', 'street', '[street]', 'data.person[address][street]'),
-            array(self::LEVEL_2, 'address', 'person[address]', 'street', '[street]', 'data.person[address][street].prop'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data[person].address.street'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data[person].address.street.prop'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data[person].address[street]'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data[person].address[street].prop'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data[person][address].street'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data[person][address].street.prop'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data[person][address][street]'),
-            array(self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data[person][address][street].prop'),
-
-            array(self::LEVEL_2, 'address', '[person].address', 'street', 'street', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', '[person].address', 'street', 'street', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', '[person].address', 'street', 'street', 'children[address].data'),
-            array(self::LEVEL_2, 'address', '[person].address', 'street', 'street', 'children[address].data.street'),
-            array(self::LEVEL_2, 'address', '[person].address', 'street', 'street', 'children[address].data.street.prop'),
-            array(self::LEVEL_1, 'address', '[person].address', 'street', 'street', 'children[address].data[street]'),
-            array(self::LEVEL_1, 'address', '[person].address', 'street', 'street', 'children[address].data[street].prop'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data.person.address.street'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data.person.address.street.prop'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data.person.address[street]'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data.person.address[street].prop'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data.person[address].street'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data.person[address].street.prop'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data.person[address][street]'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data.person[address][street].prop'),
-            array(self::LEVEL_2, 'address', '[person].address', 'street', 'street', 'data[person].address.street'),
-            array(self::LEVEL_2, 'address', '[person].address', 'street', 'street', 'data[person].address.street.prop'),
-            array(self::LEVEL_1, 'address', '[person].address', 'street', 'street', 'data[person].address[street]'),
-            array(self::LEVEL_1, 'address', '[person].address', 'street', 'street', 'data[person].address[street].prop'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data[person][address].street'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data[person][address].street.prop'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data[person][address][street]'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data[person][address][street].prop'),
-
-            array(self::LEVEL_2, 'address', '[person].address', 'street', '[street]', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', '[person].address', 'street', '[street]', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', '[person].address', 'street', '[street]', 'children[address].data'),
-            array(self::LEVEL_1, 'address', '[person].address', 'street', '[street]', 'children[address].data.street'),
-            array(self::LEVEL_1, 'address', '[person].address', 'street', '[street]', 'children[address].data.street.prop'),
-            array(self::LEVEL_2, 'address', '[person].address', 'street', '[street]', 'children[address].data[street]'),
-            array(self::LEVEL_2, 'address', '[person].address', 'street', '[street]', 'children[address].data[street].prop'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data.person.address.street'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data.person.address.street.prop'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data.person.address[street]'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data.person.address[street].prop'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data.person[address].street'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data.person[address].street.prop'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data.person[address][street]'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data.person[address][street].prop'),
-            array(self::LEVEL_1, 'address', '[person].address', 'street', '[street]', 'data[person].address.street'),
-            array(self::LEVEL_1, 'address', '[person].address', 'street', '[street]', 'data[person].address.street.prop'),
-            array(self::LEVEL_2, 'address', '[person].address', 'street', '[street]', 'data[person].address[street]'),
-            array(self::LEVEL_2, 'address', '[person].address', 'street', '[street]', 'data[person].address[street].prop'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data[person][address].street'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data[person][address].street.prop'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data[person][address][street]'),
-            array(self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data[person][address][street].prop'),
-
-            array(self::LEVEL_2, 'address', '[person][address]', 'street', 'street', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', '[person][address]', 'street', 'street', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', '[person][address]', 'street', 'street', 'children[address]'),
-            array(self::LEVEL_1, 'address', '[person][address]', 'street', 'street', 'children[address].data'),
-            array(self::LEVEL_2, 'address', '[person][address]', 'street', 'street', 'children[address].data.street'),
-            array(self::LEVEL_2, 'address', '[person][address]', 'street', 'street', 'children[address].data.street.prop'),
-            array(self::LEVEL_1, 'address', '[person][address]', 'street', 'street', 'children[address].data[street]'),
-            array(self::LEVEL_1, 'address', '[person][address]', 'street', 'street', 'children[address].data[street].prop'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data.person.address.street'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data.person.address.street.prop'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data.person.address[street]'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data.person.address[street].prop'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data.person[address].street'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data.person[address].street.prop'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data.person[address][street]'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data.person[address][street].prop'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data[person].address.street'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data[person].address.street.prop'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data[person].address[street]'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data[person].address[street].prop'),
-            array(self::LEVEL_2, 'address', '[person][address]', 'street', 'street', 'data[person][address].street'),
-            array(self::LEVEL_2, 'address', '[person][address]', 'street', 'street', 'data[person][address].street.prop'),
-            array(self::LEVEL_1, 'address', '[person][address]', 'street', 'street', 'data[person][address][street]'),
-            array(self::LEVEL_1, 'address', '[person][address]', 'street', 'street', 'data[person][address][street].prop'),
-
-            array(self::LEVEL_2, 'address', '[person][address]', 'street', '[street]', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', '[person][address]', 'street', '[street]', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', '[person][address]', 'street', '[street]', 'children[address].data'),
-            array(self::LEVEL_1, 'address', '[person][address]', 'street', '[street]', 'children[address].data.street'),
-            array(self::LEVEL_1, 'address', '[person][address]', 'street', '[street]', 'children[address].data.street.prop'),
-            array(self::LEVEL_2, 'address', '[person][address]', 'street', '[street]', 'children[address].data[street]'),
-            array(self::LEVEL_2, 'address', '[person][address]', 'street', '[street]', 'children[address].data[street].prop'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data.person.address.street'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data.person.address.street.prop'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data.person.address[street]'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data.person.address[street].prop'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data.person[address].street'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data.person[address].street.prop'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data.person[address][street]'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data.person[address][street].prop'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data[person].address.street'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data[person].address.street.prop'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data[person].address[street]'),
-            array(self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data[person].address[street].prop'),
-            array(self::LEVEL_1, 'address', '[person][address]', 'street', '[street]', 'data[person][address].street'),
-            array(self::LEVEL_1, 'address', '[person][address]', 'street', '[street]', 'data[person][address].street.prop'),
-            array(self::LEVEL_2, 'address', '[person][address]', 'street', '[street]', 'data[person][address][street]'),
-            array(self::LEVEL_2, 'address', '[person][address]', 'street', '[street]', 'data[person][address][street].prop'),
-
-            array(self::LEVEL_2, 'address', 'address', 'street', 'office.street', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'office.street', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data.office'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'office.street', 'children[address].data.office.street'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'office.street', 'children[address].data.office.street.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data.office[street]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data.office[street].prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data[office]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data[office].street'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data[office].street.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data[office][street]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data[office][street].prop'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'office.street', 'data.address.office.street'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'office.street', 'data.address.office.street.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'data.address.office[street]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'data.address.office[street].prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'data.address[office].street'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'data.address[office].street.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'data.address[office][street]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'data.address[office][street].prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'office.street', 'data[address].office.street'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'office.street', 'data[address].office.street.prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'office.street', 'data[address].office[street]'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'office.street', 'data[address].office[street].prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'office.street', 'data[address][office].street'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'office.street', 'data[address][office].street.prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'office.street', 'data[address][office][street]'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'office.street', 'data[address][office][street].prop'),
-
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'office.street', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'office.street', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'children[address].data'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'children[address].data.office'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'office.street', 'children[address].data.office.street'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'office.street', 'children[address].data.office.street.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'children[address].data.office[street]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'children[address].data.office[street].prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'children[address].data[office]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'children[address].data[office].street'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'children[address].data[office].street.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'children[address].data[office][street]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'children[address].data[office][street].prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'office.street', 'data.address.office.street'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'office.street', 'data.address.office.street.prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'office.street', 'data.address.office[street]'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'office.street', 'data.address.office[street].prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'office.street', 'data.address[office].street'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'office.street', 'data.address[office].street.prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'office.street', 'data.address[office][street]'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'office.street', 'data.address[office][street].prop'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'office.street', 'data[address].office.street'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'office.street', 'data[address].office.street.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'data[address].office[street]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'data[address].office[street].prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'data[address][office].street'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'data[address][office].street.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'data[address][office][street]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'data[address][office][street].prop'),
-
-            array(self::LEVEL_2, 'address', 'address', 'street', 'office[street]', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'office[street]', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'children[address].data'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'children[address].data.office'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'children[address].data.office.street'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'children[address].data.office.street.prop'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'office[street]', 'children[address].data.office[street]'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'office[street]', 'children[address].data.office[street].prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'children[address].data[office]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'children[address].data[office].street'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'children[address].data[office].street.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'children[address].data[office][street]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'children[address].data[office][street].prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'data.address.office.street'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'data.address.office.street.prop'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'office[street]', 'data.address.office[street]'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'office[street]', 'data.address.office[street].prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'data.address[office].street'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'data.address[office].street.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'data.address[office][street]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'data.address[office][street].prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'office[street]', 'data[address].office.street'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'office[street]', 'data[address].office.street.prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'office[street]', 'data[address].office[street]'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'office[street]', 'data[address].office[street].prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'office[street]', 'data[address][office].street'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'office[street]', 'data[address][office].street.prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'office[street]', 'data[address][office][street]'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'office[street]', 'data[address][office][street].prop'),
-
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'office[street]', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'office[street]', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'children[address].data.office.street'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'children[address].data.office.street.prop'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'office[street]', 'children[address].data.office[street]'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'office[street]', 'children[address].data.office[street].prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'children[address].data[office]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'children[address].data[office].street'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'children[address].data[office].street.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'children[address].data[office][street]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'children[address].data[office][street].prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'office[street]', 'data.address.office.street'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'office[street]', 'data.address.office.street.prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'office[street]', 'data.address.office[street]'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'office[street]', 'data.address.office[street].prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'office[street]', 'data.address[office].street'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'office[street]', 'data.address[office].street.prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'office[street]', 'data.address[office][street]'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', 'office[street]', 'data.address[office][street].prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'data[address].office.street'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'data[address].office.street.prop'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'office[street]', 'data[address].office[street]'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'office[street]', 'data[address].office[street].prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'data[address][office].street'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'data[address][office].street.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'data[address][office][street]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'data[address][office][street].prop'),
-
-            array(self::LEVEL_2, 'address', 'address', 'street', '[office].street', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', 'address', 'street', '[office].street', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'children[address].data'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'children[address].data.office'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'children[address].data.office.street'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'children[address].data.office.street.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'children[address].data.office[street]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'children[address].data.office[street].prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'children[address].data[office]'),
-            array(self::LEVEL_2, 'address', 'address', 'street', '[office].street', 'children[address].data[office].street'),
-            array(self::LEVEL_2, 'address', 'address', 'street', '[office].street', 'children[address].data[office].street.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'children[address].data[office][street]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'children[address].data[office][street].prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'data.address.office.street'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'data.address.office.street.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'data.address.office[street]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'data.address.office[street].prop'),
-            array(self::LEVEL_2, 'address', 'address', 'street', '[office].street', 'data.address[office].street'),
-            array(self::LEVEL_2, 'address', 'address', 'street', '[office].street', 'data.address[office].street.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'data.address[office][street]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'data.address[office][street].prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[office].street', 'data[address].office.street'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[office].street', 'data[address].office.street.prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[office].street', 'data[address].office[street]'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[office].street', 'data[address].office[street].prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[office].street', 'data[address][office].street'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[office].street', 'data[address][office].street.prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[office].street', 'data[address][office][street]'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[office].street', 'data[address][office][street].prop'),
-
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[office].street', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[office].street', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'children[address].data'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'children[address].data.office'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'children[address].data.office.street'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'children[address].data.office.street.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'children[address].data.office[street]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'children[address].data.office[street].prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'children[address].data[office]'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[office].street', 'children[address].data[office].street'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[office].street', 'children[address].data[office].street.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'children[address].data[office][street]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'children[address].data[office][street].prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[office].street', 'data.address.office.street'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[office].street', 'data.address.office.street.prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[office].street', 'data.address.office[street]'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[office].street', 'data.address.office[street].prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[office].street', 'data.address[office].street'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[office].street', 'data.address[office].street.prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[office].street', 'data.address[office][street]'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[office].street', 'data.address[office][street].prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'data[address].office.street'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'data[address].office.street.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'data[address].office[street]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'data[address].office[street].prop'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[office].street', 'data[address][office].street'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[office].street', 'data[address][office].street.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'data[address][office][street]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'data[address][office][street].prop'),
-
-            array(self::LEVEL_2, 'address', 'address', 'street', '[office][street]', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', 'address', 'street', '[office][street]', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'children[address].data'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'children[address].data.office'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'children[address].data.office.street'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'children[address].data.office.street.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'children[address].data.office[street]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'children[address].data.office[street].prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'children[address].data[office]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'children[address].data[office].street'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'children[address].data[office].street.prop'),
-            array(self::LEVEL_2, 'address', 'address', 'street', '[office][street]', 'children[address].data[office][street]'),
-            array(self::LEVEL_2, 'address', 'address', 'street', '[office][street]', 'children[address].data[office][street].prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'data.address.office.street'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'data.address.office.street.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'data.address.office[street]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'data.address.office[street].prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'data.address[office].street'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'data.address[office].street.prop'),
-            array(self::LEVEL_2, 'address', 'address', 'street', '[office][street]', 'data.address[office][street]'),
-            array(self::LEVEL_2, 'address', 'address', 'street', '[office][street]', 'data.address[office][street].prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[office][street]', 'data[address].office.street'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[office][street]', 'data[address].office.street.prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[office][street]', 'data[address].office[street]'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[office][street]', 'data[address].office[street].prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[office][street]', 'data[address][office].street'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[office][street]', 'data[address][office].street.prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[office][street]', 'data[address][office][street]'),
-            array(self::LEVEL_0, 'address', 'address', 'street', '[office][street]', 'data[address][office][street].prop'),
-
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[office][street]', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[office][street]', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'children[address].data'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'children[address].data.office'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'children[address].data.office.street'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'children[address].data.office.street.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'children[address].data.office[street]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'children[address].data.office[street].prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'children[address].data[office]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'children[address].data[office].street'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'children[address].data[office].street.prop'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[office][street]', 'children[address].data[office][street]'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[office][street]', 'children[address].data[office][street].prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[office][street]', 'data.address.office.street'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[office][street]', 'data.address.office.street.prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[office][street]', 'data.address.office[street]'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[office][street]', 'data.address.office[street].prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[office][street]', 'data.address[office].street'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[office][street]', 'data.address[office].street.prop'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[office][street]', 'data.address[office][street]'),
-            array(self::LEVEL_0, 'address', '[address]', 'street', '[office][street]', 'data.address[office][street].prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'data[address].office.street'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'data[address].office.street.prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'data[address].office[street]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'data[address].office[street].prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'data[address][office].street'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'data[address][office].street.prop'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[office][street]', 'data[address][office][street]'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[office][street]', 'data[address][office][street].prop'),
+            [self::LEVEL_0, 'address', 'address', 'street', 'street', ''],
+            [self::LEVEL_0, 'address', 'address', 'street', 'street', 'data'],
+
+            [self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'street', 'children[address].data'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address].data.street'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address].data.street.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'street', 'children[address].data[street]'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'street', 'children[address].data[street].prop'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'street', 'data.address.street'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'street', 'data.address.street.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'street', 'data.address[street]'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'street', 'data.address[street].prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[address].street'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[address].street.prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[address][street]'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[address][street].prop'],
+
+            [self::LEVEL_2, 'address', 'address', 'street', '[street]', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', 'address', 'street', '[street]', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[street]', 'children[address].data'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[street]', 'children[address].data.street'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[street]', 'children[address].data.street.prop'],
+            [self::LEVEL_2, 'address', 'address', 'street', '[street]', 'children[address].data[street]'],
+            [self::LEVEL_2, 'address', 'address', 'street', '[street]', 'children[address].data[street].prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[street]', 'data.address.street'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[street]', 'data.address.street.prop'],
+            [self::LEVEL_2, 'address', 'address', 'street', '[street]', 'data.address[street]'],
+            [self::LEVEL_2, 'address', 'address', 'street', '[street]', 'data.address[street].prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[street]', 'data[address].street'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[street]', 'data[address].street.prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[street]', 'data[address][street]'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[street]', 'data[address][street].prop'],
+
+            [self::LEVEL_2, 'address', '[address]', 'street', 'street', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', '[address]', 'street', 'street', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'street', 'children[address].data'],
+            [self::LEVEL_2, 'address', '[address]', 'street', 'street', 'children[address].data.street'],
+            [self::LEVEL_2, 'address', '[address]', 'street', 'street', 'children[address].data.street.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'street', 'children[address].data[street]'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'street', 'children[address].data[street].prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'street', 'data.address.street'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'street', 'data.address.street.prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'street', 'data.address[street]'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'street', 'data.address[street].prop'],
+            [self::LEVEL_2, 'address', '[address]', 'street', 'street', 'data[address].street'],
+            [self::LEVEL_2, 'address', '[address]', 'street', 'street', 'data[address].street.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'street', 'data[address][street]'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'street', 'data[address][street].prop'],
+
+            [self::LEVEL_2, 'address', '[address]', 'street', '[street]', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', '[address]', 'street', '[street]', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[street]', 'children[address].data'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[street]', 'children[address].data.street'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[street]', 'children[address].data.street.prop'],
+            [self::LEVEL_2, 'address', '[address]', 'street', '[street]', 'children[address].data[street]'],
+            [self::LEVEL_2, 'address', '[address]', 'street', '[street]', 'children[address].data[street].prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[street]', 'data.address.street'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[street]', 'data.address.street.prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[street]', 'data.address[street]'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[street]', 'data.address[street].prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[street]', 'data[address].street'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[street]', 'data[address].street.prop'],
+            [self::LEVEL_2, 'address', '[address]', 'street', '[street]', 'data[address][street]'],
+            [self::LEVEL_2, 'address', '[address]', 'street', '[street]', 'data[address][street].prop'],
+
+            [self::LEVEL_2, 'address', 'person.address', 'street', 'street', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', 'person.address', 'street', 'street', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', 'person.address', 'street', 'street', 'children[address].data'],
+            [self::LEVEL_2, 'address', 'person.address', 'street', 'street', 'children[address].data.street'],
+            [self::LEVEL_2, 'address', 'person.address', 'street', 'street', 'children[address].data.street.prop'],
+            [self::LEVEL_1, 'address', 'person.address', 'street', 'street', 'children[address].data[street]'],
+            [self::LEVEL_1, 'address', 'person.address', 'street', 'street', 'children[address].data[street].prop'],
+            [self::LEVEL_2, 'address', 'person.address', 'street', 'street', 'data.person.address.street'],
+            [self::LEVEL_2, 'address', 'person.address', 'street', 'street', 'data.person.address.street.prop'],
+            [self::LEVEL_1, 'address', 'person.address', 'street', 'street', 'data.person.address[street]'],
+            [self::LEVEL_1, 'address', 'person.address', 'street', 'street', 'data.person.address[street].prop'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data.person[address].street'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data.person[address].street.prop'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data.person[address][street]'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data.person[address][street].prop'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data[person].address.street'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data[person].address.street.prop'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data[person].address[street]'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data[person].address[street].prop'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data[person][address].street'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data[person][address].street.prop'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data[person][address][street]'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data[person][address][street].prop'],
+
+            [self::LEVEL_2, 'address', 'person.address', 'street', '[street]', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', 'person.address', 'street', '[street]', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', 'person.address', 'street', '[street]', 'children[address].data'],
+            [self::LEVEL_1, 'address', 'person.address', 'street', '[street]', 'children[address].data.street'],
+            [self::LEVEL_1, 'address', 'person.address', 'street', '[street]', 'children[address].data.street.prop'],
+            [self::LEVEL_2, 'address', 'person.address', 'street', '[street]', 'children[address].data[street]'],
+            [self::LEVEL_2, 'address', 'person.address', 'street', '[street]', 'children[address].data[street].prop'],
+            [self::LEVEL_1, 'address', 'person.address', 'street', '[street]', 'data.person.address.street'],
+            [self::LEVEL_1, 'address', 'person.address', 'street', '[street]', 'data.person.address.street.prop'],
+            [self::LEVEL_2, 'address', 'person.address', 'street', '[street]', 'data.person.address[street]'],
+            [self::LEVEL_2, 'address', 'person.address', 'street', '[street]', 'data.person.address[street].prop'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data.person[address].street'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data.person[address].street.prop'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data.person[address][street]'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data.person[address][street].prop'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data[person].address.street'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data[person].address.street.prop'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data[person].address[street]'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data[person].address[street].prop'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data[person][address].street'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data[person][address].street.prop'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data[person][address][street]'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', '[street]', 'data[person][address][street].prop'],
+
+            [self::LEVEL_2, 'address', 'person[address]', 'street', 'street', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', 'person[address]', 'street', 'street', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', 'person[address]', 'street', 'street', 'children[address].data'],
+            [self::LEVEL_2, 'address', 'person[address]', 'street', 'street', 'children[address].data.street'],
+            [self::LEVEL_2, 'address', 'person[address]', 'street', 'street', 'children[address].data.street.prop'],
+            [self::LEVEL_1, 'address', 'person[address]', 'street', 'street', 'children[address].data[street]'],
+            [self::LEVEL_1, 'address', 'person[address]', 'street', 'street', 'children[address].data[street].prop'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data.person.address.street'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data.person.address.street.prop'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data.person.address[street]'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data.person.address[street].prop'],
+            [self::LEVEL_2, 'address', 'person[address]', 'street', 'street', 'data.person[address].street'],
+            [self::LEVEL_2, 'address', 'person[address]', 'street', 'street', 'data.person[address].street.prop'],
+            [self::LEVEL_1, 'address', 'person[address]', 'street', 'street', 'data.person[address][street]'],
+            [self::LEVEL_1, 'address', 'person[address]', 'street', 'street', 'data.person[address][street].prop'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data[person].address.street'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data[person].address.street.prop'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data[person].address[street]'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data[person].address[street].prop'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data[person][address].street'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data[person][address].street.prop'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data[person][address][street]'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', 'street', 'data[person][address][street].prop'],
+
+            [self::LEVEL_2, 'address', 'person[address]', 'street', '[street]', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', 'person[address]', 'street', '[street]', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', 'person[address]', 'street', '[street]', 'children[address].data'],
+            [self::LEVEL_1, 'address', 'person[address]', 'street', '[street]', 'children[address].data.street'],
+            [self::LEVEL_1, 'address', 'person[address]', 'street', '[street]', 'children[address].data.street.prop'],
+            [self::LEVEL_2, 'address', 'person[address]', 'street', '[street]', 'children[address].data[street]'],
+            [self::LEVEL_2, 'address', 'person[address]', 'street', '[street]', 'children[address].data[street].prop'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data.person.address.street'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data.person.address.street.prop'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data.person.address[street]'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data.person.address[street].prop'],
+            [self::LEVEL_1, 'address', 'person[address]', 'street', '[street]', 'data.person[address].street'],
+            [self::LEVEL_1, 'address', 'person[address]', 'street', '[street]', 'data.person[address].street.prop'],
+            [self::LEVEL_2, 'address', 'person[address]', 'street', '[street]', 'data.person[address][street]'],
+            [self::LEVEL_2, 'address', 'person[address]', 'street', '[street]', 'data.person[address][street].prop'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data[person].address.street'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data[person].address.street.prop'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data[person].address[street]'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data[person].address[street].prop'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data[person][address].street'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data[person][address].street.prop'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data[person][address][street]'],
+            [self::LEVEL_0, 'address', 'person[address]', 'street', '[street]', 'data[person][address][street].prop'],
+
+            [self::LEVEL_2, 'address', '[person].address', 'street', 'street', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', '[person].address', 'street', 'street', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', '[person].address', 'street', 'street', 'children[address].data'],
+            [self::LEVEL_2, 'address', '[person].address', 'street', 'street', 'children[address].data.street'],
+            [self::LEVEL_2, 'address', '[person].address', 'street', 'street', 'children[address].data.street.prop'],
+            [self::LEVEL_1, 'address', '[person].address', 'street', 'street', 'children[address].data[street]'],
+            [self::LEVEL_1, 'address', '[person].address', 'street', 'street', 'children[address].data[street].prop'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data.person.address.street'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data.person.address.street.prop'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data.person.address[street]'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data.person.address[street].prop'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data.person[address].street'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data.person[address].street.prop'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data.person[address][street]'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data.person[address][street].prop'],
+            [self::LEVEL_2, 'address', '[person].address', 'street', 'street', 'data[person].address.street'],
+            [self::LEVEL_2, 'address', '[person].address', 'street', 'street', 'data[person].address.street.prop'],
+            [self::LEVEL_1, 'address', '[person].address', 'street', 'street', 'data[person].address[street]'],
+            [self::LEVEL_1, 'address', '[person].address', 'street', 'street', 'data[person].address[street].prop'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data[person][address].street'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data[person][address].street.prop'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data[person][address][street]'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', 'street', 'data[person][address][street].prop'],
+
+            [self::LEVEL_2, 'address', '[person].address', 'street', '[street]', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', '[person].address', 'street', '[street]', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', '[person].address', 'street', '[street]', 'children[address].data'],
+            [self::LEVEL_1, 'address', '[person].address', 'street', '[street]', 'children[address].data.street'],
+            [self::LEVEL_1, 'address', '[person].address', 'street', '[street]', 'children[address].data.street.prop'],
+            [self::LEVEL_2, 'address', '[person].address', 'street', '[street]', 'children[address].data[street]'],
+            [self::LEVEL_2, 'address', '[person].address', 'street', '[street]', 'children[address].data[street].prop'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data.person.address.street'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data.person.address.street.prop'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data.person.address[street]'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data.person.address[street].prop'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data.person[address].street'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data.person[address].street.prop'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data.person[address][street]'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data.person[address][street].prop'],
+            [self::LEVEL_1, 'address', '[person].address', 'street', '[street]', 'data[person].address.street'],
+            [self::LEVEL_1, 'address', '[person].address', 'street', '[street]', 'data[person].address.street.prop'],
+            [self::LEVEL_2, 'address', '[person].address', 'street', '[street]', 'data[person].address[street]'],
+            [self::LEVEL_2, 'address', '[person].address', 'street', '[street]', 'data[person].address[street].prop'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data[person][address].street'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data[person][address].street.prop'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data[person][address][street]'],
+            [self::LEVEL_0, 'address', '[person].address', 'street', '[street]', 'data[person][address][street].prop'],
+
+            [self::LEVEL_2, 'address', '[person][address]', 'street', 'street', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', '[person][address]', 'street', 'street', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', '[person][address]', 'street', 'street', 'children[address]'],
+            [self::LEVEL_1, 'address', '[person][address]', 'street', 'street', 'children[address].data'],
+            [self::LEVEL_2, 'address', '[person][address]', 'street', 'street', 'children[address].data.street'],
+            [self::LEVEL_2, 'address', '[person][address]', 'street', 'street', 'children[address].data.street.prop'],
+            [self::LEVEL_1, 'address', '[person][address]', 'street', 'street', 'children[address].data[street]'],
+            [self::LEVEL_1, 'address', '[person][address]', 'street', 'street', 'children[address].data[street].prop'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data.person.address.street'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data.person.address.street.prop'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data.person.address[street]'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data.person.address[street].prop'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data.person[address].street'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data.person[address].street.prop'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data.person[address][street]'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data.person[address][street].prop'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data[person].address.street'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data[person].address.street.prop'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data[person].address[street]'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', 'street', 'data[person].address[street].prop'],
+            [self::LEVEL_2, 'address', '[person][address]', 'street', 'street', 'data[person][address].street'],
+            [self::LEVEL_2, 'address', '[person][address]', 'street', 'street', 'data[person][address].street.prop'],
+            [self::LEVEL_1, 'address', '[person][address]', 'street', 'street', 'data[person][address][street]'],
+            [self::LEVEL_1, 'address', '[person][address]', 'street', 'street', 'data[person][address][street].prop'],
+
+            [self::LEVEL_2, 'address', '[person][address]', 'street', '[street]', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', '[person][address]', 'street', '[street]', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', '[person][address]', 'street', '[street]', 'children[address].data'],
+            [self::LEVEL_1, 'address', '[person][address]', 'street', '[street]', 'children[address].data.street'],
+            [self::LEVEL_1, 'address', '[person][address]', 'street', '[street]', 'children[address].data.street.prop'],
+            [self::LEVEL_2, 'address', '[person][address]', 'street', '[street]', 'children[address].data[street]'],
+            [self::LEVEL_2, 'address', '[person][address]', 'street', '[street]', 'children[address].data[street].prop'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data.person.address.street'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data.person.address.street.prop'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data.person.address[street]'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data.person.address[street].prop'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data.person[address].street'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data.person[address].street.prop'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data.person[address][street]'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data.person[address][street].prop'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data[person].address.street'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data[person].address.street.prop'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data[person].address[street]'],
+            [self::LEVEL_0, 'address', '[person][address]', 'street', '[street]', 'data[person].address[street].prop'],
+            [self::LEVEL_1, 'address', '[person][address]', 'street', '[street]', 'data[person][address].street'],
+            [self::LEVEL_1, 'address', '[person][address]', 'street', '[street]', 'data[person][address].street.prop'],
+            [self::LEVEL_2, 'address', '[person][address]', 'street', '[street]', 'data[person][address][street]'],
+            [self::LEVEL_2, 'address', '[person][address]', 'street', '[street]', 'data[person][address][street].prop'],
+
+            [self::LEVEL_2, 'address', 'address', 'street', 'office.street', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'office.street', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data.office'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'office.street', 'children[address].data.office.street'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'office.street', 'children[address].data.office.street.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data.office[street]'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data.office[street].prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data[office]'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data[office].street'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data[office].street.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data[office][street]'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data[office][street].prop'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'office.street', 'data.address.office.street'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'office.street', 'data.address.office.street.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'data.address.office[street]'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'data.address.office[street].prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'data.address[office].street'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'data.address[office].street.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'data.address[office][street]'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'data.address[office][street].prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'office.street', 'data[address].office.street'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'office.street', 'data[address].office.street.prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'office.street', 'data[address].office[street]'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'office.street', 'data[address].office[street].prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'office.street', 'data[address][office].street'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'office.street', 'data[address][office].street.prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'office.street', 'data[address][office][street]'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'office.street', 'data[address][office][street].prop'],
+
+            [self::LEVEL_2, 'address', '[address]', 'street', 'office.street', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', '[address]', 'street', 'office.street', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'children[address].data'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'children[address].data.office'],
+            [self::LEVEL_2, 'address', '[address]', 'street', 'office.street', 'children[address].data.office.street'],
+            [self::LEVEL_2, 'address', '[address]', 'street', 'office.street', 'children[address].data.office.street.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'children[address].data.office[street]'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'children[address].data.office[street].prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'children[address].data[office]'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'children[address].data[office].street'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'children[address].data[office].street.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'children[address].data[office][street]'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'children[address].data[office][street].prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'office.street', 'data.address.office.street'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'office.street', 'data.address.office.street.prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'office.street', 'data.address.office[street]'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'office.street', 'data.address.office[street].prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'office.street', 'data.address[office].street'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'office.street', 'data.address[office].street.prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'office.street', 'data.address[office][street]'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'office.street', 'data.address[office][street].prop'],
+            [self::LEVEL_2, 'address', '[address]', 'street', 'office.street', 'data[address].office.street'],
+            [self::LEVEL_2, 'address', '[address]', 'street', 'office.street', 'data[address].office.street.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'data[address].office[street]'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'data[address].office[street].prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'data[address][office].street'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'data[address][office].street.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'data[address][office][street]'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office.street', 'data[address][office][street].prop'],
+
+            [self::LEVEL_2, 'address', 'address', 'street', 'office[street]', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'office[street]', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'children[address].data'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'children[address].data.office'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'children[address].data.office.street'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'children[address].data.office.street.prop'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'office[street]', 'children[address].data.office[street]'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'office[street]', 'children[address].data.office[street].prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'children[address].data[office]'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'children[address].data[office].street'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'children[address].data[office].street.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'children[address].data[office][street]'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'children[address].data[office][street].prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'data.address.office.street'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'data.address.office.street.prop'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'office[street]', 'data.address.office[street]'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'office[street]', 'data.address.office[street].prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'data.address[office].street'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'data.address[office].street.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'data.address[office][street]'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office[street]', 'data.address[office][street].prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'office[street]', 'data[address].office.street'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'office[street]', 'data[address].office.street.prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'office[street]', 'data[address].office[street]'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'office[street]', 'data[address].office[street].prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'office[street]', 'data[address][office].street'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'office[street]', 'data[address][office].street.prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'office[street]', 'data[address][office][street]'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'office[street]', 'data[address][office][street].prop'],
+
+            [self::LEVEL_2, 'address', '[address]', 'street', 'office[street]', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', '[address]', 'street', 'office[street]', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'children[address].data.office.street'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'children[address].data.office.street.prop'],
+            [self::LEVEL_2, 'address', '[address]', 'street', 'office[street]', 'children[address].data.office[street]'],
+            [self::LEVEL_2, 'address', '[address]', 'street', 'office[street]', 'children[address].data.office[street].prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'children[address].data[office]'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'children[address].data[office].street'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'children[address].data[office].street.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'children[address].data[office][street]'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'children[address].data[office][street].prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'office[street]', 'data.address.office.street'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'office[street]', 'data.address.office.street.prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'office[street]', 'data.address.office[street]'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'office[street]', 'data.address.office[street].prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'office[street]', 'data.address[office].street'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'office[street]', 'data.address[office].street.prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'office[street]', 'data.address[office][street]'],
+            [self::LEVEL_0, 'address', '[address]', 'street', 'office[street]', 'data.address[office][street].prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'data[address].office.street'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'data[address].office.street.prop'],
+            [self::LEVEL_2, 'address', '[address]', 'street', 'office[street]', 'data[address].office[street]'],
+            [self::LEVEL_2, 'address', '[address]', 'street', 'office[street]', 'data[address].office[street].prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'data[address][office].street'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'data[address][office].street.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'data[address][office][street]'],
+            [self::LEVEL_1, 'address', '[address]', 'street', 'office[street]', 'data[address][office][street].prop'],
+
+            [self::LEVEL_2, 'address', 'address', 'street', '[office].street', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', 'address', 'street', '[office].street', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'children[address].data'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'children[address].data.office'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'children[address].data.office.street'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'children[address].data.office.street.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'children[address].data.office[street]'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'children[address].data.office[street].prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'children[address].data[office]'],
+            [self::LEVEL_2, 'address', 'address', 'street', '[office].street', 'children[address].data[office].street'],
+            [self::LEVEL_2, 'address', 'address', 'street', '[office].street', 'children[address].data[office].street.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'children[address].data[office][street]'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'children[address].data[office][street].prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'data.address.office.street'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'data.address.office.street.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'data.address.office[street]'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'data.address.office[street].prop'],
+            [self::LEVEL_2, 'address', 'address', 'street', '[office].street', 'data.address[office].street'],
+            [self::LEVEL_2, 'address', 'address', 'street', '[office].street', 'data.address[office].street.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'data.address[office][street]'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office].street', 'data.address[office][street].prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[office].street', 'data[address].office.street'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[office].street', 'data[address].office.street.prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[office].street', 'data[address].office[street]'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[office].street', 'data[address].office[street].prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[office].street', 'data[address][office].street'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[office].street', 'data[address][office].street.prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[office].street', 'data[address][office][street]'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[office].street', 'data[address][office][street].prop'],
+
+            [self::LEVEL_2, 'address', '[address]', 'street', '[office].street', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', '[address]', 'street', '[office].street', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'children[address].data'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'children[address].data.office'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'children[address].data.office.street'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'children[address].data.office.street.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'children[address].data.office[street]'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'children[address].data.office[street].prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'children[address].data[office]'],
+            [self::LEVEL_2, 'address', '[address]', 'street', '[office].street', 'children[address].data[office].street'],
+            [self::LEVEL_2, 'address', '[address]', 'street', '[office].street', 'children[address].data[office].street.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'children[address].data[office][street]'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'children[address].data[office][street].prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[office].street', 'data.address.office.street'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[office].street', 'data.address.office.street.prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[office].street', 'data.address.office[street]'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[office].street', 'data.address.office[street].prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[office].street', 'data.address[office].street'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[office].street', 'data.address[office].street.prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[office].street', 'data.address[office][street]'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[office].street', 'data.address[office][street].prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'data[address].office.street'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'data[address].office.street.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'data[address].office[street]'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'data[address].office[street].prop'],
+            [self::LEVEL_2, 'address', '[address]', 'street', '[office].street', 'data[address][office].street'],
+            [self::LEVEL_2, 'address', '[address]', 'street', '[office].street', 'data[address][office].street.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'data[address][office][street]'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office].street', 'data[address][office][street].prop'],
+
+            [self::LEVEL_2, 'address', 'address', 'street', '[office][street]', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', 'address', 'street', '[office][street]', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'children[address].data'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'children[address].data.office'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'children[address].data.office.street'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'children[address].data.office.street.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'children[address].data.office[street]'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'children[address].data.office[street].prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'children[address].data[office]'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'children[address].data[office].street'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'children[address].data[office].street.prop'],
+            [self::LEVEL_2, 'address', 'address', 'street', '[office][street]', 'children[address].data[office][street]'],
+            [self::LEVEL_2, 'address', 'address', 'street', '[office][street]', 'children[address].data[office][street].prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'data.address.office.street'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'data.address.office.street.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'data.address.office[street]'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'data.address.office[street].prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'data.address[office].street'],
+            [self::LEVEL_1, 'address', 'address', 'street', '[office][street]', 'data.address[office].street.prop'],
+            [self::LEVEL_2, 'address', 'address', 'street', '[office][street]', 'data.address[office][street]'],
+            [self::LEVEL_2, 'address', 'address', 'street', '[office][street]', 'data.address[office][street].prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[office][street]', 'data[address].office.street'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[office][street]', 'data[address].office.street.prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[office][street]', 'data[address].office[street]'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[office][street]', 'data[address].office[street].prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[office][street]', 'data[address][office].street'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[office][street]', 'data[address][office].street.prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[office][street]', 'data[address][office][street]'],
+            [self::LEVEL_0, 'address', 'address', 'street', '[office][street]', 'data[address][office][street].prop'],
+
+            [self::LEVEL_2, 'address', '[address]', 'street', '[office][street]', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', '[address]', 'street', '[office][street]', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'children[address].data'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'children[address].data.office'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'children[address].data.office.street'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'children[address].data.office.street.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'children[address].data.office[street]'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'children[address].data.office[street].prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'children[address].data[office]'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'children[address].data[office].street'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'children[address].data[office].street.prop'],
+            [self::LEVEL_2, 'address', '[address]', 'street', '[office][street]', 'children[address].data[office][street]'],
+            [self::LEVEL_2, 'address', '[address]', 'street', '[office][street]', 'children[address].data[office][street].prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[office][street]', 'data.address.office.street'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[office][street]', 'data.address.office.street.prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[office][street]', 'data.address.office[street]'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[office][street]', 'data.address.office[street].prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[office][street]', 'data.address[office].street'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[office][street]', 'data.address[office].street.prop'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[office][street]', 'data.address[office][street]'],
+            [self::LEVEL_0, 'address', '[address]', 'street', '[office][street]', 'data.address[office][street].prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'data[address].office.street'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'data[address].office.street.prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'data[address].office[street]'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'data[address].office[street].prop'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'data[address][office].street'],
+            [self::LEVEL_1, 'address', '[address]', 'street', '[office][street]', 'data[address][office].street.prop'],
+            [self::LEVEL_2, 'address', '[address]', 'street', '[office][street]', 'data[address][office][street]'],
+            [self::LEVEL_2, 'address', '[address]', 'street', '[office][street]', 'data[address][office][street].prop'],
 
             // Edge cases which must not occur
-            array(self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address][street]'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address][street].prop'),
-            array(self::LEVEL_2, 'address', 'address', 'street', '[street]', 'children[address][street]'),
-            array(self::LEVEL_2, 'address', 'address', 'street', '[street]', 'children[address][street].prop'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'street', 'children[address][street]'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', 'street', 'children[address][street].prop'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[street]', 'children[address][street]'),
-            array(self::LEVEL_2, 'address', '[address]', 'street', '[street]', 'children[address][street].prop'),
-
-            array(self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'children[person].children[address].children[street]'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'children[person].children[address].data.street'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'children[person].data.address.street'),
-            array(self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data.address.street'),
-
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].children[office].children[street]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].children[office].data.street'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data.street'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'data.address.street'),
-        );
+            [self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address][street]'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address][street].prop'],
+            [self::LEVEL_2, 'address', 'address', 'street', '[street]', 'children[address][street]'],
+            [self::LEVEL_2, 'address', 'address', 'street', '[street]', 'children[address][street].prop'],
+            [self::LEVEL_2, 'address', '[address]', 'street', 'street', 'children[address][street]'],
+            [self::LEVEL_2, 'address', '[address]', 'street', 'street', 'children[address][street].prop'],
+            [self::LEVEL_2, 'address', '[address]', 'street', '[street]', 'children[address][street]'],
+            [self::LEVEL_2, 'address', '[address]', 'street', '[street]', 'children[address][street].prop'],
+
+            [self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'children[person].children[address].children[street]'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'children[person].children[address].data.street'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'children[person].data.address.street'],
+            [self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'data.address.street'],
+
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].children[office].children[street]'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].children[office].data.street'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'children[address].data.street'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'office.street', 'data.address.street'],
+        ];
     }
 
     /**
@@ -797,446 +797,446 @@ public function testDefaultErrorMapping($target, $childName, $childPath, $grandC
         $parent->add($child);
         $child->add($grandChild);
 
-        $parent->submit(array());
+        $parent->submit([]);
 
         $this->mapper->mapViolation($violation, $parent);
 
         if (self::LEVEL_0 === $target) {
-            $this->assertEquals(array($this->getFormError($violation, $parent)), iterator_to_array($parent->getErrors()), $parent->getName().' should have an error, but has none');
+            $this->assertEquals([$this->getFormError($violation, $parent)], iterator_to_array($parent->getErrors()), $parent->getName().' should have an error, but has none');
             $this->assertCount(0, $child->getErrors(), $childName.' should not have an error, but has one');
             $this->assertCount(0, $grandChild->getErrors(), $grandChildName.' should not have an error, but has one');
         } elseif (self::LEVEL_1 === $target) {
             $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
-            $this->assertEquals(array($this->getFormError($violation, $child)), iterator_to_array($child->getErrors()), $childName.' should have an error, but has none');
+            $this->assertEquals([$this->getFormError($violation, $child)], iterator_to_array($child->getErrors()), $childName.' should have an error, but has none');
             $this->assertCount(0, $grandChild->getErrors(), $grandChildName.' should not have an error, but has one');
         } else {
             $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
             $this->assertCount(0, $child->getErrors(), $childName.' should not have an error, but has one');
-            $this->assertEquals(array($this->getFormError($violation, $grandChild)), iterator_to_array($grandChild->getErrors()), $grandChildName.' should have an error, but has none');
+            $this->assertEquals([$this->getFormError($violation, $grandChild)], iterator_to_array($grandChild->getErrors()), $grandChildName.' should have an error, but has none');
         }
     }
 
     public function provideCustomDataErrorTests()
     {
-        return array(
+        return [
             // mapping target, error mapping, child name, its property path, grand child name, its property path, violation path
-            array(self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.foo'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.foo.prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[foo]'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[foo].prop'),
-
-            array(self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.address'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.address.prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[address]'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[address].prop'),
-
-            array(self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo.prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo]'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo].prop'),
-
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.address'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.address.prop'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[address]'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[address].prop'),
-
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo.prop'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo]'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo].prop'),
-
-            array(self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.address'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.address.prop'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[address]'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[address].prop'),
-
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.foo'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.foo.prop'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[foo]'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[foo].prop'),
-
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.address'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.address.prop'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[address]'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[address].prop'),
-
-            array(self::LEVEL_2, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.foo.street'),
-            array(self::LEVEL_2, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.foo.street.prop'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.foo[street]'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.foo[street].prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[foo].street'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[foo].street.prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[foo][street]'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[foo][street].prop'),
-
-            array(self::LEVEL_2, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.address.street'),
-            array(self::LEVEL_2, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.address.street.prop'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.address[street]'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.address[street].prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[address].street'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[address].street.prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[address][street]'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[address][street].prop'),
-
-            array(self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data.foo.street'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data.foo.street.prop'),
-            array(self::LEVEL_2, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data.foo[street]'),
-            array(self::LEVEL_2, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data.foo[street].prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data[foo].street'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data[foo].street.prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data[foo][street]'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data[foo][street].prop'),
-
-            array(self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data.address.street'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data.address.street.prop'),
-            array(self::LEVEL_2, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data.address[street]'),
-            array(self::LEVEL_2, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data.address[street].prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data[address].street'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data[address].street.prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data[address][street]'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data[address][street].prop'),
-
-            array(self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo.street'),
-            array(self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo.street.prop'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo[street]'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo[street].prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo].street'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo].street.prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo][street]'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo][street].prop'),
-
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.address.street'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.address.street.prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.address[street]'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.address[street].prop'),
-            array(self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[address].street'),
-            array(self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[address].street.prop'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[address][street]'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[address][street].prop'),
-
-            array(self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data.foo.street'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data.foo.street.prop'),
-            array(self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data.foo[street]'),
-            array(self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data.foo[street].prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data[foo].street'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data[foo].street.prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data[foo][street]'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data[foo][street].prop'),
-
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data.address.street'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data.address.street.prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data.address[street]'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data.address[street].prop'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data[address].street'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data[address].street.prop'),
-            array(self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data[address][street]'),
-            array(self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data[address][street].prop'),
-
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo.street'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo.street.prop'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo[street]'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo[street].prop'),
-            array(self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo].street'),
-            array(self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo].street.prop'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo][street]'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo][street].prop'),
-
-            array(self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.address.street'),
-            array(self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.address.street.prop'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.address[street]'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.address[street].prop'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[address].street'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[address].street.prop'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[address][street]'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[address][street].prop'),
-
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.street'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.street.prop'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[street]'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[street].prop'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].street'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].street.prop'),
-            array(self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][street]'),
-            array(self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][street].prop'),
-
-            array(self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data.address.street'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data.address.street.prop'),
-            array(self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data.address[street]'),
-            array(self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data.address[street].prop'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data[address].street'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data[address].street.prop'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data[address][street]'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data[address][street].prop'),
-
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.foo.street'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.foo.street.prop'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.foo[street]'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.foo[street].prop'),
-            array(self::LEVEL_2, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[foo].street'),
-            array(self::LEVEL_2, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[foo].street.prop'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[foo][street]'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[foo][street].prop'),
-
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.address.street'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.address.street.prop'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.address[street]'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.address[street].prop'),
-            array(self::LEVEL_2, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[address].street'),
-            array(self::LEVEL_2, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[address].street.prop'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[address][street]'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[address][street].prop'),
-
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data.foo.street'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data.foo.street.prop'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data.foo[street]'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data.foo[street].prop'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data[foo].street'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data[foo].street.prop'),
-            array(self::LEVEL_2, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data[foo][street]'),
-            array(self::LEVEL_2, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data[foo][street].prop'),
-
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data.address.street'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data.address.street.prop'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data.address[street]'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data.address[street].prop'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data[address].street'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data[address].street.prop'),
-            array(self::LEVEL_2, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data[address][street]'),
-            array(self::LEVEL_2, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data[address][street].prop'),
-
-            array(self::LEVEL_1, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar'),
-            array(self::LEVEL_1, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.prop'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar]'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].prop'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.prop'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar]'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].prop'),
-
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.prop'),
-            array(self::LEVEL_1, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar]'),
-            array(self::LEVEL_1, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].prop'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.prop'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar]'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].prop'),
-
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.prop'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar]'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].prop'),
-            array(self::LEVEL_1, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar'),
-            array(self::LEVEL_1, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.prop'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar]'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].prop'),
-
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.prop'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar]'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].prop'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.prop'),
-            array(self::LEVEL_1, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar]'),
-            array(self::LEVEL_1, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].prop'),
-
-            array(self::LEVEL_2, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.street'),
-            array(self::LEVEL_2, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.street.prop'),
-            array(self::LEVEL_1, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar[street]'),
-            array(self::LEVEL_1, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar[street].prop'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].street'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].street.prop'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar][street]'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar][street].prop'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.street'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.street.prop'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar[street]'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar[street].prop'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].street'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].street.prop'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar][street]'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar][street].prop'),
-
-            array(self::LEVEL_1, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar.street'),
-            array(self::LEVEL_1, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar.street.prop'),
-            array(self::LEVEL_2, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar[street]'),
-            array(self::LEVEL_2, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar[street].prop'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar].street'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar].street.prop'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar][street]'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar][street].prop'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar.street'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar.street.prop'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar[street]'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar[street].prop'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar].street'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar].street.prop'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar][street]'),
-            array(self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar][street].prop'),
-
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.street'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.street.prop'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar[street]'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar[street].prop'),
-            array(self::LEVEL_2, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].street'),
-            array(self::LEVEL_2, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].street.prop'),
-            array(self::LEVEL_1, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar][street]'),
-            array(self::LEVEL_1, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar][street].prop'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.street'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.street.prop'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar[street]'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar[street].prop'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].street'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].street.prop'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar][street]'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar][street].prop'),
-
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar.street'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar.street.prop'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar[street]'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar[street].prop'),
-            array(self::LEVEL_1, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar].street'),
-            array(self::LEVEL_1, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar].street.prop'),
-            array(self::LEVEL_2, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar][street]'),
-            array(self::LEVEL_2, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar][street].prop'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar.street'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar.street.prop'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar[street]'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar[street].prop'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar].street'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar].street.prop'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar][street]'),
-            array(self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar][street].prop'),
-
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.street'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.street.prop'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar[street]'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar[street].prop'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].street'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].street.prop'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar][street]'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar][street].prop'),
-            array(self::LEVEL_2, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.street'),
-            array(self::LEVEL_2, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.street.prop'),
-            array(self::LEVEL_1, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar[street]'),
-            array(self::LEVEL_1, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar[street].prop'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].street'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].street.prop'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar][street]'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar][street].prop'),
-
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar.street'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar.street.prop'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar[street]'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar[street].prop'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar].street'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar].street.prop'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar][street]'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar][street].prop'),
-            array(self::LEVEL_1, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar.street'),
-            array(self::LEVEL_1, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar.street.prop'),
-            array(self::LEVEL_2, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar[street]'),
-            array(self::LEVEL_2, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar[street].prop'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar].street'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar].street.prop'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar][street]'),
-            array(self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar][street].prop'),
-
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.street'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.street.prop'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar[street]'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar[street].prop'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].street'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].street.prop'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar][street]'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar][street].prop'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.street'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.street.prop'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar[street]'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar[street].prop'),
-            array(self::LEVEL_2, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].street'),
-            array(self::LEVEL_2, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].street.prop'),
-            array(self::LEVEL_1, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar][street]'),
-            array(self::LEVEL_1, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar][street].prop'),
-
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar.street'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar.street.prop'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar[street]'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar[street].prop'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar].street'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar].street.prop'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar][street]'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar][street].prop'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar.street'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar.street.prop'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar[street]'),
-            array(self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar[street].prop'),
-            array(self::LEVEL_1, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar].street'),
-            array(self::LEVEL_1, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar].street.prop'),
-            array(self::LEVEL_2, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar][street]'),
-            array(self::LEVEL_2, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar][street].prop'),
-
-            array(self::LEVEL_2, 'foo', 'address.street', 'address', 'address', 'street', 'street', 'data.foo'),
-            array(self::LEVEL_2, 'foo', 'address.street', 'address', 'address', 'street', 'street', 'data.foo.prop'),
-            array(self::LEVEL_2, '[foo]', 'address.street', 'address', 'address', 'street', 'street', 'data[foo]'),
-            array(self::LEVEL_2, '[foo]', 'address.street', 'address', 'address', 'street', 'street', 'data[foo].prop'),
-
-            array(self::LEVEL_2, 'foo', 'address.street', 'address', 'address', 'street', '[street]', 'data.foo'),
-            array(self::LEVEL_2, 'foo', 'address.street', 'address', 'address', 'street', '[street]', 'data.foo.prop'),
-            array(self::LEVEL_2, '[foo]', 'address.street', 'address', 'address', 'street', '[street]', 'data[foo]'),
-            array(self::LEVEL_2, '[foo]', 'address.street', 'address', 'address', 'street', '[street]', 'data[foo].prop'),
-
-            array(self::LEVEL_2, 'foo', 'address.street', 'address', '[address]', 'street', 'street', 'data.foo'),
-            array(self::LEVEL_2, 'foo', 'address.street', 'address', '[address]', 'street', 'street', 'data.foo.prop'),
-            array(self::LEVEL_2, '[foo]', 'address.street', 'address', '[address]', 'street', 'street', 'data[foo]'),
-            array(self::LEVEL_2, '[foo]', 'address.street', 'address', '[address]', 'street', 'street', 'data[foo].prop'),
-
-            array(self::LEVEL_2, 'foo.bar', 'address.street', 'address', 'address', 'street', 'street', 'data.foo.bar'),
-            array(self::LEVEL_2, 'foo.bar', 'address.street', 'address', 'address', 'street', 'street', 'data.foo.bar.prop'),
-            array(self::LEVEL_2, 'foo[bar]', 'address.street', 'address', 'address', 'street', 'street', 'data.foo[bar]'),
-            array(self::LEVEL_2, 'foo[bar]', 'address.street', 'address', 'address', 'street', 'street', 'data.foo[bar].prop'),
-            array(self::LEVEL_2, '[foo].bar', 'address.street', 'address', 'address', 'street', 'street', 'data[foo].bar'),
-            array(self::LEVEL_2, '[foo].bar', 'address.street', 'address', 'address', 'street', 'street', 'data[foo].bar.prop'),
-            array(self::LEVEL_2, '[foo][bar]', 'address.street', 'address', 'address', 'street', 'street', 'data[foo][bar]'),
-            array(self::LEVEL_2, '[foo][bar]', 'address.street', 'address', 'address', 'street', 'street', 'data[foo][bar].prop'),
-
-            array(self::LEVEL_2, 'foo.bar', 'address.street', 'address', 'address', 'street', '[street]', 'data.foo.bar'),
-            array(self::LEVEL_2, 'foo.bar', 'address.street', 'address', 'address', 'street', '[street]', 'data.foo.bar.prop'),
-            array(self::LEVEL_2, 'foo[bar]', 'address.street', 'address', 'address', 'street', '[street]', 'data.foo[bar]'),
-            array(self::LEVEL_2, 'foo[bar]', 'address.street', 'address', 'address', 'street', '[street]', 'data.foo[bar].prop'),
-            array(self::LEVEL_2, '[foo].bar', 'address.street', 'address', 'address', 'street', '[street]', 'data[foo].bar'),
-            array(self::LEVEL_2, '[foo].bar', 'address.street', 'address', 'address', 'street', '[street]', 'data[foo].bar.prop'),
-            array(self::LEVEL_2, '[foo][bar]', 'address.street', 'address', 'address', 'street', '[street]', 'data[foo][bar]'),
-            array(self::LEVEL_2, '[foo][bar]', 'address.street', 'address', 'address', 'street', '[street]', 'data[foo][bar].prop'),
-
-            array(self::LEVEL_2, 'foo.bar', 'address.street', 'address', '[address]', 'street', 'street', 'data.foo.bar'),
-            array(self::LEVEL_2, 'foo.bar', 'address.street', 'address', '[address]', 'street', 'street', 'data.foo.bar.prop'),
-            array(self::LEVEL_2, 'foo[bar]', 'address.street', 'address', '[address]', 'street', 'street', 'data.foo[bar]'),
-            array(self::LEVEL_2, 'foo[bar]', 'address.street', 'address', '[address]', 'street', 'street', 'data.foo[bar].prop'),
-            array(self::LEVEL_2, '[foo].bar', 'address.street', 'address', '[address]', 'street', 'street', 'data[foo].bar'),
-            array(self::LEVEL_2, '[foo].bar', 'address.street', 'address', '[address]', 'street', 'street', 'data[foo].bar.prop'),
-            array(self::LEVEL_2, '[foo][bar]', 'address.street', 'address', '[address]', 'street', 'street', 'data[foo][bar]'),
-            array(self::LEVEL_2, '[foo][bar]', 'address.street', 'address', '[address]', 'street', 'street', 'data[foo][bar].prop'),
+            [self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.foo'],
+            [self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.foo.prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[foo]'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[foo].prop'],
+
+            [self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.address'],
+            [self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.address.prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[address]'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[address].prop'],
+
+            [self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo'],
+            [self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo.prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo]'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo].prop'],
+
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.address'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.address.prop'],
+            [self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[address]'],
+            [self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[address].prop'],
+
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo.prop'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo]'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo].prop'],
+
+            [self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.address'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.address.prop'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[address]'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[address].prop'],
+
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.foo'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.foo.prop'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[foo]'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[foo].prop'],
+
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.address'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.address.prop'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[address]'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[address].prop'],
+
+            [self::LEVEL_2, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.foo.street'],
+            [self::LEVEL_2, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.foo.street.prop'],
+            [self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.foo[street]'],
+            [self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.foo[street].prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[foo].street'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[foo].street.prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[foo][street]'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[foo][street].prop'],
+
+            [self::LEVEL_2, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.address.street'],
+            [self::LEVEL_2, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.address.street.prop'],
+            [self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.address[street]'],
+            [self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', 'street', 'data.address[street].prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[address].street'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[address].street.prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[address][street]'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', 'street', 'data[address][street].prop'],
+
+            [self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data.foo.street'],
+            [self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data.foo.street.prop'],
+            [self::LEVEL_2, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data.foo[street]'],
+            [self::LEVEL_2, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data.foo[street].prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data[foo].street'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data[foo].street.prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data[foo][street]'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data[foo][street].prop'],
+
+            [self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data.address.street'],
+            [self::LEVEL_1, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data.address.street.prop'],
+            [self::LEVEL_2, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data.address[street]'],
+            [self::LEVEL_2, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data.address[street].prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data[address].street'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data[address].street.prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data[address][street]'],
+            [self::LEVEL_0, 'foo', 'address', 'address', 'address', 'street', '[street]', 'data[address][street].prop'],
+
+            [self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo.street'],
+            [self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo.street.prop'],
+            [self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo[street]'],
+            [self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo[street].prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo].street'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo].street.prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo][street]'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo][street].prop'],
+
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.address.street'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.address.street.prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.address[street]'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.address[street].prop'],
+            [self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[address].street'],
+            [self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[address].street.prop'],
+            [self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[address][street]'],
+            [self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[address][street].prop'],
+
+            [self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data.foo.street'],
+            [self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data.foo.street.prop'],
+            [self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data.foo[street]'],
+            [self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data.foo[street].prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data[foo].street'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data[foo].street.prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data[foo][street]'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data[foo][street].prop'],
+
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data.address.street'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data.address.street.prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data.address[street]'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data.address[street].prop'],
+            [self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data[address].street'],
+            [self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data[address].street.prop'],
+            [self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data[address][street]'],
+            [self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', '[street]', 'data[address][street].prop'],
+
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo.street'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo.street.prop'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo[street]'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo[street].prop'],
+            [self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo].street'],
+            [self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo].street.prop'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo][street]'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo][street].prop'],
+
+            [self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.address.street'],
+            [self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.address.street.prop'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.address[street]'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.address[street].prop'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[address].street'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[address].street.prop'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[address][street]'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[address][street].prop'],
+
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.street'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.street.prop'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[street]'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[street].prop'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].street'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].street.prop'],
+            [self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][street]'],
+            [self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][street].prop'],
+
+            [self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data.address.street'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data.address.street.prop'],
+            [self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data.address[street]'],
+            [self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data.address[street].prop'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data[address].street'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data[address].street.prop'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data[address][street]'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', '[street]', 'data[address][street].prop'],
+
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.foo.street'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.foo.street.prop'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.foo[street]'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.foo[street].prop'],
+            [self::LEVEL_2, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[foo].street'],
+            [self::LEVEL_2, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[foo].street.prop'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[foo][street]'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[foo][street].prop'],
+
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.address.street'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.address.street.prop'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.address[street]'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data.address[street].prop'],
+            [self::LEVEL_2, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[address].street'],
+            [self::LEVEL_2, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[address].street.prop'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[address][street]'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', 'street', 'data[address][street].prop'],
+
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data.foo.street'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data.foo.street.prop'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data.foo[street]'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data.foo[street].prop'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data[foo].street'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data[foo].street.prop'],
+            [self::LEVEL_2, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data[foo][street]'],
+            [self::LEVEL_2, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data[foo][street].prop'],
+
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data.address.street'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data.address.street.prop'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data.address[street]'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data.address[street].prop'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data[address].street'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data[address].street.prop'],
+            [self::LEVEL_2, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data[address][street]'],
+            [self::LEVEL_2, '[foo]', 'address', 'address', '[address]', 'street', '[street]', 'data[address][street].prop'],
+
+            [self::LEVEL_1, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar'],
+            [self::LEVEL_1, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.prop'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar]'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].prop'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.prop'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar]'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].prop'],
+
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.prop'],
+            [self::LEVEL_1, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar]'],
+            [self::LEVEL_1, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].prop'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.prop'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar]'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].prop'],
+
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.prop'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar]'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].prop'],
+            [self::LEVEL_1, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar'],
+            [self::LEVEL_1, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.prop'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar]'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].prop'],
+
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.prop'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar]'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].prop'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.prop'],
+            [self::LEVEL_1, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar]'],
+            [self::LEVEL_1, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].prop'],
+
+            [self::LEVEL_2, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.street'],
+            [self::LEVEL_2, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.street.prop'],
+            [self::LEVEL_1, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar[street]'],
+            [self::LEVEL_1, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar[street].prop'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].street'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].street.prop'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar][street]'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar][street].prop'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.street'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.street.prop'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar[street]'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar[street].prop'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].street'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].street.prop'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar][street]'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar][street].prop'],
+
+            [self::LEVEL_1, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar.street'],
+            [self::LEVEL_1, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar.street.prop'],
+            [self::LEVEL_2, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar[street]'],
+            [self::LEVEL_2, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar[street].prop'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar].street'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar].street.prop'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar][street]'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar][street].prop'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar.street'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar.street.prop'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar[street]'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar[street].prop'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar].street'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar].street.prop'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar][street]'],
+            [self::LEVEL_0, 'foo.bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar][street].prop'],
+
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.street'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.street.prop'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar[street]'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar[street].prop'],
+            [self::LEVEL_2, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].street'],
+            [self::LEVEL_2, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].street.prop'],
+            [self::LEVEL_1, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar][street]'],
+            [self::LEVEL_1, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar][street].prop'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.street'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.street.prop'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar[street]'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar[street].prop'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].street'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].street.prop'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar][street]'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar][street].prop'],
+
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar.street'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar.street.prop'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar[street]'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar[street].prop'],
+            [self::LEVEL_1, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar].street'],
+            [self::LEVEL_1, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar].street.prop'],
+            [self::LEVEL_2, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar][street]'],
+            [self::LEVEL_2, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar][street].prop'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar.street'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar.street.prop'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar[street]'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar[street].prop'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar].street'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar].street.prop'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar][street]'],
+            [self::LEVEL_0, 'foo[bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar][street].prop'],
+
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.street'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.street.prop'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar[street]'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar[street].prop'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].street'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].street.prop'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar][street]'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar][street].prop'],
+            [self::LEVEL_2, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.street'],
+            [self::LEVEL_2, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.street.prop'],
+            [self::LEVEL_1, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar[street]'],
+            [self::LEVEL_1, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar[street].prop'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].street'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].street.prop'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar][street]'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar][street].prop'],
+
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar.street'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar.street.prop'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar[street]'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar[street].prop'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar].street'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar].street.prop'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar][street]'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar][street].prop'],
+            [self::LEVEL_1, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar.street'],
+            [self::LEVEL_1, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar.street.prop'],
+            [self::LEVEL_2, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar[street]'],
+            [self::LEVEL_2, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar[street].prop'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar].street'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar].street.prop'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar][street]'],
+            [self::LEVEL_0, '[foo].bar', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar][street].prop'],
+
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.street'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar.street.prop'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar[street]'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo.bar[street].prop'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].street'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar].street.prop'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar][street]'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data.foo[bar][street].prop'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.street'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar.street.prop'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar[street]'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo].bar[street].prop'],
+            [self::LEVEL_2, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].street'],
+            [self::LEVEL_2, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar].street.prop'],
+            [self::LEVEL_1, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar][street]'],
+            [self::LEVEL_1, '[foo][bar]', 'address', 'address', 'address', 'street', 'street', 'data[foo][bar][street].prop'],
+
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar.street'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar.street.prop'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar[street]'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo.bar[street].prop'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar].street'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar].street.prop'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar][street]'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data.foo[bar][street].prop'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar.street'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar.street.prop'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar[street]'],
+            [self::LEVEL_0, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo].bar[street].prop'],
+            [self::LEVEL_1, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar].street'],
+            [self::LEVEL_1, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar].street.prop'],
+            [self::LEVEL_2, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar][street]'],
+            [self::LEVEL_2, '[foo][bar]', 'address', 'address', 'address', 'street', '[street]', 'data[foo][bar][street].prop'],
+
+            [self::LEVEL_2, 'foo', 'address.street', 'address', 'address', 'street', 'street', 'data.foo'],
+            [self::LEVEL_2, 'foo', 'address.street', 'address', 'address', 'street', 'street', 'data.foo.prop'],
+            [self::LEVEL_2, '[foo]', 'address.street', 'address', 'address', 'street', 'street', 'data[foo]'],
+            [self::LEVEL_2, '[foo]', 'address.street', 'address', 'address', 'street', 'street', 'data[foo].prop'],
+
+            [self::LEVEL_2, 'foo', 'address.street', 'address', 'address', 'street', '[street]', 'data.foo'],
+            [self::LEVEL_2, 'foo', 'address.street', 'address', 'address', 'street', '[street]', 'data.foo.prop'],
+            [self::LEVEL_2, '[foo]', 'address.street', 'address', 'address', 'street', '[street]', 'data[foo]'],
+            [self::LEVEL_2, '[foo]', 'address.street', 'address', 'address', 'street', '[street]', 'data[foo].prop'],
+
+            [self::LEVEL_2, 'foo', 'address.street', 'address', '[address]', 'street', 'street', 'data.foo'],
+            [self::LEVEL_2, 'foo', 'address.street', 'address', '[address]', 'street', 'street', 'data.foo.prop'],
+            [self::LEVEL_2, '[foo]', 'address.street', 'address', '[address]', 'street', 'street', 'data[foo]'],
+            [self::LEVEL_2, '[foo]', 'address.street', 'address', '[address]', 'street', 'street', 'data[foo].prop'],
+
+            [self::LEVEL_2, 'foo.bar', 'address.street', 'address', 'address', 'street', 'street', 'data.foo.bar'],
+            [self::LEVEL_2, 'foo.bar', 'address.street', 'address', 'address', 'street', 'street', 'data.foo.bar.prop'],
+            [self::LEVEL_2, 'foo[bar]', 'address.street', 'address', 'address', 'street', 'street', 'data.foo[bar]'],
+            [self::LEVEL_2, 'foo[bar]', 'address.street', 'address', 'address', 'street', 'street', 'data.foo[bar].prop'],
+            [self::LEVEL_2, '[foo].bar', 'address.street', 'address', 'address', 'street', 'street', 'data[foo].bar'],
+            [self::LEVEL_2, '[foo].bar', 'address.street', 'address', 'address', 'street', 'street', 'data[foo].bar.prop'],
+            [self::LEVEL_2, '[foo][bar]', 'address.street', 'address', 'address', 'street', 'street', 'data[foo][bar]'],
+            [self::LEVEL_2, '[foo][bar]', 'address.street', 'address', 'address', 'street', 'street', 'data[foo][bar].prop'],
+
+            [self::LEVEL_2, 'foo.bar', 'address.street', 'address', 'address', 'street', '[street]', 'data.foo.bar'],
+            [self::LEVEL_2, 'foo.bar', 'address.street', 'address', 'address', 'street', '[street]', 'data.foo.bar.prop'],
+            [self::LEVEL_2, 'foo[bar]', 'address.street', 'address', 'address', 'street', '[street]', 'data.foo[bar]'],
+            [self::LEVEL_2, 'foo[bar]', 'address.street', 'address', 'address', 'street', '[street]', 'data.foo[bar].prop'],
+            [self::LEVEL_2, '[foo].bar', 'address.street', 'address', 'address', 'street', '[street]', 'data[foo].bar'],
+            [self::LEVEL_2, '[foo].bar', 'address.street', 'address', 'address', 'street', '[street]', 'data[foo].bar.prop'],
+            [self::LEVEL_2, '[foo][bar]', 'address.street', 'address', 'address', 'street', '[street]', 'data[foo][bar]'],
+            [self::LEVEL_2, '[foo][bar]', 'address.street', 'address', 'address', 'street', '[street]', 'data[foo][bar].prop'],
+
+            [self::LEVEL_2, 'foo.bar', 'address.street', 'address', '[address]', 'street', 'street', 'data.foo.bar'],
+            [self::LEVEL_2, 'foo.bar', 'address.street', 'address', '[address]', 'street', 'street', 'data.foo.bar.prop'],
+            [self::LEVEL_2, 'foo[bar]', 'address.street', 'address', '[address]', 'street', 'street', 'data.foo[bar]'],
+            [self::LEVEL_2, 'foo[bar]', 'address.street', 'address', '[address]', 'street', 'street', 'data.foo[bar].prop'],
+            [self::LEVEL_2, '[foo].bar', 'address.street', 'address', '[address]', 'street', 'street', 'data[foo].bar'],
+            [self::LEVEL_2, '[foo].bar', 'address.street', 'address', '[address]', 'street', 'street', 'data[foo].bar.prop'],
+            [self::LEVEL_2, '[foo][bar]', 'address.street', 'address', '[address]', 'street', 'street', 'data[foo][bar]'],
+            [self::LEVEL_2, '[foo][bar]', 'address.street', 'address', '[address]', 'street', 'street', 'data[foo][bar].prop'],
 
             // Edge cases
-            array(self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo.street'),
-            array(self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo.street.prop'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo[street]'),
-            array(self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo[street].prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo].street'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo].street.prop'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo][street]'),
-            array(self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo][street].prop'),
-
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo.street'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo.street.prop'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo[street]'),
-            array(self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo[street].prop'),
-            array(self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo].street'),
-            array(self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo].street.prop'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo][street]'),
-            array(self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo][street].prop'),
-        );
+            [self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo.street'],
+            [self::LEVEL_2, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo.street.prop'],
+            [self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo[street]'],
+            [self::LEVEL_1, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data.foo[street].prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo].street'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo].street.prop'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo][street]'],
+            [self::LEVEL_0, 'foo', 'address', 'address', '[address]', 'street', 'street', 'data[foo][street].prop'],
+
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo.street'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo.street.prop'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo[street]'],
+            [self::LEVEL_0, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data.foo[street].prop'],
+            [self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo].street'],
+            [self::LEVEL_2, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo].street.prop'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo][street]'],
+            [self::LEVEL_1, '[foo]', 'address', 'address', 'address', 'street', 'street', 'data[foo][street].prop'],
+        ];
     }
 
     /**
@@ -1245,7 +1245,7 @@ public function provideCustomDataErrorTests()
     public function testCustomDataErrorMapping($target, $mapFrom, $mapTo, $childName, $childPath, $grandChildName, $grandChildPath, $violationPath)
     {
         $violation = $this->getConstraintViolation($violationPath);
-        $parent = $this->getForm('parent', null, null, array($mapFrom => $mapTo));
+        $parent = $this->getForm('parent', null, null, [$mapFrom => $mapTo]);
         $child = $this->getForm($childName, $childPath);
         $grandChild = $this->getForm($grandChildName, $grandChildPath);
 
@@ -1267,7 +1267,7 @@ public function testCustomDataErrorMapping($target, $mapFrom, $mapTo, $childName
             $parent->add($distraction);
         }
 
-        $parent->submit(array());
+        $parent->submit([]);
 
         $this->mapper->mapViolation($violation, $parent);
 
@@ -1276,17 +1276,17 @@ public function testCustomDataErrorMapping($target, $mapFrom, $mapTo, $childName
         }
 
         if (self::LEVEL_0 === $target) {
-            $this->assertEquals(array($this->getFormError($violation, $parent)), iterator_to_array($parent->getErrors()), $parent->getName().' should have an error, but has none');
+            $this->assertEquals([$this->getFormError($violation, $parent)], iterator_to_array($parent->getErrors()), $parent->getName().' should have an error, but has none');
             $this->assertCount(0, $child->getErrors(), $childName.' should not have an error, but has one');
             $this->assertCount(0, $grandChild->getErrors(), $grandChildName.' should not have an error, but has one');
         } elseif (self::LEVEL_1 === $target) {
             $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
-            $this->assertEquals(array($this->getFormError($violation, $child)), iterator_to_array($child->getErrors()), $childName.' should have an error, but has none');
+            $this->assertEquals([$this->getFormError($violation, $child)], iterator_to_array($child->getErrors()), $childName.' should have an error, but has none');
             $this->assertCount(0, $grandChild->getErrors(), $grandChildName.' should not have an error, but has one');
         } else {
             $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
             $this->assertCount(0, $child->getErrors(), $childName.' should not have an error, but has one');
-            $this->assertEquals(array($this->getFormError($violation, $grandChild)), iterator_to_array($grandChild->getErrors()), $grandChildName.' should have an error, but has none');
+            $this->assertEquals([$this->getFormError($violation, $grandChild)], iterator_to_array($grandChild->getErrors()), $grandChildName.' should have an error, but has none');
         }
     }
 
@@ -1298,145 +1298,145 @@ public function provideCustomFormErrorTests()
         // 1) the error actually maps to an existing child and
         // 2) the property path of that child (relative to the form providing
         //    the mapping) matches the left side of the mapping
-        return array(
+        return [
             // mapping target, map from, map to, child name, its property path, grand child name, its property path, violation path
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].children[street].data'),
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].children[street].data.prop'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].data.street'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].data.street.prop'),
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].data[street]'),
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].data[street].prop'),
-
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data.street'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data.street.prop'),
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data[street]'),
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data[street].prop'),
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].children[street].data'],
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].children[street].data.prop'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].data.street'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].data.street.prop'],
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].data[street]'],
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].data[street].prop'],
+
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].children[street].data.prop'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data.street'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data.street.prop'],
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data[street]'],
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data[street].prop'],
 
             // Property path of the erroneous field and mapping must match exactly
-            array(self::LEVEL_1B, 'foo', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].children[street].data'),
-            array(self::LEVEL_1B, 'foo', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].children[street].data.prop'),
-            array(self::LEVEL_1B, 'foo', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].data.street'),
-            array(self::LEVEL_1B, 'foo', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].data.street.prop'),
-            array(self::LEVEL_1B, 'foo', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].data[street]'),
-            array(self::LEVEL_1B, 'foo', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].data[street].prop'),
-
-            array(self::LEVEL_1B, '[foo]', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].children[street].data'),
-            array(self::LEVEL_1B, '[foo]', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].children[street].data.prop'),
-            array(self::LEVEL_1B, '[foo]', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].data.street'),
-            array(self::LEVEL_1B, '[foo]', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].data.street.prop'),
-            array(self::LEVEL_1B, '[foo]', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].data[street]'),
-            array(self::LEVEL_1B, '[foo]', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].data[street].prop'),
-
-            array(self::LEVEL_1, '[foo]', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].children[street].data'),
-            array(self::LEVEL_1, '[foo]', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].children[street].data.prop'),
-            array(self::LEVEL_2, '[foo]', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].data.street'),
-            array(self::LEVEL_2, '[foo]', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].data.street.prop'),
-            array(self::LEVEL_1, '[foo]', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].data[street]'),
-            array(self::LEVEL_1, '[foo]', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].data[street].prop'),
-
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[foo].children[street].data'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[foo].children[street].data.prop'),
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[foo].data.street'),
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[foo].data.street.prop'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[foo].data[street]'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[foo].data[street].prop'),
-
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data.street'),
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data.street.prop'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data[street]'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data[street].prop'),
-
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[foo].children[street].data'),
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[foo].children[street].data.prop'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[foo].data.street'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[foo].data.street.prop'),
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[foo].data[street]'),
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[foo].data[street].prop'),
-
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data.street'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data.street.prop'),
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data[street]'),
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data[street].prop'),
-
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[foo].children[street].data'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[foo].children[street].data.prop'),
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[foo].data.street'),
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[foo].data.street.prop'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[foo].data[street]'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[foo].data[street].prop'),
-
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data.street'),
-            array(self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data.street.prop'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data[street]'),
-            array(self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data[street].prop'),
+            [self::LEVEL_1B, 'foo', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].children[street].data'],
+            [self::LEVEL_1B, 'foo', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].children[street].data.prop'],
+            [self::LEVEL_1B, 'foo', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].data.street'],
+            [self::LEVEL_1B, 'foo', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].data.street.prop'],
+            [self::LEVEL_1B, 'foo', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].data[street]'],
+            [self::LEVEL_1B, 'foo', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].data[street].prop'],
+
+            [self::LEVEL_1B, '[foo]', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].children[street].data'],
+            [self::LEVEL_1B, '[foo]', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].children[street].data.prop'],
+            [self::LEVEL_1B, '[foo]', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].data.street'],
+            [self::LEVEL_1B, '[foo]', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].data.street.prop'],
+            [self::LEVEL_1B, '[foo]', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].data[street]'],
+            [self::LEVEL_1B, '[foo]', 'address', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo].data[street].prop'],
+
+            [self::LEVEL_1, '[foo]', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].children[street].data'],
+            [self::LEVEL_1, '[foo]', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].children[street].data.prop'],
+            [self::LEVEL_2, '[foo]', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].data.street'],
+            [self::LEVEL_2, '[foo]', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].data.street.prop'],
+            [self::LEVEL_1, '[foo]', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].data[street]'],
+            [self::LEVEL_1, '[foo]', 'address', 'foo', '[foo]', 'address', 'address', 'street', 'street', 'children[foo].data[street].prop'],
+
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[foo].children[street].data'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[foo].children[street].data.prop'],
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[foo].data.street'],
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[foo].data.street.prop'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[foo].data[street]'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[foo].data[street].prop'],
+
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data.street'],
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data.street.prop'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data[street]'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data[street].prop'],
+
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[foo].children[street].data'],
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[foo].children[street].data.prop'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[foo].data.street'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[foo].data.street.prop'],
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[foo].data[street]'],
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[foo].data[street].prop'],
+
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].children[street].data.prop'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data.street'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data.street.prop'],
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data[street]'],
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data[street].prop'],
+
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[foo].children[street].data'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[foo].children[street].data.prop'],
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[foo].data.street'],
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[foo].data.street.prop'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[foo].data[street]'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[foo].data[street].prop'],
+
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].children[street].data.prop'],
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data.street'],
+            [self::LEVEL_1, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data.street.prop'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data[street]'],
+            [self::LEVEL_2, 'foo', 'address', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data[street].prop'],
 
             // Map to a nested child
-            array(self::LEVEL_2, 'foo', 'address.street', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo]'),
-            array(self::LEVEL_2, 'foo', 'address.street', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[foo]'),
-            array(self::LEVEL_2, 'foo', 'address.street', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[foo]'),
-            array(self::LEVEL_2, 'foo', 'address.street', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[foo]'),
+            [self::LEVEL_2, 'foo', 'address.street', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[foo]'],
+            [self::LEVEL_2, 'foo', 'address.street', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[foo]'],
+            [self::LEVEL_2, 'foo', 'address.street', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[foo]'],
+            [self::LEVEL_2, 'foo', 'address.street', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[foo]'],
 
             // Map from a nested child
-            array(self::LEVEL_1B, 'address.street', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].children[street]'),
-            array(self::LEVEL_1B, 'address.street', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data.street'),
-            array(self::LEVEL_1, 'address.street', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data[street]'),
-            array(self::LEVEL_2, 'address.street', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].children[street]'),
-            array(self::LEVEL_1B, 'address.street', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data.street'),
-            array(self::LEVEL_2, 'address.street', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data[street]'),
-            array(self::LEVEL_2, 'address.street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].children[street]'),
-            array(self::LEVEL_2, 'address.street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data.street'),
-            array(self::LEVEL_1, 'address.street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data[street]'),
-            array(self::LEVEL_2, 'address.street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].children[street]'),
-            array(self::LEVEL_1, 'address.street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data.street'),
-            array(self::LEVEL_2, 'address.street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data[street]'),
-
-            array(self::LEVEL_2, 'address[street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].children[street]'),
-            array(self::LEVEL_2, 'address[street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data.street'),
-            array(self::LEVEL_1B, 'address[street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data[street]'),
-            array(self::LEVEL_1B, 'address[street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].children[street]'),
-            array(self::LEVEL_1, 'address[street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data.street'),
-            array(self::LEVEL_1B, 'address[street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data[street]'),
-            array(self::LEVEL_2, 'address[street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].children[street]'),
-            array(self::LEVEL_2, 'address[street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data.street'),
-            array(self::LEVEL_1, 'address[street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data[street]'),
-            array(self::LEVEL_2, 'address[street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].children[street]'),
-            array(self::LEVEL_1, 'address[street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data.street'),
-            array(self::LEVEL_2, 'address[street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data[street]'),
-
-            array(self::LEVEL_2, '[address].street', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].children[street]'),
-            array(self::LEVEL_2, '[address].street', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data.street'),
-            array(self::LEVEL_1, '[address].street', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data[street]'),
-            array(self::LEVEL_2, '[address].street', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].children[street]'),
-            array(self::LEVEL_1, '[address].street', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data.street'),
-            array(self::LEVEL_2, '[address].street', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data[street]'),
-            array(self::LEVEL_1B, '[address].street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].children[street]'),
-            array(self::LEVEL_1B, '[address].street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data.street'),
-            array(self::LEVEL_1, '[address].street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data[street]'),
-            array(self::LEVEL_2, '[address].street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].children[street]'),
-            array(self::LEVEL_1B, '[address].street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data.street'),
-            array(self::LEVEL_2, '[address].street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data[street]'),
-
-            array(self::LEVEL_2, '[address][street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].children[street]'),
-            array(self::LEVEL_2, '[address][street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data.street'),
-            array(self::LEVEL_1, '[address][street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data[street]'),
-            array(self::LEVEL_2, '[address][street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].children[street]'),
-            array(self::LEVEL_1, '[address][street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data.street'),
-            array(self::LEVEL_2, '[address][street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data[street]'),
-            array(self::LEVEL_2, '[address][street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].children[street]'),
-            array(self::LEVEL_2, '[address][street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data.street'),
-            array(self::LEVEL_1B, '[address][street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data[street]'),
-            array(self::LEVEL_1B, '[address][street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].children[street]'),
-            array(self::LEVEL_1, '[address][street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data.street'),
-            array(self::LEVEL_1B, '[address][street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data[street]'),
-        );
+            [self::LEVEL_1B, 'address.street', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].children[street]'],
+            [self::LEVEL_1B, 'address.street', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data.street'],
+            [self::LEVEL_1, 'address.street', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data[street]'],
+            [self::LEVEL_2, 'address.street', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].children[street]'],
+            [self::LEVEL_1B, 'address.street', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data.street'],
+            [self::LEVEL_2, 'address.street', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data[street]'],
+            [self::LEVEL_2, 'address.street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].children[street]'],
+            [self::LEVEL_2, 'address.street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data.street'],
+            [self::LEVEL_1, 'address.street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data[street]'],
+            [self::LEVEL_2, 'address.street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].children[street]'],
+            [self::LEVEL_1, 'address.street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data.street'],
+            [self::LEVEL_2, 'address.street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data[street]'],
+
+            [self::LEVEL_2, 'address[street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].children[street]'],
+            [self::LEVEL_2, 'address[street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data.street'],
+            [self::LEVEL_1B, 'address[street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data[street]'],
+            [self::LEVEL_1B, 'address[street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].children[street]'],
+            [self::LEVEL_1, 'address[street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data.street'],
+            [self::LEVEL_1B, 'address[street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data[street]'],
+            [self::LEVEL_2, 'address[street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].children[street]'],
+            [self::LEVEL_2, 'address[street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data.street'],
+            [self::LEVEL_1, 'address[street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data[street]'],
+            [self::LEVEL_2, 'address[street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].children[street]'],
+            [self::LEVEL_1, 'address[street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data.street'],
+            [self::LEVEL_2, 'address[street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data[street]'],
+
+            [self::LEVEL_2, '[address].street', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].children[street]'],
+            [self::LEVEL_2, '[address].street', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data.street'],
+            [self::LEVEL_1, '[address].street', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data[street]'],
+            [self::LEVEL_2, '[address].street', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].children[street]'],
+            [self::LEVEL_1, '[address].street', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data.street'],
+            [self::LEVEL_2, '[address].street', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data[street]'],
+            [self::LEVEL_1B, '[address].street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].children[street]'],
+            [self::LEVEL_1B, '[address].street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data.street'],
+            [self::LEVEL_1, '[address].street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data[street]'],
+            [self::LEVEL_2, '[address].street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].children[street]'],
+            [self::LEVEL_1B, '[address].street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data.street'],
+            [self::LEVEL_2, '[address].street', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data[street]'],
+
+            [self::LEVEL_2, '[address][street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].children[street]'],
+            [self::LEVEL_2, '[address][street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data.street'],
+            [self::LEVEL_1, '[address][street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', 'street', 'children[address].data[street]'],
+            [self::LEVEL_2, '[address][street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].children[street]'],
+            [self::LEVEL_1, '[address][street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data.street'],
+            [self::LEVEL_2, '[address][street]', 'foo', 'foo', 'foo', 'address', 'address', 'street', '[street]', 'children[address].data[street]'],
+            [self::LEVEL_2, '[address][street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].children[street]'],
+            [self::LEVEL_2, '[address][street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data.street'],
+            [self::LEVEL_1B, '[address][street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', 'street', 'children[address].data[street]'],
+            [self::LEVEL_1B, '[address][street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].children[street]'],
+            [self::LEVEL_1, '[address][street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data.street'],
+            [self::LEVEL_1B, '[address][street]', 'foo', 'foo', 'foo', 'address', '[address]', 'street', '[street]', 'children[address].data[street]'],
+        ];
     }
 
     /**
@@ -1445,7 +1445,7 @@ public function provideCustomFormErrorTests()
     public function testCustomFormErrorMapping($target, $mapFrom, $mapTo, $errorName, $errorPath, $childName, $childPath, $grandChildName, $grandChildPath, $violationPath)
     {
         $violation = $this->getConstraintViolation($violationPath);
-        $parent = $this->getForm('parent', null, null, array($mapFrom => $mapTo));
+        $parent = $this->getForm('parent', null, null, [$mapFrom => $mapTo]);
         $child = $this->getForm($childName, $childPath);
         $grandChild = $this->getForm($grandChildName, $grandChildPath);
         $errorChild = $this->getForm($errorName, $errorPath);
@@ -1454,22 +1454,22 @@ public function testCustomFormErrorMapping($target, $mapFrom, $mapTo, $errorName
         $parent->add($errorChild);
         $child->add($grandChild);
 
-        $parent->submit(array());
+        $parent->submit([]);
 
         $this->mapper->mapViolation($violation, $parent);
 
         if (self::LEVEL_0 === $target) {
             $this->assertCount(0, $errorChild->getErrors(), $errorName.' should not have an error, but has one');
-            $this->assertEquals(array($this->getFormError($violation, $parent)), iterator_to_array($parent->getErrors()), $parent->getName().' should have an error, but has none');
+            $this->assertEquals([$this->getFormError($violation, $parent)], iterator_to_array($parent->getErrors()), $parent->getName().' should have an error, but has none');
             $this->assertCount(0, $child->getErrors(), $childName.' should not have an error, but has one');
             $this->assertCount(0, $grandChild->getErrors(), $grandChildName.' should not have an error, but has one');
         } elseif (self::LEVEL_1 === $target) {
             $this->assertCount(0, $errorChild->getErrors(), $errorName.' should not have an error, but has one');
             $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
-            $this->assertEquals(array($this->getFormError($violation, $child)), iterator_to_array($child->getErrors()), $childName.' should have an error, but has none');
+            $this->assertEquals([$this->getFormError($violation, $child)], iterator_to_array($child->getErrors()), $childName.' should have an error, but has none');
             $this->assertCount(0, $grandChild->getErrors(), $grandChildName.' should not have an error, but has one');
         } elseif (self::LEVEL_1B === $target) {
-            $this->assertEquals(array($this->getFormError($violation, $errorChild)), iterator_to_array($errorChild->getErrors()), $errorName.' should have an error, but has none');
+            $this->assertEquals([$this->getFormError($violation, $errorChild)], iterator_to_array($errorChild->getErrors()), $errorName.' should have an error, but has none');
             $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
             $this->assertCount(0, $child->getErrors(), $childName.' should not have an error, but has one');
             $this->assertCount(0, $grandChild->getErrors(), $grandChildName.' should not have an error, but has one');
@@ -1477,33 +1477,33 @@ public function testCustomFormErrorMapping($target, $mapFrom, $mapTo, $errorName
             $this->assertCount(0, $errorChild->getErrors(), $errorName.' should not have an error, but has one');
             $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
             $this->assertCount(0, $child->getErrors(), $childName.' should not have an error, but has one');
-            $this->assertEquals(array($this->getFormError($violation, $grandChild)), iterator_to_array($grandChild->getErrors()), $grandChildName.' should have an error, but has none');
+            $this->assertEquals([$this->getFormError($violation, $grandChild)], iterator_to_array($grandChild->getErrors()), $grandChildName.' should have an error, but has none');
         }
     }
 
     public function provideErrorTestsForFormInheritingParentData()
     {
-        return array(
+        return [
             // mapping target, child name, its property path, grand child name, its property path, violation path
-            array(self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address].children[street].data'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address].children[street].data.prop'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address].data.street'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address].data.street.prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'street', 'children[address].data[street]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'street', 'children[address].data[street].prop'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'street', 'data.street'),
-            array(self::LEVEL_2, 'address', 'address', 'street', 'street', 'data.street.prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[street]'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[street].prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'street', 'data.address.street'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'street', 'data.address.street.prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'street', 'data.address[street]'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'street', 'data.address[street].prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[address].street'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[address].street.prop'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[address][street]'),
-            array(self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[address][street].prop'),
-        );
+            [self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address].children[street].data'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address].children[street].data.prop'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address].data.street'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address].data.street.prop'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'street', 'children[address].data[street]'],
+            [self::LEVEL_1, 'address', 'address', 'street', 'street', 'children[address].data[street].prop'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'street', 'data.street'],
+            [self::LEVEL_2, 'address', 'address', 'street', 'street', 'data.street.prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[street]'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[street].prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'street', 'data.address.street'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'street', 'data.address.street.prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'street', 'data.address[street]'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'street', 'data.address[street].prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[address].street'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[address].street.prop'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[address][street]'],
+            [self::LEVEL_0, 'address', 'address', 'street', 'street', 'data[address][street].prop'],
+        ];
     }
 
     /**
@@ -1513,28 +1513,28 @@ public function testErrorMappingForFormInheritingParentData($target, $childName,
     {
         $violation = $this->getConstraintViolation($violationPath);
         $parent = $this->getForm('parent');
-        $child = $this->getForm($childName, $childPath, null, array(), true);
+        $child = $this->getForm($childName, $childPath, null, [], true);
         $grandChild = $this->getForm($grandChildName, $grandChildPath);
 
         $parent->add($child);
         $child->add($grandChild);
 
-        $parent->submit(array());
+        $parent->submit([]);
 
         $this->mapper->mapViolation($violation, $parent);
 
         if (self::LEVEL_0 === $target) {
-            $this->assertEquals(array($this->getFormError($violation, $parent)), iterator_to_array($parent->getErrors()), $parent->getName().' should have an error, but has none');
+            $this->assertEquals([$this->getFormError($violation, $parent)], iterator_to_array($parent->getErrors()), $parent->getName().' should have an error, but has none');
             $this->assertCount(0, $child->getErrors(), $childName.' should not have an error, but has one');
             $this->assertCount(0, $grandChild->getErrors(), $grandChildName.' should not have an error, but has one');
         } elseif (self::LEVEL_1 === $target) {
             $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
-            $this->assertEquals(array($this->getFormError($violation, $child)), iterator_to_array($child->getErrors()), $childName.' should have an error, but has none');
+            $this->assertEquals([$this->getFormError($violation, $child)], iterator_to_array($child->getErrors()), $childName.' should have an error, but has none');
             $this->assertCount(0, $grandChild->getErrors(), $grandChildName.' should not have an error, but has one');
         } else {
             $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
             $this->assertCount(0, $child->getErrors(), $childName.' should not have an error, but has one');
-            $this->assertEquals(array($this->getFormError($violation, $grandChild)), iterator_to_array($grandChild->getErrors()), $grandChildName.' should have an error, but has none');
+            $this->assertEquals([$this->getFormError($violation, $grandChild)], iterator_to_array($grandChild->getErrors()), $grandChildName.' should have an error, but has none');
         }
     }
 
@@ -1543,8 +1543,8 @@ public function testBacktrackIfSeveralSubFormsWithSamePropertyPath()
         $parent = $this->getForm('parent');
         $child1 = $this->getForm('subform1', 'address');
         $child2 = $this->getForm('subform2', 'address');
-        $child3 = $this->getForm('subform3', null, null, array(), true);
-        $child4 = $this->getForm('subform4', null, null, array(), true);
+        $child3 = $this->getForm('subform3', null, null, [], true);
+        $child4 = $this->getForm('subform4', null, null, [], true);
         $grandChild1 = $this->getForm('street');
         $grandChild2 = $this->getForm('street', '[sub_address1_street]');
         $grandChild3 = $this->getForm('street', '[sub_address2_street]');
@@ -1557,7 +1557,7 @@ public function testBacktrackIfSeveralSubFormsWithSamePropertyPath()
         $child3->add($grandChild2);
         $child4->add($grandChild3);
 
-        $parent->submit(array());
+        $parent->submit([]);
 
         $violation1 = $this->getConstraintViolation('data.address[street]');
         $violation2 = $this->getConstraintViolation('data[sub_address1_street]');
@@ -1571,8 +1571,8 @@ public function testBacktrackIfSeveralSubFormsWithSamePropertyPath()
         $this->assertCount(0, $child2->getErrors(), $child2->getName().' should not have an error, but has one');
         $this->assertCount(0, $child3->getErrors(), $child3->getName().' should not have an error, but has one');
         $this->assertCount(0, $child4->getErrors(), $child4->getName().' should not have an error, but has one');
-        $this->assertEquals(array($this->getFormError($violation1, $grandChild1)), iterator_to_array($grandChild1->getErrors()), $grandChild1->getName().' should have an error, but has none');
-        $this->assertEquals(array($this->getFormError($violation2, $grandChild2)), iterator_to_array($grandChild2->getErrors()), $grandChild2->getName().' should have an error, but has none');
-        $this->assertEquals(array($this->getFormError($violation3, $grandChild3)), iterator_to_array($grandChild3->getErrors()), $grandChild3->getName().' should have an error, but has none');
+        $this->assertEquals([$this->getFormError($violation1, $grandChild1)], iterator_to_array($grandChild1->getErrors()), $grandChild1->getName().' should have an error, but has none');
+        $this->assertEquals([$this->getFormError($violation2, $grandChild2)], iterator_to_array($grandChild2->getErrors()), $grandChild2->getName().' should have an error, but has none');
+        $this->assertEquals([$this->getFormError($violation3, $grandChild3)], iterator_to_array($grandChild3->getErrors()), $grandChild3->getName().' should have an error, but has none');
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationPathTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationPathTest.php
index 2e1c9f673daa0..7a6602d27e930 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationPathTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationPathTest.php
@@ -21,67 +21,67 @@ class ViolationPathTest extends TestCase
 {
     public function providePaths()
     {
-        return array(
-            array('children[address]', array(
-                array('address', true, true),
-            )),
-            array('children[address].children[street]', array(
-                array('address', true, true),
-                array('street', true, true),
-            )),
-            array('children[address][street]', array(
-                array('address', true, true),
-                array('street', true, true),
-            ), 'children[address].children[street]'),
-            array('children[address].data', array(
-                array('address', true, true),
-            ), 'children[address]'),
-            array('children[address].data.street', array(
-                array('address', true, true),
-                array('street', false, false),
-            )),
-            array('children[address].data[street]', array(
-                array('address', true, true),
-                array('street', false, true),
-            )),
-            array('children[address].children[street].data.name', array(
-                array('address', true, true),
-                array('street', true, true),
-                array('name', false, false),
-            )),
-            array('children[address].children[street].data[name]', array(
-                array('address', true, true),
-                array('street', true, true),
-                array('name', false, true),
-            )),
-            array('data.address', array(
-                array('address', false, false),
-            )),
-            array('data[address]', array(
-                array('address', false, true),
-            )),
-            array('data.address.street', array(
-                array('address', false, false),
-                array('street', false, false),
-            )),
-            array('data[address].street', array(
-                array('address', false, true),
-                array('street', false, false),
-            )),
-            array('data.address[street]', array(
-                array('address', false, false),
-                array('street', false, true),
-            )),
-            array('data[address][street]', array(
-                array('address', false, true),
-                array('street', false, true),
-            )),
+        return [
+            ['children[address]', [
+                ['address', true, true],
+            ]],
+            ['children[address].children[street]', [
+                ['address', true, true],
+                ['street', true, true],
+            ]],
+            ['children[address][street]', [
+                ['address', true, true],
+                ['street', true, true],
+            ], 'children[address].children[street]'],
+            ['children[address].data', [
+                ['address', true, true],
+            ], 'children[address]'],
+            ['children[address].data.street', [
+                ['address', true, true],
+                ['street', false, false],
+            ]],
+            ['children[address].data[street]', [
+                ['address', true, true],
+                ['street', false, true],
+            ]],
+            ['children[address].children[street].data.name', [
+                ['address', true, true],
+                ['street', true, true],
+                ['name', false, false],
+            ]],
+            ['children[address].children[street].data[name]', [
+                ['address', true, true],
+                ['street', true, true],
+                ['name', false, true],
+            ]],
+            ['data.address', [
+                ['address', false, false],
+            ]],
+            ['data[address]', [
+                ['address', false, true],
+            ]],
+            ['data.address.street', [
+                ['address', false, false],
+                ['street', false, false],
+            ]],
+            ['data[address].street', [
+                ['address', false, true],
+                ['street', false, false],
+            ]],
+            ['data.address[street]', [
+                ['address', false, false],
+                ['street', false, true],
+            ]],
+            ['data[address][street]', [
+                ['address', false, true],
+                ['street', false, true],
+            ]],
             // A few invalid examples
-            array('data', array(), ''),
-            array('children', array(), ''),
-            array('children.address', array(), ''),
-            array('children.address[street]', array(), ''),
-        );
+            ['data', [], ''],
+            ['children', [], ''],
+            ['children.address', [], ''],
+            ['children.address[street]', [], ''],
+        ];
     }
 
     /**
@@ -109,17 +109,17 @@ public function testCreatePath($string, $entries, $slicedPath = null)
 
     public function provideParents()
     {
-        return array(
-            array('children[address]', null),
-            array('children[address].children[street]', 'children[address]'),
-            array('children[address].data.street', 'children[address]'),
-            array('children[address].data[street]', 'children[address]'),
-            array('data.address', null),
-            array('data.address.street', 'data.address'),
-            array('data.address[street]', 'data.address'),
-            array('data[address].street', 'data[address]'),
-            array('data[address][street]', 'data[address]'),
-        );
+        return [
+            ['children[address]', null],
+            ['children[address].children[street]', 'children[address]'],
+            ['children[address].data.street', 'children[address]'],
+            ['children[address].data[street]', 'children[address]'],
+            ['data.address', null],
+            ['data.address.street', 'data.address'],
+            ['data.address[street]', 'data.address'],
+            ['data[address].street', 'data[address]'],
+            ['data[address][street]', 'data[address]'],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/AuthorType.php b/src/Symfony/Component/Form/Tests/Fixtures/AuthorType.php
index 504f812dff3a5..84c988984f64d 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/AuthorType.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/AuthorType.php
@@ -18,8 +18,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'data_class' => 'Symfony\Component\Form\Tests\Fixtures\Author',
-        ));
+        ]);
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php
index dbd8843d8e7eb..580e21570869f 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php
@@ -24,12 +24,12 @@ class ChoiceSubType extends AbstractType
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array('expanded' => true));
+        $resolver->setDefaults(['expanded' => true]);
         $resolver->setNormalizer('choices', function () {
-            return array(
+            return [
                 'attr1' => 'Attribute 1',
                 'attr2' => 'Attribute 2',
-            );
+            ];
         });
     }
 
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceTypeExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceTypeExtension.php
index db4166ff30929..766b46928849b 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceTypeExtension.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceTypeExtension.php
@@ -29,10 +29,10 @@ public function __construct($extendedType = ChoiceType::class)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefault('choices', array(
+        $resolver->setDefault('choices', [
             'A' => 'a',
             'B' => 'b',
-        ));
+        ]);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/CustomArrayObject.php b/src/Symfony/Component/Form/Tests/Fixtures/CustomArrayObject.php
index 91b277303732d..39758e781884a 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/CustomArrayObject.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/CustomArrayObject.php
@@ -21,7 +21,7 @@ class CustomArrayObject implements \ArrayAccess, \IteratorAggregate, \Countable,
 
     public function __construct(array $array = null)
     {
-        $this->array = $array ?: array();
+        $this->array = $array ?: [];
     }
 
     public function offsetExists($offset)
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/FixedFilterListener.php b/src/Symfony/Component/Form/Tests/Fixtures/FixedFilterListener.php
index 5a85ea8d1980c..7ca0187c643a3 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/FixedFilterListener.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/FixedFilterListener.php
@@ -21,11 +21,11 @@ class FixedFilterListener implements EventSubscriberInterface
 
     public function __construct(array $mapping)
     {
-        $this->mapping = array_merge(array(
-            'preSubmit' => array(),
-            'onSubmit' => array(),
-            'preSetData' => array(),
-        ), $mapping);
+        $this->mapping = array_merge([
+            'preSubmit' => [],
+            'onSubmit' => [],
+            'preSetData' => [],
+        ], $mapping);
     }
 
     public function preSubmit(FormEvent $event)
@@ -57,10 +57,10 @@ public function preSetData(FormEvent $event)
 
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             FormEvents::PRE_SUBMIT => 'preSubmit',
             FormEvents::SUBMIT => 'onSubmit',
             FormEvents::PRE_SET_DATA => 'preSetData',
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBarExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBarExtension.php
index 8d72132f2f1f6..7eda15546cd5f 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBarExtension.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBarExtension.php
@@ -23,9 +23,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
     public function getAllowedOptionValues()
     {
-        return array(
-            'a_or_b' => array('c'),
-        );
+        return [
+            'a_or_b' => ['c'],
+        ];
     }
 
     public function getExtendedType()
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php
index 133b8829e0dfe..a67501820d856 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php
@@ -31,10 +31,10 @@ public function __construct($extendedType = ChoiceType::class)
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefault('choice_loader', new CallbackChoiceLoader(function () {
-            return array(
+            return [
                 'Lazy A' => 'lazy_a',
                 'Lazy B' => 'lazy_b',
-            );
+            ];
         }));
     }
 
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/TestExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/TestExtension.php
index bdbc5a9c1cfb9..b3d8631afc306 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/TestExtension.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/TestExtension.php
@@ -18,9 +18,9 @@
 
 class TestExtension implements FormExtensionInterface
 {
-    private $types = array();
+    private $types = [];
 
-    private $extensions = array();
+    private $extensions = [];
 
     private $guesser;
 
@@ -57,7 +57,7 @@ public function addTypeExtension(FormTypeExtensionInterface $extension)
 
     public function getTypeExtensions($name)
     {
-        return isset($this->extensions[$name]) ? $this->extensions[$name] : array();
+        return isset($this->extensions[$name]) ? $this->extensions[$name] : [];
     }
 
     public function hasTypeExtensions($name)
diff --git a/src/Symfony/Component/Form/Tests/FormBuilderTest.php b/src/Symfony/Component/Form/Tests/FormBuilderTest.php
index 2ecd19f5eaabb..ecab2bb5d91ef 100644
--- a/src/Symfony/Component/Form/Tests/FormBuilderTest.php
+++ b/src/Symfony/Component/Form/Tests/FormBuilderTest.php
@@ -68,7 +68,7 @@ public function testAddWithGuessFluent()
 
     public function testAddIsFluent()
     {
-        $builder = $this->builder->add('foo', 'Symfony\Component\Form\Extension\Core\Type\TextType', array('bar' => 'baz'));
+        $builder = $this->builder->add('foo', 'Symfony\Component\Form\Extension\Core\Type\TextType', ['bar' => 'baz']);
         $this->assertSame($builder, $this->builder);
     }
 
@@ -115,7 +115,7 @@ public function testMaintainOrderOfLazyAndExplicitChildren()
 
         $children = $this->builder->all();
 
-        $this->assertSame(array('foo', 'bar', 'baz'), array_keys($children));
+        $this->assertSame(['foo', 'bar', 'baz'], array_keys($children));
     }
 
     public function testAddFormType()
@@ -151,7 +151,7 @@ public function testCreateNoTypeNo()
     {
         $this->factory->expects($this->once())
             ->method('createNamedBuilder')
-            ->with('foo', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array())
+            ->with('foo', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [])
         ;
 
         $this->builder->create('foo');
@@ -181,7 +181,7 @@ public function testGetExplicitType()
     {
         $expectedType = 'Symfony\Component\Form\Extension\Core\Type\TextType';
         $expectedName = 'foo';
-        $expectedOptions = array('bar' => 'baz');
+        $expectedOptions = ['bar' => 'baz'];
 
         $this->factory->expects($this->once())
             ->method('createNamedBuilder')
@@ -197,7 +197,7 @@ public function testGetExplicitType()
     public function testGetGuessedType()
     {
         $expectedName = 'foo';
-        $expectedOptions = array('bar' => 'baz');
+        $expectedOptions = ['bar' => 'baz'];
 
         $this->factory->expects($this->once())
             ->method('createBuilderForProperty')
diff --git a/src/Symfony/Component/Form/Tests/FormConfigTest.php b/src/Symfony/Component/Form/Tests/FormConfigTest.php
index bb922bf3d61ff..db32fb1a1e631 100644
--- a/src/Symfony/Component/Form/Tests/FormConfigTest.php
+++ b/src/Symfony/Component/Form/Tests/FormConfigTest.php
@@ -21,48 +21,48 @@ class FormConfigTest extends TestCase
 {
     public function getHtml4Ids()
     {
-        return array(
-            array('z0'),
-            array('A0'),
-            array('A9'),
-            array('Z0'),
-            array('#', 'Symfony\Component\Form\Exception\InvalidArgumentException'),
-            array('a#', 'Symfony\Component\Form\Exception\InvalidArgumentException'),
-            array('a$', 'Symfony\Component\Form\Exception\InvalidArgumentException'),
-            array('a%', 'Symfony\Component\Form\Exception\InvalidArgumentException'),
-            array('a ', 'Symfony\Component\Form\Exception\InvalidArgumentException'),
-            array("a\t", 'Symfony\Component\Form\Exception\InvalidArgumentException'),
-            array("a\n", 'Symfony\Component\Form\Exception\InvalidArgumentException'),
-            array('a-'),
-            array('a_'),
-            array('a:'),
+        return [
+            ['z0'],
+            ['A0'],
+            ['A9'],
+            ['Z0'],
+            ['#', 'Symfony\Component\Form\Exception\InvalidArgumentException'],
+            ['a#', 'Symfony\Component\Form\Exception\InvalidArgumentException'],
+            ['a$', 'Symfony\Component\Form\Exception\InvalidArgumentException'],
+            ['a%', 'Symfony\Component\Form\Exception\InvalidArgumentException'],
+            ['a ', 'Symfony\Component\Form\Exception\InvalidArgumentException'],
+            ["a\t", 'Symfony\Component\Form\Exception\InvalidArgumentException'],
+            ["a\n", 'Symfony\Component\Form\Exception\InvalidArgumentException'],
+            ['a-'],
+            ['a_'],
+            ['a:'],
             // Periods are allowed by the HTML4 spec, but disallowed by us
             // because they break the generated property paths
-            array('a.', 'Symfony\Component\Form\Exception\InvalidArgumentException'),
+            ['a.', 'Symfony\Component\Form\Exception\InvalidArgumentException'],
             // Contrary to the HTML4 spec, we allow names starting with a
             // number, otherwise naming fields by collection indices is not
             // possible.
             // For root forms, leading digits will be stripped from the
             // "id" attribute to produce valid HTML4.
-            array('0'),
-            array('9'),
+            ['0'],
+            ['9'],
             // Contrary to the HTML4 spec, we allow names starting with an
             // underscore, since this is already a widely used practice in
             // Symfony.
             // For root forms, leading underscores will be stripped from the
             // "id" attribute to produce valid HTML4.
-            array('_'),
+            ['_'],
             // Integers are allowed
-            array(0),
-            array(123),
+            [0],
+            [123],
             // NULL is allowed
-            array(null),
+            [null],
             // Other types are not
-            array(1.23, 'Symfony\Component\Form\Exception\UnexpectedTypeException'),
-            array(5., 'Symfony\Component\Form\Exception\UnexpectedTypeException'),
-            array(true, 'Symfony\Component\Form\Exception\UnexpectedTypeException'),
-            array(new \stdClass(), 'Symfony\Component\Form\Exception\UnexpectedTypeException'),
-        );
+            [1.23, 'Symfony\Component\Form\Exception\UnexpectedTypeException'],
+            [5., 'Symfony\Component\Form\Exception\UnexpectedTypeException'],
+            [true, 'Symfony\Component\Form\Exception\UnexpectedTypeException'],
+            [new \stdClass(), 'Symfony\Component\Form\Exception\UnexpectedTypeException'],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/FormErrorIteratorTest.php b/src/Symfony/Component/Form/Tests/FormErrorIteratorTest.php
index 04eddd1c32350..4ed30414f3ad3 100644
--- a/src/Symfony/Component/Form/Tests/FormErrorIteratorTest.php
+++ b/src/Symfony/Component/Form/Tests/FormErrorIteratorTest.php
@@ -34,17 +34,17 @@ public function testFindByCodes($code, $violationsCount)
             null,
             new EventDispatcher(),
             $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock(),
-            array()
+            []
         );
 
         $form = $formBuilder->getForm();
 
-        $cause = new ConstraintViolation('Error 1!', null, array(), null, '', null, null, 'code1');
-        $form->addError(new FormError('Error 1!', null, array(), null, $cause));
-        $cause = new ConstraintViolation('Error 2!', null, array(), null, '', null, null, 'code1');
-        $form->addError(new FormError('Error 2!', null, array(), null, $cause));
-        $cause = new ConstraintViolation('Error 3!', null, array(), null, '', null, null, 'code2');
-        $form->addError(new FormError('Error 3!', null, array(), null, $cause));
+        $cause = new ConstraintViolation('Error 1!', null, [], null, '', null, null, 'code1');
+        $form->addError(new FormError('Error 1!', null, [], null, $cause));
+        $cause = new ConstraintViolation('Error 2!', null, [], null, '', null, null, 'code1');
+        $form->addError(new FormError('Error 2!', null, [], null, $cause));
+        $cause = new ConstraintViolation('Error 3!', null, [], null, '', null, null, 'code2');
+        $form->addError(new FormError('Error 3!', null, [], null, $cause));
         $formErrors = $form->getErrors();
 
         $specificFormErrors = $formErrors->findByCodes($code);
@@ -54,10 +54,10 @@ public function testFindByCodes($code, $violationsCount)
 
     public function findByCodesProvider()
     {
-        return array(
-            array('code1', 2),
-            array(array('code1', 'code2'), 3),
-            array('code3', 0),
-        );
+        return [
+            ['code1', 2],
+            [['code1', 'code2'], 3],
+            ['code3', 0],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/FormFactoryTest.php b/src/Symfony/Component/Form/Tests/FormFactoryTest.php
index ce65e05bb1700..27a5ca6e20f7c 100644
--- a/src/Symfony/Component/Form/Tests/FormFactoryTest.php
+++ b/src/Symfony/Component/Form/Tests/FormFactoryTest.php
@@ -58,16 +58,16 @@ protected function setUp()
 
         $this->registry->expects($this->any())
             ->method('getTypeGuesser')
-            ->will($this->returnValue(new FormTypeGuesserChain(array(
+            ->will($this->returnValue(new FormTypeGuesserChain([
                 $this->guesser1,
                 $this->guesser2,
-            ))));
+            ])));
     }
 
     public function testCreateNamedBuilderWithTypeName()
     {
-        $options = array('a' => '1', 'b' => '2');
-        $resolvedOptions = array('a' => '2', 'b' => '3');
+        $options = ['a' => '1', 'b' => '2'];
+        $resolvedOptions = ['a' => '2', 'b' => '3'];
         $resolvedType = $this->getMockResolvedType();
 
         $this->registry->expects($this->once())
@@ -93,9 +93,9 @@ public function testCreateNamedBuilderWithTypeName()
 
     public function testCreateNamedBuilderFillsDataOption()
     {
-        $givenOptions = array('a' => '1', 'b' => '2');
-        $expectedOptions = array_merge($givenOptions, array('data' => 'DATA'));
-        $resolvedOptions = array('a' => '2', 'b' => '3', 'data' => 'DATA');
+        $givenOptions = ['a' => '1', 'b' => '2'];
+        $expectedOptions = array_merge($givenOptions, ['data' => 'DATA']);
+        $resolvedOptions = ['a' => '2', 'b' => '3', 'data' => 'DATA'];
         $resolvedType = $this->getMockResolvedType();
 
         $this->registry->expects($this->once())
@@ -121,8 +121,8 @@ public function testCreateNamedBuilderFillsDataOption()
 
     public function testCreateNamedBuilderDoesNotOverrideExistingDataOption()
     {
-        $options = array('a' => '1', 'b' => '2', 'data' => 'CUSTOM');
-        $resolvedOptions = array('a' => '2', 'b' => '3', 'data' => 'CUSTOM');
+        $options = ['a' => '1', 'b' => '2', 'data' => 'CUSTOM'];
+        $resolvedOptions = ['a' => '2', 'b' => '3', 'data' => 'CUSTOM'];
         $resolvedType = $this->getMockResolvedType();
 
         $this->registry->expects($this->once())
@@ -166,8 +166,8 @@ public function testCreateThrowsUnderstandableException()
 
     public function testCreateUsesBlockPrefixIfTypeGivenAsString()
     {
-        $options = array('a' => '1', 'b' => '2');
-        $resolvedOptions = array('a' => '2', 'b' => '3');
+        $options = ['a' => '1', 'b' => '2'];
+        $resolvedOptions = ['a' => '2', 'b' => '3'];
 
         // the interface does not have the method, so use the real class
         $resolvedType = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormType')
@@ -205,8 +205,8 @@ public function testCreateUsesBlockPrefixIfTypeGivenAsString()
 
     public function testCreateNamed()
     {
-        $options = array('a' => '1', 'b' => '2');
-        $resolvedOptions = array('a' => '2', 'b' => '3');
+        $options = ['a' => '1', 'b' => '2'];
+        $resolvedOptions = ['a' => '2', 'b' => '3'];
         $resolvedType = $this->getMockResolvedType();
 
         $this->registry->expects($this->once())
@@ -238,13 +238,13 @@ public function testCreateBuilderForPropertyWithoutTypeGuesser()
     {
         $registry = $this->getMockBuilder('Symfony\Component\Form\FormRegistryInterface')->getMock();
         $factory = $this->getMockBuilder('Symfony\Component\Form\FormFactory')
-            ->setMethods(array('createNamedBuilder'))
-            ->setConstructorArgs(array($registry))
+            ->setMethods(['createNamedBuilder'])
+            ->setConstructorArgs([$registry])
             ->getMock();
 
         $factory->expects($this->once())
             ->method('createNamedBuilder')
-            ->with('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array())
+            ->with('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [])
             ->will($this->returnValue('builderInstance'));
 
         $this->builder = $factory->createBuilderForProperty('Application\Author', 'firstName');
@@ -259,7 +259,7 @@ public function testCreateBuilderForPropertyCreatesFormWithHighestConfidence()
             ->with('Application\Author', 'firstName')
             ->will($this->returnValue(new TypeGuess(
                 'Symfony\Component\Form\Extension\Core\Type\TextType',
-                array('attr' => array('maxlength' => 10)),
+                ['attr' => ['maxlength' => 10]],
                 Guess::MEDIUM_CONFIDENCE
             )));
 
@@ -268,15 +268,15 @@ public function testCreateBuilderForPropertyCreatesFormWithHighestConfidence()
             ->with('Application\Author', 'firstName')
             ->will($this->returnValue(new TypeGuess(
                 'Symfony\Component\Form\Extension\Core\Type\PasswordType',
-                array('attr' => array('maxlength' => 7)),
+                ['attr' => ['maxlength' => 7]],
                 Guess::HIGH_CONFIDENCE
             )));
 
-        $factory = $this->getMockFactory(array('createNamedBuilder'));
+        $factory = $this->getMockFactory(['createNamedBuilder']);
 
         $factory->expects($this->once())
             ->method('createNamedBuilder')
-            ->with('firstName', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', null, array('attr' => array('maxlength' => 7)))
+            ->with('firstName', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', null, ['attr' => ['maxlength' => 7]])
             ->will($this->returnValue('builderInstance'));
 
         $this->builder = $factory->createBuilderForProperty('Application\Author', 'firstName');
@@ -291,7 +291,7 @@ public function testCreateBuilderCreatesTextFormIfNoGuess()
             ->with('Application\Author', 'firstName')
             ->will($this->returnValue(null));
 
-        $factory = $this->getMockFactory(array('createNamedBuilder'));
+        $factory = $this->getMockFactory(['createNamedBuilder']);
 
         $factory->expects($this->once())
             ->method('createNamedBuilder')
@@ -310,22 +310,22 @@ public function testOptionsCanBeOverridden()
             ->with('Application\Author', 'firstName')
             ->will($this->returnValue(new TypeGuess(
                 'Symfony\Component\Form\Extension\Core\Type\TextType',
-                array('attr' => array('class' => 'foo', 'maxlength' => 10)),
+                ['attr' => ['class' => 'foo', 'maxlength' => 10]],
                 Guess::MEDIUM_CONFIDENCE
             )));
 
-        $factory = $this->getMockFactory(array('createNamedBuilder'));
+        $factory = $this->getMockFactory(['createNamedBuilder']);
 
         $factory->expects($this->once())
             ->method('createNamedBuilder')
-            ->with('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array('attr' => array('class' => 'foo', 'maxlength' => 11)))
+            ->with('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, ['attr' => ['class' => 'foo', 'maxlength' => 11]])
             ->will($this->returnValue('builderInstance'));
 
         $this->builder = $factory->createBuilderForProperty(
             'Application\Author',
             'firstName',
             null,
-            array('attr' => array('maxlength' => 11))
+            ['attr' => ['maxlength' => 11]]
         );
 
         $this->assertEquals('builderInstance', $this->builder);
@@ -349,11 +349,11 @@ public function testCreateBuilderUsesMaxLengthIfFound()
                     Guess::HIGH_CONFIDENCE
                 )));
 
-        $factory = $this->getMockFactory(array('createNamedBuilder'));
+        $factory = $this->getMockFactory(['createNamedBuilder']);
 
         $factory->expects($this->once())
             ->method('createNamedBuilder')
-            ->with('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array('attr' => array('maxlength' => 20)))
+            ->with('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, ['attr' => ['maxlength' => 20]])
             ->will($this->returnValue('builderInstance'));
 
         $this->builder = $factory->createBuilderForProperty(
@@ -382,18 +382,18 @@ public function testCreateBuilderUsesMaxLengthAndPattern()
                 Guess::HIGH_CONFIDENCE
             )));
 
-        $factory = $this->getMockFactory(array('createNamedBuilder'));
+        $factory = $this->getMockFactory(['createNamedBuilder']);
 
         $factory->expects($this->once())
             ->method('createNamedBuilder')
-            ->with('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array('attr' => array('maxlength' => 20, 'pattern' => '.{5,}', 'class' => 'tinymce')))
+            ->with('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, ['attr' => ['maxlength' => 20, 'pattern' => '.{5,}', 'class' => 'tinymce']])
             ->will($this->returnValue('builderInstance'));
 
         $this->builder = $factory->createBuilderForProperty(
             'Application\Author',
             'firstName',
             null,
-            array('attr' => array('class' => 'tinymce'))
+            ['attr' => ['class' => 'tinymce']]
         );
 
         $this->assertEquals('builderInstance', $this->builder);
@@ -417,11 +417,11 @@ public function testCreateBuilderUsesRequiredSettingWithHighestConfidence()
                     Guess::HIGH_CONFIDENCE
                 )));
 
-        $factory = $this->getMockFactory(array('createNamedBuilder'));
+        $factory = $this->getMockFactory(['createNamedBuilder']);
 
         $factory->expects($this->once())
             ->method('createNamedBuilder')
-            ->with('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array('required' => false))
+            ->with('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, ['required' => false])
             ->will($this->returnValue('builderInstance'));
 
         $this->builder = $factory->createBuilderForProperty(
@@ -450,11 +450,11 @@ public function testCreateBuilderUsesPatternIfFound()
                     Guess::HIGH_CONFIDENCE
                 )));
 
-        $factory = $this->getMockFactory(array('createNamedBuilder'));
+        $factory = $this->getMockFactory(['createNamedBuilder']);
 
         $factory->expects($this->once())
             ->method('createNamedBuilder')
-            ->with('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array('attr' => array('pattern' => '[a-zA-Z]')))
+            ->with('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, ['attr' => ['pattern' => '[a-zA-Z]']])
             ->will($this->returnValue('builderInstance'));
 
         $this->builder = $factory->createBuilderForProperty(
@@ -465,11 +465,11 @@ public function testCreateBuilderUsesPatternIfFound()
         $this->assertEquals('builderInstance', $this->builder);
     }
 
-    private function getMockFactory(array $methods = array())
+    private function getMockFactory(array $methods = [])
     {
         return $this->getMockBuilder('Symfony\Component\Form\FormFactory')
             ->setMethods($methods)
-            ->setConstructorArgs(array($this->registry))
+            ->setConstructorArgs([$this->registry])
             ->getMock();
     }
 
diff --git a/src/Symfony/Component/Form/Tests/FormRegistryTest.php b/src/Symfony/Component/Form/Tests/FormRegistryTest.php
index ca38c7a8b2941..e4dee5da8a07d 100644
--- a/src/Symfony/Component/Form/Tests/FormRegistryTest.php
+++ b/src/Symfony/Component/Form/Tests/FormRegistryTest.php
@@ -68,10 +68,10 @@ protected function setUp()
         $this->guesser2 = $this->getMockBuilder('Symfony\Component\Form\FormTypeGuesserInterface')->getMock();
         $this->extension1 = new TestExtension($this->guesser1);
         $this->extension2 = new TestExtension($this->guesser2);
-        $this->registry = new FormRegistry(array(
+        $this->registry = new FormRegistry([
             $this->extension1,
             $this->extension2,
-        ), $this->resolvedTypeFactory);
+        ], $this->resolvedTypeFactory);
     }
 
     public function testGetTypeFromExtension()
@@ -123,7 +123,7 @@ public function testGetTypeWithTypeExtensions()
         $type = new FooType();
         $ext1 = new FooTypeBarExtension();
         $ext2 = new FooTypeBazExtension();
-        $resolvedType = new ResolvedFormType($type, array($ext1, $ext2));
+        $resolvedType = new ResolvedFormType($type, [$ext1, $ext2]);
 
         $this->extension2->addType($type);
         $this->extension1->addTypeExtension($ext1);
@@ -131,7 +131,7 @@ public function testGetTypeWithTypeExtensions()
 
         $this->resolvedTypeFactory->expects($this->once())
             ->method('createResolvedType')
-            ->with($type, array($ext1, $ext2))
+            ->with($type, [$ext1, $ext2])
             ->willReturn($resolvedType);
 
         $this->assertSame($resolvedType, $this->registry->getType(\get_class($type)));
@@ -154,7 +154,7 @@ public function testGetTypeConnectsParent()
 
         $this->resolvedTypeFactory->expects($this->at(1))
             ->method('createResolvedType')
-            ->with($type, array(), $parentResolvedType)
+            ->with($type, [], $parentResolvedType)
             ->willReturn($resolvedType);
 
         $this->assertSame($resolvedType, $this->registry->getType(\get_class($type)));
@@ -230,12 +230,12 @@ public function testDoesNotHaveTypeIfNoFormType()
 
     public function testGetTypeGuesser()
     {
-        $expectedGuesser = new FormTypeGuesserChain(array($this->guesser1, $this->guesser2));
+        $expectedGuesser = new FormTypeGuesserChain([$this->guesser1, $this->guesser2]);
 
         $this->assertEquals($expectedGuesser, $this->registry->getTypeGuesser());
 
         $registry = new FormRegistry(
-            array($this->getMockBuilder('Symfony\Component\Form\FormExtensionInterface')->getMock()),
+            [$this->getMockBuilder('Symfony\Component\Form\FormExtensionInterface')->getMock()],
             $this->resolvedTypeFactory
         );
 
@@ -244,7 +244,7 @@ public function testGetTypeGuesser()
 
     public function testGetExtensions()
     {
-        $expectedExtensions = array($this->extension1, $this->extension2);
+        $expectedExtensions = [$this->extension1, $this->extension2];
 
         $this->assertEquals($expectedExtensions, $this->registry->getExtensions());
     }
diff --git a/src/Symfony/Component/Form/Tests/Guess/GuessTest.php b/src/Symfony/Component/Form/Tests/Guess/GuessTest.php
index 8f7e1d020302a..eea423bb9dc00 100644
--- a/src/Symfony/Component/Form/Tests/Guess/GuessTest.php
+++ b/src/Symfony/Component/Form/Tests/Guess/GuessTest.php
@@ -26,7 +26,7 @@ public function testGetBestGuessReturnsGuessWithHighestConfidence()
         $guess2 = new TestGuess(Guess::LOW_CONFIDENCE);
         $guess3 = new TestGuess(Guess::HIGH_CONFIDENCE);
 
-        $this->assertSame($guess3, Guess::getBestGuess(array($guess1, $guess2, $guess3)));
+        $this->assertSame($guess3, Guess::getBestGuess([$guess1, $guess2, $guess3]));
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/NativeRequestHandlerTest.php b/src/Symfony/Component/Form/Tests/NativeRequestHandlerTest.php
index aba417288a948..db4902e34b9d9 100644
--- a/src/Symfony/Component/Form/Tests/NativeRequestHandlerTest.php
+++ b/src/Symfony/Component/Form/Tests/NativeRequestHandlerTest.php
@@ -29,22 +29,22 @@ protected function setUp()
     {
         parent::setUp();
 
-        $_GET = array();
-        $_POST = array();
-        $_FILES = array();
-        $_SERVER = array(
+        $_GET = [];
+        $_POST = [];
+        $_FILES = [];
+        $_SERVER = [
             // PHPUnit needs this entry
             'SCRIPT_NAME' => self::$serverBackup['SCRIPT_NAME'],
-        );
+        ];
     }
 
     protected function tearDown()
     {
         parent::tearDown();
 
-        $_GET = array();
-        $_POST = array();
-        $_FILES = array();
+        $_GET = [];
+        $_POST = [];
+        $_FILES = [];
         $_SERVER = self::$serverBackup;
     }
 
@@ -60,9 +60,9 @@ public function testMethodOverrideHeaderTakesPrecedenceIfPost()
     {
         $form = $this->getMockForm('param1', 'PUT');
 
-        $this->setRequestData('POST', array(
+        $this->setRequestData('POST', [
             'param1' => 'DATA',
-        ));
+        ]);
 
         $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] = 'PUT';
 
@@ -77,13 +77,13 @@ public function testConvertEmptyUploadedFilesToNull()
     {
         $form = $this->getMockForm('param1', 'POST', false);
 
-        $this->setRequestData('POST', array(), array('param1' => array(
+        $this->setRequestData('POST', [], ['param1' => [
             'name' => '',
             'type' => '',
             'tmp_name' => '',
             'error' => UPLOAD_ERR_NO_FILE,
             'size' => 0,
-        )));
+        ]]);
 
         $form->expects($this->once())
             ->method('submit')
@@ -96,35 +96,35 @@ public function testFixBuggyFilesArray()
     {
         $form = $this->getMockForm('param1', 'POST', false);
 
-        $this->setRequestData('POST', array(), array('param1' => array(
-            'name' => array(
+        $this->setRequestData('POST', [], ['param1' => [
+            'name' => [
                 'field' => 'upload.txt',
-            ),
-            'type' => array(
+            ],
+            'type' => [
                 'field' => 'text/plain',
-            ),
-            'tmp_name' => array(
+            ],
+            'tmp_name' => [
                 'field' => 'owfdskjasdfsa',
-            ),
-            'error' => array(
+            ],
+            'error' => [
                 'field' => UPLOAD_ERR_OK,
-            ),
-            'size' => array(
+            ],
+            'size' => [
                 'field' => 100,
-            ),
-        )));
+            ],
+        ]]);
 
         $form->expects($this->once())
             ->method('submit')
-            ->with(array(
-                'field' => array(
+            ->with([
+                'field' => [
                     'name' => 'upload.txt',
                     'type' => 'text/plain',
                     'tmp_name' => 'owfdskjasdfsa',
                     'error' => UPLOAD_ERR_OK,
                     'size' => 100,
-                ),
-            ));
+                ],
+            ]);
 
         $this->requestHandler->handleRequest($form, $this->request);
     }
@@ -133,37 +133,37 @@ public function testFixBuggyNestedFilesArray()
     {
         $form = $this->getMockForm('param1', 'POST');
 
-        $this->setRequestData('POST', array(), array('param1' => array(
-            'name' => array(
-                'field' => array('subfield' => 'upload.txt'),
-            ),
-            'type' => array(
-                'field' => array('subfield' => 'text/plain'),
-            ),
-            'tmp_name' => array(
-                'field' => array('subfield' => 'owfdskjasdfsa'),
-            ),
-            'error' => array(
-                'field' => array('subfield' => UPLOAD_ERR_OK),
-            ),
-            'size' => array(
-                'field' => array('subfield' => 100),
-            ),
-        )));
+        $this->setRequestData('POST', [], ['param1' => [
+            'name' => [
+                'field' => ['subfield' => 'upload.txt'],
+            ],
+            'type' => [
+                'field' => ['subfield' => 'text/plain'],
+            ],
+            'tmp_name' => [
+                'field' => ['subfield' => 'owfdskjasdfsa'],
+            ],
+            'error' => [
+                'field' => ['subfield' => UPLOAD_ERR_OK],
+            ],
+            'size' => [
+                'field' => ['subfield' => 100],
+            ],
+        ]]);
 
         $form->expects($this->once())
             ->method('submit')
-            ->with(array(
-                'field' => array(
-                    'subfield' => array(
+            ->with([
+                'field' => [
+                    'subfield' => [
                         'name' => 'upload.txt',
                         'type' => 'text/plain',
                         'tmp_name' => 'owfdskjasdfsa',
                         'error' => UPLOAD_ERR_OK,
                         'size' => 100,
-                    ),
-                ),
-            ));
+                    ],
+                ],
+            ]);
 
         $this->requestHandler->handleRequest($form, $this->request);
     }
@@ -172,9 +172,9 @@ public function testMethodOverrideHeaderIgnoredIfNotPost()
     {
         $form = $this->getMockForm('param1', 'POST');
 
-        $this->setRequestData('GET', array(
+        $this->setRequestData('GET', [
                 'param1' => 'DATA',
-            ));
+            ]);
 
         $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] = 'PUT';
 
@@ -184,21 +184,21 @@ public function testMethodOverrideHeaderIgnoredIfNotPost()
         $this->requestHandler->handleRequest($form, $this->request);
     }
 
-    protected function setRequestData($method, $data, $files = array())
+    protected function setRequestData($method, $data, $files = [])
     {
         if ('GET' === $method) {
             $_GET = $data;
-            $_FILES = array();
+            $_FILES = [];
         } else {
             $_POST = $data;
             $_FILES = $files;
         }
 
-        $_SERVER = array(
+        $_SERVER = [
             'REQUEST_METHOD' => $method,
             // PHPUnit needs this entry
             'SCRIPT_NAME' => self::$serverBackup['SCRIPT_NAME'],
-        );
+        ];
     }
 
     protected function getRequestHandler()
@@ -208,23 +208,23 @@ protected function getRequestHandler()
 
     protected function getMockFile($suffix = '')
     {
-        return array(
+        return [
             'name' => 'upload'.$suffix.'.txt',
             'type' => 'text/plain',
             'tmp_name' => 'owfdskjasdfsa'.$suffix,
             'error' => UPLOAD_ERR_OK,
             'size' => 100,
-        );
+        ];
     }
 
     protected function getInvalidFile()
     {
-        return array(
+        return [
             'name' => 'upload.txt',
             'type' => 'text/plain',
             'tmp_name' => 'owfdskjasdfsa',
             'error' => '0',
             'size' => '100',
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php b/src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
index ca9ec14252cac..ff3e2cb87de8f 100644
--- a/src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
@@ -78,7 +78,7 @@ protected function setUp()
         $this->extension1 = $this->getMockFormTypeExtension();
         $this->extension2 = $this->getMockFormTypeExtension();
         $this->parentResolvedType = new ResolvedFormType($this->parentType);
-        $this->resolvedType = new ResolvedFormType($this->type, array($this->extension1, $this->extension2), $this->parentResolvedType);
+        $this->resolvedType = new ResolvedFormType($this->type, [$this->extension1, $this->extension2], $this->parentResolvedType);
     }
 
     public function testGetOptionsResolver()
@@ -91,7 +91,7 @@ public function testGetOptionsResolver()
 
                 ++$i;
 
-                $resolver->setDefaults(array($option => $default));
+                $resolver->setDefaults([$option => $default]);
             };
         };
 
@@ -114,8 +114,8 @@ public function testGetOptionsResolver()
             ->method('configureOptions')
             ->will($this->returnCallback($assertIndexAndAddOption(3, 'd', 'd_default')));
 
-        $givenOptions = array('a' => 'a_custom', 'c' => 'c_custom');
-        $resolvedOptions = array('a' => 'a_custom', 'b' => 'b_default', 'c' => 'c_custom', 'd' => 'd_default');
+        $givenOptions = ['a' => 'a_custom', 'c' => 'c_custom'];
+        $resolvedOptions = ['a' => 'a_custom', 'b' => 'b_default', 'c' => 'c_custom', 'd' => 'd_default'];
 
         $resolver = $this->resolvedType->getOptionsResolver();
 
@@ -124,13 +124,13 @@ public function testGetOptionsResolver()
 
     public function testCreateBuilder()
     {
-        $givenOptions = array('a' => 'a_custom', 'c' => 'c_custom');
-        $resolvedOptions = array('a' => 'a_custom', 'b' => 'b_default', 'c' => 'c_custom', 'd' => 'd_default');
+        $givenOptions = ['a' => 'a_custom', 'c' => 'c_custom'];
+        $resolvedOptions = ['a' => 'a_custom', 'b' => 'b_default', 'c' => 'c_custom', 'd' => 'd_default'];
         $optionsResolver = $this->getMockBuilder('Symfony\Component\OptionsResolver\OptionsResolver')->getMock();
 
         $this->resolvedType = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormType')
-            ->setConstructorArgs(array($this->type, array($this->extension1, $this->extension2), $this->parentResolvedType))
-            ->setMethods(array('getOptionsResolver'))
+            ->setConstructorArgs([$this->type, [$this->extension1, $this->extension2], $this->parentResolvedType])
+            ->setMethods(['getOptionsResolver'])
             ->getMock();
 
         $this->resolvedType->expects($this->once())
@@ -152,13 +152,13 @@ public function testCreateBuilder()
 
     public function testCreateBuilderWithDataClassOption()
     {
-        $givenOptions = array('data_class' => 'Foo');
-        $resolvedOptions = array('data_class' => '\stdClass');
+        $givenOptions = ['data_class' => 'Foo'];
+        $resolvedOptions = ['data_class' => '\stdClass'];
         $optionsResolver = $this->getMockBuilder('Symfony\Component\OptionsResolver\OptionsResolver')->getMock();
 
         $this->resolvedType = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormType')
-            ->setConstructorArgs(array($this->type, array($this->extension1, $this->extension2), $this->parentResolvedType))
-            ->setMethods(array('getOptionsResolver'))
+            ->setConstructorArgs([$this->type, [$this->extension1, $this->extension2], $this->parentResolvedType])
+            ->setMethods(['getOptionsResolver'])
             ->getMock();
 
         $this->resolvedType->expects($this->once())
@@ -190,7 +190,7 @@ public function testBuildForm()
             };
         };
 
-        $options = array('a' => 'Foo', 'b' => 'Bar');
+        $options = ['a' => 'Foo', 'b' => 'Bar'];
         $builder = $this->getMockBuilder('Symfony\Component\Form\Test\FormBuilderInterface')->getMock();
 
         // First the form is built for the super type
@@ -242,7 +242,7 @@ public function testCreateViewWithParent()
 
     public function testBuildView()
     {
-        $options = array('a' => '1', 'b' => '2');
+        $options = ['a' => '1', 'b' => '2'];
         $form = $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
         $view = $this->getMockBuilder('Symfony\Component\Form\FormView')->getMock();
 
@@ -284,7 +284,7 @@ public function testBuildView()
 
     public function testFinishView()
     {
-        $options = array('a' => '1', 'b' => '2');
+        $options = ['a' => '1', 'b' => '2'];
         $form = $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
         $view = $this->getMockBuilder('Symfony\Component\Form\FormView')->getMock();
 
@@ -347,14 +347,14 @@ public function testBlockPrefixDefaultsToFQCNIfNoName($typeClass, $blockPrefix)
 
     public function provideTypeClassBlockPrefixTuples()
     {
-        return array(
-            array(__NAMESPACE__.'\Fixtures\FooType', 'foo'),
-            array(__NAMESPACE__.'\Fixtures\Foo', 'foo'),
-            array(__NAMESPACE__.'\Fixtures\Type', 'type'),
-            array(__NAMESPACE__.'\Fixtures\FooBarHTMLType', 'foo_bar_html'),
-            array(__NAMESPACE__.'\Fixtures\Foo1Bar2Type', 'foo1_bar2'),
-            array(__NAMESPACE__.'\Fixtures\FBooType', 'f_boo'),
-        );
+        return [
+            [__NAMESPACE__.'\Fixtures\FooType', 'foo'],
+            [__NAMESPACE__.'\Fixtures\Foo', 'foo'],
+            [__NAMESPACE__.'\Fixtures\Type', 'type'],
+            [__NAMESPACE__.'\Fixtures\FooBarHTMLType', 'foo_bar_html'],
+            [__NAMESPACE__.'\Fixtures\Foo1Bar2Type', 'foo1_bar2'],
+            [__NAMESPACE__.'\Fixtures\FBooType', 'f_boo'],
+        ];
     }
 
     /**
@@ -362,7 +362,7 @@ public function provideTypeClassBlockPrefixTuples()
      */
     private function getMockFormType($typeClass = 'Symfony\Component\Form\AbstractType')
     {
-        return $this->getMockBuilder($typeClass)->setMethods(array('getBlockPrefix', 'configureOptions', 'finishView', 'buildView', 'buildForm'))->getMock();
+        return $this->getMockBuilder($typeClass)->setMethods(['getBlockPrefix', 'configureOptions', 'finishView', 'buildView', 'buildForm'])->getMock();
     }
 
     /**
@@ -370,7 +370,7 @@ private function getMockFormType($typeClass = 'Symfony\Component\Form\AbstractTy
      */
     private function getMockFormTypeExtension()
     {
-        return $this->getMockBuilder('Symfony\Component\Form\AbstractTypeExtension')->setMethods(array('getExtendedType', 'configureOptions', 'finishView', 'buildView', 'buildForm'))->getMock();
+        return $this->getMockBuilder('Symfony\Component\Form\AbstractTypeExtension')->setMethods(['getExtendedType', 'configureOptions', 'finishView', 'buildView', 'buildForm'])->getMock();
     }
 
     /**
@@ -387,7 +387,7 @@ private function getMockFormFactory()
      *
      * @return FormBuilder
      */
-    protected function getBuilder($name = 'name', array $options = array())
+    protected function getBuilder($name = 'name', array $options = [])
     {
         return new FormBuilder($name, null, $this->dispatcher, $this->factory, $options);
     }
diff --git a/src/Symfony/Component/Form/Tests/SimpleFormTest.php b/src/Symfony/Component/Form/Tests/SimpleFormTest.php
index 30d8b7927469a..ed26efbe4f141 100644
--- a/src/Symfony/Component/Form/Tests/SimpleFormTest.php
+++ b/src/Symfony/Component/Form/Tests/SimpleFormTest.php
@@ -43,7 +43,7 @@ class SimpleFormTest_Traversable implements \IteratorAggregate
 
     public function __construct($count)
     {
-        $this->iterator = new \ArrayIterator($count > 0 ? array_fill(0, $count, 'Foo') : array());
+        $this->iterator = new \ArrayIterator($count > 0 ? array_fill(0, $count, 'Foo') : []);
     }
 
     public function getIterator()
@@ -56,12 +56,12 @@ class SimpleFormTest extends AbstractFormTest
 {
     public function testDataIsInitializedToConfiguredValue()
     {
-        $model = new FixedDataTransformer(array(
+        $model = new FixedDataTransformer([
             'default' => 'foo',
-        ));
-        $view = new FixedDataTransformer(array(
+        ]);
+        $view = new FixedDataTransformer([
             'foo' => 'bar',
-        ));
+        ]);
 
         $config = new FormConfigBuilder('name', null, $this->dispatcher);
         $config->addViewTransformer($view);
@@ -80,12 +80,12 @@ public function testDataIsInitializedToConfiguredValue()
      */
     public function testDataTransformationFailure()
     {
-        $model = new FixedDataTransformer(array(
+        $model = new FixedDataTransformer([
             'default' => 'foo',
-        ));
-        $view = new FixedDataTransformer(array(
+        ]);
+        $view = new FixedDataTransformer([
             'foo' => 'bar',
-        ));
+        ]);
 
         $config = new FormConfigBuilder('name', null, $this->dispatcher);
         $config->addViewTransformer($view);
@@ -100,7 +100,7 @@ public function testDataTransformationFailure()
     public function testDataIsInitializedFromSubmit()
     {
         $mock = $this->getMockBuilder('\stdClass')
-            ->setMethods(array('preSetData', 'preSubmit'))
+            ->setMethods(['preSetData', 'preSubmit'])
             ->getMock();
         $mock->expects($this->at(0))
             ->method('preSetData');
@@ -108,8 +108,8 @@ public function testDataIsInitializedFromSubmit()
             ->method('preSubmit');
 
         $config = new FormConfigBuilder('name', null, $this->dispatcher);
-        $config->addEventListener(FormEvents::PRE_SET_DATA, array($mock, 'preSetData'));
-        $config->addEventListener(FormEvents::PRE_SUBMIT, array($mock, 'preSubmit'));
+        $config->addEventListener(FormEvents::PRE_SET_DATA, [$mock, 'preSetData']);
+        $config->addEventListener(FormEvents::PRE_SUBMIT, [$mock, 'preSubmit']);
         $form = new Form($config);
 
         // no call to setData() or similar where the object would be
@@ -122,7 +122,7 @@ public function testDataIsInitializedFromSubmit()
     public function testFalseIsConvertedToNull()
     {
         $mock = $this->getMockBuilder('\stdClass')
-            ->setMethods(array('preSubmit'))
+            ->setMethods(['preSubmit'])
             ->getMock();
         $mock->expects($this->once())
             ->method('preSubmit')
@@ -131,7 +131,7 @@ public function testFalseIsConvertedToNull()
             }));
 
         $config = new FormConfigBuilder('name', null, $this->dispatcher);
-        $config->addEventListener(FormEvents::PRE_SUBMIT, array($mock, 'preSubmit'));
+        $config->addEventListener(FormEvents::PRE_SUBMIT, [$mock, 'preSubmit']);
         $form = new Form($config);
 
         $form->submit(false);
@@ -145,8 +145,8 @@ public function testFalseIsConvertedToNull()
      */
     public function testSubmitThrowsExceptionIfAlreadySubmitted()
     {
-        $this->form->submit(array());
-        $this->form->submit(array());
+        $this->form->submit([]);
+        $this->form->submit([]);
     }
 
     public function testSubmitIsIgnoredIfDisabled()
@@ -207,13 +207,13 @@ public function testAlwaysDisabledIfParentDisabled($parentDisabled, $disabled, $
 
     public function getDisabledStates()
     {
-        return array(
+        return [
             // parent, button, result
-            array(true, true, true),
-            array(true, false, true),
-            array(false, true, true),
-            array(false, false, false),
-        );
+            [true, true, true],
+            [true, false, true],
+            [false, true, true],
+            [false, false, false],
+        ];
     }
 
     public function testGetRootReturnsRootOfParent()
@@ -235,7 +235,7 @@ public function testGetRootReturnsSelfIfNoParent()
 
     public function testEmptyIfEmptyArray()
     {
-        $this->form->setData(array());
+        $this->form->setData([]);
 
         $this->assertTrue($this->form->isEmpty());
     }
@@ -348,7 +348,7 @@ public function testHasNoErrors()
      */
     public function testSetParentThrowsExceptionIfAlreadySubmitted()
     {
-        $this->form->submit(array());
+        $this->form->submit([]);
         $this->form->setParent($this->getBuilder('parent')->getForm());
     }
 
@@ -370,7 +370,7 @@ public function testNotSubmitted()
      */
     public function testSetDataThrowsExceptionIfAlreadySubmitted()
     {
-        $this->form->submit(array());
+        $this->form->submit([]);
         $this->form->setData(null);
     }
 
@@ -397,19 +397,19 @@ public function testSetDataExecutesTransformationChain()
     {
         // use real event dispatcher now
         $form = $this->getBuilder('name', new EventDispatcher())
-            ->addEventSubscriber(new FixedFilterListener(array(
-                'preSetData' => array(
+            ->addEventSubscriber(new FixedFilterListener([
+                'preSetData' => [
                     'app' => 'filtered',
-                ),
-            )))
-            ->addModelTransformer(new FixedDataTransformer(array(
+                ],
+            ]))
+            ->addModelTransformer(new FixedDataTransformer([
                 '' => '',
                 'filtered' => 'norm',
-            )))
-            ->addViewTransformer(new FixedDataTransformer(array(
+            ]))
+            ->addViewTransformer(new FixedDataTransformer([
                 '' => '',
                 'norm' => 'client',
-            )))
+            ]))
             ->getForm();
 
         $form->setData('app');
@@ -422,14 +422,14 @@ public function testSetDataExecutesTransformationChain()
     public function testSetDataExecutesViewTransformersInOrder()
     {
         $form = $this->getBuilder()
-            ->addViewTransformer(new FixedDataTransformer(array(
+            ->addViewTransformer(new FixedDataTransformer([
                 '' => '',
                 'first' => 'second',
-            )))
-            ->addViewTransformer(new FixedDataTransformer(array(
+            ]))
+            ->addViewTransformer(new FixedDataTransformer([
                 '' => '',
                 'second' => 'third',
-            )))
+            ]))
             ->getForm();
 
         $form->setData('first');
@@ -440,14 +440,14 @@ public function testSetDataExecutesViewTransformersInOrder()
     public function testSetDataExecutesModelTransformersInReverseOrder()
     {
         $form = $this->getBuilder()
-            ->addModelTransformer(new FixedDataTransformer(array(
+            ->addModelTransformer(new FixedDataTransformer([
                 '' => '',
                 'second' => 'third',
-            )))
-            ->addModelTransformer(new FixedDataTransformer(array(
+            ]))
+            ->addModelTransformer(new FixedDataTransformer([
                 '' => '',
                 'first' => 'second',
-            )))
+            ]))
             ->getForm();
 
         $form->setData('first');
@@ -477,10 +477,10 @@ public function testSetDataConvertsScalarToStringIfNoTransformer()
     public function testSetDataConvertsScalarToStringIfOnlyModelTransformer()
     {
         $form = $this->getBuilder()
-            ->addModelTransformer(new FixedDataTransformer(array(
+            ->addModelTransformer(new FixedDataTransformer([
             '' => '',
             1 => 23,
-        )))
+        ]))
             ->getForm();
 
         $form->setData(1);
@@ -548,25 +548,25 @@ public function testSubmitExecutesTransformationChain()
     {
         // use real event dispatcher now
         $form = $this->getBuilder('name', new EventDispatcher())
-            ->addEventSubscriber(new FixedFilterListener(array(
-                'preSubmit' => array(
+            ->addEventSubscriber(new FixedFilterListener([
+                'preSubmit' => [
                     'client' => 'filteredclient',
-                ),
-                'onSubmit' => array(
+                ],
+                'onSubmit' => [
                     'norm' => 'filterednorm',
-                ),
-            )))
-            ->addViewTransformer(new FixedDataTransformer(array(
+                ],
+            ]))
+            ->addViewTransformer(new FixedDataTransformer([
                 '' => '',
                 // direction is reversed!
                 'norm' => 'filteredclient',
                 'filterednorm' => 'cleanedclient',
-            )))
-            ->addModelTransformer(new FixedDataTransformer(array(
+            ]))
+            ->addModelTransformer(new FixedDataTransformer([
                 '' => '',
                 // direction is reversed!
                 'app' => 'filterednorm',
-            )))
+            ]))
             ->getForm();
 
         $form->submit('client');
@@ -579,14 +579,14 @@ public function testSubmitExecutesTransformationChain()
     public function testSubmitExecutesViewTransformersInReverseOrder()
     {
         $form = $this->getBuilder()
-            ->addViewTransformer(new FixedDataTransformer(array(
+            ->addViewTransformer(new FixedDataTransformer([
                 '' => '',
                 'third' => 'second',
-            )))
-            ->addViewTransformer(new FixedDataTransformer(array(
+            ]))
+            ->addViewTransformer(new FixedDataTransformer([
                 '' => '',
                 'second' => 'first',
-            )))
+            ]))
             ->getForm();
 
         $form->submit('first');
@@ -597,14 +597,14 @@ public function testSubmitExecutesViewTransformersInReverseOrder()
     public function testSubmitExecutesModelTransformersInOrder()
     {
         $form = $this->getBuilder()
-            ->addModelTransformer(new FixedDataTransformer(array(
+            ->addModelTransformer(new FixedDataTransformer([
                 '' => '',
                 'second' => 'first',
-            )))
-            ->addModelTransformer(new FixedDataTransformer(array(
+            ]))
+            ->addModelTransformer(new FixedDataTransformer([
                 '' => '',
                 'third' => 'second',
-            )))
+            ]))
             ->getForm();
 
         $form->submit('first');
@@ -660,11 +660,11 @@ public function testEmptyDataCreatedBeforeTransforming()
     {
         $form = $this->getBuilder()
             ->setEmptyData('foo')
-            ->addViewTransformer(new FixedDataTransformer(array(
+            ->addViewTransformer(new FixedDataTransformer([
                 '' => '',
                 // direction is reversed!
                 'bar' => 'foo',
-            )))
+            ]))
             ->getForm();
 
         $form->submit('');
@@ -682,11 +682,11 @@ public function testEmptyDataFromClosure()
 
                 return 'foo';
             })
-            ->addViewTransformer(new FixedDataTransformer(array(
+            ->addViewTransformer(new FixedDataTransformer([
                 '' => '',
                 // direction is reversed!
                 'bar' => 'foo',
-            )))
+            ]))
             ->getForm();
 
         $form->submit('');
@@ -853,10 +853,10 @@ public function testViewDataMayBeObjectIfDataClassIsNull()
     {
         $object = new \stdClass();
         $config = new FormConfigBuilder('name', null, $this->dispatcher);
-        $config->addViewTransformer(new FixedDataTransformer(array(
+        $config->addViewTransformer(new FixedDataTransformer([
             '' => '',
             'foo' => $object,
-        )));
+        ]));
         $form = new Form($config);
 
         $form->setData('foo');
@@ -868,10 +868,10 @@ public function testViewDataMayBeArrayAccessIfDataClassIsNull()
     {
         $arrayAccess = $this->getMockBuilder('\ArrayAccess')->getMock();
         $config = new FormConfigBuilder('name', null, $this->dispatcher);
-        $config->addViewTransformer(new FixedDataTransformer(array(
+        $config->addViewTransformer(new FixedDataTransformer([
             '' => '',
             'foo' => $arrayAccess,
-        )));
+        ]));
         $form = new Form($config);
 
         $form->setData('foo');
@@ -885,10 +885,10 @@ public function testViewDataMayBeArrayAccessIfDataClassIsNull()
     public function testViewDataMustBeObjectIfDataClassIsSet()
     {
         $config = new FormConfigBuilder('name', 'stdClass', $this->dispatcher);
-        $config->addViewTransformer(new FixedDataTransformer(array(
+        $config->addViewTransformer(new FixedDataTransformer([
             '' => '',
-            'foo' => array('bar' => 'baz'),
-        )));
+            'foo' => ['bar' => 'baz'],
+        ]));
         $form = new Form($config);
 
         $form->setData('foo');
@@ -954,12 +954,12 @@ public function testFormInheritsParentData()
             ->setCompound(true)
             ->setDataMapper($this->getDataMapper())
             ->setData('foo')
-            ->addModelTransformer(new FixedDataTransformer(array(
+            ->addModelTransformer(new FixedDataTransformer([
                 'foo' => 'norm[foo]',
-            )))
-            ->addViewTransformer(new FixedDataTransformer(array(
+            ]))
+            ->addViewTransformer(new FixedDataTransformer([
                 'norm[foo]' => 'view[foo]',
-            )))
+            ]))
             ->add($child)
             ->getForm();
 
@@ -1046,7 +1046,7 @@ public function testSubmitIsNeverFiredIfInheritData()
     public function testInitializeSetsDefaultData()
     {
         $config = $this->getBuilder()->setData('DEFAULT')->getFormConfig();
-        $form = $this->getMockBuilder('Symfony\Component\Form\Form')->setMethods(array('setData'))->setConstructorArgs(array($config))->getMock();
+        $form = $this->getMockBuilder('Symfony\Component\Form\Form')->setMethods(['setData'])->setConstructorArgs([$config])->getMock();
 
         $form->expects($this->once())
             ->method('setData')
diff --git a/src/Symfony/Component/Form/Tests/Util/OrderedHashMapTest.php b/src/Symfony/Component/Form/Tests/Util/OrderedHashMapTest.php
index 8ce3f8fc82b82..01e76d87eb7ed 100644
--- a/src/Symfony/Component/Form/Tests/Util/OrderedHashMapTest.php
+++ b/src/Symfony/Component/Form/Tests/Util/OrderedHashMapTest.php
@@ -43,7 +43,7 @@ public function testInsertStringKeys()
         $map['first'] = 1;
         $map['second'] = 2;
 
-        $this->assertSame(array('first' => 1, 'second' => 2), iterator_to_array($map));
+        $this->assertSame(['first' => 1, 'second' => 2], iterator_to_array($map));
     }
 
     public function testInsertNullKeys()
@@ -53,7 +53,7 @@ public function testInsertNullKeys()
         $map['foo'] = 2;
         $map[] = 3;
 
-        $this->assertSame(array(0 => 1, 'foo' => 2, 1 => 3), iterator_to_array($map));
+        $this->assertSame([0 => 1, 'foo' => 2, 1 => 3], iterator_to_array($map));
     }
 
     public function testInsertLooselyEqualKeys()
@@ -62,7 +62,7 @@ public function testInsertLooselyEqualKeys()
         $map['1 as a string'] = '1 as a string';
         $map[1] = 1;
 
-        $this->assertSame(array('1 as a string' => '1 as a string', 1 => 1), iterator_to_array($map));
+        $this->assertSame(['1 as a string' => '1 as a string', 1 => 1], iterator_to_array($map));
     }
 
     /**
@@ -83,7 +83,7 @@ public function testUpdateDoesNotChangeElementPosition()
         $map['second'] = 2;
         $map['first'] = 1;
 
-        $this->assertSame(array('first' => 1, 'second' => 2), iterator_to_array($map));
+        $this->assertSame(['first' => 1, 'second' => 2], iterator_to_array($map));
     }
 
     public function testIsset()
@@ -117,7 +117,7 @@ public function testUnset()
 
         unset($map['first']);
 
-        $this->assertSame(array('second' => 2), iterator_to_array($map));
+        $this->assertSame(['second' => 2], iterator_to_array($map));
     }
 
     public function testUnsetFromLooselyEqualKeysHashMap()
@@ -128,7 +128,7 @@ public function testUnsetFromLooselyEqualKeysHashMap()
 
         unset($map[1]);
 
-        $this->assertSame(array('1 as a string' => '1 as a string'), iterator_to_array($map));
+        $this->assertSame(['1 as a string' => '1 as a string'], iterator_to_array($map));
     }
 
     public function testUnsetNonExistingSucceeds()
@@ -138,7 +138,7 @@ public function testUnsetNonExistingSucceeds()
 
         unset($map['first']);
 
-        $this->assertSame(array('second' => 2), iterator_to_array($map));
+        $this->assertSame(['second' => 2], iterator_to_array($map));
     }
 
     public function testEmptyIteration()
@@ -154,7 +154,7 @@ public function testEmptyIteration()
 
     public function testIterationSupportsInsertion()
     {
-        $map = new OrderedHashMap(array('first' => 1));
+        $map = new OrderedHashMap(['first' => 1]);
         $it = $map->getIterator();
 
         $it->rewind();
@@ -185,7 +185,7 @@ public function testIterationSupportsInsertion()
 
     public function testIterationSupportsDeletionAndInsertion()
     {
-        $map = new OrderedHashMap(array('first' => 1, 'removed' => 2));
+        $map = new OrderedHashMap(['first' => 1, 'removed' => 2]);
         $it = $map->getIterator();
 
         $it->rewind();
@@ -217,7 +217,7 @@ public function testIterationSupportsDeletionAndInsertion()
 
     public function testIterationSupportsDeletionOfCurrentElement()
     {
-        $map = new OrderedHashMap(array('removed' => 1, 'next' => 2));
+        $map = new OrderedHashMap(['removed' => 1, 'next' => 2]);
         $it = $map->getIterator();
 
         $it->rewind();
@@ -247,7 +247,7 @@ public function testIterationSupportsDeletionOfCurrentElement()
 
     public function testIterationIgnoresReplacementOfCurrentElement()
     {
-        $map = new OrderedHashMap(array('replaced' => 1, 'next' => 2));
+        $map = new OrderedHashMap(['replaced' => 1, 'next' => 2]);
         $it = $map->getIterator();
 
         $it->rewind();
@@ -277,7 +277,7 @@ public function testIterationIgnoresReplacementOfCurrentElement()
 
     public function testIterationSupportsDeletionOfCurrentAndLastElement()
     {
-        $map = new OrderedHashMap(array('removed' => 1));
+        $map = new OrderedHashMap(['removed' => 1]);
         $it = $map->getIterator();
 
         $it->rewind();
@@ -301,7 +301,7 @@ public function testIterationSupportsDeletionOfCurrentAndLastElement()
 
     public function testIterationIgnoresReplacementOfCurrentAndLastElement()
     {
-        $map = new OrderedHashMap(array('replaced' => 1));
+        $map = new OrderedHashMap(['replaced' => 1]);
         $it = $map->getIterator();
 
         $it->rewind();
@@ -325,7 +325,7 @@ public function testIterationIgnoresReplacementOfCurrentAndLastElement()
 
     public function testIterationSupportsDeletionOfPreviousElement()
     {
-        $map = new OrderedHashMap(array('removed' => 1, 'next' => 2, 'onemore' => 3));
+        $map = new OrderedHashMap(['removed' => 1, 'next' => 2, 'onemore' => 3]);
         $it = $map->getIterator();
 
         $it->rewind();
@@ -361,7 +361,7 @@ public function testIterationSupportsDeletionOfPreviousElement()
 
     public function testIterationIgnoresReplacementOfPreviousElement()
     {
-        $map = new OrderedHashMap(array('replaced' => 1, 'next' => 2, 'onemore' => 3));
+        $map = new OrderedHashMap(['replaced' => 1, 'next' => 2, 'onemore' => 3]);
         $it = $map->getIterator();
 
         $it->rewind();
@@ -397,7 +397,7 @@ public function testIterationIgnoresReplacementOfPreviousElement()
 
     public function testIterationSupportsDeletionOfMultiplePreviousElements()
     {
-        $map = new OrderedHashMap(array('removed' => 1, 'alsoremoved' => 2, 'next' => 3, 'onemore' => 4));
+        $map = new OrderedHashMap(['removed' => 1, 'alsoremoved' => 2, 'next' => 3, 'onemore' => 4]);
         $it = $map->getIterator();
 
         $it->rewind();
@@ -439,7 +439,7 @@ public function testIterationSupportsDeletionOfMultiplePreviousElements()
 
     public function testParallelIteration()
     {
-        $map = new OrderedHashMap(array('first' => 1, 'second' => 2));
+        $map = new OrderedHashMap(['first' => 1, 'second' => 2]);
         $it1 = $map->getIterator();
         $it2 = $map->getIterator();
 
diff --git a/src/Symfony/Component/Form/Tests/Util/StringUtilTest.php b/src/Symfony/Component/Form/Tests/Util/StringUtilTest.php
index 86c68ba3313d3..1c723d16a0971 100644
--- a/src/Symfony/Component/Form/Tests/Util/StringUtilTest.php
+++ b/src/Symfony/Component/Form/Tests/Util/StringUtilTest.php
@@ -42,38 +42,38 @@ public function testTrimUtf8Separators($hex)
 
     public function spaceProvider()
     {
-        return array(
+        return [
             // separators
-            array('0020'),
-            array('00A0'),
-            array('1680'),
+            ['0020'],
+            ['00A0'],
+            ['1680'],
 //            array('180E'),
-            array('2000'),
-            array('2001'),
-            array('2002'),
-            array('2003'),
-            array('2004'),
-            array('2005'),
-            array('2006'),
-            array('2007'),
-            array('2008'),
-            array('2009'),
-            array('200A'),
-            array('2028'),
-            array('2029'),
-            array('202F'),
-            array('205F'),
-            array('3000'),
+            ['2000'],
+            ['2001'],
+            ['2002'],
+            ['2003'],
+            ['2004'],
+            ['2005'],
+            ['2006'],
+            ['2007'],
+            ['2008'],
+            ['2009'],
+            ['200A'],
+            ['2028'],
+            ['2029'],
+            ['202F'],
+            ['205F'],
+            ['3000'],
             // controls
-            array('0009'),
-            array('000A'),
-            array('000B'),
-            array('000C'),
-            array('000D'),
-            array('0085'),
+            ['0009'],
+            ['000A'],
+            ['000B'],
+            ['000C'],
+            ['000D'],
+            ['0085'],
             // zero width space
 //            array('200B'),
-        );
+        ];
     }
 
     /**
@@ -88,18 +88,18 @@ public function testFqcnToBlockPrefix($fqcn, $expectedBlockPrefix)
 
     public function fqcnToBlockPrefixProvider()
     {
-        return array(
-            array('TYPE', 'type'),
-            array('\Type', 'type'),
-            array('\UserType', 'user'),
-            array('UserType', 'user'),
-            array('Vendor\Name\Space\Type', 'type'),
-            array('Vendor\Name\Space\UserForm', 'user_form'),
-            array('Vendor\Name\Space\UserType', 'user'),
-            array('Vendor\Name\Space\usertype', 'user'),
-            array('Symfony\Component\Form\Form', 'form'),
-            array('Vendor\Name\Space\BarTypeBazType', 'bar_type_baz'),
-            array('FooBarBazType', 'foo_bar_baz'),
-        );
+        return [
+            ['TYPE', 'type'],
+            ['\Type', 'type'],
+            ['\UserType', 'user'],
+            ['UserType', 'user'],
+            ['Vendor\Name\Space\Type', 'type'],
+            ['Vendor\Name\Space\UserForm', 'user_form'],
+            ['Vendor\Name\Space\UserType', 'user'],
+            ['Vendor\Name\Space\usertype', 'user'],
+            ['Symfony\Component\Form\Form', 'form'],
+            ['Vendor\Name\Space\BarTypeBazType', 'bar_type_baz'],
+            ['FooBarBazType', 'foo_bar_baz'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Form/Util/OptionsResolverWrapper.php b/src/Symfony/Component/Form/Util/OptionsResolverWrapper.php
index 94a4fc111abcf..a7c2647592639 100644
--- a/src/Symfony/Component/Form/Util/OptionsResolverWrapper.php
+++ b/src/Symfony/Component/Form/Util/OptionsResolverWrapper.php
@@ -22,7 +22,7 @@
  */
 class OptionsResolverWrapper extends OptionsResolver
 {
-    private $undefined = array();
+    private $undefined = [];
 
     public function setNormalizer($option, \Closure $normalizer)
     {
@@ -79,7 +79,7 @@ public function addAllowedTypes($option, $allowedTypes)
         return $this;
     }
 
-    public function resolve(array $options = array())
+    public function resolve(array $options = [])
     {
         throw new AccessException('Resolve options is not supported.');
     }
diff --git a/src/Symfony/Component/Form/Util/OrderedHashMap.php b/src/Symfony/Component/Form/Util/OrderedHashMap.php
index 26e45a462250d..19ec4fc7d2a27 100644
--- a/src/Symfony/Component/Form/Util/OrderedHashMap.php
+++ b/src/Symfony/Component/Form/Util/OrderedHashMap.php
@@ -71,28 +71,28 @@ class OrderedHashMap implements \ArrayAccess, \IteratorAggregate, \Countable
      *
      * @var array
      */
-    private $elements = array();
+    private $elements = [];
 
     /**
      * The keys of the map in the order in which they were inserted or changed.
      *
      * @var array
      */
-    private $orderedKeys = array();
+    private $orderedKeys = [];
 
     /**
      * References to the cursors of all open iterators.
      *
      * @var array
      */
-    private $managedCursors = array();
+    private $managedCursors = [];
 
     /**
      * Creates a new map.
      *
      * @param array $elements The elements to insert initially
      */
-    public function __construct(array $elements = array())
+    public function __construct(array $elements = [])
     {
         $this->elements = $elements;
         $this->orderedKeys = array_keys($elements);
@@ -125,7 +125,7 @@ public function offsetSet($key, $value)
     {
         if (null === $key || !isset($this->elements[$key])) {
             if (null === $key) {
-                $key = array() === $this->orderedKeys
+                $key = [] === $this->orderedKeys
                     // If the array is empty, use 0 as key
                     ? 0
                     // Imitate PHP behavior of generating a key that equals
diff --git a/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php b/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php
index 93a7caa58dabe..c34bf2e39b134 100644
--- a/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php
+++ b/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php
@@ -120,7 +120,7 @@ public function key()
             return null;
         }
 
-        $array = array($this->key => null);
+        $array = [$this->key => null];
 
         return key($array);
     }
diff --git a/src/Symfony/Component/Form/Util/StringUtil.php b/src/Symfony/Component/Form/Util/StringUtil.php
index ee71ae7a52e14..241a66810b417 100644
--- a/src/Symfony/Component/Form/Util/StringUtil.php
+++ b/src/Symfony/Component/Form/Util/StringUtil.php
@@ -51,7 +51,7 @@ public static function fqcnToBlockPrefix($fqcn)
     {
         // Non-greedy ("+?") to match "type" suffix, if present
         if (preg_match('~([^\\\\]+?)(type)?$~i', $fqcn, $matches)) {
-            return strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), array('\\1_\\2', '\\1_\\2'), $matches[1]));
+            return strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], ['\\1_\\2', '\\1_\\2'], $matches[1]));
         }
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/AcceptHeader.php b/src/Symfony/Component/HttpFoundation/AcceptHeader.php
index d1740266b7a80..968b71f5d2aff 100644
--- a/src/Symfony/Component/HttpFoundation/AcceptHeader.php
+++ b/src/Symfony/Component/HttpFoundation/AcceptHeader.php
@@ -24,7 +24,7 @@ class AcceptHeader
     /**
      * @var AcceptHeaderItem[]
      */
-    private $items = array();
+    private $items = [];
 
     /**
      * @var bool
diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
index 97023278e0bfa..1c044e2632854 100644
--- a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
+++ b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
@@ -66,7 +66,7 @@ public function __construct($file, $status = 200, $headers = array(), $public =
      *
      * @return static
      */
-    public static function create($file = null, $status = 200, $headers = array(), $public = true, $contentDisposition = null, $autoEtag = false, $autoLastModified = true)
+    public static function create($file = null, $status = 200, $headers = [], $public = true, $contentDisposition = null, $autoEtag = false, $autoLastModified = true)
     {
         return new static($file, $status, $headers, $public, $contentDisposition, $autoEtag, $autoLastModified);
     }
@@ -239,7 +239,7 @@ public function prepare(Request $request)
             if (!$request->headers->has('If-Range') || $this->hasValidIfRangeHeader($request->headers->get('If-Range'))) {
                 $range = $request->headers->get('Range');
 
-                list($start, $end) = explode('-', substr($range, 6), 2) + array(0);
+                list($start, $end) = explode('-', substr($range, 6), 2) + [0];
 
                 $end = ('' === $end) ? $fileSize - 1 : (int) $end;
 
diff --git a/src/Symfony/Component/HttpFoundation/Cookie.php b/src/Symfony/Component/HttpFoundation/Cookie.php
index c38aa409da08b..02e92cf2f7875 100644
--- a/src/Symfony/Component/HttpFoundation/Cookie.php
+++ b/src/Symfony/Component/HttpFoundation/Cookie.php
@@ -128,7 +128,7 @@ public function __construct($name, $value = null, $expire = 0, $path = '/', $dom
             $sameSite = strtolower($sameSite);
         }
 
-        if (!\in_array($sameSite, array(self::SAMESITE_LAX, self::SAMESITE_STRICT, null), true)) {
+        if (!\in_array($sameSite, [self::SAMESITE_LAX, self::SAMESITE_STRICT, null], true)) {
             throw new \InvalidArgumentException('The "sameSite" parameter value is not valid.');
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php b/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php
index e9c8441ce314b..26bed7d3713eb 100644
--- a/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php
+++ b/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php
@@ -35,13 +35,13 @@ public function matches(Request $request)
             throw new \LogicException('Unable to match the request as the expression language is not available.');
         }
 
-        return $this->language->evaluate($this->expression, array(
+        return $this->language->evaluate($this->expression, [
             'request' => $request,
             'method' => $request->getMethod(),
             'path' => rawurldecode($request->getPathInfo()),
             'host' => $request->getHost(),
             'ip' => $request->getClientIp(),
             'attributes' => $request->attributes->all(),
-        )) && parent::matches($request);
+        ]) && parent::matches($request);
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php
index 263fb321c5745..80f4d47f767c0 100644
--- a/src/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php
+++ b/src/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php
@@ -37,7 +37,7 @@ class ExtensionGuesser implements ExtensionGuesserInterface
      *
      * @var array
      */
-    protected $guessers = array();
+    protected $guessers = [];
 
     /**
      * Returns the singleton instance.
diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeExtensionGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeExtensionGuesser.php
index 77bf51b1e5a03..08c5590252570 100644
--- a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeExtensionGuesser.php
+++ b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeExtensionGuesser.php
@@ -24,7 +24,7 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
      *
      * @see http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
      */
-    protected $defaultExtensions = array(
+    protected $defaultExtensions = [
         'application/andrew-inset' => 'ez',
         'application/applixware' => 'aw',
         'application/atom+xml' => 'atom',
@@ -796,7 +796,7 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
         'video/x-sgi-movie' => 'movie',
         'video/x-smv' => 'smv',
         'x-conference/x-cooltalk' => 'ice',
-    );
+    ];
 
     /**
      * {@inheritdoc}
diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php
index dae47a7c023d7..95d1ee26762a5 100644
--- a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php
+++ b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php
@@ -51,7 +51,7 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface
      *
      * @var array
      */
-    protected $guessers = array();
+    protected $guessers = [];
 
     /**
      * Returns the singleton instance.
diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
index de6ce75cc94b3..a44c664b4c6ef 100644
--- a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
+++ b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
@@ -249,7 +249,7 @@ public static function getMaxFilesize()
      */
     public function getErrorMessage()
     {
-        static $errors = array(
+        static $errors = [
             UPLOAD_ERR_INI_SIZE => 'The file "%s" exceeds your upload_max_filesize ini directive (limit is %d KiB).',
             UPLOAD_ERR_FORM_SIZE => 'The file "%s" exceeds the upload limit defined in your form.',
             UPLOAD_ERR_PARTIAL => 'The file "%s" was only partially uploaded.',
@@ -257,7 +257,7 @@ public function getErrorMessage()
             UPLOAD_ERR_CANT_WRITE => 'The file "%s" could not be written on disk.',
             UPLOAD_ERR_NO_TMP_DIR => 'File could not be uploaded: missing temporary directory.',
             UPLOAD_ERR_EXTENSION => 'File upload was stopped by a PHP extension.',
-        );
+        ];
 
         $errorCode = $this->error;
         $maxFilesize = UPLOAD_ERR_INI_SIZE === $errorCode ? self::getMaxFilesize() / 1024 : 0;
diff --git a/src/Symfony/Component/HttpFoundation/FileBag.php b/src/Symfony/Component/HttpFoundation/FileBag.php
index c135ad6412484..ca849b3d7baf5 100644
--- a/src/Symfony/Component/HttpFoundation/FileBag.php
+++ b/src/Symfony/Component/HttpFoundation/FileBag.php
@@ -21,12 +21,12 @@
  */
 class FileBag extends ParameterBag
 {
-    private static $fileKeys = array('error', 'name', 'size', 'tmp_name', 'type');
+    private static $fileKeys = ['error', 'name', 'size', 'tmp_name', 'type'];
 
     /**
      * @param array $parameters An array of HTTP files
      */
-    public function __construct(array $parameters = array())
+    public function __construct(array $parameters = [])
     {
         $this->replace($parameters);
     }
@@ -34,9 +34,9 @@ public function __construct(array $parameters = array())
     /**
      * {@inheritdoc}
      */
-    public function replace(array $files = array())
+    public function replace(array $files = [])
     {
-        $this->parameters = array();
+        $this->parameters = [];
         $this->add($files);
     }
 
@@ -55,7 +55,7 @@ public function set($key, $value)
     /**
      * {@inheritdoc}
      */
-    public function add(array $files = array())
+    public function add(array $files = [])
     {
         foreach ($files as $key => $file) {
             $this->set($key, $file);
@@ -87,7 +87,7 @@ protected function convertFileInformation($file)
                     $file = new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file['size'], $file['error']);
                 }
             } else {
-                $file = array_map(array($this, 'convertFileInformation'), $file);
+                $file = array_map([$this, 'convertFileInformation'], $file);
                 if (array_keys($keys) === $keys) {
                     $file = array_filter($file);
                 }
@@ -130,13 +130,13 @@ protected function fixPhpFilesArray($data)
         }
 
         foreach ($data['name'] as $key => $name) {
-            $files[$key] = $this->fixPhpFilesArray(array(
+            $files[$key] = $this->fixPhpFilesArray([
                 'error' => $data['error'][$key],
                 'name' => $name,
                 'type' => $data['type'][$key],
                 'tmp_name' => $data['tmp_name'][$key],
                 'size' => $data['size'][$key],
-            ));
+            ]);
         }
 
         return $files;
diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php
index 230253663ccfb..21a94b3a2007e 100644
--- a/src/Symfony/Component/HttpFoundation/HeaderBag.php
+++ b/src/Symfony/Component/HttpFoundation/HeaderBag.php
@@ -18,13 +18,13 @@
  */
 class HeaderBag implements \IteratorAggregate, \Countable
 {
-    protected $headers = array();
-    protected $cacheControl = array();
+    protected $headers = [];
+    protected $cacheControl = [];
 
     /**
      * @param array $headers An array of HTTP headers
      */
-    public function __construct(array $headers = array())
+    public function __construct(array $headers = [])
     {
         foreach ($headers as $key => $values) {
             $this->set($key, $values);
@@ -80,9 +80,9 @@ public function keys()
      *
      * @param array $headers An array of HTTP headers
      */
-    public function replace(array $headers = array())
+    public function replace(array $headers = [])
     {
-        $this->headers = array();
+        $this->headers = [];
         $this->add($headers);
     }
 
@@ -114,10 +114,10 @@ public function get($key, $default = null, $first = true)
 
         if (!array_key_exists($key, $headers)) {
             if (null === $default) {
-                return $first ? null : array();
+                return $first ? null : [];
             }
 
-            return $first ? $default : array($default);
+            return $first ? $default : [$default];
         }
 
         if ($first) {
@@ -148,7 +148,7 @@ public function set($key, $values, $replace = true)
             }
         } else {
             if (true === $replace || !isset($this->headers[$key])) {
-                $this->headers[$key] = array($values);
+                $this->headers[$key] = [$values];
             } else {
                 $this->headers[$key][] = $values;
             }
@@ -196,7 +196,7 @@ public function remove($key)
         unset($this->headers[$key]);
 
         if ('cache-control' === $key) {
-            $this->cacheControl = array();
+            $this->cacheControl = [];
         }
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/IpUtils.php b/src/Symfony/Component/HttpFoundation/IpUtils.php
index a1bfa90885dcf..67d13e57aafce 100644
--- a/src/Symfony/Component/HttpFoundation/IpUtils.php
+++ b/src/Symfony/Component/HttpFoundation/IpUtils.php
@@ -18,7 +18,7 @@
  */
 class IpUtils
 {
-    private static $checkedIps = array();
+    private static $checkedIps = [];
 
     /**
      * This class should not be instantiated.
@@ -38,7 +38,7 @@ private function __construct()
     public static function checkIp($requestIp, $ips)
     {
         if (!\is_array($ips)) {
-            $ips = array($ips);
+            $ips = [$ips];
         }
 
         $method = substr_count($requestIp, ':') > 1 ? 'checkIp6' : 'checkIp4';
diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php
index d741ce099d730..1769f9987c453 100644
--- a/src/Symfony/Component/HttpFoundation/JsonResponse.php
+++ b/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -64,7 +64,7 @@ public function __construct($data = null, $status = 200, $headers = array(), $js
      *
      * @return static
      */
-    public static function create($data = null, $status = 200, $headers = array())
+    public static function create($data = null, $status = 200, $headers = [])
     {
         return new static($data, $status, $headers);
     }
@@ -72,7 +72,7 @@ public static function create($data = null, $status = 200, $headers = array())
     /**
      * Make easier the creation of JsonResponse from raw json.
      */
-    public static function fromJsonString($data = null, $status = 200, $headers = array())
+    public static function fromJsonString($data = null, $status = 200, $headers = [])
     {
         return new static($data, $status, $headers, true);
     }
@@ -94,11 +94,11 @@ public function setCallback($callback = null)
             //      JsonpCallbackValidator is released under the MIT License. See https://github.com/willdurand/JsonpCallbackValidator/blob/v1.1.0/LICENSE for details.
             //      (c) William Durand <william.durand1@gmail.com>
             $pattern = '/^[$_\p{L}][$_\p{L}\p{Mn}\p{Mc}\p{Nd}\p{Pc}\x{200C}\x{200D}]*(?:\[(?:"(?:\\\.|[^"\\\])*"|\'(?:\\\.|[^\'\\\])*\'|\d+)\])*?$/u';
-            $reserved = array(
+            $reserved = [
                 'break', 'do', 'instanceof', 'typeof', 'case', 'else', 'new', 'var', 'catch', 'finally', 'return', 'void', 'continue', 'for', 'switch', 'while',
                 'debugger', 'function', 'this', 'with', 'default', 'if', 'throw', 'delete', 'in', 'try', 'class', 'enum', 'extends', 'super',  'const', 'export',
                 'import', 'implements', 'let', 'private', 'public', 'yield', 'interface', 'package', 'protected', 'static', 'null', 'true', 'false',
-            );
+            ];
             $parts = explode('.', $callback);
             foreach ($parts as $part) {
                 if (!preg_match($pattern, $part) || \in_array($part, $reserved, true)) {
@@ -137,7 +137,7 @@ public function setJson($json)
      *
      * @throws \InvalidArgumentException
      */
-    public function setData($data = array())
+    public function setData($data = [])
     {
         if (\defined('HHVM_VERSION')) {
             // HHVM does not trigger any warnings and let exceptions
diff --git a/src/Symfony/Component/HttpFoundation/ParameterBag.php b/src/Symfony/Component/HttpFoundation/ParameterBag.php
index 19d7ee913a253..3c6ba46a6a08e 100644
--- a/src/Symfony/Component/HttpFoundation/ParameterBag.php
+++ b/src/Symfony/Component/HttpFoundation/ParameterBag.php
@@ -26,7 +26,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
     /**
      * @param array $parameters An array of parameters
      */
-    public function __construct(array $parameters = array())
+    public function __construct(array $parameters = [])
     {
         $this->parameters = $parameters;
     }
@@ -56,7 +56,7 @@ public function keys()
      *
      * @param array $parameters An array of parameters
      */
-    public function replace(array $parameters = array())
+    public function replace(array $parameters = [])
     {
         $this->parameters = $parameters;
     }
@@ -66,7 +66,7 @@ public function replace(array $parameters = array())
      *
      * @param array $parameters An array of parameters
      */
-    public function add(array $parameters = array())
+    public function add(array $parameters = [])
     {
         $this->parameters = array_replace($this->parameters, $parameters);
     }
@@ -154,7 +154,7 @@ public function getAlnum($key, $default = '')
     public function getDigits($key, $default = '')
     {
         // we need to remove - and + because they're allowed in the filter
-        return str_replace(array('-', '+'), '', $this->filter($key, $default, FILTER_SANITIZE_NUMBER_INT));
+        return str_replace(['-', '+'], '', $this->filter($key, $default, FILTER_SANITIZE_NUMBER_INT));
     }
 
     /**
@@ -195,13 +195,13 @@ public function getBoolean($key, $default = false)
      *
      * @return mixed
      */
-    public function filter($key, $default = null, $filter = FILTER_DEFAULT, $options = array())
+    public function filter($key, $default = null, $filter = FILTER_DEFAULT, $options = [])
     {
         $value = $this->get($key, $default);
 
         // Always turn $options into an array - this allows filter_var option shortcuts.
         if (!\is_array($options) && $options) {
-            $options = array('flags' => $options);
+            $options = ['flags' => $options];
         }
 
         // Add a convenience check for arrays.
diff --git a/src/Symfony/Component/HttpFoundation/RedirectResponse.php b/src/Symfony/Component/HttpFoundation/RedirectResponse.php
index 01681dcdf787a..5c6fbc1acd29f 100644
--- a/src/Symfony/Component/HttpFoundation/RedirectResponse.php
+++ b/src/Symfony/Component/HttpFoundation/RedirectResponse.php
@@ -56,7 +56,7 @@ public function __construct($url, $status = 302, $headers = array())
      *
      * @return static
      */
-    public static function create($url = '', $status = 302, $headers = array())
+    public static function create($url = '', $status = 302, $headers = [])
     {
         return new static($url, $status, $headers);
     }
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index 89611660add2f..f32f90ed8d58d 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -61,17 +61,17 @@ class Request
     /**
      * @var string[]
      */
-    protected static $trustedProxies = array();
+    protected static $trustedProxies = [];
 
     /**
      * @var string[]
      */
-    protected static $trustedHostPatterns = array();
+    protected static $trustedHostPatterns = [];
 
     /**
      * @var string[]
      */
-    protected static $trustedHosts = array();
+    protected static $trustedHosts = [];
 
     /**
      * Names for headers that can be trusted when
@@ -250,7 +250,7 @@ class Request
      * @param array                $server     The SERVER parameters
      * @param string|resource|null $content    The raw body data
      */
-    public function __construct(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
+    public function __construct(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null)
     {
         $this->initialize($query, $request, $attributes, $cookies, $files, $server, $content);
     }
@@ -268,7 +268,7 @@ public function __construct(array $query = array(), array $request = array(), ar
      * @param array                $server     The SERVER parameters
      * @param string|resource|null $content    The raw body data
      */
-    public function initialize(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
+    public function initialize(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null)
     {
         $this->request = new ParameterBag($request);
         $this->query = new ParameterBag($query);
@@ -339,9 +339,9 @@ public static function createFromGlobals()
      *
      * @return static
      */
-    public static function create($uri, $method = 'GET', $parameters = array(), $cookies = array(), $files = array(), $server = array(), $content = null)
+    public static function create($uri, $method = 'GET', $parameters = [], $cookies = [], $files = [], $server = [], $content = null)
     {
-        $server = array_replace(array(
+        $server = array_replace([
             'SERVER_NAME' => 'localhost',
             'SERVER_PORT' => 80,
             'HTTP_HOST' => 'localhost',
@@ -354,7 +354,7 @@ public static function create($uri, $method = 'GET', $parameters = array(), $coo
             'SCRIPT_FILENAME' => '',
             'SERVER_PROTOCOL' => 'HTTP/1.1',
             'REQUEST_TIME' => time(),
-        ), $server);
+        ], $server);
 
         $server['PATH_INFO'] = '';
         $server['REQUEST_METHOD'] = strtoupper($method);
@@ -402,10 +402,10 @@ public static function create($uri, $method = 'GET', $parameters = array(), $coo
                 // no break
             case 'PATCH':
                 $request = $parameters;
-                $query = array();
+                $query = [];
                 break;
             default:
-                $request = array();
+                $request = [];
                 $query = $parameters;
                 break;
         }
@@ -428,7 +428,7 @@ public static function create($uri, $method = 'GET', $parameters = array(), $coo
         $server['REQUEST_URI'] = $components['path'].('' !== $queryString ? '?'.$queryString : '');
         $server['QUERY_STRING'] = $queryString;
 
-        return self::createRequestFromFactory($query, $request, array(), $cookies, $files, $server, $content);
+        return self::createRequestFromFactory($query, $request, [], $cookies, $files, $server, $content);
     }
 
     /**
@@ -532,7 +532,7 @@ public function __toString()
         }
 
         $cookieHeader = '';
-        $cookies = array();
+        $cookies = [];
 
         foreach ($this->cookies as $k => $v) {
             $cookies[] = $k.'='.$v;
@@ -644,7 +644,7 @@ public static function setTrustedHosts(array $hostPatterns)
             return sprintf('{%s}i', $hostPattern);
         }, $hostPatterns);
         // we need to reset trusted hosts on trusted host patterns change
-        self::$trustedHosts = array();
+        self::$trustedHosts = [];
     }
 
     /**
@@ -1405,7 +1405,7 @@ public static function getMimeTypes($format)
             static::initializeFormats();
         }
 
-        return isset(static::$formats[$format]) ? static::$formats[$format] : array();
+        return isset(static::$formats[$format]) ? static::$formats[$format] : [];
     }
 
     /**
@@ -1448,7 +1448,7 @@ public function setFormat($format, $mimeTypes)
             static::initializeFormats();
         }
 
-        static::$formats[$format] = \is_array($mimeTypes) ? $mimeTypes : array($mimeTypes);
+        static::$formats[$format] = \is_array($mimeTypes) ? $mimeTypes : [$mimeTypes];
     }
 
     /**
@@ -1578,7 +1578,7 @@ public function isMethodSafe(/* $andCacheable = true */)
      */
     public function isMethodIdempotent()
     {
-        return \in_array($this->getMethod(), array('HEAD', 'GET', 'PUT', 'DELETE', 'TRACE', 'OPTIONS', 'PURGE'));
+        return \in_array($this->getMethod(), ['HEAD', 'GET', 'PUT', 'DELETE', 'TRACE', 'OPTIONS', 'PURGE']);
     }
 
     /**
@@ -1590,7 +1590,7 @@ public function isMethodIdempotent()
      */
     public function isMethodCacheable()
     {
-        return \in_array($this->getMethod(), array('GET', 'HEAD'));
+        return \in_array($this->getMethod(), ['GET', 'HEAD']);
     }
 
     /**
@@ -1704,7 +1704,7 @@ public function getPreferredLanguage(array $locales = null)
             return $locales[0];
         }
 
-        $extendedPreferredLanguages = array();
+        $extendedPreferredLanguages = [];
         foreach ($preferredLanguages as $language) {
             $extendedPreferredLanguages[] = $language;
             if (false !== $position = strpos($language, '_')) {
@@ -1732,7 +1732,7 @@ public function getLanguages()
         }
 
         $languages = AcceptHeader::fromString($this->headers->get('Accept-Language'))->all();
-        $this->languages = array();
+        $this->languages = [];
         foreach ($languages as $lang => $acceptHeaderItem) {
             if (false !== strpos($lang, '-')) {
                 $codes = explode('-', $lang);
@@ -1994,19 +1994,19 @@ protected function preparePathInfo()
      */
     protected static function initializeFormats()
     {
-        static::$formats = array(
-            'html' => array('text/html', 'application/xhtml+xml'),
-            'txt' => array('text/plain'),
-            'js' => array('application/javascript', 'application/x-javascript', 'text/javascript'),
-            'css' => array('text/css'),
-            'json' => array('application/json', 'application/x-json'),
-            'jsonld' => array('application/ld+json'),
-            'xml' => array('text/xml', 'application/xml', 'application/x-xml'),
-            'rdf' => array('application/rdf+xml'),
-            'atom' => array('application/atom+xml'),
-            'rss' => array('application/rss+xml'),
-            'form' => array('application/x-www-form-urlencoded'),
-        );
+        static::$formats = [
+            'html' => ['text/html', 'application/xhtml+xml'],
+            'txt' => ['text/plain'],
+            'js' => ['application/javascript', 'application/x-javascript', 'text/javascript'],
+            'css' => ['text/css'],
+            'json' => ['application/json', 'application/x-json'],
+            'jsonld' => ['application/ld+json'],
+            'xml' => ['text/xml', 'application/xml', 'application/x-xml'],
+            'rdf' => ['application/rdf+xml'],
+            'atom' => ['application/atom+xml'],
+            'rss' => ['application/rss+xml'],
+            'form' => ['application/x-www-form-urlencoded'],
+        ];
     }
 
     /**
@@ -2051,7 +2051,7 @@ private function getUrlencodedPrefix($string, $prefix)
         return false;
     }
 
-    private static function createRequestFromFactory(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
+    private static function createRequestFromFactory(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null)
     {
         if (self::$requestFactory) {
             $request = \call_user_func(self::$requestFactory, $query, $request, $attributes, $cookies, $files, $server, $content);
@@ -2081,8 +2081,8 @@ public function isFromTrustedProxy()
 
     private function getTrustedValues($type, $ip = null)
     {
-        $clientValues = array();
-        $forwardedValues = array();
+        $clientValues = [];
+        $forwardedValues = [];
 
         if (self::$trustedHeaders[$type] && $this->headers->has(self::$trustedHeaders[$type])) {
             foreach (explode(',', $this->headers->get(self::$trustedHeaders[$type])) as $v) {
@@ -2117,7 +2117,7 @@ private function getTrustedValues($type, $ip = null)
         }
 
         if (!$this->isForwardedValid) {
-            return null !== $ip ? array('0.0.0.0', $ip) : array();
+            return null !== $ip ? ['0.0.0.0', $ip] : [];
         }
         $this->isForwardedValid = false;
 
@@ -2127,7 +2127,7 @@ private function getTrustedValues($type, $ip = null)
     private function normalizeAndFilterClientIps(array $clientIps, $ip)
     {
         if (!$clientIps) {
-            return array();
+            return [];
         }
         $clientIps[] = $ip; // Complete the IP chain with the IP the request actually came from
         $firstTrustedIp = null;
@@ -2163,6 +2163,6 @@ private function normalizeAndFilterClientIps(array $clientIps, $ip)
         }
 
         // Now the IP chain contains only untrusted proxies and the client IP
-        return $clientIps ? array_reverse($clientIps) : array($firstTrustedIp);
+        return $clientIps ? array_reverse($clientIps) : [$firstTrustedIp];
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
index 6b4cef147d99f..176464e3d49a2 100644
--- a/src/Symfony/Component/HttpFoundation/RequestMatcher.php
+++ b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
@@ -31,22 +31,22 @@ class RequestMatcher implements RequestMatcherInterface
     /**
      * @var string[]
      */
-    private $methods = array();
+    private $methods = [];
 
     /**
      * @var string[]
      */
-    private $ips = array();
+    private $ips = [];
 
     /**
      * @var array
      */
-    private $attributes = array();
+    private $attributes = [];
 
     /**
      * @var string[]
      */
-    private $schemes = array();
+    private $schemes = [];
 
     /**
      * @param string|null          $path
@@ -76,7 +76,7 @@ public function __construct($path = null, $host = null, $methods = null, $ips =
      */
     public function matchScheme($scheme)
     {
-        $this->schemes = null !== $scheme ? array_map('strtolower', (array) $scheme) : array();
+        $this->schemes = null !== $scheme ? array_map('strtolower', (array) $scheme) : [];
     }
 
     /**
@@ -116,7 +116,7 @@ public function matchIp($ip)
      */
     public function matchIps($ips)
     {
-        $this->ips = null !== $ips ? (array) $ips : array();
+        $this->ips = null !== $ips ? (array) $ips : [];
     }
 
     /**
@@ -126,7 +126,7 @@ public function matchIps($ips)
      */
     public function matchMethod($method)
     {
-        $this->methods = null !== $method ? array_map('strtoupper', (array) $method) : array();
+        $this->methods = null !== $method ? array_map('strtoupper', (array) $method) : [];
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/RequestStack.php b/src/Symfony/Component/HttpFoundation/RequestStack.php
index 40123f66f910b..885d78a50e6e5 100644
--- a/src/Symfony/Component/HttpFoundation/RequestStack.php
+++ b/src/Symfony/Component/HttpFoundation/RequestStack.php
@@ -21,7 +21,7 @@ class RequestStack
     /**
      * @var Request[]
      */
-    private $requests = array();
+    private $requests = [];
 
     /**
      * Pushes a Request on the stack.
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
index f267d1e0e0fcc..30156ae04b65c 100644
--- a/src/Symfony/Component/HttpFoundation/Response.php
+++ b/src/Symfony/Component/HttpFoundation/Response.php
@@ -128,7 +128,7 @@ class Response
      *
      * @var array
      */
-    public static $statusTexts = array(
+    public static $statusTexts = [
         100 => 'Continue',
         101 => 'Switching Protocols',
         102 => 'Processing',            // RFC2518
@@ -191,7 +191,7 @@ class Response
         508 => 'Loop Detected',                                               // RFC5842
         510 => 'Not Extended',                                                // RFC2774
         511 => 'Network Authentication Required',                             // RFC6585
-    );
+    ];
 
     /**
      * @param mixed $content The response content, see setContent()
@@ -222,7 +222,7 @@ public function __construct($content = '', $status = 200, $headers = array())
      *
      * @return static
      */
-    public static function create($content = '', $status = 200, $headers = array())
+    public static function create($content = '', $status = 200, $headers = [])
     {
         return new static($content, $status, $headers);
     }
@@ -375,7 +375,7 @@ public function send()
 
         if (\function_exists('fastcgi_finish_request')) {
             fastcgi_finish_request();
-        } elseif (!\in_array(\PHP_SAPI, array('cli', 'phpdbg'), true)) {
+        } elseif (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
             static::closeOutputBuffers(0, true);
         }
 
@@ -395,7 +395,7 @@ public function send()
      */
     public function setContent($content)
     {
-        if (null !== $content && !\is_string($content) && !is_numeric($content) && !\is_callable(array($content, '__toString'))) {
+        if (null !== $content && !\is_string($content) && !is_numeric($content) && !\is_callable([$content, '__toString'])) {
             throw new \UnexpectedValueException(sprintf('The Response content must be a string or object implementing __toString(), "%s" given.', \gettype($content)));
         }
 
@@ -542,7 +542,7 @@ public function getCharset()
      */
     public function isCacheable()
     {
-        if (!\in_array($this->statusCode, array(200, 203, 300, 301, 302, 404, 410))) {
+        if (!\in_array($this->statusCode, [200, 203, 300, 301, 302, 404, 410])) {
             return false;
         }
 
@@ -974,7 +974,7 @@ public function setEtag($etag = null, $weak = false)
      */
     public function setCache(array $options)
     {
-        if ($diff = array_diff(array_keys($options), array('etag', 'last_modified', 'max_age', 's_maxage', 'private', 'public', 'immutable'))) {
+        if ($diff = array_diff(array_keys($options), ['etag', 'last_modified', 'max_age', 's_maxage', 'private', 'public', 'immutable'])) {
             throw new \InvalidArgumentException(sprintf('Response does not support the following options: "%s".', implode('", "', $diff)));
         }
 
@@ -1035,7 +1035,7 @@ public function setNotModified()
         $this->setContent(null);
 
         // remove headers that MUST NOT be included with 304 Not Modified responses
-        foreach (array('Allow', 'Content-Encoding', 'Content-Language', 'Content-Length', 'Content-MD5', 'Content-Type', 'Last-Modified') as $header) {
+        foreach (['Allow', 'Content-Encoding', 'Content-Language', 'Content-Length', 'Content-MD5', 'Content-Type', 'Last-Modified'] as $header) {
             $this->headers->remove($header);
         }
 
@@ -1064,10 +1064,10 @@ public function hasVary()
     public function getVary()
     {
         if (!$vary = $this->headers->get('Vary', null, false)) {
-            return array();
+            return [];
         }
 
-        $ret = array();
+        $ret = [];
         foreach ($vary as $item) {
             $ret = array_merge($ret, preg_split('/[\s,]+/', $item));
         }
@@ -1249,7 +1249,7 @@ public function isNotFound()
      */
     public function isRedirect($location = null)
     {
-        return \in_array($this->statusCode, array(201, 301, 302, 303, 307, 308)) && (null === $location ?: $location == $this->headers->get('Location'));
+        return \in_array($this->statusCode, [201, 301, 302, 303, 307, 308]) && (null === $location ?: $location == $this->headers->get('Location'));
     }
 
     /**
@@ -1261,7 +1261,7 @@ public function isRedirect($location = null)
      */
     public function isEmpty()
     {
-        return \in_array($this->statusCode, array(204, 304));
+        return \in_array($this->statusCode, [204, 304]);
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
index 00cff7af08744..7ae909ad3e208 100644
--- a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
+++ b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
@@ -24,11 +24,11 @@ class ResponseHeaderBag extends HeaderBag
     const DISPOSITION_ATTACHMENT = 'attachment';
     const DISPOSITION_INLINE = 'inline';
 
-    protected $computedCacheControl = array();
-    protected $cookies = array();
-    protected $headerNames = array();
+    protected $computedCacheControl = [];
+    protected $cookies = [];
+    protected $headerNames = [];
 
-    public function __construct(array $headers = array())
+    public function __construct(array $headers = [])
     {
         parent::__construct($headers);
 
@@ -49,7 +49,7 @@ public function __construct(array $headers = array())
      */
     public function allPreserveCase()
     {
-        $headers = array();
+        $headers = [];
         foreach ($this->all() as $name => $value) {
             $headers[isset($this->headerNames[$name]) ? $this->headerNames[$name] : $name] = $value;
         }
@@ -70,9 +70,9 @@ public function allPreserveCaseWithoutCookies()
     /**
      * {@inheritdoc}
      */
-    public function replace(array $headers = array())
+    public function replace(array $headers = [])
     {
-        $this->headerNames = array();
+        $this->headerNames = [];
 
         parent::replace($headers);
 
@@ -107,7 +107,7 @@ public function set($key, $values, $replace = true)
 
         if ('set-cookie' === $uniqueKey) {
             if ($replace) {
-                $this->cookies = array();
+                $this->cookies = [];
             }
             foreach ((array) $values as $cookie) {
                 $this->setCookie(Cookie::fromString($cookie));
@@ -122,9 +122,9 @@ public function set($key, $values, $replace = true)
         parent::set($key, $values, $replace);
 
         // ensure the cache-control header has sensible defaults
-        if (\in_array($uniqueKey, array('cache-control', 'etag', 'last-modified', 'expires'), true)) {
+        if (\in_array($uniqueKey, ['cache-control', 'etag', 'last-modified', 'expires'], true)) {
             $computed = $this->computeCacheControlValue();
-            $this->headers['cache-control'] = array($computed);
+            $this->headers['cache-control'] = [$computed];
             $this->headerNames['cache-control'] = 'Cache-Control';
             $this->computedCacheControl = $this->parseCacheControl($computed);
         }
@@ -139,7 +139,7 @@ public function remove($key)
         unset($this->headerNames[$uniqueKey]);
 
         if ('set-cookie' === $uniqueKey) {
-            $this->cookies = array();
+            $this->cookies = [];
 
             return;
         }
@@ -147,7 +147,7 @@ public function remove($key)
         parent::remove($key);
 
         if ('cache-control' === $uniqueKey) {
-            $this->computedCacheControl = array();
+            $this->computedCacheControl = [];
         }
 
         if ('date' === $uniqueKey) {
@@ -216,15 +216,15 @@ public function removeCookie($name, $path = '/', $domain = null)
      */
     public function getCookies($format = self::COOKIES_FLAT)
     {
-        if (!\in_array($format, array(self::COOKIES_FLAT, self::COOKIES_ARRAY))) {
-            throw new \InvalidArgumentException(sprintf('Format "%s" invalid (%s).', $format, implode(', ', array(self::COOKIES_FLAT, self::COOKIES_ARRAY))));
+        if (!\in_array($format, [self::COOKIES_FLAT, self::COOKIES_ARRAY])) {
+            throw new \InvalidArgumentException(sprintf('Format "%s" invalid (%s).', $format, implode(', ', [self::COOKIES_FLAT, self::COOKIES_ARRAY])));
         }
 
         if (self::COOKIES_ARRAY === $format) {
             return $this->cookies;
         }
 
-        $flattenedCookies = array();
+        $flattenedCookies = [];
         foreach ($this->cookies as $path) {
             foreach ($path as $cookies) {
                 foreach ($cookies as $cookie) {
diff --git a/src/Symfony/Component/HttpFoundation/ServerBag.php b/src/Symfony/Component/HttpFoundation/ServerBag.php
index d8ab561aafb17..90da49fae5dbe 100644
--- a/src/Symfony/Component/HttpFoundation/ServerBag.php
+++ b/src/Symfony/Component/HttpFoundation/ServerBag.php
@@ -27,8 +27,8 @@ class ServerBag extends ParameterBag
      */
     public function getHeaders()
     {
-        $headers = array();
-        $contentHeaders = array('CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true);
+        $headers = [];
+        $contentHeaders = ['CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true];
         foreach ($this->parameters as $key => $value) {
             if (0 === strpos($key, 'HTTP_')) {
                 $headers[substr($key, 5)] = $value;
diff --git a/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php b/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php
index fc5fb14101b29..b5666f8543e38 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php
@@ -19,7 +19,7 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta
     private $name = 'attributes';
     private $storageKey;
 
-    protected $attributes = array();
+    protected $attributes = [];
 
     /**
      * @param string $storageKey The key used to store attributes in the session
@@ -95,7 +95,7 @@ public function all()
      */
     public function replace(array $attributes)
     {
-        $this->attributes = array();
+        $this->attributes = [];
         foreach ($attributes as $key => $value) {
             $this->set($key, $value);
         }
@@ -121,7 +121,7 @@ public function remove($name)
     public function clear()
     {
         $return = $this->attributes;
-        $this->attributes = array();
+        $this->attributes = [];
 
         return $return;
     }
diff --git a/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php b/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php
index 2f1e01a971a94..95e48253bfb0d 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php
@@ -115,7 +115,7 @@ protected function &resolveAttributePath($name, $writeContext = false)
                 return $array;
             }
 
-            $array[$parts[0]] = array();
+            $array[$parts[0]] = [];
 
             return $array;
         }
@@ -130,7 +130,7 @@ protected function &resolveAttributePath($name, $writeContext = false)
                     return $null;
                 }
 
-                $array[$part] = array();
+                $array[$part] = [];
             }
 
             $array = &$array[$part];
diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php b/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php
index 77521c24789c6..12345c8238c78 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php
@@ -19,7 +19,7 @@
 class AutoExpireFlashBag implements FlashBagInterface
 {
     private $name = 'flashes';
-    private $flashes = array('display' => array(), 'new' => array());
+    private $flashes = ['display' => [], 'new' => []];
     private $storageKey;
 
     /**
@@ -53,8 +53,8 @@ public function initialize(array &$flashes)
         // The logic: messages from the last request will be stored in new, so we move them to previous
         // This request we will show what is in 'display'.  What is placed into 'new' this time round will
         // be moved to display next time round.
-        $this->flashes['display'] = array_key_exists('new', $this->flashes) ? $this->flashes['new'] : array();
-        $this->flashes['new'] = array();
+        $this->flashes['display'] = array_key_exists('new', $this->flashes) ? $this->flashes['new'] : [];
+        $this->flashes['new'] = [];
     }
 
     /**
@@ -68,7 +68,7 @@ public function add($type, $message)
     /**
      * {@inheritdoc}
      */
-    public function peek($type, array $default = array())
+    public function peek($type, array $default = [])
     {
         return $this->has($type) ? $this->flashes['display'][$type] : $default;
     }
@@ -78,13 +78,13 @@ public function peek($type, array $default = array())
      */
     public function peekAll()
     {
-        return array_key_exists('display', $this->flashes) ? (array) $this->flashes['display'] : array();
+        return array_key_exists('display', $this->flashes) ? (array) $this->flashes['display'] : [];
     }
 
     /**
      * {@inheritdoc}
      */
-    public function get($type, array $default = array())
+    public function get($type, array $default = [])
     {
         $return = $default;
 
@@ -106,7 +106,7 @@ public function get($type, array $default = array())
     public function all()
     {
         $return = $this->flashes['display'];
-        $this->flashes['display'] = array();
+        $this->flashes['display'] = [];
 
         return $return;
     }
diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php
index 12fb740c5220c..19baabb943b6e 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php
@@ -19,7 +19,7 @@
 class FlashBag implements FlashBagInterface
 {
     private $name = 'flashes';
-    private $flashes = array();
+    private $flashes = [];
     private $storageKey;
 
     /**
@@ -62,7 +62,7 @@ public function add($type, $message)
     /**
      * {@inheritdoc}
      */
-    public function peek($type, array $default = array())
+    public function peek($type, array $default = [])
     {
         return $this->has($type) ? $this->flashes[$type] : $default;
     }
@@ -78,7 +78,7 @@ public function peekAll()
     /**
      * {@inheritdoc}
      */
-    public function get($type, array $default = array())
+    public function get($type, array $default = [])
     {
         if (!$this->has($type)) {
             return $default;
@@ -97,7 +97,7 @@ public function get($type, array $default = array())
     public function all()
     {
         $return = $this->peekAll();
-        $this->flashes = array();
+        $this->flashes = [];
 
         return $return;
     }
diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php
index f53c9dae6c0aa..2bd1d62bdbf12 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php
@@ -44,7 +44,7 @@ public function set($type, $message);
      *
      * @return array
      */
-    public function peek($type, array $default = array());
+    public function peek($type, array $default = []);
 
     /**
      * Gets all flash messages.
@@ -61,7 +61,7 @@ public function peekAll();
      *
      * @return array
      */
-    public function get($type, array $default = array());
+    public function get($type, array $default = []);
 
     /**
      * Gets and clears flashes from the stack.
diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php
index 3349906875864..867ceba97f8db 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Session.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Session.php
@@ -28,7 +28,7 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable
 
     private $flashName;
     private $attributeName;
-    private $data = array();
+    private $data = [];
     private $usageIndex = 0;
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php
index 0d119498d0227..7da62fc392308 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php
@@ -113,7 +113,7 @@ public function write($sessionId, $data)
         }
         if (null === $this->igbinaryEmptyData) {
             // see https://github.com/igbinary/igbinary/issues/146
-            $this->igbinaryEmptyData = \function_exists('igbinary_serialize') ? igbinary_serialize(array()) : '';
+            $this->igbinaryEmptyData = \function_exists('igbinary_serialize') ? igbinary_serialize([]) : '';
         }
         if ('' === $data || $this->igbinaryEmptyData === $data) {
             return $this->destroy($sessionId);
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
index 61a7afd90400c..3c3e3b2d22a79 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
@@ -45,11 +45,11 @@ class MemcachedSessionHandler extends AbstractSessionHandler
      *
      * @throws \InvalidArgumentException When unsupported options are passed
      */
-    public function __construct(\Memcached $memcached, array $options = array())
+    public function __construct(\Memcached $memcached, array $options = [])
     {
         $this->memcached = $memcached;
 
-        if ($diff = array_diff(array_keys($options), array('prefix', 'expiretime'))) {
+        if ($diff = array_diff(array_keys($options), ['prefix', 'expiretime'])) {
             throw new \InvalidArgumentException(sprintf('The following options are not supported "%s"', implode(', ', $diff)));
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
index 7d3fa218a269d..cd1cd06725fe5 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
@@ -83,12 +83,12 @@ public function __construct($mongo, array $options)
 
         $this->mongo = $mongo;
 
-        $this->options = array_merge(array(
+        $this->options = array_merge([
             'id_field' => '_id',
             'data_field' => 'data',
             'time_field' => 'time',
             'expiry_field' => 'expires_at',
-        ), $options);
+        ], $options);
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
index 8c0c42fd23dbd..c027a9e6e5ee6 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -118,7 +118,7 @@ class PdoSessionHandler extends AbstractSessionHandler
     /**
      * @var array Connection options when lazy-connect
      */
-    private $connectionOptions = array();
+    private $connectionOptions = [];
 
     /**
      * @var int The strategy for locking, see constants
@@ -130,7 +130,7 @@ class PdoSessionHandler extends AbstractSessionHandler
      *
      * @var \PDOStatement[] An array of statements to release advisory locks
      */
-    private $unlockStatements = array();
+    private $unlockStatements = [];
 
     /**
      * @var bool True when the current session exists but expired according to session.gc_maxlifetime
@@ -169,7 +169,7 @@ class PdoSessionHandler extends AbstractSessionHandler
      *
      * @throws \InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
      */
-    public function __construct($pdoOrDsn = null, array $options = array())
+    public function __construct($pdoOrDsn = null, array $options = [])
     {
         if ($pdoOrDsn instanceof \PDO) {
             if (\PDO::ERRMODE_EXCEPTION !== $pdoOrDsn->getAttribute(\PDO::ATTR_ERRMODE)) {
@@ -468,13 +468,13 @@ private function buildDsnFromUrl($dsnOrUrl)
             throw new \InvalidArgumentException('URLs without scheme are not supported to configure the PdoSessionHandler');
         }
 
-        $driverAliasMap = array(
+        $driverAliasMap = [
             'mssql' => 'sqlsrv',
             'mysql2' => 'mysql', // Amazon RDS, for some weird reason
             'postgres' => 'pgsql',
             'postgresql' => 'pgsql',
             'sqlite3' => 'sqlite',
-        );
+        ];
 
         $driver = isset($driverAliasMap[$params['scheme']]) ? $driverAliasMap[$params['scheme']] : $params['scheme'];
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
index 6f59af486981e..a62f108b34bb6 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
@@ -39,7 +39,7 @@ class MetadataBag implements SessionBagInterface
     /**
      * @var array
      */
-    protected $meta = array(self::CREATED => 0, self::UPDATED => 0, self::LIFETIME => 0);
+    protected $meta = [self::CREATED => 0, self::UPDATED => 0, self::LIFETIME => 0];
 
     /**
      * Unix timestamp.
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
index 027f4efffce51..c1e7523c5e44f 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
@@ -50,7 +50,7 @@ class MockArraySessionStorage implements SessionStorageInterface
     /**
      * @var array
      */
-    protected $data = array();
+    protected $data = [];
 
     /**
      * @var MetadataBag
@@ -60,7 +60,7 @@ class MockArraySessionStorage implements SessionStorageInterface
     /**
      * @var array|SessionBagInterface[]
      */
-    protected $bags = array();
+    protected $bags = [];
 
     /**
      * @param string      $name    Session name
@@ -170,7 +170,7 @@ public function clear()
         }
 
         // clear out the session
-        $this->data = array();
+        $this->data = [];
 
         // reconnect the bags to the session
         $this->loadSession();
@@ -242,11 +242,11 @@ protected function generateId()
 
     protected function loadSession()
     {
-        $bags = array_merge($this->bags, array($this->metadataBag));
+        $bags = array_merge($this->bags, [$this->metadataBag]);
 
         foreach ($bags as $bag) {
             $key = $bag->getStorageKey();
-            $this->data[$key] = isset($this->data[$key]) ? $this->data[$key] : array();
+            $this->data[$key] = isset($this->data[$key]) ? $this->data[$key] : [];
             $bag->initialize($this->data[$key]);
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
index 14f427007ba82..9bbd1baf2cd69 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
@@ -98,7 +98,7 @@ public function save()
                 unset($data[$key]);
             }
         }
-        if (array($key = $this->metadataBag->getStorageKey()) === array_keys($data)) {
+        if ([$key = $this->metadataBag->getStorageKey()] === array_keys($data)) {
             unset($data[$key]);
         }
 
@@ -145,7 +145,7 @@ private function getFilePath()
     private function read()
     {
         $filePath = $this->getFilePath();
-        $this->data = is_readable($filePath) && is_file($filePath) ? unserialize(file_get_contents($filePath)) : array();
+        $this->data = is_readable($filePath) && is_file($filePath) ? unserialize(file_get_contents($filePath)) : [];
 
         $this->loadSession();
     }
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
index a18f812d57e57..480a7a682793b 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -26,7 +26,7 @@ class NativeSessionStorage implements SessionStorageInterface
     /**
      * @var SessionBagInterface[]
      */
-    protected $bags = array();
+    protected $bags = [];
 
     /**
      * @var bool
@@ -226,7 +226,7 @@ public function save()
                 unset($_SESSION[$key]);
             }
         }
-        if (array($key = $this->metadataBag->getStorageKey()) === array_keys($_SESSION)) {
+        if ([$key = $this->metadataBag->getStorageKey()] === array_keys($_SESSION)) {
             unset($_SESSION[$key]);
         }
 
@@ -262,7 +262,7 @@ public function clear()
         }
 
         // clear out the session
-        $_SESSION = array();
+        $_SESSION = [];
 
         // reconnect the bags to the session
         $this->loadSession();
@@ -341,7 +341,7 @@ public function setOptions(array $options)
             return;
         }
 
-        $validOptions = array_flip(array(
+        $validOptions = array_flip([
             'cache_expire', 'cache_limiter', 'cookie_domain', 'cookie_httponly',
             'cookie_lifetime', 'cookie_path', 'cookie_secure',
             'entropy_file', 'entropy_length', 'gc_divisor',
@@ -352,7 +352,7 @@ public function setOptions(array $options)
             'upload_progress.cleanup', 'upload_progress.prefix', 'upload_progress.name',
             'upload_progress.freq', 'upload_progress.min_freq', 'url_rewriter.tags',
             'sid_length', 'sid_bits_per_character', 'trans_sid_hosts', 'trans_sid_tags',
-        ));
+        ]);
 
         foreach ($options as $key => $value) {
             if (isset($validOptions[$key])) {
@@ -422,11 +422,11 @@ protected function loadSession(array &$session = null)
             $session = &$_SESSION;
         }
 
-        $bags = array_merge($this->bags, array($this->metadataBag));
+        $bags = array_merge($this->bags, [$this->metadataBag]);
 
         foreach ($bags as $bag) {
             $key = $bag->getStorageKey();
-            $session[$key] = isset($session[$key]) ? $session[$key] : array();
+            $session[$key] = isset($session[$key]) ? $session[$key] : [];
             $bag->initialize($session[$key]);
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/StreamedResponse.php b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
index 3a55d5d2b9789..1f1cb9e022113 100644
--- a/src/Symfony/Component/HttpFoundation/StreamedResponse.php
+++ b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
@@ -55,7 +55,7 @@ public function __construct(callable $callback = null, $status = 200, $headers =
      *
      * @return static
      */
-    public static function create($callback = null, $status = 200, $headers = array())
+    public static function create($callback = null, $status = 200, $headers = [])
     {
         return new static($callback, $status, $headers);
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/AcceptHeaderItemTest.php b/src/Symfony/Component/HttpFoundation/Tests/AcceptHeaderItemTest.php
index cb43bb35168a7..7306b30178d07 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/AcceptHeaderItemTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/AcceptHeaderItemTest.php
@@ -28,24 +28,24 @@ public function testFromString($string, $value, array $attributes)
 
     public function provideFromStringData()
     {
-        return array(
-            array(
+        return [
+            [
                 'text/html',
-                'text/html', array(),
-            ),
-            array(
+                'text/html', [],
+            ],
+            [
                 '"this;should,not=matter"',
-                'this;should,not=matter', array(),
-            ),
-            array(
+                'this;should,not=matter', [],
+            ],
+            [
                 "text/plain; charset=utf-8;param=\"this;should,not=matter\";\tfootnotes=true",
-                'text/plain', array('charset' => 'utf-8', 'param' => 'this;should,not=matter', 'footnotes' => 'true'),
-            ),
-            array(
+                'text/plain', ['charset' => 'utf-8', 'param' => 'this;should,not=matter', 'footnotes' => 'true'],
+            ],
+            [
                 '"this;should,not=matter";charset=utf-8',
-                'this;should,not=matter', array('charset' => 'utf-8'),
-            ),
-        );
+                'this;should,not=matter', ['charset' => 'utf-8'],
+            ],
+        ];
     }
 
     /**
@@ -85,7 +85,7 @@ public function testValue()
 
     public function testQuality()
     {
-        $item = new AcceptHeaderItem('value', array());
+        $item = new AcceptHeaderItem('value', []);
         $this->assertEquals(1.0, $item->getQuality());
 
         $item->setQuality(0.5);
@@ -98,14 +98,14 @@ public function testQuality()
 
     public function testAttribute()
     {
-        $item = new AcceptHeaderItem('value', array());
-        $this->assertEquals(array(), $item->getAttributes());
+        $item = new AcceptHeaderItem('value', []);
+        $this->assertEquals([], $item->getAttributes());
         $this->assertFalse($item->hasAttribute('test'));
         $this->assertNull($item->getAttribute('test'));
         $this->assertEquals('default', $item->getAttribute('test', 'default'));
 
         $item->setAttribute('test', 'value');
-        $this->assertEquals(array('test' => 'value'), $item->getAttributes());
+        $this->assertEquals(['test' => 'value'], $item->getAttributes());
         $this->assertTrue($item->hasAttribute('test'));
         $this->assertEquals('value', $item->getAttribute('test'));
         $this->assertEquals('value', $item->getAttribute('test', 'default'));
diff --git a/src/Symfony/Component/HttpFoundation/Tests/AcceptHeaderTest.php b/src/Symfony/Component/HttpFoundation/Tests/AcceptHeaderTest.php
index 9929eac28ef01..459b693d5cb84 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/AcceptHeaderTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/AcceptHeaderTest.php
@@ -39,13 +39,13 @@ public function testFromString($string, array $items)
 
     public function provideFromStringData()
     {
-        return array(
-            array('', array()),
-            array('gzip', array(new AcceptHeaderItem('gzip'))),
-            array('gzip,deflate,sdch', array(new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch'))),
-            array("gzip, deflate\t,sdch", array(new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch'))),
-            array('"this;should,not=matter"', array(new AcceptHeaderItem('this;should,not=matter'))),
-        );
+        return [
+            ['', []],
+            ['gzip', [new AcceptHeaderItem('gzip')]],
+            ['gzip,deflate,sdch', [new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch')]],
+            ["gzip, deflate\t,sdch", [new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch')]],
+            ['"this;should,not=matter"', [new AcceptHeaderItem('this;should,not=matter')]],
+        ];
     }
 
     /**
@@ -59,12 +59,12 @@ public function testToString(array $items, $string)
 
     public function provideToStringData()
     {
-        return array(
-            array(array(), ''),
-            array(array(new AcceptHeaderItem('gzip')), 'gzip'),
-            array(array(new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch')), 'gzip,deflate,sdch'),
-            array(array(new AcceptHeaderItem('this;should,not=matter')), 'this;should,not=matter'),
-        );
+        return [
+            [[], ''],
+            [[new AcceptHeaderItem('gzip')], 'gzip'],
+            [[new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch')], 'gzip,deflate,sdch'],
+            [[new AcceptHeaderItem('this;should,not=matter')], 'this;should,not=matter'],
+        ];
     }
 
     /**
@@ -78,9 +78,9 @@ public function testFilter($string, $filter, array $values)
 
     public function provideFilterData()
     {
-        return array(
-            array('fr-FR,fr;q=0.8,en-US;q=0.6,en;q=0.4', '/fr.*/', array('fr-FR', 'fr')),
-        );
+        return [
+            ['fr-FR,fr;q=0.8,en-US;q=0.6,en;q=0.4', '/fr.*/', ['fr-FR', 'fr']],
+        ];
     }
 
     /**
@@ -94,10 +94,10 @@ public function testSorting($string, array $values)
 
     public function provideSortingData()
     {
-        return array(
-            'quality has priority' => array('*;q=0.3,ISO-8859-1,utf-8;q=0.7',  array('ISO-8859-1', 'utf-8', '*')),
-            'order matters when q is equal' => array('*;q=0.3,ISO-8859-1;q=0.7,utf-8;q=0.7',  array('ISO-8859-1', 'utf-8', '*')),
-            'order matters when q is equal2' => array('*;q=0.3,utf-8;q=0.7,ISO-8859-1;q=0.7',  array('utf-8', 'ISO-8859-1', '*')),
-        );
+        return [
+            'quality has priority' => ['*;q=0.3,ISO-8859-1,utf-8;q=0.7',  ['ISO-8859-1', 'utf-8', '*']],
+            'order matters when q is equal' => ['*;q=0.3,ISO-8859-1;q=0.7,utf-8;q=0.7',  ['ISO-8859-1', 'utf-8', '*']],
+            'order matters when q is equal2' => ['*;q=0.3,utf-8;q=0.7,ISO-8859-1;q=0.7',  ['utf-8', 'ISO-8859-1', '*']],
+        ];
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ApacheRequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/ApacheRequestTest.php
index 157ab90ec59a2..6fa3b88917055 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ApacheRequestTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ApacheRequestTest.php
@@ -31,63 +31,63 @@ public function testUriMethods($server, $expectedRequestUri, $expectedBaseUrl, $
 
     public function provideServerVars()
     {
-        return array(
-            array(
-                array(
+        return [
+            [
+                [
                     'REQUEST_URI' => '/foo/app_dev.php/bar',
                     'SCRIPT_NAME' => '/foo/app_dev.php',
                     'PATH_INFO' => '/bar',
-                ),
+                ],
                 '/foo/app_dev.php/bar',
                 '/foo/app_dev.php',
                 '/bar',
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'REQUEST_URI' => '/foo/bar',
                     'SCRIPT_NAME' => '/foo/app_dev.php',
-                ),
+                ],
                 '/foo/bar',
                 '/foo',
                 '/bar',
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'REQUEST_URI' => '/app_dev.php/foo/bar',
                     'SCRIPT_NAME' => '/app_dev.php',
                     'PATH_INFO' => '/foo/bar',
-                ),
+                ],
                 '/app_dev.php/foo/bar',
                 '/app_dev.php',
                 '/foo/bar',
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'REQUEST_URI' => '/foo/bar',
                     'SCRIPT_NAME' => '/app_dev.php',
-                ),
+                ],
                 '/foo/bar',
                 '',
                 '/foo/bar',
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'REQUEST_URI' => '/app_dev.php',
                     'SCRIPT_NAME' => '/app_dev.php',
-                ),
+                ],
                 '/app_dev.php',
                 '/app_dev.php',
                 '/',
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'REQUEST_URI' => '/',
                     'SCRIPT_NAME' => '/app_dev.php',
-                ),
+                ],
                 '/',
                 '',
                 '/',
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
index d21791f000512..2e3e9c39541fc 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
@@ -22,14 +22,14 @@ class BinaryFileResponseTest extends ResponseTestCase
     public function testConstruction()
     {
         $file = __DIR__.'/../README.md';
-        $response = new BinaryFileResponse($file, 404, array('X-Header' => 'Foo'), true, null, true, true);
+        $response = new BinaryFileResponse($file, 404, ['X-Header' => 'Foo'], true, null, true, true);
         $this->assertEquals(404, $response->getStatusCode());
         $this->assertEquals('Foo', $response->headers->get('X-Header'));
         $this->assertTrue($response->headers->has('ETag'));
         $this->assertTrue($response->headers->has('Last-Modified'));
         $this->assertFalse($response->headers->has('Content-Disposition'));
 
-        $response = BinaryFileResponse::create($file, 404, array(), true, ResponseHeaderBag::DISPOSITION_INLINE);
+        $response = BinaryFileResponse::create($file, 404, [], true, ResponseHeaderBag::DISPOSITION_INLINE);
         $this->assertEquals(404, $response->getStatusCode());
         $this->assertFalse($response->headers->has('ETag'));
         $this->assertEquals('inline; filename="README.md"', $response->headers->get('Content-Disposition'));
@@ -39,7 +39,7 @@ public function testConstructWithNonAsciiFilename()
     {
         touch(sys_get_temp_dir().'/fööö.html');
 
-        $response = new BinaryFileResponse(sys_get_temp_dir().'/fööö.html', 200, array(), true, 'attachment');
+        $response = new BinaryFileResponse(sys_get_temp_dir().'/fööö.html', 200, [], true, 'attachment');
 
         @unlink(sys_get_temp_dir().'/fööö.html');
 
@@ -85,7 +85,7 @@ public function testSetContentDispositionGeneratesSafeFallbackFilenameForWrongly
      */
     public function testRequests($requestRange, $offset, $length, $responseRange)
     {
-        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, array('Content-Type' => 'application/octet-stream'))->setAutoEtag();
+        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream'])->setAutoEtag();
 
         // do a request to get the ETag
         $request = Request::create('/');
@@ -117,7 +117,7 @@ public function testRequests($requestRange, $offset, $length, $responseRange)
      */
     public function testRequestsWithoutEtag($requestRange, $offset, $length, $responseRange)
     {
-        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, array('Content-Type' => 'application/octet-stream'));
+        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream']);
 
         // do a request to get the LastModified
         $request = Request::create('/');
@@ -145,19 +145,19 @@ public function testRequestsWithoutEtag($requestRange, $offset, $length, $respon
 
     public function provideRanges()
     {
-        return array(
-            array('bytes=1-4', 1, 4, 'bytes 1-4/35'),
-            array('bytes=-5', 30, 5, 'bytes 30-34/35'),
-            array('bytes=30-', 30, 5, 'bytes 30-34/35'),
-            array('bytes=30-30', 30, 1, 'bytes 30-30/35'),
-            array('bytes=30-34', 30, 5, 'bytes 30-34/35'),
-        );
+        return [
+            ['bytes=1-4', 1, 4, 'bytes 1-4/35'],
+            ['bytes=-5', 30, 5, 'bytes 30-34/35'],
+            ['bytes=30-', 30, 5, 'bytes 30-34/35'],
+            ['bytes=30-30', 30, 1, 'bytes 30-30/35'],
+            ['bytes=30-34', 30, 5, 'bytes 30-34/35'],
+        ];
     }
 
     public function testRangeRequestsWithoutLastModifiedDate()
     {
         // prevent auto last modified
-        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, array('Content-Type' => 'application/octet-stream'), true, null, false, false);
+        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream'], true, null, false, false);
 
         // prepare a request for a range of the testing file
         $request = Request::create('/');
@@ -178,7 +178,7 @@ public function testRangeRequestsWithoutLastModifiedDate()
      */
     public function testFullFileRequests($requestRange)
     {
-        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, array('Content-Type' => 'application/octet-stream'))->setAutoEtag();
+        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream'])->setAutoEtag();
 
         // prepare a request for a range of the testing file
         $request = Request::create('/');
@@ -198,14 +198,14 @@ public function testFullFileRequests($requestRange)
 
     public function provideFullFileRanges()
     {
-        return array(
-            array('bytes=0-'),
-            array('bytes=0-34'),
-            array('bytes=-35'),
+        return [
+            ['bytes=0-'],
+            ['bytes=0-34'],
+            ['bytes=-35'],
             // Syntactical invalid range-request should also return the full resource
-            array('bytes=20-10'),
-            array('bytes=50-40'),
-        );
+            ['bytes=20-10'],
+            ['bytes=50-40'],
+        ];
     }
 
     public function testUnpreparedResponseSendsFullFile()
@@ -226,7 +226,7 @@ public function testUnpreparedResponseSendsFullFile()
      */
     public function testInvalidRequests($requestRange)
     {
-        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, array('Content-Type' => 'application/octet-stream'))->setAutoEtag();
+        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream'])->setAutoEtag();
 
         // prepare a request for a range of the testing file
         $request = Request::create('/');
@@ -242,10 +242,10 @@ public function testInvalidRequests($requestRange)
 
     public function provideInvalidRanges()
     {
-        return array(
-            array('bytes=-40'),
-            array('bytes=30-40'),
-        );
+        return [
+            ['bytes=-40'],
+            ['bytes=30-40'],
+        ];
     }
 
     /**
@@ -257,7 +257,7 @@ public function testXSendfile($file)
         $request->headers->set('X-Sendfile-Type', 'X-Sendfile');
 
         BinaryFileResponse::trustXSendfileTypeHeader();
-        $response = BinaryFileResponse::create($file, 200, array('Content-Type' => 'application/octet-stream'));
+        $response = BinaryFileResponse::create($file, 200, ['Content-Type' => 'application/octet-stream']);
         $response->prepare($request);
 
         $this->expectOutputString('');
@@ -268,10 +268,10 @@ public function testXSendfile($file)
 
     public function provideXSendfileFiles()
     {
-        return array(
-            array(__DIR__.'/../README.md'),
-            array('file://'.__DIR__.'/../README.md'),
-        );
+        return [
+            [__DIR__.'/../README.md'],
+            ['file://'.__DIR__.'/../README.md'],
+        ];
     }
 
     /**
@@ -286,7 +286,7 @@ public function testXAccelMapping($realpath, $mapping, $virtual)
         $file = new FakeFile($realpath, __DIR__.'/File/Fixtures/test');
 
         BinaryFileResponse::trustXSendfileTypeHeader();
-        $response = new BinaryFileResponse($file, 200, array('Content-Type' => 'application/octet-stream'));
+        $response = new BinaryFileResponse($file, 200, ['Content-Type' => 'application/octet-stream']);
         $reflection = new \ReflectionObject($response);
         $property = $reflection->getProperty('file');
         $property->setAccessible(true);
@@ -305,7 +305,7 @@ public function testDeleteFileAfterSend()
         $realPath = realpath($path);
         $this->assertFileExists($realPath);
 
-        $response = new BinaryFileResponse($realPath, 200, array('Content-Type' => 'application/octet-stream'));
+        $response = new BinaryFileResponse($realPath, 200, ['Content-Type' => 'application/octet-stream']);
         $response->deleteFileAfterSend(true);
 
         $response->prepare($request);
@@ -317,7 +317,7 @@ public function testDeleteFileAfterSend()
     public function testAcceptRangeOnUnsafeMethods()
     {
         $request = Request::create('/', 'POST');
-        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, array('Content-Type' => 'application/octet-stream'));
+        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream']);
         $response->prepare($request);
 
         $this->assertEquals('none', $response->headers->get('Accept-Ranges'));
@@ -326,7 +326,7 @@ public function testAcceptRangeOnUnsafeMethods()
     public function testAcceptRangeNotOverriden()
     {
         $request = Request::create('/', 'POST');
-        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, array('Content-Type' => 'application/octet-stream'));
+        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream']);
         $response->headers->set('Accept-Ranges', 'foo');
         $response->prepare($request);
 
@@ -352,7 +352,7 @@ public function testStream()
 
     protected function provideResponse()
     {
-        return new BinaryFileResponse(__DIR__.'/../README.md', 200, array('Content-Type' => 'application/octet-stream'));
+        return new BinaryFileResponse(__DIR__.'/../README.md', 200, ['Content-Type' => 'application/octet-stream']);
     }
 
     public static function tearDownAfterClass()
diff --git a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
index 14c45c9a6c89f..aaf2edb385807 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
@@ -26,17 +26,17 @@ class CookieTest extends TestCase
 {
     public function invalidNames()
     {
-        return array(
-            array(''),
-            array(',MyName'),
-            array(';MyName'),
-            array(' MyName'),
-            array("\tMyName"),
-            array("\rMyName"),
-            array("\nMyName"),
-            array("\013MyName"),
-            array("\014MyName"),
-        );
+        return [
+            [''],
+            [',MyName'],
+            [';MyName'],
+            [' MyName'],
+            ["\tMyName"],
+            ["\rMyName"],
+            ["\nMyName"],
+            ["\013MyName"],
+            ["\014MyName"],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ExpressionRequestMatcherTest.php b/src/Symfony/Component/HttpFoundation/Tests/ExpressionRequestMatcherTest.php
index 1152e46c0be7e..2afdade67d9ce 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ExpressionRequestMatcherTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ExpressionRequestMatcherTest.php
@@ -55,15 +55,15 @@ public function testMatchesWhenParentMatchesIsFalse($expression)
 
     public function provideExpressions()
     {
-        return array(
-            array('request.getMethod() == method', true),
-            array('request.getPathInfo() == path', true),
-            array('request.getHost() == host', true),
-            array('request.getClientIp() == ip', true),
-            array('request.attributes.all() == attributes', true),
-            array('request.getMethod() == method && request.getPathInfo() == path && request.getHost() == host && request.getClientIp() == ip &&  request.attributes.all() == attributes', true),
-            array('request.getMethod() != method', false),
-            array('request.getMethod() != method && request.getPathInfo() == path && request.getHost() == host && request.getClientIp() == ip &&  request.attributes.all() == attributes', false),
-        );
+        return [
+            ['request.getMethod() == method', true],
+            ['request.getPathInfo() == path', true],
+            ['request.getHost() == host', true],
+            ['request.getClientIp() == ip', true],
+            ['request.attributes.all() == attributes', true],
+            ['request.getMethod() == method && request.getPathInfo() == path && request.getHost() == host && request.getClientIp() == ip &&  request.attributes.all() == attributes', true],
+            ['request.getMethod() != method', false],
+            ['request.getMethod() != method && request.getPathInfo() == path && request.getHost() == host && request.getClientIp() == ip &&  request.attributes.all() == attributes', false],
+        ];
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php b/src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php
index dbd9c44bd802c..fb82dae768b4f 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php
@@ -110,14 +110,14 @@ public function testMoveWithNewName()
 
     public function getFilenameFixtures()
     {
-        return array(
-            array('original.gif', 'original.gif'),
-            array('..\\..\\original.gif', 'original.gif'),
-            array('../../original.gif', 'original.gif'),
-            array('файлfile.gif', 'файлfile.gif'),
-            array('..\\..\\файлfile.gif', 'файлfile.gif'),
-            array('../../файлfile.gif', 'файлfile.gif'),
-        );
+        return [
+            ['original.gif', 'original.gif'],
+            ['..\\..\\original.gif', 'original.gif'],
+            ['../../original.gif', 'original.gif'],
+            ['файлfile.gif', 'файлfile.gif'],
+            ['..\\..\\файлfile.gif', 'файлfile.gif'],
+            ['../../файлfile.gif', 'файлfile.gif'],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php b/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php
index 1a88d483505b4..9c02b478edc03 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php
@@ -249,13 +249,13 @@ public function testIsInvalidOnUploadError($error)
 
     public function uploadedFileErrorProvider()
     {
-        return array(
-            array(UPLOAD_ERR_INI_SIZE),
-            array(UPLOAD_ERR_FORM_SIZE),
-            array(UPLOAD_ERR_PARTIAL),
-            array(UPLOAD_ERR_NO_TMP_DIR),
-            array(UPLOAD_ERR_EXTENSION),
-        );
+        return [
+            [UPLOAD_ERR_INI_SIZE],
+            [UPLOAD_ERR_FORM_SIZE],
+            [UPLOAD_ERR_PARTIAL],
+            [UPLOAD_ERR_NO_TMP_DIR],
+            [UPLOAD_ERR_EXTENSION],
+        ];
     }
 
     public function testIsInvalidIfNotHttpUpload()
diff --git a/src/Symfony/Component/HttpFoundation/Tests/FileBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/FileBagTest.php
index b1bbba0d3f57c..1c2c787dd7c79 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/FileBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/FileBagTest.php
@@ -28,7 +28,7 @@ class FileBagTest extends TestCase
      */
     public function testFileMustBeAnArrayOrUploadedFile()
     {
-        new FileBag(array('file' => 'foo'));
+        new FileBag(['file' => 'foo']);
     }
 
     public function testShouldConvertsUploadedFiles()
diff --git a/src/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php
index c5a437f999379..6c4915f2e43b9 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php
@@ -18,7 +18,7 @@ class HeaderBagTest extends TestCase
 {
     public function testConstructor()
     {
-        $bag = new HeaderBag(array('foo' => 'bar'));
+        $bag = new HeaderBag(['foo' => 'bar']);
         $this->assertTrue($bag->has('foo'));
     }
 
@@ -30,20 +30,20 @@ public function testToStringNull()
 
     public function testToStringNotNull()
     {
-        $bag = new HeaderBag(array('foo' => 'bar'));
+        $bag = new HeaderBag(['foo' => 'bar']);
         $this->assertEquals("Foo: bar\r\n", $bag->__toString());
     }
 
     public function testKeys()
     {
-        $bag = new HeaderBag(array('foo' => 'bar'));
+        $bag = new HeaderBag(['foo' => 'bar']);
         $keys = $bag->keys();
         $this->assertEquals('foo', $keys[0]);
     }
 
     public function testGetDate()
     {
-        $bag = new HeaderBag(array('foo' => 'Tue, 4 Sep 2012 20:00:00 +0200'));
+        $bag = new HeaderBag(['foo' => 'Tue, 4 Sep 2012 20:00:00 +0200']);
         $headerDate = $bag->getDate('foo');
         $this->assertInstanceOf('DateTime', $headerDate);
     }
@@ -53,7 +53,7 @@ public function testGetDate()
      */
     public function testGetDateException()
     {
-        $bag = new HeaderBag(array('foo' => 'Tue'));
+        $bag = new HeaderBag(['foo' => 'Tue']);
         $headerDate = $bag->getDate('foo');
     }
 
@@ -67,50 +67,50 @@ public function testGetCacheControlHeader()
 
     public function testAll()
     {
-        $bag = new HeaderBag(array('foo' => 'bar'));
-        $this->assertEquals(array('foo' => array('bar')), $bag->all(), '->all() gets all the input');
+        $bag = new HeaderBag(['foo' => 'bar']);
+        $this->assertEquals(['foo' => ['bar']], $bag->all(), '->all() gets all the input');
 
-        $bag = new HeaderBag(array('FOO' => 'BAR'));
-        $this->assertEquals(array('foo' => array('BAR')), $bag->all(), '->all() gets all the input key are lower case');
+        $bag = new HeaderBag(['FOO' => 'BAR']);
+        $this->assertEquals(['foo' => ['BAR']], $bag->all(), '->all() gets all the input key are lower case');
     }
 
     public function testReplace()
     {
-        $bag = new HeaderBag(array('foo' => 'bar'));
+        $bag = new HeaderBag(['foo' => 'bar']);
 
-        $bag->replace(array('NOPE' => 'BAR'));
-        $this->assertEquals(array('nope' => array('BAR')), $bag->all(), '->replace() replaces the input with the argument');
+        $bag->replace(['NOPE' => 'BAR']);
+        $this->assertEquals(['nope' => ['BAR']], $bag->all(), '->replace() replaces the input with the argument');
         $this->assertFalse($bag->has('foo'), '->replace() overrides previously set the input');
     }
 
     public function testGet()
     {
-        $bag = new HeaderBag(array('foo' => 'bar', 'fuzz' => 'bizz'));
+        $bag = new HeaderBag(['foo' => 'bar', 'fuzz' => 'bizz']);
         $this->assertEquals('bar', $bag->get('foo'), '->get return current value');
         $this->assertEquals('bar', $bag->get('FoO'), '->get key in case insensitive');
-        $this->assertEquals(array('bar'), $bag->get('foo', 'nope', false), '->get return the value as array');
+        $this->assertEquals(['bar'], $bag->get('foo', 'nope', false), '->get return the value as array');
 
         // defaults
         $this->assertNull($bag->get('none'), '->get unknown values returns null');
         $this->assertEquals('default', $bag->get('none', 'default'), '->get unknown values returns default');
-        $this->assertEquals(array('default'), $bag->get('none', 'default', false), '->get unknown values returns default as array');
+        $this->assertEquals(['default'], $bag->get('none', 'default', false), '->get unknown values returns default as array');
 
         $bag->set('foo', 'bor', false);
         $this->assertEquals('bar', $bag->get('foo'), '->get return first value');
-        $this->assertEquals(array('bar', 'bor'), $bag->get('foo', 'nope', false), '->get return all values as array');
+        $this->assertEquals(['bar', 'bor'], $bag->get('foo', 'nope', false), '->get return all values as array');
     }
 
     public function testSetAssociativeArray()
     {
         $bag = new HeaderBag();
-        $bag->set('foo', array('bad-assoc-index' => 'value'));
+        $bag->set('foo', ['bad-assoc-index' => 'value']);
         $this->assertSame('value', $bag->get('foo'));
-        $this->assertEquals(array('value'), $bag->get('foo', 'nope', false), 'assoc indices of multi-valued headers are ignored');
+        $this->assertEquals(['value'], $bag->get('foo', 'nope', false), 'assoc indices of multi-valued headers are ignored');
     }
 
     public function testContains()
     {
-        $bag = new HeaderBag(array('foo' => 'bar', 'fuzz' => 'bizz'));
+        $bag = new HeaderBag(['foo' => 'bar', 'fuzz' => 'bizz']);
         $this->assertTrue($bag->contains('foo', 'bar'), '->contains first value');
         $this->assertTrue($bag->contains('fuzz', 'bizz'), '->contains second value');
         $this->assertFalse($bag->contains('nope', 'nope'), '->contains unknown value');
@@ -143,7 +143,7 @@ public function testCacheControlDirectiveAccessors()
 
     public function testCacheControlDirectiveParsing()
     {
-        $bag = new HeaderBag(array('cache-control' => 'public, max-age=10'));
+        $bag = new HeaderBag(['cache-control' => 'public, max-age=10']);
         $this->assertTrue($bag->hasCacheControlDirective('public'));
         $this->assertTrue($bag->getCacheControlDirective('public'));
 
@@ -156,15 +156,15 @@ public function testCacheControlDirectiveParsing()
 
     public function testCacheControlDirectiveParsingQuotedZero()
     {
-        $bag = new HeaderBag(array('cache-control' => 'max-age="0"'));
+        $bag = new HeaderBag(['cache-control' => 'max-age="0"']);
         $this->assertTrue($bag->hasCacheControlDirective('max-age'));
         $this->assertEquals(0, $bag->getCacheControlDirective('max-age'));
     }
 
     public function testCacheControlDirectiveOverrideWithReplace()
     {
-        $bag = new HeaderBag(array('cache-control' => 'private, max-age=100'));
-        $bag->replace(array('cache-control' => 'public, max-age=10'));
+        $bag = new HeaderBag(['cache-control' => 'private, max-age=100']);
+        $bag->replace(['cache-control' => 'public, max-age=10']);
         $this->assertTrue($bag->hasCacheControlDirective('public'));
         $this->assertTrue($bag->getCacheControlDirective('public'));
 
@@ -174,7 +174,7 @@ public function testCacheControlDirectiveOverrideWithReplace()
 
     public function testCacheControlClone()
     {
-        $headers = array('foo' => 'bar');
+        $headers = ['foo' => 'bar'];
         $bag1 = new HeaderBag($headers);
         $bag2 = new HeaderBag($bag1->all());
 
@@ -183,13 +183,13 @@ public function testCacheControlClone()
 
     public function testGetIterator()
     {
-        $headers = array('foo' => 'bar', 'hello' => 'world', 'third' => 'charm');
+        $headers = ['foo' => 'bar', 'hello' => 'world', 'third' => 'charm'];
         $headerBag = new HeaderBag($headers);
 
         $i = 0;
         foreach ($headerBag as $key => $val) {
             ++$i;
-            $this->assertEquals(array($headers[$key]), $val);
+            $this->assertEquals([$headers[$key]], $val);
         }
 
         $this->assertEquals(\count($headers), $i);
@@ -197,7 +197,7 @@ public function testGetIterator()
 
     public function testCount()
     {
-        $headers = array('foo' => 'bar', 'HELLO' => 'WORLD');
+        $headers = ['foo' => 'bar', 'HELLO' => 'WORLD'];
         $headerBag = new HeaderBag($headers);
 
         $this->assertCount(\count($headers), $headerBag);
diff --git a/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php b/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
index 232a2040ff635..c7f76b5de2926 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
@@ -26,20 +26,20 @@ public function testIpv4($matches, $remoteAddr, $cidr)
 
     public function getIpv4Data()
     {
-        return array(
-            array(true, '192.168.1.1', '192.168.1.1'),
-            array(true, '192.168.1.1', '192.168.1.1/1'),
-            array(true, '192.168.1.1', '192.168.1.0/24'),
-            array(false, '192.168.1.1', '1.2.3.4/1'),
-            array(false, '192.168.1.1', '192.168.1.1/33'), // invalid subnet
-            array(true, '192.168.1.1', array('1.2.3.4/1', '192.168.1.0/24')),
-            array(true, '192.168.1.1', array('192.168.1.0/24', '1.2.3.4/1')),
-            array(false, '192.168.1.1', array('1.2.3.4/1', '4.3.2.1/1')),
-            array(true, '1.2.3.4', '0.0.0.0/0'),
-            array(true, '1.2.3.4', '192.168.1.0/0'),
-            array(false, '1.2.3.4', '256.256.256/0'), // invalid CIDR notation
-            array(false, 'an_invalid_ip', '192.168.1.0/24'),
-        );
+        return [
+            [true, '192.168.1.1', '192.168.1.1'],
+            [true, '192.168.1.1', '192.168.1.1/1'],
+            [true, '192.168.1.1', '192.168.1.0/24'],
+            [false, '192.168.1.1', '1.2.3.4/1'],
+            [false, '192.168.1.1', '192.168.1.1/33'], // invalid subnet
+            [true, '192.168.1.1', ['1.2.3.4/1', '192.168.1.0/24']],
+            [true, '192.168.1.1', ['192.168.1.0/24', '1.2.3.4/1']],
+            [false, '192.168.1.1', ['1.2.3.4/1', '4.3.2.1/1']],
+            [true, '1.2.3.4', '0.0.0.0/0'],
+            [true, '1.2.3.4', '192.168.1.0/0'],
+            [false, '1.2.3.4', '256.256.256/0'], // invalid CIDR notation
+            [false, 'an_invalid_ip', '192.168.1.0/24'],
+        ];
     }
 
     /**
@@ -56,20 +56,20 @@ public function testIpv6($matches, $remoteAddr, $cidr)
 
     public function getIpv6Data()
     {
-        return array(
-            array(true, '2a01:198:603:0:396e:4789:8e99:890f', '2a01:198:603:0::/65'),
-            array(false, '2a00:198:603:0:396e:4789:8e99:890f', '2a01:198:603:0::/65'),
-            array(false, '2a01:198:603:0:396e:4789:8e99:890f', '::1'),
-            array(true, '0:0:0:0:0:0:0:1', '::1'),
-            array(false, '0:0:603:0:396e:4789:8e99:0001', '::1'),
-            array(true, '0:0:603:0:396e:4789:8e99:0001', '::/0'),
-            array(true, '0:0:603:0:396e:4789:8e99:0001', '2a01:198:603:0::/0'),
-            array(true, '2a01:198:603:0:396e:4789:8e99:890f', array('::1', '2a01:198:603:0::/65')),
-            array(true, '2a01:198:603:0:396e:4789:8e99:890f', array('2a01:198:603:0::/65', '::1')),
-            array(false, '2a01:198:603:0:396e:4789:8e99:890f', array('::1', '1a01:198:603:0::/65')),
-            array(false, '}__test|O:21:&quot;JDatabaseDriverMysqli&quot;:3:{s:2', '::1'),
-            array(false, '2a01:198:603:0:396e:4789:8e99:890f', 'unknown'),
-        );
+        return [
+            [true, '2a01:198:603:0:396e:4789:8e99:890f', '2a01:198:603:0::/65'],
+            [false, '2a00:198:603:0:396e:4789:8e99:890f', '2a01:198:603:0::/65'],
+            [false, '2a01:198:603:0:396e:4789:8e99:890f', '::1'],
+            [true, '0:0:0:0:0:0:0:1', '::1'],
+            [false, '0:0:603:0:396e:4789:8e99:0001', '::1'],
+            [true, '0:0:603:0:396e:4789:8e99:0001', '::/0'],
+            [true, '0:0:603:0:396e:4789:8e99:0001', '2a01:198:603:0::/0'],
+            [true, '2a01:198:603:0:396e:4789:8e99:890f', ['::1', '2a01:198:603:0::/65']],
+            [true, '2a01:198:603:0:396e:4789:8e99:890f', ['2a01:198:603:0::/65', '::1']],
+            [false, '2a01:198:603:0:396e:4789:8e99:890f', ['::1', '1a01:198:603:0::/65']],
+            [false, '}__test|O:21:&quot;JDatabaseDriverMysqli&quot;:3:{s:2', '::1'],
+            [false, '2a01:198:603:0:396e:4789:8e99:890f', 'unknown'],
+        ];
     }
 
     /**
@@ -95,10 +95,10 @@ public function testInvalidIpAddressesDoNotMatch($requestIp, $proxyIp)
 
     public function invalidIpAddressData()
     {
-        return array(
-            'invalid proxy wildcard' => array('192.168.20.13', '*'),
-            'invalid proxy missing netmask' => array('192.168.20.13', '0.0.0.0'),
-            'invalid request IP with invalid proxy wildcard' => array('0.0.0.0', '*'),
-        );
+        return [
+            'invalid proxy wildcard' => ['192.168.20.13', '*'],
+            'invalid proxy missing netmask' => ['192.168.20.13', '0.0.0.0'],
+            'invalid request IP with invalid proxy wildcard' => ['0.0.0.0', '*'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php
index 6687fde5be519..5425896dfa3b7 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php
@@ -33,13 +33,13 @@ public function testConstructorEmptyCreatesJsonObject()
 
     public function testConstructorWithArrayCreatesJsonArray()
     {
-        $response = new JsonResponse(array(0, 1, 2, 3));
+        $response = new JsonResponse([0, 1, 2, 3]);
         $this->assertSame('[0,1,2,3]', $response->getContent());
     }
 
     public function testConstructorWithAssocArrayCreatesJsonObject()
     {
-        $response = new JsonResponse(array('foo' => 'bar'));
+        $response = new JsonResponse(['foo' => 'bar']);
         $this->assertSame('{"foo":"bar"}', $response->getContent());
     }
 
@@ -60,7 +60,7 @@ public function testConstructorWithSimpleTypes()
 
     public function testConstructorWithCustomStatus()
     {
-        $response = new JsonResponse(array(), 202);
+        $response = new JsonResponse([], 202);
         $this->assertSame(202, $response->getStatusCode());
     }
 
@@ -72,35 +72,35 @@ public function testConstructorAddsContentTypeHeader()
 
     public function testConstructorWithCustomHeaders()
     {
-        $response = new JsonResponse(array(), 200, array('ETag' => 'foo'));
+        $response = new JsonResponse([], 200, ['ETag' => 'foo']);
         $this->assertSame('application/json', $response->headers->get('Content-Type'));
         $this->assertSame('foo', $response->headers->get('ETag'));
     }
 
     public function testConstructorWithCustomContentType()
     {
-        $headers = array('Content-Type' => 'application/vnd.acme.blog-v1+json');
+        $headers = ['Content-Type' => 'application/vnd.acme.blog-v1+json'];
 
-        $response = new JsonResponse(array(), 200, $headers);
+        $response = new JsonResponse([], 200, $headers);
         $this->assertSame('application/vnd.acme.blog-v1+json', $response->headers->get('Content-Type'));
     }
 
     public function testSetJson()
     {
-        $response = new JsonResponse('1', 200, array(), true);
+        $response = new JsonResponse('1', 200, [], true);
         $this->assertEquals('1', $response->getContent());
 
-        $response = new JsonResponse('[1]', 200, array(), true);
+        $response = new JsonResponse('[1]', 200, [], true);
         $this->assertEquals('[1]', $response->getContent());
 
-        $response = new JsonResponse(null, 200, array());
+        $response = new JsonResponse(null, 200, []);
         $response->setJson('true');
         $this->assertEquals('true', $response->getContent());
     }
 
     public function testCreate()
     {
-        $response = JsonResponse::create(array('foo' => 'bar'), 204);
+        $response = JsonResponse::create(['foo' => 'bar'], 204);
 
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response);
         $this->assertEquals('{"foo":"bar"}', $response->getContent());
@@ -116,14 +116,14 @@ public function testStaticCreateEmptyJsonObject()
 
     public function testStaticCreateJsonArray()
     {
-        $response = JsonResponse::create(array(0, 1, 2, 3));
+        $response = JsonResponse::create([0, 1, 2, 3]);
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response);
         $this->assertSame('[0,1,2,3]', $response->getContent());
     }
 
     public function testStaticCreateJsonObject()
     {
-        $response = JsonResponse::create(array('foo' => 'bar'));
+        $response = JsonResponse::create(['foo' => 'bar']);
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response);
         $this->assertSame('{"foo":"bar"}', $response->getContent());
     }
@@ -149,7 +149,7 @@ public function testStaticCreateWithSimpleTypes()
 
     public function testStaticCreateWithCustomStatus()
     {
-        $response = JsonResponse::create(array(), 202);
+        $response = JsonResponse::create([], 202);
         $this->assertSame(202, $response->getStatusCode());
     }
 
@@ -161,22 +161,22 @@ public function testStaticCreateAddsContentTypeHeader()
 
     public function testStaticCreateWithCustomHeaders()
     {
-        $response = JsonResponse::create(array(), 200, array('ETag' => 'foo'));
+        $response = JsonResponse::create([], 200, ['ETag' => 'foo']);
         $this->assertSame('application/json', $response->headers->get('Content-Type'));
         $this->assertSame('foo', $response->headers->get('ETag'));
     }
 
     public function testStaticCreateWithCustomContentType()
     {
-        $headers = array('Content-Type' => 'application/vnd.acme.blog-v1+json');
+        $headers = ['Content-Type' => 'application/vnd.acme.blog-v1+json'];
 
-        $response = JsonResponse::create(array(), 200, $headers);
+        $response = JsonResponse::create([], 200, $headers);
         $this->assertSame('application/vnd.acme.blog-v1+json', $response->headers->get('Content-Type'));
     }
 
     public function testSetCallback()
     {
-        $response = JsonResponse::create(array('foo' => 'bar'))->setCallback('callback');
+        $response = JsonResponse::create(['foo' => 'bar'])->setCallback('callback');
 
         $this->assertEquals('/**/callback({"foo":"bar"});', $response->getContent());
         $this->assertEquals('text/javascript', $response->headers->get('Content-Type'));
@@ -199,7 +199,7 @@ public function testGetEncodingOptions()
     public function testSetEncodingOptions()
     {
         $response = new JsonResponse();
-        $response->setData(array(array(1, 2, 3)));
+        $response->setData([[1, 2, 3]]);
 
         $this->assertEquals('[[1,2,3]]', $response->getContent());
 
@@ -248,7 +248,7 @@ public function testSetContentJsonSerializeError()
 
     public function testSetComplexCallback()
     {
-        $response = JsonResponse::create(array('foo' => 'bar'));
+        $response = JsonResponse::create(['foo' => 'bar']);
         $response->setCallback('ಠ_ಠ["foo"].bar[0]');
 
         $this->assertEquals('/**/ಠ_ಠ["foo"].bar[0]({"foo":"bar"});', $response->getContent());
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
index dccfd4f308687..d2a5c991cc7f6 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
@@ -23,44 +23,44 @@ public function testConstructor()
 
     public function testAll()
     {
-        $bag = new ParameterBag(array('foo' => 'bar'));
-        $this->assertEquals(array('foo' => 'bar'), $bag->all(), '->all() gets all the input');
+        $bag = new ParameterBag(['foo' => 'bar']);
+        $this->assertEquals(['foo' => 'bar'], $bag->all(), '->all() gets all the input');
     }
 
     public function testKeys()
     {
-        $bag = new ParameterBag(array('foo' => 'bar'));
-        $this->assertEquals(array('foo'), $bag->keys());
+        $bag = new ParameterBag(['foo' => 'bar']);
+        $this->assertEquals(['foo'], $bag->keys());
     }
 
     public function testAdd()
     {
-        $bag = new ParameterBag(array('foo' => 'bar'));
-        $bag->add(array('bar' => 'bas'));
-        $this->assertEquals(array('foo' => 'bar', 'bar' => 'bas'), $bag->all());
+        $bag = new ParameterBag(['foo' => 'bar']);
+        $bag->add(['bar' => 'bas']);
+        $this->assertEquals(['foo' => 'bar', 'bar' => 'bas'], $bag->all());
     }
 
     public function testRemove()
     {
-        $bag = new ParameterBag(array('foo' => 'bar'));
-        $bag->add(array('bar' => 'bas'));
-        $this->assertEquals(array('foo' => 'bar', 'bar' => 'bas'), $bag->all());
+        $bag = new ParameterBag(['foo' => 'bar']);
+        $bag->add(['bar' => 'bas']);
+        $this->assertEquals(['foo' => 'bar', 'bar' => 'bas'], $bag->all());
         $bag->remove('bar');
-        $this->assertEquals(array('foo' => 'bar'), $bag->all());
+        $this->assertEquals(['foo' => 'bar'], $bag->all());
     }
 
     public function testReplace()
     {
-        $bag = new ParameterBag(array('foo' => 'bar'));
+        $bag = new ParameterBag(['foo' => 'bar']);
 
-        $bag->replace(array('FOO' => 'BAR'));
-        $this->assertEquals(array('FOO' => 'BAR'), $bag->all(), '->replace() replaces the input with the argument');
+        $bag->replace(['FOO' => 'BAR']);
+        $this->assertEquals(['FOO' => 'BAR'], $bag->all(), '->replace() replaces the input with the argument');
         $this->assertFalse($bag->has('foo'), '->replace() overrides previously set the input');
     }
 
     public function testGet()
     {
-        $bag = new ParameterBag(array('foo' => 'bar', 'null' => null));
+        $bag = new ParameterBag(['foo' => 'bar', 'null' => null]);
 
         $this->assertEquals('bar', $bag->get('foo'), '->get() gets the value of a parameter');
         $this->assertEquals('default', $bag->get('unknown', 'default'), '->get() returns second argument as default if a parameter is not defined');
@@ -69,14 +69,14 @@ public function testGet()
 
     public function testGetDoesNotUseDeepByDefault()
     {
-        $bag = new ParameterBag(array('foo' => array('bar' => 'moo')));
+        $bag = new ParameterBag(['foo' => ['bar' => 'moo']]);
 
         $this->assertNull($bag->get('foo[bar]'));
     }
 
     public function testSet()
     {
-        $bag = new ParameterBag(array());
+        $bag = new ParameterBag([]);
 
         $bag->set('foo', 'bar');
         $this->assertEquals('bar', $bag->get('foo'), '->set() sets the value of parameter');
@@ -87,7 +87,7 @@ public function testSet()
 
     public function testHas()
     {
-        $bag = new ParameterBag(array('foo' => 'bar'));
+        $bag = new ParameterBag(['foo' => 'bar']);
 
         $this->assertTrue($bag->has('foo'), '->has() returns true if a parameter is defined');
         $this->assertFalse($bag->has('unknown'), '->has() return false if a parameter is not defined');
@@ -95,7 +95,7 @@ public function testHas()
 
     public function testGetAlpha()
     {
-        $bag = new ParameterBag(array('word' => 'foo_BAR_012'));
+        $bag = new ParameterBag(['word' => 'foo_BAR_012']);
 
         $this->assertEquals('fooBAR', $bag->getAlpha('word'), '->getAlpha() gets only alphabetic characters');
         $this->assertEquals('', $bag->getAlpha('unknown'), '->getAlpha() returns empty string if a parameter is not defined');
@@ -103,7 +103,7 @@ public function testGetAlpha()
 
     public function testGetAlnum()
     {
-        $bag = new ParameterBag(array('word' => 'foo_BAR_012'));
+        $bag = new ParameterBag(['word' => 'foo_BAR_012']);
 
         $this->assertEquals('fooBAR012', $bag->getAlnum('word'), '->getAlnum() gets only alphanumeric characters');
         $this->assertEquals('', $bag->getAlnum('unknown'), '->getAlnum() returns empty string if a parameter is not defined');
@@ -111,7 +111,7 @@ public function testGetAlnum()
 
     public function testGetDigits()
     {
-        $bag = new ParameterBag(array('word' => 'foo_BAR_012'));
+        $bag = new ParameterBag(['word' => 'foo_BAR_012']);
 
         $this->assertEquals('012', $bag->getDigits('word'), '->getDigits() gets only digits as string');
         $this->assertEquals('', $bag->getDigits('unknown'), '->getDigits() returns empty string if a parameter is not defined');
@@ -119,7 +119,7 @@ public function testGetDigits()
 
     public function testGetInt()
     {
-        $bag = new ParameterBag(array('digits' => '0123'));
+        $bag = new ParameterBag(['digits' => '0123']);
 
         $this->assertEquals(123, $bag->getInt('digits'), '->getInt() gets a value of parameter as integer');
         $this->assertEquals(0, $bag->getInt('unknown'), '->getInt() returns zero if a parameter is not defined');
@@ -127,14 +127,14 @@ public function testGetInt()
 
     public function testFilter()
     {
-        $bag = new ParameterBag(array(
+        $bag = new ParameterBag([
             'digits' => '0123ab',
             'email' => 'example@example.com',
             'url' => 'http://example.com/foo',
             'dec' => '256',
             'hex' => '0x100',
-            'array' => array('bang'),
-            ));
+            'array' => ['bang'],
+            ]);
 
         $this->assertEmpty($bag->filter('nokey'), '->filter() should return empty by default if no key is found');
 
@@ -142,27 +142,27 @@ public function testFilter()
 
         $this->assertEquals('example@example.com', $bag->filter('email', '', FILTER_VALIDATE_EMAIL), '->filter() gets a value of parameter as email');
 
-        $this->assertEquals('http://example.com/foo', $bag->filter('url', '', FILTER_VALIDATE_URL, array('flags' => FILTER_FLAG_PATH_REQUIRED)), '->filter() gets a value of parameter as URL with a path');
+        $this->assertEquals('http://example.com/foo', $bag->filter('url', '', FILTER_VALIDATE_URL, ['flags' => FILTER_FLAG_PATH_REQUIRED]), '->filter() gets a value of parameter as URL with a path');
 
         // This test is repeated for code-coverage
         $this->assertEquals('http://example.com/foo', $bag->filter('url', '', FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED), '->filter() gets a value of parameter as URL with a path');
 
-        $this->assertFalse($bag->filter('dec', '', FILTER_VALIDATE_INT, array(
+        $this->assertFalse($bag->filter('dec', '', FILTER_VALIDATE_INT, [
             'flags' => FILTER_FLAG_ALLOW_HEX,
-            'options' => array('min_range' => 1, 'max_range' => 0xff),
-        )), '->filter() gets a value of parameter as integer between boundaries');
+            'options' => ['min_range' => 1, 'max_range' => 0xff],
+        ]), '->filter() gets a value of parameter as integer between boundaries');
 
-        $this->assertFalse($bag->filter('hex', '', FILTER_VALIDATE_INT, array(
+        $this->assertFalse($bag->filter('hex', '', FILTER_VALIDATE_INT, [
             'flags' => FILTER_FLAG_ALLOW_HEX,
-            'options' => array('min_range' => 1, 'max_range' => 0xff),
-        )), '->filter() gets a value of parameter as integer between boundaries');
+            'options' => ['min_range' => 1, 'max_range' => 0xff],
+        ]), '->filter() gets a value of parameter as integer between boundaries');
 
-        $this->assertEquals(array('bang'), $bag->filter('array', ''), '->filter() gets a value of parameter as an array');
+        $this->assertEquals(['bang'], $bag->filter('array', ''), '->filter() gets a value of parameter as an array');
     }
 
     public function testGetIterator()
     {
-        $parameters = array('foo' => 'bar', 'hello' => 'world');
+        $parameters = ['foo' => 'bar', 'hello' => 'world'];
         $bag = new ParameterBag($parameters);
 
         $i = 0;
@@ -176,7 +176,7 @@ public function testGetIterator()
 
     public function testCount()
     {
-        $parameters = array('foo' => 'bar', 'hello' => 'world');
+        $parameters = ['foo' => 'bar', 'hello' => 'world'];
         $bag = new ParameterBag($parameters);
 
         $this->assertCount(\count($parameters), $bag);
@@ -184,7 +184,7 @@ public function testCount()
 
     public function testGetBoolean()
     {
-        $parameters = array('string_true' => 'true', 'string_false' => 'false');
+        $parameters = ['string_true' => 'true', 'string_false' => 'false'];
         $bag = new ParameterBag($parameters);
 
         $this->assertTrue($bag->getBoolean('string_true'), '->getBoolean() gets the string true as boolean true');
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RedirectResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/RedirectResponseTest.php
index d389e83dbe14a..64c3e73ee21af 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/RedirectResponseTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/RedirectResponseTest.php
@@ -22,7 +22,7 @@ public function testGenerateMetaRedirect()
 
         $this->assertEquals(1, preg_match(
             '#<meta http-equiv="refresh" content="\d+;url=foo\.bar" />#',
-            preg_replace(array('/\s+/', '/\'/'), array(' ', '"'), $response->getContent())
+            preg_replace(['/\s+/', '/\'/'], [' ', '"'], $response->getContent())
         ));
     }
 
@@ -87,7 +87,7 @@ public function testCacheHeaders()
         $response = new RedirectResponse('foo.bar', 301);
         $this->assertFalse($response->headers->hasCacheControlDirective('no-cache'));
 
-        $response = new RedirectResponse('foo.bar', 301, array('cache-control' => 'max-age=86400'));
+        $response = new RedirectResponse('foo.bar', 301, ['cache-control' => 'max-age=86400']);
         $this->assertFalse($response->headers->hasCacheControlDirective('no-cache'));
         $this->assertTrue($response->headers->hasCacheControlDirective('max-age'));
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestMatcherTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestMatcherTest.php
index 10d764a776bba..7fb6925bbc7b2 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/RequestMatcherTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/RequestMatcherTest.php
@@ -34,20 +34,20 @@ public function testMethod($requestMethod, $matcherMethod, $isMatch)
 
     public function getMethodData()
     {
-        return array(
-            array('get', 'get', true),
-            array('get', array('get', 'post'), true),
-            array('get', 'post', false),
-            array('get', 'GET', true),
-            array('get', array('GET', 'POST'), true),
-            array('get', 'POST', false),
-        );
+        return [
+            ['get', 'get', true],
+            ['get', ['get', 'post'], true],
+            ['get', 'post', false],
+            ['get', 'GET', true],
+            ['get', ['GET', 'POST'], true],
+            ['get', 'POST', false],
+        ];
     }
 
     public function testScheme()
     {
         $httpRequest = $request = $request = Request::create('');
-        $httpsRequest = $request = $request = Request::create('', 'get', array(), array(), array(), array('HTTPS' => 'on'));
+        $httpsRequest = $request = $request = Request::create('', 'get', [], [], [], ['HTTPS' => 'on']);
 
         $matcher = new RequestMatcher();
         $matcher->matchScheme('https');
@@ -69,7 +69,7 @@ public function testScheme()
     public function testHost($pattern, $isMatch)
     {
         $matcher = new RequestMatcher();
-        $request = Request::create('', 'get', array(), array(), array(), array('HTTP_HOST' => 'foo.example.com'));
+        $request = Request::create('', 'get', [], [], [], ['HTTP_HOST' => 'foo.example.com']);
 
         $matcher->matchHost($pattern);
         $this->assertSame($isMatch, $matcher->matches($request));
@@ -80,16 +80,16 @@ public function testHost($pattern, $isMatch)
 
     public function getHostData()
     {
-        return array(
-            array('.*\.example\.com', true),
-            array('\.example\.com$', true),
-            array('^.*\.example\.com$', true),
-            array('.*\.sensio\.com', false),
-            array('.*\.example\.COM', true),
-            array('\.example\.COM$', true),
-            array('^.*\.example\.COM$', true),
-            array('.*\.sensio\.COM', false),
-        );
+        return [
+            ['.*\.example\.com', true],
+            ['\.example\.com$', true],
+            ['^.*\.example\.com$', true],
+            ['.*\.sensio\.com', false],
+            ['.*\.example\.COM', true],
+            ['\.example\.COM$', true],
+            ['^.*\.example\.COM$', true],
+            ['.*\.sensio\.COM', false],
+        ];
     }
 
     public function testPath()
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
index 539bb69cfb7ce..78a487bfe3992 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -21,24 +21,24 @@ class RequestTest extends TestCase
 {
     protected function tearDown()
     {
-        Request::setTrustedProxies(array(), -1);
-        Request::setTrustedHosts(array());
+        Request::setTrustedProxies([], -1);
+        Request::setTrustedHosts([]);
     }
 
     public function testInitialize()
     {
         $request = new Request();
 
-        $request->initialize(array('foo' => 'bar'));
+        $request->initialize(['foo' => 'bar']);
         $this->assertEquals('bar', $request->query->get('foo'), '->initialize() takes an array of query parameters as its first argument');
 
-        $request->initialize(array(), array('foo' => 'bar'));
+        $request->initialize([], ['foo' => 'bar']);
         $this->assertEquals('bar', $request->request->get('foo'), '->initialize() takes an array of request parameters as its second argument');
 
-        $request->initialize(array(), array(), array('foo' => 'bar'));
+        $request->initialize([], [], ['foo' => 'bar']);
         $this->assertEquals('bar', $request->attributes->get('foo'), '->initialize() takes an array of attributes as its third argument');
 
-        $request->initialize(array(), array(), array(), array(), array(), array('HTTP_FOO' => 'bar'));
+        $request->initialize([], [], [], [], [], ['HTTP_FOO' => 'bar']);
         $this->assertEquals('bar', $request->headers->get('FOO'), '->initialize() takes an array of HTTP headers as its sixth argument');
     }
 
@@ -101,7 +101,7 @@ public function testCreate()
         $this->assertEquals('test.com', $request->getHttpHost());
         $this->assertFalse($request->isSecure());
 
-        $request = Request::create('http://test.com/foo', 'GET', array('bar' => 'baz'));
+        $request = Request::create('http://test.com/foo', 'GET', ['bar' => 'baz']);
         $this->assertEquals('http://test.com/foo?bar=baz', $request->getUri());
         $this->assertEquals('/foo', $request->getPathInfo());
         $this->assertEquals('bar=baz', $request->getQueryString());
@@ -109,7 +109,7 @@ public function testCreate()
         $this->assertEquals('test.com', $request->getHttpHost());
         $this->assertFalse($request->isSecure());
 
-        $request = Request::create('http://test.com/foo?bar=foo', 'GET', array('bar' => 'baz'));
+        $request = Request::create('http://test.com/foo?bar=foo', 'GET', ['bar' => 'baz']);
         $this->assertEquals('http://test.com/foo?bar=baz', $request->getUri());
         $this->assertEquals('/foo', $request->getPathInfo());
         $this->assertEquals('bar=baz', $request->getQueryString());
@@ -166,7 +166,7 @@ public function testCreate()
         $this->assertTrue($request->isSecure());
 
         $json = '{"jsonrpc":"2.0","method":"echo","id":7,"params":["Hello World"]}';
-        $request = Request::create('http://example.com/jsonrpc', 'POST', array(), array(), array(), array(), $json);
+        $request = Request::create('http://example.com/jsonrpc', 'POST', [], [], [], [], $json);
         $this->assertEquals($json, $request->getContent());
         $this->assertFalse($request->isSecure());
 
@@ -216,16 +216,16 @@ public function testCreate()
 
         $request = Request::create('http://test.com/?foo');
         $this->assertEquals('/?foo', $request->getRequestUri());
-        $this->assertEquals(array('foo' => ''), $request->query->all());
+        $this->assertEquals(['foo' => ''], $request->query->all());
 
         // assume rewrite rule: (.*) --> app/app.php; app/ is a symlink to a symfony web/ directory
-        $request = Request::create('http://test.com/apparthotel-1234', 'GET', array(), array(), array(),
-            array(
+        $request = Request::create('http://test.com/apparthotel-1234', 'GET', [], [], [],
+            [
                 'DOCUMENT_ROOT' => '/var/www/www.test.com',
                 'SCRIPT_FILENAME' => '/var/www/www.test.com/app/app.php',
                 'SCRIPT_NAME' => '/app/app.php',
                 'PHP_SELF' => '/app/app.php/apparthotel-1234',
-            ));
+            ]);
         $this->assertEquals('http://test.com/apparthotel-1234', $request->getUri());
         $this->assertEquals('/apparthotel-1234', $request->getPathInfo());
         $this->assertEquals('', $request->getQueryString());
@@ -258,7 +258,7 @@ public function testCreateWithRequestUri()
         $this->assertEquals(8080, $request->getPort());
         $this->assertFalse($request->isSecure());
 
-        $request = Request::create('http://test.com/foo?bar=foo', 'GET', array('bar' => 'baz'));
+        $request = Request::create('http://test.com/foo?bar=foo', 'GET', ['bar' => 'baz']);
         $request->server->set('REQUEST_URI', 'http://test.com/foo?bar=foo');
         $this->assertEquals('http://test.com/foo?bar=baz', $request->getUri());
         $this->assertEquals('/foo', $request->getPathInfo());
@@ -286,7 +286,7 @@ public function testCreateWithRequestUri()
     public function testCreateCheckPrecedence()
     {
         // server is used by default
-        $request = Request::create('/', 'DELETE', array(), array(), array(), array(
+        $request = Request::create('/', 'DELETE', [], [], [], [
             'HTTP_HOST' => 'example.com',
             'HTTPS' => 'on',
             'SERVER_PORT' => 443,
@@ -294,7 +294,7 @@ public function testCreateCheckPrecedence()
             'PHP_AUTH_PW' => 'pa$$',
             'QUERY_STRING' => 'foo=bar',
             'CONTENT_TYPE' => 'application/json',
-        ));
+        ]);
         $this->assertEquals('example.com', $request->getHost());
         $this->assertEquals(443, $request->getPort());
         $this->assertTrue($request->isSecure());
@@ -304,11 +304,11 @@ public function testCreateCheckPrecedence()
         $this->assertEquals('application/json', $request->headers->get('CONTENT_TYPE'));
 
         // URI has precedence over server
-        $request = Request::create('http://thomas:pokemon@example.net:8080/?foo=bar', 'GET', array(), array(), array(), array(
+        $request = Request::create('http://thomas:pokemon@example.net:8080/?foo=bar', 'GET', [], [], [], [
             'HTTP_HOST' => 'example.com',
             'HTTPS' => 'on',
             'SERVER_PORT' => 443,
-        ));
+        ]);
         $this->assertEquals('example.net', $request->getHost());
         $this->assertEquals(8080, $request->getPort());
         $this->assertFalse($request->isSecure());
@@ -319,7 +319,7 @@ public function testCreateCheckPrecedence()
 
     public function testDuplicate()
     {
-        $request = new Request(array('foo' => 'bar'), array('foo' => 'bar'), array('foo' => 'bar'), array(), array(), array('HTTP_FOO' => 'bar'));
+        $request = new Request(['foo' => 'bar'], ['foo' => 'bar'], ['foo' => 'bar'], [], [], ['HTTP_FOO' => 'bar']);
         $dup = $request->duplicate();
 
         $this->assertEquals($request->query->all(), $dup->query->all(), '->duplicate() duplicates a request an copy the current query parameters');
@@ -327,17 +327,17 @@ public function testDuplicate()
         $this->assertEquals($request->attributes->all(), $dup->attributes->all(), '->duplicate() duplicates a request an copy the current attributes');
         $this->assertEquals($request->headers->all(), $dup->headers->all(), '->duplicate() duplicates a request an copy the current HTTP headers');
 
-        $dup = $request->duplicate(array('foo' => 'foobar'), array('foo' => 'foobar'), array('foo' => 'foobar'), array(), array(), array('HTTP_FOO' => 'foobar'));
+        $dup = $request->duplicate(['foo' => 'foobar'], ['foo' => 'foobar'], ['foo' => 'foobar'], [], [], ['HTTP_FOO' => 'foobar']);
 
-        $this->assertEquals(array('foo' => 'foobar'), $dup->query->all(), '->duplicate() overrides the query parameters if provided');
-        $this->assertEquals(array('foo' => 'foobar'), $dup->request->all(), '->duplicate() overrides the request parameters if provided');
-        $this->assertEquals(array('foo' => 'foobar'), $dup->attributes->all(), '->duplicate() overrides the attributes if provided');
-        $this->assertEquals(array('foo' => array('foobar')), $dup->headers->all(), '->duplicate() overrides the HTTP header if provided');
+        $this->assertEquals(['foo' => 'foobar'], $dup->query->all(), '->duplicate() overrides the query parameters if provided');
+        $this->assertEquals(['foo' => 'foobar'], $dup->request->all(), '->duplicate() overrides the request parameters if provided');
+        $this->assertEquals(['foo' => 'foobar'], $dup->attributes->all(), '->duplicate() overrides the attributes if provided');
+        $this->assertEquals(['foo' => ['foobar']], $dup->headers->all(), '->duplicate() overrides the HTTP header if provided');
     }
 
     public function testDuplicateWithFormat()
     {
-        $request = new Request(array(), array(), array('_format' => 'json'));
+        $request = new Request([], [], ['_format' => 'json']);
         $dup = $request->duplicate();
 
         $this->assertEquals('json', $dup->getRequestFormat());
@@ -372,7 +372,7 @@ public function testGetFormatFromMimeType($format, $mimeTypes)
     public function getFormatToMimeTypeMapProviderWithAdditionalNullFormat()
     {
         return array_merge(
-            array(array(null, array(null, 'unexistent-mime-type'))),
+            [[null, [null, 'unexistent-mime-type']]],
             $this->getFormatToMimeTypeMapProvider()
         );
     }
@@ -407,7 +407,7 @@ public function testGetMimeTypesFromInexistentFormat()
     {
         $request = new Request();
         $this->assertNull($request->getMimeType('foo'));
-        $this->assertEquals(array(), Request::getMimeTypes('foo'));
+        $this->assertEquals([], Request::getMimeTypes('foo'));
     }
 
     public function testGetFormatWithCustomMimeType()
@@ -419,21 +419,21 @@ public function testGetFormatWithCustomMimeType()
 
     public function getFormatToMimeTypeMapProvider()
     {
-        return array(
-            array('txt', array('text/plain')),
-            array('js', array('application/javascript', 'application/x-javascript', 'text/javascript')),
-            array('css', array('text/css')),
-            array('json', array('application/json', 'application/x-json')),
-            array('jsonld', array('application/ld+json')),
-            array('xml', array('text/xml', 'application/xml', 'application/x-xml')),
-            array('rdf', array('application/rdf+xml')),
-            array('atom', array('application/atom+xml')),
-        );
+        return [
+            ['txt', ['text/plain']],
+            ['js', ['application/javascript', 'application/x-javascript', 'text/javascript']],
+            ['css', ['text/css']],
+            ['json', ['application/json', 'application/x-json']],
+            ['jsonld', ['application/ld+json']],
+            ['xml', ['text/xml', 'application/xml', 'application/x-xml']],
+            ['rdf', ['application/rdf+xml']],
+            ['atom', ['application/atom+xml']],
+        ];
     }
 
     public function testGetUri()
     {
-        $server = array();
+        $server = [];
 
         // Standard Request on non default PORT
         // http://host:8080/index.php/path/info?query=string
@@ -452,7 +452,7 @@ public function testGetUri()
 
         $request = new Request();
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('http://host:8080/index.php/path/info?query=string', $request->getUri(), '->getUri() with non default port');
 
@@ -461,7 +461,7 @@ public function testGetUri()
         $server['SERVER_NAME'] = 'servername';
         $server['SERVER_PORT'] = '80';
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('http://host/index.php/path/info?query=string', $request->getUri(), '->getUri() with default port');
 
@@ -470,7 +470,7 @@ public function testGetUri()
         $server['SERVER_NAME'] = 'servername';
         $server['SERVER_PORT'] = '80';
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('http://servername/index.php/path/info?query=string', $request->getUri(), '->getUri() with default port without HOST_HEADER');
 
@@ -478,7 +478,7 @@ public function testGetUri()
         //   RewriteCond %{REQUEST_FILENAME} !-f
         //   RewriteRule ^(.*)$ index.php [QSA,L]
         // http://host:8080/path/info?query=string
-        $server = array();
+        $server = [];
         $server['HTTP_HOST'] = 'host:8080';
         $server['SERVER_NAME'] = 'servername';
         $server['SERVER_PORT'] = '8080';
@@ -492,7 +492,7 @@ public function testGetUri()
         $server['PHP_SELF'] = '/index.php';
         $server['SCRIPT_FILENAME'] = '/some/where/index.php';
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
         $this->assertEquals('http://host:8080/path/info?query=string', $request->getUri(), '->getUri() with rewrite');
 
         // Use std port number
@@ -501,7 +501,7 @@ public function testGetUri()
         $server['SERVER_NAME'] = 'servername';
         $server['SERVER_PORT'] = '80';
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('http://host/path/info?query=string', $request->getUri(), '->getUri() with rewrite and default port');
 
@@ -510,13 +510,13 @@ public function testGetUri()
         $server['SERVER_NAME'] = 'servername';
         $server['SERVER_PORT'] = '80';
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('http://servername/path/info?query=string', $request->getUri(), '->getUri() with rewrite, default port without HOST_HEADER');
 
         // With encoded characters
 
-        $server = array(
+        $server = [
             'HTTP_HOST' => 'host:8080',
             'SERVER_NAME' => 'servername',
             'SERVER_PORT' => '8080',
@@ -526,9 +526,9 @@ public function testGetUri()
             'PATH_TRANSLATED' => 'redirect:/index.php/foo bar/in+fo',
             'PHP_SELF' => '/ba se/index_dev.php/path/info',
             'SCRIPT_FILENAME' => '/some/where/ba se/index_dev.php',
-        );
+        ];
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals(
             'http://host:8080/ba%20se/index_dev.php/foo%20bar/in+fo?query=string',
@@ -538,11 +538,11 @@ public function testGetUri()
         // with user info
 
         $server['PHP_AUTH_USER'] = 'fabien';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
         $this->assertEquals('http://host:8080/ba%20se/index_dev.php/foo%20bar/in+fo?query=string', $request->getUri());
 
         $server['PHP_AUTH_PW'] = 'symfony';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
         $this->assertEquals('http://host:8080/ba%20se/index_dev.php/foo%20bar/in+fo?query=string', $request->getUri());
     }
 
@@ -560,7 +560,7 @@ public function testGetUriForPath()
         $request = Request::create('https://test.com:90/foo?bar=baz');
         $this->assertEquals('https://test.com:90/some/path', $request->getUriForPath('/some/path'));
 
-        $server = array();
+        $server = [];
 
         // Standard Request on non default PORT
         // http://host:8080/index.php/path/info?query=string
@@ -579,7 +579,7 @@ public function testGetUriForPath()
 
         $request = new Request();
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('http://host:8080/index.php/some/path', $request->getUriForPath('/some/path'), '->getUriForPath() with non default port');
 
@@ -588,7 +588,7 @@ public function testGetUriForPath()
         $server['SERVER_NAME'] = 'servername';
         $server['SERVER_PORT'] = '80';
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('http://host/index.php/some/path', $request->getUriForPath('/some/path'), '->getUriForPath() with default port');
 
@@ -597,7 +597,7 @@ public function testGetUriForPath()
         $server['SERVER_NAME'] = 'servername';
         $server['SERVER_PORT'] = '80';
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('http://servername/index.php/some/path', $request->getUriForPath('/some/path'), '->getUriForPath() with default port without HOST_HEADER');
 
@@ -605,7 +605,7 @@ public function testGetUriForPath()
         //   RewriteCond %{REQUEST_FILENAME} !-f
         //   RewriteRule ^(.*)$ index.php [QSA,L]
         // http://host:8080/path/info?query=string
-        $server = array();
+        $server = [];
         $server['HTTP_HOST'] = 'host:8080';
         $server['SERVER_NAME'] = 'servername';
         $server['SERVER_PORT'] = '8080';
@@ -619,7 +619,7 @@ public function testGetUriForPath()
         $server['PHP_SELF'] = '/index.php';
         $server['SCRIPT_FILENAME'] = '/some/where/index.php';
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
         $this->assertEquals('http://host:8080/some/path', $request->getUriForPath('/some/path'), '->getUri() with rewrite');
 
         // Use std port number
@@ -628,7 +628,7 @@ public function testGetUriForPath()
         $server['SERVER_NAME'] = 'servername';
         $server['SERVER_PORT'] = '80';
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('http://host/some/path', $request->getUriForPath('/some/path'), '->getUriForPath() with rewrite and default port');
 
@@ -637,7 +637,7 @@ public function testGetUriForPath()
         $server['SERVER_NAME'] = 'servername';
         $server['SERVER_PORT'] = '80';
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('http://servername/some/path', $request->getUriForPath('/some/path'), '->getUriForPath() with rewrite, default port without HOST_HEADER');
         $this->assertEquals('servername', $request->getHttpHost());
@@ -645,11 +645,11 @@ public function testGetUriForPath()
         // with user info
 
         $server['PHP_AUTH_USER'] = 'fabien';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
         $this->assertEquals('http://servername/some/path', $request->getUriForPath('/some/path'));
 
         $server['PHP_AUTH_PW'] = 'symfony';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
         $this->assertEquals('http://servername/some/path', $request->getUriForPath('/some/path'));
     }
 
@@ -663,30 +663,30 @@ public function testGetRelativeUriForPath($expected, $pathinfo, $path)
 
     public function getRelativeUriForPathData()
     {
-        return array(
-            array('me.png', '/foo', '/me.png'),
-            array('../me.png', '/foo/bar', '/me.png'),
-            array('me.png', '/foo/bar', '/foo/me.png'),
-            array('../baz/me.png', '/foo/bar/b', '/foo/baz/me.png'),
-            array('../../fooz/baz/me.png', '/foo/bar/b', '/fooz/baz/me.png'),
-            array('baz/me.png', '/foo/bar/b', 'baz/me.png'),
-        );
+        return [
+            ['me.png', '/foo', '/me.png'],
+            ['../me.png', '/foo/bar', '/me.png'],
+            ['me.png', '/foo/bar', '/foo/me.png'],
+            ['../baz/me.png', '/foo/bar/b', '/foo/baz/me.png'],
+            ['../../fooz/baz/me.png', '/foo/bar/b', '/fooz/baz/me.png'],
+            ['baz/me.png', '/foo/bar/b', 'baz/me.png'],
+        ];
     }
 
     public function testGetUserInfo()
     {
         $request = new Request();
 
-        $server = array('PHP_AUTH_USER' => 'fabien');
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $server = ['PHP_AUTH_USER' => 'fabien'];
+        $request->initialize([], [], [], [], [], $server);
         $this->assertEquals('fabien', $request->getUserInfo());
 
         $server['PHP_AUTH_USER'] = '0';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
         $this->assertEquals('0', $request->getUserInfo());
 
         $server['PHP_AUTH_PW'] = '0';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
         $this->assertEquals('0:0', $request->getUserInfo());
     }
 
@@ -694,22 +694,22 @@ public function testGetSchemeAndHttpHost()
     {
         $request = new Request();
 
-        $server = array();
+        $server = [];
         $server['SERVER_NAME'] = 'servername';
         $server['SERVER_PORT'] = '90';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
         $this->assertEquals('http://servername:90', $request->getSchemeAndHttpHost());
 
         $server['PHP_AUTH_USER'] = 'fabien';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
         $this->assertEquals('http://servername:90', $request->getSchemeAndHttpHost());
 
         $server['PHP_AUTH_USER'] = '0';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
         $this->assertEquals('http://servername:90', $request->getSchemeAndHttpHost());
 
         $server['PHP_AUTH_PW'] = '0';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
         $this->assertEquals('http://servername:90', $request->getSchemeAndHttpHost());
     }
 
@@ -765,74 +765,74 @@ public function testGetHost()
     {
         $request = new Request();
 
-        $request->initialize(array('foo' => 'bar'));
+        $request->initialize(['foo' => 'bar']);
         $this->assertEquals('', $request->getHost(), '->getHost() return empty string if not initialized');
 
-        $request->initialize(array(), array(), array(), array(), array(), array('HTTP_HOST' => 'www.example.com'));
+        $request->initialize([], [], [], [], [], ['HTTP_HOST' => 'www.example.com']);
         $this->assertEquals('www.example.com', $request->getHost(), '->getHost() from Host Header');
 
         // Host header with port number
-        $request->initialize(array(), array(), array(), array(), array(), array('HTTP_HOST' => 'www.example.com:8080'));
+        $request->initialize([], [], [], [], [], ['HTTP_HOST' => 'www.example.com:8080']);
         $this->assertEquals('www.example.com', $request->getHost(), '->getHost() from Host Header with port number');
 
         // Server values
-        $request->initialize(array(), array(), array(), array(), array(), array('SERVER_NAME' => 'www.example.com'));
+        $request->initialize([], [], [], [], [], ['SERVER_NAME' => 'www.example.com']);
         $this->assertEquals('www.example.com', $request->getHost(), '->getHost() from server name');
 
-        $request->initialize(array(), array(), array(), array(), array(), array('SERVER_NAME' => 'www.example.com', 'HTTP_HOST' => 'www.host.com'));
+        $request->initialize([], [], [], [], [], ['SERVER_NAME' => 'www.example.com', 'HTTP_HOST' => 'www.host.com']);
         $this->assertEquals('www.host.com', $request->getHost(), '->getHost() value from Host header has priority over SERVER_NAME ');
     }
 
     public function testGetPort()
     {
-        $request = Request::create('http://example.com', 'GET', array(), array(), array(), array(
+        $request = Request::create('http://example.com', 'GET', [], [], [], [
             'HTTP_X_FORWARDED_PROTO' => 'https',
             'HTTP_X_FORWARDED_PORT' => '443',
-        ));
+        ]);
         $port = $request->getPort();
 
         $this->assertEquals(80, $port, 'Without trusted proxies FORWARDED_PROTO and FORWARDED_PORT are ignored.');
 
-        Request::setTrustedProxies(array('1.1.1.1'), Request::HEADER_X_FORWARDED_ALL);
-        $request = Request::create('http://example.com', 'GET', array(), array(), array(), array(
+        Request::setTrustedProxies(['1.1.1.1'], Request::HEADER_X_FORWARDED_ALL);
+        $request = Request::create('http://example.com', 'GET', [], [], [], [
             'HTTP_X_FORWARDED_PROTO' => 'https',
             'HTTP_X_FORWARDED_PORT' => '8443',
-        ));
+        ]);
         $this->assertEquals(80, $request->getPort(), 'With PROTO and PORT on untrusted connection server value takes precedence.');
         $request->server->set('REMOTE_ADDR', '1.1.1.1');
         $this->assertEquals(8443, $request->getPort(), 'With PROTO and PORT set PORT takes precedence.');
 
-        $request = Request::create('http://example.com', 'GET', array(), array(), array(), array(
+        $request = Request::create('http://example.com', 'GET', [], [], [], [
             'HTTP_X_FORWARDED_PROTO' => 'https',
-        ));
+        ]);
         $this->assertEquals(80, $request->getPort(), 'With only PROTO set getPort() ignores trusted headers on untrusted connection.');
         $request->server->set('REMOTE_ADDR', '1.1.1.1');
         $this->assertEquals(443, $request->getPort(), 'With only PROTO set getPort() defaults to 443.');
 
-        $request = Request::create('http://example.com', 'GET', array(), array(), array(), array(
+        $request = Request::create('http://example.com', 'GET', [], [], [], [
             'HTTP_X_FORWARDED_PROTO' => 'http',
-        ));
+        ]);
         $this->assertEquals(80, $request->getPort(), 'If X_FORWARDED_PROTO is set to HTTP getPort() ignores trusted headers on untrusted connection.');
         $request->server->set('REMOTE_ADDR', '1.1.1.1');
         $this->assertEquals(80, $request->getPort(), 'If X_FORWARDED_PROTO is set to HTTP getPort() returns port of the original request.');
 
-        $request = Request::create('http://example.com', 'GET', array(), array(), array(), array(
+        $request = Request::create('http://example.com', 'GET', [], [], [], [
             'HTTP_X_FORWARDED_PROTO' => 'On',
-        ));
+        ]);
         $this->assertEquals(80, $request->getPort(), 'With only PROTO set and value is On, getPort() ignores trusted headers on untrusted connection.');
         $request->server->set('REMOTE_ADDR', '1.1.1.1');
         $this->assertEquals(443, $request->getPort(), 'With only PROTO set and value is On, getPort() defaults to 443.');
 
-        $request = Request::create('http://example.com', 'GET', array(), array(), array(), array(
+        $request = Request::create('http://example.com', 'GET', [], [], [], [
             'HTTP_X_FORWARDED_PROTO' => '1',
-        ));
+        ]);
         $this->assertEquals(80, $request->getPort(), 'With only PROTO set and value is 1, getPort() ignores trusted headers on untrusted connection.');
         $request->server->set('REMOTE_ADDR', '1.1.1.1');
         $this->assertEquals(443, $request->getPort(), 'With only PROTO set and value is 1, getPort() defaults to 443.');
 
-        $request = Request::create('http://example.com', 'GET', array(), array(), array(), array(
+        $request = Request::create('http://example.com', 'GET', [], [], [], [
             'HTTP_X_FORWARDED_PROTO' => 'something-else',
-        ));
+        ]);
         $port = $request->getPort();
         $this->assertEquals(80, $port, 'With only PROTO set and value is not recognized, getPort() defaults to 80.');
     }
@@ -843,7 +843,7 @@ public function testGetPort()
     public function testGetHostWithFakeHttpHostValue()
     {
         $request = new Request();
-        $request->initialize(array(), array(), array(), array(), array(), array('HTTP_HOST' => 'www.host.com?query=string'));
+        $request->initialize([], [], [], [], [], ['HTTP_HOST' => 'www.host.com?query=string']);
         $request->getHost();
     }
 
@@ -903,7 +903,7 @@ public function testGetSetMethod()
 
         $request = new Request();
         $request->setMethod('POST');
-        $request->query->set('_method', array('delete', 'patch'));
+        $request->query->set('_method', ['delete', 'patch']);
         $this->assertSame('POST', $request->getMethod(), '->getMethod() returns the request method if invalid type is defined in query');
     }
 
@@ -1013,15 +1013,15 @@ public function testGetClientIpsWithConflictingHeaders($httpForwarded, $httpXFor
     {
         $request = new Request();
 
-        $server = array(
+        $server = [
             'REMOTE_ADDR' => '88.88.88.88',
             'HTTP_FORWARDED' => $httpForwarded,
             'HTTP_X_FORWARDED_FOR' => $httpXForwardedFor,
-        );
+        ];
 
-        Request::setTrustedProxies(array('88.88.88.88'), Request::HEADER_X_FORWARDED_ALL | Request::HEADER_FORWARDED);
+        Request::setTrustedProxies(['88.88.88.88'], Request::HEADER_X_FORWARDED_ALL | Request::HEADER_FORWARDED);
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $request->getClientIps();
     }
@@ -1033,15 +1033,15 @@ public function testGetClientIpsOnlyXHttpForwardedForTrusted($httpForwarded, $ht
     {
         $request = new Request();
 
-        $server = array(
+        $server = [
             'REMOTE_ADDR' => '88.88.88.88',
             'HTTP_FORWARDED' => $httpForwarded,
             'HTTP_X_FORWARDED_FOR' => $httpXForwardedFor,
-        );
+        ];
 
-        Request::setTrustedProxies(array('88.88.88.88'), Request::HEADER_X_FORWARDED_FOR);
+        Request::setTrustedProxies(['88.88.88.88'], Request::HEADER_X_FORWARDED_FOR);
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertSame(array_reverse(explode(',', $httpXForwardedFor)), $request->getClientIps());
     }
@@ -1049,13 +1049,13 @@ public function testGetClientIpsOnlyXHttpForwardedForTrusted($httpForwarded, $ht
     public function getClientIpsWithConflictingHeadersProvider()
     {
         //        $httpForwarded                   $httpXForwardedFor
-        return array(
-            array('for=87.65.43.21',                 '192.0.2.60'),
-            array('for=87.65.43.21, for=192.0.2.60', '192.0.2.60'),
-            array('for=192.0.2.60',                  '192.0.2.60,87.65.43.21'),
-            array('for="::face", for=192.0.2.60',    '192.0.2.60,192.0.2.43'),
-            array('for=87.65.43.21, for=192.0.2.60', '192.0.2.60,87.65.43.21'),
-        );
+        return [
+            ['for=87.65.43.21',                 '192.0.2.60'],
+            ['for=87.65.43.21, for=192.0.2.60', '192.0.2.60'],
+            ['for=192.0.2.60',                  '192.0.2.60,87.65.43.21'],
+            ['for="::face", for=192.0.2.60',    '192.0.2.60,192.0.2.43'],
+            ['for=87.65.43.21, for=192.0.2.60', '192.0.2.60,87.65.43.21'],
+        ];
     }
 
     /**
@@ -1065,15 +1065,15 @@ public function testGetClientIpsWithAgreeingHeaders($httpForwarded, $httpXForwar
     {
         $request = new Request();
 
-        $server = array(
+        $server = [
             'REMOTE_ADDR' => '88.88.88.88',
             'HTTP_FORWARDED' => $httpForwarded,
             'HTTP_X_FORWARDED_FOR' => $httpXForwardedFor,
-        );
+        ];
 
-        Request::setTrustedProxies(array('88.88.88.88'), -1);
+        Request::setTrustedProxies(['88.88.88.88'], -1);
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $clientIps = $request->getClientIps();
 
@@ -1083,14 +1083,14 @@ public function testGetClientIpsWithAgreeingHeaders($httpForwarded, $httpXForwar
     public function getClientIpsWithAgreeingHeadersProvider()
     {
         //        $httpForwarded                               $httpXForwardedFor
-        return array(
-            array('for="192.0.2.60"',                          '192.0.2.60',             array('192.0.2.60')),
-            array('for=192.0.2.60, for=87.65.43.21',           '192.0.2.60,87.65.43.21', array('87.65.43.21', '192.0.2.60')),
-            array('for="[::face]", for=192.0.2.60',            '::face,192.0.2.60',      array('192.0.2.60', '::face')),
-            array('for="192.0.2.60:80"',                       '192.0.2.60',             array('192.0.2.60')),
-            array('for=192.0.2.60;proto=http;by=203.0.113.43', '192.0.2.60',             array('192.0.2.60')),
-            array('for="[2001:db8:cafe::17]:4711"',            '2001:db8:cafe::17',      array('2001:db8:cafe::17')),
-        );
+        return [
+            ['for="192.0.2.60"',                          '192.0.2.60',             ['192.0.2.60']],
+            ['for=192.0.2.60, for=87.65.43.21',           '192.0.2.60,87.65.43.21', ['87.65.43.21', '192.0.2.60']],
+            ['for="[::face]", for=192.0.2.60',            '::face,192.0.2.60',      ['192.0.2.60', '::face']],
+            ['for="192.0.2.60:80"',                       '192.0.2.60',             ['192.0.2.60']],
+            ['for=192.0.2.60;proto=http;by=203.0.113.43', '192.0.2.60',             ['192.0.2.60']],
+            ['for="[2001:db8:cafe::17]:4711"',            '2001:db8:cafe::17',      ['2001:db8:cafe::17']],
+        ];
     }
 
     public function testGetContentWorksTwiceInDefaultMode()
@@ -1111,7 +1111,7 @@ public function testGetContentReturnsResource()
 
     public function testGetContentReturnsResourceWhenContentSetInConstructor()
     {
-        $req = new Request(array(), array(), array(), array(), array(), array(), 'MyContent');
+        $req = new Request([], [], [], [], [], [], 'MyContent');
         $resource = $req->getContent(true);
 
         $this->assertInternalType('resource', $resource);
@@ -1124,7 +1124,7 @@ public function testContentAsResource()
         fwrite($resource, 'My other content');
         rewind($resource);
 
-        $req = new Request(array(), array(), array(), array(), array(), array(), $resource);
+        $req = new Request([], [], [], [], [], [], $resource);
         $this->assertEquals('My other content', stream_get_contents($req->getContent(true)));
         $this->assertEquals('My other content', $req->getContent());
     }
@@ -1146,10 +1146,10 @@ public function testGetContentCantBeCalledTwiceWithResources($first, $second)
 
     public function getContentCantBeCalledTwiceWithResourcesProvider()
     {
-        return array(
-            'Resource then fetch' => array(true, false),
-            'Resource then resource' => array(true, true),
-        );
+        return [
+            'Resource then fetch' => [true, false],
+            'Resource then resource' => [true, true],
+        ];
     }
 
     /**
@@ -1175,24 +1175,24 @@ public function testGetContentCanBeCalledTwiceWithResources($first, $second)
 
     public function getContentCanBeCalledTwiceWithResourcesProvider()
     {
-        return array(
-            'Fetch then fetch' => array(false, false),
-            'Fetch then resource' => array(false, true),
-            'Resource then fetch' => array(true, false),
-            'Resource then resource' => array(true, true),
-        );
+        return [
+            'Fetch then fetch' => [false, false],
+            'Fetch then resource' => [false, true],
+            'Resource then fetch' => [true, false],
+            'Resource then resource' => [true, true],
+        ];
     }
 
     public function provideOverloadedMethods()
     {
-        return array(
-            array('PUT'),
-            array('DELETE'),
-            array('PATCH'),
-            array('put'),
-            array('delete'),
-            array('patch'),
-        );
+        return [
+            ['PUT'],
+            ['DELETE'],
+            ['PATCH'],
+            ['put'],
+            ['delete'],
+            ['patch'],
+        ];
     }
 
     /**
@@ -1205,14 +1205,14 @@ public function testCreateFromGlobals($method)
         $_GET['foo1'] = 'bar1';
         $_POST['foo2'] = 'bar2';
         $_COOKIE['foo3'] = 'bar3';
-        $_FILES['foo4'] = array('bar4');
+        $_FILES['foo4'] = ['bar4'];
         $_SERVER['foo5'] = 'bar5';
 
         $request = Request::createFromGlobals();
         $this->assertEquals('bar1', $request->query->get('foo1'), '::fromGlobals() uses values from $_GET');
         $this->assertEquals('bar2', $request->request->get('foo2'), '::fromGlobals() uses values from $_POST');
         $this->assertEquals('bar3', $request->cookies->get('foo3'), '::fromGlobals() uses values from $_COOKIE');
-        $this->assertEquals(array('bar4'), $request->files->get('foo4'), '::fromGlobals() uses values from $_FILES');
+        $this->assertEquals(['bar4'], $request->files->get('foo4'), '::fromGlobals() uses values from $_FILES');
         $this->assertEquals('bar5', $request->server->get('foo5'), '::fromGlobals() uses values from $_SERVER');
 
         unset($_GET['foo1'], $_POST['foo2'], $_COOKIE['foo3'], $_FILES['foo4'], $_SERVER['foo5']);
@@ -1242,25 +1242,25 @@ public function testCreateFromGlobals($method)
     public function testOverrideGlobals()
     {
         $request = new Request();
-        $request->initialize(array('foo' => 'bar'));
+        $request->initialize(['foo' => 'bar']);
 
         // as the Request::overrideGlobals really work, it erase $_SERVER, so we must backup it
         $server = $_SERVER;
 
         $request->overrideGlobals();
 
-        $this->assertEquals(array('foo' => 'bar'), $_GET);
+        $this->assertEquals(['foo' => 'bar'], $_GET);
 
-        $request->initialize(array(), array('foo' => 'bar'));
+        $request->initialize([], ['foo' => 'bar']);
         $request->overrideGlobals();
 
-        $this->assertEquals(array('foo' => 'bar'), $_POST);
+        $this->assertEquals(['foo' => 'bar'], $_POST);
 
         $this->assertArrayNotHasKey('HTTP_X_FORWARDED_PROTO', $_SERVER);
 
         $request->headers->set('X_FORWARDED_PROTO', 'https');
 
-        Request::setTrustedProxies(array('1.1.1.1'), Request::HEADER_X_FORWARDED_ALL);
+        Request::setTrustedProxies(['1.1.1.1'], Request::HEADER_X_FORWARDED_ALL);
         $this->assertFalse($request->isSecure());
         $request->server->set('REMOTE_ADDR', '1.1.1.1');
         $this->assertTrue($request->isSecure());
@@ -1277,12 +1277,12 @@ public function testOverrideGlobals()
         $this->assertArrayHasKey('CONTENT_TYPE', $_SERVER);
         $this->assertArrayHasKey('CONTENT_LENGTH', $_SERVER);
 
-        $request->initialize(array('foo' => 'bar', 'baz' => 'foo'));
+        $request->initialize(['foo' => 'bar', 'baz' => 'foo']);
         $request->query->remove('baz');
 
         $request->overrideGlobals();
 
-        $this->assertEquals(array('foo' => 'bar'), $_GET);
+        $this->assertEquals(['foo' => 'bar'], $_GET);
         $this->assertEquals('foo=bar', $_SERVER['QUERY_STRING']);
         $this->assertEquals('foo=bar', $request->server->get('QUERY_STRING'));
 
@@ -1295,23 +1295,23 @@ public function testGetScriptName()
         $request = new Request();
         $this->assertEquals('', $request->getScriptName());
 
-        $server = array();
+        $server = [];
         $server['SCRIPT_NAME'] = '/index.php';
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('/index.php', $request->getScriptName());
 
-        $server = array();
+        $server = [];
         $server['ORIG_SCRIPT_NAME'] = '/frontend.php';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('/frontend.php', $request->getScriptName());
 
-        $server = array();
+        $server = [];
         $server['SCRIPT_NAME'] = '/index.php';
         $server['ORIG_SCRIPT_NAME'] = '/frontend.php';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('/index.php', $request->getScriptName());
     }
@@ -1321,29 +1321,29 @@ public function testGetBasePath()
         $request = new Request();
         $this->assertEquals('', $request->getBasePath());
 
-        $server = array();
+        $server = [];
         $server['SCRIPT_FILENAME'] = '/some/where/index.php';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
         $this->assertEquals('', $request->getBasePath());
 
-        $server = array();
+        $server = [];
         $server['SCRIPT_FILENAME'] = '/some/where/index.php';
         $server['SCRIPT_NAME'] = '/index.php';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('', $request->getBasePath());
 
-        $server = array();
+        $server = [];
         $server['SCRIPT_FILENAME'] = '/some/where/index.php';
         $server['PHP_SELF'] = '/index.php';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('', $request->getBasePath());
 
-        $server = array();
+        $server = [];
         $server['SCRIPT_FILENAME'] = '/some/where/index.php';
         $server['ORIG_SCRIPT_NAME'] = '/index.php';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('', $request->getBasePath());
     }
@@ -1353,21 +1353,21 @@ public function testGetPathInfo()
         $request = new Request();
         $this->assertEquals('/', $request->getPathInfo());
 
-        $server = array();
+        $server = [];
         $server['REQUEST_URI'] = '/path/info';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('/path/info', $request->getPathInfo());
 
-        $server = array();
+        $server = [];
         $server['REQUEST_URI'] = '/path%20test/info';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('/path%20test/info', $request->getPathInfo());
 
-        $server = array();
+        $server = [];
         $server['REQUEST_URI'] = '?a=b';
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         $this->assertEquals('/', $request->getPathInfo());
     }
@@ -1395,27 +1395,27 @@ public function testGetPreferredLanguage()
     {
         $request = new Request();
         $this->assertNull($request->getPreferredLanguage());
-        $this->assertNull($request->getPreferredLanguage(array()));
-        $this->assertEquals('fr', $request->getPreferredLanguage(array('fr')));
-        $this->assertEquals('fr', $request->getPreferredLanguage(array('fr', 'en')));
-        $this->assertEquals('en', $request->getPreferredLanguage(array('en', 'fr')));
-        $this->assertEquals('fr-ch', $request->getPreferredLanguage(array('fr-ch', 'fr-fr')));
+        $this->assertNull($request->getPreferredLanguage([]));
+        $this->assertEquals('fr', $request->getPreferredLanguage(['fr']));
+        $this->assertEquals('fr', $request->getPreferredLanguage(['fr', 'en']));
+        $this->assertEquals('en', $request->getPreferredLanguage(['en', 'fr']));
+        $this->assertEquals('fr-ch', $request->getPreferredLanguage(['fr-ch', 'fr-fr']));
 
         $request = new Request();
         $request->headers->set('Accept-language', 'zh, en-us; q=0.8, en; q=0.6');
-        $this->assertEquals('en', $request->getPreferredLanguage(array('en', 'en-us')));
+        $this->assertEquals('en', $request->getPreferredLanguage(['en', 'en-us']));
 
         $request = new Request();
         $request->headers->set('Accept-language', 'zh, en-us; q=0.8, en; q=0.6');
-        $this->assertEquals('en', $request->getPreferredLanguage(array('fr', 'en')));
+        $this->assertEquals('en', $request->getPreferredLanguage(['fr', 'en']));
 
         $request = new Request();
         $request->headers->set('Accept-language', 'zh, en-us; q=0.8');
-        $this->assertEquals('en', $request->getPreferredLanguage(array('fr', 'en')));
+        $this->assertEquals('en', $request->getPreferredLanguage(['fr', 'en']));
 
         $request = new Request();
         $request->headers->set('Accept-language', 'zh, en-us; q=0.8, fr-fr; q=0.6, fr; q=0.5');
-        $this->assertEquals('en', $request->getPreferredLanguage(array('fr', 'en')));
+        $this->assertEquals('en', $request->getPreferredLanguage(['fr', 'en']));
     }
 
     public function testIsXmlHttpRequest()
@@ -1453,72 +1453,72 @@ public function testIntlLocale()
     public function testGetCharsets()
     {
         $request = new Request();
-        $this->assertEquals(array(), $request->getCharsets());
+        $this->assertEquals([], $request->getCharsets());
         $request->headers->set('Accept-Charset', 'ISO-8859-1, US-ASCII, UTF-8; q=0.8, ISO-10646-UCS-2; q=0.6');
-        $this->assertEquals(array(), $request->getCharsets()); // testing caching
+        $this->assertEquals([], $request->getCharsets()); // testing caching
 
         $request = new Request();
         $request->headers->set('Accept-Charset', 'ISO-8859-1, US-ASCII, UTF-8; q=0.8, ISO-10646-UCS-2; q=0.6');
-        $this->assertEquals(array('ISO-8859-1', 'US-ASCII', 'UTF-8', 'ISO-10646-UCS-2'), $request->getCharsets());
+        $this->assertEquals(['ISO-8859-1', 'US-ASCII', 'UTF-8', 'ISO-10646-UCS-2'], $request->getCharsets());
 
         $request = new Request();
         $request->headers->set('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.7');
-        $this->assertEquals(array('ISO-8859-1', 'utf-8', '*'), $request->getCharsets());
+        $this->assertEquals(['ISO-8859-1', 'utf-8', '*'], $request->getCharsets());
     }
 
     public function testGetEncodings()
     {
         $request = new Request();
-        $this->assertEquals(array(), $request->getEncodings());
+        $this->assertEquals([], $request->getEncodings());
         $request->headers->set('Accept-Encoding', 'gzip,deflate,sdch');
-        $this->assertEquals(array(), $request->getEncodings()); // testing caching
+        $this->assertEquals([], $request->getEncodings()); // testing caching
 
         $request = new Request();
         $request->headers->set('Accept-Encoding', 'gzip,deflate,sdch');
-        $this->assertEquals(array('gzip', 'deflate', 'sdch'), $request->getEncodings());
+        $this->assertEquals(['gzip', 'deflate', 'sdch'], $request->getEncodings());
 
         $request = new Request();
         $request->headers->set('Accept-Encoding', 'gzip;q=0.4,deflate;q=0.9,compress;q=0.7');
-        $this->assertEquals(array('deflate', 'compress', 'gzip'), $request->getEncodings());
+        $this->assertEquals(['deflate', 'compress', 'gzip'], $request->getEncodings());
     }
 
     public function testGetAcceptableContentTypes()
     {
         $request = new Request();
-        $this->assertEquals(array(), $request->getAcceptableContentTypes());
+        $this->assertEquals([], $request->getAcceptableContentTypes());
         $request->headers->set('Accept', 'application/vnd.wap.wmlscriptc, text/vnd.wap.wml, application/vnd.wap.xhtml+xml, application/xhtml+xml, text/html, multipart/mixed, */*');
-        $this->assertEquals(array(), $request->getAcceptableContentTypes()); // testing caching
+        $this->assertEquals([], $request->getAcceptableContentTypes()); // testing caching
 
         $request = new Request();
         $request->headers->set('Accept', 'application/vnd.wap.wmlscriptc, text/vnd.wap.wml, application/vnd.wap.xhtml+xml, application/xhtml+xml, text/html, multipart/mixed, */*');
-        $this->assertEquals(array('application/vnd.wap.wmlscriptc', 'text/vnd.wap.wml', 'application/vnd.wap.xhtml+xml', 'application/xhtml+xml', 'text/html', 'multipart/mixed', '*/*'), $request->getAcceptableContentTypes());
+        $this->assertEquals(['application/vnd.wap.wmlscriptc', 'text/vnd.wap.wml', 'application/vnd.wap.xhtml+xml', 'application/xhtml+xml', 'text/html', 'multipart/mixed', '*/*'], $request->getAcceptableContentTypes());
     }
 
     public function testGetLanguages()
     {
         $request = new Request();
-        $this->assertEquals(array(), $request->getLanguages());
+        $this->assertEquals([], $request->getLanguages());
 
         $request = new Request();
         $request->headers->set('Accept-language', 'zh, en-us; q=0.8, en; q=0.6');
-        $this->assertEquals(array('zh', 'en_US', 'en'), $request->getLanguages());
-        $this->assertEquals(array('zh', 'en_US', 'en'), $request->getLanguages());
+        $this->assertEquals(['zh', 'en_US', 'en'], $request->getLanguages());
+        $this->assertEquals(['zh', 'en_US', 'en'], $request->getLanguages());
 
         $request = new Request();
         $request->headers->set('Accept-language', 'zh, en-us; q=0.6, en; q=0.8');
-        $this->assertEquals(array('zh', 'en', 'en_US'), $request->getLanguages()); // Test out of order qvalues
+        $this->assertEquals(['zh', 'en', 'en_US'], $request->getLanguages()); // Test out of order qvalues
 
         $request = new Request();
         $request->headers->set('Accept-language', 'zh, en, en-us');
-        $this->assertEquals(array('zh', 'en', 'en_US'), $request->getLanguages()); // Test equal weighting without qvalues
+        $this->assertEquals(['zh', 'en', 'en_US'], $request->getLanguages()); // Test equal weighting without qvalues
 
         $request = new Request();
         $request->headers->set('Accept-language', 'zh; q=0.6, en, en-us; q=0.6');
-        $this->assertEquals(array('en', 'zh', 'en_US'), $request->getLanguages()); // Test equal weighting with qvalues
+        $this->assertEquals(['en', 'zh', 'en_US'], $request->getLanguages()); // Test equal weighting with qvalues
 
         $request = new Request();
         $request->headers->set('Accept-language', 'zh, i-cherokee; q=0.6');
-        $this->assertEquals(array('zh', 'cherokee'), $request->getLanguages());
+        $this->assertEquals(['zh', 'cherokee'], $request->getLanguages());
     }
 
     public function testGetRequestFormat()
@@ -1538,7 +1538,7 @@ public function testGetRequestFormat()
         $this->assertNull($request->setRequestFormat('foo'));
         $this->assertEquals('foo', $request->getRequestFormat(null));
 
-        $request = new Request(array('_format' => 'foo'));
+        $request = new Request(['_format' => 'foo']);
         $this->assertEquals('html', $request->getRequestFormat());
     }
 
@@ -1615,7 +1615,7 @@ public function testIsMethod()
      */
     public function testGetBaseUrl($uri, $server, $expectedBaseUrl, $expectedPathInfo)
     {
-        $request = Request::create($uri, 'GET', array(), array(), array(), $server);
+        $request = Request::create($uri, 'GET', [], [], [], $server);
 
         $this->assertSame($expectedBaseUrl, $request->getBaseUrl(), 'baseUrl');
         $this->assertSame($expectedPathInfo, $request->getPathInfo(), 'pathInfo');
@@ -1623,78 +1623,78 @@ public function testGetBaseUrl($uri, $server, $expectedBaseUrl, $expectedPathInf
 
     public function getBaseUrlData()
     {
-        return array(
-            array(
+        return [
+            [
                 '/fruit/strawberry/1234index.php/blah',
-                array(
+                [
                     'SCRIPT_FILENAME' => 'E:/Sites/cc-new/public_html/fruit/index.php',
                     'SCRIPT_NAME' => '/fruit/index.php',
                     'PHP_SELF' => '/fruit/index.php',
-                ),
+                ],
                 '/fruit',
                 '/strawberry/1234index.php/blah',
-            ),
-            array(
+            ],
+            [
                 '/fruit/strawberry/1234index.php/blah',
-                array(
+                [
                     'SCRIPT_FILENAME' => 'E:/Sites/cc-new/public_html/index.php',
                     'SCRIPT_NAME' => '/index.php',
                     'PHP_SELF' => '/index.php',
-                ),
+                ],
                 '',
                 '/fruit/strawberry/1234index.php/blah',
-            ),
-            array(
+            ],
+            [
                 '/foo%20bar/',
-                array(
+                [
                     'SCRIPT_FILENAME' => '/home/John Doe/public_html/foo bar/app.php',
                     'SCRIPT_NAME' => '/foo bar/app.php',
                     'PHP_SELF' => '/foo bar/app.php',
-                ),
+                ],
                 '/foo%20bar',
                 '/',
-            ),
-            array(
+            ],
+            [
                 '/foo%20bar/home',
-                array(
+                [
                     'SCRIPT_FILENAME' => '/home/John Doe/public_html/foo bar/app.php',
                     'SCRIPT_NAME' => '/foo bar/app.php',
                     'PHP_SELF' => '/foo bar/app.php',
-                ),
+                ],
                 '/foo%20bar',
                 '/home',
-            ),
-            array(
+            ],
+            [
                 '/foo%20bar/app.php/home',
-                array(
+                [
                     'SCRIPT_FILENAME' => '/home/John Doe/public_html/foo bar/app.php',
                     'SCRIPT_NAME' => '/foo bar/app.php',
                     'PHP_SELF' => '/foo bar/app.php',
-                ),
+                ],
                 '/foo%20bar/app.php',
                 '/home',
-            ),
-            array(
+            ],
+            [
                 '/foo%20bar/app.php/home%3Dbaz',
-                array(
+                [
                     'SCRIPT_FILENAME' => '/home/John Doe/public_html/foo bar/app.php',
                     'SCRIPT_NAME' => '/foo bar/app.php',
                     'PHP_SELF' => '/foo bar/app.php',
-                ),
+                ],
                 '/foo%20bar/app.php',
                 '/home%3Dbaz',
-            ),
-            array(
+            ],
+            [
                 '/foo/bar+baz',
-                array(
+                [
                     'SCRIPT_FILENAME' => '/home/John Doe/public_html/foo/app.php',
                     'SCRIPT_NAME' => '/foo/app.php',
                     'PHP_SELF' => '/foo/app.php',
-                ),
+                ],
                 '/foo',
                 '/bar+baz',
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -1712,16 +1712,16 @@ public function testUrlencodedStringPrefix($string, $prefix, $expect)
 
     public function urlencodedStringPrefixData()
     {
-        return array(
-            array('foo', 'foo', 'foo'),
-            array('fo%6f', 'foo', 'fo%6f'),
-            array('foo/bar', 'foo', 'foo'),
-            array('fo%6f/bar', 'foo', 'fo%6f'),
-            array('f%6f%6f/bar', 'foo', 'f%6f%6f'),
-            array('%66%6F%6F/bar', 'foo', '%66%6F%6F'),
-            array('fo+o/bar', 'fo+o', 'fo+o'),
-            array('fo%2Bo/bar', 'fo+o', 'fo%2Bo'),
-        );
+        return [
+            ['foo', 'foo', 'foo'],
+            ['fo%6f', 'foo', 'fo%6f'],
+            ['foo/bar', 'foo', 'foo'],
+            ['fo%6f/bar', 'foo', 'fo%6f'],
+            ['f%6f%6f/bar', 'foo', 'f%6f%6f'],
+            ['%66%6F%6F/bar', 'foo', '%66%6F%6F'],
+            ['fo+o/bar', 'fo+o', 'fo+o'],
+            ['fo%2Bo/bar', 'fo+o', 'fo%2Bo'],
+        ];
     }
 
     private function disableHttpMethodParameterOverride()
@@ -1736,7 +1736,7 @@ private function getRequestInstanceForClientIpTests($remoteAddr, $httpForwardedF
     {
         $request = new Request();
 
-        $server = array('REMOTE_ADDR' => $remoteAddr);
+        $server = ['REMOTE_ADDR' => $remoteAddr];
         if (null !== $httpForwardedFor) {
             $server['HTTP_X_FORWARDED_FOR'] = $httpForwardedFor;
         }
@@ -1745,7 +1745,7 @@ private function getRequestInstanceForClientIpTests($remoteAddr, $httpForwardedF
             Request::setTrustedProxies($trustedProxies, Request::HEADER_X_FORWARDED_ALL);
         }
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         return $request;
     }
@@ -1754,7 +1754,7 @@ private function getRequestInstanceForClientIpsForwardedTests($remoteAddr, $http
     {
         $request = new Request();
 
-        $server = array('REMOTE_ADDR' => $remoteAddr);
+        $server = ['REMOTE_ADDR' => $remoteAddr];
 
         if (null !== $httpForwarded) {
             $server['HTTP_FORWARDED'] = $httpForwarded;
@@ -1764,7 +1764,7 @@ private function getRequestInstanceForClientIpsForwardedTests($remoteAddr, $http
             Request::setTrustedProxies($trustedProxies, Request::HEADER_FORWARDED);
         }
 
-        $request->initialize(array(), array(), array(), array(), array(), $server);
+        $request->initialize([], [], [], [], [], $server);
 
         return $request;
     }
@@ -1785,35 +1785,35 @@ public function testTrustedProxiesXForwardedFor()
         $this->assertFalse($request->isSecure());
 
         // disabling proxy trusting
-        Request::setTrustedProxies(array(), Request::HEADER_X_FORWARDED_ALL);
+        Request::setTrustedProxies([], Request::HEADER_X_FORWARDED_ALL);
         $this->assertEquals('3.3.3.3', $request->getClientIp());
         $this->assertEquals('example.com', $request->getHost());
         $this->assertEquals(80, $request->getPort());
         $this->assertFalse($request->isSecure());
 
         // request is forwarded by a non-trusted proxy
-        Request::setTrustedProxies(array('2.2.2.2'), Request::HEADER_X_FORWARDED_ALL);
+        Request::setTrustedProxies(['2.2.2.2'], Request::HEADER_X_FORWARDED_ALL);
         $this->assertEquals('3.3.3.3', $request->getClientIp());
         $this->assertEquals('example.com', $request->getHost());
         $this->assertEquals(80, $request->getPort());
         $this->assertFalse($request->isSecure());
 
         // trusted proxy via setTrustedProxies()
-        Request::setTrustedProxies(array('3.3.3.3', '2.2.2.2'), Request::HEADER_X_FORWARDED_ALL);
+        Request::setTrustedProxies(['3.3.3.3', '2.2.2.2'], Request::HEADER_X_FORWARDED_ALL);
         $this->assertEquals('1.1.1.1', $request->getClientIp());
         $this->assertEquals('foo.example.com', $request->getHost());
         $this->assertEquals(443, $request->getPort());
         $this->assertTrue($request->isSecure());
 
         // trusted proxy via setTrustedProxies()
-        Request::setTrustedProxies(array('3.3.3.4', '2.2.2.2'), Request::HEADER_X_FORWARDED_ALL);
+        Request::setTrustedProxies(['3.3.3.4', '2.2.2.2'], Request::HEADER_X_FORWARDED_ALL);
         $this->assertEquals('3.3.3.3', $request->getClientIp());
         $this->assertEquals('example.com', $request->getHost());
         $this->assertEquals(80, $request->getPort());
         $this->assertFalse($request->isSecure());
 
         // check various X_FORWARDED_PROTO header values
-        Request::setTrustedProxies(array('3.3.3.3', '2.2.2.2'), Request::HEADER_X_FORWARDED_ALL);
+        Request::setTrustedProxies(['3.3.3.3', '2.2.2.2'], Request::HEADER_X_FORWARDED_ALL);
         $request->headers->set('X_FORWARDED_PROTO', 'ssl');
         $this->assertTrue($request->isSecure());
 
@@ -1881,35 +1881,35 @@ public function testTrustedProxiesForwarded()
         $this->assertFalse($request->isSecure());
 
         // disabling proxy trusting
-        Request::setTrustedProxies(array(), Request::HEADER_FORWARDED);
+        Request::setTrustedProxies([], Request::HEADER_FORWARDED);
         $this->assertEquals('3.3.3.3', $request->getClientIp());
         $this->assertEquals('example.com', $request->getHost());
         $this->assertEquals(80, $request->getPort());
         $this->assertFalse($request->isSecure());
 
         // request is forwarded by a non-trusted proxy
-        Request::setTrustedProxies(array('2.2.2.2'), Request::HEADER_FORWARDED);
+        Request::setTrustedProxies(['2.2.2.2'], Request::HEADER_FORWARDED);
         $this->assertEquals('3.3.3.3', $request->getClientIp());
         $this->assertEquals('example.com', $request->getHost());
         $this->assertEquals(80, $request->getPort());
         $this->assertFalse($request->isSecure());
 
         // trusted proxy via setTrustedProxies()
-        Request::setTrustedProxies(array('3.3.3.3', '2.2.2.2'), Request::HEADER_FORWARDED);
+        Request::setTrustedProxies(['3.3.3.3', '2.2.2.2'], Request::HEADER_FORWARDED);
         $this->assertEquals('1.1.1.1', $request->getClientIp());
         $this->assertEquals('foo.example.com', $request->getHost());
         $this->assertEquals(8080, $request->getPort());
         $this->assertTrue($request->isSecure());
 
         // trusted proxy via setTrustedProxies()
-        Request::setTrustedProxies(array('3.3.3.4', '2.2.2.2'), Request::HEADER_FORWARDED);
+        Request::setTrustedProxies(['3.3.3.4', '2.2.2.2'], Request::HEADER_FORWARDED);
         $this->assertEquals('3.3.3.3', $request->getClientIp());
         $this->assertEquals('example.com', $request->getHost());
         $this->assertEquals(80, $request->getPort());
         $this->assertFalse($request->isSecure());
 
         // check various X_FORWARDED_PROTO header values
-        Request::setTrustedProxies(array('3.3.3.3', '2.2.2.2'), Request::HEADER_FORWARDED);
+        Request::setTrustedProxies(['3.3.3.3', '2.2.2.2'], Request::HEADER_FORWARDED);
         $request->headers->set('FORWARDED', 'proto=ssl');
         $this->assertTrue($request->isSecure());
 
@@ -1949,37 +1949,37 @@ public function testIISRequestUri($headers, $server, $expectedRequestUri)
         $this->assertEquals($expectedRequestUri, $request->getRequestUri(), '->getRequestUri() is correct');
 
         $subRequestUri = '/bar/foo';
-        $subRequest = Request::create($subRequestUri, 'get', array(), array(), array(), $request->server->all());
+        $subRequest = Request::create($subRequestUri, 'get', [], [], [], $request->server->all());
         $this->assertEquals($subRequestUri, $subRequest->getRequestUri(), '->getRequestUri() is correct in sub request');
     }
 
     public function iisRequestUriProvider()
     {
-        return array(
-            array(
-                array(),
-                array(
+        return [
+            [
+                [],
+                [
                     'IIS_WasUrlRewritten' => '1',
                     'UNENCODED_URL' => '/foo/bar',
-                ),
+                ],
                 '/foo/bar',
-            ),
-            array(
-                array(),
-                array(
+            ],
+            [
+                [],
+                [
                     'ORIG_PATH_INFO' => '/foo/bar',
-                ),
+                ],
                 '/foo/bar',
-            ),
-            array(
-                array(),
-                array(
+            ],
+            [
+                [],
+                [
                     'ORIG_PATH_INFO' => '/foo/bar',
                     'QUERY_STRING' => 'foo=bar',
-                ),
+                ],
                 '/foo/bar?foo=bar',
-            ),
-        );
+            ],
+        ];
     }
 
     public function testTrustedHosts()
@@ -1992,7 +1992,7 @@ public function testTrustedHosts()
         $this->assertEquals('evil.com', $request->getHost());
 
         // add a trusted domain and all its subdomains
-        Request::setTrustedHosts(array('^([a-z]{9}\.)?trusted\.com$'));
+        Request::setTrustedHosts(['^([a-z]{9}\.)?trusted\.com$']);
 
         // untrusted host
         $request->headers->set('host', 'evil.com');
@@ -2024,7 +2024,7 @@ public function testTrustedHosts()
 
     public function testSetTrustedHostsDoesNotBreakOnSpecialCharacters()
     {
-        Request::setTrustedHosts(array('localhost(\.local){0,1}#,example.com', 'localhost'));
+        Request::setTrustedHosts(['localhost(\.local){0,1}#,example.com', 'localhost']);
 
         $request = Request::create('/');
         $request->headers->set('host', 'localhost');
@@ -2033,7 +2033,7 @@ public function testSetTrustedHostsDoesNotBreakOnSpecialCharacters()
 
     public function testFactory()
     {
-        Request::setFactory(function (array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null) {
+        Request::setFactory(function (array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null) {
             return new NewRequest();
         });
 
@@ -2082,23 +2082,23 @@ public function testHostValidity($host, $isValid, $expectedHost = null, $expecte
 
     public function getHostValidities()
     {
-        return array(
-            array('.a', false),
-            array('a..', false),
-            array('a.', true),
-            array("\xE9", false),
-            array('[::1]', true),
-            array('[::1]:80', true, '[::1]', 80),
-            array(str_repeat('.', 101), false),
-        );
+        return [
+            ['.a', false],
+            ['a..', false],
+            ['a.', true],
+            ["\xE9", false],
+            ['[::1]', true],
+            ['[::1]:80', true, '[::1]', 80],
+            [str_repeat('.', 101), false],
+        ];
     }
 
     public function getLongHostNames()
     {
-        return array(
-            array('a'.str_repeat('.a', 40000)),
-            array(str_repeat(':', 101)),
-        );
+        return [
+            ['a'.str_repeat('.a', 40000)],
+            [str_repeat(':', 101)],
+        ];
     }
 
     /**
@@ -2113,18 +2113,18 @@ public function testMethodIdempotent($method, $idempotent)
 
     public function methodIdempotentProvider()
     {
-        return array(
-            array('HEAD', true),
-            array('GET', true),
-            array('POST', false),
-            array('PUT', true),
-            array('PATCH', false),
-            array('DELETE', true),
-            array('PURGE', true),
-            array('OPTIONS', true),
-            array('TRACE', true),
-            array('CONNECT', false),
-        );
+        return [
+            ['HEAD', true],
+            ['GET', true],
+            ['POST', false],
+            ['PUT', true],
+            ['PATCH', false],
+            ['DELETE', true],
+            ['PURGE', true],
+            ['OPTIONS', true],
+            ['TRACE', true],
+            ['CONNECT', false],
+        ];
     }
 
     /**
@@ -2139,18 +2139,18 @@ public function testMethodSafe($method, $safe)
 
     public function methodSafeProvider()
     {
-        return array(
-            array('HEAD', true),
-            array('GET', true),
-            array('POST', false),
-            array('PUT', false),
-            array('PATCH', false),
-            array('DELETE', false),
-            array('PURGE', false),
-            array('OPTIONS', true),
-            array('TRACE', true),
-            array('CONNECT', false),
-        );
+        return [
+            ['HEAD', true],
+            ['GET', true],
+            ['POST', false],
+            ['PUT', false],
+            ['PATCH', false],
+            ['DELETE', false],
+            ['PURGE', false],
+            ['OPTIONS', true],
+            ['TRACE', true],
+            ['CONNECT', false],
+        ];
     }
 
     /**
@@ -2176,18 +2176,18 @@ public function testMethodCacheable($method, $cacheable)
 
     public function methodCacheableProvider()
     {
-        return array(
-            array('HEAD', true),
-            array('GET', true),
-            array('POST', false),
-            array('PUT', false),
-            array('PATCH', false),
-            array('DELETE', false),
-            array('PURGE', false),
-            array('OPTIONS', false),
-            array('TRACE', false),
-            array('CONNECT', false),
-        );
+        return [
+            ['HEAD', true],
+            ['GET', true],
+            ['POST', false],
+            ['PUT', false],
+            ['PATCH', false],
+            ['DELETE', false],
+            ['PURGE', false],
+            ['OPTIONS', false],
+            ['TRACE', false],
+            ['CONNECT', false],
+        ];
     }
 
     /**
@@ -2251,7 +2251,7 @@ public function testGetTrustedHeaderName()
     public function testProtocolVersion($serverProtocol, $trustedProxy, $via, $expected)
     {
         if ($trustedProxy) {
-            Request::setTrustedProxies(array('1.1.1.1'), -1);
+            Request::setTrustedProxies(['1.1.1.1'], -1);
         }
 
         $request = new Request();
@@ -2264,41 +2264,41 @@ public function testProtocolVersion($serverProtocol, $trustedProxy, $via, $expec
 
     public function protocolVersionProvider()
     {
-        return array(
-            'untrusted without via' => array('HTTP/2.0', false, '', 'HTTP/2.0'),
-            'untrusted with via' => array('HTTP/2.0', false, '1.0 fred, 1.1 nowhere.com (Apache/1.1)', 'HTTP/2.0'),
-            'trusted without via' => array('HTTP/2.0', true, '', 'HTTP/2.0'),
-            'trusted with via' => array('HTTP/2.0', true, '1.0 fred, 1.1 nowhere.com (Apache/1.1)', 'HTTP/1.0'),
-            'trusted with via and protocol name' => array('HTTP/2.0', true, 'HTTP/1.0 fred, HTTP/1.1 nowhere.com (Apache/1.1)', 'HTTP/1.0'),
-            'trusted with broken via' => array('HTTP/2.0', true, 'HTTP/1^0 foo', 'HTTP/2.0'),
-            'trusted with partially-broken via' => array('HTTP/2.0', true, '1.0 fred, foo', 'HTTP/1.0'),
-        );
+        return [
+            'untrusted without via' => ['HTTP/2.0', false, '', 'HTTP/2.0'],
+            'untrusted with via' => ['HTTP/2.0', false, '1.0 fred, 1.1 nowhere.com (Apache/1.1)', 'HTTP/2.0'],
+            'trusted without via' => ['HTTP/2.0', true, '', 'HTTP/2.0'],
+            'trusted with via' => ['HTTP/2.0', true, '1.0 fred, 1.1 nowhere.com (Apache/1.1)', 'HTTP/1.0'],
+            'trusted with via and protocol name' => ['HTTP/2.0', true, 'HTTP/1.0 fred, HTTP/1.1 nowhere.com (Apache/1.1)', 'HTTP/1.0'],
+            'trusted with broken via' => ['HTTP/2.0', true, 'HTTP/1^0 foo', 'HTTP/2.0'],
+            'trusted with partially-broken via' => ['HTTP/2.0', true, '1.0 fred, foo', 'HTTP/1.0'],
+        ];
     }
 
     public function nonstandardRequestsData()
     {
-        return array(
-            array('',  '', '/', 'http://host:8080/', ''),
-            array('/', '', '/', 'http://host:8080/', ''),
+        return [
+            ['',  '', '/', 'http://host:8080/', ''],
+            ['/', '', '/', 'http://host:8080/', ''],
 
-            array('hello/app.php/x',  '', '/x', 'http://host:8080/hello/app.php/x', '/hello', '/hello/app.php'),
-            array('/hello/app.php/x', '', '/x', 'http://host:8080/hello/app.php/x', '/hello', '/hello/app.php'),
+            ['hello/app.php/x',  '', '/x', 'http://host:8080/hello/app.php/x', '/hello', '/hello/app.php'],
+            ['/hello/app.php/x', '', '/x', 'http://host:8080/hello/app.php/x', '/hello', '/hello/app.php'],
 
-            array('',      'a=b', '/', 'http://host:8080/?a=b'),
-            array('?a=b',  'a=b', '/', 'http://host:8080/?a=b'),
-            array('/?a=b', 'a=b', '/', 'http://host:8080/?a=b'),
+            ['',      'a=b', '/', 'http://host:8080/?a=b'],
+            ['?a=b',  'a=b', '/', 'http://host:8080/?a=b'],
+            ['/?a=b', 'a=b', '/', 'http://host:8080/?a=b'],
 
-            array('x',      'a=b', '/x', 'http://host:8080/x?a=b'),
-            array('x?a=b',  'a=b', '/x', 'http://host:8080/x?a=b'),
-            array('/x?a=b', 'a=b', '/x', 'http://host:8080/x?a=b'),
+            ['x',      'a=b', '/x', 'http://host:8080/x?a=b'],
+            ['x?a=b',  'a=b', '/x', 'http://host:8080/x?a=b'],
+            ['/x?a=b', 'a=b', '/x', 'http://host:8080/x?a=b'],
 
-            array('hello/x',  '', '/x', 'http://host:8080/hello/x', '/hello'),
-            array('/hello/x', '', '/x', 'http://host:8080/hello/x', '/hello'),
+            ['hello/x',  '', '/x', 'http://host:8080/hello/x', '/hello'],
+            ['/hello/x', '', '/x', 'http://host:8080/hello/x', '/hello'],
 
-            array('hello/app.php/x',      'a=b', '/x', 'http://host:8080/hello/app.php/x?a=b', '/hello', '/hello/app.php'),
-            array('hello/app.php/x?a=b',  'a=b', '/x', 'http://host:8080/hello/app.php/x?a=b', '/hello', '/hello/app.php'),
-            array('/hello/app.php/x?a=b', 'a=b', '/x', 'http://host:8080/hello/app.php/x?a=b', '/hello', '/hello/app.php'),
-        );
+            ['hello/app.php/x',      'a=b', '/x', 'http://host:8080/hello/app.php/x?a=b', '/hello', '/hello/app.php'],
+            ['hello/app.php/x?a=b',  'a=b', '/x', 'http://host:8080/hello/app.php/x?a=b', '/hello', '/hello/app.php'],
+            ['/hello/app.php/x?a=b', 'a=b', '/x', 'http://host:8080/hello/app.php/x?a=b', '/hello', '/hello/app.php'],
+        ];
     }
 
     /**
@@ -2310,16 +2310,16 @@ public function testNonstandardRequests($requestUri, $queryString, $expectedPath
             $expectedBaseUrl = $expectedBasePath;
         }
 
-        $server = array(
+        $server = [
             'HTTP_HOST' => 'host:8080',
             'SERVER_PORT' => '8080',
             'QUERY_STRING' => $queryString,
             'PHP_SELF' => '/hello/app.php',
             'SCRIPT_FILENAME' => '/some/path/app.php',
             'REQUEST_URI' => $requestUri,
-        );
+        ];
 
-        $request = new Request(array(), array(), array(), array(), array(), $server);
+        $request = new Request([], [], [], [], [], $server);
 
         $this->assertEquals($expectedPathInfo, $request->getPathInfo());
         $this->assertEquals($expectedUri, $request->getUri());
@@ -2332,7 +2332,7 @@ public function testNonstandardRequests($requestUri, $queryString, $expectedPath
 
     public function testTrustedHost()
     {
-        Request::setTrustedProxies(array('1.1.1.1'), -1);
+        Request::setTrustedProxies(['1.1.1.1'], -1);
 
         $request = Request::create('/');
         $request->server->set('REMOTE_ADDR', '1.1.1.1');
@@ -2354,7 +2354,7 @@ public function testTrustedHost()
 
     public function testTrustedPort()
     {
-        Request::setTrustedProxies(array('1.1.1.1'), -1);
+        Request::setTrustedProxies(['1.1.1.1'], -1);
 
         $request = Request::create('/');
         $request->server->set('REMOTE_ADDR', '1.1.1.1');
@@ -2384,7 +2384,7 @@ class RequestContentProxy extends Request
 {
     public function getContent($asResource = false)
     {
-        return http_build_query(array('_method' => 'PUT', 'content' => 'mycontent'), '', '&');
+        return http_build_query(['_method' => 'PUT', 'content' => 'mycontent'], '', '&');
     }
 }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php
index 22f25e978e5a2..3d3e696c75c3b 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php
@@ -22,10 +22,10 @@ class ResponseFunctionalTest extends TestCase
 
     public static function setUpBeforeClass()
     {
-        $spec = array(
-            1 => array('file', '/dev/null', 'w'),
-            2 => array('file', '/dev/null', 'w'),
-        );
+        $spec = [
+            1 => ['file', '/dev/null', 'w'],
+            2 => ['file', '/dev/null', 'w'],
+        ];
         if (!self::$server = @proc_open('exec php -S localhost:8054', $spec, $pipes, __DIR__.'/Fixtures/response-functional')) {
             self::markTestSkipped('PHP server unable to start.');
         }
@@ -52,7 +52,7 @@ public function testCookie($fixture)
     public function provideCookie()
     {
         foreach (glob(__DIR__.'/Fixtures/response-functional/*.php') as $file) {
-            yield array(pathinfo($file, PATHINFO_FILENAME));
+            yield [pathinfo($file, PATHINFO_FILENAME)];
         }
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
index 06e2d41d01bb0..abfc28399ec42 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
@@ -22,7 +22,7 @@ class ResponseHeaderBagTest extends TestCase
 {
     public function testAllPreserveCase()
     {
-        $headers = array(
+        $headers = [
             'fOo' => 'BAR',
             'ETag' => 'xyzzy',
             'Content-MD5' => 'Q2hlY2sgSW50ZWdyaXR5IQ==',
@@ -30,7 +30,7 @@ public function testAllPreserveCase()
             'WWW-Authenticate' => 'Basic realm="WallyWorld"',
             'X-UA-Compatible' => 'IE=edge,chrome=1',
             'X-XSS-Protection' => '1; mode=block',
-        );
+        ];
 
         $bag = new ResponseHeaderBag($headers);
         $allPreservedCase = $bag->allPreserveCase();
@@ -42,45 +42,45 @@ public function testAllPreserveCase()
 
     public function testCacheControlHeader()
     {
-        $bag = new ResponseHeaderBag(array());
+        $bag = new ResponseHeaderBag([]);
         $this->assertEquals('no-cache, private', $bag->get('Cache-Control'));
         $this->assertTrue($bag->hasCacheControlDirective('no-cache'));
 
-        $bag = new ResponseHeaderBag(array('Cache-Control' => 'public'));
+        $bag = new ResponseHeaderBag(['Cache-Control' => 'public']);
         $this->assertEquals('public', $bag->get('Cache-Control'));
         $this->assertTrue($bag->hasCacheControlDirective('public'));
 
-        $bag = new ResponseHeaderBag(array('ETag' => 'abcde'));
+        $bag = new ResponseHeaderBag(['ETag' => 'abcde']);
         $this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
         $this->assertTrue($bag->hasCacheControlDirective('private'));
         $this->assertTrue($bag->hasCacheControlDirective('must-revalidate'));
         $this->assertFalse($bag->hasCacheControlDirective('max-age'));
 
-        $bag = new ResponseHeaderBag(array('Expires' => 'Wed, 16 Feb 2011 14:17:43 GMT'));
+        $bag = new ResponseHeaderBag(['Expires' => 'Wed, 16 Feb 2011 14:17:43 GMT']);
         $this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
 
-        $bag = new ResponseHeaderBag(array(
+        $bag = new ResponseHeaderBag([
             'Expires' => 'Wed, 16 Feb 2011 14:17:43 GMT',
             'Cache-Control' => 'max-age=3600',
-        ));
+        ]);
         $this->assertEquals('max-age=3600, private', $bag->get('Cache-Control'));
 
-        $bag = new ResponseHeaderBag(array('Last-Modified' => 'abcde'));
+        $bag = new ResponseHeaderBag(['Last-Modified' => 'abcde']);
         $this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
 
-        $bag = new ResponseHeaderBag(array('Etag' => 'abcde', 'Last-Modified' => 'abcde'));
+        $bag = new ResponseHeaderBag(['Etag' => 'abcde', 'Last-Modified' => 'abcde']);
         $this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
 
-        $bag = new ResponseHeaderBag(array('cache-control' => 'max-age=100'));
+        $bag = new ResponseHeaderBag(['cache-control' => 'max-age=100']);
         $this->assertEquals('max-age=100, private', $bag->get('Cache-Control'));
 
-        $bag = new ResponseHeaderBag(array('cache-control' => 's-maxage=100'));
+        $bag = new ResponseHeaderBag(['cache-control' => 's-maxage=100']);
         $this->assertEquals('s-maxage=100', $bag->get('Cache-Control'));
 
-        $bag = new ResponseHeaderBag(array('cache-control' => 'private, max-age=100'));
+        $bag = new ResponseHeaderBag(['cache-control' => 'private, max-age=100']);
         $this->assertEquals('max-age=100, private', $bag->get('Cache-Control'));
 
-        $bag = new ResponseHeaderBag(array('cache-control' => 'public, max-age=100'));
+        $bag = new ResponseHeaderBag(['cache-control' => 'public, max-age=100']);
         $this->assertEquals('max-age=100, public', $bag->get('Cache-Control'));
 
         $bag = new ResponseHeaderBag();
@@ -88,7 +88,7 @@ public function testCacheControlHeader()
         $this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
 
         $bag = new ResponseHeaderBag();
-        $bag->set('Cache-Control', array('public', 'must-revalidate'));
+        $bag->set('Cache-Control', ['public', 'must-revalidate']);
         $this->assertCount(1, $bag->get('Cache-Control', null, false));
         $this->assertEquals('must-revalidate, public', $bag->get('Cache-Control'));
 
@@ -101,7 +101,7 @@ public function testCacheControlHeader()
 
     public function testCacheControlClone()
     {
-        $headers = array('foo' => 'bar');
+        $headers = ['foo' => 'bar'];
         $bag1 = new ResponseHeaderBag($headers);
         $bag2 = new ResponseHeaderBag($bag1->allPreserveCase());
         $this->assertEquals($bag1->allPreserveCase(), $bag2->allPreserveCase());
@@ -121,7 +121,7 @@ public function testToStringIncludesCookieHeaders()
 
     public function testClearCookieSecureNotHttpOnly()
     {
-        $bag = new ResponseHeaderBag(array());
+        $bag = new ResponseHeaderBag([]);
 
         $bag->clearCookie('foo', '/', null, true, false);
 
@@ -130,23 +130,23 @@ public function testClearCookieSecureNotHttpOnly()
 
     public function testReplace()
     {
-        $bag = new ResponseHeaderBag(array());
+        $bag = new ResponseHeaderBag([]);
         $this->assertEquals('no-cache, private', $bag->get('Cache-Control'));
         $this->assertTrue($bag->hasCacheControlDirective('no-cache'));
 
-        $bag->replace(array('Cache-Control' => 'public'));
+        $bag->replace(['Cache-Control' => 'public']);
         $this->assertEquals('public', $bag->get('Cache-Control'));
         $this->assertTrue($bag->hasCacheControlDirective('public'));
     }
 
     public function testReplaceWithRemove()
     {
-        $bag = new ResponseHeaderBag(array());
+        $bag = new ResponseHeaderBag([]);
         $this->assertEquals('no-cache, private', $bag->get('Cache-Control'));
         $this->assertTrue($bag->hasCacheControlDirective('no-cache'));
 
         $bag->remove('Cache-Control');
-        $bag->replace(array());
+        $bag->replace([]);
         $this->assertEquals('no-cache, private', $bag->get('Cache-Control'));
         $this->assertTrue($bag->hasCacheControlDirective('no-cache'));
     }
@@ -332,7 +332,7 @@ public function testDateHeaderAddedOnCreation()
     public function testDateHeaderCanBeSetOnCreation()
     {
         $someDate = 'Thu, 23 Mar 2017 09:15:12 GMT';
-        $bag = new ResponseHeaderBag(array('Date' => $someDate));
+        $bag = new ResponseHeaderBag(['Date' => $someDate]);
 
         $this->assertEquals($someDate, $bag->get('Date'));
     }
@@ -340,7 +340,7 @@ public function testDateHeaderCanBeSetOnCreation()
     public function testDateHeaderWillBeRecreatedWhenRemoved()
     {
         $someDate = 'Thu, 23 Mar 2017 09:15:12 GMT';
-        $bag = new ResponseHeaderBag(array('Date' => $someDate));
+        $bag = new ResponseHeaderBag(['Date' => $someDate]);
         $bag->remove('Date');
 
         // a (new) Date header is still present
@@ -351,7 +351,7 @@ public function testDateHeaderWillBeRecreatedWhenRemoved()
     public function testDateHeaderWillBeRecreatedWhenHeadersAreReplaced()
     {
         $bag = new ResponseHeaderBag();
-        $bag->replace(array());
+        $bag->replace([]);
 
         $this->assertTrue($bag->has('Date'));
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
index 43fa9b70aa1e3..f6fb1309ea1dc 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
@@ -21,7 +21,7 @@ class ResponseTest extends ResponseTestCase
 {
     public function testCreate()
     {
-        $response = Response::create('foo', 301, array('Foo' => 'bar'));
+        $response = Response::create('foo', 301, ['Foo' => 'bar']);
 
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $response);
         $this->assertEquals(301, $response->getStatusCode());
@@ -253,10 +253,10 @@ public function testIsNotModifiedIfModifiedSinceAndEtagWithoutLastModified()
 
     public function testIsValidateable()
     {
-        $response = new Response('', 200, array('Last-Modified' => $this->createDateTimeOneHourAgo()->format(DATE_RFC2822)));
+        $response = new Response('', 200, ['Last-Modified' => $this->createDateTimeOneHourAgo()->format(DATE_RFC2822)]);
         $this->assertTrue($response->isValidateable(), '->isValidateable() returns true if Last-Modified is present');
 
-        $response = new Response('', 200, array('ETag' => '"12345"'));
+        $response = new Response('', 200, ['ETag' => '"12345"']);
         $this->assertTrue($response->isValidateable(), '->isValidateable() returns true if ETag is present');
 
         $response = new Response();
@@ -266,7 +266,7 @@ public function testIsValidateable()
     public function testGetDate()
     {
         $oneHourAgo = $this->createDateTimeOneHourAgo();
-        $response = new Response('', 200, array('Date' => $oneHourAgo->format(DATE_RFC2822)));
+        $response = new Response('', 200, ['Date' => $oneHourAgo->format(DATE_RFC2822)]);
         $date = $response->getDate();
         $this->assertEquals($oneHourAgo->getTimestamp(), $date->getTimestamp(), '->getDate() returns the Date header if present');
 
@@ -274,7 +274,7 @@ public function testGetDate()
         $date = $response->getDate();
         $this->assertEquals(time(), $date->getTimestamp(), '->getDate() returns the current Date if no Date header present');
 
-        $response = new Response('', 200, array('Date' => $this->createDateTimeOneHourAgo()->format(DATE_RFC2822)));
+        $response = new Response('', 200, ['Date' => $this->createDateTimeOneHourAgo()->format(DATE_RFC2822)]);
         $now = $this->createDateTimeNow();
         $response->headers->set('Date', $now->format(DATE_RFC2822));
         $date = $response->getDate();
@@ -414,21 +414,21 @@ public function testGetSetProtocolVersion()
     public function testGetVary()
     {
         $response = new Response();
-        $this->assertEquals(array(), $response->getVary(), '->getVary() returns an empty array if no Vary header is present');
+        $this->assertEquals([], $response->getVary(), '->getVary() returns an empty array if no Vary header is present');
 
         $response = new Response();
         $response->headers->set('Vary', 'Accept-Language');
-        $this->assertEquals(array('Accept-Language'), $response->getVary(), '->getVary() parses a single header name value');
+        $this->assertEquals(['Accept-Language'], $response->getVary(), '->getVary() parses a single header name value');
 
         $response = new Response();
         $response->headers->set('Vary', 'Accept-Language User-Agent    X-Foo');
-        $this->assertEquals(array('Accept-Language', 'User-Agent', 'X-Foo'), $response->getVary(), '->getVary() parses multiple header name values separated by spaces');
+        $this->assertEquals(['Accept-Language', 'User-Agent', 'X-Foo'], $response->getVary(), '->getVary() parses multiple header name values separated by spaces');
 
         $response = new Response();
         $response->headers->set('Vary', 'Accept-Language,User-Agent,    X-Foo');
-        $this->assertEquals(array('Accept-Language', 'User-Agent', 'X-Foo'), $response->getVary(), '->getVary() parses multiple header name values separated by commas');
+        $this->assertEquals(['Accept-Language', 'User-Agent', 'X-Foo'], $response->getVary(), '->getVary() parses multiple header name values separated by commas');
 
-        $vary = array('Accept-Language', 'User-Agent', 'X-foo');
+        $vary = ['Accept-Language', 'User-Agent', 'X-foo'];
 
         $response = new Response();
         $response->headers->set('Vary', $vary);
@@ -443,18 +443,18 @@ public function testSetVary()
     {
         $response = new Response();
         $response->setVary('Accept-Language');
-        $this->assertEquals(array('Accept-Language'), $response->getVary());
+        $this->assertEquals(['Accept-Language'], $response->getVary());
 
         $response->setVary('Accept-Language, User-Agent');
-        $this->assertEquals(array('Accept-Language', 'User-Agent'), $response->getVary(), '->setVary() replace the vary header by default');
+        $this->assertEquals(['Accept-Language', 'User-Agent'], $response->getVary(), '->setVary() replace the vary header by default');
 
         $response->setVary('X-Foo', false);
-        $this->assertEquals(array('Accept-Language', 'User-Agent', 'X-Foo'), $response->getVary(), '->setVary() doesn\'t wipe out earlier Vary headers if replace is set to false');
+        $this->assertEquals(['Accept-Language', 'User-Agent', 'X-Foo'], $response->getVary(), '->setVary() doesn\'t wipe out earlier Vary headers if replace is set to false');
     }
 
     public function testDefaultContentType()
     {
-        $headerMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\ResponseHeaderBag')->setMethods(array('set'))->getMock();
+        $headerMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\ResponseHeaderBag')->setMethods(['set'])->getMock();
         $headerMock->expects($this->at(0))
             ->method('set')
             ->with('Content-Type', 'text/html');
@@ -578,53 +578,53 @@ public function testSetCache()
         $response = new Response();
         //array('etag', 'last_modified', 'max_age', 's_maxage', 'private', 'public')
         try {
-            $response->setCache(array('wrong option' => 'value'));
+            $response->setCache(['wrong option' => 'value']);
             $this->fail('->setCache() throws an InvalidArgumentException if an option is not supported');
         } catch (\Exception $e) {
             $this->assertInstanceOf('InvalidArgumentException', $e, '->setCache() throws an InvalidArgumentException if an option is not supported');
             $this->assertContains('"wrong option"', $e->getMessage());
         }
 
-        $options = array('etag' => '"whatever"');
+        $options = ['etag' => '"whatever"'];
         $response->setCache($options);
         $this->assertEquals($response->getEtag(), '"whatever"');
 
         $now = $this->createDateTimeNow();
-        $options = array('last_modified' => $now);
+        $options = ['last_modified' => $now];
         $response->setCache($options);
         $this->assertEquals($response->getLastModified()->getTimestamp(), $now->getTimestamp());
 
-        $options = array('max_age' => 100);
+        $options = ['max_age' => 100];
         $response->setCache($options);
         $this->assertEquals($response->getMaxAge(), 100);
 
-        $options = array('s_maxage' => 200);
+        $options = ['s_maxage' => 200];
         $response->setCache($options);
         $this->assertEquals($response->getMaxAge(), 200);
 
         $this->assertTrue($response->headers->hasCacheControlDirective('public'));
         $this->assertFalse($response->headers->hasCacheControlDirective('private'));
 
-        $response->setCache(array('public' => true));
+        $response->setCache(['public' => true]);
         $this->assertTrue($response->headers->hasCacheControlDirective('public'));
         $this->assertFalse($response->headers->hasCacheControlDirective('private'));
 
-        $response->setCache(array('public' => false));
+        $response->setCache(['public' => false]);
         $this->assertFalse($response->headers->hasCacheControlDirective('public'));
         $this->assertTrue($response->headers->hasCacheControlDirective('private'));
 
-        $response->setCache(array('private' => true));
+        $response->setCache(['private' => true]);
         $this->assertFalse($response->headers->hasCacheControlDirective('public'));
         $this->assertTrue($response->headers->hasCacheControlDirective('private'));
 
-        $response->setCache(array('private' => false));
+        $response->setCache(['private' => false]);
         $this->assertTrue($response->headers->hasCacheControlDirective('public'));
         $this->assertFalse($response->headers->hasCacheControlDirective('private'));
 
-        $response->setCache(array('immutable' => true));
+        $response->setCache(['immutable' => true]);
         $this->assertTrue($response->headers->hasCacheControlDirective('immutable'));
 
-        $response->setCache(array('immutable' => false));
+        $response->setCache(['immutable' => false]);
         $this->assertFalse($response->headers->hasCacheControlDirective('immutable'));
     }
 
@@ -725,14 +725,14 @@ public function testSetStatusCode($code, $text, $expectedText)
 
     public function getStatusCodeFixtures()
     {
-        return array(
-            array('200', null, 'OK'),
-            array('200', false, ''),
-            array('200', 'foo', 'foo'),
-            array('199', null, 'unknown status'),
-            array('199', false, ''),
-            array('199', 'foo', 'foo'),
-        );
+        return [
+            ['200', null, 'OK'],
+            ['200', false, ''],
+            ['200', 'foo', 'foo'],
+            ['199', null, 'unknown status'],
+            ['199', false, ''],
+            ['199', 'foo', 'foo'],
+        ];
     }
 
     public function testIsInformational()
@@ -746,7 +746,7 @@ public function testIsInformational()
 
     public function testIsRedirectRedirection()
     {
-        foreach (array(301, 302, 303, 307) as $code) {
+        foreach ([301, 302, 303, 307] as $code) {
             $response = new Response('', $code);
             $this->assertTrue($response->isRedirection());
             $this->assertTrue($response->isRedirect());
@@ -764,7 +764,7 @@ public function testIsRedirectRedirection()
         $this->assertFalse($response->isRedirection());
         $this->assertFalse($response->isRedirect());
 
-        $response = new Response('', 301, array('Location' => '/good-uri'));
+        $response = new Response('', 301, ['Location' => '/good-uri']);
         $this->assertFalse($response->isRedirect('/bad-uri'));
         $this->assertTrue($response->isRedirect('/good-uri'));
     }
@@ -780,7 +780,7 @@ public function testIsNotFound()
 
     public function testIsEmpty()
     {
-        foreach (array(204, 304) as $code) {
+        foreach ([204, 304] as $code) {
             $response = new Response('', $code);
             $this->assertTrue($response->isEmpty());
         }
@@ -829,7 +829,7 @@ public function testHasVary()
 
     public function testSetEtag()
     {
-        $response = new Response('', 200, array('ETag' => '"12345"'));
+        $response = new Response('', 200, ['ETag' => '"12345"']);
         $response->setEtag();
 
         $this->assertNull($response->headers->get('Etag'), '->setEtag() removes Etags when call with null');
@@ -859,7 +859,7 @@ public function testSettersAreChainable()
     {
         $response = new Response();
 
-        $setters = array(
+        $setters = [
             'setProtocolVersion' => '1.0',
             'setCharset' => 'UTF-8',
             'setPublic' => null,
@@ -870,7 +870,7 @@ public function testSettersAreChainable()
             'setSharedMaxAge' => 1,
             'setTtl' => 1,
             'setClientTtl' => 1,
-        );
+        ];
 
         foreach ($setters as $setter => $arg) {
             $this->assertEquals($response, $response->{$setter}($arg));
@@ -889,20 +889,20 @@ public function testNoDeprecationsAreTriggered()
 
     public function validContentProvider()
     {
-        return array(
-            'obj' => array(new StringableObject()),
-            'string' => array('Foo'),
-            'int' => array(2),
-        );
+        return [
+            'obj' => [new StringableObject()],
+            'string' => ['Foo'],
+            'int' => [2],
+        ];
     }
 
     public function invalidContentProvider()
     {
-        return array(
-            'obj' => array(new \stdClass()),
-            'array' => array(array()),
-            'bool' => array(true, '1'),
-        );
+        return [
+            'obj' => [new \stdClass()],
+            'array' => [[]],
+            'bool' => [true, '1'],
+        ];
     }
 
     protected function createDateTimeOneHourAgo()
@@ -942,19 +942,19 @@ public function ianaCodesReasonPhrasesProvider()
 
         $ianaHttpStatusCodes = new \DOMDocument();
 
-        libxml_set_streams_context(stream_context_create(array(
-            'http' => array(
+        libxml_set_streams_context(stream_context_create([
+            'http' => [
                 'method' => 'GET',
                 'timeout' => 30,
-            ),
-        )));
+            ],
+        ]));
 
         $ianaHttpStatusCodes->load('https://www.iana.org/assignments/http-status-codes/http-status-codes.xml');
         if (!$ianaHttpStatusCodes->relaxNGValidate(__DIR__.'/schema/http-status-codes.rng')) {
             self::fail('Invalid IANA\'s HTTP status code list.');
         }
 
-        $ianaCodesReasonPhrases = array();
+        $ianaCodesReasonPhrases = [];
 
         $xpath = new \DOMXPath($ianaHttpStatusCodes);
         $xpath->registerNamespace('ns', 'http://www.iana.org/assignments');
@@ -964,16 +964,16 @@ public function ianaCodesReasonPhrasesProvider()
             $value = $xpath->query('.//ns:value', $record)->item(0)->nodeValue;
             $description = $xpath->query('.//ns:description', $record)->item(0)->nodeValue;
 
-            if (\in_array($description, array('Unassigned', '(Unused)'), true)) {
+            if (\in_array($description, ['Unassigned', '(Unused)'], true)) {
                 continue;
             }
 
             if (preg_match('/^([0-9]+)\s*\-\s*([0-9]+)$/', $value, $matches)) {
                 for ($value = $matches[1]; $value <= $matches[2]; ++$value) {
-                    $ianaCodesReasonPhrases[] = array($value, $description);
+                    $ianaCodesReasonPhrases[] = [$value, $description];
                 }
             } else {
-                $ianaCodesReasonPhrases[] = array($value, $description);
+                $ianaCodesReasonPhrases[] = [$value, $description];
             }
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ServerBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ServerBagTest.php
index f8becec5a982d..0663b118e675e 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ServerBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ServerBagTest.php
@@ -23,7 +23,7 @@ class ServerBagTest extends TestCase
 {
     public function testShouldExtractHeadersFromServerArray()
     {
-        $server = array(
+        $server = [
             'SOME_SERVER_VARIABLE' => 'value',
             'SOME_SERVER_VARIABLE2' => 'value',
             'ROOT' => 'value',
@@ -32,45 +32,45 @@ public function testShouldExtractHeadersFromServerArray()
             'HTTP_ETAG' => 'asdf',
             'PHP_AUTH_USER' => 'foo',
             'PHP_AUTH_PW' => 'bar',
-        );
+        ];
 
         $bag = new ServerBag($server);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'CONTENT_TYPE' => 'text/html',
             'CONTENT_LENGTH' => '0',
             'ETAG' => 'asdf',
             'AUTHORIZATION' => 'Basic '.base64_encode('foo:bar'),
             'PHP_AUTH_USER' => 'foo',
             'PHP_AUTH_PW' => 'bar',
-        ), $bag->getHeaders());
+        ], $bag->getHeaders());
     }
 
     public function testHttpPasswordIsOptional()
     {
-        $bag = new ServerBag(array('PHP_AUTH_USER' => 'foo'));
+        $bag = new ServerBag(['PHP_AUTH_USER' => 'foo']);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'AUTHORIZATION' => 'Basic '.base64_encode('foo:'),
             'PHP_AUTH_USER' => 'foo',
             'PHP_AUTH_PW' => '',
-        ), $bag->getHeaders());
+        ], $bag->getHeaders());
     }
 
     public function testHttpBasicAuthWithPhpCgi()
     {
-        $bag = new ServerBag(array('HTTP_AUTHORIZATION' => 'Basic '.base64_encode('foo:bar')));
+        $bag = new ServerBag(['HTTP_AUTHORIZATION' => 'Basic '.base64_encode('foo:bar')]);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'AUTHORIZATION' => 'Basic '.base64_encode('foo:bar'),
             'PHP_AUTH_USER' => 'foo',
             'PHP_AUTH_PW' => 'bar',
-        ), $bag->getHeaders());
+        ], $bag->getHeaders());
     }
 
     public function testHttpBasicAuthWithPhpCgiBogus()
     {
-        $bag = new ServerBag(array('HTTP_AUTHORIZATION' => 'Basic_'.base64_encode('foo:bar')));
+        $bag = new ServerBag(['HTTP_AUTHORIZATION' => 'Basic_'.base64_encode('foo:bar')]);
 
         // Username and passwords should not be set as the header is bogus
         $headers = $bag->getHeaders();
@@ -80,41 +80,41 @@ public function testHttpBasicAuthWithPhpCgiBogus()
 
     public function testHttpBasicAuthWithPhpCgiRedirect()
     {
-        $bag = new ServerBag(array('REDIRECT_HTTP_AUTHORIZATION' => 'Basic '.base64_encode('username:pass:word')));
+        $bag = new ServerBag(['REDIRECT_HTTP_AUTHORIZATION' => 'Basic '.base64_encode('username:pass:word')]);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'AUTHORIZATION' => 'Basic '.base64_encode('username:pass:word'),
             'PHP_AUTH_USER' => 'username',
             'PHP_AUTH_PW' => 'pass:word',
-        ), $bag->getHeaders());
+        ], $bag->getHeaders());
     }
 
     public function testHttpBasicAuthWithPhpCgiEmptyPassword()
     {
-        $bag = new ServerBag(array('HTTP_AUTHORIZATION' => 'Basic '.base64_encode('foo:')));
+        $bag = new ServerBag(['HTTP_AUTHORIZATION' => 'Basic '.base64_encode('foo:')]);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'AUTHORIZATION' => 'Basic '.base64_encode('foo:'),
             'PHP_AUTH_USER' => 'foo',
             'PHP_AUTH_PW' => '',
-        ), $bag->getHeaders());
+        ], $bag->getHeaders());
     }
 
     public function testHttpDigestAuthWithPhpCgi()
     {
         $digest = 'Digest username="foo", realm="acme", nonce="'.md5('secret').'", uri="/protected, qop="auth"';
-        $bag = new ServerBag(array('HTTP_AUTHORIZATION' => $digest));
+        $bag = new ServerBag(['HTTP_AUTHORIZATION' => $digest]);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'AUTHORIZATION' => $digest,
             'PHP_AUTH_DIGEST' => $digest,
-        ), $bag->getHeaders());
+        ], $bag->getHeaders());
     }
 
     public function testHttpDigestAuthWithPhpCgiBogus()
     {
         $digest = 'Digest_username="foo", realm="acme", nonce="'.md5('secret').'", uri="/protected, qop="auth"';
-        $bag = new ServerBag(array('HTTP_AUTHORIZATION' => $digest));
+        $bag = new ServerBag(['HTTP_AUTHORIZATION' => $digest]);
 
         // Username and passwords should not be set as the header is bogus
         $headers = $bag->getHeaders();
@@ -125,32 +125,32 @@ public function testHttpDigestAuthWithPhpCgiBogus()
     public function testHttpDigestAuthWithPhpCgiRedirect()
     {
         $digest = 'Digest username="foo", realm="acme", nonce="'.md5('secret').'", uri="/protected, qop="auth"';
-        $bag = new ServerBag(array('REDIRECT_HTTP_AUTHORIZATION' => $digest));
+        $bag = new ServerBag(['REDIRECT_HTTP_AUTHORIZATION' => $digest]);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'AUTHORIZATION' => $digest,
             'PHP_AUTH_DIGEST' => $digest,
-        ), $bag->getHeaders());
+        ], $bag->getHeaders());
     }
 
     public function testOAuthBearerAuth()
     {
         $headerContent = 'Bearer L-yLEOr9zhmUYRkzN1jwwxwQ-PBNiKDc8dgfB4hTfvo';
-        $bag = new ServerBag(array('HTTP_AUTHORIZATION' => $headerContent));
+        $bag = new ServerBag(['HTTP_AUTHORIZATION' => $headerContent]);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'AUTHORIZATION' => $headerContent,
-        ), $bag->getHeaders());
+        ], $bag->getHeaders());
     }
 
     public function testOAuthBearerAuthWithRedirect()
     {
         $headerContent = 'Bearer L-yLEOr9zhmUYRkzN1jwwxwQ-PBNiKDc8dgfB4hTfvo';
-        $bag = new ServerBag(array('REDIRECT_HTTP_AUTHORIZATION' => $headerContent));
+        $bag = new ServerBag(['REDIRECT_HTTP_AUTHORIZATION' => $headerContent]);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'AUTHORIZATION' => $headerContent,
-        ), $bag->getHeaders());
+        ], $bag->getHeaders());
     }
 
     /**
@@ -159,12 +159,12 @@ public function testOAuthBearerAuthWithRedirect()
     public function testItDoesNotOverwriteTheAuthorizationHeaderIfItIsAlreadySet()
     {
         $headerContent = 'Bearer L-yLEOr9zhmUYRkzN1jwwxwQ-PBNiKDc8dgfB4hTfvo';
-        $bag = new ServerBag(array('PHP_AUTH_USER' => 'foo', 'HTTP_AUTHORIZATION' => $headerContent));
+        $bag = new ServerBag(['PHP_AUTH_USER' => 'foo', 'HTTP_AUTHORIZATION' => $headerContent]);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'AUTHORIZATION' => $headerContent,
             'PHP_AUTH_USER' => 'foo',
             'PHP_AUTH_PW' => '',
-        ), $bag->getHeaders());
+        ], $bag->getHeaders());
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/AttributeBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/AttributeBagTest.php
index 43644e23eab28..735a1edcb46e8 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/AttributeBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/AttributeBagTest.php
@@ -21,7 +21,7 @@
  */
 class AttributeBagTest extends TestCase
 {
-    private $array = array();
+    private $array = [];
 
     /**
      * @var AttributeBag
@@ -52,7 +52,7 @@ protected function setUp()
     protected function tearDown()
     {
         $this->bag = null;
-        $this->array = array();
+        $this->array = [];
     }
 
     public function testInitialize()
@@ -60,7 +60,7 @@ public function testInitialize()
         $bag = new AttributeBag();
         $bag->initialize($this->array);
         $this->assertEquals($this->array, $bag->all());
-        $array = array('should' => 'change');
+        $array = ['should' => 'change'];
         $bag->initialize($array);
         $this->assertEquals($array, $bag->all());
     }
@@ -122,7 +122,7 @@ public function testAll()
 
     public function testReplace()
     {
-        $array = array();
+        $array = [];
         $array['name'] = 'jack';
         $array['foo.bar'] = 'beep';
         $this->bag->replace($array);
@@ -150,22 +150,22 @@ public function testRemove()
     public function testClear()
     {
         $this->bag->clear();
-        $this->assertEquals(array(), $this->bag->all());
+        $this->assertEquals([], $this->bag->all());
     }
 
     public function attributesProvider()
     {
-        return array(
-            array('hello', 'world', true),
-            array('always', 'be happy', true),
-            array('user.login', 'drak', true),
-            array('csrf.token', array('a' => '1234', 'b' => '4321'), true),
-            array('category', array('fishing' => array('first' => 'cod', 'second' => 'sole')), true),
-            array('user2.login', null, false),
-            array('never', null, false),
-            array('bye', null, false),
-            array('bye/for/now', null, false),
-        );
+        return [
+            ['hello', 'world', true],
+            ['always', 'be happy', true],
+            ['user.login', 'drak', true],
+            ['csrf.token', ['a' => '1234', 'b' => '4321'], true],
+            ['category', ['fishing' => ['first' => 'cod', 'second' => 'sole']], true],
+            ['user2.login', null, false],
+            ['never', null, false],
+            ['bye', null, false],
+            ['bye/for/now', null, false],
+        ];
     }
 
     public function testGetIterator()
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/NamespacedAttributeBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/NamespacedAttributeBagTest.php
index ec4cd5ad1a146..6b4bb17d696f2 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/NamespacedAttributeBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/NamespacedAttributeBagTest.php
@@ -21,7 +21,7 @@
  */
 class NamespacedAttributeBagTest extends TestCase
 {
-    private $array = array();
+    private $array = [];
 
     /**
      * @var NamespacedAttributeBag
@@ -30,21 +30,21 @@ class NamespacedAttributeBagTest extends TestCase
 
     protected function setUp()
     {
-        $this->array = array(
+        $this->array = [
             'hello' => 'world',
             'always' => 'be happy',
             'user.login' => 'drak',
-            'csrf.token' => array(
+            'csrf.token' => [
                 'a' => '1234',
                 'b' => '4321',
-            ),
-            'category' => array(
-                'fishing' => array(
+            ],
+            'category' => [
+                'fishing' => [
                     'first' => 'cod',
                     'second' => 'sole',
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
         $this->bag = new NamespacedAttributeBag('_sf2', '/');
         $this->bag->initialize($this->array);
     }
@@ -52,7 +52,7 @@ protected function setUp()
     protected function tearDown()
     {
         $this->bag = null;
-        $this->array = array();
+        $this->array = [];
     }
 
     public function testInitialize()
@@ -60,7 +60,7 @@ public function testInitialize()
         $bag = new NamespacedAttributeBag();
         $bag->initialize($this->array);
         $this->assertEquals($this->array, $this->bag->all());
-        $array = array('should' => 'not stick');
+        $array = ['should' => 'not stick'];
         $bag->initialize($array);
 
         // should have remained the same
@@ -139,7 +139,7 @@ public function testAll()
 
     public function testReplace()
     {
-        $array = array();
+        $array = [];
         $array['name'] = 'jack';
         $array['foo.bar'] = 'beep';
         $this->bag->replace($array);
@@ -177,28 +177,28 @@ public function testRemoveNonexistingNamespacedAttribute()
     public function testClear()
     {
         $this->bag->clear();
-        $this->assertEquals(array(), $this->bag->all());
+        $this->assertEquals([], $this->bag->all());
     }
 
     public function attributesProvider()
     {
-        return array(
-            array('hello', 'world', true),
-            array('always', 'be happy', true),
-            array('user.login', 'drak', true),
-            array('csrf.token', array('a' => '1234', 'b' => '4321'), true),
-            array('csrf.token/a', '1234', true),
-            array('csrf.token/b', '4321', true),
-            array('category', array('fishing' => array('first' => 'cod', 'second' => 'sole')), true),
-            array('category/fishing', array('first' => 'cod', 'second' => 'sole'), true),
-            array('category/fishing/missing/first', null, false),
-            array('category/fishing/first', 'cod', true),
-            array('category/fishing/second', 'sole', true),
-            array('category/fishing/missing/second', null, false),
-            array('user2.login', null, false),
-            array('never', null, false),
-            array('bye', null, false),
-            array('bye/for/now', null, false),
-        );
+        return [
+            ['hello', 'world', true],
+            ['always', 'be happy', true],
+            ['user.login', 'drak', true],
+            ['csrf.token', ['a' => '1234', 'b' => '4321'], true],
+            ['csrf.token/a', '1234', true],
+            ['csrf.token/b', '4321', true],
+            ['category', ['fishing' => ['first' => 'cod', 'second' => 'sole']], true],
+            ['category/fishing', ['first' => 'cod', 'second' => 'sole'], true],
+            ['category/fishing/missing/first', null, false],
+            ['category/fishing/first', 'cod', true],
+            ['category/fishing/second', 'sole', true],
+            ['category/fishing/missing/second', null, false],
+            ['user2.login', null, false],
+            ['never', null, false],
+            ['bye', null, false],
+            ['bye/for/now', null, false],
+        ];
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/AutoExpireFlashBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/AutoExpireFlashBagTest.php
index fa8626ab923b7..b4e2c3a5ad30a 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/AutoExpireFlashBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/AutoExpireFlashBagTest.php
@@ -26,13 +26,13 @@ class AutoExpireFlashBagTest extends TestCase
      */
     private $bag;
 
-    protected $array = array();
+    protected $array = [];
 
     protected function setUp()
     {
         parent::setUp();
         $this->bag = new FlashBag();
-        $this->array = array('new' => array('notice' => array('A previous flash message')));
+        $this->array = ['new' => ['notice' => ['A previous flash message']]];
         $this->bag->initialize($this->array);
     }
 
@@ -45,16 +45,16 @@ protected function tearDown()
     public function testInitialize()
     {
         $bag = new FlashBag();
-        $array = array('new' => array('notice' => array('A previous flash message')));
+        $array = ['new' => ['notice' => ['A previous flash message']]];
         $bag->initialize($array);
-        $this->assertEquals(array('A previous flash message'), $bag->peek('notice'));
-        $array = array('new' => array(
-                'notice' => array('Something else'),
-                'error' => array('a'),
-            ));
+        $this->assertEquals(['A previous flash message'], $bag->peek('notice'));
+        $array = ['new' => [
+                'notice' => ['Something else'],
+                'error' => ['a'],
+            ]];
         $bag->initialize($array);
-        $this->assertEquals(array('Something else'), $bag->peek('notice'));
-        $this->assertEquals(array('a'), $bag->peek('error'));
+        $this->assertEquals(['Something else'], $bag->peek('notice'));
+        $this->assertEquals(['a'], $bag->peek('error'));
     }
 
     public function testGetStorageKey()
@@ -73,16 +73,16 @@ public function testGetSetName()
 
     public function testPeek()
     {
-        $this->assertEquals(array(), $this->bag->peek('non_existing'));
-        $this->assertEquals(array('default'), $this->bag->peek('non_existing', array('default')));
-        $this->assertEquals(array('A previous flash message'), $this->bag->peek('notice'));
-        $this->assertEquals(array('A previous flash message'), $this->bag->peek('notice'));
+        $this->assertEquals([], $this->bag->peek('non_existing'));
+        $this->assertEquals(['default'], $this->bag->peek('non_existing', ['default']));
+        $this->assertEquals(['A previous flash message'], $this->bag->peek('notice'));
+        $this->assertEquals(['A previous flash message'], $this->bag->peek('notice'));
     }
 
     public function testSet()
     {
         $this->bag->set('notice', 'Foo');
-        $this->assertEquals(array('A previous flash message'), $this->bag->peek('notice'));
+        $this->assertEquals(['A previous flash message'], $this->bag->peek('notice'));
     }
 
     public function testHas()
@@ -93,43 +93,43 @@ public function testHas()
 
     public function testKeys()
     {
-        $this->assertEquals(array('notice'), $this->bag->keys());
+        $this->assertEquals(['notice'], $this->bag->keys());
     }
 
     public function testPeekAll()
     {
-        $array = array(
-            'new' => array(
+        $array = [
+            'new' => [
                 'notice' => 'Foo',
                 'error' => 'Bar',
-            ),
-        );
+            ],
+        ];
 
         $this->bag->initialize($array);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'notice' => 'Foo',
             'error' => 'Bar',
-            ), $this->bag->peekAll()
+            ], $this->bag->peekAll()
         );
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'notice' => 'Foo',
             'error' => 'Bar',
-            ), $this->bag->peekAll()
+            ], $this->bag->peekAll()
         );
     }
 
     public function testGet()
     {
-        $this->assertEquals(array(), $this->bag->get('non_existing'));
-        $this->assertEquals(array('default'), $this->bag->get('non_existing', array('default')));
-        $this->assertEquals(array('A previous flash message'), $this->bag->get('notice'));
-        $this->assertEquals(array(), $this->bag->get('notice'));
+        $this->assertEquals([], $this->bag->get('non_existing'));
+        $this->assertEquals(['default'], $this->bag->get('non_existing', ['default']));
+        $this->assertEquals(['A previous flash message'], $this->bag->get('notice'));
+        $this->assertEquals([], $this->bag->get('notice'));
     }
 
     public function testSetAll()
     {
-        $this->bag->setAll(array('a' => 'first', 'b' => 'second'));
+        $this->bag->setAll(['a' => 'first', 'b' => 'second']);
         $this->assertFalse($this->bag->has('a'));
         $this->assertFalse($this->bag->has('b'));
     }
@@ -138,17 +138,17 @@ public function testAll()
     {
         $this->bag->set('notice', 'Foo');
         $this->bag->set('error', 'Bar');
-        $this->assertEquals(array(
-            'notice' => array('A previous flash message'),
-            ), $this->bag->all()
+        $this->assertEquals([
+            'notice' => ['A previous flash message'],
+            ], $this->bag->all()
         );
 
-        $this->assertEquals(array(), $this->bag->all());
+        $this->assertEquals([], $this->bag->all());
     }
 
     public function testClear()
     {
-        $this->assertEquals(array('notice' => array('A previous flash message')), $this->bag->clear());
+        $this->assertEquals(['notice' => ['A previous flash message']], $this->bag->clear());
     }
 
     public function testDoNotRemoveTheNewFlashesWhenDisplayingTheExistingOnes()
@@ -156,6 +156,6 @@ public function testDoNotRemoveTheNewFlashesWhenDisplayingTheExistingOnes()
         $this->bag->add('success', 'Something');
         $this->bag->all();
 
-        $this->assertEquals(array('new' => array('success' => array('Something')), 'display' => array()), $this->array);
+        $this->assertEquals(['new' => ['success' => ['Something']], 'display' => []], $this->array);
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php
index 905a1f7517306..6d8619e078a12 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php
@@ -26,13 +26,13 @@ class FlashBagTest extends TestCase
      */
     private $bag;
 
-    protected $array = array();
+    protected $array = [];
 
     protected function setUp()
     {
         parent::setUp();
         $this->bag = new FlashBag();
-        $this->array = array('notice' => array('A previous flash message'));
+        $this->array = ['notice' => ['A previous flash message']];
         $this->bag->initialize($this->array);
     }
 
@@ -47,7 +47,7 @@ public function testInitialize()
         $bag = new FlashBag();
         $bag->initialize($this->array);
         $this->assertEquals($this->array, $bag->peekAll());
-        $array = array('should' => array('change'));
+        $array = ['should' => ['change']];
         $bag->initialize($array);
         $this->assertEquals($array, $bag->peekAll());
     }
@@ -68,49 +68,49 @@ public function testGetSetName()
 
     public function testPeek()
     {
-        $this->assertEquals(array(), $this->bag->peek('non_existing'));
-        $this->assertEquals(array('default'), $this->bag->peek('not_existing', array('default')));
-        $this->assertEquals(array('A previous flash message'), $this->bag->peek('notice'));
-        $this->assertEquals(array('A previous flash message'), $this->bag->peek('notice'));
+        $this->assertEquals([], $this->bag->peek('non_existing'));
+        $this->assertEquals(['default'], $this->bag->peek('not_existing', ['default']));
+        $this->assertEquals(['A previous flash message'], $this->bag->peek('notice'));
+        $this->assertEquals(['A previous flash message'], $this->bag->peek('notice'));
     }
 
     public function testAdd()
     {
-        $tab = array('bar' => 'baz');
+        $tab = ['bar' => 'baz'];
         $this->bag->add('string_message', 'lorem');
         $this->bag->add('object_message', new \stdClass());
         $this->bag->add('array_message', $tab);
 
-        $this->assertEquals(array('lorem'), $this->bag->get('string_message'));
-        $this->assertEquals(array(new \stdClass()), $this->bag->get('object_message'));
-        $this->assertEquals(array($tab), $this->bag->get('array_message'));
+        $this->assertEquals(['lorem'], $this->bag->get('string_message'));
+        $this->assertEquals([new \stdClass()], $this->bag->get('object_message'));
+        $this->assertEquals([$tab], $this->bag->get('array_message'));
     }
 
     public function testGet()
     {
-        $this->assertEquals(array(), $this->bag->get('non_existing'));
-        $this->assertEquals(array('default'), $this->bag->get('not_existing', array('default')));
-        $this->assertEquals(array('A previous flash message'), $this->bag->get('notice'));
-        $this->assertEquals(array(), $this->bag->get('notice'));
+        $this->assertEquals([], $this->bag->get('non_existing'));
+        $this->assertEquals(['default'], $this->bag->get('not_existing', ['default']));
+        $this->assertEquals(['A previous flash message'], $this->bag->get('notice'));
+        $this->assertEquals([], $this->bag->get('notice'));
     }
 
     public function testAll()
     {
         $this->bag->set('notice', 'Foo');
         $this->bag->set('error', 'Bar');
-        $this->assertEquals(array(
-            'notice' => array('Foo'),
-            'error' => array('Bar'), ), $this->bag->all()
+        $this->assertEquals([
+            'notice' => ['Foo'],
+            'error' => ['Bar'], ], $this->bag->all()
         );
 
-        $this->assertEquals(array(), $this->bag->all());
+        $this->assertEquals([], $this->bag->all());
     }
 
     public function testSet()
     {
         $this->bag->set('notice', 'Foo');
         $this->bag->set('notice', 'Bar');
-        $this->assertEquals(array('Bar'), $this->bag->peek('notice'));
+        $this->assertEquals(['Bar'], $this->bag->peek('notice'));
     }
 
     public function testHas()
@@ -121,7 +121,7 @@ public function testHas()
 
     public function testKeys()
     {
-        $this->assertEquals(array('notice'), $this->bag->keys());
+        $this->assertEquals(['notice'], $this->bag->keys());
     }
 
     public function testSetAll()
@@ -130,28 +130,28 @@ public function testSetAll()
         $this->bag->add('another_flash', 'Bar');
         $this->assertTrue($this->bag->has('one_flash'));
         $this->assertTrue($this->bag->has('another_flash'));
-        $this->bag->setAll(array('unique_flash' => 'FooBar'));
+        $this->bag->setAll(['unique_flash' => 'FooBar']);
         $this->assertFalse($this->bag->has('one_flash'));
         $this->assertFalse($this->bag->has('another_flash'));
-        $this->assertSame(array('unique_flash' => 'FooBar'), $this->bag->all());
-        $this->assertSame(array(), $this->bag->all());
+        $this->assertSame(['unique_flash' => 'FooBar'], $this->bag->all());
+        $this->assertSame([], $this->bag->all());
     }
 
     public function testPeekAll()
     {
         $this->bag->set('notice', 'Foo');
         $this->bag->set('error', 'Bar');
-        $this->assertEquals(array(
-            'notice' => array('Foo'),
-            'error' => array('Bar'),
-            ), $this->bag->peekAll()
+        $this->assertEquals([
+            'notice' => ['Foo'],
+            'error' => ['Bar'],
+            ], $this->bag->peekAll()
         );
         $this->assertTrue($this->bag->has('notice'));
         $this->assertTrue($this->bag->has('error'));
-        $this->assertEquals(array(
-            'notice' => array('Foo'),
-            'error' => array('Bar'),
-            ), $this->bag->peekAll()
+        $this->assertEquals([
+            'notice' => ['Foo'],
+            'error' => ['Bar'],
+            ], $this->bag->peekAll()
         );
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php
index 63351e575a3c8..afa00fc7c3046 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php
@@ -127,10 +127,10 @@ public function testHas($key, $value)
 
     public function testReplace()
     {
-        $this->session->replace(array('happiness' => 'be good', 'symfony' => 'awesome'));
-        $this->assertEquals(array('happiness' => 'be good', 'symfony' => 'awesome'), $this->session->all());
-        $this->session->replace(array());
-        $this->assertEquals(array(), $this->session->all());
+        $this->session->replace(['happiness' => 'be good', 'symfony' => 'awesome']);
+        $this->assertEquals(['happiness' => 'be good', 'symfony' => 'awesome'], $this->session->all());
+        $this->session->replace([]);
+        $this->assertEquals([], $this->session->all());
     }
 
     /**
@@ -150,16 +150,16 @@ public function testClear($key, $value)
         $this->session->set('hi', 'fabien');
         $this->session->set($key, $value);
         $this->session->clear();
-        $this->assertEquals(array(), $this->session->all());
+        $this->assertEquals([], $this->session->all());
     }
 
     public function setProvider()
     {
-        return array(
-            array('foo', 'bar', array('foo' => 'bar')),
-            array('foo.bar', 'too much beer', array('foo.bar' => 'too much beer')),
-            array('great', 'symfony is great', array('great' => 'symfony is great')),
-        );
+        return [
+            ['foo', 'bar', ['foo' => 'bar']],
+            ['foo.bar', 'too much beer', ['foo.bar' => 'too much beer']],
+            ['great', 'symfony is great', ['great' => 'symfony is great']],
+        ];
     }
 
     /**
@@ -170,14 +170,14 @@ public function testRemove($key, $value)
         $this->session->set('hi.world', 'have a nice day');
         $this->session->set($key, $value);
         $this->session->remove($key);
-        $this->assertEquals(array('hi.world' => 'have a nice day'), $this->session->all());
+        $this->assertEquals(['hi.world' => 'have a nice day'], $this->session->all());
     }
 
     public function testInvalidate()
     {
         $this->session->set('invalidate', 123);
         $this->session->invalidate();
-        $this->assertEquals(array(), $this->session->all());
+        $this->assertEquals([], $this->session->all());
     }
 
     public function testMigrate()
@@ -216,7 +216,7 @@ public function testGetFlashBag()
 
     public function testGetIterator()
     {
-        $attributes = array('hello' => 'world', 'symfony' => 'rocks');
+        $attributes = ['hello' => 'world', 'symfony' => 'rocks'];
         foreach ($attributes as $key => $val) {
             $this->session->set($key, $val);
         }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
index 3ac081e3884c1..ce13729e6f1fb 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
@@ -22,10 +22,10 @@ class AbstractSessionHandlerTest extends TestCase
 
     public static function setUpBeforeClass()
     {
-        $spec = array(
-            1 => array('file', '/dev/null', 'w'),
-            2 => array('file', '/dev/null', 'w'),
-        );
+        $spec = [
+            1 => ['file', '/dev/null', 'w'],
+            2 => ['file', '/dev/null', 'w'],
+        ];
         if (!self::$server = @proc_open('exec php -S localhost:8053', $spec, $pipes, __DIR__.'/Fixtures')) {
             self::markTestSkipped('PHP server unable to start.');
         }
@@ -45,7 +45,7 @@ public static function tearDownAfterClass()
      */
     public function testSession($fixture)
     {
-        $context = array('http' => array('header' => "Cookie: sid=123abc\r\n"));
+        $context = ['http' => ['header' => "Cookie: sid=123abc\r\n"]];
         $context = stream_context_create($context);
         $result = file_get_contents(sprintf('http://localhost:8053/%s.php', $fixture), false, $context);
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
index 2a114801056c3..70bc3d14655b9 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
@@ -45,7 +45,7 @@ protected function setUp()
         $this->memcached = $this->getMockBuilder('Memcached')->getMock();
         $this->storage = new MemcachedSessionHandler(
             $this->memcached,
-            array('prefix' => self::PREFIX, 'expiretime' => self::TTL)
+            ['prefix' => self::PREFIX, 'expiretime' => self::TTL]
         );
     }
 
@@ -121,12 +121,12 @@ public function testSupportedOptions($options, $supported)
 
     public function getOptionFixtures()
     {
-        return array(
-            array(array('prefix' => 'session'), true),
-            array(array('expiretime' => 100), true),
-            array(array('prefix' => 'session', 'expiretime' => 200), true),
-            array(array('expiretime' => 100, 'foo' => 'bar'), false),
-        );
+        return [
+            [['prefix' => 'session'], true],
+            [['expiretime' => 100], true],
+            [['prefix' => 'session', 'expiretime' => 200], true],
+            [['expiretime' => 100, 'foo' => 'bar'], false],
+        ];
     }
 
     public function testGetConnection()
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
index 186fc0a2d0564..b540e125b218e 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -75,7 +75,7 @@ public function testConstructorShouldThrowExceptionForInvalidMongo()
      */
     public function testConstructorShouldThrowExceptionForMissingOptions()
     {
-        new MongoDbSessionHandler($this->mongo, array());
+        new MongoDbSessionHandler($this->mongo, []);
     }
 
     public function testOpenMethodAlwaysReturnTrue()
@@ -239,7 +239,7 @@ public function testReplaceSessionData()
             ->with($this->options['database'], $this->options['collection'])
             ->will($this->returnValue($collection));
 
-        $data = array();
+        $data = [];
 
         $methodName = phpversion('mongodb') ? 'updateOne' : 'update';
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
index a6264e51d2a72..dc827d8ab03c2 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
@@ -27,7 +27,7 @@ class NativeFileSessionHandlerTest extends TestCase
 {
     public function testConstruct()
     {
-        $storage = new NativeSessionStorage(array('name' => 'TESTING'), new NativeFileSessionHandler(sys_get_temp_dir()));
+        $storage = new NativeSessionStorage(['name' => 'TESTING'], new NativeFileSessionHandler(sys_get_temp_dir()));
 
         $this->assertEquals('files', $storage->getSaveHandler()->getSaveHandlerName());
         $this->assertEquals('user', ini_get('session.save_handler'));
@@ -52,11 +52,11 @@ public function savePathDataProvider()
     {
         $base = sys_get_temp_dir();
 
-        return array(
-            array("$base/foo", "$base/foo", "$base/foo"),
-            array("5;$base/foo", "5;$base/foo", "$base/foo"),
-            array("5;0600;$base/foo", "5;0600;$base/foo", "$base/foo"),
-        );
+        return [
+            ["$base/foo", "$base/foo", "$base/foo"],
+            ["5;$base/foo", "5;$base/foo", "$base/foo"],
+            ["5;0600;$base/foo", "5;0600;$base/foo", "$base/foo"],
+        ];
     }
 
     /**
@@ -70,7 +70,7 @@ public function testConstructException()
     public function testConstructDefault()
     {
         $path = ini_get('session.save_path');
-        $storage = new NativeSessionStorage(array('name' => 'TESTING'), new NativeFileSessionHandler());
+        $storage = new NativeSessionStorage(['name' => 'TESTING'], new NativeFileSessionHandler());
 
         $this->assertEquals($path, ini_get('session.save_path'));
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php
index 9a2212b8b4009..0d246e1aa560b 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php
@@ -54,6 +54,6 @@ public function testNothingIsPersisted()
 
     public function getStorage()
     {
-        return new NativeSessionStorage(array(), new NullSessionHandler());
+        return new NativeSessionStorage([], new NullSessionHandler());
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
index 853e96d2819bb..901078478b4db 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -64,7 +64,7 @@ public function testWrongPdoErrMode()
      */
     public function testInexistentTable()
     {
-        $storage = new PdoSessionHandler($this->getMemorySqlitePdo(), array('db_table' => 'inexistent_table'));
+        $storage = new PdoSessionHandler($this->getMemorySqlitePdo(), ['db_table' => 'inexistent_table']);
         $storage->open('', 'sid');
         $storage->read('id');
         $storage->write('id', 'data');
@@ -147,7 +147,7 @@ public function testReadConvertsStreamToString()
         $stream = $this->createStream($content);
 
         $pdo->prepareResult->expects($this->once())->method('fetchAll')
-            ->will($this->returnValue(array(array($stream, 42, time()))));
+            ->will($this->returnValue([[$stream, 42, time()]]));
 
         $storage = new PdoSessionHandler($pdo);
         $result = $storage->read('foo');
@@ -178,7 +178,7 @@ public function testReadLockedConvertsStreamToString()
 
         $selectStmt->expects($this->atLeast(2))->method('fetchAll')
             ->will($this->returnCallback(function () use (&$exception, $stream) {
-                return $exception ? array(array($stream, 42, time())) : array();
+                return $exception ? [[$stream, 42, time()]] : [];
             }));
 
         $insertStmt->expects($this->once())->method('execute')
@@ -344,19 +344,19 @@ public function testUrlDsn($url, $expectedDsn, $expectedUser = null, $expectedPa
 
     public function provideUrlDsnPairs()
     {
-        yield array('mysql://localhost/test', 'mysql:host=localhost;dbname=test;');
-        yield array('mysql://localhost:56/test', 'mysql:host=localhost;port=56;dbname=test;');
-        yield array('mysql2://root:pwd@localhost/test', 'mysql:host=localhost;dbname=test;', 'root', 'pwd');
-        yield array('postgres://localhost/test', 'pgsql:host=localhost;dbname=test;');
-        yield array('postgresql://localhost:5634/test', 'pgsql:host=localhost;port=5634;dbname=test;');
-        yield array('postgres://root:pwd@localhost/test', 'pgsql:host=localhost;dbname=test;', 'root', 'pwd');
-        yield 'sqlite relative path' => array('sqlite://localhost/tmp/test', 'sqlite:tmp/test');
-        yield 'sqlite absolute path' => array('sqlite://localhost//tmp/test', 'sqlite:/tmp/test');
-        yield 'sqlite relative path without host' => array('sqlite:///tmp/test', 'sqlite:tmp/test');
-        yield 'sqlite absolute path without host' => array('sqlite3:////tmp/test', 'sqlite:/tmp/test');
-        yield array('sqlite://localhost/:memory:', 'sqlite::memory:');
-        yield array('mssql://localhost/test', 'sqlsrv:server=localhost;Database=test');
-        yield array('mssql://localhost:56/test', 'sqlsrv:server=localhost,56;Database=test');
+        yield ['mysql://localhost/test', 'mysql:host=localhost;dbname=test;'];
+        yield ['mysql://localhost:56/test', 'mysql:host=localhost;port=56;dbname=test;'];
+        yield ['mysql2://root:pwd@localhost/test', 'mysql:host=localhost;dbname=test;', 'root', 'pwd'];
+        yield ['postgres://localhost/test', 'pgsql:host=localhost;dbname=test;'];
+        yield ['postgresql://localhost:5634/test', 'pgsql:host=localhost;port=5634;dbname=test;'];
+        yield ['postgres://root:pwd@localhost/test', 'pgsql:host=localhost;dbname=test;', 'root', 'pwd'];
+        yield 'sqlite relative path' => ['sqlite://localhost/tmp/test', 'sqlite:tmp/test'];
+        yield 'sqlite absolute path' => ['sqlite://localhost//tmp/test', 'sqlite:/tmp/test'];
+        yield 'sqlite relative path without host' => ['sqlite:///tmp/test', 'sqlite:tmp/test'];
+        yield 'sqlite absolute path without host' => ['sqlite3:////tmp/test', 'sqlite:/tmp/test'];
+        yield ['sqlite://localhost/:memory:', 'sqlite::memory:'];
+        yield ['mssql://localhost/test', 'sqlsrv:server=localhost;Database=test'];
+        yield ['mssql://localhost:56/test', 'sqlsrv:server=localhost,56;Database=test'];
     }
 
     private function createStream($content)
@@ -394,7 +394,7 @@ public function getAttribute($attribute)
         return parent::getAttribute($attribute);
     }
 
-    public function prepare($statement, $driverOptions = array())
+    public function prepare($statement, $driverOptions = [])
     {
         return \is_callable($this->prepareResult)
             ? \call_user_func($this->prepareResult, $statement, $driverOptions)
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php
index b02c41ae89866..6a0d16876e8e0 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php
@@ -84,7 +84,7 @@ public function testReadWithValidateIdMismatch()
     {
         $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
         $handler->expects($this->exactly(2))->method('read')
-            ->withConsecutive(array('id1'), array('id2'))
+            ->withConsecutive(['id1'], ['id2'])
             ->will($this->onConsecutiveCalls('data1', 'data2'));
         $proxy = new StrictSessionHandler($handler);
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MetadataBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MetadataBagTest.php
index 69cf6163c16f3..2c4758b9137c0 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MetadataBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MetadataBagTest.php
@@ -26,26 +26,26 @@ class MetadataBagTest extends TestCase
      */
     protected $bag;
 
-    protected $array = array();
+    protected $array = [];
 
     protected function setUp()
     {
         parent::setUp();
         $this->bag = new MetadataBag();
-        $this->array = array(MetadataBag::CREATED => 1234567, MetadataBag::UPDATED => 12345678, MetadataBag::LIFETIME => 0);
+        $this->array = [MetadataBag::CREATED => 1234567, MetadataBag::UPDATED => 12345678, MetadataBag::LIFETIME => 0];
         $this->bag->initialize($this->array);
     }
 
     protected function tearDown()
     {
-        $this->array = array();
+        $this->array = [];
         $this->bag = null;
         parent::tearDown();
     }
 
     public function testInitialize()
     {
-        $sessionMetadata = array();
+        $sessionMetadata = [];
 
         $bag1 = new MetadataBag();
         $bag1->initialize($sessionMetadata);
@@ -82,7 +82,7 @@ public function testGetStorageKey()
     public function testGetLifetime()
     {
         $bag = new MetadataBag();
-        $array = array(MetadataBag::CREATED => 1234567, MetadataBag::UPDATED => 12345678, MetadataBag::LIFETIME => 1000);
+        $array = [MetadataBag::CREATED => 1234567, MetadataBag::UPDATED => 12345678, MetadataBag::LIFETIME => 1000];
         $bag->initialize($array);
         $this->assertEquals(1000, $bag->getLifetime());
     }
@@ -111,11 +111,11 @@ public function testSkipLastUsedUpdate()
         $timeStamp = time();
 
         $created = $timeStamp - 15;
-        $sessionMetadata = array(
+        $sessionMetadata = [
             MetadataBag::CREATED => $created,
             MetadataBag::UPDATED => $created,
             MetadataBag::LIFETIME => 1000,
-        );
+        ];
         $bag->initialize($sessionMetadata);
 
         $this->assertEquals($created, $sessionMetadata[MetadataBag::UPDATED]);
@@ -127,11 +127,11 @@ public function testDoesNotSkipLastUsedUpdate()
         $timeStamp = time();
 
         $created = $timeStamp - 45;
-        $sessionMetadata = array(
+        $sessionMetadata = [
             MetadataBag::CREATED => $created,
             MetadataBag::UPDATED => $created,
             MetadataBag::LIFETIME => 1000,
-        );
+        ];
         $bag->initialize($sessionMetadata);
 
         $this->assertEquals($timeStamp, $sessionMetadata[MetadataBag::UPDATED]);
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockArraySessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockArraySessionStorageTest.php
index 893e120ce166e..2e3024ef1b166 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockArraySessionStorageTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockArraySessionStorageTest.php
@@ -45,10 +45,10 @@ protected function setUp()
         $this->attributes = new AttributeBag();
         $this->flashes = new FlashBag();
 
-        $this->data = array(
-            $this->attributes->getStorageKey() => array('foo' => 'bar'),
-            $this->flashes->getStorageKey() => array('notice' => 'hello'),
-        );
+        $this->data = [
+            $this->attributes->getStorageKey() => ['foo' => 'bar'],
+            $this->flashes->getStorageKey() => ['notice' => 'hello'],
+        ];
 
         $this->storage = new MockArraySessionStorage();
         $this->storage->registerBag($this->flashes);
@@ -80,14 +80,14 @@ public function testRegenerate()
         $id = $this->storage->getId();
         $this->storage->regenerate();
         $this->assertNotEquals($id, $this->storage->getId());
-        $this->assertEquals(array('foo' => 'bar'), $this->storage->getBag('attributes')->all());
-        $this->assertEquals(array('notice' => 'hello'), $this->storage->getBag('flashes')->peekAll());
+        $this->assertEquals(['foo' => 'bar'], $this->storage->getBag('attributes')->all());
+        $this->assertEquals(['notice' => 'hello'], $this->storage->getBag('flashes')->peekAll());
 
         $id = $this->storage->getId();
         $this->storage->regenerate(true);
         $this->assertNotEquals($id, $this->storage->getId());
-        $this->assertEquals(array('foo' => 'bar'), $this->storage->getBag('attributes')->all());
-        $this->assertEquals(array('notice' => 'hello'), $this->storage->getBag('flashes')->peekAll());
+        $this->assertEquals(['foo' => 'bar'], $this->storage->getBag('attributes')->all());
+        $this->assertEquals(['notice' => 'hello'], $this->storage->getBag('flashes')->peekAll());
     }
 
     public function testGetId()
@@ -101,8 +101,8 @@ public function testClearClearsBags()
     {
         $this->storage->clear();
 
-        $this->assertSame(array(), $this->storage->getBag('attributes')->all());
-        $this->assertSame(array(), $this->storage->getBag('flashes')->peekAll());
+        $this->assertSame([], $this->storage->getBag('attributes')->all());
+        $this->assertSame([], $this->storage->getBag('flashes')->peekAll());
     }
 
     public function testClearStartsSession()
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockFileSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockFileSessionStorageTest.php
index 16957981750e3..9e2692dc0ba18 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockFileSessionStorageTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockFileSessionStorageTest.php
@@ -91,7 +91,7 @@ public function testSave()
         $storage->start();
         $this->assertEquals('108', $storage->getBag('attributes')->get('new'));
         $this->assertTrue($storage->getBag('flashes')->has('newkey'));
-        $this->assertEquals(array('test'), $storage->getBag('flashes')->peek('newkey'));
+        $this->assertEquals(['test'], $storage->getBag('flashes')->peek('newkey'));
     }
 
     public function testMultipleInstances()
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
index 52da2947cbcb7..1fde0bc04e436 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -56,7 +56,7 @@ protected function tearDown()
     /**
      * @return NativeSessionStorage
      */
-    protected function getStorage(array $options = array())
+    protected function getStorage(array $options = [])
     {
         $storage = new NativeSessionStorage($options);
         $storage->registerBag(new AttributeBag());
@@ -188,10 +188,10 @@ public function testSessionOptions()
             $this->markTestSkipped('HHVM is not handled in this test case.');
         }
 
-        $options = array(
+        $options = [
             'url_rewriter.tags' => 'a=href',
             'cache_expire' => '200',
-        );
+        ];
 
         $this->getStorage($options);
 
@@ -272,9 +272,9 @@ public function testCanCreateNativeSessionStorageWhenSessionAlreadyStarted()
     public function testSetSessionOptionsOnceSessionStartedIsIgnored()
     {
         session_start();
-        $this->getStorage(array(
+        $this->getStorage([
             'name' => 'something-else',
-        ));
+        ]);
 
         // Assert no exception has been thrown by `getStorage()`
         $this->addToAssertionCount(1);
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
index 7cb63c5aacefc..752be618bc1ee 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
@@ -87,10 +87,10 @@ public function testClear()
         $_SESSION['drak'] = 'loves symfony';
         $storage->getBag('attributes')->set('symfony', 'greatness');
         $key = $storage->getBag('attributes')->getStorageKey();
-        $this->assertEquals($_SESSION[$key], array('symfony' => 'greatness'));
+        $this->assertEquals($_SESSION[$key], ['symfony' => 'greatness']);
         $this->assertEquals($_SESSION['drak'], 'loves symfony');
         $storage->clear();
-        $this->assertEquals($_SESSION[$key], array());
+        $this->assertEquals($_SESSION[$key], []);
         $this->assertEquals($_SESSION['drak'], 'loves symfony');
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
index 0b48250e01010..0459a8ce97d50 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
@@ -127,7 +127,7 @@ public function testGc()
      */
     public function testValidateId()
     {
-        $mock = $this->getMockBuilder(array('SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'))->getMock();
+        $mock = $this->getMockBuilder(['SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'])->getMock();
         $mock->expects($this->once())
             ->method('validateId');
 
@@ -142,7 +142,7 @@ public function testValidateId()
      */
     public function testUpdateTimestamp()
     {
-        $mock = $this->getMockBuilder(array('SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'))->getMock();
+        $mock = $this->getMockBuilder(['SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'])->getMock();
         $mock->expects($this->once())
             ->method('updateTimestamp');
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php
index 699222e37916e..62dfc9bc94a7b 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php
@@ -19,7 +19,7 @@ class StreamedResponseTest extends TestCase
 {
     public function testConstructor()
     {
-        $response = new StreamedResponse(function () { echo 'foo'; }, 404, array('Content-Type' => 'text/plain'));
+        $response = new StreamedResponse(function () { echo 'foo'; }, 404, ['Content-Type' => 'text/plain']);
 
         $this->assertEquals(404, $response->getStatusCode());
         $this->assertEquals('text/plain', $response->headers->get('Content-Type'));
@@ -51,7 +51,7 @@ public function testPrepareWith10Protocol()
 
     public function testPrepareWithHeadRequest()
     {
-        $response = new StreamedResponse(function () { echo 'foo'; }, 200, array('Content-Length' => '123'));
+        $response = new StreamedResponse(function () { echo 'foo'; }, 200, ['Content-Length' => '123']);
         $request = Request::create('/', 'HEAD');
 
         $response->prepare($request);
@@ -61,7 +61,7 @@ public function testPrepareWithHeadRequest()
 
     public function testPrepareWithCacheHeaders()
     {
-        $response = new StreamedResponse(function () { echo 'foo'; }, 200, array('Cache-Control' => 'max-age=600, public'));
+        $response = new StreamedResponse(function () { echo 'foo'; }, 200, ['Cache-Control' => 'max-age=600, public']);
         $request = Request::create('/', 'GET');
 
         $response->prepare($request);
diff --git a/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php b/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php
index d413d2c9d641d..42add5a686f93 100644
--- a/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php
+++ b/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php
@@ -18,9 +18,9 @@
  */
 class Psr6CacheClearer implements CacheClearerInterface
 {
-    private $pools = array();
+    private $pools = [];
 
-    public function __construct(array $pools = array())
+    public function __construct(array $pools = [])
     {
         $this->pools = $pools;
     }
diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php
index 324710bb8ac0d..89e4b69bc658d 100644
--- a/src/Symfony/Component/HttpKernel/Client.php
+++ b/src/Symfony/Component/HttpKernel/Client.php
@@ -39,7 +39,7 @@ class Client extends BaseClient
      * @param History             $history   A History instance to store the browser history
      * @param CookieJar           $cookieJar A CookieJar instance to store the cookies
      */
-    public function __construct(HttpKernelInterface $kernel, array $server = array(), History $history = null, CookieJar $cookieJar = null)
+    public function __construct(HttpKernelInterface $kernel, array $server = [], History $history = null, CookieJar $cookieJar = null)
     {
         // These class properties must be set before calling the parent constructor, as it may depend on it.
         $this->kernel = $kernel;
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
index fc316920c7e08..6bb1cd6959b14 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
@@ -45,7 +45,7 @@ public function __construct(ArgumentMetadataFactoryInterface $argumentMetadataFa
      */
     public function getArguments(Request $request, $controller)
     {
-        $arguments = array();
+        $arguments = [];
 
         foreach ($this->argumentMetadataFactory->createArgumentMetadata($controller) as $metadata) {
             foreach ($this->argumentValueResolvers as $resolver) {
@@ -83,12 +83,12 @@ public function getArguments(Request $request, $controller)
 
     public static function getDefaultArgumentValueResolvers()
     {
-        return array(
+        return [
             new RequestAttributeValueResolver(),
             new RequestValueResolver(),
             new SessionValueResolver(),
             new DefaultValueResolver(),
             new VariadicValueResolver(),
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
index 6d898e783144b..463b8573a8888 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -233,7 +233,7 @@ private function getControllerError($callable)
 
         $collection = get_class_methods($controller);
 
-        $alternatives = array();
+        $alternatives = [];
 
         foreach ($collection as $item) {
             $lev = levenshtein($method, $item);
diff --git a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
index b46be7e8b7097..fa48d0cc11574 100644
--- a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
+++ b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
@@ -47,7 +47,7 @@ public function __construct()
      */
     public function createArgumentMetadata($controller)
     {
-        $arguments = array();
+        $arguments = [];
 
         if (\is_array($controller)) {
             $reflection = new \ReflectionMethod($controller[0], $controller[1]);
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
index abfd939f5f59b..626c1cc695271 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
@@ -54,7 +54,7 @@ public function setKernel(KernelInterface $kernel = null)
      */
     public function collect(Request $request, Response $response, \Exception $exception = null)
     {
-        $this->data = array(
+        $this->data = [
             'app_name' => $this->name,
             'app_version' => $this->version,
             'token' => $response->headers->get('X-Debug-Token'),
@@ -70,9 +70,9 @@ public function collect(Request $request, Response $response, \Exception $except
             'xdebug_enabled' => \extension_loaded('xdebug'),
             'apcu_enabled' => \extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN),
             'zend_opcache_enabled' => \extension_loaded('Zend OPcache') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN),
-            'bundles' => array(),
+            'bundles' => [],
             'sapi_name' => \PHP_SAPI,
-        );
+        ];
 
         if (isset($this->kernel)) {
             foreach ($this->kernel->getBundles() as $name => $bundle) {
@@ -98,7 +98,7 @@ public function collect(Request $request, Response $response, \Exception $except
      */
     public function reset()
     {
-        $this->data = array();
+        $this->data = [];
     }
 
     public function lateCollect()
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
index 6d1a822e47a90..de19678a30d89 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
@@ -28,7 +28,7 @@
  */
 abstract class DataCollector implements DataCollectorInterface, \Serializable
 {
-    protected $data = array();
+    protected $data = [];
 
     /**
      * @var ValueExporter
@@ -111,7 +111,7 @@ protected function varToString($var)
      */
     protected function getCasters()
     {
-        return array(
+        return [
             '*' => function ($v, array $a, Stub $s, $isNested) {
                 if (!$v instanceof Stub) {
                     foreach ($a as $k => $v) {
@@ -123,6 +123,6 @@ protected function getCasters()
 
                 return $a;
             },
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
index 7e2430c4ba106..17a957ccea779 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
@@ -169,7 +169,7 @@ public function reset()
         if ($this->stopwatch) {
             $this->stopwatch->reset();
         }
-        $this->data = array();
+        $this->data = [];
         $this->dataCount = 0;
         $this->isCollected = true;
         $this->clonesCount = 0;
@@ -185,7 +185,7 @@ public function serialize()
         $this->data[] = $this->fileLinkFormat;
         $this->data[] = $this->charset;
         $ser = serialize($this->data);
-        $this->data = array();
+        $this->data = [];
         $this->dataCount = 0;
         $this->isCollected = true;
         if (!$this->dumperIsInjected) {
@@ -215,11 +215,11 @@ public function getDumps($format, $maxDepthLimit = -1, $maxItemsPerDepth = -1)
 
         if ('html' === $format) {
             $dumper = new HtmlDumper($data, $this->charset);
-            $dumper->setDisplayOptions(array('fileLinkFormat' => $this->fileLinkFormat));
+            $dumper->setDisplayOptions(['fileLinkFormat' => $this->fileLinkFormat]);
         } else {
             throw new \InvalidArgumentException(sprintf('Invalid dump format: %s', $format));
         }
-        $dumps = array();
+        $dumps = [];
 
         foreach ($this->data as $dump) {
             $dumper->dump($dump['data']->withMaxDepth($maxDepthLimit)->withMaxItemsPerDepth($maxItemsPerDepth));
@@ -262,7 +262,7 @@ public function __destruct()
                 $this->doDump($dump['data'], $dump['name'], $dump['file'], $dump['line']);
             }
 
-            $this->data = array();
+            $this->data = [];
             $this->dataCount = 0;
         }
     }
@@ -276,7 +276,7 @@ private function doDump($data, $name, $file, $line)
                         $s = $this->style('meta', '%s');
                         $f = strip_tags($this->style('', $file));
                         $name = strip_tags($this->style('', $name));
-                        if ($fmt && $link = \is_string($fmt) ? strtr($fmt, array('%f' => $file, '%l' => $line)) : $fmt->format($file, $line)) {
+                        if ($fmt && $link = \is_string($fmt) ? strtr($fmt, ['%f' => $file, '%l' => $line]) : $fmt->format($file, $line)) {
                             $name = sprintf('<a href="%s" title="%s">'.$s.'</a>', strip_tags($this->style('', $link)), $f, $name);
                         } else {
                             $name = sprintf('<abbr title="%s">'.$s.'</abbr>', $f, $name);
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php
index 7a25f149215b8..c76e7f45bdf10 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php
@@ -28,9 +28,9 @@ class ExceptionDataCollector extends DataCollector
     public function collect(Request $request, Response $response, \Exception $exception = null)
     {
         if (null !== $exception) {
-            $this->data = array(
+            $this->data = [
                 'exception' => FlattenException::create($exception),
-            );
+            ];
         }
     }
 
@@ -39,7 +39,7 @@ public function collect(Request $request, Response $response, \Exception $except
      */
     public function reset()
     {
-        $this->data = array();
+        $this->data = [];
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
index 97b8a8620c3c9..992751f0a479f 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
@@ -55,7 +55,7 @@ public function reset()
         if ($this->logger && method_exists($this->logger, 'clear')) {
             $this->logger->clear();
         }
-        $this->data = array();
+        $this->data = [];
     }
 
     /**
@@ -79,12 +79,12 @@ public function lateCollect()
      */
     public function getLogs()
     {
-        return isset($this->data['logs']) ? $this->data['logs'] : array();
+        return isset($this->data['logs']) ? $this->data['logs'] : [];
     }
 
     public function getPriorities()
     {
-        return isset($this->data['priorities']) ? $this->data['priorities'] : array();
+        return isset($this->data['priorities']) ? $this->data['priorities'] : [];
     }
 
     public function countErrors()
@@ -109,7 +109,7 @@ public function countScreams()
 
     public function getCompilerLogs()
     {
-        return isset($this->data['compiler_logs']) ? $this->data['compiler_logs'] : array();
+        return isset($this->data['compiler_logs']) ? $this->data['compiler_logs'] : [];
     }
 
     /**
@@ -123,13 +123,13 @@ public function getName()
     private function getContainerDeprecationLogs()
     {
         if (null === $this->containerPathPrefix || !file_exists($file = $this->containerPathPrefix.'Deprecations.log')) {
-            return array();
+            return [];
         }
 
         $bootTime = filemtime($file);
-        $logs = array();
+        $logs = [];
         foreach (unserialize(file_get_contents($file)) as $log) {
-            $log['context'] = array('exception' => new SilencedErrorContext($log['type'], $log['file'], $log['line'], $log['trace'], $log['count']));
+            $log['context'] = ['exception' => new SilencedErrorContext($log['type'], $log['file'], $log['line'], $log['trace'], $log['count'])];
             $log['timestamp'] = $bootTime;
             $log['priority'] = 100;
             $log['priorityName'] = 'DEBUG';
@@ -145,17 +145,17 @@ private function getContainerDeprecationLogs()
     private function getContainerCompilerLogs()
     {
         if (null === $this->containerPathPrefix || !file_exists($file = $this->containerPathPrefix.'Compiler.log')) {
-            return array();
+            return [];
         }
 
-        $logs = array();
+        $logs = [];
         foreach (file($file, FILE_IGNORE_NEW_LINES) as $log) {
             $log = explode(': ', $log, 2);
             if (!isset($log[1]) || !preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\\\\[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)++$/', $log[0])) {
-                $log = array('Unknown Compiler Pass', implode(': ', $log));
+                $log = ['Unknown Compiler Pass', implode(': ', $log)];
             }
 
-            $logs[$log[0]][] = array('message' => $log[1]);
+            $logs[$log[0]][] = ['message' => $log[1]];
         }
 
         return $logs;
@@ -163,8 +163,8 @@ private function getContainerCompilerLogs()
 
     private function sanitizeLogs($logs)
     {
-        $sanitizedLogs = array();
-        $silencedLogs = array();
+        $sanitizedLogs = [];
+        $silencedLogs = [];
 
         foreach ($logs as $log) {
             if (!$this->isSilencedOrDeprecationErrorLog($log)) {
@@ -183,10 +183,10 @@ private function sanitizeLogs($logs)
                 $silencedLogs[$h] = true;
 
                 if (!isset($sanitizedLogs[$message])) {
-                    $sanitizedLogs[$message] = $log + array(
+                    $sanitizedLogs[$message] = $log + [
                         'errorCount' => 0,
                         'scream' => true,
-                    );
+                    ];
                 }
                 $sanitizedLogs[$message]['errorCount'] += $exception->count;
 
@@ -198,10 +198,10 @@ private function sanitizeLogs($logs)
             if (isset($sanitizedLogs[$errorId])) {
                 ++$sanitizedLogs[$errorId]['errorCount'];
             } else {
-                $log += array(
+                $log += [
                     'errorCount' => 1,
                     'scream' => false,
-                );
+                ];
 
                 $sanitizedLogs[$errorId] = $log;
             }
@@ -222,7 +222,7 @@ private function isSilencedOrDeprecationErrorLog(array $log)
             return true;
         }
 
-        if ($exception instanceof \ErrorException && \in_array($exception->getSeverity(), array(E_DEPRECATED, E_USER_DEPRECATED), true)) {
+        if ($exception instanceof \ErrorException && \in_array($exception->getSeverity(), [E_DEPRECATED, E_USER_DEPRECATED], true)) {
             return true;
         }
 
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
index 310b2f91a55d0..7a6e1c0646446 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
@@ -39,10 +39,10 @@ public function collect(Request $request, Response $response, \Exception $except
      */
     public function reset()
     {
-        $this->data = array(
+        $this->data = [
             'memory' => 0,
             'memory_limit' => $this->convertToBytes(ini_get('memory_limit')),
-        );
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
index 10492e4465035..cdf126ffe0711 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -38,7 +38,7 @@ public function __construct()
     public function collect(Request $request, Response $response, \Exception $exception = null)
     {
         // attributes are serialized and as they can be anything, they need to be converted to strings.
-        $attributes = array();
+        $attributes = [];
         $route = '';
         foreach ($request->attributes->all() as $key => $value) {
             if ('_route' === $key) {
@@ -57,10 +57,10 @@ public function collect(Request $request, Response $response, \Exception $except
             $content = false;
         }
 
-        $sessionMetadata = array();
-        $sessionAttributes = array();
+        $sessionMetadata = [];
+        $sessionAttributes = [];
         $session = null;
-        $flashes = array();
+        $flashes = [];
         if ($request->hasSession()) {
             $session = $request->getSession();
             if ($session->isStarted()) {
@@ -159,7 +159,7 @@ public function lateCollect()
 
     public function reset()
     {
-        $this->data = array();
+        $this->data = [];
         $this->controllers = new \SplObjectStorage();
     }
 
@@ -284,7 +284,7 @@ public function getIdentifier()
      */
     public function getRouteParams()
     {
-        return isset($this->data['request_attributes']['_route_params']) ? $this->data['request_attributes']['_route_params']->getValue() : array();
+        return isset($this->data['request_attributes']['_route_params']) ? $this->data['request_attributes']['_route_params']->getValue() : [];
     }
 
     /**
@@ -327,10 +327,10 @@ public function onKernelResponse(FilterResponseEvent $event)
 
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             KernelEvents::CONTROLLER => 'onKernelController',
             KernelEvents::RESPONSE => 'onKernelResponse',
-        );
+        ];
     }
 
     /**
@@ -358,21 +358,21 @@ protected function parseController($controller)
             try {
                 $r = new \ReflectionMethod($controller[0], $controller[1]);
 
-                return array(
+                return [
                     'class' => \is_object($controller[0]) ? \get_class($controller[0]) : $controller[0],
                     'method' => $controller[1],
                     'file' => $r->getFileName(),
                     'line' => $r->getStartLine(),
-                );
+                ];
             } catch (\ReflectionException $e) {
                 if (\is_callable($controller)) {
                     // using __call or  __callStatic
-                    return array(
+                    return [
                         'class' => \is_object($controller[0]) ? \get_class($controller[0]) : $controller[0],
                         'method' => $controller[1],
                         'file' => 'n/a',
                         'line' => 'n/a',
-                    );
+                    ];
                 }
             }
         }
@@ -380,12 +380,12 @@ protected function parseController($controller)
         if ($controller instanceof \Closure) {
             $r = new \ReflectionFunction($controller);
 
-            $controller = array(
+            $controller = [
                 'class' => $r->getName(),
                 'method' => null,
                 'file' => $r->getFileName(),
                 'line' => $r->getStartLine(),
-            );
+            ];
 
             if (false !== strpos($r->name, '{closure}')) {
                 return $controller;
@@ -404,12 +404,12 @@ protected function parseController($controller)
         if (\is_object($controller)) {
             $r = new \ReflectionClass($controller);
 
-            return array(
+            return [
                 'class' => $r->getName(),
                 'method' => null,
                 'file' => $r->getFileName(),
                 'line' => $r->getStartLine(),
-            );
+            ];
         }
 
         return \is_string($controller) ? $controller : 'n/a';
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
index 481747b3c8396..432dc3618f8c0 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
@@ -54,11 +54,11 @@ public function reset()
     {
         $this->controllers = new \SplObjectStorage();
 
-        $this->data = array(
+        $this->data = [
             'redirect' => false,
             'url' => null,
             'route' => null,
-        );
+        ];
     }
 
     protected function guessRoute(Request $request, $controller)
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
index e489d77598620..5356ea8f6ae0a 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
@@ -43,11 +43,11 @@ public function collect(Request $request, Response $response, \Exception $except
             $startTime = $request->server->get('REQUEST_TIME_FLOAT');
         }
 
-        $this->data = array(
+        $this->data = [
             'token' => $response->headers->get('X-Debug-Token'),
             'start_time' => $startTime * 1000,
-            'events' => array(),
-        );
+            'events' => [],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
index b3c2595b0d072..016b9fa8cd359 100644
--- a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
+++ b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
@@ -36,7 +36,7 @@ public function __construct($fileLinkFormat = null, RequestStack $requestStack =
         $fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
         if ($fileLinkFormat && !\is_array($fileLinkFormat)) {
             $i = strpos($f = $fileLinkFormat, '&', max(strrpos($f, '%f'), strrpos($f, '%l'))) ?: \strlen($f);
-            $fileLinkFormat = array(substr($f, 0, $i)) + preg_split('/&([^>]++)>/', substr($f, $i), -1, PREG_SPLIT_DELIM_CAPTURE);
+            $fileLinkFormat = [substr($f, 0, $i)] + preg_split('/&([^>]++)>/', substr($f, $i), -1, PREG_SPLIT_DELIM_CAPTURE);
         }
 
         $this->fileLinkFormat = $fileLinkFormat;
@@ -55,7 +55,7 @@ public function format($file, $line)
                 }
             }
 
-            return strtr($fmt[0], array('%f' => $file, '%l' => $line));
+            return strtr($fmt[0], ['%f' => $file, '%l' => $line]);
         }
 
         return false;
@@ -99,10 +99,10 @@ private function getFileLinkFormat()
                     return;
                 }
 
-                return array(
+                return [
                     $request->getSchemeAndHttpHost().$request->getBasePath().$this->urlFormat,
                     $this->baseDir.\DIRECTORY_SEPARATOR, '',
-                );
+                ];
             }
         }
     }
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
index 645e8f30ff158..7e150df57280e 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
@@ -67,7 +67,7 @@ public function process(ContainerBuilder $container)
      */
     private function expandClasses(array $patterns, array $classes)
     {
-        $expanded = array();
+        $expanded = [];
 
         // Explicit classes declared in the patterns are returned directly
         foreach ($patterns as $key => $pattern) {
@@ -93,7 +93,7 @@ private function expandClasses(array $patterns, array $classes)
 
     private function getClassesInComposerClassMaps()
     {
-        $classes = array();
+        $classes = [];
 
         foreach (spl_autoload_functions() as $function) {
             if (!\is_array($function)) {
@@ -114,14 +114,14 @@ private function getClassesInComposerClassMaps()
 
     private function patternsToRegexps($patterns)
     {
-        $regexps = array();
+        $regexps = [];
 
         foreach ($patterns as $pattern) {
             // Escape user input
             $regex = preg_quote(ltrim($pattern, '\\'));
 
             // Wildcards * and **
-            $regex = strtr($regex, array('\\*\\*' => '.*?', '\\*' => '[^\\\\]*?'));
+            $regex = strtr($regex, ['\\*\\*' => '.*?', '\\*' => '[^\\\\]*?']);
 
             // If this class does not end by a slash, anchor the end
             if ('\\' !== substr($regex, -1)) {
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php
index 06a39c8bc0152..a15fbaa172125 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php
@@ -45,7 +45,7 @@ public function process(ContainerBuilder $container)
         }
 
         $definition = $container->getDefinition($this->handlerService);
-        $renderers = array();
+        $renderers = [];
         foreach ($container->findTaggedServiceIds($this->rendererTag, true) as $id => $tags) {
             $def = $container->getDefinition($id);
             $class = $container->getParameterBag()->resolveValue($def->getClass());
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/LazyLoadingFragmentHandler.php b/src/Symfony/Component/HttpKernel/DependencyInjection/LazyLoadingFragmentHandler.php
index 00b05959cf385..dafd753279f57 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/LazyLoadingFragmentHandler.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/LazyLoadingFragmentHandler.php
@@ -38,7 +38,7 @@ public function __construct(ContainerInterface $container, RequestStack $request
     {
         $this->container = $container;
 
-        parent::__construct($requestStack, array(), $debug);
+        parent::__construct($requestStack, [], $debug);
     }
 
     /**
@@ -59,7 +59,7 @@ public function addRendererService($name, $renderer)
     /**
      * {@inheritdoc}
      */
-    public function render($uri, $renderer = 'inline', array $options = array())
+    public function render($uri, $renderer = 'inline', array $options = [])
     {
         // BC 3.x, to be removed in 4.0
         if (isset($this->rendererIds[$renderer])) {
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/MergeExtensionConfigurationPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/MergeExtensionConfigurationPass.php
index 1dbf7f7beeedf..83e1b758de75b 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/MergeExtensionConfigurationPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/MergeExtensionConfigurationPass.php
@@ -32,7 +32,7 @@ public function process(ContainerBuilder $container)
     {
         foreach ($this->extensions as $extension) {
             if (!\count($container->getExtensionConfig($extension))) {
-                $container->loadFromExtension($extension, array());
+                $container->loadFromExtension($extension, []);
             }
         }
 
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
index cb05f6fbeb4e1..dd1e26ad97a34 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -47,7 +47,7 @@ public function process(ContainerBuilder $container)
         }
 
         $parameterBag = $container->getParameterBag();
-        $controllers = array();
+        $controllers = [];
 
         foreach ($container->findTaggedServiceIds($this->controllerTag, true) as $id => $tags) {
             $def = $container->getDefinition($id);
@@ -70,14 +70,14 @@ public function process(ContainerBuilder $container)
             $isContainerAware = $r->implementsInterface(ContainerAwareInterface::class) || is_subclass_of($class, AbstractController::class);
 
             // get regular public methods
-            $methods = array();
-            $arguments = array();
+            $methods = [];
+            $arguments = [];
             foreach ($r->getMethods(\ReflectionMethod::IS_PUBLIC) as $r) {
                 if ('setContainer' === $r->name && $isContainerAware) {
                     continue;
                 }
                 if (!$r->isConstructor() && !$r->isDestructor() && !$r->isAbstract()) {
-                    $methods[strtolower($r->name)] = array($r, $r->getParameters());
+                    $methods[strtolower($r->name)] = [$r, $r->getParameters()];
                 }
             }
 
@@ -87,7 +87,7 @@ public function process(ContainerBuilder $container)
                     $autowire = true;
                     continue;
                 }
-                foreach (array('action', 'argument', 'id') as $k) {
+                foreach (['action', 'argument', 'id'] as $k) {
                     if (!isset($attributes[$k][0])) {
                         throw new InvalidArgumentException(sprintf('Missing "%s" attribute on tag "%s" %s for service "%s".', $k, $this->controllerTag, json_encode($attributes, JSON_UNESCAPED_UNICODE), $id));
                     }
@@ -117,7 +117,7 @@ public function process(ContainerBuilder $container)
                 /** @var \ReflectionMethod $r */
 
                 // create a per-method map of argument-names to service/type-references
-                $args = array();
+                $args = [];
                 foreach ($parameters as $p) {
                     /** @var \ReflectionParameter $p */
                     $type = $target = ProxyHelper::getTypeHint($r, $p, true);
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php
index 29433a6d5b195..28136be625427 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php
@@ -39,7 +39,7 @@ public function process(ContainerBuilder $container)
             return;
         }
 
-        $services = $methods = array();
+        $services = $methods = [];
 
         foreach ($container->findTaggedServiceIds($this->tagName, true) as $id => $tags) {
             $services[$id] = new Reference($id, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE);
diff --git a/src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
index cb5da50bd0860..714b315a3240f 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
@@ -85,10 +85,10 @@ public function onKernelResponse(FilterResponseEvent $event)
 
     public static function getSubscribedEvents()
     {
-        return array(
-            KernelEvents::REQUEST => array('onKernelRequest', 192),
-            KernelEvents::RESPONSE => array('onKernelResponse', -128),
-        );
+        return [
+            KernelEvents::REQUEST => ['onKernelRequest', 192],
+            KernelEvents::RESPONSE => ['onKernelResponse', -128],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php b/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php
index 5ec528417c987..68d806af01ecd 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php
@@ -45,6 +45,6 @@ public function onKernelRequest(GetResponseEvent $event)
      */
     public static function getSubscribedEvents()
     {
-        return array(KernelEvents::REQUEST => array('onKernelRequest', 1));
+        return [KernelEvents::REQUEST => ['onKernelRequest', 1]];
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
index 04137c746861b..77f9e2f61839c 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
@@ -145,10 +145,10 @@ public function configure(Event $event = null)
 
     public static function getSubscribedEvents()
     {
-        $events = array(KernelEvents::REQUEST => array('configure', 2048));
+        $events = [KernelEvents::REQUEST => ['configure', 2048]];
 
         if ('cli' === \PHP_SAPI && \defined('Symfony\Component\Console\ConsoleEvents::COMMAND')) {
-            $events[ConsoleEvents::COMMAND] = array('configure', 2048);
+            $events[ConsoleEvents::COMMAND] = ['configure', 2048];
         }
 
         return $events;
diff --git a/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php b/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php
index de19e13113e59..2f47d1068cbe8 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php
@@ -46,10 +46,10 @@ public function configure()
     public static function getSubscribedEvents()
     {
         if (!class_exists(ConsoleEvents::class)) {
-            return array();
+            return [];
         }
 
         // Register early to have a working dump() as early as possible
-        return array(ConsoleEvents::COMMAND => array('configure', 1024));
+        return [ConsoleEvents::COMMAND => ['configure', 1024]];
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
index 71de60434d456..a0ca3e42b8172 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
@@ -99,9 +99,9 @@ protected function logException(\Exception $exception, $message)
     {
         if (null !== $this->logger) {
             if (!$exception instanceof HttpExceptionInterface || $exception->getStatusCode() >= 500) {
-                $this->logger->critical($message, array('exception' => $exception));
+                $this->logger->critical($message, ['exception' => $exception]);
             } else {
-                $this->logger->error($message, array('exception' => $exception));
+                $this->logger->error($message, ['exception' => $exception]);
             }
         }
     }
diff --git a/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php b/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
index 574d7c05c9436..1333120e2dd10 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
@@ -70,7 +70,7 @@ public function onKernelRequest(GetResponseEvent $event)
 
         parse_str($request->query->get('_path', ''), $attributes);
         $request->attributes->add($attributes);
-        $request->attributes->set('_route_params', array_replace($request->attributes->get('_route_params', array()), $attributes));
+        $request->attributes->set('_route_params', array_replace($request->attributes->get('_route_params', []), $attributes));
         $request->query->remove('_path');
     }
 
@@ -92,8 +92,8 @@ protected function validateRequest(Request $request)
 
     public static function getSubscribedEvents()
     {
-        return array(
-            KernelEvents::REQUEST => array(array('onKernelRequest', 48)),
-        );
+        return [
+            KernelEvents::REQUEST => [['onKernelRequest', 48]],
+        ];
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
index ed0236efc85e8..c7e32dbb23089 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
@@ -74,10 +74,10 @@ private function setRouterContext(Request $request)
 
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             // must be registered after the Router to have access to the _locale
-            KernelEvents::REQUEST => array(array('onKernelRequest', 16)),
-            KernelEvents::FINISH_REQUEST => array(array('onKernelFinishRequest', 0)),
-        );
+            KernelEvents::REQUEST => [['onKernelRequest', 16]],
+            KernelEvents::FINISH_REQUEST => [['onKernelFinishRequest', 0]],
+        ];
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php b/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php
index f24784527bb8e..43527b7ffc2df 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php
@@ -49,8 +49,8 @@ public function onKernelResponse(FilterResponseEvent $event)
 
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             KernelEvents::RESPONSE => 'onKernelResponse',
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
index ab5c86cdd0e82..378327b574109 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
@@ -118,12 +118,12 @@ public function onKernelRequest(GetResponseEvent $event)
             }
 
             if (null !== $this->logger) {
-                $this->logger->info('Matched route "{route}".', array(
+                $this->logger->info('Matched route "{route}".', [
                     'route' => isset($parameters['_route']) ? $parameters['_route'] : 'n/a',
                     'route_parameters' => $parameters,
                     'request_uri' => $request->getUri(),
                     'method' => $request->getMethod(),
-                ));
+                ]);
             }
 
             $request->attributes->add($parameters);
@@ -157,11 +157,11 @@ public function onKernelException(GetResponseForExceptionEvent $event)
 
     public static function getSubscribedEvents()
     {
-        return array(
-            KernelEvents::REQUEST => array(array('onKernelRequest', 32)),
-            KernelEvents::FINISH_REQUEST => array(array('onKernelFinishRequest', 0)),
-            KernelEvents::EXCEPTION => array('onKernelException', -64),
-        );
+        return [
+            KernelEvents::REQUEST => [['onKernelRequest', 32]],
+            KernelEvents::FINISH_REQUEST => [['onKernelFinishRequest', 0]],
+            KernelEvents::EXCEPTION => ['onKernelException', -64],
+        ];
     }
 
     private function createWelcomeResponse()
diff --git a/src/Symfony/Component/HttpKernel/EventListener/SaveSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/SaveSessionListener.php
index 36809b59af914..5901200a70f72 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/SaveSessionListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/SaveSessionListener.php
@@ -58,9 +58,9 @@ public function onKernelResponse(FilterResponseEvent $event)
 
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             // low priority but higher than StreamedResponseListener
-            KernelEvents::RESPONSE => array(array('onKernelResponse', -1000)),
-        );
+            KernelEvents::RESPONSE => [['onKernelResponse', -1000]],
+        ];
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/EventListener/StreamedResponseListener.php b/src/Symfony/Component/HttpKernel/EventListener/StreamedResponseListener.php
index 2c616b9182b3b..895176a931ae3 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/StreamedResponseListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/StreamedResponseListener.php
@@ -42,8 +42,8 @@ public function onKernelResponse(FilterResponseEvent $event)
 
     public static function getSubscribedEvents()
     {
-        return array(
-            KernelEvents::RESPONSE => array('onKernelResponse', -1024),
-        );
+        return [
+            KernelEvents::RESPONSE => ['onKernelResponse', -1024],
+        ];
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php b/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php
index 634353385715f..0fddddde4233b 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php
@@ -58,8 +58,8 @@ public function onKernelResponse(FilterResponseEvent $event)
 
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             KernelEvents::RESPONSE => 'onKernelResponse',
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/EventListener/TranslatorListener.php b/src/Symfony/Component/HttpKernel/EventListener/TranslatorListener.php
index 2a5fc712807d5..0f506061a66a3 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/TranslatorListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/TranslatorListener.php
@@ -51,11 +51,11 @@ public function onKernelFinishRequest(FinishRequestEvent $event)
 
     public static function getSubscribedEvents()
     {
-        return array(
+        return [
             // must be registered after the Locale listener
-            KernelEvents::REQUEST => array(array('onKernelRequest', 10)),
-            KernelEvents::FINISH_REQUEST => array(array('onKernelFinishRequest', 0)),
-        );
+            KernelEvents::REQUEST => [['onKernelRequest', 10]],
+            KernelEvents::FINISH_REQUEST => [['onKernelFinishRequest', 0]],
+        ];
     }
 
     private function setLocale(Request $request)
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ValidateRequestListener.php b/src/Symfony/Component/HttpKernel/EventListener/ValidateRequestListener.php
index a33853f727bad..2e921869b92f1 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/ValidateRequestListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/ValidateRequestListener.php
@@ -44,10 +44,10 @@ public function onKernelRequest(GetResponseEvent $event)
      */
     public static function getSubscribedEvents()
     {
-        return array(
-            KernelEvents::REQUEST => array(
-                array('onKernelRequest', 256),
-            ),
-        );
+        return [
+            KernelEvents::REQUEST => [
+                ['onKernelRequest', 256],
+            ],
+        ];
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
index 3c8934ff89348..430486e549885 100644
--- a/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
+++ b/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
@@ -59,7 +59,7 @@ public function __construct(SurrogateInterface $surrogate = null, FragmentRender
      *
      * @see Symfony\Component\HttpKernel\HttpCache\SurrogateInterface
      */
-    public function render($uri, Request $request, array $options = array())
+    public function render($uri, Request $request, array $options = [])
     {
         if (!$this->surrogate || !$this->surrogate->hasSurrogateCapability($request)) {
             if ($uri instanceof ControllerReference && $this->containsNonScalars($uri->attributes)) {
diff --git a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
index f11db73dc90c2..f952beb235c97 100644
--- a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
+++ b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
@@ -29,7 +29,7 @@
 class FragmentHandler
 {
     private $debug;
-    private $renderers = array();
+    private $renderers = [];
     private $requestStack;
 
     /**
@@ -70,7 +70,7 @@ public function addRenderer(FragmentRendererInterface $renderer)
      * @throws \InvalidArgumentException when the renderer does not exist
      * @throws \LogicException           when no master request is being handled
      */
-    public function render($uri, $renderer = 'inline', array $options = array())
+    public function render($uri, $renderer = 'inline', array $options = [])
     {
         if (!isset($options['ignore_errors'])) {
             $options['ignore_errors'] = !$this->debug;
diff --git a/src/Symfony/Component/HttpKernel/Fragment/FragmentRendererInterface.php b/src/Symfony/Component/HttpKernel/Fragment/FragmentRendererInterface.php
index bcf4e9944a9dd..8e454a01a6ecb 100644
--- a/src/Symfony/Component/HttpKernel/Fragment/FragmentRendererInterface.php
+++ b/src/Symfony/Component/HttpKernel/Fragment/FragmentRendererInterface.php
@@ -31,7 +31,7 @@ interface FragmentRendererInterface
      *
      * @return Response A Response instance
      */
-    public function render($uri, Request $request, array $options = array());
+    public function render($uri, Request $request, array $options = []);
 
     /**
      * Gets the name of the strategy.
diff --git a/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php
index f7150c1979b4b..a0abc058819af 100644
--- a/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php
+++ b/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php
@@ -81,7 +81,7 @@ public function hasTemplating()
      *  * id:         An optional hx:include tag id attribute
      *  * attributes: An optional array of hx:include tag attributes
      */
-    public function render($uri, Request $request, array $options = array())
+    public function render($uri, Request $request, array $options = [])
     {
         if ($uri instanceof ControllerReference) {
             if (null === $this->signer) {
@@ -102,7 +102,7 @@ public function render($uri, Request $request, array $options = array())
             $content = $template;
         }
 
-        $attributes = isset($options['attributes']) && \is_array($options['attributes']) ? $options['attributes'] : array();
+        $attributes = isset($options['attributes']) && \is_array($options['attributes']) ? $options['attributes'] : [];
         if (isset($options['id']) && $options['id']) {
             $attributes['id'] = $options['id'];
         }
diff --git a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
index 13fc3356242e7..73defb9d3ef7e 100644
--- a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
+++ b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
@@ -43,7 +43,7 @@ public function __construct(HttpKernelInterface $kernel, EventDispatcherInterfac
      *
      *  * alt: an alternative URI to render in case of an error
      */
-    public function render($uri, Request $request, array $options = array())
+    public function render($uri, Request $request, array $options = [])
     {
         $reference = null;
         if ($uri instanceof ControllerReference) {
@@ -54,10 +54,10 @@ public function render($uri, Request $request, array $options = array())
             // want that as we want to preserve objects (so we manually set Request attributes
             // below instead)
             $attributes = $reference->attributes;
-            $reference->attributes = array();
+            $reference->attributes = [];
 
             // The request format and locale might have been overridden by the user
-            foreach (array('_format', '_locale') as $key) {
+            foreach (['_format', '_locale'] as $key) {
                 if (isset($attributes[$key])) {
                     $reference->attributes[$key] = $attributes[$key];
                 }
@@ -113,7 +113,7 @@ protected function createSubRequest($uri, Request $request)
         unset($server['HTTP_IF_MODIFIED_SINCE']);
         unset($server['HTTP_IF_NONE_MATCH']);
 
-        $subRequest = Request::create($uri, 'get', array(), $cookies, array(), $server);
+        $subRequest = Request::create($uri, 'get', [], $cookies, [], $server);
         if ($request->headers->has('Surrogate-Capability')) {
             $subRequest->headers->set('Surrogate-Capability', $request->headers->get('Surrogate-Capability'));
         }
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php b/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php
index 3b2d5f262cfcc..8918a3057056e 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php
@@ -24,16 +24,16 @@
 abstract class AbstractSurrogate implements SurrogateInterface
 {
     protected $contentTypes;
-    protected $phpEscapeMap = array(
-        array('<?', '<%', '<s', '<S'),
-        array('<?php echo "<?"; ?>', '<?php echo "<%"; ?>', '<?php echo "<s"; ?>', '<?php echo "<S"; ?>'),
-    );
+    protected $phpEscapeMap = [
+        ['<?', '<%', '<s', '<S'],
+        ['<?php echo "<?"; ?>', '<?php echo "<%"; ?>', '<?php echo "<s"; ?>', '<?php echo "<S"; ?>'],
+    ];
 
     /**
      * @param array $contentTypes An array of content-type that should be parsed for Surrogate information
      *                            (default: text/html, text/xml, application/xhtml+xml, and application/xml)
      */
-    public function __construct(array $contentTypes = array('text/html', 'text/xml', 'application/xhtml+xml', 'application/xml'))
+    public function __construct(array $contentTypes = ['text/html', 'text/xml', 'application/xhtml+xml', 'application/xml'])
     {
         $this->contentTypes = $contentTypes;
     }
@@ -90,7 +90,7 @@ public function needsParsing(Response $response)
      */
     public function handle(HttpCache $cache, $uri, $alt, $ignoreErrors)
     {
-        $subRequest = Request::create($uri, Request::METHOD_GET, array(), $cache->getRequest()->cookies->all(), array(), $cache->getRequest()->server->all());
+        $subRequest = Request::create($uri, Request::METHOD_GET, [], $cache->getRequest()->cookies->all(), [], $cache->getRequest()->server->all());
 
         try {
             $response = $cache->handle($subRequest, HttpKernelInterface::SUB_REQUEST, true);
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
index 69134c71a12c4..dc62990b408c9 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
@@ -85,7 +85,7 @@ public function process(Request $request, Response $response)
 
         $i = 1;
         while (isset($chunks[$i])) {
-            $options = array();
+            $options = [];
             preg_match_all('/(src|onerror|alt)="([^"]*?)"/', $chunks[$i], $matches, PREG_SET_ORDER);
             foreach ($matches as $set) {
                 $options[$set[1]] = $set[2];
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
index ebc5ba6868a46..daaa928fa38ff 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -32,8 +32,8 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
     private $request;
     private $surrogate;
     private $surrogateCacheStrategy;
-    private $options = array();
-    private $traces = array();
+    private $options = [];
+    private $traces = [];
 
     /**
      * Constructor.
@@ -70,24 +70,24 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
      *                            This setting is overridden by the stale-if-error HTTP Cache-Control extension
      *                            (see RFC 5861).
      */
-    public function __construct(HttpKernelInterface $kernel, StoreInterface $store, SurrogateInterface $surrogate = null, array $options = array())
+    public function __construct(HttpKernelInterface $kernel, StoreInterface $store, SurrogateInterface $surrogate = null, array $options = [])
     {
         $this->store = $store;
         $this->kernel = $kernel;
         $this->surrogate = $surrogate;
 
         // needed in case there is a fatal error because the backend is too slow to respond
-        register_shutdown_function(array($this->store, 'cleanup'));
+        register_shutdown_function([$this->store, 'cleanup']);
 
-        $this->options = array_merge(array(
+        $this->options = array_merge([
             'debug' => false,
             'default_ttl' => 0,
-            'private_headers' => array('Authorization', 'Cookie'),
+            'private_headers' => ['Authorization', 'Cookie'],
             'allow_reload' => false,
             'allow_revalidate' => false,
             'stale_while_revalidate' => 2,
             'stale_if_error' => 60,
-        ), $options);
+        ], $options);
     }
 
     /**
@@ -117,7 +117,7 @@ public function getTraces()
      */
     public function getLog()
     {
-        $log = array();
+        $log = [];
         foreach ($this->traces as $request => $traces) {
             $log[] = sprintf('%s: %s', $request, implode(', ', $traces));
         }
@@ -164,7 +164,7 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
     {
         // FIXME: catch exceptions and implement a 500 error page here? -> in Varnish, there is a built-in error page mechanism
         if (HttpKernelInterface::MASTER_REQUEST === $type) {
-            $this->traces = array();
+            $this->traces = [];
             // Keep a clone of the original request for surrogates so they can access it.
             // We must clone here to get a separate instance because the application will modify the request during
             // the application flow (we know it always does because we do ourselves by setting REMOTE_ADDR to 127.0.0.1
@@ -175,7 +175,7 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
             }
         }
 
-        $this->traces[$this->getTraceKey($request)] = array();
+        $this->traces[$this->getTraceKey($request)] = [];
 
         if (!$request->isMethodSafe(false)) {
             $response = $this->invalidate($request, $catch);
@@ -260,9 +260,9 @@ protected function invalidate(Request $request, $catch = false)
                 $this->store->invalidate($request);
 
                 // As per the RFC, invalidate Location and Content-Location URLs if present
-                foreach (array('Location', 'Content-Location') as $header) {
+                foreach (['Location', 'Content-Location'] as $header) {
                     if ($uri = $response->headers->get($header)) {
-                        $subRequest = Request::create($uri, 'get', array(), array(), array(), $request->server->all());
+                        $subRequest = Request::create($uri, 'get', [], [], [], $request->server->all());
 
                         $this->store->invalidate($subRequest);
                     }
@@ -357,7 +357,7 @@ protected function validate(Request $request, Response $entry, $catch = false)
         // Add our cached etag validator to the environment.
         // We keep the etags from the client to handle the case when the client
         // has a different private valid entry which is not cached here.
-        $cachedEtags = $entry->getEtag() ? array($entry->getEtag()) : array();
+        $cachedEtags = $entry->getEtag() ? [$entry->getEtag()] : [];
         $requestEtags = $request->getETags();
         if ($etags = array_unique(array_merge($cachedEtags, $requestEtags))) {
             $subRequest->headers->set('if_none_match', implode(', ', $etags));
@@ -377,7 +377,7 @@ protected function validate(Request $request, Response $entry, $catch = false)
             $entry = clone $entry;
             $entry->headers->remove('Date');
 
-            foreach (array('Date', 'Expires', 'Cache-Control', 'ETag', 'Last-Modified') as $name) {
+            foreach (['Date', 'Expires', 'Cache-Control', 'ETag', 'Last-Modified'] as $name) {
                 if ($response->headers->has($name)) {
                     $entry->headers->set($name, $response->headers->get($name));
                 }
@@ -448,7 +448,7 @@ protected function forward(Request $request, $catch = false, Response $entry = n
         $response = SubRequestHandler::handle($this->kernel, $request, HttpKernelInterface::MASTER_REQUEST, $catch);
 
         // we don't implement the stale-if-error on Requests, which is nonetheless part of the RFC
-        if (null !== $entry && \in_array($response->getStatusCode(), array(500, 502, 503, 504))) {
+        if (null !== $entry && \in_array($response->getStatusCode(), [500, 502, 503, 504])) {
             if (null === $age = $entry->headers->getCacheControlDirective('stale-if-error')) {
                 $age = $this->options['stale_if_error'];
             }
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php b/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php
index 672cc893feb6d..168e9564b0c99 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php
@@ -30,8 +30,8 @@ class ResponseCacheStrategy implements ResponseCacheStrategyInterface
 {
     private $cacheable = true;
     private $embeddedResponses = 0;
-    private $ttls = array();
-    private $maxAges = array();
+    private $ttls = [];
+    private $maxAges = [];
     private $isNotCacheableResponseEmbedded = false;
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php b/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php
index 58df176019953..eaaa230b50ee9 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php
@@ -70,7 +70,7 @@ public function process(Request $request, Response $response)
 
         $i = 1;
         while (isset($chunks[$i])) {
-            $options = array();
+            $options = [];
             preg_match_all('/(virtual)="([^"]*?)"/', $chunks[$i], $matches, PREG_SET_ORDER);
             foreach ($matches as $set) {
                 $options[$set[1]] = $set[2];
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
index 990091d0650a5..ffd4f01aea59f 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/Store.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
@@ -40,7 +40,7 @@ public function __construct($root)
             throw new \RuntimeException(sprintf('Unable to create the store directory (%s).', $this->root));
         }
         $this->keyCache = new \SplObjectStorage();
-        $this->locks = array();
+        $this->locks = [];
     }
 
     /**
@@ -54,7 +54,7 @@ public function cleanup()
             fclose($lock);
         }
 
-        $this->locks = array();
+        $this->locks = [];
     }
 
     /**
@@ -192,11 +192,11 @@ public function write(Request $request, Response $response)
         }
 
         // read existing cache entries, remove non-varying, and add this one to the list
-        $entries = array();
+        $entries = [];
         $vary = $response->headers->get('vary');
         foreach ($this->getMetadata($key) as $entry) {
             if (!isset($entry[1]['vary'][0])) {
-                $entry[1]['vary'] = array('');
+                $entry[1]['vary'] = [''];
             }
 
             if ($entry[1]['vary'][0] != $vary || !$this->requestsMatch($vary, $entry[0], $storedEnv)) {
@@ -207,7 +207,7 @@ public function write(Request $request, Response $response)
         $headers = $this->persistResponse($response);
         unset($headers['age']);
 
-        array_unshift($entries, array($storedEnv, $headers));
+        array_unshift($entries, [$storedEnv, $headers]);
 
         if (false === $this->save($key, serialize($entries))) {
             throw new \RuntimeException('Unable to store the metadata.');
@@ -236,13 +236,13 @@ public function invalidate(Request $request)
         $modified = false;
         $key = $this->getCacheKey($request);
 
-        $entries = array();
+        $entries = [];
         foreach ($this->getMetadata($key) as $entry) {
             $response = $this->restoreResponse($entry[1]);
             if ($response->isFresh()) {
                 $response->expire();
                 $modified = true;
-                $entries[] = array($entry[0], $this->persistResponse($response));
+                $entries[] = [$entry[0], $this->persistResponse($response)];
             } else {
                 $entries[] = $entry;
             }
@@ -293,7 +293,7 @@ private function requestsMatch($vary, $env1, $env2)
     private function getMetadata($key)
     {
         if (!$entries = $this->load($key)) {
-            return array();
+            return [];
         }
 
         return unserialize($entries);
@@ -464,7 +464,7 @@ private function persistRequest(Request $request)
     private function persistResponse(Response $response)
     {
         $headers = $response->headers->all();
-        $headers['X-Status'] = array($response->getStatusCode());
+        $headers['X-Status'] = [$response->getStatusCode()];
 
         return $headers;
     }
@@ -483,7 +483,7 @@ private function restoreResponse($headers, $body = null)
         unset($headers['X-Status']);
 
         if (null !== $body) {
-            $headers['X-Body-File'] = array($body);
+            $headers['X-Body-File'] = [$body];
         }
 
         return new Response($body, $status, $headers);
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/SubRequestHandler.php b/src/Symfony/Component/HttpKernel/HttpCache/SubRequestHandler.php
index 9649072c16c6d..4b2704da8b119 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/SubRequestHandler.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/SubRequestHandler.php
@@ -63,8 +63,8 @@ public static function handle(HttpKernelInterface $kernel, Request $request, $ty
         }
 
         // compute trusted values, taking any trusted proxies into account
-        $trustedIps = array();
-        $trustedValues = array();
+        $trustedIps = [];
+        $trustedValues = [];
         foreach (array_reverse($request->getClientIps()) as $ip) {
             $trustedIps[] = $ip;
             $trustedValues[] = sprintf('for="%s"', $ip);
@@ -95,7 +95,7 @@ public static function handle(HttpKernelInterface $kernel, Request $request, $ty
 
         // ensure 127.0.0.1 is set as trusted proxy
         if (!IpUtils::checkIp('127.0.0.1', $trustedProxies)) {
-            Request::setTrustedProxies(array_merge($trustedProxies, array('127.0.0.1')), Request::getTrustedHeaderSet());
+            Request::setTrustedProxies(array_merge($trustedProxies, ['127.0.0.1']), Request::getTrustedHeaderSet());
         }
 
         try {
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
index f34d9b32251b3..1e19923eb7e7a 100644
--- a/src/Symfony/Component/HttpKernel/HttpKernel.php
+++ b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -273,7 +273,7 @@ private function varToString($var)
         }
 
         if (\is_array($var)) {
-            $a = array();
+            $a = [];
             foreach ($var as $k => $v) {
                 $a[] = sprintf('%s => %s', $k, $this->varToString($v));
             }
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 8635c2dfc4448..c8a03a1f3f9e1 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -50,7 +50,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     /**
      * @var BundleInterface[]
      */
-    protected $bundles = array();
+    protected $bundles = [];
 
     protected $bundleMap;
     protected $container;
@@ -598,7 +598,7 @@ protected function initializeContainer()
         }
 
         if ($this->debug) {
-            $collectedLogs = array();
+            $collectedLogs = [];
             $previousHandler = \defined('PHPUNIT_COMPOSER_INSTALL');
             $previousHandler = $previousHandler ?: set_error_handler(function ($type, $message, $file, $line) use (&$collectedLogs, &$previousHandler) {
                 if (E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) {
@@ -664,7 +664,7 @@ protected function initializeContainer()
             // Because concurrent requests might still be using them,
             // old container files are not removed immediately,
             // but on a next dump of the container.
-            static $legacyContainers = array();
+            static $legacyContainers = [];
             $oldContainerDir = \dirname($oldContainer->getFileName());
             $legacyContainers[$oldContainerDir.'.legacy'] = true;
             foreach (glob(\dirname($oldContainerDir).\DIRECTORY_SEPARATOR.'*.legacy') as $legacyContainer) {
@@ -753,7 +753,7 @@ protected function getEnvParameters()
      */
     protected function buildContainer()
     {
-        foreach (array('cache' => $this->warmupDir ?: $this->getCacheDir(), 'logs' => $this->getLogDir()) as $name => $dir) {
+        foreach (['cache' => $this->warmupDir ?: $this->getCacheDir(), 'logs' => $this->getLogDir()] as $name => $dir) {
             if (!is_dir($dir)) {
                 if (false === @mkdir($dir, 0777, true) && !is_dir($dir)) {
                     throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n", $name, $dir));
@@ -782,7 +782,7 @@ protected function buildContainer()
      */
     protected function prepareContainer(ContainerBuilder $container)
     {
-        $extensions = array();
+        $extensions = [];
         foreach ($this->bundles as $bundle) {
             if ($extension = $bundle->getContainerExtension()) {
                 $container->registerExtension($extension);
@@ -844,7 +844,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
             $dumper->setProxyDumper(new ProxyDumper());
         }
 
-        $content = $dumper->dump(array(
+        $content = $dumper->dump([
             'class' => $class,
             'base_class' => $baseClass,
             'file' => $cache->getPath(),
@@ -852,7 +852,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
             'debug' => $this->debug,
             'inline_class_loader_parameter' => \PHP_VERSION_ID >= 70000 && !$this->loadClassCache && !class_exists(ClassCollectionLoader::class, false) ? 'container.dumper.inline_class_loader' : null,
             'build_time' => $container->hasParameter('kernel.container_build_time') ? $container->getParameter('kernel.container_build_time') : time(),
-        ));
+        ]);
 
         $rootCode = array_pop($content);
         $dir = \dirname($cache->getPath()).'/';
@@ -875,7 +875,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
     protected function getContainerLoader(ContainerInterface $container)
     {
         $locator = new FileLocator($this);
-        $resolver = new LoaderResolver(array(
+        $resolver = new LoaderResolver([
             new XmlFileLoader($container, $locator),
             new YamlFileLoader($container, $locator),
             new IniFileLoader($container, $locator),
@@ -883,7 +883,7 @@ protected function getContainerLoader(ContainerInterface $container)
             new GlobFileLoader($container, $locator),
             new DirectoryLoader($container, $locator),
             new ClosureLoader($container),
-        ));
+        ]);
 
         return new DelegatingLoader($resolver);
     }
@@ -927,8 +927,8 @@ public static function stripComments($source)
                 }
 
                 // replace multiple new lines with a single newline
-                $rawChunk .= preg_replace(array('/\n{2,}/S'), "\n", $token[1]);
-            } elseif (\in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) {
+                $rawChunk .= preg_replace(['/\n{2,}/S'], "\n", $token[1]);
+            } elseif (\in_array($token[0], [T_COMMENT, T_DOC_COMMENT])) {
                 $ignoreSpace = true;
             } else {
                 $rawChunk .= $token[1];
diff --git a/src/Symfony/Component/HttpKernel/Log/Logger.php b/src/Symfony/Component/HttpKernel/Log/Logger.php
index ca54d22f759bd..6cfc75949021e 100644
--- a/src/Symfony/Component/HttpKernel/Log/Logger.php
+++ b/src/Symfony/Component/HttpKernel/Log/Logger.php
@@ -22,7 +22,7 @@
  */
 class Logger extends AbstractLogger
 {
-    private static $levels = array(
+    private static $levels = [
         LogLevel::DEBUG => 0,
         LogLevel::INFO => 1,
         LogLevel::NOTICE => 2,
@@ -31,7 +31,7 @@ class Logger extends AbstractLogger
         LogLevel::CRITICAL => 5,
         LogLevel::ALERT => 6,
         LogLevel::EMERGENCY => 7,
-    );
+    ];
 
     private $minLevelIndex;
     private $formatter;
@@ -57,7 +57,7 @@ public function __construct($minLevel = null, $output = 'php://stderr', callable
         }
 
         $this->minLevelIndex = self::$levels[$minLevel];
-        $this->formatter = $formatter ?: array($this, 'format');
+        $this->formatter = $formatter ?: [$this, 'format'];
         if (false === $this->handle = \is_resource($output) ? $output : @fopen($output, 'a')) {
             throw new InvalidArgumentException(sprintf('Unable to open "%s".', $output));
         }
@@ -66,7 +66,7 @@ public function __construct($minLevel = null, $output = 'php://stderr', callable
     /**
      * {@inheritdoc}
      */
-    public function log($level, $message, array $context = array())
+    public function log($level, $message, array $context = [])
     {
         if (!isset(self::$levels[$level])) {
             throw new InvalidArgumentException(sprintf('The log level "%s" does not exist.', $level));
@@ -90,7 +90,7 @@ public function log($level, $message, array $context = array())
     private function format($level, $message, array $context)
     {
         if (false !== strpos($message, '{')) {
-            $replacements = array();
+            $replacements = [];
             foreach ($context as $key => $val) {
                 if (null === $val || is_scalar($val) || (\is_object($val) && method_exists($val, '__toString'))) {
                     $replacements["{{$key}}"] = $val;
diff --git a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
index 8bb57cf30cecf..810e2fe6f2f8d 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
@@ -54,13 +54,13 @@ public function find($ip, $url, $limit, $method, $start = null, $end = null, $st
         $file = $this->getIndexFilename();
 
         if (!file_exists($file)) {
-            return array();
+            return [];
         }
 
         $file = fopen($file, 'r');
         fseek($file, 0, SEEK_END);
 
-        $result = array();
+        $result = [];
         while (\count($result) < $limit && $line = $this->readLineFromFile($file)) {
             $values = str_getcsv($line);
             list($csvToken, $csvIp, $csvMethod, $csvUrl, $csvTime, $csvParent, $csvStatusCode) = $values;
@@ -78,7 +78,7 @@ public function find($ip, $url, $limit, $method, $start = null, $end = null, $st
                 continue;
             }
 
-            $result[$csvToken] = array(
+            $result[$csvToken] = [
                 'token' => $csvToken,
                 'ip' => $csvIp,
                 'method' => $csvMethod,
@@ -86,7 +86,7 @@ public function find($ip, $url, $limit, $method, $start = null, $end = null, $st
                 'time' => $csvTime,
                 'parent' => $csvParent,
                 'status_code' => $csvStatusCode,
-            );
+            ];
         }
 
         fclose($file);
@@ -151,7 +151,7 @@ public function write(Profile $profile)
         }, $profile->getChildren()));
 
         // Store profile
-        $data = array(
+        $data = [
             'token' => $profileToken,
             'parent' => $parentToken,
             'children' => $childrenToken,
@@ -161,7 +161,7 @@ public function write(Profile $profile)
             'url' => $profile->getUrl(),
             'time' => $profile->getTime(),
             'status_code' => $profile->getStatusCode(),
-        );
+        ];
 
         if (false === file_put_contents($file, serialize($data))) {
             return false;
@@ -173,7 +173,7 @@ public function write(Profile $profile)
                 return false;
             }
 
-            fputcsv($file, array(
+            fputcsv($file, [
                 $profile->getToken(),
                 $profile->getIp(),
                 $profile->getMethod(),
@@ -181,7 +181,7 @@ public function write(Profile $profile)
                 $profile->getTime(),
                 $profile->getParentToken(),
                 $profile->getStatusCode(),
-            ));
+            ]);
             fclose($file);
         }
 
diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profile.php b/src/Symfony/Component/HttpKernel/Profiler/Profile.php
index 9216f09e2bc35..450286107ae27 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/Profile.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/Profile.php
@@ -25,7 +25,7 @@ class Profile
     /**
      * @var DataCollectorInterface[]
      */
-    private $collectors = array();
+    private $collectors = [];
 
     private $ip;
     private $method;
@@ -41,7 +41,7 @@ class Profile
     /**
      * @var Profile[]
      */
-    private $children = array();
+    private $children = [];
 
     /**
      * @param string $token The token
@@ -204,7 +204,7 @@ public function getChildren()
      */
     public function setChildren(array $children)
     {
-        $this->children = array();
+        $this->children = [];
         foreach ($children as $child) {
             $this->addChild($child);
         }
@@ -254,7 +254,7 @@ public function getCollectors()
      */
     public function setCollectors(array $collectors)
     {
-        $this->collectors = array();
+        $this->collectors = [];
         foreach ($collectors as $collector) {
             $this->addCollector($collector);
         }
@@ -282,6 +282,6 @@ public function hasCollector($name)
 
     public function __sleep()
     {
-        return array('token', 'parent', 'children', 'collectors', 'ip', 'method', 'url', 'time', 'statusCode');
+        return ['token', 'parent', 'children', 'collectors', 'ip', 'method', 'url', 'time', 'statusCode'];
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
index f252da476680c..edf6cb833017d 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
@@ -30,7 +30,7 @@ class Profiler
     /**
      * @var DataCollectorInterface[]
      */
-    private $collectors = array();
+    private $collectors = [];
 
     private $logger;
     private $initiallyEnabled = true;
@@ -103,7 +103,7 @@ public function saveProfile(Profile $profile)
         }
 
         if (!($ret = $this->storage->write($profile)) && null !== $this->logger) {
-            $this->logger->warning('Unable to store the profiler information.', array('configured_storage' => \get_class($this->storage)));
+            $this->logger->warning('Unable to store the profiler information.', ['configured_storage' => \get_class($this->storage)]);
         }
 
         return $ret;
@@ -198,9 +198,9 @@ public function all()
      *
      * @param DataCollectorInterface[] $collectors An array of collectors
      */
-    public function set(array $collectors = array())
+    public function set(array $collectors = [])
     {
-        $this->collectors = array();
+        $this->collectors = [];
         foreach ($collectors as $collector) {
             $this->add($collector);
         }
diff --git a/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php b/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php
index ec2ecff948c81..a7093dfc9df90 100644
--- a/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php
@@ -35,7 +35,7 @@ public function testInjectClearersInConstructor()
             ->expects($this->once())
             ->method('clear');
 
-        $chainClearer = new ChainCacheClearer(array($clearer));
+        $chainClearer = new ChainCacheClearer([$clearer]);
         $chainClearer->clear(self::$cacheDir);
     }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/CacheClearer/Psr6CacheClearerTest.php b/src/Symfony/Component/HttpKernel/Tests/CacheClearer/Psr6CacheClearerTest.php
index b3bed4e87f605..402e9bbc7afc6 100644
--- a/src/Symfony/Component/HttpKernel/Tests/CacheClearer/Psr6CacheClearerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/CacheClearer/Psr6CacheClearerTest.php
@@ -24,7 +24,7 @@ public function testClearPoolsInjectedInConstructor()
             ->expects($this->once())
             ->method('clear');
 
-        (new Psr6CacheClearer(array('pool' => $pool)))->clear('');
+        (new Psr6CacheClearer(['pool' => $pool]))->clear('');
     }
 
     public function testClearPool()
@@ -34,7 +34,7 @@ public function testClearPool()
             ->expects($this->once())
             ->method('clear');
 
-        (new Psr6CacheClearer(array('pool' => $pool)))->clearPool('pool');
+        (new Psr6CacheClearer(['pool' => $pool]))->clearPool('pool');
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php b/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
index ba159124c93e9..7265770d93d16 100644
--- a/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
@@ -34,7 +34,7 @@ public function testInjectWarmersUsingConstructor()
         $warmer
             ->expects($this->once())
             ->method('warmUp');
-        $aggregate = new CacheWarmerAggregate(array($warmer));
+        $aggregate = new CacheWarmerAggregate([$warmer]);
         $aggregate->warmUp(self::$cacheDir);
     }
 
@@ -76,7 +76,7 @@ public function testWarmupDoesCallWarmupOnOptionalWarmersWhenEnableOptionalWarme
             ->expects($this->once())
             ->method('warmUp');
 
-        $aggregate = new CacheWarmerAggregate(array($warmer));
+        $aggregate = new CacheWarmerAggregate([$warmer]);
         $aggregate->enableOptionalWarmers();
         $aggregate->warmUp(self::$cacheDir);
     }
@@ -92,7 +92,7 @@ public function testWarmupDoesNotCallWarmupOnOptionalWarmersWhenEnableOptionalWa
             ->expects($this->never())
             ->method('warmUp');
 
-        $aggregate = new CacheWarmerAggregate(array($warmer));
+        $aggregate = new CacheWarmerAggregate([$warmer]);
         $aggregate->warmUp(self::$cacheDir);
     }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/ClientTest.php b/src/Symfony/Component/HttpKernel/Tests/ClientTest.php
index 5af273086820b..e95c7ff7ed4c1 100644
--- a/src/Symfony/Component/HttpKernel/Tests/ClientTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/ClientTest.php
@@ -70,7 +70,7 @@ public function testFilterResponseConvertsCookies()
         $response->headers->setCookie($cookie2 = new Cookie('foo1', 'bar1', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true));
         $domResponse = $m->invoke($client, $response);
         $this->assertSame((string) $cookie1, $domResponse->getHeader('Set-Cookie'));
-        $this->assertSame(array((string) $cookie1, (string) $cookie2), $domResponse->getHeader('Set-Cookie', false));
+        $this->assertSame([(string) $cookie1, (string) $cookie2], $domResponse->getHeader('Set-Cookie', false));
     }
 
     public function testFilterResponseSupportsStreamedResponses()
@@ -131,9 +131,9 @@ public function testUploadedFileWhenNoFileSelected()
         $kernel = new TestHttpKernel();
         $client = new Client($kernel);
 
-        $file = array('tmp_name' => '', 'name' => '', 'type' => '', 'size' => 0, 'error' => UPLOAD_ERR_NO_FILE);
+        $file = ['tmp_name' => '', 'name' => '', 'type' => '', 'size' => 0, 'error' => UPLOAD_ERR_NO_FILE];
 
-        $client->request('POST', '/', array(), array('foo' => $file));
+        $client->request('POST', '/', [], ['foo' => $file]);
 
         $files = $client->getRequest()->files->all();
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php
index f6a3689638714..2c43e5b1ba00c 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php
@@ -21,86 +21,86 @@ class ServiceValueResolverTest extends TestCase
 {
     public function testDoNotSupportWhenControllerDoNotExists()
     {
-        $resolver = new ServiceValueResolver(new ServiceLocator(array()));
+        $resolver = new ServiceValueResolver(new ServiceLocator([]));
         $argument = new ArgumentMetadata('dummy', DummyService::class, false, false, null);
-        $request = $this->requestWithAttributes(array('_controller' => 'my_controller'));
+        $request = $this->requestWithAttributes(['_controller' => 'my_controller']);
 
         $this->assertFalse($resolver->supports($request, $argument));
     }
 
     public function testExistingController()
     {
-        $resolver = new ServiceValueResolver(new ServiceLocator(array(
+        $resolver = new ServiceValueResolver(new ServiceLocator([
             'App\\Controller\\Mine::method' => function () {
-                return new ServiceLocator(array(
+                return new ServiceLocator([
                     'dummy' => function () {
                         return new DummyService();
                     },
-                ));
+                ]);
             },
-        )));
+        ]));
 
-        $request = $this->requestWithAttributes(array('_controller' => 'App\\Controller\\Mine::method'));
+        $request = $this->requestWithAttributes(['_controller' => 'App\\Controller\\Mine::method']);
         $argument = new ArgumentMetadata('dummy', DummyService::class, false, false, null);
 
         $this->assertTrue($resolver->supports($request, $argument));
-        $this->assertYieldEquals(array(new DummyService()), $resolver->resolve($request, $argument));
+        $this->assertYieldEquals([new DummyService()], $resolver->resolve($request, $argument));
     }
 
     public function testExistingControllerWithATrailingBackSlash()
     {
-        $resolver = new ServiceValueResolver(new ServiceLocator(array(
+        $resolver = new ServiceValueResolver(new ServiceLocator([
             'App\\Controller\\Mine::method' => function () {
-                return new ServiceLocator(array(
+                return new ServiceLocator([
                     'dummy' => function () {
                         return new DummyService();
                     },
-                ));
+                ]);
             },
-        )));
+        ]));
 
-        $request = $this->requestWithAttributes(array('_controller' => '\\App\\Controller\\Mine::method'));
+        $request = $this->requestWithAttributes(['_controller' => '\\App\\Controller\\Mine::method']);
         $argument = new ArgumentMetadata('dummy', DummyService::class, false, false, null);
 
         $this->assertTrue($resolver->supports($request, $argument));
-        $this->assertYieldEquals(array(new DummyService()), $resolver->resolve($request, $argument));
+        $this->assertYieldEquals([new DummyService()], $resolver->resolve($request, $argument));
     }
 
     public function testExistingControllerWithMethodNameStartUppercase()
     {
-        $resolver = new ServiceValueResolver(new ServiceLocator(array(
+        $resolver = new ServiceValueResolver(new ServiceLocator([
             'App\\Controller\\Mine::method' => function () {
-                return new ServiceLocator(array(
+                return new ServiceLocator([
                     'dummy' => function () {
                         return new DummyService();
                     },
-                ));
+                ]);
             },
-        )));
-        $request = $this->requestWithAttributes(array('_controller' => 'App\\Controller\\Mine::Method'));
+        ]));
+        $request = $this->requestWithAttributes(['_controller' => 'App\\Controller\\Mine::Method']);
         $argument = new ArgumentMetadata('dummy', DummyService::class, false, false, null);
 
         $this->assertTrue($resolver->supports($request, $argument));
-        $this->assertYieldEquals(array(new DummyService()), $resolver->resolve($request, $argument));
+        $this->assertYieldEquals([new DummyService()], $resolver->resolve($request, $argument));
     }
 
     public function testControllerNameIsAnArray()
     {
-        $resolver = new ServiceValueResolver(new ServiceLocator(array(
+        $resolver = new ServiceValueResolver(new ServiceLocator([
             'App\\Controller\\Mine::method' => function () {
-                return new ServiceLocator(array(
+                return new ServiceLocator([
                     'dummy' => function () {
                         return new DummyService();
                     },
-                ));
+                ]);
             },
-        )));
+        ]));
 
-        $request = $this->requestWithAttributes(array('_controller' => array('App\\Controller\\Mine', 'method')));
+        $request = $this->requestWithAttributes(['_controller' => ['App\\Controller\\Mine', 'method']]);
         $argument = new ArgumentMetadata('dummy', DummyService::class, false, false, null);
 
         $this->assertTrue($resolver->supports($request, $argument));
-        $this->assertYieldEquals(array(new DummyService()), $resolver->resolve($request, $argument));
+        $this->assertYieldEquals([new DummyService()], $resolver->resolve($request, $argument));
     }
 
     private function requestWithAttributes(array $attributes)
@@ -116,7 +116,7 @@ private function requestWithAttributes(array $attributes)
 
     private function assertYieldEquals(array $expected, \Generator $generator)
     {
-        $args = array();
+        $args = [];
         foreach ($generator as $arg) {
             $args[] = $arg;
         }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
index 729b90b2f63c5..8c900fb92c228 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
@@ -40,33 +40,33 @@ public static function setUpBeforeClass()
     public function testDefaultState()
     {
         $this->assertEquals(self::$resolver, new ArgumentResolver());
-        $this->assertNotEquals(self::$resolver, new ArgumentResolver(null, array(new RequestAttributeValueResolver())));
+        $this->assertNotEquals(self::$resolver, new ArgumentResolver(null, [new RequestAttributeValueResolver()]));
     }
 
     public function testGetArguments()
     {
         $request = Request::create('/');
         $request->attributes->set('foo', 'foo');
-        $controller = array(new self(), 'controllerWithFoo');
+        $controller = [new self(), 'controllerWithFoo'];
 
-        $this->assertEquals(array('foo'), self::$resolver->getArguments($request, $controller), '->getArguments() returns an array of arguments for the controller method');
+        $this->assertEquals(['foo'], self::$resolver->getArguments($request, $controller), '->getArguments() returns an array of arguments for the controller method');
     }
 
     public function testGetArgumentsReturnsEmptyArrayWhenNoArguments()
     {
         $request = Request::create('/');
-        $controller = array(new self(), 'controllerWithoutArguments');
+        $controller = [new self(), 'controllerWithoutArguments'];
 
-        $this->assertEquals(array(), self::$resolver->getArguments($request, $controller), '->getArguments() returns an empty array if the method takes no arguments');
+        $this->assertEquals([], self::$resolver->getArguments($request, $controller), '->getArguments() returns an empty array if the method takes no arguments');
     }
 
     public function testGetArgumentsUsesDefaultValue()
     {
         $request = Request::create('/');
         $request->attributes->set('foo', 'foo');
-        $controller = array(new self(), 'controllerWithFooAndDefaultBar');
+        $controller = [new self(), 'controllerWithFooAndDefaultBar'];
 
-        $this->assertEquals(array('foo', null), self::$resolver->getArguments($request, $controller), '->getArguments() uses default values if present');
+        $this->assertEquals(['foo', null], self::$resolver->getArguments($request, $controller), '->getArguments() uses default values if present');
     }
 
     public function testGetArgumentsOverrideDefaultValueByRequestAttribute()
@@ -74,9 +74,9 @@ public function testGetArgumentsOverrideDefaultValueByRequestAttribute()
         $request = Request::create('/');
         $request->attributes->set('foo', 'foo');
         $request->attributes->set('bar', 'bar');
-        $controller = array(new self(), 'controllerWithFooAndDefaultBar');
+        $controller = [new self(), 'controllerWithFooAndDefaultBar'];
 
-        $this->assertEquals(array('foo', 'bar'), self::$resolver->getArguments($request, $controller), '->getArguments() overrides default values if provided in the request attributes');
+        $this->assertEquals(['foo', 'bar'], self::$resolver->getArguments($request, $controller), '->getArguments() overrides default values if provided in the request attributes');
     }
 
     public function testGetArgumentsFromClosure()
@@ -85,7 +85,7 @@ public function testGetArgumentsFromClosure()
         $request->attributes->set('foo', 'foo');
         $controller = function ($foo) {};
 
-        $this->assertEquals(array('foo'), self::$resolver->getArguments($request, $controller));
+        $this->assertEquals(['foo'], self::$resolver->getArguments($request, $controller));
     }
 
     public function testGetArgumentsUsesDefaultValueFromClosure()
@@ -94,7 +94,7 @@ public function testGetArgumentsUsesDefaultValueFromClosure()
         $request->attributes->set('foo', 'foo');
         $controller = function ($foo, $bar = 'bar') {};
 
-        $this->assertEquals(array('foo', 'bar'), self::$resolver->getArguments($request, $controller));
+        $this->assertEquals(['foo', 'bar'], self::$resolver->getArguments($request, $controller));
     }
 
     public function testGetArgumentsFromInvokableObject()
@@ -103,12 +103,12 @@ public function testGetArgumentsFromInvokableObject()
         $request->attributes->set('foo', 'foo');
         $controller = new self();
 
-        $this->assertEquals(array('foo', null), self::$resolver->getArguments($request, $controller));
+        $this->assertEquals(['foo', null], self::$resolver->getArguments($request, $controller));
 
         // Test default bar overridden by request attribute
         $request->attributes->set('bar', 'bar');
 
-        $this->assertEquals(array('foo', 'bar'), self::$resolver->getArguments($request, $controller));
+        $this->assertEquals(['foo', 'bar'], self::$resolver->getArguments($request, $controller));
     }
 
     public function testGetArgumentsFromFunctionName()
@@ -118,7 +118,7 @@ public function testGetArgumentsFromFunctionName()
         $request->attributes->set('foobar', 'foobar');
         $controller = __NAMESPACE__.'\controller_function';
 
-        $this->assertEquals(array('foo', 'foobar'), self::$resolver->getArguments($request, $controller));
+        $this->assertEquals(['foo', 'foobar'], self::$resolver->getArguments($request, $controller));
     }
 
     public function testGetArgumentsFailsOnUnresolvedValue()
@@ -126,7 +126,7 @@ public function testGetArgumentsFailsOnUnresolvedValue()
         $request = Request::create('/');
         $request->attributes->set('foo', 'foo');
         $request->attributes->set('foobar', 'foobar');
-        $controller = array(new self(), 'controllerWithFooBarFoobar');
+        $controller = [new self(), 'controllerWithFooBarFoobar'];
 
         try {
             self::$resolver->getArguments($request, $controller);
@@ -139,17 +139,17 @@ public function testGetArgumentsFailsOnUnresolvedValue()
     public function testGetArgumentsInjectsRequest()
     {
         $request = Request::create('/');
-        $controller = array(new self(), 'controllerWithRequest');
+        $controller = [new self(), 'controllerWithRequest'];
 
-        $this->assertEquals(array($request), self::$resolver->getArguments($request, $controller), '->getArguments() injects the request');
+        $this->assertEquals([$request], self::$resolver->getArguments($request, $controller), '->getArguments() injects the request');
     }
 
     public function testGetArgumentsInjectsExtendingRequest()
     {
         $request = ExtendingRequest::create('/');
-        $controller = array(new self(), 'controllerWithExtendingRequest');
+        $controller = [new self(), 'controllerWithExtendingRequest'];
 
-        $this->assertEquals(array($request), self::$resolver->getArguments($request, $controller), '->getArguments() injects the request when extended');
+        $this->assertEquals([$request], self::$resolver->getArguments($request, $controller), '->getArguments() injects the request when extended');
     }
 
     /**
@@ -159,10 +159,10 @@ public function testGetVariadicArguments()
     {
         $request = Request::create('/');
         $request->attributes->set('foo', 'foo');
-        $request->attributes->set('bar', array('foo', 'bar'));
-        $controller = array(new VariadicController(), 'action');
+        $request->attributes->set('bar', ['foo', 'bar']);
+        $controller = [new VariadicController(), 'action'];
 
-        $this->assertEquals(array('foo', 'foo', 'bar'), self::$resolver->getArguments($request, $controller));
+        $this->assertEquals(['foo', 'foo', 'bar'], self::$resolver->getArguments($request, $controller));
     }
 
     /**
@@ -174,7 +174,7 @@ public function testGetVariadicArgumentsWithoutArrayInRequest()
         $request = Request::create('/');
         $request->attributes->set('foo', 'foo');
         $request->attributes->set('bar', 'foo');
-        $controller = array(new VariadicController(), 'action');
+        $controller = [new VariadicController(), 'action'];
 
         self::$resolver->getArguments($request, $controller);
     }
@@ -187,7 +187,7 @@ public function testGetArgumentWithoutArray()
     {
         $factory = new ArgumentMetadataFactory();
         $valueResolver = $this->getMockBuilder(ArgumentValueResolverInterface::class)->getMock();
-        $resolver = new ArgumentResolver($factory, array($valueResolver));
+        $resolver = new ArgumentResolver($factory, [$valueResolver]);
 
         $valueResolver->expects($this->any())->method('supports')->willReturn(true);
         $valueResolver->expects($this->any())->method('resolve')->willReturn('foo');
@@ -195,7 +195,7 @@ public function testGetArgumentWithoutArray()
         $request = Request::create('/');
         $request->attributes->set('foo', 'foo');
         $request->attributes->set('bar', 'foo');
-        $controller = array($this, 'controllerWithFooAndDefaultBar');
+        $controller = [$this, 'controllerWithFooAndDefaultBar'];
         $resolver->getArguments($request, $controller);
     }
 
@@ -205,7 +205,7 @@ public function testGetArgumentWithoutArray()
     public function testIfExceptionIsThrownWhenMissingAnArgument()
     {
         $request = Request::create('/');
-        $controller = array($this, 'controllerWithFoo');
+        $controller = [$this, 'controllerWithFoo'];
 
         self::$resolver->getArguments($request, $controller);
     }
@@ -219,9 +219,9 @@ public function testGetNullableArguments()
         $request->attributes->set('foo', 'foo');
         $request->attributes->set('bar', new \stdClass());
         $request->attributes->set('mandatory', 'mandatory');
-        $controller = array(new NullableController(), 'action');
+        $controller = [new NullableController(), 'action'];
 
-        $this->assertEquals(array('foo', new \stdClass(), 'value', 'mandatory'), self::$resolver->getArguments($request, $controller));
+        $this->assertEquals(['foo', new \stdClass(), 'value', 'mandatory'], self::$resolver->getArguments($request, $controller));
     }
 
     /**
@@ -231,9 +231,9 @@ public function testGetNullableArgumentsWithDefaults()
     {
         $request = Request::create('/');
         $request->attributes->set('mandatory', 'mandatory');
-        $controller = array(new NullableController(), 'action');
+        $controller = [new NullableController(), 'action'];
 
-        $this->assertEquals(array(null, null, 'value', 'mandatory'), self::$resolver->getArguments($request, $controller));
+        $this->assertEquals([null, null, 'value', 'mandatory'], self::$resolver->getArguments($request, $controller));
     }
 
     public function testGetSessionArguments()
@@ -241,9 +241,9 @@ public function testGetSessionArguments()
         $session = new Session(new MockArraySessionStorage());
         $request = Request::create('/');
         $request->setSession($session);
-        $controller = array($this, 'controllerWithSession');
+        $controller = [$this, 'controllerWithSession'];
 
-        $this->assertEquals(array($session), self::$resolver->getArguments($request, $controller));
+        $this->assertEquals([$session], self::$resolver->getArguments($request, $controller));
     }
 
     public function testGetSessionArgumentsWithExtendedSession()
@@ -251,9 +251,9 @@ public function testGetSessionArgumentsWithExtendedSession()
         $session = new ExtendingSession(new MockArraySessionStorage());
         $request = Request::create('/');
         $request->setSession($session);
-        $controller = array($this, 'controllerWithExtendingSession');
+        $controller = [$this, 'controllerWithExtendingSession'];
 
-        $this->assertEquals(array($session), self::$resolver->getArguments($request, $controller));
+        $this->assertEquals([$session], self::$resolver->getArguments($request, $controller));
     }
 
     public function testGetSessionArgumentsWithInterface()
@@ -261,9 +261,9 @@ public function testGetSessionArgumentsWithInterface()
         $session = $this->getMockBuilder(SessionInterface::class)->getMock();
         $request = Request::create('/');
         $request->setSession($session);
-        $controller = array($this, 'controllerWithSessionInterface');
+        $controller = [$this, 'controllerWithSessionInterface'];
 
-        $this->assertEquals(array($session), self::$resolver->getArguments($request, $controller));
+        $this->assertEquals([$session], self::$resolver->getArguments($request, $controller));
     }
 
     /**
@@ -274,7 +274,7 @@ public function testGetSessionMissMatchWithInterface()
         $session = $this->getMockBuilder(SessionInterface::class)->getMock();
         $request = Request::create('/');
         $request->setSession($session);
-        $controller = array($this, 'controllerWithExtendingSession');
+        $controller = [$this, 'controllerWithExtendingSession'];
 
         self::$resolver->getArguments($request, $controller);
     }
@@ -287,7 +287,7 @@ public function testGetSessionMissMatchWithImplementation()
         $session = new Session(new MockArraySessionStorage());
         $request = Request::create('/');
         $request->setSession($session);
-        $controller = array($this, 'controllerWithExtendingSession');
+        $controller = [$this, 'controllerWithExtendingSession'];
 
         self::$resolver->getArguments($request, $controller);
     }
@@ -298,7 +298,7 @@ public function testGetSessionMissMatchWithImplementation()
     public function testGetSessionMissMatchOnNull()
     {
         $request = Request::create('/');
-        $controller = array($this, 'controllerWithExtendingSession');
+        $controller = [$this, 'controllerWithExtendingSession'];
 
         self::$resolver->getArguments($request, $controller);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php
index 82407f5601a18..b98a217decc2c 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php
@@ -195,7 +195,7 @@ public function testExceptionWhenUsingRemovedControllerService()
         $container->expects($this->atLeastOnce())
             ->method('getRemovedIds')
             ->with()
-            ->will($this->returnValue(array('app.my_controller' => true)))
+            ->will($this->returnValue(['app.my_controller' => true]))
         ;
 
         $resolver = $this->createControllerResolver(null, $container);
diff --git a/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php b/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
index bf0db5ad56512..1c0c4648a0f2a 100644
--- a/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
@@ -33,55 +33,55 @@ protected function setUp()
 
     public function testSignature1()
     {
-        $arguments = $this->factory->createArgumentMetadata(array($this, 'signature1'));
+        $arguments = $this->factory->createArgumentMetadata([$this, 'signature1']);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ArgumentMetadata('foo', self::class, false, false, null),
             new ArgumentMetadata('bar', 'array', false, false, null),
             new ArgumentMetadata('baz', 'callable', false, false, null),
-        ), $arguments);
+        ], $arguments);
     }
 
     public function testSignature2()
     {
-        $arguments = $this->factory->createArgumentMetadata(array($this, 'signature2'));
+        $arguments = $this->factory->createArgumentMetadata([$this, 'signature2']);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ArgumentMetadata('foo', self::class, false, true, null, true),
             new ArgumentMetadata('bar', __NAMESPACE__.'\FakeClassThatDoesNotExist', false, true, null, true),
             new ArgumentMetadata('baz', 'Fake\ImportedAndFake', false, true, null, true),
-        ), $arguments);
+        ], $arguments);
     }
 
     public function testSignature3()
     {
-        $arguments = $this->factory->createArgumentMetadata(array($this, 'signature3'));
+        $arguments = $this->factory->createArgumentMetadata([$this, 'signature3']);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ArgumentMetadata('bar', __NAMESPACE__.'\FakeClassThatDoesNotExist', false, false, null),
             new ArgumentMetadata('baz', 'Fake\ImportedAndFake', false, false, null),
-        ), $arguments);
+        ], $arguments);
     }
 
     public function testSignature4()
     {
-        $arguments = $this->factory->createArgumentMetadata(array($this, 'signature4'));
+        $arguments = $this->factory->createArgumentMetadata([$this, 'signature4']);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ArgumentMetadata('foo', null, false, true, 'default'),
             new ArgumentMetadata('bar', null, false, true, 500),
-            new ArgumentMetadata('baz', null, false, true, array()),
-        ), $arguments);
+            new ArgumentMetadata('baz', null, false, true, []),
+        ], $arguments);
     }
 
     public function testSignature5()
     {
-        $arguments = $this->factory->createArgumentMetadata(array($this, 'signature5'));
+        $arguments = $this->factory->createArgumentMetadata([$this, 'signature5']);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ArgumentMetadata('foo', 'array', false, true, null, true),
             new ArgumentMetadata('bar', null, false, false, null),
-        ), $arguments);
+        ], $arguments);
     }
 
     /**
@@ -89,12 +89,12 @@ public function testSignature5()
      */
     public function testVariadicSignature()
     {
-        $arguments = $this->factory->createArgumentMetadata(array(new VariadicController(), 'action'));
+        $arguments = $this->factory->createArgumentMetadata([new VariadicController(), 'action']);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ArgumentMetadata('foo', null, false, false, null),
             new ArgumentMetadata('bar', null, true, false, null),
-        ), $arguments);
+        ], $arguments);
     }
 
     /**
@@ -102,13 +102,13 @@ public function testVariadicSignature()
      */
     public function testBasicTypesSignature()
     {
-        $arguments = $this->factory->createArgumentMetadata(array(new BasicTypesController(), 'action'));
+        $arguments = $this->factory->createArgumentMetadata([new BasicTypesController(), 'action']);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ArgumentMetadata('foo', 'string', false, false, null),
             new ArgumentMetadata('bar', 'int', false, false, null),
             new ArgumentMetadata('baz', 'float', false, false, null),
-        ), $arguments);
+        ], $arguments);
     }
 
     /**
@@ -116,14 +116,14 @@ public function testBasicTypesSignature()
      */
     public function testNullableTypesSignature()
     {
-        $arguments = $this->factory->createArgumentMetadata(array(new NullableController(), 'action'));
+        $arguments = $this->factory->createArgumentMetadata([new NullableController(), 'action']);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new ArgumentMetadata('foo', 'string', false, false, null, true),
             new ArgumentMetadata('bar', \stdClass::class, false, false, null, true),
             new ArgumentMetadata('baz', 'string', false, true, 'value', true),
             new ArgumentMetadata('mandatory', null, false, false, null, true),
-        ), $arguments);
+        ], $arguments);
     }
 
     private function signature1(self $foo, array $bar, callable $baz)
@@ -138,7 +138,7 @@ private function signature3(FakeClassThatDoesNotExist $bar, ImportedAndFake $baz
     {
     }
 
-    private function signature4($foo = 'default', $bar = 500, $baz = array())
+    private function signature4($foo = 'default', $bar = 500, $baz = [])
     {
     }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php
index 3f51b13ce9e4b..a858eabe155f2 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php
@@ -57,7 +57,7 @@ public function registerBundles()
 
     public function getBundles()
     {
-        return array();
+        return [];
     }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/DataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/DataCollectorTest.php
index 54fd39e0d8c8f..ae79a3c93c504 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/DataCollectorTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/DataCollectorTest.php
@@ -30,7 +30,7 @@ public function testCloneVarStringWithScheme()
 
     public function testCloneVarExistingFilePath()
     {
-        $c = new CloneVarDataCollector(array($filePath = tempnam(sys_get_temp_dir(), 'clone_var_data_collector_')));
+        $c = new CloneVarDataCollector([$filePath = tempnam(sys_get_temp_dir(), 'clone_var_data_collector_')]);
         $c->collect(new Request(), new Response());
 
         $this->assertSame($filePath, $c->getData()[0]);
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php
index fd5ea11e720b5..169f4384a8e90 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php
@@ -25,7 +25,7 @@ class DumpDataCollectorTest extends TestCase
 {
     public function testDump()
     {
-        $data = new Data(array(array(123)));
+        $data = new Data([[123]]);
 
         $collector = new DumpDataCollector();
 
@@ -40,15 +40,15 @@ public function testDump()
         $dump[0]['data'] = preg_replace('/^.*?<pre/', '<pre', $dump[0]['data']);
         $dump[0]['data'] = preg_replace('/sf-dump-\d+/', 'sf-dump', $dump[0]['data']);
 
-        $xDump = array(
-            array(
+        $xDump = [
+            [
                 'data' => "<pre class=sf-dump id=sf-dump data-indent-pad=\"  \"><span class=sf-dump-num>123</span>\n</pre><script>Sfdump(\"sf-dump\")</script>\n",
                 'name' => 'DumpDataCollectorTest.php',
                 'file' => __FILE__,
                 'line' => $line,
                 'fileExcerpt' => false,
-            ),
-        );
+            ],
+        ];
         $this->assertEquals($xDump, $dump);
 
         $this->assertStringMatchesFormat('a:3:{i:0;a:5:{s:4:"data";%c:39:"Symfony\Component\VarDumper\Cloner\Data":%a', $collector->serialize());
@@ -58,7 +58,7 @@ public function testDump()
 
     public function testCollectDefault()
     {
-        $data = new Data(array(array(123)));
+        $data = new Data([[123]]);
 
         $collector = new DumpDataCollector();
 
@@ -76,7 +76,7 @@ public function testCollectDefault()
 
     public function testCollectHtml()
     {
-        $data = new Data(array(array(123)));
+        $data = new Data([[123]]);
 
         $collector = new DumpDataCollector(null, 'test://%f:%l');
 
@@ -104,7 +104,7 @@ public function testCollectHtml()
 
     public function testFlush()
     {
-        $data = new Data(array(array(456)));
+        $data = new Data([[456]]);
         $collector = new DumpDataCollector();
         $collector->dump($data);
         $line = __LINE__ - 1;
@@ -117,7 +117,7 @@ public function testFlush()
 
     public function testFlushNothingWhenDataDumperIsProvided()
     {
-        $data = new Data(array(array(456)));
+        $data = new Data([[456]]);
         $dumper = new CliDumper('php://output');
         $collector = new DumpDataCollector(null, null, null, null, $dumper);
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
index 3dec3bd7f87a0..90151ae44afdf 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
@@ -21,24 +21,24 @@ public function testCollectWithUnexpectedFormat()
     {
         $logger = $this
             ->getMockBuilder('Symfony\Component\HttpKernel\Log\DebugLoggerInterface')
-            ->setMethods(array('countErrors', 'getLogs', 'clear'))
+            ->setMethods(['countErrors', 'getLogs', 'clear'])
             ->getMock();
         $logger->expects($this->once())->method('countErrors')->will($this->returnValue('foo'));
-        $logger->expects($this->exactly(2))->method('getLogs')->will($this->returnValue(array()));
+        $logger->expects($this->exactly(2))->method('getLogs')->will($this->returnValue([]));
 
         $c = new LoggerDataCollector($logger, __DIR__.'/');
         $c->lateCollect();
         $compilerLogs = $c->getCompilerLogs()->getValue('message');
 
-        $this->assertSame(array(
-            array('message' => 'Removed service "Psr\Container\ContainerInterface"; reason: private alias.'),
-            array('message' => 'Removed service "Symfony\Component\DependencyInjection\ContainerInterface"; reason: private alias.'),
-        ), $compilerLogs['Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass']);
+        $this->assertSame([
+            ['message' => 'Removed service "Psr\Container\ContainerInterface"; reason: private alias.'],
+            ['message' => 'Removed service "Symfony\Component\DependencyInjection\ContainerInterface"; reason: private alias.'],
+        ], $compilerLogs['Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass']);
 
-        $this->assertSame(array(
-            array('message' => 'Some custom logging message'),
-            array('message' => 'With ending :'),
-        ), $compilerLogs['Unknown Compiler Pass']);
+        $this->assertSame([
+            ['message' => 'Some custom logging message'],
+            ['message' => 'With ending :'],
+        ], $compilerLogs['Unknown Compiler Pass']);
     }
 
     /**
@@ -48,7 +48,7 @@ public function testCollect($nb, $logs, $expectedLogs, $expectedDeprecationCount
     {
         $logger = $this
             ->getMockBuilder('Symfony\Component\HttpKernel\Log\DebugLoggerInterface')
-            ->setMethods(array('countErrors', 'getLogs', 'clear'))
+            ->setMethods(['countErrors', 'getLogs', 'clear'])
             ->getMock();
         $logger->expects($this->once())->method('countErrors')->will($this->returnValue($nb));
         $logger->expects($this->exactly(2))->method('getLogs')->will($this->returnValue($logs));
@@ -62,7 +62,7 @@ public function testCollect($nb, $logs, $expectedLogs, $expectedDeprecationCount
         $logs = array_map(function ($v) {
             if (isset($v['context']['exception'])) {
                 $e = &$v['context']['exception'];
-                $e = isset($e["\0*\0message"]) ? array($e["\0*\0message"], $e["\0*\0severity"]) : array($e["\0Symfony\Component\Debug\Exception\SilencedErrorContext\0severity"]);
+                $e = isset($e["\0*\0message"]) ? [$e["\0*\0message"], $e["\0*\0severity"]] : [$e["\0Symfony\Component\Debug\Exception\SilencedErrorContext\0severity"]];
             }
 
             return $v;
@@ -80,7 +80,7 @@ public function testReset()
     {
         $logger = $this
             ->getMockBuilder('Symfony\Component\HttpKernel\Log\DebugLoggerInterface')
-            ->setMethods(array('countErrors', 'getLogs', 'clear'))
+            ->setMethods(['countErrors', 'getLogs', 'clear'])
             ->getMock();
         $logger->expects($this->once())->method('clear');
 
@@ -90,55 +90,55 @@ public function testReset()
 
     public function getCollectTestData()
     {
-        yield 'simple log' => array(
+        yield 'simple log' => [
             1,
-            array(array('message' => 'foo', 'context' => array(), 'priority' => 100, 'priorityName' => 'DEBUG')),
-            array(array('message' => 'foo', 'context' => array(), 'priority' => 100, 'priorityName' => 'DEBUG')),
+            [['message' => 'foo', 'context' => [], 'priority' => 100, 'priorityName' => 'DEBUG']],
+            [['message' => 'foo', 'context' => [], 'priority' => 100, 'priorityName' => 'DEBUG']],
             0,
             0,
-        );
+        ];
 
-        yield 'log with a context' => array(
+        yield 'log with a context' => [
             1,
-            array(array('message' => 'foo', 'context' => array('foo' => 'bar'), 'priority' => 100, 'priorityName' => 'DEBUG')),
-            array(array('message' => 'foo', 'context' => array('foo' => 'bar'), 'priority' => 100, 'priorityName' => 'DEBUG')),
+            [['message' => 'foo', 'context' => ['foo' => 'bar'], 'priority' => 100, 'priorityName' => 'DEBUG']],
+            [['message' => 'foo', 'context' => ['foo' => 'bar'], 'priority' => 100, 'priorityName' => 'DEBUG']],
             0,
             0,
-        );
+        ];
 
         if (!class_exists(SilencedErrorContext::class)) {
             return;
         }
 
-        yield 'logs with some deprecations' => array(
+        yield 'logs with some deprecations' => [
             1,
-            array(
-                array('message' => 'foo3', 'context' => array('exception' => new \ErrorException('warning', 0, E_USER_WARNING)), 'priority' => 100, 'priorityName' => 'DEBUG'),
-                array('message' => 'foo', 'context' => array('exception' => new \ErrorException('deprecated', 0, E_DEPRECATED)), 'priority' => 100, 'priorityName' => 'DEBUG'),
-                array('message' => 'foo2', 'context' => array('exception' => new \ErrorException('deprecated', 0, E_USER_DEPRECATED)), 'priority' => 100, 'priorityName' => 'DEBUG'),
-            ),
-            array(
-                array('message' => 'foo3', 'context' => array('exception' => array('warning', E_USER_WARNING)), 'priority' => 100, 'priorityName' => 'DEBUG'),
-                array('message' => 'foo', 'context' => array('exception' => array('deprecated', E_DEPRECATED)), 'priority' => 100, 'priorityName' => 'DEBUG', 'errorCount' => 1, 'scream' => false),
-                array('message' => 'foo2', 'context' => array('exception' => array('deprecated', E_USER_DEPRECATED)), 'priority' => 100, 'priorityName' => 'DEBUG', 'errorCount' => 1, 'scream' => false),
-            ),
+            [
+                ['message' => 'foo3', 'context' => ['exception' => new \ErrorException('warning', 0, E_USER_WARNING)], 'priority' => 100, 'priorityName' => 'DEBUG'],
+                ['message' => 'foo', 'context' => ['exception' => new \ErrorException('deprecated', 0, E_DEPRECATED)], 'priority' => 100, 'priorityName' => 'DEBUG'],
+                ['message' => 'foo2', 'context' => ['exception' => new \ErrorException('deprecated', 0, E_USER_DEPRECATED)], 'priority' => 100, 'priorityName' => 'DEBUG'],
+            ],
+            [
+                ['message' => 'foo3', 'context' => ['exception' => ['warning', E_USER_WARNING]], 'priority' => 100, 'priorityName' => 'DEBUG'],
+                ['message' => 'foo', 'context' => ['exception' => ['deprecated', E_DEPRECATED]], 'priority' => 100, 'priorityName' => 'DEBUG', 'errorCount' => 1, 'scream' => false],
+                ['message' => 'foo2', 'context' => ['exception' => ['deprecated', E_USER_DEPRECATED]], 'priority' => 100, 'priorityName' => 'DEBUG', 'errorCount' => 1, 'scream' => false],
+            ],
             2,
             0,
-            array(100 => array('count' => 3, 'name' => 'DEBUG')),
-        );
+            [100 => ['count' => 3, 'name' => 'DEBUG']],
+        ];
 
-        yield 'logs with some silent errors' => array(
+        yield 'logs with some silent errors' => [
             1,
-            array(
-                array('message' => 'foo3', 'context' => array('exception' => new \ErrorException('warning', 0, E_USER_WARNING)), 'priority' => 100, 'priorityName' => 'DEBUG'),
-                array('message' => 'foo3', 'context' => array('exception' => new SilencedErrorContext(E_USER_WARNING, __FILE__, __LINE__)), 'priority' => 100, 'priorityName' => 'DEBUG'),
-            ),
-            array(
-                array('message' => 'foo3', 'context' => array('exception' => array('warning', E_USER_WARNING)), 'priority' => 100, 'priorityName' => 'DEBUG'),
-                array('message' => 'foo3', 'context' => array('exception' => array(E_USER_WARNING)), 'priority' => 100, 'priorityName' => 'DEBUG', 'errorCount' => 1, 'scream' => true),
-            ),
+            [
+                ['message' => 'foo3', 'context' => ['exception' => new \ErrorException('warning', 0, E_USER_WARNING)], 'priority' => 100, 'priorityName' => 'DEBUG'],
+                ['message' => 'foo3', 'context' => ['exception' => new SilencedErrorContext(E_USER_WARNING, __FILE__, __LINE__)], 'priority' => 100, 'priorityName' => 'DEBUG'],
+            ],
+            [
+                ['message' => 'foo3', 'context' => ['exception' => ['warning', E_USER_WARNING]], 'priority' => 100, 'priorityName' => 'DEBUG'],
+                ['message' => 'foo3', 'context' => ['exception' => [E_USER_WARNING]], 'priority' => 100, 'priorityName' => 'DEBUG', 'errorCount' => 1, 'scream' => true],
+            ],
             0,
             1,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/MemoryDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/MemoryDataCollectorTest.php
index 1435d05e83c3a..c434ed1e1162b 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/MemoryDataCollectorTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/MemoryDataCollectorTest.php
@@ -39,21 +39,21 @@ public function testBytesConversion($limit, $bytes)
 
     public function getBytesConversionTestData()
     {
-        return array(
-            array('2k', 2048),
-            array('2 k', 2048),
-            array('8m', 8 * 1024 * 1024),
-            array('+2 k', 2048),
-            array('+2???k', 2048),
-            array('0x10', 16),
-            array('0xf', 15),
-            array('010', 8),
-            array('+0x10 k', 16 * 1024),
-            array('1g', 1024 * 1024 * 1024),
-            array('1G', 1024 * 1024 * 1024),
-            array('-1', -1),
-            array('0', 0),
-            array('2mk', 2048), // the unit must be the last char, so in this case 'k', not 'm'
-        );
+        return [
+            ['2k', 2048],
+            ['2 k', 2048],
+            ['8m', 8 * 1024 * 1024],
+            ['+2 k', 2048],
+            ['+2???k', 2048],
+            ['0x10', 16],
+            ['0xf', 15],
+            ['010', 8],
+            ['+0x10 k', 16 * 1024],
+            ['1g', 1024 * 1024 * 1024],
+            ['1G', 1024 * 1024 * 1024],
+            ['-1', -1],
+            ['0', 0],
+            ['2mk', 2048], // the unit must be the last char, so in this case 'k', not 'm'
+        ];
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
index cce08e27c4cc5..5e97267da5423 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -48,8 +48,8 @@ public function testCollect()
         $this->assertInstanceOf(ParameterBag::class, $c->getResponseCookies());
         $this->assertSame('html', $c->getFormat());
         $this->assertEquals('foobar', $c->getRoute());
-        $this->assertEquals(array('name' => 'foo'), $c->getRouteParams());
-        $this->assertSame(array(), $c->getSessionAttributes());
+        $this->assertEquals(['name' => 'foo'], $c->getRouteParams());
+        $this->assertSame([], $c->getSessionAttributes());
         $this->assertSame('en', $c->getLocale());
         $this->assertContains(__FILE__, $attributes->get('resource'));
         $this->assertSame('stdClass', $attributes->get('object')->getType());
@@ -62,13 +62,13 @@ public function testCollect()
 
     public function testCollectWithoutRouteParams()
     {
-        $request = $this->createRequest(array());
+        $request = $this->createRequest([]);
 
         $c = new RequestDataCollector();
         $c->collect($request, $this->createResponse());
         $c->lateCollect();
 
-        $this->assertEquals(array(), $c->getRouteParams());
+        $this->assertEquals([], $c->getRouteParams());
     }
 
     /**
@@ -94,95 +94,95 @@ public function provideControllerCallables()
         $r3 = new \ReflectionClass($this);
 
         // test name, callable, expected
-        return array(
-            array(
+        return [
+            [
                 '"Regular" callable',
-                array($this, 'testControllerInspection'),
-                array(
+                [$this, 'testControllerInspection'],
+                [
                     'class' => __NAMESPACE__.'\RequestDataCollectorTest',
                     'method' => 'testControllerInspection',
                     'file' => __FILE__,
                     'line' => $r1->getStartLine(),
-                ),
-            ),
+                ],
+            ],
 
-            array(
+            [
                 'Closure',
                 function () { return 'foo'; },
-                array(
+                [
                     'class' => __NAMESPACE__.'\{closure}',
                     'method' => null,
                     'file' => __FILE__,
                     'line' => __LINE__ - 5,
-                ),
-            ),
+                ],
+            ],
 
-            array(
+            [
                 'Static callback as string',
                 __NAMESPACE__.'\RequestDataCollectorTest::staticControllerMethod',
-                array(
+                [
                     'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
                     'method' => 'staticControllerMethod',
                     'file' => __FILE__,
                     'line' => $r2->getStartLine(),
-                ),
-            ),
+                ],
+            ],
 
-            array(
+            [
                 'Static callable with instance',
-                array($this, 'staticControllerMethod'),
-                array(
+                [$this, 'staticControllerMethod'],
+                [
                     'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
                     'method' => 'staticControllerMethod',
                     'file' => __FILE__,
                     'line' => $r2->getStartLine(),
-                ),
-            ),
+                ],
+            ],
 
-            array(
+            [
                 'Static callable with class name',
-                array('Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest', 'staticControllerMethod'),
-                array(
+                ['Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest', 'staticControllerMethod'],
+                [
                     'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
                     'method' => 'staticControllerMethod',
                     'file' => __FILE__,
                     'line' => $r2->getStartLine(),
-                ),
-            ),
+                ],
+            ],
 
-            array(
+            [
                 'Callable with instance depending on __call()',
-                array($this, 'magicMethod'),
-                array(
+                [$this, 'magicMethod'],
+                [
                     'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
                     'method' => 'magicMethod',
                     'file' => 'n/a',
                     'line' => 'n/a',
-                ),
-            ),
+                ],
+            ],
 
-            array(
+            [
                 'Callable with class name depending on __callStatic()',
-                array('Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest', 'magicMethod'),
-                array(
+                ['Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest', 'magicMethod'],
+                [
                     'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
                     'method' => 'magicMethod',
                     'file' => 'n/a',
                     'line' => 'n/a',
-                ),
-            ),
+                ],
+            ],
 
-            array(
+            [
                 'Invokable controller',
                 $this,
-                array(
+                [
                     'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
                     'method' => null,
                     'file' => __FILE__,
                     'line' => $r3->getStartLine(),
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
     }
 
     public function testItIgnoresInvalidCallables()
@@ -199,9 +199,9 @@ public function testItIgnoresInvalidCallables()
     public function testItAddsRedirectedAttributesWhenRequestContainsSpecificCookie()
     {
         $request = $this->createRequest();
-        $request->cookies->add(array(
+        $request->cookies->add([
             'sf_redirect' => '{}',
-        ));
+        ]);
 
         $kernel = $this->getMockBuilder(HttpKernelInterface::class)->getMock();
 
@@ -233,9 +233,9 @@ public function testItCollectsTheRedirectionAndClearTheCookie()
 
         $request = $this->createRequest();
         $request->attributes->set('_redirected', true);
-        $request->cookies->add(array(
+        $request->cookies->add([
             'sf_redirect' => '{"method": "POST"}',
-        ));
+        ]);
 
         $c->collect($request, $response = $this->createResponse());
         $c->lateCollect();
@@ -246,7 +246,7 @@ public function testItCollectsTheRedirectionAndClearTheCookie()
         $this->assertNull($cookie->getValue());
     }
 
-    protected function createRequest($routeParams = array('name' => 'foo'))
+    protected function createRequest($routeParams = ['name' => 'foo'])
     {
         $request = Request::create('http://test.com/foo?bar=baz');
         $request->attributes->set('foo', 'bar');
diff --git a/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php b/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
index 3de147c7f79fb..8b8e91aeb474d 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
@@ -31,7 +31,7 @@ public function testStopwatchSections()
         $kernel->terminate($request, $response);
 
         $events = $stopwatch->getSectionEvents($response->headers->get('X-Debug-Token'));
-        $this->assertEquals(array(
+        $this->assertEquals([
             '__section__',
             'kernel.request',
             'kernel.controller',
@@ -39,13 +39,13 @@ public function testStopwatchSections()
             'controller',
             'kernel.response',
             'kernel.terminate',
-        ), array_keys($events));
+        ], array_keys($events));
     }
 
     public function testStopwatchCheckControllerOnRequestEvent()
     {
         $stopwatch = $this->getMockBuilder('Symfony\Component\Stopwatch\Stopwatch')
-            ->setMethods(array('isStarted'))
+            ->setMethods(['isStarted'])
             ->getMock();
         $stopwatch->expects($this->once())
             ->method('isStarted')
@@ -61,7 +61,7 @@ public function testStopwatchCheckControllerOnRequestEvent()
     public function testStopwatchStopControllerOnRequestEvent()
     {
         $stopwatch = $this->getMockBuilder('Symfony\Component\Stopwatch\Stopwatch')
-            ->setMethods(array('isStarted', 'stop', 'stopSection'))
+            ->setMethods(['isStarted', 'stop', 'stopSection'])
             ->getMock();
         $stopwatch->expects($this->once())
             ->method('isStarted')
@@ -114,7 +114,7 @@ protected function getHttpKernel($dispatcher, $controller)
         $controllerResolver = $this->getMockBuilder('Symfony\Component\HttpKernel\Controller\ControllerResolverInterface')->getMock();
         $controllerResolver->expects($this->once())->method('getController')->will($this->returnValue($controller));
         $argumentResolver = $this->getMockBuilder('Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface')->getMock();
-        $argumentResolver->expects($this->once())->method('getArguments')->will($this->returnValue(array()));
+        $argumentResolver->expects($this->once())->method('getArguments')->will($this->returnValue([]));
 
         return new HttpKernel($dispatcher, $controllerResolver, new RequestStack(), $argumentResolver);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/AddAnnotatedClassesToCachePassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/AddAnnotatedClassesToCachePassTest.php
index a2fb6afca4da0..914b1dd8d68e0 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/AddAnnotatedClassesToCachePassTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/AddAnnotatedClassesToCachePassTest.php
@@ -24,76 +24,76 @@ public function testExpandClasses()
         $r->setAccessible(true);
         $expand = $r->getClosure($pass);
 
-        $this->assertSame('Foo', $expand(array('Foo'), array())[0]);
-        $this->assertSame('Foo', $expand(array('\\Foo'), array())[0]);
-        $this->assertSame('Foo', $expand(array('Foo'), array('\\Foo'))[0]);
-        $this->assertSame('Foo', $expand(array('Foo'), array('Foo'))[0]);
-        $this->assertSame('Foo', $expand(array('\\Foo'), array('\\Foo\\Bar'))[0]);
-        $this->assertSame('Foo', $expand(array('Foo'), array('\\Foo\\Bar'))[0]);
-        $this->assertSame('Foo', $expand(array('\\Foo'), array('\\Foo\\Bar\\Acme'))[0]);
+        $this->assertSame('Foo', $expand(['Foo'], [])[0]);
+        $this->assertSame('Foo', $expand(['\\Foo'], [])[0]);
+        $this->assertSame('Foo', $expand(['Foo'], ['\\Foo'])[0]);
+        $this->assertSame('Foo', $expand(['Foo'], ['Foo'])[0]);
+        $this->assertSame('Foo', $expand(['\\Foo'], ['\\Foo\\Bar'])[0]);
+        $this->assertSame('Foo', $expand(['Foo'], ['\\Foo\\Bar'])[0]);
+        $this->assertSame('Foo', $expand(['\\Foo'], ['\\Foo\\Bar\\Acme'])[0]);
 
-        $this->assertSame('Foo\\Bar', $expand(array('Foo\\'), array('\\Foo\\Bar'))[0]);
-        $this->assertSame('Foo\\Bar\\Acme', $expand(array('Foo\\'), array('\\Foo\\Bar\\Acme'))[0]);
-        $this->assertEmpty($expand(array('Foo\\'), array('\\Foo')));
+        $this->assertSame('Foo\\Bar', $expand(['Foo\\'], ['\\Foo\\Bar'])[0]);
+        $this->assertSame('Foo\\Bar\\Acme', $expand(['Foo\\'], ['\\Foo\\Bar\\Acme'])[0]);
+        $this->assertEmpty($expand(['Foo\\'], ['\\Foo']));
 
-        $this->assertSame('Acme\\Foo\\Bar', $expand(array('**\\Foo\\'), array('\\Acme\\Foo\\Bar'))[0]);
-        $this->assertEmpty($expand(array('**\\Foo\\'), array('\\Foo\\Bar')));
-        $this->assertEmpty($expand(array('**\\Foo\\'), array('\\Acme\\Foo')));
-        $this->assertEmpty($expand(array('**\\Foo\\'), array('\\Foo')));
+        $this->assertSame('Acme\\Foo\\Bar', $expand(['**\\Foo\\'], ['\\Acme\\Foo\\Bar'])[0]);
+        $this->assertEmpty($expand(['**\\Foo\\'], ['\\Foo\\Bar']));
+        $this->assertEmpty($expand(['**\\Foo\\'], ['\\Acme\\Foo']));
+        $this->assertEmpty($expand(['**\\Foo\\'], ['\\Foo']));
 
-        $this->assertSame('Acme\\Foo', $expand(array('**\\Foo'), array('\\Acme\\Foo'))[0]);
-        $this->assertEmpty($expand(array('**\\Foo'), array('\\Acme\\Foo\\AcmeBundle')));
-        $this->assertEmpty($expand(array('**\\Foo'), array('\\Acme\\FooBar\\AcmeBundle')));
+        $this->assertSame('Acme\\Foo', $expand(['**\\Foo'], ['\\Acme\\Foo'])[0]);
+        $this->assertEmpty($expand(['**\\Foo'], ['\\Acme\\Foo\\AcmeBundle']));
+        $this->assertEmpty($expand(['**\\Foo'], ['\\Acme\\FooBar\\AcmeBundle']));
 
-        $this->assertSame('Foo\\Acme\\Bar', $expand(array('Foo\\*\\Bar'), array('\\Foo\\Acme\\Bar'))[0]);
-        $this->assertEmpty($expand(array('Foo\\*\\Bar'), array('\\Foo\\Acme\\Bundle\\Bar')));
+        $this->assertSame('Foo\\Acme\\Bar', $expand(['Foo\\*\\Bar'], ['\\Foo\\Acme\\Bar'])[0]);
+        $this->assertEmpty($expand(['Foo\\*\\Bar'], ['\\Foo\\Acme\\Bundle\\Bar']));
 
-        $this->assertSame('Foo\\Acme\\Bar', $expand(array('Foo\\**\\Bar'), array('\\Foo\\Acme\\Bar'))[0]);
-        $this->assertSame('Foo\\Acme\\Bundle\\Bar', $expand(array('Foo\\**\\Bar'), array('\\Foo\\Acme\\Bundle\\Bar'))[0]);
+        $this->assertSame('Foo\\Acme\\Bar', $expand(['Foo\\**\\Bar'], ['\\Foo\\Acme\\Bar'])[0]);
+        $this->assertSame('Foo\\Acme\\Bundle\\Bar', $expand(['Foo\\**\\Bar'], ['\\Foo\\Acme\\Bundle\\Bar'])[0]);
 
-        $this->assertSame('Acme\\Bar', $expand(array('*\\Bar'), array('\\Acme\\Bar'))[0]);
-        $this->assertEmpty($expand(array('*\\Bar'), array('\\Bar')));
-        $this->assertEmpty($expand(array('*\\Bar'), array('\\Foo\\Acme\\Bar')));
+        $this->assertSame('Acme\\Bar', $expand(['*\\Bar'], ['\\Acme\\Bar'])[0]);
+        $this->assertEmpty($expand(['*\\Bar'], ['\\Bar']));
+        $this->assertEmpty($expand(['*\\Bar'], ['\\Foo\\Acme\\Bar']));
 
-        $this->assertSame('Foo\\Acme\\Bar', $expand(array('**\\Bar'), array('\\Foo\\Acme\\Bar'))[0]);
-        $this->assertSame('Foo\\Acme\\Bundle\\Bar', $expand(array('**\\Bar'), array('\\Foo\\Acme\\Bundle\\Bar'))[0]);
-        $this->assertEmpty($expand(array('**\\Bar'), array('\\Bar')));
+        $this->assertSame('Foo\\Acme\\Bar', $expand(['**\\Bar'], ['\\Foo\\Acme\\Bar'])[0]);
+        $this->assertSame('Foo\\Acme\\Bundle\\Bar', $expand(['**\\Bar'], ['\\Foo\\Acme\\Bundle\\Bar'])[0]);
+        $this->assertEmpty($expand(['**\\Bar'], ['\\Bar']));
 
-        $this->assertSame('Foo\\Bar', $expand(array('Foo\\*'), array('\\Foo\\Bar'))[0]);
-        $this->assertEmpty($expand(array('Foo\\*'), array('\\Foo\\Acme\\Bar')));
+        $this->assertSame('Foo\\Bar', $expand(['Foo\\*'], ['\\Foo\\Bar'])[0]);
+        $this->assertEmpty($expand(['Foo\\*'], ['\\Foo\\Acme\\Bar']));
 
-        $this->assertSame('Foo\\Bar', $expand(array('Foo\\**'), array('\\Foo\\Bar'))[0]);
-        $this->assertSame('Foo\\Acme\\Bar', $expand(array('Foo\\**'), array('\\Foo\\Acme\\Bar'))[0]);
+        $this->assertSame('Foo\\Bar', $expand(['Foo\\**'], ['\\Foo\\Bar'])[0]);
+        $this->assertSame('Foo\\Acme\\Bar', $expand(['Foo\\**'], ['\\Foo\\Acme\\Bar'])[0]);
 
-        $this->assertSame(array('Foo\\Bar'), $expand(array('Foo\\*'), array('Foo\\Bar', 'Foo\\BarTest')));
-        $this->assertSame(array('Foo\\Bar', 'Foo\\BarTest'), $expand(array('Foo\\*', 'Foo\\*Test'), array('Foo\\Bar', 'Foo\\BarTest')));
+        $this->assertSame(['Foo\\Bar'], $expand(['Foo\\*'], ['Foo\\Bar', 'Foo\\BarTest']));
+        $this->assertSame(['Foo\\Bar', 'Foo\\BarTest'], $expand(['Foo\\*', 'Foo\\*Test'], ['Foo\\Bar', 'Foo\\BarTest']));
 
         $this->assertSame(
             'Acme\\FooBundle\\Controller\\DefaultController',
-            $expand(array('**Bundle\\Controller\\'), array('\\Acme\\FooBundle\\Controller\\DefaultController'))[0]
+            $expand(['**Bundle\\Controller\\'], ['\\Acme\\FooBundle\\Controller\\DefaultController'])[0]
         );
 
         $this->assertSame(
             'FooBundle\\Controller\\DefaultController',
-            $expand(array('**Bundle\\Controller\\'), array('\\FooBundle\\Controller\\DefaultController'))[0]
+            $expand(['**Bundle\\Controller\\'], ['\\FooBundle\\Controller\\DefaultController'])[0]
         );
 
         $this->assertSame(
             'Acme\\FooBundle\\Controller\\Bar\\DefaultController',
-            $expand(array('**Bundle\\Controller\\'), array('\\Acme\\FooBundle\\Controller\\Bar\\DefaultController'))[0]
+            $expand(['**Bundle\\Controller\\'], ['\\Acme\\FooBundle\\Controller\\Bar\\DefaultController'])[0]
         );
 
         $this->assertSame(
             'Bundle\\Controller\\Bar\\DefaultController',
-            $expand(array('**Bundle\\Controller\\'), array('\\Bundle\\Controller\\Bar\\DefaultController'))[0]
+            $expand(['**Bundle\\Controller\\'], ['\\Bundle\\Controller\\Bar\\DefaultController'])[0]
         );
 
         $this->assertSame(
             'Acme\\Bundle\\Controller\\Bar\\DefaultController',
-            $expand(array('**Bundle\\Controller\\'), array('\\Acme\\Bundle\\Controller\\Bar\\DefaultController'))[0]
+            $expand(['**Bundle\\Controller\\'], ['\\Acme\\Bundle\\Controller\\Bar\\DefaultController'])[0]
         );
 
-        $this->assertSame('Foo\\Bar', $expand(array('Foo\\Bar'), array())[0]);
-        $this->assertSame('Foo\\Acme\\Bar', $expand(array('Foo\\**'), array('\\Foo\\Acme\\Bar'))[0]);
+        $this->assertSame('Foo\\Bar', $expand(['Foo\\Bar'], [])[0]);
+        $this->assertSame('Foo\\Acme\\Bar', $expand(['Foo\\**'], ['\\Foo\\Acme\\Bar'])[0]);
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ControllerArgumentValueResolverPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ControllerArgumentValueResolverPassTest.php
index df8977de0b4ff..cf8eb1fc0bfd5 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ControllerArgumentValueResolverPassTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ControllerArgumentValueResolverPassTest.php
@@ -22,19 +22,19 @@ class ControllerArgumentValueResolverPassTest extends TestCase
 {
     public function testServicesAreOrderedAccordingToPriority()
     {
-        $services = array(
-            'n3' => array(array()),
-            'n1' => array(array('priority' => 200)),
-            'n2' => array(array('priority' => 100)),
-        );
+        $services = [
+            'n3' => [[]],
+            'n1' => [['priority' => 200]],
+            'n2' => [['priority' => 100]],
+        ];
 
-        $expected = array(
+        $expected = [
             new Reference('n1'),
             new Reference('n2'),
             new Reference('n3'),
-        );
+        ];
 
-        $definition = new Definition(ArgumentResolver::class, array(null, array()));
+        $definition = new Definition(ArgumentResolver::class, [null, []]);
         $container = new ContainerBuilder();
         $container->setDefinition('argument_resolver', $definition);
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php
index e8957bb3ccfac..087c66659633c 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php
@@ -33,12 +33,12 @@ public function testContentRendererWithoutInterface()
         $builder = new ContainerBuilder();
         $fragmentHandlerDefinition = $builder->register('fragment.handler');
         $builder->register('my_content_renderer', 'Symfony\Component\DependencyInjection\Definition')
-            ->addTag('kernel.fragment_renderer', array('alias' => 'foo'));
+            ->addTag('kernel.fragment_renderer', ['alias' => 'foo']);
 
         $pass = new FragmentRendererPass();
         $pass->process($builder);
 
-        $this->assertEquals(array(array('addRendererService', array('foo', 'my_content_renderer'))), $fragmentHandlerDefinition->getMethodCalls());
+        $this->assertEquals([['addRendererService', ['foo', 'my_content_renderer']]], $fragmentHandlerDefinition->getMethodCalls());
     }
 
     public function testValidContentRenderer()
@@ -47,20 +47,20 @@ public function testValidContentRenderer()
         $fragmentHandlerDefinition = $builder->register('fragment.handler')
             ->addArgument(null);
         $builder->register('my_content_renderer', 'Symfony\Component\HttpKernel\Tests\DependencyInjection\RendererService')
-            ->addTag('kernel.fragment_renderer', array('alias' => 'foo'));
+            ->addTag('kernel.fragment_renderer', ['alias' => 'foo']);
 
         $pass = new FragmentRendererPass();
         $pass->process($builder);
 
         $serviceLocatorDefinition = $builder->getDefinition((string) $fragmentHandlerDefinition->getArgument(0));
         $this->assertSame(ServiceLocator::class, $serviceLocatorDefinition->getClass());
-        $this->assertEquals(array('foo' => new ServiceClosureArgument(new Reference('my_content_renderer'))), $serviceLocatorDefinition->getArgument(0));
+        $this->assertEquals(['foo' => new ServiceClosureArgument(new Reference('my_content_renderer'))], $serviceLocatorDefinition->getArgument(0));
     }
 }
 
 class RendererService implements FragmentRendererInterface
 {
-    public function render($uri, Request $request = null, array $options = array())
+    public function render($uri, Request $request = null, array $options = [])
     {
     }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php
index ae421d919bfd8..7af756e0b8c10 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php
@@ -23,9 +23,9 @@ public function testAutoloadMainExtension()
         $container = new ContainerBuilder();
         $container->registerExtension(new LoadedExtension());
         $container->registerExtension(new NotLoadedExtension());
-        $container->loadFromExtension('loaded', array());
+        $container->loadFromExtension('loaded', []);
 
-        $configPass = new MergeExtensionConfigurationPass(array('loaded', 'not_loaded'));
+        $configPass = new MergeExtensionConfigurationPass(['loaded', 'not_loaded']);
         $configPass->process($container);
 
         $this->assertTrue($container->hasDefinition('loaded.foo'));
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
index ca121c732711e..bd7fb0eed4a9f 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -32,7 +32,7 @@ class RegisterControllerArgumentLocatorsPassTest extends TestCase
     public function testInvalidClass()
     {
         $container = new ContainerBuilder();
-        $container->register('argument_resolver.service')->addArgument(array());
+        $container->register('argument_resolver.service')->addArgument([]);
 
         $container->register('foo', NotFound::class)
             ->addTag('controller.service_arguments')
@@ -49,10 +49,10 @@ public function testInvalidClass()
     public function testNoAction()
     {
         $container = new ContainerBuilder();
-        $container->register('argument_resolver.service')->addArgument(array());
+        $container->register('argument_resolver.service')->addArgument([]);
 
         $container->register('foo', RegisterTestController::class)
-            ->addTag('controller.service_arguments', array('argument' => 'bar'))
+            ->addTag('controller.service_arguments', ['argument' => 'bar'])
         ;
 
         $pass = new RegisterControllerArgumentLocatorsPass();
@@ -66,10 +66,10 @@ public function testNoAction()
     public function testNoArgument()
     {
         $container = new ContainerBuilder();
-        $container->register('argument_resolver.service')->addArgument(array());
+        $container->register('argument_resolver.service')->addArgument([]);
 
         $container->register('foo', RegisterTestController::class)
-            ->addTag('controller.service_arguments', array('action' => 'fooAction'))
+            ->addTag('controller.service_arguments', ['action' => 'fooAction'])
         ;
 
         $pass = new RegisterControllerArgumentLocatorsPass();
@@ -83,10 +83,10 @@ public function testNoArgument()
     public function testNoService()
     {
         $container = new ContainerBuilder();
-        $container->register('argument_resolver.service')->addArgument(array());
+        $container->register('argument_resolver.service')->addArgument([]);
 
         $container->register('foo', RegisterTestController::class)
-            ->addTag('controller.service_arguments', array('action' => 'fooAction', 'argument' => 'bar'))
+            ->addTag('controller.service_arguments', ['action' => 'fooAction', 'argument' => 'bar'])
         ;
 
         $pass = new RegisterControllerArgumentLocatorsPass();
@@ -100,10 +100,10 @@ public function testNoService()
     public function testInvalidMethod()
     {
         $container = new ContainerBuilder();
-        $container->register('argument_resolver.service')->addArgument(array());
+        $container->register('argument_resolver.service')->addArgument([]);
 
         $container->register('foo', RegisterTestController::class)
-            ->addTag('controller.service_arguments', array('action' => 'barAction', 'argument' => 'bar', 'id' => 'bar_service'))
+            ->addTag('controller.service_arguments', ['action' => 'barAction', 'argument' => 'bar', 'id' => 'bar_service'])
         ;
 
         $pass = new RegisterControllerArgumentLocatorsPass();
@@ -117,10 +117,10 @@ public function testInvalidMethod()
     public function testInvalidArgument()
     {
         $container = new ContainerBuilder();
-        $container->register('argument_resolver.service')->addArgument(array());
+        $container->register('argument_resolver.service')->addArgument([]);
 
         $container->register('foo', RegisterTestController::class)
-            ->addTag('controller.service_arguments', array('action' => 'fooAction', 'argument' => 'baz', 'id' => 'bar'))
+            ->addTag('controller.service_arguments', ['action' => 'fooAction', 'argument' => 'baz', 'id' => 'bar'])
         ;
 
         $pass = new RegisterControllerArgumentLocatorsPass();
@@ -130,7 +130,7 @@ public function testInvalidArgument()
     public function testAllActions()
     {
         $container = new ContainerBuilder();
-        $resolver = $container->register('argument_resolver.service')->addArgument(array());
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
 
         $container->register('foo', RegisterTestController::class)
             ->addTag('controller.service_arguments')
@@ -214,7 +214,7 @@ public function testSkipSetContainer()
     public function testExceptionOnNonExistentTypeHint()
     {
         $container = new ContainerBuilder();
-        $container->register('argument_resolver.service')->addArgument(array());
+        $container->register('argument_resolver.service')->addArgument([]);
 
         $container->register('foo', NonExistentClassController::class)
             ->addTag('controller.service_arguments');
@@ -230,7 +230,7 @@ public function testExceptionOnNonExistentTypeHint()
     public function testExceptionOnNonExistentTypeHintDifferentNamespace()
     {
         $container = new ContainerBuilder();
-        $container->register('argument_resolver.service')->addArgument(array());
+        $container->register('argument_resolver.service')->addArgument([]);
 
         $container->register('foo', NonExistentClassDifferentNamespaceController::class)
             ->addTag('controller.service_arguments');
@@ -242,7 +242,7 @@ public function testExceptionOnNonExistentTypeHintDifferentNamespace()
     public function testNoExceptionOnNonExistentTypeHintOptionalArg()
     {
         $container = new ContainerBuilder();
-        $resolver = $container->register('argument_resolver.service')->addArgument(array());
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
 
         $container->register('foo', NonExistentClassOptionalController::class)
             ->addTag('controller.service_arguments');
@@ -272,7 +272,7 @@ public function testArgumentWithNoTypeHintIsOk()
     public function testControllersAreMadePublic()
     {
         $container = new ContainerBuilder();
-        $resolver = $container->register('argument_resolver.service')->addArgument(array());
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
 
         $container->register('foo', ArgumentWithoutTypeController::class)
             ->setPublic(false)
@@ -290,10 +290,10 @@ public function testControllersAreMadePublic()
     public function testBindings($bindingName)
     {
         $container = new ContainerBuilder();
-        $resolver = $container->register('argument_resolver.service')->addArgument(array());
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
 
         $container->register('foo', RegisterTestController::class)
-            ->setBindings(array($bindingName => new Reference('foo')))
+            ->setBindings([$bindingName => new Reference('foo')])
             ->addTag('controller.service_arguments');
 
         $pass = new RegisterControllerArgumentLocatorsPass();
@@ -331,12 +331,12 @@ public function testDoNotBindScalarValueToControllerArgument()
     public function testBindingsOnChildDefinitions()
     {
         $container = new ContainerBuilder();
-        $resolver = $container->register('argument_resolver.service')->addArgument(array());
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
 
         $container->register('parent', ArgumentWithoutTypeController::class);
 
         $container->setDefinition('child', (new ChildDefinition('parent'))
-            ->setBindings(array('$someArg' => new Reference('parent')))
+            ->setBindings(['$someArg' => new Reference('parent')])
             ->addTag('controller.service_arguments')
         );
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
index 9cac9681857f8..f668817094e9b 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
@@ -23,13 +23,13 @@ class RemoveEmptyControllerArgumentLocatorsPassTest extends TestCase
     public function testProcess()
     {
         $container = new ContainerBuilder();
-        $resolver = $container->register('argument_resolver.service')->addArgument(array());
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
 
         $container->register('stdClass', 'stdClass');
         $container->register(parent::class, 'stdClass');
         $container->register('c1', RemoveTestController1::class)->addTag('controller.service_arguments');
         $container->register('c2', RemoveTestController2::class)->addTag('controller.service_arguments')
-            ->addMethodCall('setTestCase', array(new Reference('c1')));
+            ->addMethodCall('setTestCase', [new Reference('c1')]);
 
         $pass = new RegisterControllerArgumentLocatorsPass();
         $pass->process($container);
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php
index f7ea16dbfb036..9b23ad003d758 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php
@@ -19,14 +19,14 @@ public function testCompilerPass()
         $container = new ContainerBuilder();
         $container->register('one', ResettableService::class)
             ->setPublic(true)
-            ->addTag('kernel.reset', array('method' => 'reset'));
+            ->addTag('kernel.reset', ['method' => 'reset']);
         $container->register('two', ClearableService::class)
             ->setPublic(true)
-            ->addTag('kernel.reset', array('method' => 'clear'));
+            ->addTag('kernel.reset', ['method' => 'clear']);
 
         $container->register('services_resetter', ServicesResetter::class)
             ->setPublic(true)
-            ->setArguments(array(null, array()));
+            ->setArguments([null, []]);
         $container->addCompilerPass(new ResettableServicePass());
 
         $container->compile();
@@ -34,16 +34,16 @@ public function testCompilerPass()
         $definition = $container->getDefinition('services_resetter');
 
         $this->assertEquals(
-            array(
-                new IteratorArgument(array(
+            [
+                new IteratorArgument([
                     'one' => new Reference('one', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE),
                     'two' => new Reference('two', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE),
-                )),
-                array(
+                ]),
+                [
                     'one' => 'reset',
                     'two' => 'clear',
-                ),
-            ),
+                ],
+            ],
             $definition->getArguments()
         );
     }
@@ -58,7 +58,7 @@ public function testMissingMethod()
         $container->register(ResettableService::class)
             ->addTag('kernel.reset');
         $container->register('services_resetter', ServicesResetter::class)
-            ->setArguments(array(null, array()));
+            ->setArguments([null, []]);
         $container->addCompilerPass(new ResettableServicePass());
 
         $container->compile();
@@ -68,7 +68,7 @@ public function testCompilerPassWithoutResetters()
     {
         $container = new ContainerBuilder();
         $container->register('services_resetter', ServicesResetter::class)
-            ->setArguments(array(null, array()));
+            ->setArguments([null, []]);
         $container->addCompilerPass(new ResettableServicePass());
 
         $container->compile();
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ServicesResetterTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ServicesResetterTest.php
index 47c62abd0d998..86f1abdb05292 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ServicesResetterTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ServicesResetterTest.php
@@ -26,13 +26,13 @@ protected function setUp()
 
     public function testResetServices()
     {
-        $resetter = new ServicesResetter(new \ArrayIterator(array(
+        $resetter = new ServicesResetter(new \ArrayIterator([
             'id1' => new ResettableService(),
             'id2' => new ClearableService(),
-        )), array(
+        ]), [
             'id1' => 'reset',
             'id2' => 'clear',
-        ));
+        ]);
 
         $resetter->reset();
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/Event/FilterControllerArgumentsEventTest.php b/src/Symfony/Component/HttpKernel/Tests/Event/FilterControllerArgumentsEventTest.php
index f1e440b2fc711..abc51ac51e777 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Event/FilterControllerArgumentsEventTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Event/FilterControllerArgumentsEventTest.php
@@ -11,7 +11,7 @@ class FilterControllerArgumentsEventTest extends TestCase
 {
     public function testFilterControllerArgumentsEvent()
     {
-        $filterController = new FilterControllerArgumentsEvent(new TestHttpKernel(), function () {}, array('test'), new Request(), 1);
-        $this->assertEquals($filterController->getArguments(), array('test'));
+        $filterController = new FilterControllerArgumentsEvent(new TestHttpKernel(), function () {}, ['test'], new Request(), 1);
+        $this->assertEquals($filterController->getArguments(), ['test']);
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/AddRequestFormatsListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/AddRequestFormatsListenerTest.php
index 3ffb9f3d632e4..b4ea2f955bb53 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/AddRequestFormatsListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/AddRequestFormatsListenerTest.php
@@ -30,7 +30,7 @@ class AddRequestFormatsListenerTest extends TestCase
 
     protected function setUp()
     {
-        $this->listener = new AddRequestFormatsListener(array('csv' => array('text/csv', 'text/plain')));
+        $this->listener = new AddRequestFormatsListener(['csv' => ['text/csv', 'text/plain']]);
     }
 
     protected function tearDown()
@@ -46,7 +46,7 @@ public function testIsAnEventSubscriber()
     public function testRegisteredEvent()
     {
         $this->assertEquals(
-            array(KernelEvents::REQUEST => array('onKernelRequest', 1)),
+            [KernelEvents::REQUEST => ['onKernelRequest', 1]],
             AddRequestFormatsListener::getSubscribedEvents()
         );
     }
@@ -58,7 +58,7 @@ public function testSetAdditionalFormats()
 
         $request->expects($this->once())
             ->method('setFormat')
-            ->with('csv', array('text/csv', 'text/plain'));
+            ->with('csv', ['text/csv', 'text/plain']);
 
         $this->listener->onKernelRequest($event);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php
index 9a9c17edab527..d9e261d35af5e 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php
@@ -40,11 +40,11 @@ public function testConfigure()
         $listener = new DebugHandlersListener($userHandler, $logger);
         $xHandler = new ExceptionHandler();
         $eHandler = new ErrorHandler();
-        $eHandler->setExceptionHandler(array($xHandler, 'handle'));
+        $eHandler->setExceptionHandler([$xHandler, 'handle']);
 
         $exception = null;
-        set_error_handler(array($eHandler, 'handleError'));
-        set_exception_handler(array($eHandler, 'handleException'));
+        set_error_handler([$eHandler, 'handleError']);
+        set_exception_handler([$eHandler, 'handleException']);
         try {
             $listener->configure();
         } catch (\Exception $exception) {
@@ -58,10 +58,10 @@ public function testConfigure()
 
         $this->assertSame($userHandler, $xHandler->setHandler('var_dump'));
 
-        $loggers = $eHandler->setLoggers(array());
+        $loggers = $eHandler->setLoggers([]);
 
         $this->assertArrayHasKey(E_DEPRECATED, $loggers);
-        $this->assertSame(array($logger, LogLevel::INFO), $loggers[E_DEPRECATED]);
+        $this->assertSame([$logger, LogLevel::INFO], $loggers[E_DEPRECATED]);
     }
 
     public function testConfigureForHttpKernelWithNoTerminateWithException()
@@ -75,7 +75,7 @@ public function testConfigureForHttpKernelWithNoTerminateWithException()
         );
 
         $exception = null;
-        $h = set_exception_handler(array($eHandler, 'handleException'));
+        $h = set_exception_handler([$eHandler, 'handleException']);
         try {
             $listener->configure($event);
         } catch (\Exception $exception) {
@@ -101,16 +101,16 @@ public function testConsoleEvent()
 
         $dispatcher->addSubscriber($listener);
 
-        $xListeners = array(
-            KernelEvents::REQUEST => array(array($listener, 'configure')),
-            ConsoleEvents::COMMAND => array(array($listener, 'configure')),
-        );
+        $xListeners = [
+            KernelEvents::REQUEST => [[$listener, 'configure']],
+            ConsoleEvents::COMMAND => [[$listener, 'configure']],
+        ];
         $this->assertSame($xListeners, $dispatcher->getListeners());
 
         $exception = null;
         $eHandler = new ErrorHandler();
-        set_error_handler(array($eHandler, 'handleError'));
-        set_exception_handler(array($eHandler, 'handleException'));
+        set_error_handler([$eHandler, 'handleError']);
+        set_exception_handler([$eHandler, 'handleException']);
         try {
             $dispatcher->dispatch(ConsoleEvents::COMMAND, $event);
         } catch (\Exception $exception) {
@@ -139,7 +139,7 @@ public function testReplaceExistingExceptionHandler()
         $eHandler->setExceptionHandler('var_dump');
 
         $exception = null;
-        set_exception_handler(array($eHandler, 'handleException'));
+        set_exception_handler([$eHandler, 'handleException']);
         try {
             $listener->configure();
         } catch (\Exception $exception) {
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php
index 509f443087ebe..b86a7552f85e4 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php
@@ -29,7 +29,7 @@ class DumpListenerTest extends TestCase
     public function testSubscribedEvents()
     {
         $this->assertSame(
-            array(ConsoleEvents::COMMAND => array('configure', 1024)),
+            [ConsoleEvents::COMMAND => ['configure', 1024]],
             DumpListener::getSubscribedEvents()
         );
     }
@@ -68,7 +68,7 @@ class MockCloner implements ClonerInterface
 {
     public function cloneVar($var)
     {
-        return new Data(array(array($var.'-')));
+        return new Data([[$var.'-']]);
     }
 }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php
index 0b73075e7b896..c4e8cd505cbff 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php
@@ -94,7 +94,7 @@ public function testHandleWithLogger($event, $event2)
     public function provider()
     {
         if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
-            return array(array(null, null));
+            return [[null, null]];
         }
 
         $request = new Request();
@@ -102,9 +102,9 @@ public function provider()
         $event = new GetResponseForExceptionEvent(new TestKernel(), $request, HttpKernelInterface::MASTER_REQUEST, $exception);
         $event2 = new GetResponseForExceptionEvent(new TestKernelThatThrowsException(), $request, HttpKernelInterface::MASTER_REQUEST, $exception);
 
-        return array(
-            array($event, $event2),
-        );
+        return [
+            [$event, $event2],
+        ];
     }
 
     public function testSubRequestFormat()
@@ -142,7 +142,7 @@ public function testCSPHeaderIsRemoved()
         $event = new GetResponseForExceptionEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, new \Exception('foo'));
         $dispatcher->dispatch(KernelEvents::EXCEPTION, $event);
 
-        $response = new Response('', 200, array('content-security-policy' => "style-src 'self'"));
+        $response = new Response('', 200, ['content-security-policy' => "style-src 'self'"]);
         $this->assertTrue($response->headers->has('content-security-policy'));
 
         $event = new FilterResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response);
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/FragmentListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/FragmentListenerTest.php
index edf0498265c80..6408b1b21c7e0 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/FragmentListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/FragmentListenerTest.php
@@ -68,7 +68,7 @@ public function testAccessDeniedWithNonSafeMethods()
      */
     public function testAccessDeniedWithWrongSignature()
     {
-        $request = Request::create('http://example.com/_fragment', 'GET', array(), array(), array(), array('REMOTE_ADDR' => '10.0.0.1'));
+        $request = Request::create('http://example.com/_fragment', 'GET', [], [], [], ['REMOTE_ADDR' => '10.0.0.1']);
 
         $listener = new FragmentListener(new UriSigner('foo'));
         $event = $this->createGetResponseEvent($request);
@@ -79,14 +79,14 @@ public function testAccessDeniedWithWrongSignature()
     public function testWithSignature()
     {
         $signer = new UriSigner('foo');
-        $request = Request::create($signer->sign('http://example.com/_fragment?_path=foo%3Dbar%26_controller%3Dfoo'), 'GET', array(), array(), array(), array('REMOTE_ADDR' => '10.0.0.1'));
+        $request = Request::create($signer->sign('http://example.com/_fragment?_path=foo%3Dbar%26_controller%3Dfoo'), 'GET', [], [], [], ['REMOTE_ADDR' => '10.0.0.1']);
 
         $listener = new FragmentListener($signer);
         $event = $this->createGetResponseEvent($request);
 
         $listener->onKernelRequest($event);
 
-        $this->assertEquals(array('foo' => 'bar', '_controller' => 'foo'), $request->attributes->get('_route_params'));
+        $this->assertEquals(['foo' => 'bar', '_controller' => 'foo'], $request->attributes->get('_route_params'));
         $this->assertFalse($request->query->has('_path'));
     }
 
@@ -105,7 +105,7 @@ public function testRemovesPathWithControllerDefined()
     public function testRemovesPathWithControllerNotDefined()
     {
         $signer = new UriSigner('foo');
-        $request = Request::create($signer->sign('http://example.com/_fragment?_path=foo%3Dbar'), 'GET', array(), array(), array(), array('REMOTE_ADDR' => '10.0.0.1'));
+        $request = Request::create($signer->sign('http://example.com/_fragment?_path=foo%3Dbar'), 'GET', [], [], [], ['REMOTE_ADDR' => '10.0.0.1']);
 
         $listener = new FragmentListener($signer);
         $event = $this->createGetResponseEvent($request);
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
index f442235ad048d..1cf4b72c69d78 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
@@ -54,7 +54,7 @@ public function testLocaleSetForRoutingContext()
         $context = $this->getMockBuilder('Symfony\Component\Routing\RequestContext')->getMock();
         $context->expects($this->once())->method('setParameter')->with('_locale', 'es');
 
-        $router = $this->getMockBuilder('Symfony\Component\Routing\Router')->setMethods(array('getContext'))->disableOriginalConstructor()->getMock();
+        $router = $this->getMockBuilder('Symfony\Component\Routing\Router')->setMethods(['getContext'])->disableOriginalConstructor()->getMock();
         $router->expects($this->once())->method('getContext')->will($this->returnValue($context));
 
         $request = Request::create('/');
@@ -70,7 +70,7 @@ public function testRouterResetWithParentRequestOnKernelFinishRequest()
         $context = $this->getMockBuilder('Symfony\Component\Routing\RequestContext')->getMock();
         $context->expects($this->once())->method('setParameter')->with('_locale', 'es');
 
-        $router = $this->getMockBuilder('Symfony\Component\Routing\Router')->setMethods(array('getContext'))->disableOriginalConstructor()->getMock();
+        $router = $this->getMockBuilder('Symfony\Component\Routing\Router')->setMethods(['getContext'])->disableOriginalConstructor()->getMock();
         $router->expects($this->once())->method('getContext')->will($this->returnValue($context));
 
         $parentRequest = Request::create('/');
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ResponseListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ResponseListenerTest.php
index 1d8960267dbe7..aeab68f3e9155 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/ResponseListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/ResponseListenerTest.php
@@ -30,7 +30,7 @@ protected function setUp()
     {
         $this->dispatcher = new EventDispatcher();
         $listener = new ResponseListener('UTF-8');
-        $this->dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse'));
+        $this->dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse']);
 
         $this->kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
     }
@@ -54,7 +54,7 @@ public function testFilterDoesNothingForSubRequests()
     public function testFilterSetsNonDefaultCharsetIfNotOverridden()
     {
         $listener = new ResponseListener('ISO-8859-15');
-        $this->dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse'), 1);
+        $this->dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse'], 1);
 
         $response = new Response('foo');
 
@@ -67,7 +67,7 @@ public function testFilterSetsNonDefaultCharsetIfNotOverridden()
     public function testFilterDoesNothingIfCharsetIsOverridden()
     {
         $listener = new ResponseListener('ISO-8859-15');
-        $this->dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse'), 1);
+        $this->dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse'], 1);
 
         $response = new Response('foo');
         $response->setCharset('ISO-8859-1');
@@ -81,7 +81,7 @@ public function testFilterDoesNothingIfCharsetIsOverridden()
     public function testFiltersSetsNonDefaultCharsetIfNotOverriddenOnNonTextContentType()
     {
         $listener = new ResponseListener('ISO-8859-15');
-        $this->dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse'), 1);
+        $this->dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse'], 1);
 
         $response = new Response('foo');
         $request = Request::create('/');
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
index ecbce409fb644..218af8d36e293 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
@@ -62,12 +62,12 @@ public function testPort($defaultHttpPort, $defaultHttpsPort, $uri, $expectedHtt
 
     public function getPortData()
     {
-        return array(
-            array(80, 443, 'http://localhost/', 80, 443),
-            array(80, 443, 'http://localhost:90/', 90, 443),
-            array(80, 443, 'https://localhost/', 80, 443),
-            array(80, 443, 'https://localhost:90/', 80, 90),
-        );
+        return [
+            [80, 443, 'http://localhost/', 80, 443],
+            [80, 443, 'http://localhost:90/', 90, 443],
+            [80, 443, 'https://localhost/', 80, 443],
+            [80, 443, 'https://localhost:90/', 80, 90],
+        ];
     }
 
     /**
@@ -102,7 +102,7 @@ public function testRequestMatcher()
         $requestMatcher->expects($this->once())
                        ->method('matchRequest')
                        ->with($this->isInstanceOf('Symfony\Component\HttpFoundation\Request'))
-                       ->will($this->returnValue(array()));
+                       ->will($this->returnValue([]));
 
         $listener = new RouterListener($requestMatcher, $this->requestStack, new RequestContext());
         $listener->onKernelRequest($event);
@@ -118,7 +118,7 @@ public function testSubRequestWithDifferentMethod()
         $requestMatcher->expects($this->any())
                        ->method('matchRequest')
                        ->with($this->isInstanceOf('Symfony\Component\HttpFoundation\Request'))
-                       ->will($this->returnValue(array()));
+                       ->will($this->returnValue([]));
 
         $context = new RequestContext();
 
@@ -159,10 +159,10 @@ public function testLoggingParameter($parameter, $log, $parameters)
 
     public function getLoggingParameterData()
     {
-        return array(
-            array(array('_route' => 'foo'), 'Matched route "{route}".', array('route' => 'foo', 'route_parameters' => array('_route' => 'foo'), 'request_uri' => 'http://localhost/', 'method' => 'GET')),
-            array(array(), 'Matched route "{route}".', array('route' => 'n/a', 'route_parameters' => array(), 'request_uri' => 'http://localhost/', 'method' => 'GET')),
-        );
+        return [
+            [['_route' => 'foo'], 'Matched route "{route}".', ['route' => 'foo', 'route_parameters' => ['_route' => 'foo'], 'request_uri' => 'http://localhost/', 'method' => 'GET']],
+            [[], 'Matched route "{route}".', ['route' => 'n/a', 'route_parameters' => [], 'request_uri' => 'http://localhost/', 'method' => 'GET']],
+        ];
     }
 
     public function testWithBadRequest()
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php
index 1b95d19f9c252..f0bac60505bc6 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php
@@ -90,7 +90,7 @@ public function testSurrogateMasterRequestIsPublic()
 
         $request = new Request();
         $response = new Response();
-        $response->setCache(array('public' => true, 'max_age' => '30'));
+        $response->setCache(['public' => true, 'max_age' => '30']);
         $listener->onKernelRequest(new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST));
         $this->assertTrue($request->hasSession());
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/SurrogateListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/SurrogateListenerTest.php
index b955c07d47422..66e119f1239dd 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/SurrogateListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/SurrogateListenerTest.php
@@ -30,7 +30,7 @@ public function testFilterDoesNothingForSubRequests()
         $response = new Response('foo <esi:include src="" />');
         $listener = new SurrogateListener(new Esi());
 
-        $dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse'));
+        $dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse']);
         $event = new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::SUB_REQUEST, $response);
         $dispatcher->dispatch(KernelEvents::RESPONSE, $event);
 
@@ -44,7 +44,7 @@ public function testFilterWhenThereIsSomeEsiIncludes()
         $response = new Response('foo <esi:include src="" />');
         $listener = new SurrogateListener(new Esi());
 
-        $dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse'));
+        $dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse']);
         $event = new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response);
         $dispatcher->dispatch(KernelEvents::RESPONSE, $event);
 
@@ -58,7 +58,7 @@ public function testFilterWhenThereIsNoEsiIncludes()
         $response = new Response('foo');
         $listener = new SurrogateListener(new Esi());
 
-        $dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse'));
+        $dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse']);
         $event = new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response);
         $dispatcher->dispatch(KernelEvents::RESPONSE, $event);
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
index 0d0985ca5daf9..f261f2ed15a66 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
@@ -87,7 +87,7 @@ public function testEmptySessionDoesNotSendCookie()
 
         $response = $this->filterResponse(new Request(), HttpKernelInterface::MASTER_REQUEST);
 
-        $this->assertSame(array(), $response->headers->getCookies());
+        $this->assertSame([], $response->headers->getCookies());
     }
 
     public function testEmptySessionWithNewSessionIdDoesSendCookie()
@@ -97,7 +97,7 @@ public function testEmptySessionWithNewSessionIdDoesSendCookie()
         $this->fixSessionId('456');
 
         $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
-        $request = Request::create('/', 'GET', array(), array('MOCKSESSID' => '123'));
+        $request = Request::create('/', 'GET', [], ['MOCKSESSID' => '123']);
         $event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
         $this->listener->onKernelRequest($event);
 
@@ -116,11 +116,11 @@ public function testSessionWithNewSessionIdAndNewCookieDoesNotSendAnotherCookie(
         $this->fixSessionId('456');
 
         $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
-        $request = Request::create('/', 'GET', array(), array('MOCKSESSID' => '123'));
+        $request = Request::create('/', 'GET', [], ['MOCKSESSID' => '123']);
         $event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
         $this->listener->onKernelRequest($event);
 
-        $response = new Response('', 200, array('Set-Cookie' => $existing));
+        $response = new Response('', 200, ['Set-Cookie' => $existing]);
 
         $response = $this->filterResponse(new Request(), HttpKernelInterface::MASTER_REQUEST, $response);
 
@@ -129,11 +129,11 @@ public function testSessionWithNewSessionIdAndNewCookieDoesNotSendAnotherCookie(
 
     public function anotherCookieProvider()
     {
-        return array(
-            'same' => array('MOCKSESSID=789; path=/', array('MOCKSESSID=789; path=/')),
-            'different domain' => array('MOCKSESSID=789; path=/; domain=example.com', array('MOCKSESSID=789; path=/; domain=example.com', 'MOCKSESSID=456; path=/')),
-            'different path' => array('MOCKSESSID=789; path=/foo', array('MOCKSESSID=789; path=/foo', 'MOCKSESSID=456; path=/')),
-        );
+        return [
+            'same' => ['MOCKSESSID=789; path=/', ['MOCKSESSID=789; path=/']],
+            'different domain' => ['MOCKSESSID=789; path=/; domain=example.com', ['MOCKSESSID=789; path=/; domain=example.com', 'MOCKSESSID=456; path=/']],
+            'different path' => ['MOCKSESSID=789; path=/foo', ['MOCKSESSID=789; path=/foo', 'MOCKSESSID=456; path=/']],
+        ];
     }
 
     public function testUnstartedSessionIsNotSave()
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php
index bdab742ce182c..fb7a4379bfa49 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php
@@ -23,7 +23,7 @@ class ValidateRequestListenerTest extends TestCase
 {
     protected function tearDown()
     {
-        Request::setTrustedProxies(array(), -1);
+        Request::setTrustedProxies([], -1);
     }
 
     /**
@@ -35,12 +35,12 @@ public function testListenerThrowsWhenMasterRequestHasInconsistentClientIps()
         $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
 
         $request = new Request();
-        $request->setTrustedProxies(array('1.1.1.1'), Request::HEADER_X_FORWARDED_FOR | Request::HEADER_FORWARDED);
+        $request->setTrustedProxies(['1.1.1.1'], Request::HEADER_X_FORWARDED_FOR | Request::HEADER_FORWARDED);
         $request->server->set('REMOTE_ADDR', '1.1.1.1');
         $request->headers->set('FORWARDED', 'for=2.2.2.2');
         $request->headers->set('X_FORWARDED_FOR', '3.3.3.3');
 
-        $dispatcher->addListener(KernelEvents::REQUEST, array(new ValidateRequestListener(), 'onKernelRequest'));
+        $dispatcher->addListener(KernelEvents::REQUEST, [new ValidateRequestListener(), 'onKernelRequest']);
         $event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
 
         $dispatcher->dispatch(KernelEvents::REQUEST, $event);
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/HttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/HttpExceptionTest.php
index b64773551eb31..f5fe97255bdb8 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/HttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/HttpExceptionTest.php
@@ -9,22 +9,22 @@ class HttpExceptionTest extends TestCase
 {
     public function headerDataProvider()
     {
-        return array(
-            array(array('X-Test' => 'Test')),
-            array(array('X-Test' => 1)),
-            array(
-                array(
-                    array('X-Test' => 'Test'),
-                    array('X-Test-2' => 'Test-2'),
-                ),
-            ),
-        );
+        return [
+            [['X-Test' => 'Test']],
+            [['X-Test' => 1]],
+            [
+                [
+                    ['X-Test' => 'Test'],
+                    ['X-Test-2' => 'Test-2'],
+                ],
+            ],
+        ];
     }
 
     public function testHeadersDefault()
     {
         $exception = $this->createException();
-        $this->assertSame(array(), $exception->getHeaders());
+        $this->assertSame([], $exception->getHeaders());
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php
index b5def13ce38d7..31dbf2f036e17 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php
@@ -8,8 +8,8 @@ class MethodNotAllowedHttpExceptionTest extends HttpExceptionTest
 {
     public function testHeadersDefault()
     {
-        $exception = new MethodNotAllowedHttpException(array('GET', 'PUT'));
-        $this->assertSame(array('Allow' => 'GET, PUT'), $exception->getHeaders());
+        $exception = new MethodNotAllowedHttpException(['GET', 'PUT']);
+        $this->assertSame(['Allow' => 'GET, PUT'], $exception->getHeaders());
     }
 
     /**
@@ -17,7 +17,7 @@ public function testHeadersDefault()
      */
     public function testHeadersSetter($headers)
     {
-        $exception = new MethodNotAllowedHttpException(array('GET'));
+        $exception = new MethodNotAllowedHttpException(['GET']);
         $exception->setHeaders($headers);
         $this->assertSame($headers, $exception->getHeaders());
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php
index e41a23d4e7719..cefde951ccfbb 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php
@@ -9,7 +9,7 @@ class ServiceUnavailableHttpExceptionTest extends HttpExceptionTest
     public function testHeadersDefaultRetryAfter()
     {
         $exception = new ServiceUnavailableHttpException(10);
-        $this->assertSame(array('Retry-After' => 10), $exception->getHeaders());
+        $this->assertSame(['Retry-After' => 10], $exception->getHeaders());
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php
index 2079bb3380d20..73ee91a77d8fa 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php
@@ -9,7 +9,7 @@ class TooManyRequestsHttpExceptionTest extends HttpExceptionTest
     public function testHeadersDefaultRertyAfter()
     {
         $exception = new TooManyRequestsHttpException(10);
-        $this->assertSame(array('Retry-After' => 10), $exception->getHeaders());
+        $this->assertSame(['Retry-After' => 10], $exception->getHeaders());
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
index 89dec36af4110..4f5de182fd17f 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
@@ -31,7 +31,7 @@ public function collect(Request $request, Response $response, \Exception $except
 
     public function reset()
     {
-        $this->data = array();
+        $this->data = [];
     }
 
     public function getData()
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
index 9acee4cac553e..88c34b023136a 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
@@ -23,7 +23,7 @@ public function getBundleMap()
 
     public function registerBundles()
     {
-        return array();
+        return [];
     }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelWithoutBundles.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelWithoutBundles.php
index cee1b09fb2253..1f5a456061f2f 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelWithoutBundles.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelWithoutBundles.php
@@ -19,7 +19,7 @@ class KernelWithoutBundles extends Kernel
 {
     public function registerBundles()
     {
-        return array();
+        return [];
     }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/TestEventDispatcher.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/TestEventDispatcher.php
index ca2e6a693da6e..dc9c9166f9f25 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/TestEventDispatcher.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/TestEventDispatcher.php
@@ -18,12 +18,12 @@ class TestEventDispatcher extends EventDispatcher implements TraceableEventDispa
 {
     public function getCalledListeners()
     {
-        return array('foo');
+        return ['foo'];
     }
 
     public function getNotCalledListeners()
     {
-        return array('bar');
+        return ['bar'];
     }
 
     public function reset()
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php
index 00d796d520511..d552eba5991b0 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php
@@ -42,7 +42,7 @@ public function testRenderFallbackWithScalarIsNotDeprecated()
     {
         $strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy(true), new UriSigner('foo'));
         $request = Request::create('/');
-        $reference = new ControllerReference('main_controller', array('foo' => array(true)), array());
+        $reference = new ControllerReference('main_controller', ['foo' => [true]], []);
         $strategy->render($reference, $request);
     }
 
@@ -55,8 +55,8 @@ public function testRender()
         $request->headers->set('Surrogate-Capability', 'ESI/1.0');
 
         $this->assertEquals('<esi:include src="/" />', $strategy->render('/', $request)->getContent());
-        $this->assertEquals("<esi:comment text=\"This is a comment\" />\n<esi:include src=\"/\" />", $strategy->render('/', $request, array('comment' => 'This is a comment'))->getContent());
-        $this->assertEquals('<esi:include src="/" alt="foo" />', $strategy->render('/', $request, array('alt' => 'foo'))->getContent());
+        $this->assertEquals("<esi:comment text=\"This is a comment\" />\n<esi:include src=\"/\" />", $strategy->render('/', $request, ['comment' => 'This is a comment'])->getContent());
+        $this->assertEquals('<esi:include src="/" alt="foo" />', $strategy->render('/', $request, ['alt' => 'foo'])->getContent());
     }
 
     public function testRenderControllerReference()
@@ -68,12 +68,12 @@ public function testRenderControllerReference()
         $request->setLocale('fr');
         $request->headers->set('Surrogate-Capability', 'ESI/1.0');
 
-        $reference = new ControllerReference('main_controller', array(), array());
-        $altReference = new ControllerReference('alt_controller', array(), array());
+        $reference = new ControllerReference('main_controller', [], []);
+        $altReference = new ControllerReference('alt_controller', [], []);
 
         $this->assertEquals(
             '<esi:include src="/_fragment?_path=_format%3Dhtml%26_locale%3Dfr%26_controller%3Dmain_controller&_hash=Jz1P8NErmhKTeI6onI1EdAXTB85359MY3RIk5mSJ60w%3D" alt="/_fragment?_path=_format%3Dhtml%26_locale%3Dfr%26_controller%3Dalt_controller&_hash=iPJEdRoUpGrM1ztqByiorpfMPtiW%2FOWwdH1DBUXHhEc%3D" />',
-            $strategy->render($reference, $request, array('alt' => $altReference))->getContent()
+            $strategy->render($reference, $request, ['alt' => $altReference])->getContent()
         );
     }
 
@@ -102,7 +102,7 @@ public function testRenderAltControllerReferenceWithoutSignerThrowsException()
         $request->setLocale('fr');
         $request->headers->set('Surrogate-Capability', 'ESI/1.0');
 
-        $strategy->render('/', $request, array('alt' => new ControllerReference('alt_controller')));
+        $strategy->render('/', $request, ['alt' => new ControllerReference('alt_controller')]);
     }
 
     private function getInlineStrategy($called = false)
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
index a296aa0e183c5..47315c93e2b95 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
@@ -68,12 +68,12 @@ public function testDeliverWithUnsuccessfulResponse()
 
     public function testRender()
     {
-        $handler = $this->getHandler($this->returnValue(new Response('foo')), array('/', Request::create('/'), array('foo' => 'foo', 'ignore_errors' => true)));
+        $handler = $this->getHandler($this->returnValue(new Response('foo')), ['/', Request::create('/'), ['foo' => 'foo', 'ignore_errors' => true]]);
 
-        $this->assertEquals('foo', $handler->render('/', 'foo', array('foo' => 'foo')));
+        $this->assertEquals('foo', $handler->render('/', 'foo', ['foo' => 'foo']));
     }
 
-    protected function getHandler($returnValue, $arguments = array())
+    protected function getHandler($returnValue, $arguments = [])
     {
         $renderer = $this->getMockBuilder('Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface')->getMock();
         $renderer
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
index 10fbccf0fa207..558f1b55fbbef 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
@@ -25,14 +25,14 @@ class HIncludeFragmentRendererTest extends TestCase
     public function testRenderExceptionWhenControllerAndNoSigner()
     {
         $strategy = new HIncludeFragmentRenderer();
-        $strategy->render(new ControllerReference('main_controller', array(), array()), Request::create('/'));
+        $strategy->render(new ControllerReference('main_controller', [], []), Request::create('/'));
     }
 
     public function testRenderWithControllerAndSigner()
     {
         $strategy = new HIncludeFragmentRenderer(null, new UriSigner('foo'));
 
-        $this->assertEquals('<hx:include src="/_fragment?_path=_format%3Dhtml%26_locale%3Den%26_controller%3Dmain_controller&amp;_hash=BP%2BOzCD5MRUI%2BHJpgPDOmoju00FnzLhP3TGcSHbbBLs%3D"></hx:include>', $strategy->render(new ControllerReference('main_controller', array(), array()), Request::create('/'))->getContent());
+        $this->assertEquals('<hx:include src="/_fragment?_path=_format%3Dhtml%26_locale%3Den%26_controller%3Dmain_controller&amp;_hash=BP%2BOzCD5MRUI%2BHJpgPDOmoju00FnzLhP3TGcSHbbBLs%3D"></hx:include>', $strategy->render(new ControllerReference('main_controller', [], []), Request::create('/'))->getContent());
     }
 
     public function testRenderWithUri()
@@ -48,30 +48,30 @@ public function testRenderWithDefault()
     {
         // only default
         $strategy = new HIncludeFragmentRenderer();
-        $this->assertEquals('<hx:include src="/foo">default</hx:include>', $strategy->render('/foo', Request::create('/'), array('default' => 'default'))->getContent());
+        $this->assertEquals('<hx:include src="/foo">default</hx:include>', $strategy->render('/foo', Request::create('/'), ['default' => 'default'])->getContent());
 
         // only global default
         $strategy = new HIncludeFragmentRenderer(null, null, 'global_default');
-        $this->assertEquals('<hx:include src="/foo">global_default</hx:include>', $strategy->render('/foo', Request::create('/'), array())->getContent());
+        $this->assertEquals('<hx:include src="/foo">global_default</hx:include>', $strategy->render('/foo', Request::create('/'), [])->getContent());
 
         // global default and default
         $strategy = new HIncludeFragmentRenderer(null, null, 'global_default');
-        $this->assertEquals('<hx:include src="/foo">default</hx:include>', $strategy->render('/foo', Request::create('/'), array('default' => 'default'))->getContent());
+        $this->assertEquals('<hx:include src="/foo">default</hx:include>', $strategy->render('/foo', Request::create('/'), ['default' => 'default'])->getContent());
     }
 
     public function testRenderWithAttributesOptions()
     {
         // with id
         $strategy = new HIncludeFragmentRenderer();
-        $this->assertEquals('<hx:include src="/foo" id="bar">default</hx:include>', $strategy->render('/foo', Request::create('/'), array('default' => 'default', 'id' => 'bar'))->getContent());
+        $this->assertEquals('<hx:include src="/foo" id="bar">default</hx:include>', $strategy->render('/foo', Request::create('/'), ['default' => 'default', 'id' => 'bar'])->getContent());
 
         // with attributes
         $strategy = new HIncludeFragmentRenderer();
-        $this->assertEquals('<hx:include src="/foo" p1="v1" p2="v2">default</hx:include>', $strategy->render('/foo', Request::create('/'), array('default' => 'default', 'attributes' => array('p1' => 'v1', 'p2' => 'v2')))->getContent());
+        $this->assertEquals('<hx:include src="/foo" p1="v1" p2="v2">default</hx:include>', $strategy->render('/foo', Request::create('/'), ['default' => 'default', 'attributes' => ['p1' => 'v1', 'p2' => 'v2']])->getContent());
 
         // with id & attributes
         $strategy = new HIncludeFragmentRenderer();
-        $this->assertEquals('<hx:include src="/foo" p1="v1" p2="v2" id="bar">default</hx:include>', $strategy->render('/foo', Request::create('/'), array('default' => 'default', 'id' => 'bar', 'attributes' => array('p1' => 'v1', 'p2' => 'v2')))->getContent());
+        $this->assertEquals('<hx:include src="/foo" p1="v1" p2="v2" id="bar">default</hx:include>', $strategy->render('/foo', Request::create('/'), ['default' => 'default', 'id' => 'bar', 'attributes' => ['p1' => 'v1', 'p2' => 'v2']])->getContent());
     }
 
     public function testRenderWithDefaultText()
@@ -84,7 +84,7 @@ public function testRenderWithDefaultText()
 
         // only default
         $strategy = new HIncludeFragmentRenderer($engine);
-        $this->assertEquals('<hx:include src="/foo">default</hx:include>', $strategy->render('/foo', Request::create('/'), array('default' => 'default'))->getContent());
+        $this->assertEquals('<hx:include src="/foo">default</hx:include>', $strategy->render('/foo', Request::create('/'), ['default' => 'default'])->getContent());
     }
 
     public function testRenderWithEngineAndDefaultText()
@@ -97,6 +97,6 @@ public function testRenderWithEngineAndDefaultText()
 
         // only default
         $strategy = new HIncludeFragmentRenderer($engine);
-        $this->assertEquals('<hx:include src="/foo">loading...</hx:include>', $strategy->render('/foo', Request::create('/'), array('default' => 'loading...'))->getContent());
+        $this->assertEquals('<hx:include src="/foo">loading...</hx:include>', $strategy->render('/foo', Request::create('/'), ['default' => 'loading...'])->getContent());
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
index 80f9cd2b53c91..0559962562793 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
@@ -36,7 +36,7 @@ public function testRenderWithControllerReference()
     {
         $strategy = new InlineFragmentRenderer($this->getKernel($this->returnValue(new Response('foo'))));
 
-        $this->assertEquals('foo', $strategy->render(new ControllerReference('main_controller', array(), array()), Request::create('/'))->getContent());
+        $this->assertEquals('foo', $strategy->render(new ControllerReference('main_controller', [], []), Request::create('/'))->getContent());
     }
 
     public function testRenderWithObjectsAsAttributes()
@@ -44,15 +44,15 @@ public function testRenderWithObjectsAsAttributes()
         $object = new \stdClass();
 
         $subRequest = Request::create('/_fragment?_path=_format%3Dhtml%26_locale%3Den%26_controller%3Dmain_controller');
-        $subRequest->attributes->replace(array('object' => $object, '_format' => 'html', '_controller' => 'main_controller', '_locale' => 'en'));
-        $subRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
-        $subRequest->headers->set('forwarded', array('for="127.0.0.1";host="localhost";proto=http'));
+        $subRequest->attributes->replace(['object' => $object, '_format' => 'html', '_controller' => 'main_controller', '_locale' => 'en']);
+        $subRequest->headers->set('x-forwarded-for', ['127.0.0.1']);
+        $subRequest->headers->set('forwarded', ['for="127.0.0.1";host="localhost";proto=http']);
         $subRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
         $subRequest->server->set('HTTP_FORWARDED', 'for="127.0.0.1";host="localhost";proto=http');
 
         $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($subRequest));
 
-        $this->assertSame('foo', $strategy->render(new ControllerReference('main_controller', array('object' => $object), array()), Request::create('/'))->getContent());
+        $this->assertSame('foo', $strategy->render(new ControllerReference('main_controller', ['object' => $object], []), Request::create('/'))->getContent());
     }
 
     /**
@@ -131,7 +131,7 @@ public function testRenderExceptionIgnoreErrors()
 
         $strategy = new InlineFragmentRenderer($this->getKernel($this->throwException(new \RuntimeException('foo'))), $dispatcher);
 
-        $this->assertEmpty($strategy->render('/', Request::create('/'), array('ignore_errors' => true))->getContent());
+        $this->assertEmpty($strategy->render('/', Request::create('/'), ['ignore_errors' => true])->getContent());
     }
 
     public function testRenderExceptionIgnoreErrorsWithAlt()
@@ -141,7 +141,7 @@ public function testRenderExceptionIgnoreErrorsWithAlt()
             $this->returnValue(new Response('bar'))
         )));
 
-        $this->assertEquals('bar', $strategy->render('/', Request::create('/'), array('ignore_errors' => true, 'alt' => '/foo'))->getContent());
+        $this->assertEquals('bar', $strategy->render('/', Request::create('/'), ['ignore_errors' => true, 'alt' => '/foo'])->getContent());
     }
 
     private function getKernel($returnValue)
@@ -173,7 +173,7 @@ public function testExceptionInSubRequestsDoesNotMangleOutputBuffers()
         $argumentResolver
             ->expects($this->once())
             ->method('getArguments')
-            ->will($this->returnValue(array()))
+            ->will($this->returnValue([]))
         ;
 
         $kernel = new HttpKernel(new EventDispatcher(), $controllerResolver, new RequestStack(), $argumentResolver);
@@ -184,7 +184,7 @@ public function testExceptionInSubRequestsDoesNotMangleOutputBuffers()
         echo 'Foo';
 
         // simulate a sub-request with output buffering and an exception
-        $renderer->render('/', Request::create('/'), array('ignore_errors' => true));
+        $renderer->render('/', Request::create('/'), ['ignore_errors' => true]);
 
         $this->assertEquals('Foo', ob_get_clean());
     }
@@ -195,10 +195,10 @@ public function testLocaleAndFormatAreIsKeptInSubrequest()
         $expectedSubRequest->attributes->set('_format', 'foo');
         $expectedSubRequest->setLocale('fr');
         if (Request::HEADER_X_FORWARDED_FOR & Request::getTrustedHeaderSet()) {
-            $expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
+            $expectedSubRequest->headers->set('x-forwarded-for', ['127.0.0.1']);
             $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
         }
-        $expectedSubRequest->headers->set('forwarded', array('for="127.0.0.1";host="localhost";proto=http'));
+        $expectedSubRequest->headers->set('forwarded', ['for="127.0.0.1";host="localhost";proto=http']);
         $expectedSubRequest->server->set('HTTP_FORWARDED', 'for="127.0.0.1";host="localhost";proto=http');
 
         $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($expectedSubRequest));
@@ -215,10 +215,10 @@ public function testESIHeaderIsKeptInSubrequest()
         $expectedSubRequest->headers->set('Surrogate-Capability', 'abc="ESI/1.0"');
 
         if (Request::HEADER_X_FORWARDED_FOR & Request::getTrustedHeaderSet()) {
-            $expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
+            $expectedSubRequest->headers->set('x-forwarded-for', ['127.0.0.1']);
             $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
         }
-        $expectedSubRequest->headers->set('forwarded', array('for="127.0.0.1";host="localhost";proto=http'));
+        $expectedSubRequest->headers->set('forwarded', ['for="127.0.0.1";host="localhost";proto=http']);
         $expectedSubRequest->server->set('HTTP_FORWARDED', 'for="127.0.0.1";host="localhost";proto=http');
 
         $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($expectedSubRequest));
@@ -230,35 +230,35 @@ public function testESIHeaderIsKeptInSubrequest()
 
     public function testESIHeaderIsKeptInSubrequestWithTrustedHeaderDisabled()
     {
-        Request::setTrustedProxies(array(), Request::HEADER_FORWARDED);
+        Request::setTrustedProxies([], Request::HEADER_FORWARDED);
 
         $this->testESIHeaderIsKeptInSubrequest();
 
-        Request::setTrustedProxies(array(), -1);
+        Request::setTrustedProxies([], -1);
     }
 
     public function testHeadersPossiblyResultingIn304AreNotAssignedToSubrequest()
     {
         $expectedSubRequest = Request::create('/');
-        $expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
-        $expectedSubRequest->headers->set('forwarded', array('for="127.0.0.1";host="localhost";proto=http'));
+        $expectedSubRequest->headers->set('x-forwarded-for', ['127.0.0.1']);
+        $expectedSubRequest->headers->set('forwarded', ['for="127.0.0.1";host="localhost";proto=http']);
         $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
         $expectedSubRequest->server->set('HTTP_FORWARDED', 'for="127.0.0.1";host="localhost";proto=http');
 
         $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($expectedSubRequest));
-        $request = Request::create('/', 'GET', array(), array(), array(), array('HTTP_IF_MODIFIED_SINCE' => 'Fri, 01 Jan 2016 00:00:00 GMT', 'HTTP_IF_NONE_MATCH' => '*'));
+        $request = Request::create('/', 'GET', [], [], [], ['HTTP_IF_MODIFIED_SINCE' => 'Fri, 01 Jan 2016 00:00:00 GMT', 'HTTP_IF_NONE_MATCH' => '*']);
         $strategy->render('/', $request);
     }
 
     public function testFirstTrustedProxyIsSetAsRemote()
     {
-        Request::setTrustedProxies(array('1.1.1.1'), -1);
+        Request::setTrustedProxies(['1.1.1.1'], -1);
 
         $expectedSubRequest = Request::create('/');
         $expectedSubRequest->headers->set('Surrogate-Capability', 'abc="ESI/1.0"');
         $expectedSubRequest->server->set('REMOTE_ADDR', '127.0.0.1');
-        $expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
-        $expectedSubRequest->headers->set('forwarded', array('for="127.0.0.1";host="localhost";proto=http'));
+        $expectedSubRequest->headers->set('x-forwarded-for', ['127.0.0.1']);
+        $expectedSubRequest->headers->set('forwarded', ['for="127.0.0.1";host="localhost";proto=http']);
         $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
         $expectedSubRequest->server->set('HTTP_FORWARDED', 'for="127.0.0.1";host="localhost";proto=http');
 
@@ -268,7 +268,7 @@ public function testFirstTrustedProxyIsSetAsRemote()
         $request->headers->set('Surrogate-Capability', 'abc="ESI/1.0"');
         $strategy->render('/', $request);
 
-        Request::setTrustedProxies(array(), -1);
+        Request::setTrustedProxies([], -1);
     }
 
     public function testIpAddressOfRangedTrustedProxyIsSetAsRemote()
@@ -276,12 +276,12 @@ public function testIpAddressOfRangedTrustedProxyIsSetAsRemote()
         $expectedSubRequest = Request::create('/');
         $expectedSubRequest->headers->set('Surrogate-Capability', 'abc="ESI/1.0"');
         $expectedSubRequest->server->set('REMOTE_ADDR', '127.0.0.1');
-        $expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
-        $expectedSubRequest->headers->set('forwarded', array('for="127.0.0.1";host="localhost";proto=http'));
+        $expectedSubRequest->headers->set('x-forwarded-for', ['127.0.0.1']);
+        $expectedSubRequest->headers->set('forwarded', ['for="127.0.0.1";host="localhost";proto=http']);
         $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
         $expectedSubRequest->server->set('HTTP_FORWARDED', 'for="127.0.0.1";host="localhost";proto=http');
 
-        Request::setTrustedProxies(array('1.1.1.1/24'), -1);
+        Request::setTrustedProxies(['1.1.1.1/24'], -1);
 
         $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($expectedSubRequest));
 
@@ -289,7 +289,7 @@ public function testIpAddressOfRangedTrustedProxyIsSetAsRemote()
         $request->headers->set('Surrogate-Capability', 'abc="ESI/1.0"');
         $strategy->render('/', $request);
 
-        Request::setTrustedProxies(array(), -1);
+        Request::setTrustedProxies([], -1);
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php
index 3a040dedd6e54..c03e8c4a92334 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php
@@ -35,14 +35,14 @@ public function testGenerateAbsoluteFragmentUri($uri, $controller)
 
     public function getGenerateFragmentUriData()
     {
-        return array(
-            array('/_fragment?_path=_format%3Dhtml%26_locale%3Den%26_controller%3Dcontroller', new ControllerReference('controller', array(), array())),
-            array('/_fragment?_path=_format%3Dxml%26_locale%3Den%26_controller%3Dcontroller', new ControllerReference('controller', array('_format' => 'xml'), array())),
-            array('/_fragment?_path=foo%3Dfoo%26_format%3Djson%26_locale%3Den%26_controller%3Dcontroller', new ControllerReference('controller', array('foo' => 'foo', '_format' => 'json'), array())),
-            array('/_fragment?bar=bar&_path=foo%3Dfoo%26_format%3Dhtml%26_locale%3Den%26_controller%3Dcontroller', new ControllerReference('controller', array('foo' => 'foo'), array('bar' => 'bar'))),
-            array('/_fragment?foo=foo&_path=_format%3Dhtml%26_locale%3Den%26_controller%3Dcontroller', new ControllerReference('controller', array(), array('foo' => 'foo'))),
-            array('/_fragment?_path=foo%255B0%255D%3Dfoo%26foo%255B1%255D%3Dbar%26_format%3Dhtml%26_locale%3Den%26_controller%3Dcontroller', new ControllerReference('controller', array('foo' => array('foo', 'bar')), array())),
-        );
+        return [
+            ['/_fragment?_path=_format%3Dhtml%26_locale%3Den%26_controller%3Dcontroller', new ControllerReference('controller', [], [])],
+            ['/_fragment?_path=_format%3Dxml%26_locale%3Den%26_controller%3Dcontroller', new ControllerReference('controller', ['_format' => 'xml'], [])],
+            ['/_fragment?_path=foo%3Dfoo%26_format%3Djson%26_locale%3Den%26_controller%3Dcontroller', new ControllerReference('controller', ['foo' => 'foo', '_format' => 'json'], [])],
+            ['/_fragment?bar=bar&_path=foo%3Dfoo%26_format%3Dhtml%26_locale%3Den%26_controller%3Dcontroller', new ControllerReference('controller', ['foo' => 'foo'], ['bar' => 'bar'])],
+            ['/_fragment?foo=foo&_path=_format%3Dhtml%26_locale%3Den%26_controller%3Dcontroller', new ControllerReference('controller', [], ['foo' => 'foo'])],
+            ['/_fragment?_path=foo%255B0%255D%3Dfoo%26foo%255B1%255D%3Dbar%26_format%3Dhtml%26_locale%3Den%26_controller%3Dcontroller', new ControllerReference('controller', ['foo' => ['foo', 'bar']], [])],
+        ];
     }
 
     public function testGenerateFragmentUriWithARequest()
@@ -50,7 +50,7 @@ public function testGenerateFragmentUriWithARequest()
         $request = Request::create('/');
         $request->attributes->set('_format', 'json');
         $request->setLocale('fr');
-        $controller = new ControllerReference('controller', array(), array());
+        $controller = new ControllerReference('controller', [], []);
 
         $this->assertEquals('/_fragment?_path=_format%3Djson%26_locale%3Dfr%26_controller%3Dcontroller', $this->callGenerateFragmentUriMethod($controller, $request));
     }
@@ -66,10 +66,10 @@ public function testGenerateFragmentUriWithNonScalar($controller)
 
     public function getGenerateFragmentUriDataWithNonScalar()
     {
-        return array(
-            array(new ControllerReference('controller', array('foo' => new Foo(), 'bar' => 'bar'), array())),
-            array(new ControllerReference('controller', array('foo' => array('foo' => 'foo'), 'bar' => array('bar' => new Foo())), array())),
-        );
+        return [
+            [new ControllerReference('controller', ['foo' => new Foo(), 'bar' => 'bar'], [])],
+            [new ControllerReference('controller', ['foo' => ['foo' => 'foo'], 'bar' => ['bar' => new Foo()]], [])],
+        ];
     }
 
     private function callGenerateFragmentUriMethod(ControllerReference $reference, Request $request, $absolute = false)
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/SsiFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/SsiFragmentRendererTest.php
index f725803118f74..45be040962253 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/SsiFragmentRendererTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/SsiFragmentRendererTest.php
@@ -35,7 +35,7 @@ public function testRender()
         $request->headers->set('Surrogate-Capability', 'SSI/1.0');
 
         $this->assertEquals('<!--#include virtual="/" -->', $strategy->render('/', $request)->getContent());
-        $this->assertEquals('<!--#include virtual="/" -->', $strategy->render('/', $request, array('comment' => 'This is a comment'))->getContent(), 'Strategy options should not impact the ssi include tag');
+        $this->assertEquals('<!--#include virtual="/" -->', $strategy->render('/', $request, ['comment' => 'This is a comment'])->getContent(), 'Strategy options should not impact the ssi include tag');
     }
 
     public function testRenderControllerReference()
@@ -47,12 +47,12 @@ public function testRenderControllerReference()
         $request->setLocale('fr');
         $request->headers->set('Surrogate-Capability', 'SSI/1.0');
 
-        $reference = new ControllerReference('main_controller', array(), array());
-        $altReference = new ControllerReference('alt_controller', array(), array());
+        $reference = new ControllerReference('main_controller', [], []);
+        $altReference = new ControllerReference('alt_controller', [], []);
 
         $this->assertEquals(
             '<!--#include virtual="/_fragment?_path=_format%3Dhtml%26_locale%3Dfr%26_controller%3Dmain_controller&_hash=Jz1P8NErmhKTeI6onI1EdAXTB85359MY3RIk5mSJ60w%3D" -->',
-            $strategy->render($reference, $request, array('alt' => $altReference))->getContent()
+            $strategy->render($reference, $request, ['alt' => $altReference])->getContent()
         );
     }
 
@@ -81,7 +81,7 @@ public function testRenderAltControllerReferenceWithoutSignerThrowsException()
         $request->setLocale('fr');
         $request->headers->set('Surrogate-Capability', 'SSI/1.0');
 
-        $strategy->render('/', $request, array('alt' => new ControllerReference('alt_controller')));
+        $strategy->render('/', $request, ['alt' => new ControllerReference('alt_controller')]);
     }
 
     private function getInlineStrategy($called = false)
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
index 863ad76147fcc..9dfd12e06499d 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
@@ -220,13 +220,13 @@ public function testHandleWhenResponseIsNot200AndAltIsPresent()
         $response1 = new Response('foo');
         $response1->setStatusCode(404);
         $response2 = new Response('bar');
-        $cache = $this->getCache(Request::create('/'), array($response1, $response2));
+        $cache = $this->getCache(Request::create('/'), [$response1, $response2]);
         $this->assertEquals('bar', $esi->handle($cache, '/', '/alt', false));
     }
 
     protected function getCache($request, $response)
     {
-        $cache = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpCache\HttpCache')->setMethods(array('getRequest', 'handle'))->disableOriginalConstructor()->getMock();
+        $cache = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpCache\HttpCache')->setMethods(['getRequest', 'handle'])->disableOriginalConstructor()->getMock();
         $cache->expects($this->any())
               ->method('getRequest')
               ->will($this->returnValue($request))
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
index a41d8665083c2..7b3cac78c734b 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
@@ -39,7 +39,7 @@ public function testTerminateDelegatesTerminationOnlyForTerminableInterface()
         // implements TerminableInterface
         $kernelMock = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Kernel')
             ->disableOriginalConstructor()
-            ->setMethods(array('terminate', 'registerBundles', 'registerContainerConfiguration'))
+            ->setMethods(['terminate', 'registerBundles', 'registerContainerConfiguration'])
             ->getMock();
 
         $kernelMock->expects($this->once())
@@ -61,7 +61,7 @@ public function testPassesOnNonGetHeadRequests()
 
     public function testInvalidatesOnPostPutDeleteRequests()
     {
-        foreach (array('post', 'put', 'delete') as $method) {
+        foreach (['post', 'put', 'delete'] as $method) {
             $this->setNextResponse(200);
             $this->request($method, '/');
 
@@ -74,8 +74,8 @@ public function testInvalidatesOnPostPutDeleteRequests()
 
     public function testDoesNotCacheWithAuthorizationRequestHeaderAndNonPublicResponse()
     {
-        $this->setNextResponse(200, array('ETag' => '"Foo"'));
-        $this->request('GET', '/', array('HTTP_AUTHORIZATION' => 'basic foobarbaz'));
+        $this->setNextResponse(200, ['ETag' => '"Foo"']);
+        $this->request('GET', '/', ['HTTP_AUTHORIZATION' => 'basic foobarbaz']);
 
         $this->assertHttpKernelIsCalled();
         $this->assertResponseOk();
@@ -88,8 +88,8 @@ public function testDoesNotCacheWithAuthorizationRequestHeaderAndNonPublicRespon
 
     public function testDoesCacheWithAuthorizationRequestHeaderAndPublicResponse()
     {
-        $this->setNextResponse(200, array('Cache-Control' => 'public', 'ETag' => '"Foo"'));
-        $this->request('GET', '/', array('HTTP_AUTHORIZATION' => 'basic foobarbaz'));
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'ETag' => '"Foo"']);
+        $this->request('GET', '/', ['HTTP_AUTHORIZATION' => 'basic foobarbaz']);
 
         $this->assertHttpKernelIsCalled();
         $this->assertResponseOk();
@@ -101,8 +101,8 @@ public function testDoesCacheWithAuthorizationRequestHeaderAndPublicResponse()
 
     public function testDoesNotCacheWithCookieHeaderAndNonPublicResponse()
     {
-        $this->setNextResponse(200, array('ETag' => '"Foo"'));
-        $this->request('GET', '/', array(), array('foo' => 'bar'));
+        $this->setNextResponse(200, ['ETag' => '"Foo"']);
+        $this->request('GET', '/', [], ['foo' => 'bar']);
 
         $this->assertHttpKernelIsCalled();
         $this->assertResponseOk();
@@ -115,7 +115,7 @@ public function testDoesNotCacheWithCookieHeaderAndNonPublicResponse()
     public function testDoesNotCacheRequestsWithACookieHeader()
     {
         $this->setNextResponse(200);
-        $this->request('GET', '/', array(), array('foo' => 'bar'));
+        $this->request('GET', '/', [], ['foo' => 'bar']);
 
         $this->assertHttpKernelIsCalled();
         $this->assertResponseOk();
@@ -129,8 +129,8 @@ public function testRespondsWith304WhenIfModifiedSinceMatchesLastModified()
     {
         $time = \DateTime::createFromFormat('U', time());
 
-        $this->setNextResponse(200, array('Cache-Control' => 'public', 'Last-Modified' => $time->format(DATE_RFC2822), 'Content-Type' => 'text/plain'), 'Hello World');
-        $this->request('GET', '/', array('HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)));
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'Last-Modified' => $time->format(DATE_RFC2822), 'Content-Type' => 'text/plain'], 'Hello World');
+        $this->request('GET', '/', ['HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)]);
 
         $this->assertHttpKernelIsCalled();
         $this->assertEquals(304, $this->response->getStatusCode());
@@ -142,8 +142,8 @@ public function testRespondsWith304WhenIfModifiedSinceMatchesLastModified()
 
     public function testRespondsWith304WhenIfNoneMatchMatchesETag()
     {
-        $this->setNextResponse(200, array('Cache-Control' => 'public', 'ETag' => '12345', 'Content-Type' => 'text/plain'), 'Hello World');
-        $this->request('GET', '/', array('HTTP_IF_NONE_MATCH' => '12345'));
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'ETag' => '12345', 'Content-Type' => 'text/plain'], 'Hello World');
+        $this->request('GET', '/', ['HTTP_IF_NONE_MATCH' => '12345']);
 
         $this->assertHttpKernelIsCalled();
         $this->assertEquals(304, $this->response->getStatusCode());
@@ -158,7 +158,7 @@ public function testRespondsWith304OnlyIfIfNoneMatchAndIfModifiedSinceBothMatch(
     {
         $time = \DateTime::createFromFormat('U', time());
 
-        $this->setNextResponse(200, array(), '', function ($request, $response) use ($time) {
+        $this->setNextResponse(200, [], '', function ($request, $response) use ($time) {
             $response->setStatusCode(200);
             $response->headers->set('ETag', '12345');
             $response->headers->set('Last-Modified', $time->format(DATE_RFC2822));
@@ -168,17 +168,17 @@ public function testRespondsWith304OnlyIfIfNoneMatchAndIfModifiedSinceBothMatch(
 
         // only ETag matches
         $t = \DateTime::createFromFormat('U', time() - 3600);
-        $this->request('GET', '/', array('HTTP_IF_NONE_MATCH' => '12345', 'HTTP_IF_MODIFIED_SINCE' => $t->format(DATE_RFC2822)));
+        $this->request('GET', '/', ['HTTP_IF_NONE_MATCH' => '12345', 'HTTP_IF_MODIFIED_SINCE' => $t->format(DATE_RFC2822)]);
         $this->assertHttpKernelIsCalled();
         $this->assertEquals(200, $this->response->getStatusCode());
 
         // only Last-Modified matches
-        $this->request('GET', '/', array('HTTP_IF_NONE_MATCH' => '1234', 'HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)));
+        $this->request('GET', '/', ['HTTP_IF_NONE_MATCH' => '1234', 'HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)]);
         $this->assertHttpKernelIsCalled();
         $this->assertEquals(200, $this->response->getStatusCode());
 
         // Both matches
-        $this->request('GET', '/', array('HTTP_IF_NONE_MATCH' => '12345', 'HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)));
+        $this->request('GET', '/', ['HTTP_IF_NONE_MATCH' => '12345', 'HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)]);
         $this->assertHttpKernelIsCalled();
         $this->assertEquals(304, $this->response->getStatusCode());
     }
@@ -187,10 +187,10 @@ public function testIncrementsMaxAgeWhenNoDateIsSpecifiedEventWhenUsingETag()
     {
         $this->setNextResponse(
             200,
-            array(
+            [
                 'ETag' => '1234',
                 'Cache-Control' => 'public, s-maxage=60',
-            )
+            ]
         );
 
         $this->request('GET', '/');
@@ -210,7 +210,7 @@ public function testIncrementsMaxAgeWhenNoDateIsSpecifiedEventWhenUsingETag()
 
     public function testValidatesPrivateResponsesCachedOnTheClient()
     {
-        $this->setNextResponse(200, array(), '', function ($request, $response) {
+        $this->setNextResponse(200, [], '', function ($request, $response) {
             $etags = preg_split('/\s*,\s*/', $request->headers->get('IF_NONE_MATCH'));
             if ($request->cookies->has('authenticated')) {
                 $response->headers->set('Cache-Control', 'private, no-store');
@@ -243,7 +243,7 @@ public function testValidatesPrivateResponsesCachedOnTheClient()
         $this->assertTraceContains('miss');
         $this->assertTraceContains('store');
 
-        $this->request('GET', '/', array(), array('authenticated' => ''));
+        $this->request('GET', '/', [], ['authenticated' => '']);
         $this->assertHttpKernelIsCalled();
         $this->assertEquals(200, $this->response->getStatusCode());
         $this->assertEquals('"private tag"', $this->response->headers->get('ETag'));
@@ -257,8 +257,8 @@ public function testStoresResponsesWhenNoCacheRequestDirectivePresent()
     {
         $time = \DateTime::createFromFormat('U', time() + 5);
 
-        $this->setNextResponse(200, array('Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)));
-        $this->request('GET', '/', array('HTTP_CACHE_CONTROL' => 'no-cache'));
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)]);
+        $this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'no-cache']);
 
         $this->assertHttpKernelIsCalled();
         $this->assertTraceContains('store');
@@ -269,7 +269,7 @@ public function testReloadsResponsesWhenCacheHitsButNoCacheRequestDirectivePrese
     {
         $count = 0;
 
-        $this->setNextResponse(200, array('Cache-Control' => 'public, max-age=10000'), '', function ($request, $response) use (&$count) {
+        $this->setNextResponse(200, ['Cache-Control' => 'public, max-age=10000'], '', function ($request, $response) use (&$count) {
             ++$count;
             $response->setContent(1 == $count ? 'Hello World' : 'Goodbye World');
         });
@@ -285,7 +285,7 @@ public function testReloadsResponsesWhenCacheHitsButNoCacheRequestDirectivePrese
         $this->assertTraceContains('fresh');
 
         $this->cacheConfig['allow_reload'] = true;
-        $this->request('GET', '/', array('HTTP_CACHE_CONTROL' => 'no-cache'));
+        $this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'no-cache']);
         $this->assertEquals(200, $this->response->getStatusCode());
         $this->assertEquals('Goodbye World', $this->response->getContent());
         $this->assertTraceContains('reload');
@@ -296,7 +296,7 @@ public function testDoesNotReloadResponsesWhenAllowReloadIsSetFalseDefault()
     {
         $count = 0;
 
-        $this->setNextResponse(200, array('Cache-Control' => 'public, max-age=10000'), '', function ($request, $response) use (&$count) {
+        $this->setNextResponse(200, ['Cache-Control' => 'public, max-age=10000'], '', function ($request, $response) use (&$count) {
             ++$count;
             $response->setContent(1 == $count ? 'Hello World' : 'Goodbye World');
         });
@@ -312,12 +312,12 @@ public function testDoesNotReloadResponsesWhenAllowReloadIsSetFalseDefault()
         $this->assertTraceContains('fresh');
 
         $this->cacheConfig['allow_reload'] = false;
-        $this->request('GET', '/', array('HTTP_CACHE_CONTROL' => 'no-cache'));
+        $this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'no-cache']);
         $this->assertEquals(200, $this->response->getStatusCode());
         $this->assertEquals('Hello World', $this->response->getContent());
         $this->assertTraceNotContains('reload');
 
-        $this->request('GET', '/', array('HTTP_CACHE_CONTROL' => 'no-cache'));
+        $this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'no-cache']);
         $this->assertEquals(200, $this->response->getStatusCode());
         $this->assertEquals('Hello World', $this->response->getContent());
         $this->assertTraceNotContains('reload');
@@ -327,7 +327,7 @@ public function testRevalidatesFreshCacheEntryWhenMaxAgeRequestDirectiveIsExceed
     {
         $count = 0;
 
-        $this->setNextResponse(200, array(), '', function ($request, $response) use (&$count) {
+        $this->setNextResponse(200, [], '', function ($request, $response) use (&$count) {
             ++$count;
             $response->headers->set('Cache-Control', 'public, max-age=10000');
             $response->setETag($count);
@@ -345,7 +345,7 @@ public function testRevalidatesFreshCacheEntryWhenMaxAgeRequestDirectiveIsExceed
         $this->assertTraceContains('fresh');
 
         $this->cacheConfig['allow_revalidate'] = true;
-        $this->request('GET', '/', array('HTTP_CACHE_CONTROL' => 'max-age=0'));
+        $this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'max-age=0']);
         $this->assertEquals(200, $this->response->getStatusCode());
         $this->assertEquals('Goodbye World', $this->response->getContent());
         $this->assertTraceContains('stale');
@@ -357,7 +357,7 @@ public function testDoesNotRevalidateFreshCacheEntryWhenEnableRevalidateOptionIs
     {
         $count = 0;
 
-        $this->setNextResponse(200, array(), '', function ($request, $response) use (&$count) {
+        $this->setNextResponse(200, [], '', function ($request, $response) use (&$count) {
             ++$count;
             $response->headers->set('Cache-Control', 'public, max-age=10000');
             $response->setETag($count);
@@ -375,14 +375,14 @@ public function testDoesNotRevalidateFreshCacheEntryWhenEnableRevalidateOptionIs
         $this->assertTraceContains('fresh');
 
         $this->cacheConfig['allow_revalidate'] = false;
-        $this->request('GET', '/', array('HTTP_CACHE_CONTROL' => 'max-age=0'));
+        $this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'max-age=0']);
         $this->assertEquals(200, $this->response->getStatusCode());
         $this->assertEquals('Hello World', $this->response->getContent());
         $this->assertTraceNotContains('stale');
         $this->assertTraceNotContains('invalid');
         $this->assertTraceContains('fresh');
 
-        $this->request('GET', '/', array('HTTP_CACHE_CONTROL' => 'max-age=0'));
+        $this->request('GET', '/', ['HTTP_CACHE_CONTROL' => 'max-age=0']);
         $this->assertEquals(200, $this->response->getStatusCode());
         $this->assertEquals('Hello World', $this->response->getContent());
         $this->assertTraceNotContains('stale');
@@ -393,7 +393,7 @@ public function testDoesNotRevalidateFreshCacheEntryWhenEnableRevalidateOptionIs
     public function testFetchesResponseFromBackendWhenCacheMisses()
     {
         $time = \DateTime::createFromFormat('U', time() + 5);
-        $this->setNextResponse(200, array('Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)));
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)]);
 
         $this->request('GET', '/');
         $this->assertEquals(200, $this->response->getStatusCode());
@@ -405,7 +405,7 @@ public function testDoesNotCacheSomeStatusCodeResponses()
     {
         foreach (array_merge(range(201, 202), range(204, 206), range(303, 305), range(400, 403), range(405, 409), range(411, 417), range(500, 505)) as $code) {
             $time = \DateTime::createFromFormat('U', time() + 5);
-            $this->setNextResponse($code, array('Expires' => $time->format(DATE_RFC2822)));
+            $this->setNextResponse($code, ['Expires' => $time->format(DATE_RFC2822)]);
 
             $this->request('GET', '/');
             $this->assertEquals($code, $this->response->getStatusCode());
@@ -417,7 +417,7 @@ public function testDoesNotCacheSomeStatusCodeResponses()
     public function testDoesNotCacheResponsesWithExplicitNoStoreDirective()
     {
         $time = \DateTime::createFromFormat('U', time() + 5);
-        $this->setNextResponse(200, array('Expires' => $time->format(DATE_RFC2822), 'Cache-Control' => 'no-store'));
+        $this->setNextResponse(200, ['Expires' => $time->format(DATE_RFC2822), 'Cache-Control' => 'no-store']);
 
         $this->request('GET', '/');
         $this->assertTraceNotContains('store');
@@ -436,7 +436,7 @@ public function testDoesNotCacheResponsesWithoutFreshnessInformationOrAValidator
     public function testCachesResponsesWithExplicitNoCacheDirective()
     {
         $time = \DateTime::createFromFormat('U', time() + 5);
-        $this->setNextResponse(200, array('Expires' => $time->format(DATE_RFC2822), 'Cache-Control' => 'public, no-cache'));
+        $this->setNextResponse(200, ['Expires' => $time->format(DATE_RFC2822), 'Cache-Control' => 'public, no-cache']);
 
         $this->request('GET', '/');
         $this->assertTraceContains('store');
@@ -446,7 +446,7 @@ public function testCachesResponsesWithExplicitNoCacheDirective()
     public function testCachesResponsesWithAnExpirationHeader()
     {
         $time = \DateTime::createFromFormat('U', time() + 5);
-        $this->setNextResponse(200, array('Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)));
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)]);
 
         $this->request('GET', '/');
         $this->assertEquals(200, $this->response->getStatusCode());
@@ -462,7 +462,7 @@ public function testCachesResponsesWithAnExpirationHeader()
 
     public function testCachesResponsesWithAMaxAgeDirective()
     {
-        $this->setNextResponse(200, array('Cache-Control' => 'public, max-age=5'));
+        $this->setNextResponse(200, ['Cache-Control' => 'public, max-age=5']);
 
         $this->request('GET', '/');
         $this->assertEquals(200, $this->response->getStatusCode());
@@ -478,7 +478,7 @@ public function testCachesResponsesWithAMaxAgeDirective()
 
     public function testCachesResponsesWithASMaxAgeDirective()
     {
-        $this->setNextResponse(200, array('Cache-Control' => 's-maxage=5'));
+        $this->setNextResponse(200, ['Cache-Control' => 's-maxage=5']);
 
         $this->request('GET', '/');
         $this->assertEquals(200, $this->response->getStatusCode());
@@ -495,7 +495,7 @@ public function testCachesResponsesWithASMaxAgeDirective()
     public function testCachesResponsesWithALastModifiedValidatorButNoFreshnessInformation()
     {
         $time = \DateTime::createFromFormat('U', time());
-        $this->setNextResponse(200, array('Cache-Control' => 'public', 'Last-Modified' => $time->format(DATE_RFC2822)));
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'Last-Modified' => $time->format(DATE_RFC2822)]);
 
         $this->request('GET', '/');
         $this->assertEquals(200, $this->response->getStatusCode());
@@ -506,7 +506,7 @@ public function testCachesResponsesWithALastModifiedValidatorButNoFreshnessInfor
 
     public function testCachesResponsesWithAnETagValidatorButNoFreshnessInformation()
     {
-        $this->setNextResponse(200, array('Cache-Control' => 'public', 'ETag' => '"123456"'));
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'ETag' => '"123456"']);
 
         $this->request('GET', '/');
         $this->assertEquals(200, $this->response->getStatusCode());
@@ -519,7 +519,7 @@ public function testHitsCachedResponsesWithExpiresHeader()
     {
         $time1 = \DateTime::createFromFormat('U', time() - 5);
         $time2 = \DateTime::createFromFormat('U', time() + 5);
-        $this->setNextResponse(200, array('Cache-Control' => 'public', 'Date' => $time1->format(DATE_RFC2822), 'Expires' => $time2->format(DATE_RFC2822)));
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'Date' => $time1->format(DATE_RFC2822), 'Expires' => $time2->format(DATE_RFC2822)]);
 
         $this->request('GET', '/');
         $this->assertHttpKernelIsCalled();
@@ -543,7 +543,7 @@ public function testHitsCachedResponsesWithExpiresHeader()
     public function testHitsCachedResponseWithMaxAgeDirective()
     {
         $time = \DateTime::createFromFormat('U', time() - 5);
-        $this->setNextResponse(200, array('Date' => $time->format(DATE_RFC2822), 'Cache-Control' => 'public, max-age=10'));
+        $this->setNextResponse(200, ['Date' => $time->format(DATE_RFC2822), 'Cache-Control' => 'public, max-age=10']);
 
         $this->request('GET', '/');
         $this->assertHttpKernelIsCalled();
@@ -573,7 +573,7 @@ public function testDegradationWhenCacheLocked()
         $this->cacheConfig['stale_while_revalidate'] = 10;
 
         // The prescence of Last-Modified makes this cacheable (because Response::isValidateable() then).
-        $this->setNextResponse(200, array('Cache-Control' => 'public, s-maxage=5', 'Last-Modified' => 'some while ago'), 'Old response');
+        $this->setNextResponse(200, ['Cache-Control' => 'public, s-maxage=5', 'Last-Modified' => 'some while ago'], 'Old response');
         $this->request('GET', '/'); // warm the cache
 
         // Now, lock the cache
@@ -607,7 +607,7 @@ public function testDegradationWhenCacheLocked()
     public function testHitsCachedResponseWithSMaxAgeDirective()
     {
         $time = \DateTime::createFromFormat('U', time() - 5);
-        $this->setNextResponse(200, array('Date' => $time->format(DATE_RFC2822), 'Cache-Control' => 's-maxage=10, max-age=0'));
+        $this->setNextResponse(200, ['Date' => $time->format(DATE_RFC2822), 'Cache-Control' => 's-maxage=10, max-age=0']);
 
         $this->request('GET', '/');
         $this->assertHttpKernelIsCalled();
@@ -752,7 +752,7 @@ public function testAssignsDefaultTtlWhenResponseHasNoFreshnessInformationAndAft
 
     public function testDoesNotAssignDefaultTtlWhenResponseHasMustRevalidateDirective()
     {
-        $this->setNextResponse(200, array('Cache-Control' => 'must-revalidate'));
+        $this->setNextResponse(200, ['Cache-Control' => 'must-revalidate']);
 
         $this->cacheConfig['default_ttl'] = 10;
         $this->request('GET', '/');
@@ -767,7 +767,7 @@ public function testDoesNotAssignDefaultTtlWhenResponseHasMustRevalidateDirectiv
     public function testFetchesFullResponseWhenCacheStaleAndNoValidatorsPresent()
     {
         $time = \DateTime::createFromFormat('U', time() + 5);
-        $this->setNextResponse(200, array('Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)));
+        $this->setNextResponse(200, ['Cache-Control' => 'public', 'Expires' => $time->format(DATE_RFC2822)]);
 
         // build initial request
         $this->request('GET', '/');
@@ -807,7 +807,7 @@ public function testFetchesFullResponseWhenCacheStaleAndNoValidatorsPresent()
     public function testValidatesCachedResponsesWithLastModifiedAndNoFreshnessInformation()
     {
         $time = \DateTime::createFromFormat('U', time());
-        $this->setNextResponse(200, array(), 'Hello World', function ($request, $response) use ($time) {
+        $this->setNextResponse(200, [], 'Hello World', function ($request, $response) use ($time) {
             $response->headers->set('Cache-Control', 'public');
             $response->headers->set('Last-Modified', $time->format(DATE_RFC2822));
             if ($time->format(DATE_RFC2822) == $request->headers->get('IF_MODIFIED_SINCE')) {
@@ -845,7 +845,7 @@ public function testValidatesCachedResponsesUseSameHttpMethod()
     {
         $test = $this;
 
-        $this->setNextResponse(200, array(), 'Hello World', function ($request, $response) use ($test) {
+        $this->setNextResponse(200, [], 'Hello World', function ($request, $response) use ($test) {
             $test->assertSame('OPTIONS', $request->getMethod());
         });
 
@@ -858,7 +858,7 @@ public function testValidatesCachedResponsesUseSameHttpMethod()
 
     public function testValidatesCachedResponsesWithETagAndNoFreshnessInformation()
     {
-        $this->setNextResponse(200, array(), 'Hello World', function ($request, $response) {
+        $this->setNextResponse(200, [], 'Hello World', function ($request, $response) {
             $response->headers->set('Cache-Control', 'public');
             $response->headers->set('ETag', '"12345"');
             if ($response->getETag() == $request->headers->get('IF_NONE_MATCH')) {
@@ -895,7 +895,7 @@ public function testServesResponseWhileFreshAndRevalidatesWithLastModifiedInform
     {
         $time = \DateTime::createFromFormat('U', time());
 
-        $this->setNextResponse(200, array(), 'Hello World', function (Request $request, Response $response) use ($time) {
+        $this->setNextResponse(200, [], 'Hello World', function (Request $request, Response $response) use ($time) {
             $response->setSharedMaxAge(10);
             $response->headers->set('Last-Modified', $time->format(DATE_RFC2822));
         });
@@ -913,7 +913,7 @@ public function testServesResponseWhileFreshAndRevalidatesWithLastModifiedInform
 
         sleep(15); // expire the cache
 
-        $this->setNextResponse(304, array(), '', function (Request $request, Response $response) use ($time) {
+        $this->setNextResponse(304, [], '', function (Request $request, Response $response) use ($time) {
             $this->assertEquals($time->format(DATE_RFC2822), $request->headers->get('IF_MODIFIED_SINCE'));
         });
 
@@ -929,7 +929,7 @@ public function testReplacesCachedResponsesWhenValidationResultsInNon304Response
     {
         $time = \DateTime::createFromFormat('U', time());
         $count = 0;
-        $this->setNextResponse(200, array(), 'Hello World', function ($request, $response) use ($time, &$count) {
+        $this->setNextResponse(200, [], 'Hello World', function ($request, $response) use ($time, &$count) {
             $response->headers->set('Last-Modified', $time->format(DATE_RFC2822));
             $response->headers->set('Cache-Control', 'public');
             switch (++$count) {
@@ -966,20 +966,20 @@ public function testReplacesCachedResponsesWhenValidationResultsInNon304Response
 
     public function testPassesHeadRequestsThroughDirectlyOnPass()
     {
-        $this->setNextResponse(200, array(), 'Hello World', function ($request, $response) {
+        $this->setNextResponse(200, [], 'Hello World', function ($request, $response) {
             $response->setContent('');
             $response->setStatusCode(200);
             $this->assertEquals('HEAD', $request->getMethod());
         });
 
-        $this->request('HEAD', '/', array('HTTP_EXPECT' => 'something ...'));
+        $this->request('HEAD', '/', ['HTTP_EXPECT' => 'something ...']);
         $this->assertHttpKernelIsCalled();
         $this->assertEquals('', $this->response->getContent());
     }
 
     public function testUsesCacheToRespondToHeadRequestsWhenFresh()
     {
-        $this->setNextResponse(200, array(), 'Hello World', function ($request, $response) {
+        $this->setNextResponse(200, [], 'Hello World', function ($request, $response) {
             $response->headers->set('Cache-Control', 'public, max-age=10');
             $response->setContent('Hello World');
             $response->setStatusCode(200);
@@ -1000,7 +1000,7 @@ public function testUsesCacheToRespondToHeadRequestsWhenFresh()
     public function testSendsNoContentWhenFresh()
     {
         $time = \DateTime::createFromFormat('U', time());
-        $this->setNextResponse(200, array(), 'Hello World', function ($request, $response) use ($time) {
+        $this->setNextResponse(200, [], 'Hello World', function ($request, $response) use ($time) {
             $response->headers->set('Cache-Control', 'public, max-age=10');
             $response->headers->set('Last-Modified', $time->format(DATE_RFC2822));
         });
@@ -1009,7 +1009,7 @@ public function testSendsNoContentWhenFresh()
         $this->assertHttpKernelIsCalled();
         $this->assertEquals('Hello World', $this->response->getContent());
 
-        $this->request('GET', '/', array('HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)));
+        $this->request('GET', '/', ['HTTP_IF_MODIFIED_SINCE' => $time->format(DATE_RFC2822)]);
         $this->assertHttpKernelIsNotCalled();
         $this->assertEquals(304, $this->response->getStatusCode());
         $this->assertEquals('', $this->response->getContent());
@@ -1017,7 +1017,7 @@ public function testSendsNoContentWhenFresh()
 
     public function testInvalidatesCachedResponsesOnPost()
     {
-        $this->setNextResponse(200, array(), 'Hello World', function ($request, $response) {
+        $this->setNextResponse(200, [], 'Hello World', function ($request, $response) {
             if ('GET' == $request->getMethod()) {
                 $response->setStatusCode(200);
                 $response->headers->set('Cache-Control', 'public, max-age=500');
@@ -1066,20 +1066,20 @@ public function testInvalidatesCachedResponsesOnPost()
     public function testServesFromCacheWhenHeadersMatch()
     {
         $count = 0;
-        $this->setNextResponse(200, array('Cache-Control' => 'max-age=10000'), '', function ($request, $response) use (&$count) {
+        $this->setNextResponse(200, ['Cache-Control' => 'max-age=10000'], '', function ($request, $response) use (&$count) {
             $response->headers->set('Vary', 'Accept User-Agent Foo');
             $response->headers->set('Cache-Control', 'public, max-age=10');
             $response->headers->set('X-Response-Count', ++$count);
             $response->setContent($request->headers->get('USER_AGENT'));
         });
 
-        $this->request('GET', '/', array('HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0'));
+        $this->request('GET', '/', ['HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0']);
         $this->assertEquals(200, $this->response->getStatusCode());
         $this->assertEquals('Bob/1.0', $this->response->getContent());
         $this->assertTraceContains('miss');
         $this->assertTraceContains('store');
 
-        $this->request('GET', '/', array('HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0'));
+        $this->request('GET', '/', ['HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0']);
         $this->assertEquals(200, $this->response->getStatusCode());
         $this->assertEquals('Bob/1.0', $this->response->getContent());
         $this->assertTraceContains('fresh');
@@ -1090,36 +1090,36 @@ public function testServesFromCacheWhenHeadersMatch()
     public function testStoresMultipleResponsesWhenHeadersDiffer()
     {
         $count = 0;
-        $this->setNextResponse(200, array('Cache-Control' => 'max-age=10000'), '', function ($request, $response) use (&$count) {
+        $this->setNextResponse(200, ['Cache-Control' => 'max-age=10000'], '', function ($request, $response) use (&$count) {
             $response->headers->set('Vary', 'Accept User-Agent Foo');
             $response->headers->set('Cache-Control', 'public, max-age=10');
             $response->headers->set('X-Response-Count', ++$count);
             $response->setContent($request->headers->get('USER_AGENT'));
         });
 
-        $this->request('GET', '/', array('HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0'));
+        $this->request('GET', '/', ['HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0']);
         $this->assertEquals(200, $this->response->getStatusCode());
         $this->assertEquals('Bob/1.0', $this->response->getContent());
         $this->assertEquals(1, $this->response->headers->get('X-Response-Count'));
 
-        $this->request('GET', '/', array('HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/2.0'));
+        $this->request('GET', '/', ['HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/2.0']);
         $this->assertEquals(200, $this->response->getStatusCode());
         $this->assertTraceContains('miss');
         $this->assertTraceContains('store');
         $this->assertEquals('Bob/2.0', $this->response->getContent());
         $this->assertEquals(2, $this->response->headers->get('X-Response-Count'));
 
-        $this->request('GET', '/', array('HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0'));
+        $this->request('GET', '/', ['HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/1.0']);
         $this->assertTraceContains('fresh');
         $this->assertEquals('Bob/1.0', $this->response->getContent());
         $this->assertEquals(1, $this->response->headers->get('X-Response-Count'));
 
-        $this->request('GET', '/', array('HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/2.0'));
+        $this->request('GET', '/', ['HTTP_ACCEPT' => 'text/html', 'HTTP_USER_AGENT' => 'Bob/2.0']);
         $this->assertTraceContains('fresh');
         $this->assertEquals('Bob/2.0', $this->response->getContent());
         $this->assertEquals(2, $this->response->headers->get('X-Response-Count'));
 
-        $this->request('GET', '/', array('HTTP_USER_AGENT' => 'Bob/2.0'));
+        $this->request('GET', '/', ['HTTP_USER_AGENT' => 'Bob/2.0']);
         $this->assertTraceContains('miss');
         $this->assertEquals('Bob/2.0', $this->response->getContent());
         $this->assertEquals(3, $this->response->headers->get('X-Response-Count'));
@@ -1141,7 +1141,7 @@ public function testShouldCatchExceptionsWhenReloadingAndNoCacheRequest()
 
         $this->setNextResponse();
         $this->cacheConfig['allow_reload'] = true;
-        $this->request('GET', '/', array(), array(), false, array('Pragma' => 'no-cache'));
+        $this->request('GET', '/', [], [], false, ['Pragma' => 'no-cache']);
 
         $this->assertExceptionsAreCaught();
     }
@@ -1158,30 +1158,30 @@ public function testShouldNotCatchExceptions()
 
     public function testEsiCacheSendsTheLowestTtl()
     {
-        $responses = array(
-            array(
+        $responses = [
+            [
                 'status' => 200,
                 'body' => '<esi:include src="/foo" /> <esi:include src="/bar" />',
-                'headers' => array(
+                'headers' => [
                     'Cache-Control' => 's-maxage=300',
                     'Surrogate-Control' => 'content="ESI/1.0"',
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 'status' => 200,
                 'body' => 'Hello World!',
-                'headers' => array('Cache-Control' => 's-maxage=200'),
-            ),
-            array(
+                'headers' => ['Cache-Control' => 's-maxage=200'],
+            ],
+            [
                 'status' => 200,
                 'body' => 'My name is Bobby.',
-                'headers' => array('Cache-Control' => 's-maxage=100'),
-            ),
-        );
+                'headers' => ['Cache-Control' => 's-maxage=100'],
+            ],
+        ];
 
         $this->setNextResponses($responses);
 
-        $this->request('GET', '/', array(), array(), true);
+        $this->request('GET', '/', [], [], true);
         $this->assertEquals('Hello World! My name is Bobby.', $this->response->getContent());
 
         $this->assertEquals(100, $this->response->getTtl());
@@ -1189,25 +1189,25 @@ public function testEsiCacheSendsTheLowestTtl()
 
     public function testEsiCacheSendsTheLowestTtlForHeadRequests()
     {
-        $responses = array(
-            array(
+        $responses = [
+            [
                 'status' => 200,
                 'body' => 'I am a long-lived master response, but I embed a short-lived resource: <esi:include src="/foo" />',
-                'headers' => array(
+                'headers' => [
                     'Cache-Control' => 's-maxage=300',
                     'Surrogate-Control' => 'content="ESI/1.0"',
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 'status' => 200,
                 'body' => 'I am a short-lived resource',
-                'headers' => array('Cache-Control' => 's-maxage=100'),
-            ),
-        );
+                'headers' => ['Cache-Control' => 's-maxage=100'],
+            ],
+        ];
 
         $this->setNextResponses($responses);
 
-        $this->request('HEAD', '/', array(), array(), true);
+        $this->request('HEAD', '/', [], [], true);
 
         $this->assertEmpty($this->response->getContent());
         $this->assertEquals(100, $this->response->getTtl());
@@ -1215,30 +1215,30 @@ public function testEsiCacheSendsTheLowestTtlForHeadRequests()
 
     public function testEsiCacheForceValidation()
     {
-        $responses = array(
-            array(
+        $responses = [
+            [
                 'status' => 200,
                 'body' => '<esi:include src="/foo" /> <esi:include src="/bar" />',
-                'headers' => array(
+                'headers' => [
                     'Cache-Control' => 's-maxage=300',
                     'Surrogate-Control' => 'content="ESI/1.0"',
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 'status' => 200,
                 'body' => 'Hello World!',
-                'headers' => array('ETag' => 'foobar'),
-            ),
-            array(
+                'headers' => ['ETag' => 'foobar'],
+            ],
+            [
                 'status' => 200,
                 'body' => 'My name is Bobby.',
-                'headers' => array('Cache-Control' => 's-maxage=100'),
-            ),
-        );
+                'headers' => ['Cache-Control' => 's-maxage=100'],
+            ],
+        ];
 
         $this->setNextResponses($responses);
 
-        $this->request('GET', '/', array(), array(), true);
+        $this->request('GET', '/', [], [], true);
         $this->assertEquals('Hello World! My name is Bobby.', $this->response->getContent());
         $this->assertNull($this->response->getTtl());
         $this->assertTrue($this->response->mustRevalidate());
@@ -1248,25 +1248,25 @@ public function testEsiCacheForceValidation()
 
     public function testEsiCacheForceValidationForHeadRequests()
     {
-        $responses = array(
-            array(
+        $responses = [
+            [
                 'status' => 200,
                 'body' => 'I am the master response and use expiration caching, but I embed another resource: <esi:include src="/foo" />',
-                'headers' => array(
+                'headers' => [
                     'Cache-Control' => 's-maxage=300',
                     'Surrogate-Control' => 'content="ESI/1.0"',
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 'status' => 200,
                 'body' => 'I am the embedded resource and use validation caching',
-                'headers' => array('ETag' => 'foobar'),
-            ),
-        );
+                'headers' => ['ETag' => 'foobar'],
+            ],
+        ];
 
         $this->setNextResponses($responses);
 
-        $this->request('HEAD', '/', array(), array(), true);
+        $this->request('HEAD', '/', [], [], true);
 
         // The response has been assembled from expiration and validation based resources
         // This can neither be cached nor revalidated, so it should be private/no cache
@@ -1279,50 +1279,50 @@ public function testEsiCacheForceValidationForHeadRequests()
 
     public function testEsiRecalculateContentLengthHeader()
     {
-        $responses = array(
-            array(
+        $responses = [
+            [
                 'status' => 200,
                 'body' => '<esi:include src="/foo" />',
-                'headers' => array(
+                'headers' => [
                     'Content-Length' => 26,
                     'Surrogate-Control' => 'content="ESI/1.0"',
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 'status' => 200,
                 'body' => 'Hello World!',
-                'headers' => array(),
-            ),
-        );
+                'headers' => [],
+            ],
+        ];
 
         $this->setNextResponses($responses);
 
-        $this->request('GET', '/', array(), array(), true);
+        $this->request('GET', '/', [], [], true);
         $this->assertEquals('Hello World!', $this->response->getContent());
         $this->assertEquals(12, $this->response->headers->get('Content-Length'));
     }
 
     public function testEsiRecalculateContentLengthHeaderForHeadRequest()
     {
-        $responses = array(
-            array(
+        $responses = [
+            [
                 'status' => 200,
                 'body' => '<esi:include src="/foo" />',
-                'headers' => array(
+                'headers' => [
                     'Content-Length' => 26,
                     'Surrogate-Control' => 'content="ESI/1.0"',
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 'status' => 200,
                 'body' => 'Hello World!',
-                'headers' => array(),
-            ),
-        );
+                'headers' => [],
+            ],
+        ];
 
         $this->setNextResponses($responses);
 
-        $this->request('HEAD', '/', array(), array(), true);
+        $this->request('HEAD', '/', [], [], true);
 
         // https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.13
         // "The Content-Length entity-header field indicates the size of the entity-body,
@@ -1336,7 +1336,7 @@ public function testEsiRecalculateContentLengthHeaderForHeadRequest()
     public function testClientIpIsAlwaysLocalhostForForwardedRequests()
     {
         $this->setNextResponse();
-        $this->request('GET', '/', array('REMOTE_ADDR' => '10.0.0.1'));
+        $this->request('GET', '/', ['REMOTE_ADDR' => '10.0.0.1']);
 
         $this->kernel->assert(function ($backendRequest) {
             $this->assertSame('127.0.0.1', $backendRequest->server->get('REMOTE_ADDR'));
@@ -1351,25 +1351,25 @@ public function testHttpCacheIsSetAsATrustedProxy(array $existing)
         Request::setTrustedProxies($existing, Request::HEADER_X_FORWARDED_ALL);
 
         $this->setNextResponse();
-        $this->request('GET', '/', array('REMOTE_ADDR' => '10.0.0.1'));
+        $this->request('GET', '/', ['REMOTE_ADDR' => '10.0.0.1']);
         $this->assertSame($existing, Request::getTrustedProxies());
 
-        $existing = array_unique(array_merge($existing, array('127.0.0.1')));
+        $existing = array_unique(array_merge($existing, ['127.0.0.1']));
         $this->kernel->assert(function ($backendRequest) use ($existing) {
             $this->assertSame($existing, Request::getTrustedProxies());
             $this->assertsame('10.0.0.1', $backendRequest->getClientIp());
         });
 
-        Request::setTrustedProxies(array(), -1);
+        Request::setTrustedProxies([], -1);
     }
 
     public function getTrustedProxyData()
     {
-        return array(
-            array(array()),
-            array(array('10.0.0.2')),
-            array(array('10.0.0.2', '127.0.0.1')),
-        );
+        return [
+            [[]],
+            [['10.0.0.2']],
+            [['10.0.0.2', '127.0.0.1']],
+        ];
     }
 
     /**
@@ -1378,7 +1378,7 @@ public function getTrustedProxyData()
     public function testForwarderHeaderForForwardedRequests($forwarded, $expected)
     {
         $this->setNextResponse();
-        $server = array('REMOTE_ADDR' => '10.0.0.1');
+        $server = ['REMOTE_ADDR' => '10.0.0.1'];
         if (null !== $forwarded) {
             Request::setTrustedProxies($server, -1);
             $server['HTTP_FORWARDED'] = $forwarded;
@@ -1389,42 +1389,42 @@ public function testForwarderHeaderForForwardedRequests($forwarded, $expected)
             $this->assertSame($expected, $backendRequest->headers->get('Forwarded'));
         });
 
-        Request::setTrustedProxies(array(), -1);
+        Request::setTrustedProxies([], -1);
     }
 
     public function getForwardedData()
     {
-        return array(
-            array(null, 'for="10.0.0.1";host="localhost";proto=http'),
-            array('for=10.0.0.2', 'for="10.0.0.2";host="localhost";proto=http, for="10.0.0.1"'),
-            array('for=10.0.0.2, for=10.0.0.3', 'for="10.0.0.2";host="localhost";proto=http, for="10.0.0.3", for="10.0.0.1"'),
-        );
+        return [
+            [null, 'for="10.0.0.1";host="localhost";proto=http'],
+            ['for=10.0.0.2', 'for="10.0.0.2";host="localhost";proto=http, for="10.0.0.1"'],
+            ['for=10.0.0.2, for=10.0.0.3', 'for="10.0.0.2";host="localhost";proto=http, for="10.0.0.3", for="10.0.0.1"'],
+        ];
     }
 
     public function testEsiCacheRemoveValidationHeadersIfEmbeddedResponses()
     {
         $time = \DateTime::createFromFormat('U', time());
 
-        $responses = array(
-            array(
+        $responses = [
+            [
                 'status' => 200,
                 'body' => '<esi:include src="/hey" />',
-                'headers' => array(
+                'headers' => [
                     'Surrogate-Control' => 'content="ESI/1.0"',
                     'ETag' => 'hey',
                     'Last-Modified' => $time->format(DATE_RFC2822),
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 'status' => 200,
                 'body' => 'Hey!',
-                'headers' => array(),
-            ),
-        );
+                'headers' => [],
+            ],
+        ];
 
         $this->setNextResponses($responses);
 
-        $this->request('GET', '/', array(), array(), true);
+        $this->request('GET', '/', [], [], true);
         $this->assertNull($this->response->getETag());
         $this->assertNull($this->response->getLastModified());
     }
@@ -1433,26 +1433,26 @@ public function testEsiCacheRemoveValidationHeadersIfEmbeddedResponsesAndHeadReq
     {
         $time = \DateTime::createFromFormat('U', time());
 
-        $responses = array(
-            array(
+        $responses = [
+            [
                 'status' => 200,
                 'body' => '<esi:include src="/hey" />',
-                'headers' => array(
+                'headers' => [
                     'Surrogate-Control' => 'content="ESI/1.0"',
                     'ETag' => 'hey',
                     'Last-Modified' => $time->format(DATE_RFC2822),
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 'status' => 200,
                 'body' => 'Hey!',
-                'headers' => array(),
-            ),
-        );
+                'headers' => [],
+            ],
+        ];
 
         $this->setNextResponses($responses);
 
-        $this->request('HEAD', '/', array(), array(), true);
+        $this->request('HEAD', '/', [], [], true);
         $this->assertEmpty($this->response->getContent());
         $this->assertNull($this->response->getETag());
         $this->assertNull($this->response->getLastModified());
@@ -1460,11 +1460,11 @@ public function testEsiCacheRemoveValidationHeadersIfEmbeddedResponsesAndHeadReq
 
     public function testDoesNotCacheOptionsRequest()
     {
-        $this->setNextResponse(200, array('Cache-Control' => 'public, s-maxage=60'), 'get');
+        $this->setNextResponse(200, ['Cache-Control' => 'public, s-maxage=60'], 'get');
         $this->request('GET', '/');
         $this->assertHttpKernelIsCalled();
 
-        $this->setNextResponse(200, array('Cache-Control' => 'public, s-maxage=60'), 'options');
+        $this->setNextResponse(200, ['Cache-Control' => 'public, s-maxage=60'], 'options');
         $this->request('OPTIONS', '/');
         $this->assertHttpKernelIsCalled();
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTestCase.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTestCase.php
index b3aa2be2f0bc8..1eb461744726e 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTestCase.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTestCase.php
@@ -41,12 +41,12 @@ protected function setUp()
 
         $this->cache = null;
         $this->esi = null;
-        $this->caches = array();
-        $this->cacheConfig = array();
+        $this->caches = [];
+        $this->cacheConfig = [];
 
         $this->request = null;
         $this->response = null;
-        $this->responses = array();
+        $this->responses = [];
 
         $this->catch = false;
 
@@ -112,7 +112,7 @@ public function assertExceptionsAreNotCaught()
         $this->assertFalse($this->kernel->isCatchingExceptions());
     }
 
-    public function request($method, $uri = '/', $server = array(), $cookies = array(), $esi = false, $headers = array())
+    public function request($method, $uri = '/', $server = [], $cookies = [], $esi = false, $headers = [])
     {
         if (null === $this->kernel) {
             throw new \LogicException('You must call setNextResponse() before calling request().');
@@ -126,7 +126,7 @@ public function request($method, $uri = '/', $server = array(), $cookies = array
 
         $this->esi = $esi ? new Esi() : null;
         $this->cache = new HttpCache($this->kernel, $this->store, $this->esi, $this->cacheConfig);
-        $this->request = Request::create($uri, $method, array(), $cookies, array(), $server);
+        $this->request = Request::create($uri, $method, [], $cookies, [], $server);
         $this->request->headers->add($headers);
 
         $this->response = $this->cache->handle($this->request, HttpKernelInterface::MASTER_REQUEST, $this->catch);
@@ -136,7 +136,7 @@ public function request($method, $uri = '/', $server = array(), $cookies = array
 
     public function getMetaStorageValues()
     {
-        $values = array();
+        $values = [];
         foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(sys_get_temp_dir().'/http_cache/md', \RecursiveDirectoryIterator::SKIP_DOTS), \RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
             $values[] = file_get_contents($file);
         }
@@ -145,7 +145,7 @@ public function getMetaStorageValues()
     }
 
     // A basic response with 200 status code and a tiny body.
-    public function setNextResponse($statusCode = 200, array $headers = array(), $body = 'Hello World', \Closure $customizer = null)
+    public function setNextResponse($statusCode = 200, array $headers = [], $body = 'Hello World', \Closure $customizer = null)
     {
         $this->kernel = new TestHttpKernel($body, $statusCode, $headers, $customizer);
     }
@@ -168,7 +168,7 @@ public static function clearDirectory($directory)
 
         $fp = opendir($directory);
         while (false !== $file = readdir($fp)) {
-            if (!\in_array($file, array('.', '..'))) {
+            if (!\in_array($file, ['.', '..'])) {
                 if (is_link($directory.'/'.$file)) {
                     unlink($directory.'/'.$file);
                 } elseif (is_dir($directory.'/'.$file)) {
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php
index 26ef6cb2b8e62..786fada27fb9e 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php
@@ -187,13 +187,13 @@ public function testHandleWhenResponseIsNot200AndAltIsPresent()
         $response1 = new Response('foo');
         $response1->setStatusCode(404);
         $response2 = new Response('bar');
-        $cache = $this->getCache(Request::create('/'), array($response1, $response2));
+        $cache = $this->getCache(Request::create('/'), [$response1, $response2]);
         $this->assertEquals('bar', $ssi->handle($cache, '/', '/alt', false));
     }
 
     protected function getCache($request, $response)
     {
-        $cache = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpCache\HttpCache')->setMethods(array('getRequest', 'handle'))->disableOriginalConstructor()->getMock();
+        $cache = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpCache\HttpCache')->setMethods(['getRequest', 'handle'])->disableOriginalConstructor()->getMock();
         $cache->expects($this->any())
               ->method('getRequest')
               ->will($this->returnValue($request))
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/StoreTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/StoreTest.php
index cef019167a4ef..fc47ff2c88c56 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/StoreTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/StoreTest.php
@@ -29,7 +29,7 @@ class StoreTest extends TestCase
     protected function setUp()
     {
         $this->request = Request::create('/');
-        $this->response = new Response('hello world', 200, array());
+        $this->response = new Response('hello world', 200, []);
 
         HttpCacheTestCase::clearDirectory(sys_get_temp_dir().'/http_cache');
 
@@ -108,7 +108,7 @@ public function testFindsAStoredEntryWithLookup()
 
     public function testDoesNotFindAnEntryWithLookupWhenNoneExists()
     {
-        $request = Request::create('/test', 'get', array(), array(), array(), array('HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar'));
+        $request = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar']);
 
         $this->assertNull($this->store->lookup($request));
     }
@@ -137,7 +137,7 @@ public function testRestoresResponseHeadersProperlyWithLookup()
         $this->storeSimpleEntry();
         $response = $this->store->lookup($this->request);
 
-        $this->assertEquals($response->headers->all(), array_merge(array('content-length' => 4, 'x-body-file' => array($this->getStorePath($response->headers->get('X-Content-Digest')))), $this->response->headers->all()));
+        $this->assertEquals($response->headers->all(), array_merge(['content-length' => 4, 'x-body-file' => [$this->getStorePath($response->headers->get('X-Content-Digest'))]], $this->response->headers->all()));
     }
 
     public function testRestoresResponseContentFromEntityStoreWithLookup()
@@ -165,9 +165,9 @@ public function testSucceedsQuietlyWhenInvalidateCalledWithNoMatchingEntries()
 
     public function testDoesNotReturnEntriesThatVaryWithLookup()
     {
-        $req1 = Request::create('/test', 'get', array(), array(), array(), array('HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar'));
-        $req2 = Request::create('/test', 'get', array(), array(), array(), array('HTTP_FOO' => 'Bling', 'HTTP_BAR' => 'Bam'));
-        $res = new Response('test', 200, array('Vary' => 'Foo Bar'));
+        $req1 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar']);
+        $req2 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Bling', 'HTTP_BAR' => 'Bam']);
+        $res = new Response('test', 200, ['Vary' => 'Foo Bar']);
         $this->store->write($req1, $res);
 
         $this->assertNull($this->store->lookup($req2));
@@ -175,9 +175,9 @@ public function testDoesNotReturnEntriesThatVaryWithLookup()
 
     public function testDoesNotReturnEntriesThatSlightlyVaryWithLookup()
     {
-        $req1 = Request::create('/test', 'get', array(), array(), array(), array('HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar'));
-        $req2 = Request::create('/test', 'get', array(), array(), array(), array('HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bam'));
-        $res = new Response('test', 200, array('Vary' => array('Foo', 'Bar')));
+        $req1 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar']);
+        $req2 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bam']);
+        $res = new Response('test', 200, ['Vary' => ['Foo', 'Bar']]);
         $this->store->write($req1, $res);
 
         $this->assertNull($this->store->lookup($req2));
@@ -185,16 +185,16 @@ public function testDoesNotReturnEntriesThatSlightlyVaryWithLookup()
 
     public function testStoresMultipleResponsesForEachVaryCombination()
     {
-        $req1 = Request::create('/test', 'get', array(), array(), array(), array('HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar'));
-        $res1 = new Response('test 1', 200, array('Vary' => 'Foo Bar'));
+        $req1 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar']);
+        $res1 = new Response('test 1', 200, ['Vary' => 'Foo Bar']);
         $key = $this->store->write($req1, $res1);
 
-        $req2 = Request::create('/test', 'get', array(), array(), array(), array('HTTP_FOO' => 'Bling', 'HTTP_BAR' => 'Bam'));
-        $res2 = new Response('test 2', 200, array('Vary' => 'Foo Bar'));
+        $req2 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Bling', 'HTTP_BAR' => 'Bam']);
+        $res2 = new Response('test 2', 200, ['Vary' => 'Foo Bar']);
         $this->store->write($req2, $res2);
 
-        $req3 = Request::create('/test', 'get', array(), array(), array(), array('HTTP_FOO' => 'Baz', 'HTTP_BAR' => 'Boom'));
-        $res3 = new Response('test 3', 200, array('Vary' => 'Foo Bar'));
+        $req3 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Baz', 'HTTP_BAR' => 'Boom']);
+        $res3 = new Response('test 3', 200, ['Vary' => 'Foo Bar']);
         $this->store->write($req3, $res3);
 
         $this->assertEquals($this->getStorePath('en'.hash('sha256', 'test 3')), $this->store->lookup($req3)->getContent());
@@ -206,18 +206,18 @@ public function testStoresMultipleResponsesForEachVaryCombination()
 
     public function testOverwritesNonVaryingResponseWithStore()
     {
-        $req1 = Request::create('/test', 'get', array(), array(), array(), array('HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar'));
-        $res1 = new Response('test 1', 200, array('Vary' => 'Foo Bar'));
+        $req1 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar']);
+        $res1 = new Response('test 1', 200, ['Vary' => 'Foo Bar']);
         $key = $this->store->write($req1, $res1);
         $this->assertEquals($this->getStorePath('en'.hash('sha256', 'test 1')), $this->store->lookup($req1)->getContent());
 
-        $req2 = Request::create('/test', 'get', array(), array(), array(), array('HTTP_FOO' => 'Bling', 'HTTP_BAR' => 'Bam'));
-        $res2 = new Response('test 2', 200, array('Vary' => 'Foo Bar'));
+        $req2 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Bling', 'HTTP_BAR' => 'Bam']);
+        $res2 = new Response('test 2', 200, ['Vary' => 'Foo Bar']);
         $this->store->write($req2, $res2);
         $this->assertEquals($this->getStorePath('en'.hash('sha256', 'test 2')), $this->store->lookup($req2)->getContent());
 
-        $req3 = Request::create('/test', 'get', array(), array(), array(), array('HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar'));
-        $res3 = new Response('test 3', 200, array('Vary' => 'Foo Bar'));
+        $req3 = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar']);
+        $res3 = new Response('test 3', 200, ['Vary' => 'Foo Bar']);
         $key = $this->store->write($req3, $res3);
         $this->assertEquals($this->getStorePath('en'.hash('sha256', 'test 3')), $this->store->lookup($req3)->getContent());
 
@@ -226,7 +226,7 @@ public function testOverwritesNonVaryingResponseWithStore()
 
     public function testLocking()
     {
-        $req = Request::create('/test', 'get', array(), array(), array(), array('HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar'));
+        $req = Request::create('/test', 'get', [], [], [], ['HTTP_FOO' => 'Foo', 'HTTP_BAR' => 'Bar']);
         $this->assertTrue($this->store->lock($req));
 
         $path = $this->store->lock($req);
@@ -263,14 +263,14 @@ public function testPurgeHttpAndHttps()
         $this->assertEmpty($this->getStoreMetadata($requestHttps));
     }
 
-    protected function storeSimpleEntry($path = null, $headers = array())
+    protected function storeSimpleEntry($path = null, $headers = [])
     {
         if (null === $path) {
             $path = '/test';
         }
 
-        $this->request = Request::create($path, 'get', array(), array(), array(), $headers);
-        $this->response = new Response('test', 200, array('Cache-Control' => 'max-age=420'));
+        $this->request = Request::create($path, 'get', [], [], [], $headers);
+        $this->response = new Response('test', 200, ['Cache-Control' => 'max-age=420']);
 
         return $this->store->write($this->request, $this->response);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/SubRequestHandlerTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/SubRequestHandlerTest.php
index dfe0a734bf9f9..67b637bfe3d05 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/SubRequestHandlerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/SubRequestHandlerTest.php
@@ -33,7 +33,7 @@ protected function tearDown()
 
     public function testTrustedHeadersAreKept()
     {
-        Request::setTrustedProxies(array('10.0.0.1'), -1);
+        Request::setTrustedProxies(['10.0.0.1'], -1);
         $globalState = $this->getGlobalState();
 
         $request = Request::create('/');
@@ -82,7 +82,7 @@ public function testUntrustedHeadersAreRemoved()
 
     public function testTrustedForwardedHeader()
     {
-        Request::setTrustedProxies(array('10.0.0.1'), -1);
+        Request::setTrustedProxies(['10.0.0.1'], -1);
         $globalState = $this->getGlobalState();
 
         $request = Request::create('/');
@@ -104,7 +104,7 @@ public function testTrustedForwardedHeader()
 
     public function testTrustedXForwardedForHeader()
     {
-        Request::setTrustedProxies(array('10.0.0.1'), -1);
+        Request::setTrustedProxies(['10.0.0.1'], -1);
         $globalState = $this->getGlobalState();
 
         $request = Request::create('/');
@@ -127,10 +127,10 @@ public function testTrustedXForwardedForHeader()
 
     private function getGlobalState()
     {
-        return array(
+        return [
             Request::getTrustedProxies(),
             Request::getTrustedHeaderSet(),
-        );
+        ];
     }
 }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/TestHttpKernel.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/TestHttpKernel.php
index 5dbf02c9922da..304ff9d9e43e7 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/TestHttpKernel.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/TestHttpKernel.php
@@ -41,7 +41,7 @@ public function __construct($body, $status, $headers, \Closure $customizer = nul
 
     public function assert(\Closure $callback)
     {
-        $trustedConfig = array(Request::getTrustedProxies(), Request::getTrustedHeaderSet());
+        $trustedConfig = [Request::getTrustedProxies(), Request::getTrustedHeaderSet()];
 
         list($trustedProxies, $trustedHeaderSet, $backendRequest) = $this->backendRequest;
         Request::setTrustedProxies($trustedProxies, $trustedHeaderSet);
@@ -57,7 +57,7 @@ public function assert(\Closure $callback)
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = false)
     {
         $this->catch = $catch;
-        $this->backendRequest = array(Request::getTrustedProxies(), Request::getTrustedHeaderSet(), $request);
+        $this->backendRequest = [Request::getTrustedProxies(), Request::getTrustedHeaderSet(), $request];
 
         return parent::handle($request, $type, $catch);
     }
@@ -69,12 +69,12 @@ public function isCatchingExceptions()
 
     public function getController(Request $request)
     {
-        return array($this, 'callController');
+        return [$this, 'callController'];
     }
 
     public function getArguments(Request $request, $controller)
     {
-        return array($request);
+        return [$request];
     }
 
     public function callController(Request $request)
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php
index 712132bd13f3d..010bee86895a7 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php
@@ -21,9 +21,9 @@
 
 class TestMultipleHttpKernel extends HttpKernel implements ControllerResolverInterface, ArgumentResolverInterface
 {
-    protected $bodies = array();
-    protected $statuses = array();
-    protected $headers = array();
+    protected $bodies = [];
+    protected $statuses = [];
+    protected $headers = [];
     protected $called = false;
     protected $backendRequest;
 
@@ -52,12 +52,12 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
 
     public function getController(Request $request)
     {
-        return array($this, 'callController');
+        return [$this, 'callController'];
     }
 
     public function getArguments(Request $request, $controller)
     {
-        return array($request);
+        return [$request];
     }
 
     public function callController(Request $request)
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
index 239865a861b1d..768ec1baba01f 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
@@ -104,7 +104,7 @@ public function testHandleHttpException()
             $event->setResponse(new Response($event->getException()->getMessage()));
         });
 
-        $kernel = $this->getHttpKernel($dispatcher, function () { throw new MethodNotAllowedHttpException(array('POST')); });
+        $kernel = $this->getHttpKernel($dispatcher, function () { throw new MethodNotAllowedHttpException(['POST']); });
         $response = $kernel->handle(new Request());
 
         $this->assertEquals('405', $response->getStatusCode());
@@ -131,12 +131,12 @@ public function testLegacyHandleWhenAnExceptionIsHandledWithASpecificStatusCode(
 
     public function getStatusCodes()
     {
-        return array(
-            array(200, 404),
-            array(404, 200),
-            array(301, 200),
-            array(500, 200),
-        );
+        return [
+            [200, 404],
+            [404, 200],
+            [301, 200],
+            [500, 200],
+        ];
     }
 
     /**
@@ -158,11 +158,11 @@ public function testHandleWhenAnExceptionIsHandledWithASpecificStatusCode($expec
 
     public function getSpecificStatusCodes()
     {
-        return array(
-            array(200),
-            array(302),
-            array(403),
-        );
+        return [
+            [200],
+            [302],
+            [403],
+        ];
     }
 
     public function testHandleWhenAListenerReturnsAResponse()
@@ -267,7 +267,7 @@ public function testHandleAllowChangingControllerArguments()
     {
         $dispatcher = new EventDispatcher();
         $dispatcher->addListener(KernelEvents::CONTROLLER_ARGUMENTS, function (FilterControllerArgumentsEvent $event) {
-            $event->setArguments(array('foo'));
+            $event->setArguments(['foo']);
         });
 
         $kernel = $this->getHttpKernel($dispatcher, function ($content) { return new Response($content); });
@@ -291,12 +291,12 @@ public function testHandleAllowChangingControllerAndArguments()
             };
 
             $event->setController($newController);
-            $event->setArguments(array('bar'));
+            $event->setArguments(['bar']);
         });
 
-        $kernel = $this->getHttpKernel($dispatcher, function ($content) { return new Response($content); }, null, array('foo'));
+        $kernel = $this->getHttpKernel($dispatcher, function ($content) { return new Response($content); }, null, ['foo']);
 
-        $this->assertResponseEquals(new Response('foo', 200, array('X-Id' => 'bar')), $kernel->handle(new Request()));
+        $this->assertResponseEquals(new Response('foo', 200, ['X-Id' => 'bar']), $kernel->handle(new Request()));
     }
 
     public function testTerminate()
@@ -321,7 +321,7 @@ public function testVerifyRequestStackPushPopDuringHandle()
     {
         $request = new Request();
 
-        $stack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->setMethods(array('push', 'pop'))->getMock();
+        $stack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->setMethods(['push', 'pop'])->getMock();
         $stack->expects($this->at(0))->method('push')->with($this->equalTo($request));
         $stack->expects($this->at(1))->method('pop');
 
@@ -337,7 +337,7 @@ public function testVerifyRequestStackPushPopDuringHandle()
     public function testInconsistentClientIpsOnMasterRequests()
     {
         $request = new Request();
-        $request->setTrustedProxies(array('1.1.1.1'), Request::HEADER_X_FORWARDED_FOR | Request::HEADER_FORWARDED);
+        $request->setTrustedProxies(['1.1.1.1'], Request::HEADER_X_FORWARDED_FOR | Request::HEADER_FORWARDED);
         $request->server->set('REMOTE_ADDR', '1.1.1.1');
         $request->headers->set('FORWARDED', 'for=2.2.2.2');
         $request->headers->set('X_FORWARDED_FOR', '3.3.3.3');
@@ -350,10 +350,10 @@ public function testInconsistentClientIpsOnMasterRequests()
         $kernel = $this->getHttpKernel($dispatcher);
         $kernel->handle($request, $kernel::MASTER_REQUEST, false);
 
-        Request::setTrustedProxies(array(), -1);
+        Request::setTrustedProxies([], -1);
     }
 
-    private function getHttpKernel(EventDispatcherInterface $eventDispatcher, $controller = null, RequestStack $requestStack = null, array $arguments = array())
+    private function getHttpKernel(EventDispatcherInterface $eventDispatcher, $controller = null, RequestStack $requestStack = null, array $arguments = [])
     {
         if (null === $controller) {
             $controller = function () { return new Response('Hello'); };
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
index ab0b8cfb6ec6b..b1f78eccb3ff0 100644
--- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -92,7 +92,7 @@ public function testInitializeContainerClearsOldContainers()
 
     public function testBootInitializesBundlesAndContainer()
     {
-        $kernel = $this->getKernel(array('initializeBundles', 'initializeContainer'));
+        $kernel = $this->getKernel(['initializeBundles', 'initializeContainer']);
         $kernel->expects($this->once())
             ->method('initializeBundles');
         $kernel->expects($this->once())
@@ -107,10 +107,10 @@ public function testBootSetsTheContainerToTheBundles()
         $bundle->expects($this->once())
             ->method('setContainer');
 
-        $kernel = $this->getKernel(array('initializeBundles', 'initializeContainer', 'getBundles'));
+        $kernel = $this->getKernel(['initializeBundles', 'initializeContainer', 'getBundles']);
         $kernel->expects($this->once())
             ->method('getBundles')
-            ->will($this->returnValue(array($bundle)));
+            ->will($this->returnValue([$bundle]));
 
         $kernel->boot();
     }
@@ -118,7 +118,7 @@ public function testBootSetsTheContainerToTheBundles()
     public function testBootSetsTheBootedFlagToTrue()
     {
         // use test kernel to access isBooted()
-        $kernel = $this->getKernelForTest(array('initializeBundles', 'initializeContainer'));
+        $kernel = $this->getKernelForTest(['initializeBundles', 'initializeContainer']);
         $kernel->boot();
 
         $this->assertTrue($kernel->isBooted());
@@ -140,7 +140,7 @@ public function testClassCacheIsLoaded()
 
     public function testClassCacheIsNotLoadedByDefault()
     {
-        $kernel = $this->getKernel(array('initializeBundles', 'initializeContainer', 'doLoadClassCache'));
+        $kernel = $this->getKernel(['initializeBundles', 'initializeContainer', 'doLoadClassCache']);
         $kernel->expects($this->never())
             ->method('doLoadClassCache');
 
@@ -196,7 +196,7 @@ public function testEnvParametersResourceIsAdded()
 
     public function testBootKernelSeveralTimesOnlyInitializesBundlesOnce()
     {
-        $kernel = $this->getKernel(array('initializeBundles', 'initializeContainer'));
+        $kernel = $this->getKernel(['initializeBundles', 'initializeContainer']);
         $kernel->expects($this->once())
             ->method('initializeBundles');
 
@@ -210,7 +210,7 @@ public function testShutdownCallsShutdownOnAllBundles()
         $bundle->expects($this->once())
             ->method('shutdown');
 
-        $kernel = $this->getKernel(array(), array($bundle));
+        $kernel = $this->getKernel([], [$bundle]);
 
         $kernel->boot();
         $kernel->shutdown();
@@ -223,10 +223,10 @@ public function testShutdownGivesNullContainerToAllBundles()
             ->method('setContainer')
             ->with(null);
 
-        $kernel = $this->getKernel(array('getBundles'));
+        $kernel = $this->getKernel(['getBundles']);
         $kernel->expects($this->any())
             ->method('getBundles')
-            ->will($this->returnValue(array($bundle)));
+            ->will($this->returnValue([$bundle]));
 
         $kernel->boot();
         $kernel->shutdown();
@@ -246,7 +246,7 @@ public function testHandleCallsHandleOnHttpKernel()
             ->method('handle')
             ->with($request, $type, $catch);
 
-        $kernel = $this->getKernel(array('getHttpKernel'));
+        $kernel = $this->getKernel(['getHttpKernel']);
         $kernel->expects($this->once())
             ->method('getHttpKernel')
             ->will($this->returnValue($httpKernelMock));
@@ -264,7 +264,7 @@ public function testHandleBootsTheKernel()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $kernel = $this->getKernel(array('getHttpKernel', 'boot'));
+        $kernel = $this->getKernel(['getHttpKernel', 'boot']);
         $kernel->expects($this->once())
             ->method('getHttpKernel')
             ->will($this->returnValue($httpKernelMock));
@@ -384,7 +384,7 @@ public function testSerialize()
         $debug = true;
         $kernel = new KernelForTest($env, $debug);
 
-        $expected = serialize(array($env, $debug));
+        $expected = serialize([$env, $debug]);
         $this->assertEquals($expected, $kernel->serialize());
     }
 
@@ -731,7 +731,7 @@ public function testInitializeBundleThrowsExceptionWhenRegisteringTwoBundlesWith
         $fooBundle = $this->getBundle(null, null, 'FooBundle', 'DuplicateName');
         $barBundle = $this->getBundle(null, null, 'BarBundle', 'DuplicateName');
 
-        $kernel = $this->getKernel(array(), array($fooBundle, $barBundle));
+        $kernel = $this->getKernel([], [$fooBundle, $barBundle]);
         $kernel->boot();
     }
 
@@ -762,7 +762,7 @@ public function testTerminateDelegatesTerminationOnlyForTerminableInterface()
         // does not implement TerminableInterface
         $httpKernel = new TestKernel();
 
-        $kernel = $this->getKernel(array('getHttpKernel'));
+        $kernel = $this->getKernel(['getHttpKernel']);
         $kernel->expects($this->once())
             ->method('getHttpKernel')
             ->willReturn($httpKernel);
@@ -775,14 +775,14 @@ public function testTerminateDelegatesTerminationOnlyForTerminableInterface()
         // implements TerminableInterface
         $httpKernelMock = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernel')
             ->disableOriginalConstructor()
-            ->setMethods(array('terminate'))
+            ->setMethods(['terminate'])
             ->getMock();
 
         $httpKernelMock
             ->expects($this->once())
             ->method('terminate');
 
-        $kernel = $this->getKernel(array('getHttpKernel'));
+        $kernel = $this->getKernel(['getHttpKernel']);
         $kernel->expects($this->exactly(2))
             ->method('getHttpKernel')
             ->will($this->returnValue($httpKernelMock));
@@ -882,7 +882,7 @@ public function testServicesResetter()
             $container->addCompilerPass(new ResettableServicePass());
             $container->register('one', ResettableService::class)
                 ->setPublic(true)
-                ->addTag('kernel.reset', array('method' => 'reset'));
+                ->addTag('kernel.reset', ['method' => 'reset']);
             $container->register('services_resetter', ServicesResetter::class)->setPublic(true);
         }, $httpKernelMock, 'resetting');
 
@@ -906,7 +906,7 @@ public function testServicesResetter()
      */
     public function testKernelStartTimeIsResetWhileBootingAlreadyBootedKernel()
     {
-        $kernel = $this->getKernelForTest(array('initializeBundles'), true);
+        $kernel = $this->getKernelForTest(['initializeBundles'], true);
         $kernel->boot();
         $preReBoot = $kernel->getStartTime();
 
@@ -925,7 +925,7 @@ protected function getBundle($dir = null, $parent = null, $className = null, $bu
     {
         $bundle = $this
             ->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')
-            ->setMethods(array('getPath', 'getParent', 'getName'))
+            ->setMethods(['getPath', 'getParent', 'getName'])
             ->disableOriginalConstructor()
         ;
 
@@ -964,14 +964,14 @@ protected function getBundle($dir = null, $parent = null, $className = null, $bu
      *
      * @return Kernel
      */
-    protected function getKernel(array $methods = array(), array $bundles = array())
+    protected function getKernel(array $methods = [], array $bundles = [])
     {
         $methods[] = 'registerBundles';
 
         $kernel = $this
             ->getMockBuilder('Symfony\Component\HttpKernel\Kernel')
             ->setMethods($methods)
-            ->setConstructorArgs(array('test', false))
+            ->setConstructorArgs(['test', false])
             ->getMockForAbstractClass()
         ;
         $kernel->expects($this->any())
@@ -985,10 +985,10 @@ protected function getKernel(array $methods = array(), array $bundles = array())
         return $kernel;
     }
 
-    protected function getKernelForTest(array $methods = array(), $debug = false)
+    protected function getKernelForTest(array $methods = [], $debug = false)
     {
         $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTest')
-            ->setConstructorArgs(array('test', $debug))
+            ->setConstructorArgs(['test', $debug])
             ->setMethods($methods)
             ->getMock();
         $p = new \ReflectionProperty($kernel, 'rootDir');
@@ -1030,7 +1030,7 @@ public function __construct(\Closure $buildContainer = null, HttpKernelInterface
 
     public function registerBundles()
     {
-        return array();
+        return [];
     }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
diff --git a/src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php b/src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php
index a5d070c8a750d..7354000b16595 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php
@@ -72,39 +72,39 @@ public function testImplements()
      */
     public function testLogsAtAllLevels($level, $message)
     {
-        $this->logger->{$level}($message, array('user' => 'Bob'));
-        $this->logger->log($level, $message, array('user' => 'Bob'));
+        $this->logger->{$level}($message, ['user' => 'Bob']);
+        $this->logger->log($level, $message, ['user' => 'Bob']);
 
-        $expected = array(
+        $expected = [
             "[$level] message of level $level with context: Bob",
             "[$level] message of level $level with context: Bob",
-        );
+        ];
         $this->assertLogsMatch($expected, $this->getLogs());
     }
 
     public function provideLevelsAndMessages()
     {
-        return array(
-            LogLevel::EMERGENCY => array(LogLevel::EMERGENCY, 'message of level emergency with context: {user}'),
-            LogLevel::ALERT => array(LogLevel::ALERT, 'message of level alert with context: {user}'),
-            LogLevel::CRITICAL => array(LogLevel::CRITICAL, 'message of level critical with context: {user}'),
-            LogLevel::ERROR => array(LogLevel::ERROR, 'message of level error with context: {user}'),
-            LogLevel::WARNING => array(LogLevel::WARNING, 'message of level warning with context: {user}'),
-            LogLevel::NOTICE => array(LogLevel::NOTICE, 'message of level notice with context: {user}'),
-            LogLevel::INFO => array(LogLevel::INFO, 'message of level info with context: {user}'),
-            LogLevel::DEBUG => array(LogLevel::DEBUG, 'message of level debug with context: {user}'),
-        );
+        return [
+            LogLevel::EMERGENCY => [LogLevel::EMERGENCY, 'message of level emergency with context: {user}'],
+            LogLevel::ALERT => [LogLevel::ALERT, 'message of level alert with context: {user}'],
+            LogLevel::CRITICAL => [LogLevel::CRITICAL, 'message of level critical with context: {user}'],
+            LogLevel::ERROR => [LogLevel::ERROR, 'message of level error with context: {user}'],
+            LogLevel::WARNING => [LogLevel::WARNING, 'message of level warning with context: {user}'],
+            LogLevel::NOTICE => [LogLevel::NOTICE, 'message of level notice with context: {user}'],
+            LogLevel::INFO => [LogLevel::INFO, 'message of level info with context: {user}'],
+            LogLevel::DEBUG => [LogLevel::DEBUG, 'message of level debug with context: {user}'],
+        ];
     }
 
     public function testLogLevelDisabled()
     {
         $this->logger = new Logger(LogLevel::INFO, $this->tmpFile);
 
-        $this->logger->debug('test', array('user' => 'Bob'));
-        $this->logger->log(LogLevel::DEBUG, 'test', array('user' => 'Bob'));
+        $this->logger->debug('test', ['user' => 'Bob']);
+        $this->logger->log(LogLevel::DEBUG, 'test', ['user' => 'Bob']);
 
         // Will always be true, but asserts than an exception isn't thrown
-        $this->assertSame(array(), $this->getLogs());
+        $this->assertSame([], $this->getLogs());
     }
 
     /**
@@ -134,18 +134,18 @@ public function testInvalidOutput()
     public function testContextReplacement()
     {
         $logger = $this->logger;
-        $logger->info('{Message {nothing} {user} {foo.bar} a}', array('user' => 'Bob', 'foo.bar' => 'Bar'));
+        $logger->info('{Message {nothing} {user} {foo.bar} a}', ['user' => 'Bob', 'foo.bar' => 'Bar']);
 
-        $expected = array('[info] {Message {nothing} Bob Bar a}');
+        $expected = ['[info] {Message {nothing} Bob Bar a}'];
         $this->assertLogsMatch($expected, $this->getLogs());
     }
 
     public function testObjectCastToString()
     {
         if (method_exists($this, 'createPartialMock')) {
-            $dummy = $this->createPartialMock(DummyTest::class, array('__toString'));
+            $dummy = $this->createPartialMock(DummyTest::class, ['__toString']);
         } else {
-            $dummy = $this->getMock(DummyTest::class, array('__toString'));
+            $dummy = $this->getMock(DummyTest::class, ['__toString']);
         }
         $dummy->expects($this->atLeastOnce())
             ->method('__toString')
@@ -153,54 +153,54 @@ public function testObjectCastToString()
 
         $this->logger->warning($dummy);
 
-        $expected = array('[warning] DUMMY');
+        $expected = ['[warning] DUMMY'];
         $this->assertLogsMatch($expected, $this->getLogs());
     }
 
     public function testContextCanContainAnything()
     {
-        $context = array(
+        $context = [
             'bool' => true,
             'null' => null,
             'string' => 'Foo',
             'int' => 0,
             'float' => 0.5,
-            'nested' => array('with object' => new DummyTest()),
+            'nested' => ['with object' => new DummyTest()],
             'object' => new \DateTime(),
             'resource' => fopen('php://memory', 'r'),
-        );
+        ];
 
         $this->logger->warning('Crazy context data', $context);
 
-        $expected = array('[warning] Crazy context data');
+        $expected = ['[warning] Crazy context data'];
         $this->assertLogsMatch($expected, $this->getLogs());
     }
 
     public function testContextExceptionKeyCanBeExceptionOrOtherValues()
     {
         $logger = $this->logger;
-        $logger->warning('Random message', array('exception' => 'oops'));
-        $logger->critical('Uncaught Exception!', array('exception' => new \LogicException('Fail')));
+        $logger->warning('Random message', ['exception' => 'oops']);
+        $logger->critical('Uncaught Exception!', ['exception' => new \LogicException('Fail')]);
 
-        $expected = array(
+        $expected = [
             '[warning] Random message',
             '[critical] Uncaught Exception!',
-        );
+        ];
         $this->assertLogsMatch($expected, $this->getLogs());
     }
 
     public function testFormatter()
     {
         $this->logger = new Logger(LogLevel::DEBUG, $this->tmpFile, function ($level, $message, $context) {
-            return json_encode(array('level' => $level, 'message' => $message, 'context' => $context)).\PHP_EOL;
+            return json_encode(['level' => $level, 'message' => $message, 'context' => $context]).\PHP_EOL;
         });
 
-        $this->logger->error('An error', array('foo' => 'bar'));
-        $this->logger->warning('A warning', array('baz' => 'bar'));
-        $this->assertSame(array(
+        $this->logger->error('An error', ['foo' => 'bar']);
+        $this->logger->warning('A warning', ['baz' => 'bar']);
+        $this->assertSame([
             '{"level":"error","message":"An error","context":{"foo":"bar"}}',
             '{"level":"warning","message":"A warning","context":{"baz":"bar"}}',
-        ), $this->getLogs());
+        ], $this->getLogs());
     }
 }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/Logger.php b/src/Symfony/Component/HttpKernel/Tests/Logger.php
index 63c70bf67aa82..8ae756132cc4d 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Logger.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Logger.php
@@ -29,59 +29,59 @@ public function getLogs($level = false)
 
     public function clear()
     {
-        $this->logs = array(
-            'emergency' => array(),
-            'alert' => array(),
-            'critical' => array(),
-            'error' => array(),
-            'warning' => array(),
-            'notice' => array(),
-            'info' => array(),
-            'debug' => array(),
-        );
+        $this->logs = [
+            'emergency' => [],
+            'alert' => [],
+            'critical' => [],
+            'error' => [],
+            'warning' => [],
+            'notice' => [],
+            'info' => [],
+            'debug' => [],
+        ];
     }
 
-    public function log($level, $message, array $context = array())
+    public function log($level, $message, array $context = [])
     {
         $this->logs[$level][] = $message;
     }
 
-    public function emergency($message, array $context = array())
+    public function emergency($message, array $context = [])
     {
         $this->log('emergency', $message, $context);
     }
 
-    public function alert($message, array $context = array())
+    public function alert($message, array $context = [])
     {
         $this->log('alert', $message, $context);
     }
 
-    public function critical($message, array $context = array())
+    public function critical($message, array $context = [])
     {
         $this->log('critical', $message, $context);
     }
 
-    public function error($message, array $context = array())
+    public function error($message, array $context = [])
     {
         $this->log('error', $message, $context);
     }
 
-    public function warning($message, array $context = array())
+    public function warning($message, array $context = [])
     {
         $this->log('warning', $message, $context);
     }
 
-    public function notice($message, array $context = array())
+    public function notice($message, array $context = [])
     {
         $this->log('notice', $message, $context);
     }
 
-    public function info($message, array $context = array())
+    public function info($message, array $context = [])
     {
         $this->log('info', $message, $context);
     }
 
-    public function debug($message, array $context = array())
+    public function debug($message, array $context = [])
     {
         $this->log('debug', $message, $context);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php
index a1db1d9c0ec61..1cc05e41ec854 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php
@@ -226,7 +226,7 @@ public function testRetrieveByEmptyUrlAndIp()
 
     public function testRetrieveByMethodAndLimit()
     {
-        foreach (array('POST', 'GET') as $method) {
+        foreach (['POST', 'GET'] as $method) {
             for ($i = 0; $i < 5; ++$i) {
                 $profile = new Profile('token_'.$i.$method);
                 $profile->setMethod($method);
@@ -293,8 +293,8 @@ public function testStatusCode()
 
         $tokens = $this->storage->find('', '', 10, '');
         $this->assertCount(2, $tokens);
-        $this->assertContains($tokens[0]['status_code'], array(200, 404));
-        $this->assertContains($tokens[1]['status_code'], array(200, 404));
+        $this->assertContains($tokens[0]['status_code'], [200, 404]);
+        $this->assertContains($tokens[1]['status_code'], [200, 404]);
     }
 
     public function testMultiRowIndexFile()
diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/ProfilerTest.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/ProfilerTest.php
index cff133c1aaa7c..8f12e013a4533 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Profiler/ProfilerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Profiler/ProfilerTest.php
@@ -44,7 +44,7 @@ public function testCollect()
     public function testReset()
     {
         $collector = $this->getMockBuilder(DataCollectorInterface::class)
-            ->setMethods(array('collect', 'getName', 'reset'))
+            ->setMethods(['collect', 'getName', 'reset'])
             ->getMock();
         $collector->expects($this->any())->method('getName')->willReturn('mock');
         $collector->expects($this->once())->method('reset');
diff --git a/src/Symfony/Component/HttpKernel/Tests/TestHttpKernel.php b/src/Symfony/Component/HttpKernel/Tests/TestHttpKernel.php
index fb95aa033b142..27ba2d6f89499 100644
--- a/src/Symfony/Component/HttpKernel/Tests/TestHttpKernel.php
+++ b/src/Symfony/Component/HttpKernel/Tests/TestHttpKernel.php
@@ -27,12 +27,12 @@ public function __construct()
 
     public function getController(Request $request)
     {
-        return array($this, 'callController');
+        return [$this, 'callController'];
     }
 
     public function getArguments(Request $request, $controller)
     {
-        return array($request);
+        return [$request];
     }
 
     public function callController(Request $request)
diff --git a/src/Symfony/Component/HttpKernel/UriSigner.php b/src/Symfony/Component/HttpKernel/UriSigner.php
index 28459b4ecd394..4766042bf0851 100644
--- a/src/Symfony/Component/HttpKernel/UriSigner.php
+++ b/src/Symfony/Component/HttpKernel/UriSigner.php
@@ -47,7 +47,7 @@ public function sign($uri)
         if (isset($url['query'])) {
             parse_str($url['query'], $params);
         } else {
-            $params = array();
+            $params = [];
         }
 
         $uri = $this->buildUrl($url, $params);
@@ -68,7 +68,7 @@ public function check($uri)
         if (isset($url['query'])) {
             parse_str($url['query'], $params);
         } else {
-            $params = array();
+            $params = [];
         }
 
         if (empty($params[$this->parameter])) {
@@ -86,7 +86,7 @@ private function computeHash($uri)
         return urlencode(base64_encode(hash_hmac('sha256', $uri, $this->secret, true)));
     }
 
-    private function buildUrl(array $url, array $params = array())
+    private function buildUrl(array $url, array $params = [])
     {
         ksort($params, SORT_STRING);
         $url['query'] = http_build_query($params, '', '&');
diff --git a/src/Symfony/Component/Inflector/Inflector.php b/src/Symfony/Component/Inflector/Inflector.php
index a4bf3e39aff43..8c725197273f5 100644
--- a/src/Symfony/Component/Inflector/Inflector.php
+++ b/src/Symfony/Component/Inflector/Inflector.php
@@ -207,7 +207,7 @@ public static function singularize($plural)
                     $firstUpper = ctype_upper($pluralRev[$j - 1]);
 
                     if (\is_array($newSuffix)) {
-                        $singulars = array();
+                        $singulars = [];
 
                         foreach ($newSuffix as $newSuffixEntry) {
                             $singulars[] = $newBase.($firstUpper ? ucfirst($newSuffixEntry) : $newSuffixEntry);
diff --git a/src/Symfony/Component/Inflector/Tests/InflectorTest.php b/src/Symfony/Component/Inflector/Tests/InflectorTest.php
index 8c40532a268d2..87a959fa0afe1 100644
--- a/src/Symfony/Component/Inflector/Tests/InflectorTest.php
+++ b/src/Symfony/Component/Inflector/Tests/InflectorTest.php
@@ -20,139 +20,139 @@ public function singularizeProvider()
     {
         // see http://english-zone.com/spelling/plurals.html
         // see http://www.scribd.com/doc/3271143/List-of-100-Irregular-Plural-Nouns-in-English
-        return array(
-            array('accesses', 'access'),
-            array('addresses', 'address'),
-            array('agendas', 'agenda'),
-            array('alumnae', 'alumna'),
-            array('alumni', 'alumnus'),
-            array('analyses', array('analys', 'analyse', 'analysis')),
-            array('antennae', 'antenna'),
-            array('antennas', 'antenna'),
-            array('appendices', array('appendex', 'appendix', 'appendice')),
-            array('arches', array('arch', 'arche')),
-            array('atlases', array('atlas', 'atlase', 'atlasis')),
-            array('axes', array('ax', 'axe', 'axis')),
-            array('babies', 'baby'),
-            array('bacteria', array('bacterion', 'bacterium')),
-            array('bases', array('bas', 'base', 'basis')),
-            array('batches', array('batch', 'batche')),
-            array('beaux', 'beau'),
-            array('bees', array('be', 'bee')),
-            array('boxes', 'box'),
-            array('boys', 'boy'),
-            array('bureaus', 'bureau'),
-            array('bureaux', 'bureau'),
-            array('buses', array('bus', 'buse', 'busis')),
-            array('bushes', array('bush', 'bushe')),
-            array('calves', array('calf', 'calve', 'calff')),
-            array('cars', 'car'),
-            array('cassettes', array('cassett', 'cassette')),
-            array('caves', array('caf', 'cave', 'caff')),
-            array('chateaux', 'chateau'),
-            array('cheeses', array('chees', 'cheese', 'cheesis')),
-            array('children', 'child'),
-            array('circuses', array('circus', 'circuse', 'circusis')),
-            array('cliffs', 'cliff'),
-            array('committee', 'committee'),
-            array('crises', array('cris', 'crise', 'crisis')),
-            array('criteria', array('criterion', 'criterium')),
-            array('cups', 'cup'),
-            array('data', array('daton', 'datum')),
-            array('days', 'day'),
-            array('discos', 'disco'),
-            array('devices', array('devex', 'devix', 'device')),
-            array('drives', 'drive'),
-            array('drivers', 'driver'),
-            array('dwarves', array('dwarf', 'dwarve', 'dwarff')),
-            array('echoes', array('echo', 'echoe')),
-            array('elves', array('elf', 'elve', 'elff')),
-            array('emphases', array('emphas', 'emphase', 'emphasis')),
-            array('faxes', 'fax'),
-            array('feet', 'foot'),
-            array('feedback', 'feedback'),
-            array('foci', 'focus'),
-            array('focuses', array('focus', 'focuse', 'focusis')),
-            array('formulae', 'formula'),
-            array('formulas', 'formula'),
-            array('fungi', 'fungus'),
-            array('funguses', array('fungus', 'funguse', 'fungusis')),
-            array('garages', array('garag', 'garage')),
-            array('geese', 'goose'),
-            array('halves', array('half', 'halve', 'halff')),
-            array('hats', 'hat'),
-            array('heroes', array('hero', 'heroe')),
-            array('hippopotamuses', array('hippopotamus', 'hippopotamuse', 'hippopotamusis')), //hippopotami
-            array('hoaxes', 'hoax'),
-            array('hooves', array('hoof', 'hoove', 'hooff')),
-            array('houses', array('hous', 'house', 'housis')),
-            array('indexes', 'index'),
-            array('indices', array('index', 'indix', 'indice')),
-            array('ions', 'ion'),
-            array('irises', array('iris', 'irise', 'irisis')),
-            array('kisses', 'kiss'),
-            array('knives', 'knife'),
-            array('lamps', 'lamp'),
-            array('leaves', array('leaf', 'leave', 'leaff')),
-            array('lice', 'louse'),
-            array('lives', 'life'),
-            array('matrices', array('matrex', 'matrix', 'matrice')),
-            array('matrixes', 'matrix'),
-            array('men', 'man'),
-            array('mice', 'mouse'),
-            array('moves', 'move'),
-            array('movies', 'movie'),
-            array('nebulae', 'nebula'),
-            array('neuroses', array('neuros', 'neurose', 'neurosis')),
-            array('news', 'news'),
-            array('oases', array('oas', 'oase', 'oasis')),
-            array('objectives', 'objective'),
-            array('oxen', 'ox'),
-            array('parties', 'party'),
-            array('people', 'person'),
-            array('persons', 'person'),
-            array('phenomena', array('phenomenon', 'phenomenum')),
-            array('photos', 'photo'),
-            array('pianos', 'piano'),
-            array('plateaux', 'plateau'),
-            array('poppies', 'poppy'),
-            array('prices', array('prex', 'prix', 'price')),
-            array('quizzes', 'quiz'),
-            array('radii', 'radius'),
-            array('roofs', 'roof'),
-            array('roses', array('ros', 'rose', 'rosis')),
-            array('sandwiches', array('sandwich', 'sandwiche')),
-            array('scarves', array('scarf', 'scarve', 'scarff')),
-            array('schemas', 'schema'), //schemata
-            array('selfies', 'selfie'),
-            array('series', 'series'),
-            array('services', 'service'),
-            array('sheriffs', 'sheriff'),
-            array('shoes', array('sho', 'shoe')),
-            array('spies', 'spy'),
-            array('staves', array('staf', 'stave', 'staff')),
-            array('stories', 'story'),
-            array('strata', array('straton', 'stratum')),
-            array('suitcases', array('suitcas', 'suitcase', 'suitcasis')),
-            array('syllabi', 'syllabus'),
-            array('tags', 'tag'),
-            array('teeth', 'tooth'),
-            array('theses', array('thes', 'these', 'thesis')),
-            array('thieves', array('thief', 'thieve', 'thieff')),
-            array('trees', array('tre', 'tree')),
-            array('waltzes', array('waltz', 'waltze')),
-            array('wives', 'wife'),
+        return [
+            ['accesses', 'access'],
+            ['addresses', 'address'],
+            ['agendas', 'agenda'],
+            ['alumnae', 'alumna'],
+            ['alumni', 'alumnus'],
+            ['analyses', ['analys', 'analyse', 'analysis']],
+            ['antennae', 'antenna'],
+            ['antennas', 'antenna'],
+            ['appendices', ['appendex', 'appendix', 'appendice']],
+            ['arches', ['arch', 'arche']],
+            ['atlases', ['atlas', 'atlase', 'atlasis']],
+            ['axes', ['ax', 'axe', 'axis']],
+            ['babies', 'baby'],
+            ['bacteria', ['bacterion', 'bacterium']],
+            ['bases', ['bas', 'base', 'basis']],
+            ['batches', ['batch', 'batche']],
+            ['beaux', 'beau'],
+            ['bees', ['be', 'bee']],
+            ['boxes', 'box'],
+            ['boys', 'boy'],
+            ['bureaus', 'bureau'],
+            ['bureaux', 'bureau'],
+            ['buses', ['bus', 'buse', 'busis']],
+            ['bushes', ['bush', 'bushe']],
+            ['calves', ['calf', 'calve', 'calff']],
+            ['cars', 'car'],
+            ['cassettes', ['cassett', 'cassette']],
+            ['caves', ['caf', 'cave', 'caff']],
+            ['chateaux', 'chateau'],
+            ['cheeses', ['chees', 'cheese', 'cheesis']],
+            ['children', 'child'],
+            ['circuses', ['circus', 'circuse', 'circusis']],
+            ['cliffs', 'cliff'],
+            ['committee', 'committee'],
+            ['crises', ['cris', 'crise', 'crisis']],
+            ['criteria', ['criterion', 'criterium']],
+            ['cups', 'cup'],
+            ['data', ['daton', 'datum']],
+            ['days', 'day'],
+            ['discos', 'disco'],
+            ['devices', ['devex', 'devix', 'device']],
+            ['drives', 'drive'],
+            ['drivers', 'driver'],
+            ['dwarves', ['dwarf', 'dwarve', 'dwarff']],
+            ['echoes', ['echo', 'echoe']],
+            ['elves', ['elf', 'elve', 'elff']],
+            ['emphases', ['emphas', 'emphase', 'emphasis']],
+            ['faxes', 'fax'],
+            ['feet', 'foot'],
+            ['feedback', 'feedback'],
+            ['foci', 'focus'],
+            ['focuses', ['focus', 'focuse', 'focusis']],
+            ['formulae', 'formula'],
+            ['formulas', 'formula'],
+            ['fungi', 'fungus'],
+            ['funguses', ['fungus', 'funguse', 'fungusis']],
+            ['garages', ['garag', 'garage']],
+            ['geese', 'goose'],
+            ['halves', ['half', 'halve', 'halff']],
+            ['hats', 'hat'],
+            ['heroes', ['hero', 'heroe']],
+            ['hippopotamuses', ['hippopotamus', 'hippopotamuse', 'hippopotamusis']], //hippopotami
+            ['hoaxes', 'hoax'],
+            ['hooves', ['hoof', 'hoove', 'hooff']],
+            ['houses', ['hous', 'house', 'housis']],
+            ['indexes', 'index'],
+            ['indices', ['index', 'indix', 'indice']],
+            ['ions', 'ion'],
+            ['irises', ['iris', 'irise', 'irisis']],
+            ['kisses', 'kiss'],
+            ['knives', 'knife'],
+            ['lamps', 'lamp'],
+            ['leaves', ['leaf', 'leave', 'leaff']],
+            ['lice', 'louse'],
+            ['lives', 'life'],
+            ['matrices', ['matrex', 'matrix', 'matrice']],
+            ['matrixes', 'matrix'],
+            ['men', 'man'],
+            ['mice', 'mouse'],
+            ['moves', 'move'],
+            ['movies', 'movie'],
+            ['nebulae', 'nebula'],
+            ['neuroses', ['neuros', 'neurose', 'neurosis']],
+            ['news', 'news'],
+            ['oases', ['oas', 'oase', 'oasis']],
+            ['objectives', 'objective'],
+            ['oxen', 'ox'],
+            ['parties', 'party'],
+            ['people', 'person'],
+            ['persons', 'person'],
+            ['phenomena', ['phenomenon', 'phenomenum']],
+            ['photos', 'photo'],
+            ['pianos', 'piano'],
+            ['plateaux', 'plateau'],
+            ['poppies', 'poppy'],
+            ['prices', ['prex', 'prix', 'price']],
+            ['quizzes', 'quiz'],
+            ['radii', 'radius'],
+            ['roofs', 'roof'],
+            ['roses', ['ros', 'rose', 'rosis']],
+            ['sandwiches', ['sandwich', 'sandwiche']],
+            ['scarves', ['scarf', 'scarve', 'scarff']],
+            ['schemas', 'schema'], //schemata
+            ['selfies', 'selfie'],
+            ['series', 'series'],
+            ['services', 'service'],
+            ['sheriffs', 'sheriff'],
+            ['shoes', ['sho', 'shoe']],
+            ['spies', 'spy'],
+            ['staves', ['staf', 'stave', 'staff']],
+            ['stories', 'story'],
+            ['strata', ['straton', 'stratum']],
+            ['suitcases', ['suitcas', 'suitcase', 'suitcasis']],
+            ['syllabi', 'syllabus'],
+            ['tags', 'tag'],
+            ['teeth', 'tooth'],
+            ['theses', ['thes', 'these', 'thesis']],
+            ['thieves', ['thief', 'thieve', 'thieff']],
+            ['trees', ['tre', 'tree']],
+            ['waltzes', ['waltz', 'waltze']],
+            ['wives', 'wife'],
 
             // test casing: if the first letter was uppercase, it should remain so
-            array('Men', 'Man'),
-            array('GrandChildren', 'GrandChild'),
-            array('SubTrees', array('SubTre', 'SubTree')),
+            ['Men', 'Man'],
+            ['GrandChildren', 'GrandChild'],
+            ['SubTrees', ['SubTre', 'SubTree']],
 
             // Known issues
             //array('insignia', 'insigne'),
             //array('insignias', 'insigne'),
             //array('rattles', 'rattle'),
-        );
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Intl/Collator/Collator.php b/src/Symfony/Component/Intl/Collator/Collator.php
index 6260e5f0006d1..62b1ddc9953e1 100644
--- a/src/Symfony/Component/Intl/Collator/Collator.php
+++ b/src/Symfony/Component/Intl/Collator/Collator.php
@@ -108,11 +108,11 @@ public static function create($locale)
      */
     public function asort(&$array, $sortFlag = self::SORT_REGULAR)
     {
-        $intlToPlainFlagMap = array(
+        $intlToPlainFlagMap = [
             self::SORT_REGULAR => \SORT_REGULAR,
             self::SORT_NUMERIC => \SORT_NUMERIC,
             self::SORT_STRING => \SORT_STRING,
-        );
+        ];
 
         $plainSortFlag = isset($intlToPlainFlagMap[$sortFlag]) ? $intlToPlainFlagMap[$sortFlag] : self::SORT_REGULAR;
 
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php
index 035166c1fb07a..1efade5bd698c 100644
--- a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php
+++ b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php
@@ -33,7 +33,7 @@ class BundleEntryReader implements BundleEntryReaderInterface
     /**
      * A mapping of locale aliases to locales.
      */
-    private $localeAliases = array();
+    private $localeAliases = [];
 
     /**
      * Creates an entry reader based on the given resource bundle reader.
@@ -76,7 +76,7 @@ public function readEntry($path, $locale, array $indices, $fallback = true)
         $readSucceeded = false;
         $exception = null;
         $currentLocale = $locale;
-        $testedLocales = array();
+        $testedLocales = [];
 
         while (null !== $currentLocale) {
             // Resolve any aliases to their target locales
diff --git a/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
index e657b3823637e..1be618d7878d7 100644
--- a/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
@@ -42,7 +42,7 @@ class CurrencyDataGenerator extends AbstractDataGenerator
     /**
      * Monetary units excluded from generation.
      */
-    private static $blacklist = array(
+    private static $blacklist = [
         self::UNKNOWN_CURRENCY_ID => true,
         self::EUROPEAN_COMPOSITE_UNIT_ID => true,
         self::EUROPEAN_MONETARY_UNIT_ID => true,
@@ -56,14 +56,14 @@ class CurrencyDataGenerator extends AbstractDataGenerator
         self::PALLADIUM_ID => true,
         self::SUCRE_ID => true,
         self::SPECIAL_DRAWING_RIGHTS_ID => true,
-    );
+    ];
 
     /**
      * Collects all available currency codes.
      *
      * @var string[]
      */
-    private $currencyCodes = array();
+    private $currencyCodes = [];
 
     /**
      * {@inheritdoc}
@@ -87,7 +87,7 @@ protected function compileTemporaryBundles(GenrbCompiler $compiler, $sourceDir,
      */
     protected function preGenerate()
     {
-        $this->currencyCodes = array();
+        $this->currencyCodes = [];
     }
 
     /**
@@ -98,10 +98,10 @@ protected function generateDataForLocale(BundleReaderInterface $reader, $tempDir
         $localeBundle = $reader->read($tempDir, $displayLocale);
 
         if (isset($localeBundle['Currencies']) && null !== $localeBundle['Currencies']) {
-            $data = array(
+            $data = [
                 'Version' => $localeBundle['Version'],
                 'Names' => $this->generateSymbolNamePairs($localeBundle),
-            );
+            ];
 
             $this->currencyCodes = array_merge($this->currencyCodes, array_keys($data['Names']));
 
@@ -116,10 +116,10 @@ protected function generateDataForRoot(BundleReaderInterface $reader, $tempDir)
     {
         $rootBundle = $reader->read($tempDir, 'root');
 
-        return array(
+        return [
             'Version' => $rootBundle['Version'],
             'Names' => $this->generateSymbolNamePairs($rootBundle),
-        );
+        ];
     }
 
     /**
@@ -135,12 +135,12 @@ protected function generateDataForMeta(BundleReaderInterface $reader, $tempDir)
 
         sort($this->currencyCodes);
 
-        $data = array(
+        $data = [
             'Version' => $rootBundle['Version'],
             'Currencies' => $this->currencyCodes,
             'Meta' => $this->generateCurrencyMeta($supplementalDataBundle),
             'Alpha3ToNumeric' => $this->generateAlpha3ToNumericMapping($numericCodesBundle, $this->currencyCodes),
-        );
+        ];
 
         $data['NumericToAlpha3'] = $this->generateNumericToAlpha3Mapping($data['Alpha3ToNumeric']);
 
@@ -181,14 +181,14 @@ private function generateAlpha3ToNumericMapping(ArrayAccessibleResourceBundle $n
 
     private function generateNumericToAlpha3Mapping(array $alpha3ToNumericMapping)
     {
-        $numericToAlpha3Mapping = array();
+        $numericToAlpha3Mapping = [];
 
         foreach ($alpha3ToNumericMapping as $alpha3 => $numeric) {
             // Make sure that the mapping is stored as table and not as array
             $numeric = (string) $numeric;
 
             if (!isset($numericToAlpha3Mapping[$numeric])) {
-                $numericToAlpha3Mapping[$numeric] = array();
+                $numericToAlpha3Mapping[$numeric] = [];
             }
 
             $numericToAlpha3Mapping[$numeric][] = $alpha3;
diff --git a/src/Symfony/Component/Intl/Data/Generator/GeneratorConfig.php b/src/Symfony/Component/Intl/Data/Generator/GeneratorConfig.php
index 9bb9304db0159..230b3434193e6 100644
--- a/src/Symfony/Component/Intl/Data/Generator/GeneratorConfig.php
+++ b/src/Symfony/Component/Intl/Data/Generator/GeneratorConfig.php
@@ -28,7 +28,7 @@ class GeneratorConfig
     /**
      * @var BundleWriterInterface[]
      */
-    private $bundleWriters = array();
+    private $bundleWriters = [];
 
     /**
      * @param string $sourceDir
diff --git a/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php
index 9b3cf0a40682b..1bc6d9609c9b8 100644
--- a/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php
@@ -112,7 +112,7 @@ protected function compileTemporaryBundles(GenrbCompiler $compiler, $sourceDir,
      */
     protected function preGenerate()
     {
-        $this->languageCodes = array();
+        $this->languageCodes = [];
     }
 
     /**
diff --git a/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php
index e2cf6d31581c6..5e0c0a6a1ba6c 100644
--- a/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php
@@ -70,12 +70,12 @@ public function generateData(GeneratorConfig $config)
         // Generate a list of (existing) locale fallbacks
         $fallbackMapping = $this->generateFallbackMapping($displayLocales, $aliases);
 
-        $localeNames = array();
+        $localeNames = [];
 
         // Generate locale names for all locales that have translations in
         // at least the language or the region bundle
         foreach ($displayLocales as $displayLocale => $_) {
-            $localeNames[$displayLocale] = array();
+            $localeNames[$displayLocale] = [];
 
             foreach ($locales as $locale) {
                 try {
@@ -111,9 +111,9 @@ public function generateData(GeneratorConfig $config)
             }
 
             foreach ($writers as $targetDir => $writer) {
-                $writer->write($targetDir.'/'.$this->dirName, $displayLocale, array(
+                $writer->write($targetDir.'/'.$this->dirName, $displayLocale, [
                     'Names' => $localeNames[$displayLocale],
-                ));
+                ]);
             }
         }
 
@@ -121,18 +121,18 @@ public function generateData(GeneratorConfig $config)
         // target
         foreach ($aliases as $alias => $aliasOf) {
             foreach ($writers as $targetDir => $writer) {
-                $writer->write($targetDir.'/'.$this->dirName, $alias, array(
+                $writer->write($targetDir.'/'.$this->dirName, $alias, [
                     '%%ALIAS' => $aliasOf,
-                ));
+                ]);
             }
         }
 
         // Create root file which maps locale codes to locale codes, for fallback
         foreach ($writers as $targetDir => $writer) {
-            $writer->write($targetDir.'/'.$this->dirName, 'meta', array(
+            $writer->write($targetDir.'/'.$this->dirName, 'meta', [
                 'Locales' => $locales,
                 'Aliases' => $aliases,
-            ));
+            ]);
         }
     }
 
@@ -168,7 +168,7 @@ private function generateLocaleName($locale, $displayLocale)
         //    continue;
         //}
 
-        $extras = array();
+        $extras = [];
 
         // Discover the name of the script part of the locale
         // i.e. in zh_Hans_MO, "Hans" is the script
@@ -209,7 +209,7 @@ private function generateLocaleName($locale, $displayLocale)
 
     private function generateFallbackMapping(array $displayLocales, array $aliases)
     {
-        $mapping = array();
+        $mapping = [];
 
         foreach ($displayLocales as $displayLocale => $_) {
             $mapping[$displayLocale] = null;
diff --git a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php
index 920e2e311b049..0728db80309b8 100644
--- a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php
@@ -40,7 +40,7 @@ class RegionDataGenerator extends AbstractDataGenerator
     /**
      * Regions excluded from generation.
      */
-    private static $blacklist = array(
+    private static $blacklist = [
         self::UNKNOWN_REGION_ID => true,
         // Look like countries, but are sub-continents
         self::OUTLYING_OCEANIA_REGION_ID => true,
@@ -53,14 +53,14 @@ class RegionDataGenerator extends AbstractDataGenerator
         self::BOUVET_ISLAND_ID => true,
         self::HEARD_MCDONALD_ISLANDS_ID => true,
         self::CLIPPERTON_ISLAND_ID => true,
-    );
+    ];
 
     /**
      * Collects all available language codes.
      *
      * @var string[]
      */
-    private $regionCodes = array();
+    private $regionCodes = [];
 
     /**
      * {@inheritdoc}
@@ -83,7 +83,7 @@ protected function compileTemporaryBundles(GenrbCompiler $compiler, $sourceDir,
      */
     protected function preGenerate()
     {
-        $this->regionCodes = array();
+        $this->regionCodes = [];
     }
 
     /**
@@ -95,10 +95,10 @@ protected function generateDataForLocale(BundleReaderInterface $reader, $tempDir
 
         // isset() on \ResourceBundle returns true even if the value is null
         if (isset($localeBundle['Countries']) && null !== $localeBundle['Countries']) {
-            $data = array(
+            $data = [
                 'Version' => $localeBundle['Version'],
                 'Names' => $this->generateRegionNames($localeBundle),
-            );
+            ];
 
             $this->regionCodes = array_merge($this->regionCodes, array_keys($data['Names']));
 
@@ -124,10 +124,10 @@ protected function generateDataForMeta(BundleReaderInterface $reader, $tempDir)
 
         sort($this->regionCodes);
 
-        return array(
+        return [
             'Version' => $rootBundle['Version'],
             'Regions' => $this->regionCodes,
-        );
+        ];
     }
 
     /**
@@ -136,7 +136,7 @@ protected function generateDataForMeta(BundleReaderInterface $reader, $tempDir)
     protected function generateRegionNames(ArrayAccessibleResourceBundle $localeBundle)
     {
         $unfilteredRegionNames = iterator_to_array($localeBundle['Countries']);
-        $regionNames = array();
+        $regionNames = [];
 
         foreach ($unfilteredRegionNames as $region => $regionName) {
             if (isset(self::$blacklist[$region])) {
diff --git a/src/Symfony/Component/Intl/Data/Generator/ScriptDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/ScriptDataGenerator.php
index 7ba6bbe692988..7ed0625262f68 100644
--- a/src/Symfony/Component/Intl/Data/Generator/ScriptDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/ScriptDataGenerator.php
@@ -29,7 +29,7 @@ class ScriptDataGenerator extends AbstractDataGenerator
      *
      * @var string[]
      */
-    private $scriptCodes = array();
+    private $scriptCodes = [];
 
     /**
      * {@inheritdoc}
@@ -52,7 +52,7 @@ protected function compileTemporaryBundles(GenrbCompiler $compiler, $sourceDir,
      */
     protected function preGenerate()
     {
-        $this->scriptCodes = array();
+        $this->scriptCodes = [];
     }
 
     /**
@@ -64,10 +64,10 @@ protected function generateDataForLocale(BundleReaderInterface $reader, $tempDir
 
         // isset() on \ResourceBundle returns true even if the value is null
         if (isset($localeBundle['Scripts']) && null !== $localeBundle['Scripts']) {
-            $data = array(
+            $data = [
                 'Version' => $localeBundle['Version'],
                 'Names' => iterator_to_array($localeBundle['Scripts']),
-            );
+            ];
 
             $this->scriptCodes = array_merge($this->scriptCodes, array_keys($data['Names']));
 
@@ -93,9 +93,9 @@ protected function generateDataForMeta(BundleReaderInterface $reader, $tempDir)
 
         sort($this->scriptCodes);
 
-        return array(
+        return [
             'Version' => $rootBundle['Version'],
             'Scripts' => $this->scriptCodes,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Intl/Data/Provider/CurrencyDataProvider.php b/src/Symfony/Component/Intl/Data/Provider/CurrencyDataProvider.php
index 5cf5fc24be535..dacde26f83707 100644
--- a/src/Symfony/Component/Intl/Data/Provider/CurrencyDataProvider.php
+++ b/src/Symfony/Component/Intl/Data/Provider/CurrencyDataProvider.php
@@ -47,7 +47,7 @@ public function __construct($path, BundleEntryReaderInterface $reader)
 
     public function getCurrencies()
     {
-        return $this->reader->readEntry($this->path, 'meta', array('Currencies'));
+        return $this->reader->readEntry($this->path, 'meta', ['Currencies']);
     }
 
     public function getSymbol($currency, $displayLocale = null)
@@ -56,7 +56,7 @@ public function getSymbol($currency, $displayLocale = null)
             $displayLocale = Locale::getDefault();
         }
 
-        return $this->reader->readEntry($this->path, $displayLocale, array('Names', $currency, static::INDEX_SYMBOL));
+        return $this->reader->readEntry($this->path, $displayLocale, ['Names', $currency, static::INDEX_SYMBOL]);
     }
 
     public function getName($currency, $displayLocale = null)
@@ -65,7 +65,7 @@ public function getName($currency, $displayLocale = null)
             $displayLocale = Locale::getDefault();
         }
 
-        return $this->reader->readEntry($this->path, $displayLocale, array('Names', $currency, static::INDEX_NAME));
+        return $this->reader->readEntry($this->path, $displayLocale, ['Names', $currency, static::INDEX_NAME]);
     }
 
     public function getNames($displayLocale = null)
@@ -80,7 +80,7 @@ public function getNames($displayLocale = null)
         // 3-letter codes (e.g. 32 => "ARA", "ARP", "ARS")
         // ====================================================================
 
-        $names = $this->reader->readEntry($this->path, $displayLocale, array('Names'));
+        $names = $this->reader->readEntry($this->path, $displayLocale, ['Names']);
 
         if ($names instanceof \Traversable) {
             $names = iterator_to_array($names);
@@ -106,9 +106,9 @@ public function getNames($displayLocale = null)
     public function getFractionDigits($currency)
     {
         try {
-            return $this->reader->readEntry($this->path, 'meta', array('Meta', $currency, static::INDEX_FRACTION_DIGITS));
+            return $this->reader->readEntry($this->path, 'meta', ['Meta', $currency, static::INDEX_FRACTION_DIGITS]);
         } catch (MissingResourceException $e) {
-            return $this->reader->readEntry($this->path, 'meta', array('Meta', 'DEFAULT', static::INDEX_FRACTION_DIGITS));
+            return $this->reader->readEntry($this->path, 'meta', ['Meta', 'DEFAULT', static::INDEX_FRACTION_DIGITS]);
         }
     }
 
@@ -118,9 +118,9 @@ public function getFractionDigits($currency)
     public function getRoundingIncrement($currency)
     {
         try {
-            return $this->reader->readEntry($this->path, 'meta', array('Meta', $currency, static::INDEX_ROUNDING_INCREMENT));
+            return $this->reader->readEntry($this->path, 'meta', ['Meta', $currency, static::INDEX_ROUNDING_INCREMENT]);
         } catch (MissingResourceException $e) {
-            return $this->reader->readEntry($this->path, 'meta', array('Meta', 'DEFAULT', static::INDEX_ROUNDING_INCREMENT));
+            return $this->reader->readEntry($this->path, 'meta', ['Meta', 'DEFAULT', static::INDEX_ROUNDING_INCREMENT]);
         }
     }
 
@@ -129,7 +129,7 @@ public function getRoundingIncrement($currency)
      */
     public function getNumericCode($currency)
     {
-        return $this->reader->readEntry($this->path, 'meta', array('Alpha3ToNumeric', $currency));
+        return $this->reader->readEntry($this->path, 'meta', ['Alpha3ToNumeric', $currency]);
     }
 
     /**
@@ -137,6 +137,6 @@ public function getNumericCode($currency)
      */
     public function forNumericCode($numericCode)
     {
-        return $this->reader->readEntry($this->path, 'meta', array('NumericToAlpha3', (string) $numericCode));
+        return $this->reader->readEntry($this->path, 'meta', ['NumericToAlpha3', (string) $numericCode]);
     }
 }
diff --git a/src/Symfony/Component/Intl/Data/Provider/LanguageDataProvider.php b/src/Symfony/Component/Intl/Data/Provider/LanguageDataProvider.php
index 2a2084e9556fe..2178158513e47 100644
--- a/src/Symfony/Component/Intl/Data/Provider/LanguageDataProvider.php
+++ b/src/Symfony/Component/Intl/Data/Provider/LanguageDataProvider.php
@@ -40,12 +40,12 @@ public function __construct($path, BundleEntryReaderInterface $reader)
 
     public function getLanguages()
     {
-        return $this->reader->readEntry($this->path, 'meta', array('Languages'));
+        return $this->reader->readEntry($this->path, 'meta', ['Languages']);
     }
 
     public function getAliases()
     {
-        return $this->reader->readEntry($this->path, 'root', array('Aliases'));
+        return $this->reader->readEntry($this->path, 'root', ['Aliases']);
     }
 
     public function getName($language, $displayLocale = null)
@@ -54,7 +54,7 @@ public function getName($language, $displayLocale = null)
             $displayLocale = Locale::getDefault();
         }
 
-        return $this->reader->readEntry($this->path, $displayLocale, array('Names', $language));
+        return $this->reader->readEntry($this->path, $displayLocale, ['Names', $language]);
     }
 
     public function getNames($displayLocale = null)
@@ -63,7 +63,7 @@ public function getNames($displayLocale = null)
             $displayLocale = Locale::getDefault();
         }
 
-        $languages = $this->reader->readEntry($this->path, $displayLocale, array('Names'));
+        $languages = $this->reader->readEntry($this->path, $displayLocale, ['Names']);
 
         if ($languages instanceof \Traversable) {
             $languages = iterator_to_array($languages);
@@ -77,6 +77,6 @@ public function getNames($displayLocale = null)
 
     public function getAlpha3Code($language)
     {
-        return $this->reader->readEntry($this->path, 'meta', array('Alpha2ToAlpha3', $language));
+        return $this->reader->readEntry($this->path, 'meta', ['Alpha2ToAlpha3', $language]);
     }
 }
diff --git a/src/Symfony/Component/Intl/Data/Provider/LocaleDataProvider.php b/src/Symfony/Component/Intl/Data/Provider/LocaleDataProvider.php
index 0eb82f621e155..4328b57d2f09d 100644
--- a/src/Symfony/Component/Intl/Data/Provider/LocaleDataProvider.php
+++ b/src/Symfony/Component/Intl/Data/Provider/LocaleDataProvider.php
@@ -40,12 +40,12 @@ public function __construct($path, BundleEntryReaderInterface $reader)
 
     public function getLocales()
     {
-        return $this->reader->readEntry($this->path, 'meta', array('Locales'));
+        return $this->reader->readEntry($this->path, 'meta', ['Locales']);
     }
 
     public function getAliases()
     {
-        $aliases = $this->reader->readEntry($this->path, 'meta', array('Aliases'));
+        $aliases = $this->reader->readEntry($this->path, 'meta', ['Aliases']);
 
         if ($aliases instanceof \Traversable) {
             $aliases = iterator_to_array($aliases);
@@ -60,7 +60,7 @@ public function getName($locale, $displayLocale = null)
             $displayLocale = Locale::getDefault();
         }
 
-        return $this->reader->readEntry($this->path, $displayLocale, array('Names', $locale));
+        return $this->reader->readEntry($this->path, $displayLocale, ['Names', $locale]);
     }
 
     public function getNames($displayLocale = null)
@@ -69,7 +69,7 @@ public function getNames($displayLocale = null)
             $displayLocale = Locale::getDefault();
         }
 
-        $names = $this->reader->readEntry($this->path, $displayLocale, array('Names'));
+        $names = $this->reader->readEntry($this->path, $displayLocale, ['Names']);
 
         if ($names instanceof \Traversable) {
             $names = iterator_to_array($names);
diff --git a/src/Symfony/Component/Intl/Data/Provider/RegionDataProvider.php b/src/Symfony/Component/Intl/Data/Provider/RegionDataProvider.php
index d3c8164158a97..08bd724394d9a 100644
--- a/src/Symfony/Component/Intl/Data/Provider/RegionDataProvider.php
+++ b/src/Symfony/Component/Intl/Data/Provider/RegionDataProvider.php
@@ -40,7 +40,7 @@ public function __construct($path, BundleEntryReaderInterface $reader)
 
     public function getRegions()
     {
-        return $this->reader->readEntry($this->path, 'meta', array('Regions'));
+        return $this->reader->readEntry($this->path, 'meta', ['Regions']);
     }
 
     public function getName($region, $displayLocale = null)
@@ -49,7 +49,7 @@ public function getName($region, $displayLocale = null)
             $displayLocale = Locale::getDefault();
         }
 
-        return $this->reader->readEntry($this->path, $displayLocale, array('Names', $region));
+        return $this->reader->readEntry($this->path, $displayLocale, ['Names', $region]);
     }
 
     public function getNames($displayLocale = null)
@@ -58,7 +58,7 @@ public function getNames($displayLocale = null)
             $displayLocale = Locale::getDefault();
         }
 
-        $names = $this->reader->readEntry($this->path, $displayLocale, array('Names'));
+        $names = $this->reader->readEntry($this->path, $displayLocale, ['Names']);
 
         if ($names instanceof \Traversable) {
             $names = iterator_to_array($names);
diff --git a/src/Symfony/Component/Intl/Data/Provider/ScriptDataProvider.php b/src/Symfony/Component/Intl/Data/Provider/ScriptDataProvider.php
index 29ff1d63ae9b1..c6844494a89f5 100644
--- a/src/Symfony/Component/Intl/Data/Provider/ScriptDataProvider.php
+++ b/src/Symfony/Component/Intl/Data/Provider/ScriptDataProvider.php
@@ -40,7 +40,7 @@ public function __construct($path, BundleEntryReaderInterface $reader)
 
     public function getScripts()
     {
-        return $this->reader->readEntry($this->path, 'meta', array('Scripts'));
+        return $this->reader->readEntry($this->path, 'meta', ['Scripts']);
     }
 
     public function getName($script, $displayLocale = null)
@@ -49,7 +49,7 @@ public function getName($script, $displayLocale = null)
             $displayLocale = Locale::getDefault();
         }
 
-        return $this->reader->readEntry($this->path, $displayLocale, array('Names', $script));
+        return $this->reader->readEntry($this->path, $displayLocale, ['Names', $script]);
     }
 
     public function getNames($displayLocale = null)
@@ -58,7 +58,7 @@ public function getNames($displayLocale = null)
             $displayLocale = Locale::getDefault();
         }
 
-        $names = $this->reader->readEntry($this->path, $displayLocale, array('Names'));
+        $names = $this->reader->readEntry($this->path, $displayLocale, ['Names']);
 
         if ($names instanceof \Traversable) {
             $names = iterator_to_array($names);
diff --git a/src/Symfony/Component/Intl/Data/Util/LocaleScanner.php b/src/Symfony/Component/Intl/Data/Util/LocaleScanner.php
index 0604593f6e1d2..ba0a6c5f08399 100644
--- a/src/Symfony/Component/Intl/Data/Util/LocaleScanner.php
+++ b/src/Symfony/Component/Intl/Data/Util/LocaleScanner.php
@@ -68,7 +68,7 @@ public function scanLocales($sourceDir)
     public function scanAliases($sourceDir)
     {
         $locales = $this->scanLocales($sourceDir);
-        $aliases = array();
+        $aliases = [];
 
         // Delete locales that are no aliases
         foreach ($locales as $locale) {
diff --git a/src/Symfony/Component/Intl/Data/Util/RingBuffer.php b/src/Symfony/Component/Intl/Data/Util/RingBuffer.php
index 1ab1a301497ae..9f82d86ea189b 100644
--- a/src/Symfony/Component/Intl/Data/Util/RingBuffer.php
+++ b/src/Symfony/Component/Intl/Data/Util/RingBuffer.php
@@ -26,9 +26,9 @@
  */
 class RingBuffer implements \ArrayAccess
 {
-    private $values = array();
+    private $values = [];
 
-    private $indices = array();
+    private $indices = [];
 
     private $cursor = 0;
 
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/AmPmTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/AmPmTransformer.php
index 66376475c666b..2593cd8966eb3 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/AmPmTransformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/AmPmTransformer.php
@@ -41,8 +41,8 @@ public function getReverseMatchingRegExp($length)
      */
     public function extractDateOptions($matched, $length)
     {
-        return array(
+        return [
             'marker' => $matched,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayOfWeekTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayOfWeekTransformer.php
index a174fdcabc570..1da32cd0791a7 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayOfWeekTransformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayOfWeekTransformer.php
@@ -60,6 +60,6 @@ public function getReverseMatchingRegExp($length)
      */
     public function extractDateOptions($matched, $length)
     {
-        return array();
+        return [];
     }
 }
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayOfYearTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayOfYearTransformer.php
index 5af6dd724336b..8b48371f60c6f 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayOfYearTransformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayOfYearTransformer.php
@@ -43,6 +43,6 @@ public function getReverseMatchingRegExp($length)
      */
     public function extractDateOptions($matched, $length)
     {
-        return array();
+        return [];
     }
 }
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayTransformer.php
index f0ded907c33c5..c07855df1c8de 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayTransformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayTransformer.php
@@ -41,8 +41,8 @@ public function getReverseMatchingRegExp($length)
      */
     public function extractDateOptions($matched, $length)
     {
-        return array(
+        return [
             'day' => (int) $matched,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/FullTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/FullTransformer.php
index 8202516887e59..9c0d86ef05bdc 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/FullTransformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/FullTransformer.php
@@ -49,7 +49,7 @@ public function __construct($pattern, $timezone)
         $notImplementedCharsMatch = $this->buildCharsMatch($this->notImplementedChars);
         $this->regExp = "/($this->quoteMatch|$implementedCharsMatch|$notImplementedCharsMatch)/";
 
-        $this->transformers = array(
+        $this->transformers = [
             'M' => new MonthTransformer(),
             'L' => new MonthTransformer(),
             'y' => new YearTransformer(),
@@ -66,7 +66,7 @@ public function __construct($pattern, $timezone)
             'm' => new MinuteTransformer(),
             's' => new SecondTransformer(),
             'z' => new TimezoneTransformer(),
-        );
+        ];
     }
 
     /**
@@ -140,7 +140,7 @@ public function parse(\DateTime $dateTime, $value)
         $reverseMatchingRegExp = $this->getReverseMatchingRegExp($this->pattern);
         $reverseMatchingRegExp = '/^'.$reverseMatchingRegExp.'$/';
 
-        $options = array();
+        $options = [];
 
         if (preg_match($reverseMatchingRegExp, $value, $matches)) {
             $matches = $this->normalizeArray($matches);
@@ -255,17 +255,17 @@ protected function buildCharsMatch($specialChars)
      */
     protected function normalizeArray(array $data)
     {
-        $ret = array();
+        $ret = [];
 
         foreach ($data as $key => $value) {
             if (!\is_string($key)) {
                 continue;
             }
 
-            $ret[$key[0]] = array(
+            $ret[$key[0]] = [
                 'value' => $value,
                 'pattern' => $key,
-            );
+            ];
         }
 
         return $ret;
@@ -332,7 +332,7 @@ protected function calculateUnixTimestamp(\DateTime $dateTime, array $options)
      */
     private function getDefaultValueForOptions(array $options)
     {
-        return array(
+        return [
             'year' => isset($options['year']) ? $options['year'] : 1970,
             'month' => isset($options['month']) ? $options['month'] : 1,
             'day' => isset($options['day']) ? $options['day'] : 1,
@@ -342,6 +342,6 @@ private function getDefaultValueForOptions(array $options)
             'second' => isset($options['second']) ? $options['second'] : 0,
             'marker' => isset($options['marker']) ? $options['marker'] : null,
             'timezone' => isset($options['timezone']) ? $options['timezone'] : null,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1200Transformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1200Transformer.php
index 948e3450443ef..157d242875ef7 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1200Transformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1200Transformer.php
@@ -56,9 +56,9 @@ public function getReverseMatchingRegExp($length)
      */
     public function extractDateOptions($matched, $length)
     {
-        return array(
+        return [
             'hour' => (int) $matched,
             'hourInstance' => $this,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1201Transformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1201Transformer.php
index 19c4d203abe09..7e704b04e3400 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1201Transformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1201Transformer.php
@@ -56,9 +56,9 @@ public function getReverseMatchingRegExp($length)
      */
     public function extractDateOptions($matched, $length)
     {
-        return array(
+        return [
             'hour' => (int) $matched,
             'hourInstance' => $this,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2400Transformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2400Transformer.php
index e43d0ee8b2aec..904a03691f373 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2400Transformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2400Transformer.php
@@ -55,9 +55,9 @@ public function getReverseMatchingRegExp($length)
      */
     public function extractDateOptions($matched, $length)
     {
-        return array(
+        return [
             'hour' => (int) $matched,
             'hourInstance' => $this,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2401Transformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2401Transformer.php
index df4e671aaf02b..e2988d852a653 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2401Transformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2401Transformer.php
@@ -58,9 +58,9 @@ public function getReverseMatchingRegExp($length)
      */
     public function extractDateOptions($matched, $length)
     {
-        return array(
+        return [
             'hour' => (int) $matched,
             'hourInstance' => $this,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/MinuteTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/MinuteTransformer.php
index 08b5356e3fbd9..d0ba82e1a9aee 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/MinuteTransformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/MinuteTransformer.php
@@ -43,8 +43,8 @@ public function getReverseMatchingRegExp($length)
      */
     public function extractDateOptions($matched, $length)
     {
-        return array(
+        return [
             'minute' => (int) $matched,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/MonthTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/MonthTransformer.php
index cc917ef82b389..40ab1d67d7290 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/MonthTransformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/MonthTransformer.php
@@ -20,7 +20,7 @@
  */
 class MonthTransformer extends Transformer
 {
-    protected static $months = array(
+    protected static $months = [
         'January',
         'February',
         'March',
@@ -33,22 +33,22 @@ class MonthTransformer extends Transformer
         'October',
         'November',
         'December',
-    );
+    ];
 
     /**
      * Short months names (first 3 letters).
      */
-    protected static $shortMonths = array();
+    protected static $shortMonths = [];
 
     /**
      * Flipped $months array, $name => $index.
      */
-    protected static $flippedMonths = array();
+    protected static $flippedMonths = [];
 
     /**
      * Flipped $shortMonths array, $name => $index.
      */
-    protected static $flippedShortMonths = array();
+    protected static $flippedShortMonths = [];
 
     public function __construct()
     {
@@ -67,12 +67,12 @@ public function __construct()
      */
     public function format(\DateTime $dateTime, $length)
     {
-        $matchLengthMap = array(
+        $matchLengthMap = [
             1 => 'n',
             2 => 'm',
             3 => 'M',
             4 => 'F',
-        );
+        ];
 
         if (isset($matchLengthMap[$length])) {
             return $dateTime->format($matchLengthMap[$length]);
@@ -129,8 +129,8 @@ public function extractDateOptions($matched, $length)
             $matched = (int) $matched;
         }
 
-        return array(
+        return [
             'month' => $matched,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/QuarterTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/QuarterTransformer.php
index fa7e91d038f8c..d8ef0674feed2 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/QuarterTransformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/QuarterTransformer.php
@@ -34,7 +34,7 @@ public function format(\DateTime $dateTime, $length)
             case 3:
                 return 'Q'.$quarter;
             default:
-                $map = array(1 => '1st quarter', 2 => '2nd quarter', 3 => '3rd quarter', 4 => '4th quarter');
+                $map = [1 => '1st quarter', 2 => '2nd quarter', 3 => '3rd quarter', 4 => '4th quarter'];
 
                 return $map[$quarter];
         }
@@ -61,6 +61,6 @@ public function getReverseMatchingRegExp($length)
      */
     public function extractDateOptions($matched, $length)
     {
-        return array();
+        return [];
     }
 }
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/SecondTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/SecondTransformer.php
index dd2e7bd9f9bb5..b1054c478c414 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/SecondTransformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/SecondTransformer.php
@@ -43,8 +43,8 @@ public function getReverseMatchingRegExp($length)
      */
     public function extractDateOptions($matched, $length)
     {
-        return array(
+        return [
             'second' => (int) $matched,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/TimezoneTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/TimezoneTransformer.php
index d8f50119b093e..c77fbc160b5bb 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/TimezoneTransformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/TimezoneTransformer.php
@@ -31,7 +31,7 @@ public function format(\DateTime $dateTime, $length)
     {
         $timeZone = substr($dateTime->getTimezone()->getName(), 0, 3);
 
-        if (!\in_array($timeZone, array('Etc', 'UTC', 'GMT'))) {
+        if (!\in_array($timeZone, ['Etc', 'UTC', 'GMT'])) {
             throw new NotImplementedException('Time zone different than GMT or UTC is not supported as a formatting output.');
         }
 
@@ -41,7 +41,7 @@ public function format(\DateTime $dateTime, $length)
         }
 
         // From ICU >= 59.1 GMT and UTC are no longer unified
-        if (\in_array($timeZone, array('UTC', 'UCT', 'Universal', 'Zulu'))) {
+        if (\in_array($timeZone, ['UTC', 'UCT', 'Universal', 'Zulu'])) {
             // offset is not supported with UTC
             return $length > 3 ? 'Coordinated Universal Time' : 'UTC';
         }
@@ -73,9 +73,9 @@ public function getReverseMatchingRegExp($length)
      */
     public function extractDateOptions($matched, $length)
     {
-        return array(
+        return [
             'timezone' => self::getEtcTimeZoneId($matched),
-        );
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/YearTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/YearTransformer.php
index 0b546b774a40c..043e6f321c2f9 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/YearTransformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/YearTransformer.php
@@ -45,8 +45,8 @@ public function getReverseMatchingRegExp($length)
      */
     public function extractDateOptions($matched, $length)
     {
-        return array(
+        return [
             'year' => (int) $matched,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
index fe46f3f2b2a00..63b8088eac39b 100644
--- a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
+++ b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
@@ -76,23 +76,23 @@ class IntlDateFormatter
     /**
      * Patterns used to format the date when no pattern is provided.
      */
-    private $defaultDateFormats = array(
+    private $defaultDateFormats = [
         self::NONE => '',
         self::FULL => 'EEEE, LLLL d, y',
         self::LONG => 'LLLL d, y',
         self::MEDIUM => 'LLL d, y',
         self::SHORT => 'M/d/yy',
-    );
+    ];
 
     /**
      * Patterns used to format the time when no pattern is provided.
      */
-    private $defaultTimeFormats = array(
+    private $defaultTimeFormats = [
         self::FULL => 'h:mm:ss a zzzz',
         self::LONG => 'h:mm:ss a z',
         self::MEDIUM => 'h:mm:ss a',
         self::SHORT => 'h:mm a',
-    );
+    ];
 
     private $datetype;
     private $timetype;
@@ -600,7 +600,7 @@ protected function createDateTime($timestamp)
      */
     protected function getDefaultPattern()
     {
-        $patternParts = array();
+        $patternParts = [];
         if (self::NONE !== $this->datetype) {
             $patternParts[] = $this->defaultDateFormats[$this->datetype];
         }
diff --git a/src/Symfony/Component/Intl/Globals/IntlGlobals.php b/src/Symfony/Component/Intl/Globals/IntlGlobals.php
index 4e520695efa9f..0dd25382f628b 100644
--- a/src/Symfony/Component/Intl/Globals/IntlGlobals.php
+++ b/src/Symfony/Component/Intl/Globals/IntlGlobals.php
@@ -38,11 +38,11 @@ abstract class IntlGlobals
     /**
      * All known error codes.
      */
-    private static $errorCodes = array(
+    private static $errorCodes = [
         self::U_ZERO_ERROR => 'U_ZERO_ERROR',
         self::U_ILLEGAL_ARGUMENT_ERROR => 'U_ILLEGAL_ARGUMENT_ERROR',
         self::U_PARSE_ERROR => 'U_PARSE_ERROR',
-    );
+    ];
 
     /**
      * The error code of the last operation.
diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
index 0d7c3df0decfb..a257e36947d0d 100644
--- a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
+++ b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
@@ -151,40 +151,40 @@ class NumberFormatter
     /**
      * Default values for the en locale.
      */
-    private $attributes = array(
+    private $attributes = [
         self::FRACTION_DIGITS => 0,
         self::GROUPING_USED => 1,
         self::ROUNDING_MODE => self::ROUND_HALFEVEN,
-    );
+    ];
 
     /**
      * Holds the initialized attributes code.
      */
-    private $initializedAttributes = array();
+    private $initializedAttributes = [];
 
     /**
      * The supported styles to the constructor $styles argument.
      */
-    private static $supportedStyles = array(
+    private static $supportedStyles = [
         'CURRENCY' => self::CURRENCY,
         'DECIMAL' => self::DECIMAL,
-    );
+    ];
 
     /**
      * Supported attributes to the setAttribute() $attr argument.
      */
-    private static $supportedAttributes = array(
+    private static $supportedAttributes = [
         'FRACTION_DIGITS' => self::FRACTION_DIGITS,
         'GROUPING_USED' => self::GROUPING_USED,
         'ROUNDING_MODE' => self::ROUNDING_MODE,
-    );
+    ];
 
     /**
      * The available rounding modes for setAttribute() usage with
      * NumberFormatter::ROUNDING_MODE. NumberFormatter::ROUND_DOWN
      * and NumberFormatter::ROUND_UP does not have a PHP only equivalent.
      */
-    private static $roundingModes = array(
+    private static $roundingModes = [
         'ROUND_HALFEVEN' => self::ROUND_HALFEVEN,
         'ROUND_HALFDOWN' => self::ROUND_HALFDOWN,
         'ROUND_HALFUP' => self::ROUND_HALFUP,
@@ -192,7 +192,7 @@ class NumberFormatter
         'ROUND_FLOOR' => self::ROUND_FLOOR,
         'ROUND_DOWN' => self::ROUND_DOWN,
         'ROUND_UP' => self::ROUND_UP,
-    );
+    ];
 
     /**
      * The mapping between NumberFormatter rounding modes to the available
@@ -200,23 +200,23 @@ class NumberFormatter
      *
      * @see http://www.php.net/manual/en/function.round.php
      */
-    private static $phpRoundingMap = array(
+    private static $phpRoundingMap = [
         self::ROUND_HALFDOWN => \PHP_ROUND_HALF_DOWN,
         self::ROUND_HALFEVEN => \PHP_ROUND_HALF_EVEN,
         self::ROUND_HALFUP => \PHP_ROUND_HALF_UP,
-    );
+    ];
 
     /**
      * The list of supported rounding modes which aren't available modes in
      * PHP's round() function, but there's an equivalent. Keys are rounding
      * modes, values does not matter.
      */
-    private static $customRoundingList = array(
+    private static $customRoundingList = [
         self::ROUND_CEILING => true,
         self::ROUND_FLOOR => true,
         self::ROUND_DOWN => true,
         self::ROUND_UP => true,
-    );
+    ];
 
     /**
      * The maximum value of the integer type in 32 bit platforms.
@@ -230,15 +230,15 @@ class NumberFormatter
      */
     private static $int64Max = 9223372036854775807;
 
-    private static $enSymbols = array(
-        self::DECIMAL => array('.', ',', ';', '%', '0', '#', '-', '+', '¤', '¤¤', '.', 'E', '‰', '*', '∞', 'NaN', '@', ','),
-        self::CURRENCY => array('.', ',', ';', '%', '0', '#', '-', '+', '¤', '¤¤', '.', 'E', '‰', '*', '∞', 'NaN', '@', ','),
-    );
+    private static $enSymbols = [
+        self::DECIMAL => ['.', ',', ';', '%', '0', '#', '-', '+', '¤', '¤¤', '.', 'E', '‰', '*', '∞', 'NaN', '@', ','],
+        self::CURRENCY => ['.', ',', ';', '%', '0', '#', '-', '+', '¤', '¤¤', '.', 'E', '‰', '*', '∞', 'NaN', '@', ','],
+    ];
 
-    private static $enTextAttributes = array(
-        self::DECIMAL => array('', '', '-', '', ' ', 'XXX', ''),
-        self::CURRENCY => array('¤', '', '-¤', '', ' ', 'XXX'),
-    );
+    private static $enTextAttributes = [
+        self::DECIMAL => ['', '', '-', '', ' ', 'XXX', ''],
+        self::CURRENCY => ['¤', '', '-¤', '', ' ', 'XXX'],
+    ];
 
     /**
      * @param string $locale  The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
diff --git a/src/Symfony/Component/Intl/ResourceBundle/CurrencyBundle.php b/src/Symfony/Component/Intl/ResourceBundle/CurrencyBundle.php
index b528b3b0a7fe3..a7a3cc1bcc8d0 100644
--- a/src/Symfony/Component/Intl/ResourceBundle/CurrencyBundle.php
+++ b/src/Symfony/Component/Intl/ResourceBundle/CurrencyBundle.php
@@ -73,7 +73,7 @@ public function getCurrencyNames($displayLocale = null)
         try {
             return $this->getNames($displayLocale);
         } catch (MissingResourceException $e) {
-            return array();
+            return [];
         }
     }
 
@@ -109,7 +109,7 @@ public function getLocales()
         try {
             return $this->localeProvider->getLocales();
         } catch (MissingResourceException $e) {
-            return array();
+            return [];
         }
     }
 }
diff --git a/src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php b/src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php
index ee319544e5414..c709f1f625169 100644
--- a/src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php
+++ b/src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php
@@ -74,7 +74,7 @@ public function getLanguageNames($displayLocale = null)
         try {
             return $this->getNames($displayLocale);
         } catch (MissingResourceException $e) {
-            return array();
+            return [];
         }
     }
 
@@ -98,7 +98,7 @@ public function getScriptNames($displayLocale = null)
         try {
             return $this->scriptProvider->getNames($displayLocale);
         } catch (MissingResourceException $e) {
-            return array();
+            return [];
         }
     }
 
@@ -110,7 +110,7 @@ public function getLocales()
         try {
             return $this->localeProvider->getLocales();
         } catch (MissingResourceException $e) {
-            return array();
+            return [];
         }
     }
 }
diff --git a/src/Symfony/Component/Intl/ResourceBundle/LocaleBundle.php b/src/Symfony/Component/Intl/ResourceBundle/LocaleBundle.php
index b14048a40ff94..078b1de2ddd8e 100644
--- a/src/Symfony/Component/Intl/ResourceBundle/LocaleBundle.php
+++ b/src/Symfony/Component/Intl/ResourceBundle/LocaleBundle.php
@@ -31,7 +31,7 @@ public function getLocales()
         try {
             return parent::getLocales();
         } catch (MissingResourceException $e) {
-            return array();
+            return [];
         }
     }
 
@@ -55,7 +55,7 @@ public function getLocaleNames($displayLocale = null)
         try {
             return $this->getNames($displayLocale);
         } catch (MissingResourceException $e) {
-            return array();
+            return [];
         }
     }
 }
diff --git a/src/Symfony/Component/Intl/ResourceBundle/RegionBundle.php b/src/Symfony/Component/Intl/ResourceBundle/RegionBundle.php
index d709ba55626f6..1eccbb33980f0 100644
--- a/src/Symfony/Component/Intl/ResourceBundle/RegionBundle.php
+++ b/src/Symfony/Component/Intl/ResourceBundle/RegionBundle.php
@@ -61,7 +61,7 @@ public function getCountryNames($displayLocale = null)
         try {
             return $this->getNames($displayLocale);
         } catch (MissingResourceException $e) {
-            return array();
+            return [];
         }
     }
 
@@ -73,7 +73,7 @@ public function getLocales()
         try {
             return $this->localeProvider->getLocales();
         } catch (MissingResourceException $e) {
-            return array();
+            return [];
         }
     }
 }
diff --git a/src/Symfony/Component/Intl/Resources/bin/update-data.php b/src/Symfony/Component/Intl/Resources/bin/update-data.php
index 7238f4688016d..d6e25af474569 100644
--- a/src/Symfony/Component/Intl/Resources/bin/update-data.php
+++ b/src/Symfony/Component/Intl/Resources/bin/update-data.php
@@ -178,8 +178,8 @@
 //$phpDir = $baseDir.'/'.Intl::PHP;
 //$resDir = $baseDir.'/'.Intl::RB_V2;
 
-$targetDirs = array($jsonDir/*, $resDir*/);
-$workingDirs = array($jsonDir/*, $txtDir, $resDir*/);
+$targetDirs = [$jsonDir/*, $resDir*/];
+$workingDirs = [$jsonDir/*, $txtDir, $resDir*/];
 
 //$config->addBundleWriter($txtDir, new TextBundleWriter());
 $config->addBundleWriter($jsonDir, new JsonBundleWriter());
@@ -189,13 +189,13 @@
 $filesystem->remove($workingDirs);
 
 foreach ($workingDirs as $targetDir) {
-    $filesystem->mkdir(array(
+    $filesystem->mkdir([
         $targetDir.'/'.Intl::CURRENCY_DIR,
         $targetDir.'/'.Intl::LANGUAGE_DIR,
         $targetDir.'/'.Intl::LOCALE_DIR,
         $targetDir.'/'.Intl::REGION_DIR,
         $targetDir.'/'.Intl::SCRIPT_DIR,
-    ));
+    ]);
 }
 
 // We don't want to use fallback to English during generation
diff --git a/src/Symfony/Component/Intl/Tests/Collator/AbstractCollatorTest.php b/src/Symfony/Component/Intl/Tests/Collator/AbstractCollatorTest.php
index 3465bb0c1d64e..28eb37d7cc057 100644
--- a/src/Symfony/Component/Intl/Tests/Collator/AbstractCollatorTest.php
+++ b/src/Symfony/Component/Intl/Tests/Collator/AbstractCollatorTest.php
@@ -33,24 +33,24 @@ public function testAsort($array, $sortFlag, $expected)
 
     public function asortProvider()
     {
-        return array(
+        return [
             /* array, sortFlag, expected */
-            array(
-                array('a', 'b', 'c'),
+            [
+                ['a', 'b', 'c'],
                 Collator::SORT_REGULAR,
-                array('a', 'b', 'c'),
-            ),
-            array(
-                array('c', 'b', 'a'),
+                ['a', 'b', 'c'],
+            ],
+            [
+                ['c', 'b', 'a'],
                 Collator::SORT_REGULAR,
-                array(2 => 'a', 1 => 'b',  0 => 'c'),
-            ),
-            array(
-                array('b', 'c', 'a'),
+                [2 => 'a', 1 => 'b',  0 => 'c'],
+            ],
+            [
+                ['b', 'c', 'a'],
                 Collator::SORT_REGULAR,
-                array(2 => 'a', 0 => 'b', 1 => 'c'),
-            ),
-        );
+                [2 => 'a', 0 => 'b', 1 => 'c'],
+            ],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php
index aedc18d384fc5..e8addf25c17c7 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php
@@ -32,34 +32,34 @@ class BundleEntryReaderTest extends TestCase
      */
     private $readerImpl;
 
-    private static $data = array(
-        'Entries' => array(
+    private static $data = [
+        'Entries' => [
             'Foo' => 'Bar',
             'Bar' => 'Baz',
-        ),
+        ],
         'Foo' => 'Bar',
         'Version' => '2.0',
-    );
+    ];
 
-    private static $fallbackData = array(
-        'Entries' => array(
+    private static $fallbackData = [
+        'Entries' => [
             'Foo' => 'Foo',
             'Bam' => 'Lah',
-        ),
+        ],
         'Baz' => 'Foo',
         'Version' => '1.0',
-    );
+    ];
 
-    private static $mergedData = array(
+    private static $mergedData = [
         // no recursive merging -> too complicated
-        'Entries' => array(
+        'Entries' => [
             'Foo' => 'Bar',
             'Bar' => 'Baz',
-        ),
+        ],
         'Baz' => 'Foo',
         'Version' => '2.0',
         'Foo' => 'Bar',
-    );
+    ];
 
     protected function setUp()
     {
@@ -89,7 +89,7 @@ public function testReadEntireDataFileIfNoIndicesGiven()
             ->with(self::RES_DIR, 'root')
             ->will($this->returnValue(self::$fallbackData));
 
-        $this->assertSame(self::$mergedData, $this->reader->readEntry(self::RES_DIR, 'en', array()));
+        $this->assertSame(self::$mergedData, $this->reader->readEntry(self::RES_DIR, 'en', []));
     }
 
     public function testReadExistingEntry()
@@ -99,7 +99,7 @@ public function testReadExistingEntry()
             ->with(self::RES_DIR, 'root')
             ->will($this->returnValue(self::$data));
 
-        $this->assertSame('Bar', $this->reader->readEntry(self::RES_DIR, 'root', array('Entries', 'Foo')));
+        $this->assertSame('Bar', $this->reader->readEntry(self::RES_DIR, 'root', ['Entries', 'Foo']));
     }
 
     /**
@@ -112,7 +112,7 @@ public function testReadNonExistingEntry()
             ->with(self::RES_DIR, 'root')
             ->will($this->returnValue(self::$data));
 
-        $this->reader->readEntry(self::RES_DIR, 'root', array('Entries', 'NonExisting'));
+        $this->reader->readEntry(self::RES_DIR, 'root', ['Entries', 'NonExisting']);
     }
 
     public function testFallbackIfEntryDoesNotExist()
@@ -127,7 +127,7 @@ public function testFallbackIfEntryDoesNotExist()
             ->with(self::RES_DIR, 'en')
             ->will($this->returnValue(self::$fallbackData));
 
-        $this->assertSame('Lah', $this->reader->readEntry(self::RES_DIR, 'en_GB', array('Entries', 'Bam')));
+        $this->assertSame('Lah', $this->reader->readEntry(self::RES_DIR, 'en_GB', ['Entries', 'Bam']));
     }
 
     /**
@@ -140,7 +140,7 @@ public function testDontFallbackIfEntryDoesNotExistAndFallbackDisabled()
             ->with(self::RES_DIR, 'en_GB')
             ->will($this->returnValue(self::$data));
 
-        $this->reader->readEntry(self::RES_DIR, 'en_GB', array('Entries', 'Bam'), false);
+        $this->reader->readEntry(self::RES_DIR, 'en_GB', ['Entries', 'Bam'], false);
     }
 
     public function testFallbackIfLocaleDoesNotExist()
@@ -155,7 +155,7 @@ public function testFallbackIfLocaleDoesNotExist()
             ->with(self::RES_DIR, 'en')
             ->will($this->returnValue(self::$fallbackData));
 
-        $this->assertSame('Lah', $this->reader->readEntry(self::RES_DIR, 'en_GB', array('Entries', 'Bam')));
+        $this->assertSame('Lah', $this->reader->readEntry(self::RES_DIR, 'en_GB', ['Entries', 'Bam']));
     }
 
     /**
@@ -168,20 +168,20 @@ public function testDontFallbackIfLocaleDoesNotExistAndFallbackDisabled()
             ->with(self::RES_DIR, 'en_GB')
             ->will($this->throwException(new ResourceBundleNotFoundException()));
 
-        $this->reader->readEntry(self::RES_DIR, 'en_GB', array('Entries', 'Bam'), false);
+        $this->reader->readEntry(self::RES_DIR, 'en_GB', ['Entries', 'Bam'], false);
     }
 
     public function provideMergeableValues()
     {
-        return array(
-            array('foo', null, 'foo'),
-            array(null, 'foo', 'foo'),
-            array(array('foo', 'bar'), null, array('foo', 'bar')),
-            array(array('foo', 'bar'), array(), array('foo', 'bar')),
-            array(null, array('baz'), array('baz')),
-            array(array(), array('baz'), array('baz')),
-            array(array('foo', 'bar'), array('baz'), array('baz', 'foo', 'bar')),
-        );
+        return [
+            ['foo', null, 'foo'],
+            [null, 'foo', 'foo'],
+            [['foo', 'bar'], null, ['foo', 'bar']],
+            [['foo', 'bar'], [], ['foo', 'bar']],
+            [null, ['baz'], ['baz']],
+            [[], ['baz'], ['baz']],
+            [['foo', 'bar'], ['baz'], ['baz', 'foo', 'bar']],
+        ];
     }
 
     /**
@@ -206,7 +206,7 @@ public function testMergeDataWithFallbackData($childData, $parentData, $result)
                 ->will($this->returnValue($childData));
         }
 
-        $this->assertSame($result, $this->reader->readEntry(self::RES_DIR, 'en', array(), true));
+        $this->assertSame($result, $this->reader->readEntry(self::RES_DIR, 'en', [], true));
     }
 
     /**
@@ -219,7 +219,7 @@ public function testDontMergeDataIfFallbackDisabled($childData, $parentData, $re
             ->with(self::RES_DIR, 'en_GB')
             ->will($this->returnValue($childData));
 
-        $this->assertSame($childData, $this->reader->readEntry(self::RES_DIR, 'en_GB', array(), false));
+        $this->assertSame($childData, $this->reader->readEntry(self::RES_DIR, 'en_GB', [], false));
     }
 
     /**
@@ -231,20 +231,20 @@ public function testMergeExistingEntryWithExistingFallbackEntry($childData, $par
             $this->readerImpl->expects($this->at(0))
                 ->method('read')
                 ->with(self::RES_DIR, 'en')
-                ->will($this->returnValue(array('Foo' => array('Bar' => $childData))));
+                ->will($this->returnValue(['Foo' => ['Bar' => $childData]]));
 
             $this->readerImpl->expects($this->at(1))
                 ->method('read')
                 ->with(self::RES_DIR, 'root')
-                ->will($this->returnValue(array('Foo' => array('Bar' => $parentData))));
+                ->will($this->returnValue(['Foo' => ['Bar' => $parentData]]));
         } else {
             $this->readerImpl->expects($this->once())
                 ->method('read')
                 ->with(self::RES_DIR, 'en')
-                ->will($this->returnValue(array('Foo' => array('Bar' => $childData))));
+                ->will($this->returnValue(['Foo' => ['Bar' => $childData]]));
         }
 
-        $this->assertSame($result, $this->reader->readEntry(self::RES_DIR, 'en', array('Foo', 'Bar'), true));
+        $this->assertSame($result, $this->reader->readEntry(self::RES_DIR, 'en', ['Foo', 'Bar'], true));
     }
 
     /**
@@ -255,14 +255,14 @@ public function testMergeNonExistingEntryWithExistingFallbackEntry($childData, $
         $this->readerImpl->expects($this->at(0))
             ->method('read')
             ->with(self::RES_DIR, 'en_GB')
-            ->will($this->returnValue(array('Foo' => 'Baz')));
+            ->will($this->returnValue(['Foo' => 'Baz']));
 
         $this->readerImpl->expects($this->at(1))
             ->method('read')
             ->with(self::RES_DIR, 'en')
-            ->will($this->returnValue(array('Foo' => array('Bar' => $parentData))));
+            ->will($this->returnValue(['Foo' => ['Bar' => $parentData]]));
 
-        $this->assertSame($parentData, $this->reader->readEntry(self::RES_DIR, 'en_GB', array('Foo', 'Bar'), true));
+        $this->assertSame($parentData, $this->reader->readEntry(self::RES_DIR, 'en_GB', ['Foo', 'Bar'], true));
     }
 
     /**
@@ -274,20 +274,20 @@ public function testMergeExistingEntryWithNonExistingFallbackEntry($childData, $
             $this->readerImpl->expects($this->at(0))
                 ->method('read')
                 ->with(self::RES_DIR, 'en_GB')
-                ->will($this->returnValue(array('Foo' => array('Bar' => $childData))));
+                ->will($this->returnValue(['Foo' => ['Bar' => $childData]]));
 
             $this->readerImpl->expects($this->at(1))
                 ->method('read')
                 ->with(self::RES_DIR, 'en')
-                ->will($this->returnValue(array('Foo' => 'Bar')));
+                ->will($this->returnValue(['Foo' => 'Bar']));
         } else {
             $this->readerImpl->expects($this->once())
                 ->method('read')
                 ->with(self::RES_DIR, 'en_GB')
-                ->will($this->returnValue(array('Foo' => array('Bar' => $childData))));
+                ->will($this->returnValue(['Foo' => ['Bar' => $childData]]));
         }
 
-        $this->assertSame($childData, $this->reader->readEntry(self::RES_DIR, 'en_GB', array('Foo', 'Bar'), true));
+        $this->assertSame($childData, $this->reader->readEntry(self::RES_DIR, 'en_GB', ['Foo', 'Bar'], true));
     }
 
     /**
@@ -298,14 +298,14 @@ public function testFailIfEntryFoundNeitherInParentNorChild()
         $this->readerImpl->expects($this->at(0))
             ->method('read')
             ->with(self::RES_DIR, 'en_GB')
-            ->will($this->returnValue(array('Foo' => 'Baz')));
+            ->will($this->returnValue(['Foo' => 'Baz']));
 
         $this->readerImpl->expects($this->at(1))
             ->method('read')
             ->with(self::RES_DIR, 'en')
-            ->will($this->returnValue(array('Foo' => 'Bar')));
+            ->will($this->returnValue(['Foo' => 'Bar']));
 
-        $this->reader->readEntry(self::RES_DIR, 'en_GB', array('Foo', 'Bar'), true);
+        $this->reader->readEntry(self::RES_DIR, 'en_GB', ['Foo', 'Bar'], true);
     }
 
     /**
@@ -320,20 +320,20 @@ public function testMergeTraversables($childData, $parentData, $result)
             $this->readerImpl->expects($this->at(0))
                 ->method('read')
                 ->with(self::RES_DIR, 'en_GB')
-                ->will($this->returnValue(array('Foo' => array('Bar' => $childData))));
+                ->will($this->returnValue(['Foo' => ['Bar' => $childData]]));
 
             $this->readerImpl->expects($this->at(1))
                 ->method('read')
                 ->with(self::RES_DIR, 'en')
-                ->will($this->returnValue(array('Foo' => array('Bar' => $parentData))));
+                ->will($this->returnValue(['Foo' => ['Bar' => $parentData]]));
         } else {
             $this->readerImpl->expects($this->once())
                 ->method('read')
                 ->with(self::RES_DIR, 'en_GB')
-                ->will($this->returnValue(array('Foo' => array('Bar' => $childData))));
+                ->will($this->returnValue(['Foo' => ['Bar' => $childData]]));
         }
 
-        $this->assertSame($result, $this->reader->readEntry(self::RES_DIR, 'en_GB', array('Foo', 'Bar'), true));
+        $this->assertSame($result, $this->reader->readEntry(self::RES_DIR, 'en_GB', ['Foo', 'Bar'], true));
     }
 
     /**
@@ -341,26 +341,26 @@ public function testMergeTraversables($childData, $parentData, $result)
      */
     public function testFollowLocaleAliases($childData, $parentData, $result)
     {
-        $this->reader->setLocaleAliases(array('mo' => 'ro_MD'));
+        $this->reader->setLocaleAliases(['mo' => 'ro_MD']);
 
         if (null === $childData || \is_array($childData)) {
             $this->readerImpl->expects($this->at(0))
                 ->method('read')
                 ->with(self::RES_DIR, 'ro_MD')
-                ->will($this->returnValue(array('Foo' => array('Bar' => $childData))));
+                ->will($this->returnValue(['Foo' => ['Bar' => $childData]]));
 
             // Read fallback locale of aliased locale ("ro_MD" -> "ro")
             $this->readerImpl->expects($this->at(1))
                 ->method('read')
                 ->with(self::RES_DIR, 'ro')
-                ->will($this->returnValue(array('Foo' => array('Bar' => $parentData))));
+                ->will($this->returnValue(['Foo' => ['Bar' => $parentData]]));
         } else {
             $this->readerImpl->expects($this->once())
                 ->method('read')
                 ->with(self::RES_DIR, 'ro_MD')
-                ->will($this->returnValue(array('Foo' => array('Bar' => $childData))));
+                ->will($this->returnValue(['Foo' => ['Bar' => $childData]]));
         }
 
-        $this->assertSame($result, $this->reader->readEntry(self::RES_DIR, 'mo', array('Foo', 'Bar'), true));
+        $this->assertSame($result, $this->reader->readEntry(self::RES_DIR, 'mo', ['Foo', 'Bar'], true));
     }
 }
diff --git a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/Fixtures/en.php b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/Fixtures/en.php
index f2b06a91ad32e..e00056aee8782 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/Fixtures/en.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/Fixtures/en.php
@@ -9,6 +9,6 @@
  * file that was distributed with this source code.
  */
 
-return array(
+return [
     'Foo' => 'Bar',
-);
+];
diff --git a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/Fixtures/invalid_directory/en.php b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/Fixtures/invalid_directory/en.php
index f2b06a91ad32e..e00056aee8782 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/Fixtures/invalid_directory/en.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/Fixtures/invalid_directory/en.php
@@ -9,6 +9,6 @@
  * file that was distributed with this source code.
  */
 
-return array(
+return [
     'Foo' => 'Bar',
-);
+];
diff --git a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/Fixtures/php/en.php b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/Fixtures/php/en.php
index f2b06a91ad32e..e00056aee8782 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/Fixtures/php/en.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/Fixtures/php/en.php
@@ -9,6 +9,6 @@
  * file that was distributed with this source code.
  */
 
-return array(
+return [
     'Foo' => 'Bar',
-);
+];
diff --git a/src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/JsonBundleWriterTest.php b/src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/JsonBundleWriterTest.php
index d13279c0d649c..f56bc84385d8f 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/JsonBundleWriterTest.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/JsonBundleWriterTest.php
@@ -48,18 +48,18 @@ protected function tearDown()
 
     public function testWrite()
     {
-        $this->writer->write($this->directory, 'en', array(
-            'Entry1' => array(
-                'Array' => array('foo', 'bar'),
+        $this->writer->write($this->directory, 'en', [
+            'Entry1' => [
+                'Array' => ['foo', 'bar'],
                 'Integer' => 5,
                 'Boolean' => false,
                 'Float' => 1.23,
-            ),
+            ],
             'Entry2' => 'String',
-            'Traversable' => new \ArrayIterator(array(
+            'Traversable' => new \ArrayIterator([
                 'Foo' => 'Bar',
-            )),
-        ));
+            ]),
+        ]);
 
         $this->assertFileEquals(__DIR__.'/Fixtures/en.json', $this->directory.'/en.json');
     }
diff --git a/src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/PhpBundleWriterTest.php b/src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/PhpBundleWriterTest.php
index e1b8f67413825..8010f9574a027 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/PhpBundleWriterTest.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/PhpBundleWriterTest.php
@@ -48,18 +48,18 @@ protected function tearDown()
 
     public function testWrite()
     {
-        $this->writer->write($this->directory, 'en', array(
-            'Entry1' => array(
-                'Array' => array('foo', 'bar'),
+        $this->writer->write($this->directory, 'en', [
+            'Entry1' => [
+                'Array' => ['foo', 'bar'],
                 'Integer' => 5,
                 'Boolean' => false,
                 'Float' => 1.23,
-            ),
+            ],
             'Entry2' => 'String',
-            'Traversable' => new \ArrayIterator(array(
+            'Traversable' => new \ArrayIterator([
                 'Foo' => 'Bar',
-            )),
-        ));
+            ]),
+        ]);
 
         $this->assertFileEquals(__DIR__.'/Fixtures/en.php', $this->directory.'/en.php');
     }
diff --git a/src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/TextBundleWriterTest.php b/src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/TextBundleWriterTest.php
index 4908f2837026e..2c0e70e019acf 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/TextBundleWriterTest.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/TextBundleWriterTest.php
@@ -50,51 +50,51 @@ protected function tearDown()
 
     public function testWrite()
     {
-        $this->writer->write($this->directory, 'en', array(
-            'Entry1' => array(
-                'Array' => array('foo', 'bar', array('Key' => 'value')),
+        $this->writer->write($this->directory, 'en', [
+            'Entry1' => [
+                'Array' => ['foo', 'bar', ['Key' => 'value']],
                 'Integer' => 5,
-                'IntVector' => array(0, 1, 2, 3),
-                'NotAnIntVector' => array(0 => 0, 2 => 1, 1 => 2, 3 => 3),
-                'IntVectorWithStringKeys' => array('a' => 0, 'b' => 1, 'c' => 2),
-                'TableWithIntKeys' => array(0 => 0, 1 => 1, 3 => 3),
+                'IntVector' => [0, 1, 2, 3],
+                'NotAnIntVector' => [0 => 0, 2 => 1, 1 => 2, 3 => 3],
+                'IntVectorWithStringKeys' => ['a' => 0, 'b' => 1, 'c' => 2],
+                'TableWithIntKeys' => [0 => 0, 1 => 1, 3 => 3],
                 'FalseBoolean' => false,
                 'TrueBoolean' => true,
                 'Null' => null,
                 'Float' => 1.23,
-            ),
+            ],
             'Entry2' => 'String',
-        ));
+        ]);
 
         $this->assertFileEquals(__DIR__.'/Fixtures/en.txt', $this->directory.'/en.txt');
     }
 
     public function testWriteTraversable()
     {
-        $this->writer->write($this->directory, 'en', new \ArrayIterator(array(
-            'Entry1' => new \ArrayIterator(array(
-                'Array' => array('foo', 'bar', array('Key' => 'value')),
+        $this->writer->write($this->directory, 'en', new \ArrayIterator([
+            'Entry1' => new \ArrayIterator([
+                'Array' => ['foo', 'bar', ['Key' => 'value']],
                 'Integer' => 5,
-                'IntVector' => array(0, 1, 2, 3),
-                'NotAnIntVector' => array(0 => 0, 2 => 1, 1 => 2, 3 => 3),
-                'IntVectorWithStringKeys' => array('a' => 0, 'b' => 1, 'c' => 2),
-                'TableWithIntKeys' => array(0 => 0, 1 => 1, 3 => 3),
+                'IntVector' => [0, 1, 2, 3],
+                'NotAnIntVector' => [0 => 0, 2 => 1, 1 => 2, 3 => 3],
+                'IntVectorWithStringKeys' => ['a' => 0, 'b' => 1, 'c' => 2],
+                'TableWithIntKeys' => [0 => 0, 1 => 1, 3 => 3],
                 'FalseBoolean' => false,
                 'TrueBoolean' => true,
                 'Null' => null,
                 'Float' => 1.23,
-            )),
+            ]),
             'Entry2' => 'String',
-        )));
+        ]));
 
         $this->assertFileEquals(__DIR__.'/Fixtures/en.txt', $this->directory.'/en.txt');
     }
 
     public function testWriteNoFallback()
     {
-        $data = array(
+        $data = [
             'Entry' => 'Value',
-        );
+        ];
 
         $this->writer->write($this->directory, 'en_nofallback', $data, $fallback = false);
 
@@ -103,13 +103,13 @@ public function testWriteNoFallback()
 
     public function testEscapeKeysIfNecessary()
     {
-        $this->writer->write($this->directory, 'escaped', array(
+        $this->writer->write($this->directory, 'escaped', [
             // Keys with colons must be escaped, otherwise the part after the
             // colon is interpreted as resource type
             'EntryWith:Colon' => 'Value',
             // Keys with spaces must be escaped
             'Entry With Spaces' => 'Value',
-        ));
+        ]);
 
         $this->assertFileEquals(__DIR__.'/Fixtures/escaped.txt', $this->directory.'/escaped.txt');
     }
diff --git a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractCurrencyDataProviderTest.php b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractCurrencyDataProviderTest.php
index bf23caee8651d..70afbb666df50 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractCurrencyDataProviderTest.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractCurrencyDataProviderTest.php
@@ -22,7 +22,7 @@ abstract class AbstractCurrencyDataProviderTest extends AbstractDataProviderTest
 {
     // The below arrays document the state of the ICU data bundled with this package.
 
-    protected static $currencies = array(
+    protected static $currencies = [
         'ADP',
         'AED',
         'AFA',
@@ -313,9 +313,9 @@ abstract class AbstractCurrencyDataProviderTest extends AbstractDataProviderTest
         'ZWD',
         'ZWL',
         'ZWR',
-    );
+    ];
 
-    protected static $alpha3ToNumeric = array(
+    protected static $alpha3ToNumeric = [
         'AFA' => 4,
         'ALK' => 8,
         'ALL' => 8,
@@ -584,7 +584,7 @@ abstract class AbstractCurrencyDataProviderTest extends AbstractDataProviderTest
         'ESA' => 996,
         'USN' => 997,
         'USS' => 998,
-    );
+    ];
 
     /**
      * @var CurrencyDataProvider
@@ -659,7 +659,7 @@ public function testGetNamesSupportsAliases($alias, $ofLocale)
     public function testGetName($displayLocale)
     {
         $expected = $this->dataProvider->getNames($displayLocale);
-        $actual = array();
+        $actual = [];
 
         foreach ($expected as $currency => $name) {
             $actual[$currency] = $this->dataProvider->getName($currency, $displayLocale);
@@ -673,7 +673,7 @@ public function testGetNameDefaultLocale()
         Locale::setDefault('de_AT');
 
         $expected = $this->dataProvider->getNames('de_AT');
-        $actual = array();
+        $actual = [];
 
         foreach ($expected as $currency => $name) {
             $actual[$currency] = $this->dataProvider->getName($currency);
@@ -697,7 +697,7 @@ public function testGetSymbol($displayLocale)
     public function provideCurrencies()
     {
         return array_map(
-            function ($currency) { return array($currency); },
+            function ($currency) { return [$currency]; },
             static::$currencies
         );
     }
@@ -721,7 +721,7 @@ public function testGetRoundingIncrement($currency)
     public function provideCurrenciesWithNumericEquivalent()
     {
         return array_map(
-            function ($value) { return array($value); },
+            function ($value) { return [$value]; },
             array_keys(static::$alpha3ToNumeric)
         );
     }
@@ -737,7 +737,7 @@ public function testGetNumericCode($currency)
     public function provideCurrenciesWithoutNumericEquivalent()
     {
         return array_map(
-            function ($value) { return array($value); },
+            function ($value) { return [$value]; },
             array_diff(static::$currencies, array_keys(static::$alpha3ToNumeric))
         );
     }
@@ -756,7 +756,7 @@ public function provideValidNumericCodes()
         $numericToAlpha3 = $this->getNumericToAlpha3Mapping();
 
         return array_map(
-            function ($numeric, $alpha3) { return array($numeric, $alpha3); },
+            function ($numeric, $alpha3) { return [$numeric, $alpha3]; },
             array_keys($numericToAlpha3),
             $numericToAlpha3
         );
@@ -782,7 +782,7 @@ public function provideInvalidNumericCodes()
         $invalidNumericCodes = array_diff(range(0, 1000), $validNumericCodes);
 
         return array_map(
-            function ($value) { return array($value); },
+            function ($value) { return [$value]; },
             $invalidNumericCodes
         );
     }
@@ -798,11 +798,11 @@ public function testForNumericCodeFailsIfInvalidNumericCode($currency)
 
     private function getNumericToAlpha3Mapping()
     {
-        $numericToAlpha3 = array();
+        $numericToAlpha3 = [];
 
         foreach (static::$alpha3ToNumeric as $alpha3 => $numeric) {
             if (!isset($numericToAlpha3[$numeric])) {
-                $numericToAlpha3[$numeric] = array();
+                $numericToAlpha3[$numeric] = [];
             }
 
             $numericToAlpha3[$numeric][] = $alpha3;
diff --git a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractDataProviderTest.php b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractDataProviderTest.php
index 19246a0602e20..22025becebd8e 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractDataProviderTest.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractDataProviderTest.php
@@ -26,7 +26,7 @@ abstract class AbstractDataProviderTest extends TestCase
     // not loaded, because it is NOT possible to skip the execution of data
     // providers.
 
-    private static $locales = array(
+    private static $locales = [
         'af',
         'af_NA',
         'af_ZA',
@@ -633,9 +633,9 @@ abstract class AbstractDataProviderTest extends TestCase
         'zh_TW',
         'zu',
         'zu_ZA',
-    );
+    ];
 
-    private static $localeAliases = array(
+    private static $localeAliases = [
         'az_AZ' => 'az_Latn_AZ',
         'bs_BA' => 'bs_Latn_BA',
         'en_NH' => 'en_VU',
@@ -673,7 +673,7 @@ abstract class AbstractDataProviderTest extends TestCase
         'zh_MO' => 'zh_Hant_MO',
         'zh_SG' => 'zh_Hans_SG',
         'zh_TW' => 'zh_Hant_TW',
-    );
+    ];
 
     private static $rootLocales;
 
@@ -686,7 +686,7 @@ protected function setUp()
     public function provideLocales()
     {
         return array_map(
-            function ($locale) { return array($locale); },
+            function ($locale) { return [$locale]; },
             $this->getLocales()
         );
     }
@@ -694,7 +694,7 @@ function ($locale) { return array($locale); },
     public function provideLocaleAliases()
     {
         return array_map(
-            function ($alias, $ofLocale) { return array($alias, $ofLocale); },
+            function ($alias, $ofLocale) { return [$alias, $ofLocale]; },
             array_keys($this->getLocaleAliases()),
             $this->getLocaleAliases()
         );
@@ -703,7 +703,7 @@ function ($alias, $ofLocale) { return array($alias, $ofLocale); },
     public function provideRootLocales()
     {
         return array_map(
-            function ($locale) { return array($locale); },
+            function ($locale) { return [$locale]; },
             $this->getRootLocales()
         );
     }
diff --git a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractLanguageDataProviderTest.php b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractLanguageDataProviderTest.php
index f328ebb484e17..003e688d03d87 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractLanguageDataProviderTest.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractLanguageDataProviderTest.php
@@ -22,7 +22,7 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
 {
     // The below arrays document the state of the ICU data bundled with this package.
 
-    protected static $languages = array(
+    protected static $languages = [
         'aa',
         'ab',
         'ace',
@@ -643,9 +643,9 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
         'zun',
         'zxx',
         'zza',
-    );
+    ];
 
-    protected static $alpha2ToAlpha3 = array(
+    protected static $alpha2ToAlpha3 = [
         'aa' => 'aar',
         'ab' => 'abk',
         'af' => 'afr',
@@ -826,7 +826,7 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
         'yo' => 'yor',
         'za' => 'zha',
         'zu' => 'zul',
-    );
+    ];
 
     /**
      * @var LanguageDataProvider
@@ -913,7 +913,7 @@ public function testGetNameDefaultLocale()
     public function provideLanguagesWithAlpha3Equivalent()
     {
         return array_map(
-            function ($value) { return array($value); },
+            function ($value) { return [$value]; },
             array_keys(static::$alpha2ToAlpha3)
         );
     }
@@ -929,7 +929,7 @@ public function testGetAlpha3Code($language)
     public function provideLanguagesWithoutAlpha3Equivalent()
     {
         return array_map(
-            function ($value) { return array($value); },
+            function ($value) { return [$value]; },
             array_diff(static::$languages, array_keys(static::$alpha2ToAlpha3))
         );
     }
diff --git a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractRegionDataProviderTest.php b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractRegionDataProviderTest.php
index c91c96f1e4dfb..1f5febb2b86bf 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractRegionDataProviderTest.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractRegionDataProviderTest.php
@@ -22,7 +22,7 @@ abstract class AbstractRegionDataProviderTest extends AbstractDataProviderTest
 {
     // The below arrays document the state of the ICU data bundled with this package.
 
-    protected static $territories = array(
+    protected static $territories = [
         'AC',
         'AD',
         'AE',
@@ -278,7 +278,7 @@ abstract class AbstractRegionDataProviderTest extends AbstractDataProviderTest
         'ZA',
         'ZM',
         'ZW',
-    );
+    ];
 
     /**
      * @var RegionDataProvider
diff --git a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractScriptDataProviderTest.php b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractScriptDataProviderTest.php
index c827f6232687d..0626159cba705 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractScriptDataProviderTest.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractScriptDataProviderTest.php
@@ -23,7 +23,7 @@ abstract class AbstractScriptDataProviderTest extends AbstractDataProviderTest
 {
     // The below arrays document the state of the ICU data bundled with this package.
 
-    protected static $scripts = array(
+    protected static $scripts = [
         'Adlm',
         'Afak',
         'Aghb',
@@ -209,7 +209,7 @@ abstract class AbstractScriptDataProviderTest extends AbstractDataProviderTest
         'Zxxx',
         'Zyyy',
         'Zzzz',
-    );
+    ];
 
     /**
      * @var ScriptDataProvider
diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
index 77d3c125c1f9c..58a8932afd9a9 100644
--- a/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
+++ b/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
@@ -63,185 +63,185 @@ public function formatProvider()
     {
         $dateTime = new \DateTime('@0');
 
-        $formatData = array(
+        $formatData = [
             /* general */
-            array('y-M-d', 0, '1970-1-1'),
-            array("EEE, MMM d, ''yy", 0, "Thu, Jan 1, '70"),
-            array('h:mm a', 0, '12:00 AM'),
-            array('yyyyy.MMMM.dd hh:mm aaa', 0, '01970.January.01 12:00 AM'),
+            ['y-M-d', 0, '1970-1-1'],
+            ["EEE, MMM d, ''yy", 0, "Thu, Jan 1, '70"],
+            ['h:mm a', 0, '12:00 AM'],
+            ['yyyyy.MMMM.dd hh:mm aaa', 0, '01970.January.01 12:00 AM'],
 
             /* escaping */
-            array("'M'", 0, 'M'),
-            array("'yy'", 0, 'yy'),
-            array("'''yy'", 0, "'yy"),
-            array("''y", 0, "'1970"),
-            array("''yy", 0, "'70"),
-            array("H 'o'' clock'", 0, "0 o' clock"),
+            ["'M'", 0, 'M'],
+            ["'yy'", 0, 'yy'],
+            ["'''yy'", 0, "'yy"],
+            ["''y", 0, "'1970"],
+            ["''yy", 0, "'70"],
+            ["H 'o'' clock'", 0, "0 o' clock"],
 
             /* month */
-            array('M', 0, '1'),
-            array('MM', 0, '01'),
-            array('MMM', 0, 'Jan'),
-            array('MMMM', 0, 'January'),
-            array('MMMMM', 0, 'J'),
-            array('MMMMMM', 0, '000001'),
-
-            array('L', 0, '1'),
-            array('LL', 0, '01'),
-            array('LLL', 0, 'Jan'),
-            array('LLLL', 0, 'January'),
-            array('LLLLL', 0, 'J'),
-            array('LLLLLL', 0, '000001'),
+            ['M', 0, '1'],
+            ['MM', 0, '01'],
+            ['MMM', 0, 'Jan'],
+            ['MMMM', 0, 'January'],
+            ['MMMMM', 0, 'J'],
+            ['MMMMMM', 0, '000001'],
+
+            ['L', 0, '1'],
+            ['LL', 0, '01'],
+            ['LLL', 0, 'Jan'],
+            ['LLLL', 0, 'January'],
+            ['LLLLL', 0, 'J'],
+            ['LLLLLL', 0, '000001'],
 
             /* year */
-            array('y', 0, '1970'),
-            array('yy', 0, '70'),
-            array('yyy', 0, '1970'),
-            array('yyyy', 0, '1970'),
-            array('yyyyy', 0, '01970'),
-            array('yyyyyy', 0, '001970'),
+            ['y', 0, '1970'],
+            ['yy', 0, '70'],
+            ['yyy', 0, '1970'],
+            ['yyyy', 0, '1970'],
+            ['yyyyy', 0, '01970'],
+            ['yyyyyy', 0, '001970'],
 
             /* day */
-            array('d', 0, '1'),
-            array('dd', 0, '01'),
-            array('ddd', 0, '001'),
+            ['d', 0, '1'],
+            ['dd', 0, '01'],
+            ['ddd', 0, '001'],
 
             /* quarter */
-            array('Q', 0, '1'),
-            array('QQ', 0, '01'),
-            array('QQQ', 0, 'Q1'),
-            array('QQQQ', 0, '1st quarter'),
-            array('QQQQQ', 0, '1st quarter'),
-
-            array('q', 0, '1'),
-            array('qq', 0, '01'),
-            array('qqq', 0, 'Q1'),
-            array('qqqq', 0, '1st quarter'),
-            array('qqqqq', 0, '1st quarter'),
+            ['Q', 0, '1'],
+            ['QQ', 0, '01'],
+            ['QQQ', 0, 'Q1'],
+            ['QQQQ', 0, '1st quarter'],
+            ['QQQQQ', 0, '1st quarter'],
+
+            ['q', 0, '1'],
+            ['qq', 0, '01'],
+            ['qqq', 0, 'Q1'],
+            ['qqqq', 0, '1st quarter'],
+            ['qqqqq', 0, '1st quarter'],
 
             // 4 months
-            array('Q', 7776000, '2'),
-            array('QQ', 7776000, '02'),
-            array('QQQ', 7776000, 'Q2'),
-            array('QQQQ', 7776000, '2nd quarter'),
+            ['Q', 7776000, '2'],
+            ['QQ', 7776000, '02'],
+            ['QQQ', 7776000, 'Q2'],
+            ['QQQQ', 7776000, '2nd quarter'],
 
             // 7 months
-            array('QQQQ', 15638400, '3rd quarter'),
+            ['QQQQ', 15638400, '3rd quarter'],
 
             // 10 months
-            array('QQQQ', 23587200, '4th quarter'),
+            ['QQQQ', 23587200, '4th quarter'],
 
             /* 12-hour (1-12) */
-            array('h', 0, '12'),
-            array('hh', 0, '12'),
-            array('hhh', 0, '012'),
+            ['h', 0, '12'],
+            ['hh', 0, '12'],
+            ['hhh', 0, '012'],
 
-            array('h', 1, '12'),
-            array('h', 3600, '1'),
-            array('h', 43200, '12'), // 12 hours
+            ['h', 1, '12'],
+            ['h', 3600, '1'],
+            ['h', 43200, '12'], // 12 hours
 
             /* day of year */
-            array('D', 0, '1'),
-            array('D', 86400, '2'), // 1 day
-            array('D', 31536000, '1'), // 1 year
-            array('D', 31622400, '2'), // 1 year + 1 day
+            ['D', 0, '1'],
+            ['D', 86400, '2'], // 1 day
+            ['D', 31536000, '1'], // 1 year
+            ['D', 31622400, '2'], // 1 year + 1 day
 
             /* day of week */
-            array('E', 0, 'Thu'),
-            array('EE', 0, 'Thu'),
-            array('EEE', 0, 'Thu'),
-            array('EEEE', 0, 'Thursday'),
-            array('EEEEE', 0, 'T'),
-            array('EEEEEE', 0, 'Th'),
+            ['E', 0, 'Thu'],
+            ['EE', 0, 'Thu'],
+            ['EEE', 0, 'Thu'],
+            ['EEEE', 0, 'Thursday'],
+            ['EEEEE', 0, 'T'],
+            ['EEEEEE', 0, 'Th'],
 
-            array('E', 1296540000, 'Tue'), // 2011-02-01
-            array('E', 1296950400, 'Sun'), // 2011-02-06
+            ['E', 1296540000, 'Tue'], // 2011-02-01
+            ['E', 1296950400, 'Sun'], // 2011-02-06
 
             /* am/pm marker */
-            array('a', 0, 'AM'),
-            array('aa', 0, 'AM'),
-            array('aaa', 0, 'AM'),
-            array('aaaa', 0, 'AM'),
+            ['a', 0, 'AM'],
+            ['aa', 0, 'AM'],
+            ['aaa', 0, 'AM'],
+            ['aaaa', 0, 'AM'],
 
             // 12 hours
-            array('a', 43200, 'PM'),
-            array('aa', 43200, 'PM'),
-            array('aaa', 43200, 'PM'),
-            array('aaaa', 43200, 'PM'),
+            ['a', 43200, 'PM'],
+            ['aa', 43200, 'PM'],
+            ['aaa', 43200, 'PM'],
+            ['aaaa', 43200, 'PM'],
 
             /* 24-hour (0-23) */
-            array('H', 0, '0'),
-            array('HH', 0, '00'),
-            array('HHH', 0, '000'),
+            ['H', 0, '0'],
+            ['HH', 0, '00'],
+            ['HHH', 0, '000'],
 
-            array('H', 1, '0'),
-            array('H', 3600, '1'),
-            array('H', 43200, '12'),
-            array('H', 46800, '13'),
+            ['H', 1, '0'],
+            ['H', 3600, '1'],
+            ['H', 43200, '12'],
+            ['H', 46800, '13'],
 
             /* 24-hour (1-24) */
-            array('k', 0, '24'),
-            array('kk', 0, '24'),
-            array('kkk', 0, '024'),
+            ['k', 0, '24'],
+            ['kk', 0, '24'],
+            ['kkk', 0, '024'],
 
-            array('k', 1, '24'),
-            array('k', 3600, '1'),
-            array('k', 43200, '12'),
-            array('k', 46800, '13'),
+            ['k', 1, '24'],
+            ['k', 3600, '1'],
+            ['k', 43200, '12'],
+            ['k', 46800, '13'],
 
             /* 12-hour (0-11) */
-            array('K', 0, '0'),
-            array('KK', 0, '00'),
-            array('KKK', 0, '000'),
+            ['K', 0, '0'],
+            ['KK', 0, '00'],
+            ['KKK', 0, '000'],
 
-            array('K', 1, '0'),
-            array('K', 3600, '1'),
-            array('K', 43200, '0'), // 12 hours
+            ['K', 1, '0'],
+            ['K', 3600, '1'],
+            ['K', 43200, '0'], // 12 hours
 
             /* minute */
-            array('m', 0, '0'),
-            array('mm', 0, '00'),
-            array('mmm', 0, '000'),
-
-            array('m', 1, '0'),
-            array('m', 60, '1'),
-            array('m', 120, '2'),
-            array('m', 180, '3'),
-            array('m', 3600, '0'),
-            array('m', 3660, '1'),
-            array('m', 43200, '0'), // 12 hours
+            ['m', 0, '0'],
+            ['mm', 0, '00'],
+            ['mmm', 0, '000'],
+
+            ['m', 1, '0'],
+            ['m', 60, '1'],
+            ['m', 120, '2'],
+            ['m', 180, '3'],
+            ['m', 3600, '0'],
+            ['m', 3660, '1'],
+            ['m', 43200, '0'], // 12 hours
 
             /* second */
-            array('s', 0, '0'),
-            array('ss', 0, '00'),
-            array('sss', 0, '000'),
-
-            array('s', 1, '1'),
-            array('s', 2, '2'),
-            array('s', 5, '5'),
-            array('s', 30, '30'),
-            array('s', 59, '59'),
-            array('s', 60, '0'),
-            array('s', 120, '0'),
-            array('s', 180, '0'),
-            array('s', 3600, '0'),
-            array('s', 3601, '1'),
-            array('s', 3630, '30'),
-            array('s', 43200, '0'), // 12 hours
-        );
+            ['s', 0, '0'],
+            ['ss', 0, '00'],
+            ['sss', 0, '000'],
+
+            ['s', 1, '1'],
+            ['s', 2, '2'],
+            ['s', 5, '5'],
+            ['s', 30, '30'],
+            ['s', 59, '59'],
+            ['s', 60, '0'],
+            ['s', 120, '0'],
+            ['s', 180, '0'],
+            ['s', 3600, '0'],
+            ['s', 3601, '1'],
+            ['s', 3630, '30'],
+            ['s', 43200, '0'], // 12 hours
+        ];
 
         /* general, DateTime */
-        $formatData[] = array('y-M-d', $dateTime, '1970-1-1');
-        $formatData[] = array("EEE, MMM d, ''yy", $dateTime, "Thu, Jan 1, '70");
-        $formatData[] = array('h:mm a', $dateTime, '12:00 AM');
-        $formatData[] = array('yyyyy.MMMM.dd hh:mm aaa', $dateTime, '01970.January.01 12:00 AM');
+        $formatData[] = ['y-M-d', $dateTime, '1970-1-1'];
+        $formatData[] = ["EEE, MMM d, ''yy", $dateTime, "Thu, Jan 1, '70"];
+        $formatData[] = ['h:mm a', $dateTime, '12:00 AM'];
+        $formatData[] = ['yyyyy.MMMM.dd hh:mm aaa', $dateTime, '01970.January.01 12:00 AM'];
 
         if (IcuVersion::compare(Intl::getIcuVersion(), '59.1', '>=', 1)) {
             // Before ICU 59.1 GMT was used instead of UTC
-            $formatData[] = array("yyyy.MM.dd 'at' HH:mm:ss zzz", 0, '1970.01.01 at 00:00:00 UTC');
-            $formatData[] = array('K:mm a, z', 0, '0:00 AM, UTC');
-            $formatData[] = array("yyyy.MM.dd 'at' HH:mm:ss zzz", $dateTime, '1970.01.01 at 00:00:00 UTC');
-            $formatData[] = array('K:mm a, z', $dateTime, '0:00 AM, UTC');
+            $formatData[] = ["yyyy.MM.dd 'at' HH:mm:ss zzz", 0, '1970.01.01 at 00:00:00 UTC'];
+            $formatData[] = ['K:mm a, z', 0, '0:00 AM, UTC'];
+            $formatData[] = ["yyyy.MM.dd 'at' HH:mm:ss zzz", $dateTime, '1970.01.01 at 00:00:00 UTC'];
+            $formatData[] = ['K:mm a, z', $dateTime, '0:00 AM, UTC'];
         }
 
         return $formatData;
@@ -274,9 +274,9 @@ public function testFormatIllegalArgumentError($pattern, $timestamp, $errorMessa
 
     public function formatErrorProvider()
     {
-        return array(
-            array('y-M-d', 'foobar', 'datefmt_format: string \'foobar\' is not numeric, which would be required for it to be a valid date: U_ILLEGAL_ARGUMENT_ERROR'),
-        );
+        return [
+            ['y-M-d', 'foobar', 'datefmt_format: string \'foobar\' is not numeric, which would be required for it to be a valid date: U_ILLEGAL_ARGUMENT_ERROR'],
+        ];
     }
 
     /**
@@ -291,31 +291,31 @@ public function testFormatWithTimezone($timestamp, $timezone, $expected)
 
     public function formatWithTimezoneProvider()
     {
-        $data = array(
-            array(0, 'UTC', '1970-01-01 00:00:00'),
-            array(0, 'GMT', '1970-01-01 00:00:00'),
-            array(0, 'GMT-03:00', '1969-12-31 21:00:00'),
-            array(0, 'GMT+03:00', '1970-01-01 03:00:00'),
-            array(0, 'Europe/Zurich', '1970-01-01 01:00:00'),
-            array(0, 'Europe/Paris', '1970-01-01 01:00:00'),
-            array(0, 'Africa/Cairo', '1970-01-01 02:00:00'),
-            array(0, 'Africa/Casablanca', '1970-01-01 00:00:00'),
-            array(0, 'Africa/Djibouti', '1970-01-01 03:00:00'),
-            array(0, 'Africa/Johannesburg', '1970-01-01 02:00:00'),
-            array(0, 'America/Antigua', '1969-12-31 20:00:00'),
-            array(0, 'America/Toronto', '1969-12-31 19:00:00'),
-            array(0, 'America/Vancouver', '1969-12-31 16:00:00'),
-            array(0, 'Asia/Aqtau', '1970-01-01 05:00:00'),
-            array(0, 'Asia/Bangkok', '1970-01-01 07:00:00'),
-            array(0, 'Asia/Dubai', '1970-01-01 04:00:00'),
-            array(0, 'Australia/Brisbane', '1970-01-01 10:00:00'),
-            array(0, 'Australia/Eucla', '1970-01-01 08:45:00'),
-            array(0, 'Australia/Melbourne', '1970-01-01 10:00:00'),
-            array(0, 'Europe/Berlin', '1970-01-01 01:00:00'),
-            array(0, 'Europe/Dublin', '1970-01-01 01:00:00'),
-            array(0, 'Europe/Warsaw', '1970-01-01 01:00:00'),
-            array(0, 'Pacific/Fiji', '1970-01-01 12:00:00'),
-        );
+        $data = [
+            [0, 'UTC', '1970-01-01 00:00:00'],
+            [0, 'GMT', '1970-01-01 00:00:00'],
+            [0, 'GMT-03:00', '1969-12-31 21:00:00'],
+            [0, 'GMT+03:00', '1970-01-01 03:00:00'],
+            [0, 'Europe/Zurich', '1970-01-01 01:00:00'],
+            [0, 'Europe/Paris', '1970-01-01 01:00:00'],
+            [0, 'Africa/Cairo', '1970-01-01 02:00:00'],
+            [0, 'Africa/Casablanca', '1970-01-01 00:00:00'],
+            [0, 'Africa/Djibouti', '1970-01-01 03:00:00'],
+            [0, 'Africa/Johannesburg', '1970-01-01 02:00:00'],
+            [0, 'America/Antigua', '1969-12-31 20:00:00'],
+            [0, 'America/Toronto', '1969-12-31 19:00:00'],
+            [0, 'America/Vancouver', '1969-12-31 16:00:00'],
+            [0, 'Asia/Aqtau', '1970-01-01 05:00:00'],
+            [0, 'Asia/Bangkok', '1970-01-01 07:00:00'],
+            [0, 'Asia/Dubai', '1970-01-01 04:00:00'],
+            [0, 'Australia/Brisbane', '1970-01-01 10:00:00'],
+            [0, 'Australia/Eucla', '1970-01-01 08:45:00'],
+            [0, 'Australia/Melbourne', '1970-01-01 10:00:00'],
+            [0, 'Europe/Berlin', '1970-01-01 01:00:00'],
+            [0, 'Europe/Dublin', '1970-01-01 01:00:00'],
+            [0, 'Europe/Warsaw', '1970-01-01 01:00:00'],
+            [0, 'Pacific/Fiji', '1970-01-01 12:00:00'],
+        ];
 
         return $data;
     }
@@ -489,16 +489,16 @@ public function testDateAndTimeType($timestamp, $datetype, $timetype, $expected)
 
     public function dateAndTimeTypeProvider()
     {
-        return array(
-            array(0, IntlDateFormatter::FULL, IntlDateFormatter::NONE, 'Thursday, January 1, 1970'),
-            array(0, IntlDateFormatter::LONG, IntlDateFormatter::NONE, 'January 1, 1970'),
-            array(0, IntlDateFormatter::MEDIUM, IntlDateFormatter::NONE, 'Jan 1, 1970'),
-            array(0, IntlDateFormatter::SHORT, IntlDateFormatter::NONE, '1/1/70'),
-            array(0, IntlDateFormatter::NONE, IntlDateFormatter::FULL, '12:00:00 AM Coordinated Universal Time'),
-            array(0, IntlDateFormatter::NONE, IntlDateFormatter::LONG, '12:00:00 AM UTC'),
-            array(0, IntlDateFormatter::NONE, IntlDateFormatter::MEDIUM, '12:00:00 AM'),
-            array(0, IntlDateFormatter::NONE, IntlDateFormatter::SHORT, '12:00 AM'),
-        );
+        return [
+            [0, IntlDateFormatter::FULL, IntlDateFormatter::NONE, 'Thursday, January 1, 1970'],
+            [0, IntlDateFormatter::LONG, IntlDateFormatter::NONE, 'January 1, 1970'],
+            [0, IntlDateFormatter::MEDIUM, IntlDateFormatter::NONE, 'Jan 1, 1970'],
+            [0, IntlDateFormatter::SHORT, IntlDateFormatter::NONE, '1/1/70'],
+            [0, IntlDateFormatter::NONE, IntlDateFormatter::FULL, '12:00:00 AM Coordinated Universal Time'],
+            [0, IntlDateFormatter::NONE, IntlDateFormatter::LONG, '12:00:00 AM UTC'],
+            [0, IntlDateFormatter::NONE, IntlDateFormatter::MEDIUM, '12:00:00 AM'],
+            [0, IntlDateFormatter::NONE, IntlDateFormatter::SHORT, '12:00 AM'],
+        ];
     }
 
     public function testGetCalendar()
@@ -571,263 +571,263 @@ public function parseProvider()
 
     public function parseYearProvider()
     {
-        return array(
-            array('y-M-d', '1970-1-1', 0),
-            array('yy-M-d', '70-1-1', 0),
-        );
+        return [
+            ['y-M-d', '1970-1-1', 0],
+            ['yy-M-d', '70-1-1', 0],
+        ];
     }
 
     public function parseQuarterProvider()
     {
-        return array(
-            array('Q', '1', 0),
-            array('QQ', '01', 0),
-            array('QQQ', 'Q1', 0),
-            array('QQQQ', '1st quarter', 0),
-            array('QQQQQ', '1st quarter', 0),
-
-            array('Q', '2', 7776000),
-            array('QQ', '02', 7776000),
-            array('QQQ', 'Q2', 7776000),
-            array('QQQQ', '2nd quarter', 7776000),
-            array('QQQQQ', '2nd quarter', 7776000),
-
-            array('q', '1', 0),
-            array('qq', '01', 0),
-            array('qqq', 'Q1', 0),
-            array('qqqq', '1st quarter', 0),
-            array('qqqqq', '1st quarter', 0),
-        );
+        return [
+            ['Q', '1', 0],
+            ['QQ', '01', 0],
+            ['QQQ', 'Q1', 0],
+            ['QQQQ', '1st quarter', 0],
+            ['QQQQQ', '1st quarter', 0],
+
+            ['Q', '2', 7776000],
+            ['QQ', '02', 7776000],
+            ['QQQ', 'Q2', 7776000],
+            ['QQQQ', '2nd quarter', 7776000],
+            ['QQQQQ', '2nd quarter', 7776000],
+
+            ['q', '1', 0],
+            ['qq', '01', 0],
+            ['qqq', 'Q1', 0],
+            ['qqqq', '1st quarter', 0],
+            ['qqqqq', '1st quarter', 0],
+        ];
     }
 
     public function parseMonthProvider()
     {
-        return array(
-            array('y-M-d', '1970-1-1', 0),
-            array('y-MMM-d', '1970-Jan-1', 0),
-            array('y-MMMM-d', '1970-January-1', 0),
-        );
+        return [
+            ['y-M-d', '1970-1-1', 0],
+            ['y-MMM-d', '1970-Jan-1', 0],
+            ['y-MMMM-d', '1970-January-1', 0],
+        ];
     }
 
     public function parseStandaloneMonthProvider()
     {
-        return array(
-            array('y-L-d', '1970-1-1', 0),
-            array('y-LLL-d', '1970-Jan-1', 0),
-            array('y-LLLL-d', '1970-January-1', 0),
-        );
+        return [
+            ['y-L-d', '1970-1-1', 0],
+            ['y-LLL-d', '1970-Jan-1', 0],
+            ['y-LLLL-d', '1970-January-1', 0],
+        ];
     }
 
     public function parseDayProvider()
     {
-        return array(
-            array('y-M-d', '1970-1-1', 0),
-            array('y-M-dd', '1970-1-01', 0),
-            array('y-M-ddd', '1970-1-001', 0),
-        );
+        return [
+            ['y-M-d', '1970-1-1', 0],
+            ['y-M-dd', '1970-1-01', 0],
+            ['y-M-ddd', '1970-1-001', 0],
+        ];
     }
 
     public function parseDayOfWeekProvider()
     {
-        return array(
-            array('E', 'Thu', 0),
-            array('EE', 'Thu', 0),
-            array('EEE', 'Thu', 0),
-            array('EEEE', 'Thursday', 0),
-            array('EEEEE', 'T', 432000),
-            array('EEEEEE', 'Th', 0),
-        );
+        return [
+            ['E', 'Thu', 0],
+            ['EE', 'Thu', 0],
+            ['EEE', 'Thu', 0],
+            ['EEEE', 'Thursday', 0],
+            ['EEEEE', 'T', 432000],
+            ['EEEEEE', 'Th', 0],
+        ];
     }
 
     public function parseDayOfYearProvider()
     {
-        return array(
-            array('D', '1', 0),
-            array('D', '2', 86400),
-        );
+        return [
+            ['D', '1', 0],
+            ['D', '2', 86400],
+        ];
     }
 
     public function parseHour12ClockOneBasedProvider()
     {
-        return array(
+        return [
             // 12 hours (1-12)
-            array('y-M-d h', '1970-1-1 1', 3600),
-            array('y-M-d h', '1970-1-1 10', 36000),
-            array('y-M-d hh', '1970-1-1 11', 39600),
-            array('y-M-d hh', '1970-1-1 12', 0),
-            array('y-M-d hh a', '1970-1-1 0 AM', 0),
-            array('y-M-d hh a', '1970-1-1 1 AM', 3600),
-            array('y-M-d hh a', '1970-1-1 10 AM', 36000),
-            array('y-M-d hh a', '1970-1-1 11 AM', 39600),
-            array('y-M-d hh a', '1970-1-1 12 AM', 0),
-            array('y-M-d hh a', '1970-1-1 23 AM', 82800),
-            array('y-M-d hh a', '1970-1-1 24 AM', 86400),
-            array('y-M-d hh a', '1970-1-1 0 PM', 43200),
-            array('y-M-d hh a', '1970-1-1 1 PM', 46800),
-            array('y-M-d hh a', '1970-1-1 10 PM', 79200),
-            array('y-M-d hh a', '1970-1-1 11 PM', 82800),
-            array('y-M-d hh a', '1970-1-1 12 PM', 43200),
-            array('y-M-d hh a', '1970-1-1 23 PM', 126000),
-            array('y-M-d hh a', '1970-1-1 24 PM', 129600),
-        );
+            ['y-M-d h', '1970-1-1 1', 3600],
+            ['y-M-d h', '1970-1-1 10', 36000],
+            ['y-M-d hh', '1970-1-1 11', 39600],
+            ['y-M-d hh', '1970-1-1 12', 0],
+            ['y-M-d hh a', '1970-1-1 0 AM', 0],
+            ['y-M-d hh a', '1970-1-1 1 AM', 3600],
+            ['y-M-d hh a', '1970-1-1 10 AM', 36000],
+            ['y-M-d hh a', '1970-1-1 11 AM', 39600],
+            ['y-M-d hh a', '1970-1-1 12 AM', 0],
+            ['y-M-d hh a', '1970-1-1 23 AM', 82800],
+            ['y-M-d hh a', '1970-1-1 24 AM', 86400],
+            ['y-M-d hh a', '1970-1-1 0 PM', 43200],
+            ['y-M-d hh a', '1970-1-1 1 PM', 46800],
+            ['y-M-d hh a', '1970-1-1 10 PM', 79200],
+            ['y-M-d hh a', '1970-1-1 11 PM', 82800],
+            ['y-M-d hh a', '1970-1-1 12 PM', 43200],
+            ['y-M-d hh a', '1970-1-1 23 PM', 126000],
+            ['y-M-d hh a', '1970-1-1 24 PM', 129600],
+        ];
     }
 
     public function parseHour12ClockZeroBasedProvider()
     {
-        return array(
+        return [
             // 12 hours (0-11)
-            array('y-M-d K', '1970-1-1 1', 3600),
-            array('y-M-d K', '1970-1-1 10', 36000),
-            array('y-M-d KK', '1970-1-1 11', 39600),
-            array('y-M-d KK', '1970-1-1 12', 43200),
-            array('y-M-d KK a', '1970-1-1 0 AM', 0),
-            array('y-M-d KK a', '1970-1-1 1 AM', 3600),
-            array('y-M-d KK a', '1970-1-1 10 AM', 36000),
-            array('y-M-d KK a', '1970-1-1 11 AM', 39600),
-            array('y-M-d KK a', '1970-1-1 12 AM', 43200),
-            array('y-M-d KK a', '1970-1-1 23 AM', 82800),
-            array('y-M-d KK a', '1970-1-1 24 AM', 86400),
-            array('y-M-d KK a', '1970-1-1 0 PM', 43200),
-            array('y-M-d KK a', '1970-1-1 1 PM', 46800),
-            array('y-M-d KK a', '1970-1-1 10 PM', 79200),
-            array('y-M-d KK a', '1970-1-1 11 PM', 82800),
-            array('y-M-d KK a', '1970-1-1 12 PM', 86400),
-            array('y-M-d KK a', '1970-1-1 23 PM', 126000),
-            array('y-M-d KK a', '1970-1-1 24 PM', 129600),
-        );
+            ['y-M-d K', '1970-1-1 1', 3600],
+            ['y-M-d K', '1970-1-1 10', 36000],
+            ['y-M-d KK', '1970-1-1 11', 39600],
+            ['y-M-d KK', '1970-1-1 12', 43200],
+            ['y-M-d KK a', '1970-1-1 0 AM', 0],
+            ['y-M-d KK a', '1970-1-1 1 AM', 3600],
+            ['y-M-d KK a', '1970-1-1 10 AM', 36000],
+            ['y-M-d KK a', '1970-1-1 11 AM', 39600],
+            ['y-M-d KK a', '1970-1-1 12 AM', 43200],
+            ['y-M-d KK a', '1970-1-1 23 AM', 82800],
+            ['y-M-d KK a', '1970-1-1 24 AM', 86400],
+            ['y-M-d KK a', '1970-1-1 0 PM', 43200],
+            ['y-M-d KK a', '1970-1-1 1 PM', 46800],
+            ['y-M-d KK a', '1970-1-1 10 PM', 79200],
+            ['y-M-d KK a', '1970-1-1 11 PM', 82800],
+            ['y-M-d KK a', '1970-1-1 12 PM', 86400],
+            ['y-M-d KK a', '1970-1-1 23 PM', 126000],
+            ['y-M-d KK a', '1970-1-1 24 PM', 129600],
+        ];
     }
 
     public function parseHour24ClockOneBasedProvider()
     {
-        return array(
+        return [
             // 24 hours (1-24)
-            array('y-M-d k', '1970-1-1 1', 3600),
-            array('y-M-d k', '1970-1-1 10', 36000),
-            array('y-M-d kk', '1970-1-1 11', 39600),
-            array('y-M-d kk', '1970-1-1 12', 43200),
-            array('y-M-d kk', '1970-1-1 23', 82800),
-            array('y-M-d kk', '1970-1-1 24', 0),
-            array('y-M-d kk a', '1970-1-1 0 AM', 0),
-            array('y-M-d kk a', '1970-1-1 1 AM', 0),
-            array('y-M-d kk a', '1970-1-1 10 AM', 0),
-            array('y-M-d kk a', '1970-1-1 11 AM', 0),
-            array('y-M-d kk a', '1970-1-1 12 AM', 0),
-            array('y-M-d kk a', '1970-1-1 23 AM', 0),
-            array('y-M-d kk a', '1970-1-1 24 AM', 0),
-            array('y-M-d kk a', '1970-1-1 0 PM', 43200),
-            array('y-M-d kk a', '1970-1-1 1 PM', 43200),
-            array('y-M-d kk a', '1970-1-1 10 PM', 43200),
-            array('y-M-d kk a', '1970-1-1 11 PM', 43200),
-            array('y-M-d kk a', '1970-1-1 12 PM', 43200),
-            array('y-M-d kk a', '1970-1-1 23 PM', 43200),
-            array('y-M-d kk a', '1970-1-1 24 PM', 43200),
-        );
+            ['y-M-d k', '1970-1-1 1', 3600],
+            ['y-M-d k', '1970-1-1 10', 36000],
+            ['y-M-d kk', '1970-1-1 11', 39600],
+            ['y-M-d kk', '1970-1-1 12', 43200],
+            ['y-M-d kk', '1970-1-1 23', 82800],
+            ['y-M-d kk', '1970-1-1 24', 0],
+            ['y-M-d kk a', '1970-1-1 0 AM', 0],
+            ['y-M-d kk a', '1970-1-1 1 AM', 0],
+            ['y-M-d kk a', '1970-1-1 10 AM', 0],
+            ['y-M-d kk a', '1970-1-1 11 AM', 0],
+            ['y-M-d kk a', '1970-1-1 12 AM', 0],
+            ['y-M-d kk a', '1970-1-1 23 AM', 0],
+            ['y-M-d kk a', '1970-1-1 24 AM', 0],
+            ['y-M-d kk a', '1970-1-1 0 PM', 43200],
+            ['y-M-d kk a', '1970-1-1 1 PM', 43200],
+            ['y-M-d kk a', '1970-1-1 10 PM', 43200],
+            ['y-M-d kk a', '1970-1-1 11 PM', 43200],
+            ['y-M-d kk a', '1970-1-1 12 PM', 43200],
+            ['y-M-d kk a', '1970-1-1 23 PM', 43200],
+            ['y-M-d kk a', '1970-1-1 24 PM', 43200],
+        ];
     }
 
     public function parseHour24ClockZeroBasedProvider()
     {
-        return array(
+        return [
             // 24 hours (0-23)
-            array('y-M-d H', '1970-1-1 0', 0),
-            array('y-M-d H', '1970-1-1 1', 3600),
-            array('y-M-d H', '1970-1-1 10', 36000),
-            array('y-M-d HH', '1970-1-1 11', 39600),
-            array('y-M-d HH', '1970-1-1 12', 43200),
-            array('y-M-d HH', '1970-1-1 23', 82800),
-            array('y-M-d HH a', '1970-1-1 0 AM', 0),
-            array('y-M-d HH a', '1970-1-1 1 AM', 0),
-            array('y-M-d HH a', '1970-1-1 10 AM', 0),
-            array('y-M-d HH a', '1970-1-1 11 AM', 0),
-            array('y-M-d HH a', '1970-1-1 12 AM', 0),
-            array('y-M-d HH a', '1970-1-1 23 AM', 0),
-            array('y-M-d HH a', '1970-1-1 24 AM', 0),
-            array('y-M-d HH a', '1970-1-1 0 PM', 43200),
-            array('y-M-d HH a', '1970-1-1 1 PM', 43200),
-            array('y-M-d HH a', '1970-1-1 10 PM', 43200),
-            array('y-M-d HH a', '1970-1-1 11 PM', 43200),
-            array('y-M-d HH a', '1970-1-1 12 PM', 43200),
-            array('y-M-d HH a', '1970-1-1 23 PM', 43200),
-            array('y-M-d HH a', '1970-1-1 24 PM', 43200),
-        );
+            ['y-M-d H', '1970-1-1 0', 0],
+            ['y-M-d H', '1970-1-1 1', 3600],
+            ['y-M-d H', '1970-1-1 10', 36000],
+            ['y-M-d HH', '1970-1-1 11', 39600],
+            ['y-M-d HH', '1970-1-1 12', 43200],
+            ['y-M-d HH', '1970-1-1 23', 82800],
+            ['y-M-d HH a', '1970-1-1 0 AM', 0],
+            ['y-M-d HH a', '1970-1-1 1 AM', 0],
+            ['y-M-d HH a', '1970-1-1 10 AM', 0],
+            ['y-M-d HH a', '1970-1-1 11 AM', 0],
+            ['y-M-d HH a', '1970-1-1 12 AM', 0],
+            ['y-M-d HH a', '1970-1-1 23 AM', 0],
+            ['y-M-d HH a', '1970-1-1 24 AM', 0],
+            ['y-M-d HH a', '1970-1-1 0 PM', 43200],
+            ['y-M-d HH a', '1970-1-1 1 PM', 43200],
+            ['y-M-d HH a', '1970-1-1 10 PM', 43200],
+            ['y-M-d HH a', '1970-1-1 11 PM', 43200],
+            ['y-M-d HH a', '1970-1-1 12 PM', 43200],
+            ['y-M-d HH a', '1970-1-1 23 PM', 43200],
+            ['y-M-d HH a', '1970-1-1 24 PM', 43200],
+        ];
     }
 
     public function parseMinuteProvider()
     {
-        return array(
-            array('y-M-d HH:m', '1970-1-1 0:1', 60),
-            array('y-M-d HH:mm', '1970-1-1 0:10', 600),
-        );
+        return [
+            ['y-M-d HH:m', '1970-1-1 0:1', 60],
+            ['y-M-d HH:mm', '1970-1-1 0:10', 600],
+        ];
     }
 
     public function parseSecondProvider()
     {
-        return array(
-            array('y-M-d HH:mm:s', '1970-1-1 00:01:1', 61),
-            array('y-M-d HH:mm:ss', '1970-1-1 00:01:10', 70),
-        );
+        return [
+            ['y-M-d HH:mm:s', '1970-1-1 00:01:1', 61],
+            ['y-M-d HH:mm:ss', '1970-1-1 00:01:10', 70],
+        ];
     }
 
     public function parseTimezoneProvider()
     {
-        return array(
-            array('y-M-d HH:mm:ss zzzz', '1970-1-1 00:00:00 GMT-03:00', 10800),
-            array('y-M-d HH:mm:ss zzzz', '1970-1-1 00:00:00 GMT-04:00', 14400),
-            array('y-M-d HH:mm:ss zzzz', '1970-1-1 00:00:00 GMT-00:00', 0),
-            array('y-M-d HH:mm:ss zzzz', '1970-1-1 00:00:00 GMT+03:00', -10800),
-            array('y-M-d HH:mm:ss zzzz', '1970-1-1 00:00:00 GMT+04:00', -14400),
-            array('y-M-d HH:mm:ss zzzz', '1970-1-1 00:00:00 GMT-0300', 10800),
-            array('y-M-d HH:mm:ss zzzz', '1970-1-1 00:00:00 GMT+0300', -10800),
+        return [
+            ['y-M-d HH:mm:ss zzzz', '1970-1-1 00:00:00 GMT-03:00', 10800],
+            ['y-M-d HH:mm:ss zzzz', '1970-1-1 00:00:00 GMT-04:00', 14400],
+            ['y-M-d HH:mm:ss zzzz', '1970-1-1 00:00:00 GMT-00:00', 0],
+            ['y-M-d HH:mm:ss zzzz', '1970-1-1 00:00:00 GMT+03:00', -10800],
+            ['y-M-d HH:mm:ss zzzz', '1970-1-1 00:00:00 GMT+04:00', -14400],
+            ['y-M-d HH:mm:ss zzzz', '1970-1-1 00:00:00 GMT-0300', 10800],
+            ['y-M-d HH:mm:ss zzzz', '1970-1-1 00:00:00 GMT+0300', -10800],
 
             // a previous timezone parsing should not change the timezone for the next parsing
-            array('y-M-d HH:mm:ss', '1970-1-1 00:00:00', 0),
-        );
+            ['y-M-d HH:mm:ss', '1970-1-1 00:00:00', 0],
+        ];
     }
 
     public function parseAmPmProvider()
     {
-        return array(
+        return [
             // AM/PM (already covered by hours tests)
-            array('y-M-d HH:mm:ss a', '1970-1-1 00:00:00 AM', 0),
-            array('y-M-d HH:mm:ss a', '1970-1-1 00:00:00 PM', 43200),
-        );
+            ['y-M-d HH:mm:ss a', '1970-1-1 00:00:00 AM', 0],
+            ['y-M-d HH:mm:ss a', '1970-1-1 00:00:00 PM', 43200],
+        ];
     }
 
     public function parseStandaloneAmPmProvider()
     {
-        return array(
-            array('a', 'AM', 0),
-            array('a', 'PM', 43200),
-        );
+        return [
+            ['a', 'AM', 0],
+            ['a', 'PM', 43200],
+        ];
     }
 
     public function parseRegexMetaCharsProvider()
     {
-        return array(
+        return [
             // regexp meta chars in the pattern string
-            array('y[M-d', '1970[1-1', 0),
-            array('y[M/d', '1970[1/1', 0),
-        );
+            ['y[M-d', '1970[1-1', 0],
+            ['y[M/d', '1970[1/1', 0],
+        ];
     }
 
     public function parseQuoteCharsProvider()
     {
-        return array(
-            array("'M'", 'M', 0),
-            array("'yy'", 'yy', 0),
-            array("'''yy'", "'yy", 0),
-            array("''y", "'1970", 0),
-            array("H 'o'' clock'", "0 o' clock", 0),
-        );
+        return [
+            ["'M'", 'M', 0],
+            ["'yy'", 'yy', 0],
+            ["'''yy'", "'yy", 0],
+            ["''y", "'1970", 0],
+            ["H 'o'' clock'", "0 o' clock", 0],
+        ];
     }
 
     public function parseDashSlashProvider()
     {
-        return array(
-            array('y-M-d', '1970/1/1', 0),
-            array('yy-M-d', '70/1/1', 0),
-            array('y/M/d', '1970-1-1', 0),
-            array('yy/M/d', '70-1-1', 0),
-        );
+        return [
+            ['y-M-d', '1970/1/1', 0],
+            ['yy-M-d', '70/1/1', 0],
+            ['y/M/d', '1970-1-1', 0],
+            ['yy/M/d', '70-1-1', 0],
+        ];
     }
 
     /**
@@ -845,15 +845,15 @@ public function testParseError($pattern, $value)
 
     public function parseErrorProvider()
     {
-        return array(
+        return [
             // 1 char month
-            array('y-MMMMM-d', '1970-J-1'),
-            array('y-MMMMM-d', '1970-S-1'),
+            ['y-MMMMM-d', '1970-J-1'],
+            ['y-MMMMM-d', '1970-S-1'],
 
             // standalone 1 char month
-            array('y-LLLLL-d', '1970-J-1'),
-            array('y-LLLLL-d', '1970-S-1'),
-        );
+            ['y-LLLLL-d', '1970-J-1'],
+            ['y-LLLLL-d', '1970-S-1'],
+        ];
     }
 
     /*
@@ -896,16 +896,16 @@ public function testSetTimeZoneId($timeZoneId, $expectedTimeZoneId)
 
     public function setTimeZoneIdProvider()
     {
-        return array(
-            array('UTC', 'UTC'),
-            array('GMT', 'GMT'),
-            array('GMT-03:00', 'GMT-03:00'),
-            array('Europe/Zurich', 'Europe/Zurich'),
-            array(null, date_default_timezone_get()),
-            array('Foo/Bar', 'UTC'),
-            array('GMT+00:AA', 'UTC'),
-            array('GMT+00AA', 'UTC'),
-        );
+        return [
+            ['UTC', 'UTC'],
+            ['GMT', 'GMT'],
+            ['GMT-03:00', 'GMT-03:00'],
+            ['Europe/Zurich', 'Europe/Zurich'],
+            [null, date_default_timezone_get()],
+            ['Foo/Bar', 'UTC'],
+            ['GMT+00:AA', 'UTC'],
+            ['GMT+00AA', 'UTC'],
+        ];
     }
 
     protected function getDefaultDateFormatter($pattern = null)
diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/IntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/IntlDateFormatterTest.php
index 88af2e775b94f..c8ba63508be00 100644
--- a/src/Symfony/Component/Intl/Tests/DateFormatter/IntlDateFormatterTest.php
+++ b/src/Symfony/Component/Intl/Tests/DateFormatter/IntlDateFormatterTest.php
@@ -52,7 +52,7 @@ public function testFormatWithUnsupportedTimestampArgument()
     {
         $formatter = $this->getDefaultDateFormatter();
 
-        $localtime = array(
+        $localtime = [
             'tm_sec' => 59,
             'tm_min' => 3,
             'tm_hour' => 15,
@@ -62,7 +62,7 @@ public function testFormatWithUnsupportedTimestampArgument()
             'tm_wday' => 0,
             'tm_yday' => 105,
             'tm_isdst' => 0,
-        );
+        ];
 
         try {
             $formatter->format($localtime);
@@ -89,7 +89,7 @@ public function testFormatWithUnimplementedChars()
     public function testFormatWithNonIntegerTimestamp()
     {
         $formatter = $this->getDefaultDateFormatter();
-        $formatter->format(array());
+        $formatter->format([]);
     }
 
     public function testGetErrorCode()
diff --git a/src/Symfony/Component/Intl/Tests/Globals/AbstractIntlGlobalsTest.php b/src/Symfony/Component/Intl/Tests/Globals/AbstractIntlGlobalsTest.php
index 57c75fb954944..2cb49ef8275b3 100644
--- a/src/Symfony/Component/Intl/Tests/Globals/AbstractIntlGlobalsTest.php
+++ b/src/Symfony/Component/Intl/Tests/Globals/AbstractIntlGlobalsTest.php
@@ -22,13 +22,13 @@ abstract class AbstractIntlGlobalsTest extends TestCase
 {
     public function errorNameProvider()
     {
-        return array(
-            array(-129, '[BOGUS UErrorCode]'),
-            array(0, 'U_ZERO_ERROR'),
-            array(1, 'U_ILLEGAL_ARGUMENT_ERROR'),
-            array(9, 'U_PARSE_ERROR'),
-            array(129, '[BOGUS UErrorCode]'),
-        );
+        return [
+            [-129, '[BOGUS UErrorCode]'],
+            [0, 'U_ZERO_ERROR'],
+            [1, 'U_ILLEGAL_ARGUMENT_ERROR'],
+            [9, 'U_PARSE_ERROR'],
+            [129, '[BOGUS UErrorCode]'],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Intl/Tests/Locale/LocaleTest.php b/src/Symfony/Component/Intl/Tests/Locale/LocaleTest.php
index 932f659744c1b..38232332234f6 100644
--- a/src/Symfony/Component/Intl/Tests/Locale/LocaleTest.php
+++ b/src/Symfony/Component/Intl/Tests/Locale/LocaleTest.php
@@ -26,11 +26,11 @@ public function testAcceptFromHttp()
      */
     public function testComposeLocale()
     {
-        $subtags = array(
+        $subtags = [
             'language' => 'pt',
             'script' => 'Latn',
             'region' => 'BR',
-        );
+        ];
         $this->call('composeLocale', $subtags);
     }
 
@@ -127,10 +127,10 @@ public function testGetScript()
      */
     public function testLookup()
     {
-        $langtag = array(
+        $langtag = [
             'pt-Latn-BR',
             'pt-BR',
-        );
+        ];
         $this->call('lookup', $langtag, 'pt-BR-x-priv1');
     }
 
diff --git a/src/Symfony/Component/Intl/Tests/LocaleTest.php b/src/Symfony/Component/Intl/Tests/LocaleTest.php
index 57059af9ae949..ff908cbcabd00 100644
--- a/src/Symfony/Component/Intl/Tests/LocaleTest.php
+++ b/src/Symfony/Component/Intl/Tests/LocaleTest.php
@@ -18,22 +18,22 @@ class LocaleTest extends TestCase
 {
     public function provideGetFallbackTests()
     {
-        $tests = array(
-            array('sl_Latn_IT', 'sl_Latn_IT_nedis'),
-            array('sl_Latn', 'sl_Latn_IT'),
-            array('fr', 'fr_FR'),
-            array('fr', 'fr-FR'),
-            array('en', 'fr'),
-            array('root', 'en'),
-            array(null, 'root'),
-        );
+        $tests = [
+            ['sl_Latn_IT', 'sl_Latn_IT_nedis'],
+            ['sl_Latn', 'sl_Latn_IT'],
+            ['fr', 'fr_FR'],
+            ['fr', 'fr-FR'],
+            ['en', 'fr'],
+            ['root', 'en'],
+            [null, 'root'],
+        ];
 
         if (\function_exists('locale_parse')) {
-            $tests[] = array('sl_Latn_IT', 'sl-Latn-IT-nedis');
-            $tests[] = array('sl_Latn', 'sl-Latn_IT');
+            $tests[] = ['sl_Latn_IT', 'sl-Latn-IT-nedis'];
+            $tests[] = ['sl_Latn', 'sl-Latn_IT'];
         } else {
-            $tests[] = array('sl-Latn-IT', 'sl-Latn-IT-nedis');
-            $tests[] = array('sl-Latn', 'sl-Latn-IT');
+            $tests[] = ['sl-Latn-IT', 'sl-Latn-IT-nedis'];
+            $tests[] = ['sl-Latn', 'sl-Latn-IT'];
         }
 
         return $tests;
diff --git a/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php b/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php
index 89be79574de97..ff1c2653e0909 100644
--- a/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php
+++ b/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php
@@ -33,23 +33,23 @@ public function testFormatCurrencyWithDecimalStyle($value, $currency, $expected)
 
     public function formatCurrencyWithDecimalStyleProvider()
     {
-        return array(
-            array(100, 'ALL', '100'),
-            array(100, 'BRL', '100.00'),
-            array(100, 'CRC', '100'),
-            array(100, 'JPY', '100'),
-            array(100, 'CHF', '100'),
-            array(-100, 'ALL', '-100'),
-            array(-100, 'BRL', '-100'),
-            array(-100, 'CRC', '-100'),
-            array(-100, 'JPY', '-100'),
-            array(-100, 'CHF', '-100'),
-            array(1000.12, 'ALL', '1,000.12'),
-            array(1000.12, 'BRL', '1,000.12'),
-            array(1000.12, 'CRC', '1,000.12'),
-            array(1000.12, 'JPY', '1,000.12'),
-            array(1000.12, 'CHF', '1,000.12'),
-        );
+        return [
+            [100, 'ALL', '100'],
+            [100, 'BRL', '100.00'],
+            [100, 'CRC', '100'],
+            [100, 'JPY', '100'],
+            [100, 'CHF', '100'],
+            [-100, 'ALL', '-100'],
+            [-100, 'BRL', '-100'],
+            [-100, 'CRC', '-100'],
+            [-100, 'JPY', '-100'],
+            [-100, 'CHF', '-100'],
+            [1000.12, 'ALL', '1,000.12'],
+            [1000.12, 'BRL', '1,000.12'],
+            [1000.12, 'CRC', '1,000.12'],
+            [1000.12, 'JPY', '1,000.12'],
+            [1000.12, 'CHF', '1,000.12'],
+        ];
     }
 
     /**
@@ -65,19 +65,19 @@ public function testFormatCurrencyWithCurrencyStyle($value, $currency, $expected
 
     public function formatCurrencyWithCurrencyStyleProvider()
     {
-        return array(
-            array(100, 'ALL', "ALL\xc2\xa0100"),
-            array(-100, 'ALL', "-ALL\xc2\xa0100"),
-            array(1000.12, 'ALL', "ALL\xc2\xa01,000"),
+        return [
+            [100, 'ALL', "ALL\xc2\xa0100"],
+            [-100, 'ALL', "-ALL\xc2\xa0100"],
+            [1000.12, 'ALL', "ALL\xc2\xa01,000"],
 
-            array(100, 'JPY', '¥100'),
-            array(-100, 'JPY', '-¥100'),
-            array(1000.12, 'JPY', '¥1,000'),
+            [100, 'JPY', '¥100'],
+            [-100, 'JPY', '-¥100'],
+            [1000.12, 'JPY', '¥1,000'],
 
-            array(100, 'EUR', '€100.00'),
-            array(-100, 'EUR', '-€100.00'),
-            array(1000.12, 'EUR', '€1,000.12'),
-        );
+            [100, 'EUR', '€100.00'],
+            [-100, 'EUR', '-€100.00'],
+            [1000.12, 'EUR', '€1,000.12'],
+        ];
     }
 
     /**
@@ -93,11 +93,11 @@ public function testFormatCurrencyWithCurrencyStyleCostaRicanColonsRounding($val
 
     public function formatCurrencyWithCurrencyStyleCostaRicanColonsRoundingProvider()
     {
-        return array(
-            array(100, 'CRC', 'CRC', "%s\xc2\xa0100.00"),
-            array(-100, 'CRC', 'CRC', "-%s\xc2\xa0100.00"),
-            array(1000.12, 'CRC', 'CRC', "%s\xc2\xa01,000.12"),
-        );
+        return [
+            [100, 'CRC', 'CRC', "%s\xc2\xa0100.00"],
+            [-100, 'CRC', 'CRC', "-%s\xc2\xa0100.00"],
+            [1000.12, 'CRC', 'CRC', "%s\xc2\xa01,000.12"],
+        ];
     }
 
     /**
@@ -111,20 +111,20 @@ public function testFormatCurrencyWithCurrencyStyleBrazilianRealRounding($value,
 
     public function formatCurrencyWithCurrencyStyleBrazilianRealRoundingProvider()
     {
-        return array(
-            array(100, 'BRL', 'R', '%s$100.00'),
-            array(-100, 'BRL', 'R', '-%s$100.00'),
-            array(1000.12, 'BRL', 'R', '%s$1,000.12'),
+        return [
+            [100, 'BRL', 'R', '%s$100.00'],
+            [-100, 'BRL', 'R', '-%s$100.00'],
+            [1000.12, 'BRL', 'R', '%s$1,000.12'],
 
             // Rounding checks
-            array(1000.121, 'BRL', 'R', '%s$1,000.12'),
-            array(1000.123, 'BRL', 'R', '%s$1,000.12'),
-            array(1000.125, 'BRL', 'R', '%s$1,000.12'),
-            array(1000.127, 'BRL', 'R', '%s$1,000.13'),
-            array(1000.129, 'BRL', 'R', '%s$1,000.13'),
-            array(11.50999, 'BRL', 'R', '%s$11.51'),
-            array(11.9999464, 'BRL', 'R', '%s$12.00'),
-        );
+            [1000.121, 'BRL', 'R', '%s$1,000.12'],
+            [1000.123, 'BRL', 'R', '%s$1,000.12'],
+            [1000.125, 'BRL', 'R', '%s$1,000.12'],
+            [1000.127, 'BRL', 'R', '%s$1,000.13'],
+            [1000.129, 'BRL', 'R', '%s$1,000.13'],
+            [11.50999, 'BRL', 'R', '%s$11.51'],
+            [11.9999464, 'BRL', 'R', '%s$12.00'],
+        ];
     }
 
     /**
@@ -140,24 +140,24 @@ public function testFormatCurrencyWithCurrencyStyleSwissRounding($value, $curren
 
     public function formatCurrencyWithCurrencyStyleSwissRoundingProvider()
     {
-        return array(
-            array(100, 'CHF', 'CHF', "%s\xc2\xa0100.00"),
-            array(-100, 'CHF', 'CHF', "-%s\xc2\xa0100.00"),
-            array(1000.12, 'CHF', 'CHF', "%s\xc2\xa01,000.12"),
-            array('1000.12', 'CHF', 'CHF', "%s\xc2\xa01,000.12"),
+        return [
+            [100, 'CHF', 'CHF', "%s\xc2\xa0100.00"],
+            [-100, 'CHF', 'CHF', "-%s\xc2\xa0100.00"],
+            [1000.12, 'CHF', 'CHF', "%s\xc2\xa01,000.12"],
+            ['1000.12', 'CHF', 'CHF', "%s\xc2\xa01,000.12"],
 
             // Rounding checks
-            array(1000.121, 'CHF', 'CHF', "%s\xc2\xa01,000.12"),
-            array(1000.123, 'CHF', 'CHF', "%s\xc2\xa01,000.12"),
-            array(1000.125, 'CHF', 'CHF', "%s\xc2\xa01,000.12"),
-            array(1000.127, 'CHF', 'CHF', "%s\xc2\xa01,000.13"),
-            array(1000.129, 'CHF', 'CHF', "%s\xc2\xa01,000.13"),
+            [1000.121, 'CHF', 'CHF', "%s\xc2\xa01,000.12"],
+            [1000.123, 'CHF', 'CHF', "%s\xc2\xa01,000.12"],
+            [1000.125, 'CHF', 'CHF', "%s\xc2\xa01,000.12"],
+            [1000.127, 'CHF', 'CHF', "%s\xc2\xa01,000.13"],
+            [1000.129, 'CHF', 'CHF', "%s\xc2\xa01,000.13"],
 
-            array(1200000.00, 'CHF', 'CHF', "%s\xc2\xa01,200,000.00"),
-            array(1200000.1, 'CHF', 'CHF', "%s\xc2\xa01,200,000.10"),
-            array(1200000.10, 'CHF', 'CHF', "%s\xc2\xa01,200,000.10"),
-            array(1200000.101, 'CHF', 'CHF', "%s\xc2\xa01,200,000.10"),
-        );
+            [1200000.00, 'CHF', 'CHF', "%s\xc2\xa01,200,000.00"],
+            [1200000.1, 'CHF', 'CHF', "%s\xc2\xa01,200,000.10"],
+            [1200000.10, 'CHF', 'CHF', "%s\xc2\xa01,200,000.10"],
+            [1200000.101, 'CHF', 'CHF', "%s\xc2\xa01,200,000.10"],
+        ];
     }
 
     public function testFormat()
@@ -199,12 +199,12 @@ public function formatTypeInt32Provider()
 
         $message = '->format() TYPE_INT32 formats inconsistently an integer if out of the 32 bit range.';
 
-        return array(
-            array($formatter, 1, '1'),
-            array($formatter, 1.1, '1'),
-            array($formatter, 2147483648, '-2,147,483,648', $message),
-            array($formatter, -2147483649, '2,147,483,647', $message),
-        );
+        return [
+            [$formatter, 1, '1'],
+            [$formatter, 1.1, '1'],
+            [$formatter, 2147483648, '-2,147,483,648', $message],
+            [$formatter, -2147483649, '2,147,483,647', $message],
+        ];
     }
 
     /**
@@ -224,12 +224,12 @@ public function formatTypeInt32WithCurrencyStyleProvider()
 
         $message = '->format() TYPE_INT32 formats inconsistently an integer if out of the 32 bit range.';
 
-        return array(
-            array($formatter, 1, '¤1.00'),
-            array($formatter, 1.1, '¤1.00'),
-            array($formatter, 2147483648, '-¤2,147,483,648.00', $message),
-            array($formatter, -2147483649, '¤2,147,483,647.00', $message),
-        );
+        return [
+            [$formatter, 1, '¤1.00'],
+            [$formatter, 1.1, '¤1.00'],
+            [$formatter, 2147483648, '-¤2,147,483,648.00', $message],
+            [$formatter, -2147483649, '¤2,147,483,647.00', $message],
+        ];
     }
 
     /**
@@ -247,12 +247,12 @@ public function formatTypeInt64Provider()
     {
         $formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
 
-        return array(
-            array($formatter, 1, '1'),
-            array($formatter, 1.1, '1'),
-            array($formatter, 2147483648, '2,147,483,648'),
-            array($formatter, -2147483649, '-2,147,483,649'),
-        );
+        return [
+            [$formatter, 1, '1'],
+            [$formatter, 1.1, '1'],
+            [$formatter, 2147483648, '2,147,483,648'],
+            [$formatter, -2147483649, '-2,147,483,649'],
+        ];
     }
 
     /**
@@ -270,12 +270,12 @@ public function formatTypeInt64WithCurrencyStyleProvider()
     {
         $formatter = $this->getNumberFormatter('en', NumberFormatter::CURRENCY);
 
-        return array(
-            array($formatter, 1, '¤1.00'),
-            array($formatter, 1.1, '¤1.00'),
-            array($formatter, 2147483648, '¤2,147,483,648.00'),
-            array($formatter, -2147483649, '-¤2,147,483,649.00'),
-        );
+        return [
+            [$formatter, 1, '¤1.00'],
+            [$formatter, 1.1, '¤1.00'],
+            [$formatter, 2147483648, '¤2,147,483,648.00'],
+            [$formatter, -2147483649, '-¤2,147,483,649.00'],
+        ];
     }
 
     /**
@@ -291,10 +291,10 @@ public function formatTypeDoubleProvider()
     {
         $formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
 
-        return array(
-            array($formatter, 1, '1'),
-            array($formatter, 1.1, '1.1'),
-        );
+        return [
+            [$formatter, 1, '1'],
+            [$formatter, 1.1, '1.1'],
+        ];
     }
 
     /**
@@ -312,10 +312,10 @@ public function formatTypeDoubleWithCurrencyStyleProvider()
     {
         $formatter = $this->getNumberFormatter('en', NumberFormatter::CURRENCY);
 
-        return array(
-            array($formatter, 1, '¤1.00'),
-            array($formatter, 1.1, '¤1.10'),
-        );
+        return [
+            [$formatter, 1, '¤1.00'],
+            [$formatter, 1.1, '¤1.10'],
+        ];
     }
 
     /**
@@ -347,10 +347,10 @@ public function formatTypeCurrencyProvider()
         $df = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
         $cf = $this->getNumberFormatter('en', NumberFormatter::CURRENCY);
 
-        return array(
-            array($df, 1),
-            array($cf, 1),
-        );
+        return [
+            [$df, 1],
+            [$cf, 1],
+        ];
     }
 
     /**
@@ -378,14 +378,14 @@ public function testFormatFractionDigits($value, $expected, $fractionDigits = nu
 
     public function formatFractionDigitsProvider()
     {
-        return array(
-            array(1.123, '1.123', null, 0),
-            array(1.123, '1', 0, 0),
-            array(1.123, '1.1', 1, 1),
-            array(1.123, '1.12', 2, 2),
-            array(1.123, '1.123', -1, 0),
-            array(1.123, '1', 'abc', 0),
-        );
+        return [
+            [1.123, '1.123', null, 0],
+            [1.123, '1', 0, 0],
+            [1.123, '1.1', 1, 1],
+            [1.123, '1.12', 2, 2],
+            [1.123, '1.123', -1, 0],
+            [1.123, '1', 'abc', 0],
+        ];
     }
 
     /**
@@ -411,14 +411,14 @@ public function testFormatGroupingUsed($value, $expected, $groupingUsed = null,
 
     public function formatGroupingUsedProvider()
     {
-        return array(
-            array(1000, '1,000', null, 1),
-            array(1000, '1000', 0, 0),
-            array(1000, '1,000', 1, 1),
-            array(1000, '1,000', 2, 1),
-            array(1000, '1000', 'abc', 0),
-            array(1000, '1,000', -1, 1),
-        );
+        return [
+            [1000, '1,000', null, 1],
+            [1000, '1000', 0, 0],
+            [1000, '1,000', 1, 1],
+            [1000, '1,000', 2, 1],
+            [1000, '1000', 'abc', 0],
+            [1000, '1,000', -1, 1],
+        ];
     }
 
     /**
@@ -436,14 +436,14 @@ public function testFormatRoundingModeHalfUp($value, $expected)
     public function formatRoundingModeRoundHalfUpProvider()
     {
         // The commented value is differently rounded by intl's NumberFormatter in 32 and 64 bit architectures
-        return array(
-            array(1.121, '1.12'),
-            array(1.123, '1.12'),
+        return [
+            [1.121, '1.12'],
+            [1.123, '1.12'],
             // array(1.125, '1.13'),
-            array(1.127, '1.13'),
-            array(1.129, '1.13'),
-            array(1020 / 100, '10.20'),
-        );
+            [1.127, '1.13'],
+            [1.129, '1.13'],
+            [1020 / 100, '10.20'],
+        ];
     }
 
     /**
@@ -460,14 +460,14 @@ public function testFormatRoundingModeHalfDown($value, $expected)
 
     public function formatRoundingModeRoundHalfDownProvider()
     {
-        return array(
-            array(1.121, '1.12'),
-            array(1.123, '1.12'),
-            array(1.125, '1.12'),
-            array(1.127, '1.13'),
-            array(1.129, '1.13'),
-            array(1020 / 100, '10.20'),
-        );
+        return [
+            [1.121, '1.12'],
+            [1.123, '1.12'],
+            [1.125, '1.12'],
+            [1.127, '1.13'],
+            [1.129, '1.13'],
+            [1020 / 100, '10.20'],
+        ];
     }
 
     /**
@@ -484,14 +484,14 @@ public function testFormatRoundingModeHalfEven($value, $expected)
 
     public function formatRoundingModeRoundHalfEvenProvider()
     {
-        return array(
-            array(1.121, '1.12'),
-            array(1.123, '1.12'),
-            array(1.125, '1.12'),
-            array(1.127, '1.13'),
-            array(1.129, '1.13'),
-            array(1020 / 100, '10.20'),
-        );
+        return [
+            [1.121, '1.12'],
+            [1.123, '1.12'],
+            [1.125, '1.12'],
+            [1.127, '1.13'],
+            [1.129, '1.13'],
+            [1020 / 100, '10.20'],
+        ];
     }
 
     /**
@@ -508,15 +508,15 @@ public function testFormatRoundingModeCeiling($value, $expected)
 
     public function formatRoundingModeRoundCeilingProvider()
     {
-        return array(
-            array(1.123, '1.13'),
-            array(1.125, '1.13'),
-            array(1.127, '1.13'),
-            array(-1.123, '-1.12'),
-            array(-1.125, '-1.12'),
-            array(-1.127, '-1.12'),
-            array(1020 / 100, '10.20'),
-        );
+        return [
+            [1.123, '1.13'],
+            [1.125, '1.13'],
+            [1.127, '1.13'],
+            [-1.123, '-1.12'],
+            [-1.125, '-1.12'],
+            [-1.127, '-1.12'],
+            [1020 / 100, '10.20'],
+        ];
     }
 
     /**
@@ -533,15 +533,15 @@ public function testFormatRoundingModeFloor($value, $expected)
 
     public function formatRoundingModeRoundFloorProvider()
     {
-        return array(
-            array(1.123, '1.12'),
-            array(1.125, '1.12'),
-            array(1.127, '1.12'),
-            array(-1.123, '-1.13'),
-            array(-1.125, '-1.13'),
-            array(-1.127, '-1.13'),
-            array(1020 / 100, '10.20'),
-        );
+        return [
+            [1.123, '1.12'],
+            [1.125, '1.12'],
+            [1.127, '1.12'],
+            [-1.123, '-1.13'],
+            [-1.125, '-1.13'],
+            [-1.127, '-1.13'],
+            [1020 / 100, '10.20'],
+        ];
     }
 
     /**
@@ -558,15 +558,15 @@ public function testFormatRoundingModeDown($value, $expected)
 
     public function formatRoundingModeRoundDownProvider()
     {
-        return array(
-            array(1.123, '1.12'),
-            array(1.125, '1.12'),
-            array(1.127, '1.12'),
-            array(-1.123, '-1.12'),
-            array(-1.125, '-1.12'),
-            array(-1.127, '-1.12'),
-            array(1020 / 100, '10.20'),
-        );
+        return [
+            [1.123, '1.12'],
+            [1.125, '1.12'],
+            [1.127, '1.12'],
+            [-1.123, '-1.12'],
+            [-1.125, '-1.12'],
+            [-1.127, '-1.12'],
+            [1020 / 100, '10.20'],
+        ];
     }
 
     /**
@@ -583,15 +583,15 @@ public function testFormatRoundingModeUp($value, $expected)
 
     public function formatRoundingModeRoundUpProvider()
     {
-        return array(
-            array(1.123, '1.13'),
-            array(1.125, '1.13'),
-            array(1.127, '1.13'),
-            array(-1.123, '-1.13'),
-            array(-1.125, '-1.13'),
-            array(-1.127, '-1.13'),
-            array(1020 / 100, '10.20'),
-        );
+        return [
+            [1.123, '1.13'],
+            [1.125, '1.13'],
+            [1.127, '1.13'],
+            [-1.123, '-1.13'],
+            [-1.125, '-1.13'],
+            [-1.127, '-1.13'],
+            [1020 / 100, '10.20'],
+        ];
     }
 
     public function testGetLocale()
@@ -664,44 +664,44 @@ public function testParse($value, $expected, $message, $expectedPosition, $group
 
     public function parseProvider()
     {
-        return array(
-            array('prefix1', false, '->parse() does not parse a number with a string prefix.', 0),
-            array('prefix1', false, '->parse() does not parse a number with a string prefix.', 0, false),
-            array('1.4suffix', (float) 1.4, '->parse() parses a number with a string suffix.', 3),
-            array('1.4suffix', (float) 1.4, '->parse() parses a number with a string suffix.', 3, false),
-            array('1,234.4suffix', 1234.4, '->parse() parses a number with a string suffix.', 7),
-            array('1,234.4suffix', 1.0, '->parse() parses a number with a string suffix.', 1, false),
-            array('-.4suffix', (float) -0.4, '->parse() parses a negative dot float with suffix.', 3),
-            array('-.4suffix', (float) -0.4, '->parse() parses a negative dot float with suffix.', 3, false),
-            array(',4', false, '->parse() does not parse when invalid grouping used.', 0),
-            array(',4', false, '->parse() does not parse when invalid grouping used.', 0, false),
-            array('123,4', false, '->parse() does not parse when invalid grouping used.', 0),
-            array('123,4', 123.0, '->parse() truncates invalid grouping when grouping is disabled.', 3, false),
-            array('123,a4', 123.0, '->parse() truncates a string suffix.', 3),
-            array('123,a4', 123.0, '->parse() truncates a string suffix.', 3, false),
-            array('-123,4', false, '->parse() does not parse when invalid grouping used.', 1),
-            array('-123,4', -123.0, '->parse() truncates invalid grouping when grouping is disabled.', 4, false),
-            array('-123,4567', false, '->parse() does not parse when invalid grouping used.', 1),
-            array('-123,4567', -123.0, '->parse() truncates invalid grouping when grouping is disabled.', 4, false),
-            array('-123,456,789', -123456789.0, '->parse() parses a number with grouping.', 12),
-            array('-123,456,789', -123.0, '->parse() truncates a group if grouping is disabled.', 4, false),
-            array('-123,456,789.66', -123456789.66, '->parse() parses a number with grouping.', 15),
-            array('-123,456,789.66', -123.00, '->parse() truncates a group if grouping is disabled.', 4, false),
-            array('-123,456789.66', false, '->parse() does not parse when invalid grouping used.', 1),
-            array('-123,456789.66', -123.00, '->parse() truncates a group if grouping is disabled.', 4, false),
-            array('-123456,789.66', false, '->parse() does not parse when invalid grouping used.', 1),
-            array('-123456,789.66', -123456.00, '->parse() truncates a group if grouping is disabled.', 7, false),
-            array('-123,456,78', false, '->parse() does not parse when invalid grouping used.', 1),
-            array('-123,456,78', -123.0, '->parse() truncates a group if grouping is disabled.', 4, false),
-            array('-123,45,789', false, '->parse() does not parse when invalid grouping used.', 1),
-            array('-123,45,789', -123.0, '->parse() truncates a group if grouping is disabled.', 4, false),
-            array('-123,,456', -123.0, '->parse() parses when grouping is duplicated.', 4),
-            array('-123,,456', -123.0, '->parse() parses when grouping is disabled.', 4, false),
-            array('-123,,4', -123.0, '->parse() parses when grouping is duplicated.', 4),
-            array('-123,,4', -123.0, '->parse() parses when grouping is duplicated.', 4, false),
-            array('239.', 239.0, '->parse() parses when string ends with decimal separator.', 4),
-            array('239.', 239.0, '->parse() parses when string ends with decimal separator.', 4, false),
-        );
+        return [
+            ['prefix1', false, '->parse() does not parse a number with a string prefix.', 0],
+            ['prefix1', false, '->parse() does not parse a number with a string prefix.', 0, false],
+            ['1.4suffix', (float) 1.4, '->parse() parses a number with a string suffix.', 3],
+            ['1.4suffix', (float) 1.4, '->parse() parses a number with a string suffix.', 3, false],
+            ['1,234.4suffix', 1234.4, '->parse() parses a number with a string suffix.', 7],
+            ['1,234.4suffix', 1.0, '->parse() parses a number with a string suffix.', 1, false],
+            ['-.4suffix', (float) -0.4, '->parse() parses a negative dot float with suffix.', 3],
+            ['-.4suffix', (float) -0.4, '->parse() parses a negative dot float with suffix.', 3, false],
+            [',4', false, '->parse() does not parse when invalid grouping used.', 0],
+            [',4', false, '->parse() does not parse when invalid grouping used.', 0, false],
+            ['123,4', false, '->parse() does not parse when invalid grouping used.', 0],
+            ['123,4', 123.0, '->parse() truncates invalid grouping when grouping is disabled.', 3, false],
+            ['123,a4', 123.0, '->parse() truncates a string suffix.', 3],
+            ['123,a4', 123.0, '->parse() truncates a string suffix.', 3, false],
+            ['-123,4', false, '->parse() does not parse when invalid grouping used.', 1],
+            ['-123,4', -123.0, '->parse() truncates invalid grouping when grouping is disabled.', 4, false],
+            ['-123,4567', false, '->parse() does not parse when invalid grouping used.', 1],
+            ['-123,4567', -123.0, '->parse() truncates invalid grouping when grouping is disabled.', 4, false],
+            ['-123,456,789', -123456789.0, '->parse() parses a number with grouping.', 12],
+            ['-123,456,789', -123.0, '->parse() truncates a group if grouping is disabled.', 4, false],
+            ['-123,456,789.66', -123456789.66, '->parse() parses a number with grouping.', 15],
+            ['-123,456,789.66', -123.00, '->parse() truncates a group if grouping is disabled.', 4, false],
+            ['-123,456789.66', false, '->parse() does not parse when invalid grouping used.', 1],
+            ['-123,456789.66', -123.00, '->parse() truncates a group if grouping is disabled.', 4, false],
+            ['-123456,789.66', false, '->parse() does not parse when invalid grouping used.', 1],
+            ['-123456,789.66', -123456.00, '->parse() truncates a group if grouping is disabled.', 7, false],
+            ['-123,456,78', false, '->parse() does not parse when invalid grouping used.', 1],
+            ['-123,456,78', -123.0, '->parse() truncates a group if grouping is disabled.', 4, false],
+            ['-123,45,789', false, '->parse() does not parse when invalid grouping used.', 1],
+            ['-123,45,789', -123.0, '->parse() truncates a group if grouping is disabled.', 4, false],
+            ['-123,,456', -123.0, '->parse() parses when grouping is duplicated.', 4],
+            ['-123,,456', -123.0, '->parse() parses when grouping is disabled.', 4, false],
+            ['-123,,4', -123.0, '->parse() parses when grouping is duplicated.', 4],
+            ['-123,,4', -123.0, '->parse() parses when grouping is duplicated.', 4, false],
+            ['239.', 239.0, '->parse() parses when string ends with decimal separator.', 4],
+            ['239.', 239.0, '->parse() parses when string ends with decimal separator.', 4, false],
+        ];
     }
 
     public function testParseTypeDefault()
@@ -730,15 +730,15 @@ public function testParseTypeInt32($value, $expected, $message = '')
 
     public function parseTypeInt32Provider()
     {
-        return array(
-            array('1', 1),
-            array('1.1', 1),
-            array('.1', 0),
-            array('2,147,483,647', 2147483647),
-            array('-2,147,483,648', -2147483647 - 1),
-            array('2,147,483,648', false, '->parse() TYPE_INT32 returns false when the number is greater than the integer positive range.'),
-            array('-2,147,483,649', false, '->parse() TYPE_INT32 returns false when the number is greater than the integer negative range.'),
-        );
+        return [
+            ['1', 1],
+            ['1.1', 1],
+            ['.1', 0],
+            ['2,147,483,647', 2147483647],
+            ['-2,147,483,648', -2147483647 - 1],
+            ['2,147,483,648', false, '->parse() TYPE_INT32 returns false when the number is greater than the integer positive range.'],
+            ['-2,147,483,649', false, '->parse() TYPE_INT32 returns false when the number is greater than the integer negative range.'],
+        ];
     }
 
     public function testParseTypeInt64With32BitIntegerInPhp32Bit()
@@ -822,12 +822,12 @@ public function testParseTypeDouble($value, $expectedValue)
 
     public function parseTypeDoubleProvider()
     {
-        return array(
-            array('1', (float) 1),
-            array('1.1', 1.1),
-            array('9,223,372,036,854,775,808', 9223372036854775808),
-            array('-9,223,372,036,854,775,809', -9223372036854775809),
-        );
+        return [
+            ['1', (float) 1],
+            ['1.1', 1.1],
+            ['9,223,372,036,854,775,808', 9223372036854775808],
+            ['-9,223,372,036,854,775,809', -9223372036854775809],
+        ];
     }
 
     public function testParseTypeCurrency()
diff --git a/src/Symfony/Component/Intl/Tests/Util/IcuVersionTest.php b/src/Symfony/Component/Intl/Tests/Util/IcuVersionTest.php
index 2fe7a0e4587b6..b037c33231ab5 100644
--- a/src/Symfony/Component/Intl/Tests/Util/IcuVersionTest.php
+++ b/src/Symfony/Component/Intl/Tests/Util/IcuVersionTest.php
@@ -21,24 +21,24 @@ class IcuVersionTest extends TestCase
 {
     public function normalizeProvider()
     {
-        return array(
-            array(null, '1', '10'),
-            array(null, '1.2', '12'),
-            array(null, '1.2.3', '12.3'),
-            array(null, '1.2.3.4', '12.3.4'),
-            array(1, '1', '10'),
-            array(1, '1.2', '12'),
-            array(1, '1.2.3', '12'),
-            array(1, '1.2.3.4', '12'),
-            array(2, '1', '10'),
-            array(2, '1.2', '12'),
-            array(2, '1.2.3', '12.3'),
-            array(2, '1.2.3.4', '12.3'),
-            array(3, '1', '10'),
-            array(3, '1.2', '12'),
-            array(3, '1.2.3', '12.3'),
-            array(3, '1.2.3.4', '12.3.4'),
-        );
+        return [
+            [null, '1', '10'],
+            [null, '1.2', '12'],
+            [null, '1.2.3', '12.3'],
+            [null, '1.2.3.4', '12.3.4'],
+            [1, '1', '10'],
+            [1, '1.2', '12'],
+            [1, '1.2.3', '12'],
+            [1, '1.2.3.4', '12'],
+            [2, '1', '10'],
+            [2, '1.2', '12'],
+            [2, '1.2.3', '12.3'],
+            [2, '1.2.3.4', '12.3'],
+            [3, '1', '10'],
+            [3, '1.2', '12'],
+            [3, '1.2.3', '12.3'],
+            [3, '1.2.3.4', '12.3.4'],
+        ];
     }
 
     /**
@@ -51,55 +51,55 @@ public function testNormalize($precision, $version, $result)
 
     public function compareProvider()
     {
-        return array(
-            array(null, '1', '==', '1', true),
-            array(null, '1.0', '==', '1.1', false),
-            array(null, '1.0.0', '==', '1.0.1', false),
-            array(null, '1.0.0.0', '==', '1.0.0.1', false),
-            array(null, '1.0.0.0.0', '==', '1.0.0.0.1', false),
+        return [
+            [null, '1', '==', '1', true],
+            [null, '1.0', '==', '1.1', false],
+            [null, '1.0.0', '==', '1.0.1', false],
+            [null, '1.0.0.0', '==', '1.0.0.1', false],
+            [null, '1.0.0.0.0', '==', '1.0.0.0.1', false],
 
-            array(null, '1', '==', '10', true),
-            array(null, '1.0', '==', '11', false),
-            array(null, '1.0.0', '==', '10.1', false),
-            array(null, '1.0.0.0', '==', '10.0.1', false),
-            array(null, '1.0.0.0.0', '==', '10.0.0.1', false),
+            [null, '1', '==', '10', true],
+            [null, '1.0', '==', '11', false],
+            [null, '1.0.0', '==', '10.1', false],
+            [null, '1.0.0.0', '==', '10.0.1', false],
+            [null, '1.0.0.0.0', '==', '10.0.0.1', false],
 
-            array(1, '1', '==', '1', true),
-            array(1, '1.0', '==', '1.1', false),
-            array(1, '1.0.0', '==', '1.0.1', true),
-            array(1, '1.0.0.0', '==', '1.0.0.1', true),
-            array(1, '1.0.0.0.0', '==', '1.0.0.0.1', true),
+            [1, '1', '==', '1', true],
+            [1, '1.0', '==', '1.1', false],
+            [1, '1.0.0', '==', '1.0.1', true],
+            [1, '1.0.0.0', '==', '1.0.0.1', true],
+            [1, '1.0.0.0.0', '==', '1.0.0.0.1', true],
 
-            array(1, '1', '==', '10', true),
-            array(1, '1.0', '==', '11', false),
-            array(1, '1.0.0', '==', '10.1', true),
-            array(1, '1.0.0.0', '==', '10.0.1', true),
-            array(1, '1.0.0.0.0', '==', '10.0.0.1', true),
+            [1, '1', '==', '10', true],
+            [1, '1.0', '==', '11', false],
+            [1, '1.0.0', '==', '10.1', true],
+            [1, '1.0.0.0', '==', '10.0.1', true],
+            [1, '1.0.0.0.0', '==', '10.0.0.1', true],
 
-            array(2, '1', '==', '1', true),
-            array(2, '1.0', '==', '1.1', false),
-            array(2, '1.0.0', '==', '1.0.1', false),
-            array(2, '1.0.0.0', '==', '1.0.0.1', true),
-            array(2, '1.0.0.0.0', '==', '1.0.0.0.1', true),
+            [2, '1', '==', '1', true],
+            [2, '1.0', '==', '1.1', false],
+            [2, '1.0.0', '==', '1.0.1', false],
+            [2, '1.0.0.0', '==', '1.0.0.1', true],
+            [2, '1.0.0.0.0', '==', '1.0.0.0.1', true],
 
-            array(2, '1', '==', '10', true),
-            array(2, '1.0', '==', '11', false),
-            array(2, '1.0.0', '==', '10.1', false),
-            array(2, '1.0.0.0', '==', '10.0.1', true),
-            array(2, '1.0.0.0.0', '==', '10.0.0.1', true),
+            [2, '1', '==', '10', true],
+            [2, '1.0', '==', '11', false],
+            [2, '1.0.0', '==', '10.1', false],
+            [2, '1.0.0.0', '==', '10.0.1', true],
+            [2, '1.0.0.0.0', '==', '10.0.0.1', true],
 
-            array(3, '1', '==', '1', true),
-            array(3, '1.0', '==', '1.1', false),
-            array(3, '1.0.0', '==', '1.0.1', false),
-            array(3, '1.0.0.0', '==', '1.0.0.1', false),
-            array(3, '1.0.0.0.0', '==', '1.0.0.0.1', true),
+            [3, '1', '==', '1', true],
+            [3, '1.0', '==', '1.1', false],
+            [3, '1.0.0', '==', '1.0.1', false],
+            [3, '1.0.0.0', '==', '1.0.0.1', false],
+            [3, '1.0.0.0.0', '==', '1.0.0.0.1', true],
 
-            array(3, '1', '==', '10', true),
-            array(3, '1.0', '==', '11', false),
-            array(3, '1.0.0', '==', '10.1', false),
-            array(3, '1.0.0.0', '==', '10.0.1', false),
-            array(3, '1.0.0.0.0', '==', '10.0.0.1', true),
-        );
+            [3, '1', '==', '10', true],
+            [3, '1.0', '==', '11', false],
+            [3, '1.0.0', '==', '10.1', false],
+            [3, '1.0.0.0', '==', '10.0.1', false],
+            [3, '1.0.0.0.0', '==', '10.0.0.1', true],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Intl/Tests/Util/VersionTest.php b/src/Symfony/Component/Intl/Tests/Util/VersionTest.php
index b570b3ae96ae3..e3bb07ee5a802 100644
--- a/src/Symfony/Component/Intl/Tests/Util/VersionTest.php
+++ b/src/Symfony/Component/Intl/Tests/Util/VersionTest.php
@@ -21,28 +21,28 @@ class VersionTest extends TestCase
 {
     public function normalizeProvider()
     {
-        return array(
-            array(null, '1', '1'),
-            array(null, '1.2', '1.2'),
-            array(null, '1.2.3', '1.2.3'),
-            array(null, '1.2.3.4', '1.2.3.4'),
-            array(1, '1', '1'),
-            array(1, '1.2', '1'),
-            array(1, '1.2.3', '1'),
-            array(1, '1.2.3.4', '1'),
-            array(2, '1', '1'),
-            array(2, '1.2', '1.2'),
-            array(2, '1.2.3', '1.2'),
-            array(2, '1.2.3.4', '1.2'),
-            array(3, '1', '1'),
-            array(3, '1.2', '1.2'),
-            array(3, '1.2.3', '1.2.3'),
-            array(3, '1.2.3.4', '1.2.3'),
-            array(4, '1', '1'),
-            array(4, '1.2', '1.2'),
-            array(4, '1.2.3', '1.2.3'),
-            array(4, '1.2.3.4', '1.2.3.4'),
-        );
+        return [
+            [null, '1', '1'],
+            [null, '1.2', '1.2'],
+            [null, '1.2.3', '1.2.3'],
+            [null, '1.2.3.4', '1.2.3.4'],
+            [1, '1', '1'],
+            [1, '1.2', '1'],
+            [1, '1.2.3', '1'],
+            [1, '1.2.3.4', '1'],
+            [2, '1', '1'],
+            [2, '1.2', '1.2'],
+            [2, '1.2.3', '1.2'],
+            [2, '1.2.3.4', '1.2'],
+            [3, '1', '1'],
+            [3, '1.2', '1.2'],
+            [3, '1.2.3', '1.2.3'],
+            [3, '1.2.3.4', '1.2.3'],
+            [4, '1', '1'],
+            [4, '1.2', '1.2'],
+            [4, '1.2.3', '1.2.3'],
+            [4, '1.2.3.4', '1.2.3.4'],
+        ];
     }
 
     /**
@@ -55,27 +55,27 @@ public function testNormalize($precision, $version, $result)
 
     public function compareProvider()
     {
-        return array(
-            array(null, '1', '==', '1', true),
-            array(null, '1.0', '==', '1.1', false),
-            array(null, '1.0.0', '==', '1.0.1', false),
-            array(null, '1.0.0.0', '==', '1.0.0.1', false),
+        return [
+            [null, '1', '==', '1', true],
+            [null, '1.0', '==', '1.1', false],
+            [null, '1.0.0', '==', '1.0.1', false],
+            [null, '1.0.0.0', '==', '1.0.0.1', false],
 
-            array(1, '1', '==', '1', true),
-            array(1, '1.0', '==', '1.1', true),
-            array(1, '1.0.0', '==', '1.0.1', true),
-            array(1, '1.0.0.0', '==', '1.0.0.1', true),
+            [1, '1', '==', '1', true],
+            [1, '1.0', '==', '1.1', true],
+            [1, '1.0.0', '==', '1.0.1', true],
+            [1, '1.0.0.0', '==', '1.0.0.1', true],
 
-            array(2, '1', '==', '1', true),
-            array(2, '1.0', '==', '1.1', false),
-            array(2, '1.0.0', '==', '1.0.1', true),
-            array(2, '1.0.0.0', '==', '1.0.0.1', true),
+            [2, '1', '==', '1', true],
+            [2, '1.0', '==', '1.1', false],
+            [2, '1.0.0', '==', '1.0.1', true],
+            [2, '1.0.0.0', '==', '1.0.0.1', true],
 
-            array(3, '1', '==', '1', true),
-            array(3, '1.0', '==', '1.1', false),
-            array(3, '1.0.0', '==', '1.0.1', false),
-            array(3, '1.0.0.0', '==', '1.0.0.1', true),
-        );
+            [3, '1', '==', '1', true],
+            [3, '1.0', '==', '1.1', false],
+            [3, '1.0.0', '==', '1.0.1', false],
+            [3, '1.0.0.0', '==', '1.0.0.1', true],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Ldap/Adapter/AbstractConnection.php b/src/Symfony/Component/Ldap/Adapter/AbstractConnection.php
index 67529b62e53b6..a43e2535d2034 100644
--- a/src/Symfony/Component/Ldap/Adapter/AbstractConnection.php
+++ b/src/Symfony/Component/Ldap/Adapter/AbstractConnection.php
@@ -21,7 +21,7 @@ abstract class AbstractConnection implements ConnectionInterface
 {
     protected $config;
 
-    public function __construct(array $config = array())
+    public function __construct(array $config = [])
     {
         $resolver = new OptionsResolver();
 
@@ -37,13 +37,13 @@ public function __construct(array $config = array())
      */
     protected function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'host' => 'localhost',
             'version' => 3,
             'connection_string' => null,
             'encryption' => 'none',
-            'options' => array(),
-        ));
+            'options' => [],
+        ]);
 
         $resolver->setDefault('port', function (Options $options) {
             return 'ssl' === $options['encryption'] ? 636 : 389;
@@ -57,7 +57,7 @@ protected function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('port', 'numeric');
         $resolver->setAllowedTypes('connection_string', 'string');
         $resolver->setAllowedTypes('version', 'numeric');
-        $resolver->setAllowedValues('encryption', array('none', 'ssl', 'tls'));
+        $resolver->setAllowedValues('encryption', ['none', 'ssl', 'tls']);
         $resolver->setAllowedTypes('options', 'array');
     }
 }
diff --git a/src/Symfony/Component/Ldap/Adapter/AbstractQuery.php b/src/Symfony/Component/Ldap/Adapter/AbstractQuery.php
index d2c39d734f0e5..37298982f2886 100644
--- a/src/Symfony/Component/Ldap/Adapter/AbstractQuery.php
+++ b/src/Symfony/Component/Ldap/Adapter/AbstractQuery.php
@@ -36,11 +36,11 @@ public function __construct(ConnectionInterface $connection, $dn, $query, array
             'attrsOnly' => 0,
             'scope' => static::SCOPE_SUB,
         ));
-        $resolver->setAllowedValues('deref', array(static::DEREF_ALWAYS, static::DEREF_NEVER, static::DEREF_FINDING, static::DEREF_SEARCHING));
-        $resolver->setAllowedValues('scope', array(static::SCOPE_BASE, static::SCOPE_ONE, static::SCOPE_SUB));
+        $resolver->setAllowedValues('deref', [static::DEREF_ALWAYS, static::DEREF_NEVER, static::DEREF_FINDING, static::DEREF_SEARCHING]);
+        $resolver->setAllowedValues('scope', [static::SCOPE_BASE, static::SCOPE_ONE, static::SCOPE_SUB]);
 
         $resolver->setNormalizer('filter', function (Options $options, $value) {
-            return \is_array($value) ? $value : array($value);
+            return \is_array($value) ? $value : [$value];
         });
 
         $this->connection = $connection;
diff --git a/src/Symfony/Component/Ldap/Adapter/AdapterInterface.php b/src/Symfony/Component/Ldap/Adapter/AdapterInterface.php
index f01e3528f8e19..3c2fb4b9710cd 100644
--- a/src/Symfony/Component/Ldap/Adapter/AdapterInterface.php
+++ b/src/Symfony/Component/Ldap/Adapter/AdapterInterface.php
@@ -32,7 +32,7 @@ public function getConnection();
      *
      * @return QueryInterface
      */
-    public function createQuery($dn, $query, array $options = array());
+    public function createQuery($dn, $query, array $options = []);
 
     /**
      * Fetches the entry manager instance.
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Adapter.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Adapter.php
index fbc41af36bfef..0700f6ec5877c 100644
--- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Adapter.php
+++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Adapter.php
@@ -23,7 +23,7 @@ class Adapter implements AdapterInterface
     private $connection;
     private $entryManager;
 
-    public function __construct(array $config = array())
+    public function __construct(array $config = [])
     {
         if (!\extension_loaded('ldap')) {
             throw new LdapException('The LDAP PHP extension is not enabled.');
@@ -59,7 +59,7 @@ public function getEntryManager()
     /**
      * {@inheritdoc}
      */
-    public function createQuery($dn, $query, array $options = array())
+    public function createQuery($dn, $query, array $options = [])
     {
         return new Query($this->getConnection(), $dn, $query, $options);
     }
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Collection.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Collection.php
index 581cf153ed652..fade430753dcc 100644
--- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Collection.php
+++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Collection.php
@@ -121,10 +121,10 @@ private function getSingleEntry($con, $current)
 
     private function cleanupAttributes(array $entry)
     {
-        $attributes = array_diff_key($entry, array_flip(range(0, $entry['count'] - 1)) + array(
+        $attributes = array_diff_key($entry, array_flip(range(0, $entry['count'] - 1)) + [
                 'count' => null,
                 'dn' => null,
-            ));
+            ]);
         array_walk($attributes, function (&$value) {
             unset($value['count']);
         });
diff --git a/src/Symfony/Component/Ldap/Ldap.php b/src/Symfony/Component/Ldap/Ldap.php
index 514f51d22c21a..79b72c8cb8670 100644
--- a/src/Symfony/Component/Ldap/Ldap.php
+++ b/src/Symfony/Component/Ldap/Ldap.php
@@ -21,9 +21,9 @@ final class Ldap implements LdapInterface
 {
     private $adapter;
 
-    private static $adapterMap = array(
+    private static $adapterMap = [
         'ext_ldap' => 'Symfony\Component\Ldap\Adapter\ExtLdap\Adapter',
-    );
+    ];
 
     public function __construct(AdapterInterface $adapter)
     {
@@ -41,7 +41,7 @@ public function bind($dn = null, $password = null)
     /**
      * {@inheritdoc}
      */
-    public function query($dn, $query, array $options = array())
+    public function query($dn, $query, array $options = [])
     {
         return $this->adapter->createQuery($dn, $query, $options);
     }
diff --git a/src/Symfony/Component/Ldap/LdapInterface.php b/src/Symfony/Component/Ldap/LdapInterface.php
index 9f24276d61a20..aa6b233f3d4d8 100644
--- a/src/Symfony/Component/Ldap/LdapInterface.php
+++ b/src/Symfony/Component/Ldap/LdapInterface.php
@@ -44,7 +44,7 @@ public function bind($dn = null, $password = null);
      *
      * @return QueryInterface
      */
-    public function query($dn, $query, array $options = array());
+    public function query($dn, $query, array $options = []);
 
     /**
      * @return EntryManagerInterface
diff --git a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php
index f238361879425..18d1c02d488e1 100644
--- a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php
+++ b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php
@@ -38,7 +38,7 @@ public function testLdapQuery()
         $ldap = new Adapter($this->getLdapConfig());
 
         $ldap->getConnection()->bind('cn=admin,dc=symfony,dc=com', 'symfony');
-        $query = $ldap->createQuery('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))', array());
+        $query = $ldap->createQuery('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))', []);
         $result = $query->execute();
 
         $this->assertInstanceOf(Collection::class, $result);
@@ -46,8 +46,8 @@ public function testLdapQuery()
 
         $entry = $result[0];
         $this->assertInstanceOf(Entry::class, $entry);
-        $this->assertEquals(array('Fabien Potencier'), $entry->getAttribute('cn'));
-        $this->assertEquals(array('fabpot@symfony.com', 'fabien@potencier.com'), $entry->getAttribute('mail'));
+        $this->assertEquals(['Fabien Potencier'], $entry->getAttribute('cn'));
+        $this->assertEquals(['fabpot@symfony.com', 'fabien@potencier.com'], $entry->getAttribute('mail'));
     }
 
     /**
@@ -58,14 +58,14 @@ public function testLdapQueryIterator()
         $ldap = new Adapter($this->getLdapConfig());
 
         $ldap->getConnection()->bind('cn=admin,dc=symfony,dc=com', 'symfony');
-        $query = $ldap->createQuery('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))', array());
+        $query = $ldap->createQuery('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))', []);
         $result = $query->execute();
         $iterator = $result->getIterator();
         $iterator->rewind();
         $entry = $iterator->current();
         $this->assertInstanceOf(Entry::class, $entry);
-        $this->assertEquals(array('Fabien Potencier'), $entry->getAttribute('cn'));
-        $this->assertEquals(array('fabpot@symfony.com', 'fabien@potencier.com'), $entry->getAttribute('mail'));
+        $this->assertEquals(['Fabien Potencier'], $entry->getAttribute('cn'));
+        $this->assertEquals(['fabpot@symfony.com', 'fabien@potencier.com'], $entry->getAttribute('mail'));
     }
 
     /**
@@ -75,7 +75,7 @@ public function testLdapQueryWithoutBind()
     {
         $ldap = new Adapter($this->getLdapConfig());
         $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(NotBoundException::class);
-        $query = $ldap->createQuery('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))', array());
+        $query = $ldap->createQuery('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))', []);
         $query->execute();
     }
 
@@ -85,14 +85,14 @@ public function testLdapQueryScopeBase()
 
         $ldap->getConnection()->bind('cn=admin,dc=symfony,dc=com', 'symfony');
 
-        $query = $ldap->createQuery('cn=Fabien Potencier,dc=symfony,dc=com', '(objectclass=*)', array(
+        $query = $ldap->createQuery('cn=Fabien Potencier,dc=symfony,dc=com', '(objectclass=*)', [
            'scope' => Query::SCOPE_BASE,
-        ));
+        ]);
         $result = $query->execute();
 
         $entry = $result[0];
         $this->assertEquals($result->count(), 1);
-        $this->assertEquals(array('Fabien Potencier'), $entry->getAttribute('cn'));
+        $this->assertEquals(['Fabien Potencier'], $entry->getAttribute('cn'));
     }
 
     public function testLdapQueryScopeOneLevel()
@@ -101,14 +101,14 @@ public function testLdapQueryScopeOneLevel()
 
         $ldap->getConnection()->bind('cn=admin,dc=symfony,dc=com', 'symfony');
 
-        $one_level_result = $ldap->createQuery('ou=Components,dc=symfony,dc=com', '(objectclass=*)', array(
+        $one_level_result = $ldap->createQuery('ou=Components,dc=symfony,dc=com', '(objectclass=*)', [
             'scope' => Query::SCOPE_ONE,
-        ))->execute();
+        ])->execute();
 
         $subtree_count = $ldap->createQuery('ou=Components,dc=symfony,dc=com', '(objectclass=*)')->execute()->count();
 
         $this->assertNotEquals($one_level_result->count(), $subtree_count);
         $this->assertEquals($one_level_result->count(), 1);
-        $this->assertEquals($one_level_result[0]->getAttribute('ou'), array('Ldap'));
+        $this->assertEquals($one_level_result[0]->getAttribute('ou'), ['Ldap']);
     }
 }
diff --git a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php
index 855a5750fbb84..23c51e3f0e197 100644
--- a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php
+++ b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php
@@ -38,12 +38,12 @@ public function testLdapAddAndRemove()
     {
         $this->executeSearchQuery(1);
 
-        $entry = new Entry('cn=Charles Sarrazin,dc=symfony,dc=com', array(
-            'sn' => array('csarrazi'),
-            'objectclass' => array(
+        $entry = new Entry('cn=Charles Sarrazin,dc=symfony,dc=com', [
+            'sn' => ['csarrazi'],
+            'objectclass' => [
                 'inetOrgPerson',
-            ),
-        ));
+            ],
+        ]);
 
         $em = $this->adapter->getEntryManager();
         $em->add($entry);
diff --git a/src/Symfony/Component/Ldap/Tests/LdapTest.php b/src/Symfony/Component/Ldap/Tests/LdapTest.php
index 17184323f41cc..acc845222587a 100644
--- a/src/Symfony/Component/Ldap/Tests/LdapTest.php
+++ b/src/Symfony/Component/Ldap/Tests/LdapTest.php
@@ -62,9 +62,9 @@ public function testLdapQuery()
         $this->adapter
             ->expects($this->once())
             ->method('createQuery')
-            ->with('foo', 'bar', array('baz'))
+            ->with('foo', 'bar', ['baz'])
         ;
-        $this->ldap->query('foo', 'bar', array('baz'));
+        $this->ldap->query('foo', 'bar', ['baz']);
     }
 
     /**
diff --git a/src/Symfony/Component/Ldap/Tests/LdapTestCase.php b/src/Symfony/Component/Ldap/Tests/LdapTestCase.php
index 33afd6d22d389..2e5fa9a34b18b 100644
--- a/src/Symfony/Component/Ldap/Tests/LdapTestCase.php
+++ b/src/Symfony/Component/Ldap/Tests/LdapTestCase.php
@@ -8,9 +8,9 @@ class LdapTestCase extends TestCase
 {
     protected function getLdapConfig()
     {
-        return array(
+        return [
             'host' => getenv('LDAP_HOST'),
             'port' => getenv('LDAP_PORT'),
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Lock/Key.php b/src/Symfony/Component/Lock/Key.php
index 8be4f3a255975..a7403301d83aa 100644
--- a/src/Symfony/Component/Lock/Key.php
+++ b/src/Symfony/Component/Lock/Key.php
@@ -20,7 +20,7 @@ final class Key
 {
     private $resource;
     private $expiringTime;
-    private $state = array();
+    private $state = [];
 
     /**
      * @param string $resource
diff --git a/src/Symfony/Component/Lock/Lock.php b/src/Symfony/Component/Lock/Lock.php
index 9cd15dd40bbeb..f3b262bc61b84 100644
--- a/src/Symfony/Component/Lock/Lock.php
+++ b/src/Symfony/Component/Lock/Lock.php
@@ -76,7 +76,7 @@ public function acquire($blocking = false)
             }
 
             $this->dirty = true;
-            $this->logger->info('Successfully acquired the "{resource}" lock.', array('resource' => $this->key));
+            $this->logger->info('Successfully acquired the "{resource}" lock.', ['resource' => $this->key]);
 
             if ($this->ttl) {
                 $this->refresh();
@@ -89,7 +89,7 @@ public function acquire($blocking = false)
             return true;
         } catch (LockConflictedException $e) {
             $this->dirty = false;
-            $this->logger->notice('Failed to acquire the "{resource}" lock. Someone else already acquired the lock.', array('resource' => $this->key));
+            $this->logger->notice('Failed to acquire the "{resource}" lock. Someone else already acquired the lock.', ['resource' => $this->key]);
 
             if ($blocking) {
                 throw $e;
@@ -97,7 +97,7 @@ public function acquire($blocking = false)
 
             return false;
         } catch (\Exception $e) {
-            $this->logger->notice('Failed to acquire the "{resource}" lock.', array('resource' => $this->key, 'exception' => $e));
+            $this->logger->notice('Failed to acquire the "{resource}" lock.', ['resource' => $this->key, 'exception' => $e]);
             throw new LockAcquiringException(sprintf('Failed to acquire the "%s" lock.', $this->key), 0, $e);
         }
     }
diff --git a/src/Symfony/Component/Lock/Store/CombinedStore.php b/src/Symfony/Component/Lock/Store/CombinedStore.php
index b0ca2c1454e0b..38f3f35e750e9 100644
--- a/src/Symfony/Component/Lock/Store/CombinedStore.php
+++ b/src/Symfony/Component/Lock/Store/CombinedStore.php
@@ -69,7 +69,7 @@ public function save(Key $key)
                 $store->save($key);
                 ++$successCount;
             } catch (\Exception $e) {
-                $this->logger->warning('One store failed to save the "{resource}" lock.', array('resource' => $key, 'store' => $store, 'exception' => $e));
+                $this->logger->warning('One store failed to save the "{resource}" lock.', ['resource' => $key, 'store' => $store, 'exception' => $e]);
                 ++$failureCount;
             }
 
@@ -82,7 +82,7 @@ public function save(Key $key)
             return;
         }
 
-        $this->logger->warning('Failed to store the "{resource}" lock. Quorum has not been met.', array('resource' => $key, 'success' => $successCount, 'failure' => $failureCount));
+        $this->logger->warning('Failed to store the "{resource}" lock. Quorum has not been met.', ['resource' => $key, 'success' => $successCount, 'failure' => $failureCount]);
 
         // clean up potential locks
         $this->delete($key);
@@ -108,7 +108,7 @@ public function putOffExpiration(Key $key, $ttl)
         foreach ($this->stores as $store) {
             try {
                 if (0.0 >= $adjustedTtl = $expireAt - microtime(true)) {
-                    $this->logger->warning('Stores took to long to put off the expiration of the "{resource}" lock.', array('resource' => $key, 'store' => $store, 'ttl' => $ttl));
+                    $this->logger->warning('Stores took to long to put off the expiration of the "{resource}" lock.', ['resource' => $key, 'store' => $store, 'ttl' => $ttl]);
                     $key->reduceLifetime(0);
                     break;
                 }
@@ -116,7 +116,7 @@ public function putOffExpiration(Key $key, $ttl)
                 $store->putOffExpiration($key, $adjustedTtl);
                 ++$successCount;
             } catch (\Exception $e) {
-                $this->logger->warning('One store failed to put off the expiration of the "{resource}" lock.', array('resource' => $key, 'store' => $store, 'exception' => $e));
+                $this->logger->warning('One store failed to put off the expiration of the "{resource}" lock.', ['resource' => $key, 'store' => $store, 'exception' => $e]);
                 ++$failureCount;
             }
 
@@ -133,7 +133,7 @@ public function putOffExpiration(Key $key, $ttl)
             return;
         }
 
-        $this->logger->warning('Failed to define the expiration for the "{resource}" lock. Quorum has not been met.', array('resource' => $key, 'success' => $successCount, 'failure' => $failureCount));
+        $this->logger->warning('Failed to define the expiration for the "{resource}" lock. Quorum has not been met.', ['resource' => $key, 'success' => $successCount, 'failure' => $failureCount]);
 
         // clean up potential locks
         $this->delete($key);
@@ -150,7 +150,7 @@ public function delete(Key $key)
             try {
                 $store->delete($key);
             } catch (\Exception $e) {
-                $this->logger->notice('One store failed to delete the "{resource}" lock.', array('resource' => $key, 'store' => $store, 'exception' => $e));
+                $this->logger->notice('One store failed to delete the "{resource}" lock.', ['resource' => $key, 'store' => $store, 'exception' => $e]);
             }
         }
     }
diff --git a/src/Symfony/Component/Lock/Store/MemcachedStore.php b/src/Symfony/Component/Lock/Store/MemcachedStore.php
index 455dfebcfb754..9b795504c990f 100644
--- a/src/Symfony/Component/Lock/Store/MemcachedStore.php
+++ b/src/Symfony/Component/Lock/Store/MemcachedStore.php
@@ -173,15 +173,15 @@ private function getValueAndCas(Key $key)
         if ($this->useExtendedReturn) {
             $extendedReturn = $this->memcached->get((string) $key, null, \Memcached::GET_EXTENDED);
             if (\Memcached::GET_ERROR_RETURN_VALUE === $extendedReturn) {
-                return array($extendedReturn, 0.0);
+                return [$extendedReturn, 0.0];
             }
 
-            return array($extendedReturn['value'], $extendedReturn['cas']);
+            return [$extendedReturn['value'], $extendedReturn['cas']];
         }
 
         $cas = 0.0;
         $value = $this->memcached->get((string) $key, null, $cas);
 
-        return array($value, $cas);
+        return [$value, $cas];
     }
 }
diff --git a/src/Symfony/Component/Lock/Store/RetryTillSaveStore.php b/src/Symfony/Component/Lock/Store/RetryTillSaveStore.php
index dfc3b266687d9..1ee988eadda2b 100644
--- a/src/Symfony/Component/Lock/Store/RetryTillSaveStore.php
+++ b/src/Symfony/Component/Lock/Store/RetryTillSaveStore.php
@@ -71,7 +71,7 @@ public function waitAndSave(Key $key)
             }
         } while (++$retry < $this->retryCount);
 
-        $this->logger->warning('Failed to store the "{resource}" lock. Abort after {retry} retry.', array('resource' => $key, 'retry' => $retry));
+        $this->logger->warning('Failed to store the "{resource}" lock. Abort after {retry} retry.', ['resource' => $key, 'retry' => $retry]);
 
         throw new LockConflictedException();
     }
diff --git a/src/Symfony/Component/Lock/Tests/LockTest.php b/src/Symfony/Component/Lock/Tests/LockTest.php
index 7913644b9a79e..f461311db0ede 100644
--- a/src/Symfony/Component/Lock/Tests/LockTest.php
+++ b/src/Symfony/Component/Lock/Tests/LockTest.php
@@ -140,7 +140,7 @@ public function testReleaseOnDestruction()
 
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(array(true, false))
+            ->willReturnOnConsecutiveCalls([true, false])
         ;
         $store
             ->expects($this->once())
@@ -159,7 +159,7 @@ public function testNoAutoReleaseWhenNotConfigured()
 
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(array(true, false))
+            ->willReturnOnConsecutiveCalls([true, false])
         ;
         $store
             ->expects($this->never())
@@ -206,7 +206,7 @@ public function testReleaseThrowsAndLog()
 
         $logger->expects($this->atLeastOnce())
             ->method('notice')
-            ->with('Failed to release the "{resource}" lock.', array('resource' => $key));
+            ->with('Failed to release the "{resource}" lock.', ['resource' => $key]);
 
         $store
             ->expects($this->once())
@@ -243,12 +243,12 @@ public function testExpiration($ttls, $expected)
 
     public function provideExpiredDates()
     {
-        yield array(array(-0.1), true);
-        yield array(array(0.1, -0.1), true);
-        yield array(array(-0.1, 0.1), true);
+        yield [[-0.1], true];
+        yield [[0.1, -0.1], true];
+        yield [[-0.1, 0.1], true];
 
-        yield array(array(), false);
-        yield array(array(0.1), false);
-        yield array(array(-0.1, null), false);
+        yield [[], false];
+        yield [[0.1], false];
+        yield [[-0.1, null], false];
     }
 }
diff --git a/src/Symfony/Component/Lock/Tests/Store/BlockingStoreTestTrait.php b/src/Symfony/Component/Lock/Tests/Store/BlockingStoreTestTrait.php
index c04c01d64fecd..fecca0d8ae65a 100644
--- a/src/Symfony/Component/Lock/Tests/Store/BlockingStoreTestTrait.php
+++ b/src/Symfony/Component/Lock/Tests/Store/BlockingStoreTestTrait.php
@@ -51,11 +51,11 @@ public function testBlockingLocks()
         $parentPID = posix_getpid();
 
         // Block SIGHUP signal
-        pcntl_sigprocmask(SIG_BLOCK, array(SIGHUP));
+        pcntl_sigprocmask(SIG_BLOCK, [SIGHUP]);
 
         if ($childPID = pcntl_fork()) {
             // Wait the start of the child
-            pcntl_sigwaitinfo(array(SIGHUP), $info);
+            pcntl_sigwaitinfo([SIGHUP], $info);
 
             try {
                 // This call should failed given the lock should already by acquired by the child
diff --git a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php
index f2c55b056b324..bcfc40b1bc266 100644
--- a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php
@@ -46,7 +46,7 @@ public function getStore()
             self::markTestSkipped($e->getMessage());
         }
 
-        return new CombinedStore(array(new RedisStore($redis)), new UnanimousStrategy());
+        return new CombinedStore([new RedisStore($redis)], new UnanimousStrategy());
     }
 
     /** @var \PHPUnit_Framework_MockObject_MockObject */
@@ -64,7 +64,7 @@ protected function setUp()
         $this->store1 = $this->getMockBuilder(StoreInterface::class)->getMock();
         $this->store2 = $this->getMockBuilder(StoreInterface::class)->getMock();
 
-        $this->store = new CombinedStore(array($this->store1, $this->store2), $this->strategy);
+        $this->store = new CombinedStore([$this->store1, $this->store2], $this->strategy);
     }
 
     /**
@@ -269,7 +269,7 @@ public function testPutOffExpirationIgnoreNonExpiringStorage()
         $store1 = $this->getMockBuilder(StoreInterface::class)->getMock();
         $store2 = $this->getMockBuilder(StoreInterface::class)->getMock();
 
-        $store = new CombinedStore(array($store1, $store2), $this->strategy);
+        $store = new CombinedStore([$store1, $store2], $this->strategy);
 
         $key = new Key(uniqid(__METHOD__, true));
         $ttl = random_int(1, 10);
diff --git a/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php
index 180da4618da03..7d915615a7a59 100644
--- a/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php
@@ -31,7 +31,7 @@ public static function setupBeforeClass()
 
     protected function getRedisConnection()
     {
-        $redis = new \RedisArray(array(getenv('REDIS_HOST')));
+        $redis = new \RedisArray([getenv('REDIS_HOST')]);
 
         return $redis;
     }
diff --git a/src/Symfony/Component/Lock/Tests/Strategy/ConsensusStrategyTest.php b/src/Symfony/Component/Lock/Tests/Strategy/ConsensusStrategyTest.php
index b8c09dfb31fa2..8034cfe7cf900 100644
--- a/src/Symfony/Component/Lock/Tests/Strategy/ConsensusStrategyTest.php
+++ b/src/Symfony/Component/Lock/Tests/Strategy/ConsensusStrategyTest.php
@@ -30,45 +30,45 @@ protected function setUp()
     public function provideMetResults()
     {
         // success, failure, total, isMet
-        yield array(3, 0, 3, true);
-        yield array(2, 1, 3, true);
-        yield array(2, 0, 3, true);
-        yield array(1, 2, 3, false);
-        yield array(1, 1, 3, false);
-        yield array(1, 0, 3, false);
-        yield array(0, 3, 3, false);
-        yield array(0, 2, 3, false);
-        yield array(0, 1, 3, false);
-        yield array(0, 0, 3, false);
+        yield [3, 0, 3, true];
+        yield [2, 1, 3, true];
+        yield [2, 0, 3, true];
+        yield [1, 2, 3, false];
+        yield [1, 1, 3, false];
+        yield [1, 0, 3, false];
+        yield [0, 3, 3, false];
+        yield [0, 2, 3, false];
+        yield [0, 1, 3, false];
+        yield [0, 0, 3, false];
 
-        yield array(2, 0, 2, true);
-        yield array(1, 1, 2, false);
-        yield array(1, 0, 2, false);
-        yield array(0, 2, 2, false);
-        yield array(0, 1, 2, false);
-        yield array(0, 0, 2, false);
+        yield [2, 0, 2, true];
+        yield [1, 1, 2, false];
+        yield [1, 0, 2, false];
+        yield [0, 2, 2, false];
+        yield [0, 1, 2, false];
+        yield [0, 0, 2, false];
     }
 
     public function provideIndeterminate()
     {
         // success, failure, total, canBeMet
-        yield array(3, 0, 3, true);
-        yield array(2, 1, 3, true);
-        yield array(2, 0, 3, true);
-        yield array(1, 2, 3, false);
-        yield array(1, 1, 3, true);
-        yield array(1, 0, 3, true);
-        yield array(0, 3, 3, false);
-        yield array(0, 2, 3, false);
-        yield array(0, 1, 3, true);
-        yield array(0, 0, 3, true);
+        yield [3, 0, 3, true];
+        yield [2, 1, 3, true];
+        yield [2, 0, 3, true];
+        yield [1, 2, 3, false];
+        yield [1, 1, 3, true];
+        yield [1, 0, 3, true];
+        yield [0, 3, 3, false];
+        yield [0, 2, 3, false];
+        yield [0, 1, 3, true];
+        yield [0, 0, 3, true];
 
-        yield array(2, 0, 2, true);
-        yield array(1, 1, 2, false);
-        yield array(1, 0, 2, true);
-        yield array(0, 2, 2, false);
-        yield array(0, 1, 2, false);
-        yield array(0, 0, 2, true);
+        yield [2, 0, 2, true];
+        yield [1, 1, 2, false];
+        yield [1, 0, 2, true];
+        yield [0, 2, 2, false];
+        yield [0, 1, 2, false];
+        yield [0, 0, 2, true];
     }
 
     /**
diff --git a/src/Symfony/Component/Lock/Tests/Strategy/UnanimousStrategyTest.php b/src/Symfony/Component/Lock/Tests/Strategy/UnanimousStrategyTest.php
index 4e63e6b4e2cd4..a07b42ddf52fb 100644
--- a/src/Symfony/Component/Lock/Tests/Strategy/UnanimousStrategyTest.php
+++ b/src/Symfony/Component/Lock/Tests/Strategy/UnanimousStrategyTest.php
@@ -30,45 +30,45 @@ protected function setUp()
     public function provideMetResults()
     {
         // success, failure, total, isMet
-        yield array(3, 0, 3, true);
-        yield array(2, 1, 3, false);
-        yield array(2, 0, 3, false);
-        yield array(1, 2, 3, false);
-        yield array(1, 1, 3, false);
-        yield array(1, 0, 3, false);
-        yield array(0, 3, 3, false);
-        yield array(0, 2, 3, false);
-        yield array(0, 1, 3, false);
-        yield array(0, 0, 3, false);
+        yield [3, 0, 3, true];
+        yield [2, 1, 3, false];
+        yield [2, 0, 3, false];
+        yield [1, 2, 3, false];
+        yield [1, 1, 3, false];
+        yield [1, 0, 3, false];
+        yield [0, 3, 3, false];
+        yield [0, 2, 3, false];
+        yield [0, 1, 3, false];
+        yield [0, 0, 3, false];
 
-        yield array(2, 0, 2, true);
-        yield array(1, 1, 2, false);
-        yield array(1, 0, 2, false);
-        yield array(0, 2, 2, false);
-        yield array(0, 1, 2, false);
-        yield array(0, 0, 2, false);
+        yield [2, 0, 2, true];
+        yield [1, 1, 2, false];
+        yield [1, 0, 2, false];
+        yield [0, 2, 2, false];
+        yield [0, 1, 2, false];
+        yield [0, 0, 2, false];
     }
 
     public function provideIndeterminate()
     {
         // success, failure, total, canBeMet
-        yield array(3, 0, 3, true);
-        yield array(2, 1, 3, false);
-        yield array(2, 0, 3, true);
-        yield array(1, 2, 3, false);
-        yield array(1, 1, 3, false);
-        yield array(1, 0, 3, true);
-        yield array(0, 3, 3, false);
-        yield array(0, 2, 3, false);
-        yield array(0, 1, 3, false);
-        yield array(0, 0, 3, true);
+        yield [3, 0, 3, true];
+        yield [2, 1, 3, false];
+        yield [2, 0, 3, true];
+        yield [1, 2, 3, false];
+        yield [1, 1, 3, false];
+        yield [1, 0, 3, true];
+        yield [0, 3, 3, false];
+        yield [0, 2, 3, false];
+        yield [0, 1, 3, false];
+        yield [0, 0, 3, true];
 
-        yield array(2, 0, 2, true);
-        yield array(1, 1, 2, false);
-        yield array(1, 0, 2, true);
-        yield array(0, 2, 2, false);
-        yield array(0, 1, 2, false);
-        yield array(0, 0, 2, true);
+        yield [2, 0, 2, true];
+        yield [1, 1, 2, false];
+        yield [1, 0, 2, true];
+        yield [0, 2, 2, false];
+        yield [0, 1, 2, false];
+        yield [0, 0, 2, true];
     }
 
     /**
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
index 83d81969cb01b..f2cf1ea9a7775 100644
--- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php
+++ b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -85,11 +85,11 @@ class OptionsResolver implements Options
      */
     private $locked = false;
 
-    private static $typeAliases = array(
+    private static $typeAliases = [
         'boolean' => 'bool',
         'integer' => 'int',
         'double' => 'float',
-    );
+    ];
 
     /**
      * Sets the default value of a given option.
@@ -154,7 +154,7 @@ public function setDefault($option, $value)
 
                 // Ignore previous lazy options if the closure has no second parameter
                 if (!isset($this->lazy[$option]) || !isset($params[1])) {
-                    $this->lazy[$option] = array();
+                    $this->lazy[$option] = [];
                 }
 
                 // Store closure for later evaluation
@@ -423,7 +423,7 @@ public function setAllowedValues($option, $allowedValues)
             throw new UndefinedOptionsException(sprintf('The option "%s" does not exist. Defined options are: "%s".', $option, implode('", "', array_keys($this->defined))));
         }
 
-        $this->allowedValues[$option] = \is_array($allowedValues) ? $allowedValues : array($allowedValues);
+        $this->allowedValues[$option] = \is_array($allowedValues) ? $allowedValues : [$allowedValues];
 
         // Make sure the option is processed
         unset($this->resolved[$option]);
@@ -465,7 +465,7 @@ public function addAllowedValues($option, $allowedValues)
         }
 
         if (!\is_array($allowedValues)) {
-            $allowedValues = array($allowedValues);
+            $allowedValues = [$allowedValues];
         }
 
         if (!isset($this->allowedValues[$option])) {
@@ -626,7 +626,7 @@ public function clear()
      * @throws NoSuchOptionException     If a lazy option reads an unavailable option
      * @throws AccessException           If called from a lazy option or normalizer
      */
-    public function resolve(array $options = array())
+    public function resolve(array $options = [])
     {
         if ($this->locked) {
             throw new AccessException('Options cannot be resolved from a lazy option or normalizer.');
@@ -735,7 +735,7 @@ public function offsetGet($option)
         // Validate the type of the resolved option
         if (isset($this->allowedTypes[$option])) {
             $valid = false;
-            $invalidTypes = array();
+            $invalidTypes = [];
 
             foreach ($this->allowedTypes[$option] as $type) {
                 $type = isset(self::$typeAliases[$type]) ? self::$typeAliases[$type] : $type;
@@ -759,7 +759,7 @@ public function offsetGet($option)
         // Validate the value of the resolved option
         if (isset($this->allowedValues[$option])) {
             $success = false;
-            $printableAllowedValues = array();
+            $printableAllowedValues = [];
 
             foreach ($this->allowedValues[$option] as $allowedValue) {
                 if ($allowedValue instanceof \Closure) {
diff --git a/src/Symfony/Component/OptionsResolver/Tests/Debug/OptionsResolverIntrospectorTest.php b/src/Symfony/Component/OptionsResolver/Tests/Debug/OptionsResolverIntrospectorTest.php
index 7c4753ab5f6b4..8dd7997ddf780 100644
--- a/src/Symfony/Component/OptionsResolver/Tests/Debug/OptionsResolverIntrospectorTest.php
+++ b/src/Symfony/Component/OptionsResolver/Tests/Debug/OptionsResolverIntrospectorTest.php
@@ -64,7 +64,7 @@ public function testGetDefaultThrowsOnNotDefinedOption()
     public function testGetLazyClosures()
     {
         $resolver = new OptionsResolver();
-        $closures = array();
+        $closures = [];
         $resolver->setDefault($option = 'foo', $closures[] = function (Options $options) {});
 
         $debug = new OptionsResolverIntrospector($resolver);
@@ -100,7 +100,7 @@ public function testGetAllowedTypes()
     {
         $resolver = new OptionsResolver();
         $resolver->setDefined($option = 'foo');
-        $resolver->setAllowedTypes($option = 'foo', $allowedTypes = array('string', 'bool'));
+        $resolver->setAllowedTypes($option = 'foo', $allowedTypes = ['string', 'bool']);
 
         $debug = new OptionsResolverIntrospector($resolver);
         $this->assertSame($allowedTypes, $debug->getAllowedTypes($option));
@@ -135,7 +135,7 @@ public function testGetAllowedValues()
     {
         $resolver = new OptionsResolver();
         $resolver->setDefined($option = 'foo');
-        $resolver->setAllowedValues($option = 'foo', $allowedValues = array('bar', 'baz'));
+        $resolver->setAllowedValues($option = 'foo', $allowedValues = ['bar', 'baz']);
 
         $debug = new OptionsResolverIntrospector($resolver);
         $this->assertSame($allowedValues, $debug->getAllowedValues($option));
diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
index 449a53f6eb5e5..abf0aa0155d23 100644
--- a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
+++ b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
@@ -38,7 +38,7 @@ public function testResolveFailsIfNonExistingOption()
         $this->resolver->setDefault('z', '1');
         $this->resolver->setDefault('a', '2');
 
-        $this->resolver->resolve(array('foo' => 'bar'));
+        $this->resolver->resolve(['foo' => 'bar']);
     }
 
     /**
@@ -50,7 +50,7 @@ public function testResolveFailsIfMultipleNonExistingOptions()
         $this->resolver->setDefault('z', '1');
         $this->resolver->setDefault('a', '2');
 
-        $this->resolver->resolve(array('ping' => 'pong', 'foo' => 'bar', 'baz' => 'bam'));
+        $this->resolver->resolve(['ping' => 'pong', 'foo' => 'bar', 'baz' => 'bam']);
     }
 
     /**
@@ -59,7 +59,7 @@ public function testResolveFailsIfMultipleNonExistingOptions()
     public function testResolveFailsFromLazyOption()
     {
         $this->resolver->setDefault('foo', function (Options $options) {
-            $options->resolve(array());
+            $options->resolve([]);
         });
 
         $this->resolver->resolve();
@@ -75,10 +75,10 @@ public function testSetDefault()
         $this->resolver->setDefault('one', '1');
         $this->resolver->setDefault('two', '20');
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'one' => '1',
             'two' => '20',
-        ), $this->resolver->resolve());
+        ], $this->resolver->resolve());
     }
 
     /**
@@ -118,7 +118,7 @@ public function testSetLazyClosure()
             return 'lazy';
         });
 
-        $this->assertEquals(array('foo' => 'lazy'), $this->resolver->resolve());
+        $this->assertEquals(['foo' => 'lazy'], $this->resolver->resolve());
     }
 
     public function testClosureWithoutTypeHintNotInvoked()
@@ -129,7 +129,7 @@ public function testClosureWithoutTypeHintNotInvoked()
 
         $this->resolver->setDefault('foo', $closure);
 
-        $this->assertSame(array('foo' => $closure), $this->resolver->resolve());
+        $this->assertSame(['foo' => $closure], $this->resolver->resolve());
     }
 
     public function testClosureWithoutParametersNotInvoked()
@@ -140,7 +140,7 @@ public function testClosureWithoutParametersNotInvoked()
 
         $this->resolver->setDefault('foo', $closure);
 
-        $this->assertSame(array('foo' => $closure), $this->resolver->resolve());
+        $this->assertSame(['foo' => $closure], $this->resolver->resolve());
     }
 
     public function testAccessPreviousDefaultValue()
@@ -155,7 +155,7 @@ public function testAccessPreviousDefaultValue()
             return 'lazy';
         });
 
-        $this->assertEquals(array('foo' => 'lazy'), $this->resolver->resolve());
+        $this->assertEquals(['foo' => 'lazy'], $this->resolver->resolve());
     }
 
     public function testAccessPreviousLazyDefaultValue()
@@ -172,7 +172,7 @@ public function testAccessPreviousLazyDefaultValue()
             return 'lazy';
         });
 
-        $this->assertEquals(array('foo' => 'lazy'), $this->resolver->resolve());
+        $this->assertEquals(['foo' => 'lazy'], $this->resolver->resolve());
     }
 
     public function testPreviousValueIsNotEvaluatedIfNoSecondArgument()
@@ -187,7 +187,7 @@ public function testPreviousValueIsNotEvaluatedIfNoSecondArgument()
             return 'lazy';
         });
 
-        $this->assertEquals(array('foo' => 'lazy'), $this->resolver->resolve());
+        $this->assertEquals(['foo' => 'lazy'], $this->resolver->resolve());
     }
 
     public function testOverwrittenLazyOptionNotEvaluated()
@@ -198,7 +198,7 @@ public function testOverwrittenLazyOptionNotEvaluated()
 
         $this->resolver->setDefault('foo', 'bar');
 
-        $this->assertSame(array('foo' => 'bar'), $this->resolver->resolve());
+        $this->assertSame(['foo' => 'bar'], $this->resolver->resolve());
     }
 
     public function testInvokeEachLazyOptionOnlyOnce()
@@ -259,7 +259,7 @@ public function testResolveSucceedsIfRequiredOptionPassed()
     {
         $this->resolver->setRequired('foo');
 
-        $this->assertNotEmpty($this->resolver->resolve(array('foo' => 'bar')));
+        $this->assertNotEmpty($this->resolver->resolve(['foo' => 'bar']));
     }
 
     public function testIsRequired()
@@ -307,11 +307,11 @@ public function testIsNotRequiredAfterClear()
 
     public function testGetRequiredOptions()
     {
-        $this->resolver->setRequired(array('foo', 'bar'));
+        $this->resolver->setRequired(['foo', 'bar']);
         $this->resolver->setDefault('bam', 'baz');
         $this->resolver->setDefault('foo', 'boo');
 
-        $this->assertSame(array('foo', 'bar'), $this->resolver->getRequiredOptions());
+        $this->assertSame(['foo', 'bar'], $this->resolver->getRequiredOptions());
     }
 
     public function testIsMissingIfNotSet()
@@ -346,11 +346,11 @@ public function testIsNotMissingAfterClear()
 
     public function testGetMissingOptions()
     {
-        $this->resolver->setRequired(array('foo', 'bar'));
+        $this->resolver->setRequired(['foo', 'bar']);
         $this->resolver->setDefault('bam', 'baz');
         $this->resolver->setDefault('foo', 'boo');
 
-        $this->assertSame(array('bar'), $this->resolver->getMissingOptions());
+        $this->assertSame(['bar'], $this->resolver->getMissingOptions());
     }
 
     /**
@@ -369,7 +369,7 @@ public function testDefinedOptionsNotIncludedInResolvedOptions()
     {
         $this->resolver->setDefined('foo');
 
-        $this->assertSame(array(), $this->resolver->resolve());
+        $this->assertSame([], $this->resolver->resolve());
     }
 
     public function testDefinedOptionsIncludedIfDefaultSetBefore()
@@ -377,7 +377,7 @@ public function testDefinedOptionsIncludedIfDefaultSetBefore()
         $this->resolver->setDefault('foo', 'bar');
         $this->resolver->setDefined('foo');
 
-        $this->assertSame(array('foo' => 'bar'), $this->resolver->resolve());
+        $this->assertSame(['foo' => 'bar'], $this->resolver->resolve());
     }
 
     public function testDefinedOptionsIncludedIfDefaultSetAfter()
@@ -385,14 +385,14 @@ public function testDefinedOptionsIncludedIfDefaultSetAfter()
         $this->resolver->setDefined('foo');
         $this->resolver->setDefault('foo', 'bar');
 
-        $this->assertSame(array('foo' => 'bar'), $this->resolver->resolve());
+        $this->assertSame(['foo' => 'bar'], $this->resolver->resolve());
     }
 
     public function testDefinedOptionsIncludedIfPassedToResolve()
     {
         $this->resolver->setDefined('foo');
 
-        $this->assertSame(array('foo' => 'bar'), $this->resolver->resolve(array('foo' => 'bar')));
+        $this->assertSame(['foo' => 'bar'], $this->resolver->resolve(['foo' => 'bar']));
     }
 
     public function testIsDefined()
@@ -425,11 +425,11 @@ public function testSetOptionsAreDefined()
 
     public function testGetDefinedOptions()
     {
-        $this->resolver->setDefined(array('foo', 'bar'));
+        $this->resolver->setDefined(['foo', 'bar']);
         $this->resolver->setDefault('baz', 'bam');
         $this->resolver->setRequired('boo');
 
-        $this->assertSame(array('foo', 'bar', 'baz', 'boo'), $this->resolver->getDefinedOptions());
+        $this->assertSame(['foo', 'bar', 'baz', 'boo'], $this->resolver->getDefinedOptions());
     }
 
     public function testRemovedOptionsAreNotDefined()
@@ -462,9 +462,9 @@ public function testResolveTypedArray()
     {
         $this->resolver->setDefined('foo');
         $this->resolver->setAllowedTypes('foo', 'string[]');
-        $options = $this->resolver->resolve(array('foo' => array('bar', 'baz')));
+        $options = $this->resolver->resolve(['foo' => ['bar', 'baz']]);
 
-        $this->assertSame(array('foo' => array('bar', 'baz')), $options);
+        $this->assertSame(['foo' => ['bar', 'baz']], $options);
     }
 
     /**
@@ -490,7 +490,7 @@ public function testResolveFailsIfInvalidTypedArray()
         $this->resolver->setDefined('foo');
         $this->resolver->setAllowedTypes('foo', 'int[]');
 
-        $this->resolver->resolve(array('foo' => array(new \DateTime())));
+        $this->resolver->resolve(['foo' => [new \DateTime()]]);
     }
 
     /**
@@ -502,7 +502,7 @@ public function testResolveFailsWithNonArray()
         $this->resolver->setDefined('foo');
         $this->resolver->setAllowedTypes('foo', 'int[]');
 
-        $this->resolver->resolve(array('foo' => 'bar'));
+        $this->resolver->resolve(['foo' => 'bar']);
     }
 
     /**
@@ -515,11 +515,11 @@ public function testResolveFailsIfTypedArrayContainsInvalidTypes()
         $this->resolver->setAllowedTypes('foo', 'int[]');
         $values = range(1, 5);
         $values[] = new \stdClass();
-        $values[] = array();
+        $values[] = [];
         $values[] = new \DateTime();
         $values[] = 123;
 
-        $this->resolver->resolve(array('foo' => $values));
+        $this->resolver->resolve(['foo' => $values]);
     }
 
     /**
@@ -532,11 +532,11 @@ public function testResolveFailsWithCorrectLevelsButWrongScalar()
         $this->resolver->setAllowedTypes('foo', 'int[][]');
 
         $this->resolver->resolve(
-            array(
-                'foo' => array(
-                    array(1.2),
-                ),
-            )
+            [
+                'foo' => [
+                    [1.2],
+                ],
+            ]
         );
     }
 
@@ -555,21 +555,21 @@ public function testResolveFailsIfInvalidType($actualType, $allowedType, $except
             $this->setExpectedException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException', $exceptionMessage);
         }
 
-        $this->resolver->resolve(array('option' => $actualType));
+        $this->resolver->resolve(['option' => $actualType]);
     }
 
     public function provideInvalidTypes()
     {
-        return array(
-            array(true, 'string', 'The option "option" with value true is expected to be of type "string", but is of type "boolean".'),
-            array(false, 'string', 'The option "option" with value false is expected to be of type "string", but is of type "boolean".'),
-            array(fopen(__FILE__, 'r'), 'string', 'The option "option" with value resource is expected to be of type "string", but is of type "resource".'),
-            array(array(), 'string', 'The option "option" with value array is expected to be of type "string", but is of type "array".'),
-            array(new OptionsResolver(), 'string', 'The option "option" with value Symfony\Component\OptionsResolver\OptionsResolver is expected to be of type "string", but is of type "Symfony\Component\OptionsResolver\OptionsResolver".'),
-            array(42, 'string', 'The option "option" with value 42 is expected to be of type "string", but is of type "integer".'),
-            array(null, 'string', 'The option "option" with value null is expected to be of type "string", but is of type "NULL".'),
-            array('bar', '\stdClass', 'The option "option" with value "bar" is expected to be of type "\stdClass", but is of type "string".'),
-        );
+        return [
+            [true, 'string', 'The option "option" with value true is expected to be of type "string", but is of type "boolean".'],
+            [false, 'string', 'The option "option" with value false is expected to be of type "string", but is of type "boolean".'],
+            [fopen(__FILE__, 'r'), 'string', 'The option "option" with value resource is expected to be of type "string", but is of type "resource".'],
+            [[], 'string', 'The option "option" with value array is expected to be of type "string", but is of type "array".'],
+            [new OptionsResolver(), 'string', 'The option "option" with value Symfony\Component\OptionsResolver\OptionsResolver is expected to be of type "string", but is of type "Symfony\Component\OptionsResolver\OptionsResolver".'],
+            [42, 'string', 'The option "option" with value 42 is expected to be of type "string", but is of type "integer".'],
+            [null, 'string', 'The option "option" with value null is expected to be of type "string", but is of type "NULL".'],
+            ['bar', '\stdClass', 'The option "option" with value "bar" is expected to be of type "\stdClass", but is of type "string".'],
+        ];
     }
 
     public function testResolveSucceedsIfValidType()
@@ -587,7 +587,7 @@ public function testResolveSucceedsIfValidType()
     public function testResolveFailsIfInvalidTypeMultiple()
     {
         $this->resolver->setDefault('foo', 42);
-        $this->resolver->setAllowedTypes('foo', array('string', 'bool'));
+        $this->resolver->setAllowedTypes('foo', ['string', 'bool']);
 
         $this->resolver->resolve();
     }
@@ -595,7 +595,7 @@ public function testResolveFailsIfInvalidTypeMultiple()
     public function testResolveSucceedsIfValidTypeMultiple()
     {
         $this->resolver->setDefault('foo', true);
-        $this->resolver->setAllowedTypes('foo', array('string', 'bool'));
+        $this->resolver->setAllowedTypes('foo', ['string', 'bool']);
 
         $this->assertNotEmpty($this->resolver->resolve());
     }
@@ -611,14 +611,14 @@ public function testResolveSucceedsIfInstanceOfClass()
     public function testResolveSucceedsIfTypedArray()
     {
         $this->resolver->setDefault('foo', null);
-        $this->resolver->setAllowedTypes('foo', array('null', 'DateTime[]'));
+        $this->resolver->setAllowedTypes('foo', ['null', 'DateTime[]']);
 
-        $data = array(
-            'foo' => array(
+        $data = [
+            'foo' => [
                 new \DateTime(),
                 new \DateTime(),
-            ),
-        );
+            ],
+        ];
         $result = $this->resolver->resolve($data);
         $this->assertEquals($data, $result);
     }
@@ -681,7 +681,7 @@ public function testResolveSucceedsIfValidAddedType()
     public function testResolveFailsIfInvalidAddedTypeMultiple()
     {
         $this->resolver->setDefault('foo', 42);
-        $this->resolver->addAllowedTypes('foo', array('string', 'bool'));
+        $this->resolver->addAllowedTypes('foo', ['string', 'bool']);
 
         $this->resolver->resolve();
     }
@@ -689,7 +689,7 @@ public function testResolveFailsIfInvalidAddedTypeMultiple()
     public function testResolveSucceedsIfValidAddedTypeMultiple()
     {
         $this->resolver->setDefault('foo', 'bar');
-        $this->resolver->addAllowedTypes('foo', array('string', 'bool'));
+        $this->resolver->addAllowedTypes('foo', ['string', 'bool']);
 
         $this->assertNotEmpty($this->resolver->resolve());
     }
@@ -747,7 +747,7 @@ public function testResolveFailsIfInvalidValue()
         $this->resolver->setDefined('foo');
         $this->resolver->setAllowedValues('foo', 'bar');
 
-        $this->resolver->resolve(array('foo' => 42));
+        $this->resolver->resolve(['foo' => 42]);
     }
 
     /**
@@ -778,7 +778,7 @@ public function testResolveSucceedsIfValidValue()
         $this->resolver->setDefault('foo', 'bar');
         $this->resolver->setAllowedValues('foo', 'bar');
 
-        $this->assertEquals(array('foo' => 'bar'), $this->resolver->resolve());
+        $this->assertEquals(['foo' => 'bar'], $this->resolver->resolve());
     }
 
     public function testResolveSucceedsIfValidValueIsNull()
@@ -786,7 +786,7 @@ public function testResolveSucceedsIfValidValueIsNull()
         $this->resolver->setDefault('foo', null);
         $this->resolver->setAllowedValues('foo', null);
 
-        $this->assertEquals(array('foo' => null), $this->resolver->resolve());
+        $this->assertEquals(['foo' => null], $this->resolver->resolve());
     }
 
     /**
@@ -796,7 +796,7 @@ public function testResolveSucceedsIfValidValueIsNull()
     public function testResolveFailsIfInvalidValueMultiple()
     {
         $this->resolver->setDefault('foo', 42);
-        $this->resolver->setAllowedValues('foo', array('bar', false, null));
+        $this->resolver->setAllowedValues('foo', ['bar', false, null]);
 
         $this->resolver->resolve();
     }
@@ -804,9 +804,9 @@ public function testResolveFailsIfInvalidValueMultiple()
     public function testResolveSucceedsIfValidValueMultiple()
     {
         $this->resolver->setDefault('foo', 'baz');
-        $this->resolver->setAllowedValues('foo', array('bar', 'baz'));
+        $this->resolver->setAllowedValues('foo', ['bar', 'baz']);
 
-        $this->assertEquals(array('foo' => 'baz'), $this->resolver->resolve());
+        $this->assertEquals(['foo' => 'baz'], $this->resolver->resolve());
     }
 
     public function testResolveFailsIfClosureReturnsFalse()
@@ -836,7 +836,7 @@ public function testResolveSucceedsIfClosureReturnsTrue()
             return true;
         });
 
-        $this->assertEquals(array('foo' => 'bar'), $this->resolver->resolve());
+        $this->assertEquals(['foo' => 'bar'], $this->resolver->resolve());
         $this->assertSame('bar', $passedValue);
     }
 
@@ -846,11 +846,11 @@ public function testResolveSucceedsIfClosureReturnsTrue()
     public function testResolveFailsIfAllClosuresReturnFalse()
     {
         $this->resolver->setDefault('foo', 42);
-        $this->resolver->setAllowedValues('foo', array(
+        $this->resolver->setAllowedValues('foo', [
             function () { return false; },
             function () { return false; },
             function () { return false; },
-        ));
+        ]);
 
         $this->resolver->resolve();
     }
@@ -858,13 +858,13 @@ function () { return false; },
     public function testResolveSucceedsIfAnyClosureReturnsTrue()
     {
         $this->resolver->setDefault('foo', 'bar');
-        $this->resolver->setAllowedValues('foo', array(
+        $this->resolver->setAllowedValues('foo', [
             function () { return false; },
             function () { return true; },
             function () { return false; },
-        ));
+        ]);
 
-        $this->assertEquals(array('foo' => 'bar'), $this->resolver->resolve());
+        $this->assertEquals(['foo' => 'bar'], $this->resolver->resolve());
     }
 
     /**
@@ -905,7 +905,7 @@ public function testResolveSucceedsIfValidAddedValue()
         $this->resolver->setDefault('foo', 'bar');
         $this->resolver->addAllowedValues('foo', 'bar');
 
-        $this->assertEquals(array('foo' => 'bar'), $this->resolver->resolve());
+        $this->assertEquals(['foo' => 'bar'], $this->resolver->resolve());
     }
 
     public function testResolveSucceedsIfValidAddedValueIsNull()
@@ -913,7 +913,7 @@ public function testResolveSucceedsIfValidAddedValueIsNull()
         $this->resolver->setDefault('foo', null);
         $this->resolver->addAllowedValues('foo', null);
 
-        $this->assertEquals(array('foo' => null), $this->resolver->resolve());
+        $this->assertEquals(['foo' => null], $this->resolver->resolve());
     }
 
     /**
@@ -922,7 +922,7 @@ public function testResolveSucceedsIfValidAddedValueIsNull()
     public function testResolveFailsIfInvalidAddedValueMultiple()
     {
         $this->resolver->setDefault('foo', 42);
-        $this->resolver->addAllowedValues('foo', array('bar', 'baz'));
+        $this->resolver->addAllowedValues('foo', ['bar', 'baz']);
 
         $this->resolver->resolve();
     }
@@ -930,9 +930,9 @@ public function testResolveFailsIfInvalidAddedValueMultiple()
     public function testResolveSucceedsIfValidAddedValueMultiple()
     {
         $this->resolver->setDefault('foo', 'bar');
-        $this->resolver->addAllowedValues('foo', array('bar', 'baz'));
+        $this->resolver->addAllowedValues('foo', ['bar', 'baz']);
 
-        $this->assertEquals(array('foo' => 'bar'), $this->resolver->resolve());
+        $this->assertEquals(['foo' => 'bar'], $this->resolver->resolve());
     }
 
     public function testAddAllowedValuesDoesNotOverwrite()
@@ -941,7 +941,7 @@ public function testAddAllowedValuesDoesNotOverwrite()
         $this->resolver->setAllowedValues('foo', 'bar');
         $this->resolver->addAllowedValues('foo', 'baz');
 
-        $this->assertEquals(array('foo' => 'bar'), $this->resolver->resolve());
+        $this->assertEquals(['foo' => 'bar'], $this->resolver->resolve());
     }
 
     public function testAddAllowedValuesDoesNotOverwrite2()
@@ -950,7 +950,7 @@ public function testAddAllowedValuesDoesNotOverwrite2()
         $this->resolver->setAllowedValues('foo', 'bar');
         $this->resolver->addAllowedValues('foo', 'baz');
 
-        $this->assertEquals(array('foo' => 'baz'), $this->resolver->resolve());
+        $this->assertEquals(['foo' => 'baz'], $this->resolver->resolve());
     }
 
     /**
@@ -971,7 +971,7 @@ public function testResolveSucceedsIfAnyAddedClosureReturnsTrue()
         $this->resolver->setAllowedValues('foo', function () { return false; });
         $this->resolver->addAllowedValues('foo', function () { return true; });
 
-        $this->assertEquals(array('foo' => 'bar'), $this->resolver->resolve());
+        $this->assertEquals(['foo' => 'bar'], $this->resolver->resolve());
     }
 
     public function testResolveSucceedsIfAnyAddedClosureReturnsTrue2()
@@ -980,7 +980,7 @@ public function testResolveSucceedsIfAnyAddedClosureReturnsTrue2()
         $this->resolver->setAllowedValues('foo', function () { return true; });
         $this->resolver->addAllowedValues('foo', function () { return false; });
 
-        $this->assertEquals(array('foo' => 'bar'), $this->resolver->resolve());
+        $this->assertEquals(['foo' => 'bar'], $this->resolver->resolve());
     }
 
     public function testSetNormalizerReturnsThis()
@@ -996,7 +996,7 @@ public function testSetNormalizerClosure()
             return 'normalized';
         });
 
-        $this->assertEquals(array('foo' => 'normalized'), $this->resolver->resolve());
+        $this->assertEquals(['foo' => 'normalized'], $this->resolver->resolve());
     }
 
     /**
@@ -1029,7 +1029,7 @@ public function testNormalizerReceivesSetOption()
             return 'normalized['.$value.']';
         });
 
-        $this->assertEquals(array('foo' => 'normalized[bar]'), $this->resolver->resolve());
+        $this->assertEquals(['foo' => 'normalized[bar]'], $this->resolver->resolve());
     }
 
     public function testNormalizerReceivesPassedOption()
@@ -1040,9 +1040,9 @@ public function testNormalizerReceivesPassedOption()
             return 'normalized['.$value.']';
         });
 
-        $resolved = $this->resolver->resolve(array('foo' => 'baz'));
+        $resolved = $this->resolver->resolve(['foo' => 'baz']);
 
-        $this->assertEquals(array('foo' => 'normalized[baz]'), $resolved);
+        $this->assertEquals(['foo' => 'normalized[baz]'], $resolved);
     }
 
     /**
@@ -1089,10 +1089,10 @@ public function testNormalizerCanAccessOtherOptions()
             return 'normalized';
         });
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'default' => 'bar',
             'norm' => 'normalized',
-        ), $this->resolver->resolve());
+        ], $this->resolver->resolve());
     }
 
     public function testNormalizerCanAccessLazyOptions()
@@ -1109,10 +1109,10 @@ public function testNormalizerCanAccessLazyOptions()
             return 'normalized';
         });
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'lazy' => 'bar',
             'norm' => 'normalized',
-        ), $this->resolver->resolve());
+        ], $this->resolver->resolve());
     }
 
     /**
@@ -1156,7 +1156,7 @@ public function testCaughtExceptionFromNormalizerDoesNotCrashOptionResolver()
     {
         $throw = true;
 
-        $this->resolver->setDefaults(array('catcher' => null, 'thrower' => null));
+        $this->resolver->setDefaults(['catcher' => null, 'thrower' => null]);
 
         $this->resolver->setNormalizer('catcher', function (Options $options) {
             try {
@@ -1175,7 +1175,7 @@ public function testCaughtExceptionFromNormalizerDoesNotCrashOptionResolver()
             return true;
         });
 
-        $this->assertSame(array('catcher' => false, 'thrower' => true), $this->resolver->resolve());
+        $this->assertSame(['catcher' => false, 'thrower' => true], $this->resolver->resolve());
     }
 
     public function testCaughtExceptionFromLazyDoesNotCrashOptionResolver()
@@ -1199,7 +1199,7 @@ public function testCaughtExceptionFromLazyDoesNotCrashOptionResolver()
             return true;
         });
 
-        $this->assertSame(array('catcher' => false, 'thrower' => true), $this->resolver->resolve());
+        $this->assertSame(['catcher' => false, 'thrower' => true], $this->resolver->resolve());
     }
 
     public function testInvokeEachNormalizerOnlyOnce()
@@ -1236,7 +1236,7 @@ public function testNormalizerNotCalledForUnsetOptions()
 
     public function testSetDefaultsReturnsThis()
     {
-        $this->assertSame($this->resolver, $this->resolver->setDefaults(array('foo', 'bar')));
+        $this->assertSame($this->resolver, $this->resolver->setDefaults(['foo', 'bar']));
     }
 
     public function testSetDefaults()
@@ -1244,16 +1244,16 @@ public function testSetDefaults()
         $this->resolver->setDefault('one', '1');
         $this->resolver->setDefault('two', 'bar');
 
-        $this->resolver->setDefaults(array(
+        $this->resolver->setDefaults([
             'two' => '2',
             'three' => '3',
-        ));
+        ]);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'one' => '1',
             'two' => '2',
             'three' => '3',
-        ), $this->resolver->resolve());
+        ], $this->resolver->resolve());
     }
 
     /**
@@ -1262,7 +1262,7 @@ public function testSetDefaults()
     public function testFailIfSetDefaultsFromLazyOption()
     {
         $this->resolver->setDefault('foo', function (Options $options) {
-            $options->setDefaults(array('two' => '2'));
+            $options->setDefaults(['two' => '2']);
         });
 
         $this->resolver->resolve();
@@ -1281,7 +1281,7 @@ public function testRemoveSingleOption()
         $this->resolver->setDefault('baz', 'boo');
         $this->resolver->remove('foo');
 
-        $this->assertSame(array('baz' => 'boo'), $this->resolver->resolve());
+        $this->assertSame(['baz' => 'boo'], $this->resolver->resolve());
     }
 
     public function testRemoveMultipleOptions()
@@ -1290,9 +1290,9 @@ public function testRemoveMultipleOptions()
         $this->resolver->setDefault('baz', 'boo');
         $this->resolver->setDefault('doo', 'dam');
 
-        $this->resolver->remove(array('foo', 'doo'));
+        $this->resolver->remove(['foo', 'doo']);
 
-        $this->assertSame(array('baz' => 'boo'), $this->resolver->resolve());
+        $this->assertSame(['baz' => 'boo'], $this->resolver->resolve());
     }
 
     public function testRemoveLazyOption()
@@ -1302,7 +1302,7 @@ public function testRemoveLazyOption()
         });
         $this->resolver->remove('foo');
 
-        $this->assertSame(array(), $this->resolver->resolve());
+        $this->assertSame([], $this->resolver->resolve());
     }
 
     public function testRemoveNormalizer()
@@ -1314,7 +1314,7 @@ public function testRemoveNormalizer()
         $this->resolver->remove('foo');
         $this->resolver->setDefault('foo', 'bar');
 
-        $this->assertSame(array('foo' => 'bar'), $this->resolver->resolve());
+        $this->assertSame(['foo' => 'bar'], $this->resolver->resolve());
     }
 
     public function testRemoveAllowedTypes()
@@ -1324,17 +1324,17 @@ public function testRemoveAllowedTypes()
         $this->resolver->remove('foo');
         $this->resolver->setDefault('foo', 'bar');
 
-        $this->assertSame(array('foo' => 'bar'), $this->resolver->resolve());
+        $this->assertSame(['foo' => 'bar'], $this->resolver->resolve());
     }
 
     public function testRemoveAllowedValues()
     {
         $this->resolver->setDefault('foo', 'bar');
-        $this->resolver->setAllowedValues('foo', array('baz', 'boo'));
+        $this->resolver->setAllowedValues('foo', ['baz', 'boo']);
         $this->resolver->remove('foo');
         $this->resolver->setDefault('foo', 'bar');
 
-        $this->assertSame(array('foo' => 'bar'), $this->resolver->resolve());
+        $this->assertSame(['foo' => 'bar'], $this->resolver->resolve());
     }
 
     /**
@@ -1378,7 +1378,7 @@ public function testClearLazyOption()
         });
         $this->resolver->clear();
 
-        $this->assertSame(array(), $this->resolver->resolve());
+        $this->assertSame([], $this->resolver->resolve());
     }
 
     public function testClearNormalizer()
@@ -1390,7 +1390,7 @@ public function testClearNormalizer()
         $this->resolver->clear();
         $this->resolver->setDefault('foo', 'bar');
 
-        $this->assertSame(array('foo' => 'bar'), $this->resolver->resolve());
+        $this->assertSame(['foo' => 'bar'], $this->resolver->resolve());
     }
 
     public function testClearAllowedTypes()
@@ -1400,7 +1400,7 @@ public function testClearAllowedTypes()
         $this->resolver->clear();
         $this->resolver->setDefault('foo', 'bar');
 
-        $this->assertSame(array('foo' => 'bar'), $this->resolver->resolve());
+        $this->assertSame(['foo' => 'bar'], $this->resolver->resolve());
     }
 
     public function testClearAllowedValues()
@@ -1410,7 +1410,7 @@ public function testClearAllowedValues()
         $this->resolver->clear();
         $this->resolver->setDefault('foo', 'bar');
 
-        $this->assertSame(array('foo' => 'bar'), $this->resolver->resolve());
+        $this->assertSame(['foo' => 'bar'], $this->resolver->resolve());
     }
 
     /**
@@ -1469,7 +1469,7 @@ public function testArrayAccess()
             // accessed
         });
 
-        $this->resolver->resolve(array('default2' => 42, 'required' => 'value'));
+        $this->resolver->resolve(['default2' => 42, 'required' => 'value']);
     }
 
     /**
@@ -1567,7 +1567,7 @@ public function testCount()
             Assert::assertCount(4, $options);
         });
 
-        $this->assertCount(4, $this->resolver->resolve(array('required' => 'value')));
+        $this->assertCount(4, $this->resolver->resolve(['required' => 'value']));
     }
 
     /**
@@ -1592,18 +1592,18 @@ public function testNestedArrays()
         $this->resolver->setDefined('foo');
         $this->resolver->setAllowedTypes('foo', 'int[][]');
 
-        $this->assertEquals(array(
-            'foo' => array(
-                array(
+        $this->assertEquals([
+            'foo' => [
+                [
                     1, 2,
-                ),
-            ),
-        ), $this->resolver->resolve(
-            array(
-                'foo' => array(
-                    array(1, 2),
-                ),
-            )
+                ],
+            ],
+        ], $this->resolver->resolve(
+            [
+                'foo' => [
+                    [1, 2],
+                ],
+            ]
         ));
     }
 
@@ -1612,26 +1612,26 @@ public function testNested2Arrays()
         $this->resolver->setDefined('foo');
         $this->resolver->setAllowedTypes('foo', 'int[][][][]');
 
-        $this->assertEquals(array(
-            'foo' => array(
-                array(
-                    array(
-                        array(
+        $this->assertEquals([
+            'foo' => [
+                [
+                    [
+                        [
                             1, 2,
-                        ),
-                    ),
-                ),
-            ),
-        ), $this->resolver->resolve(
-            array(
-                'foo' => array(
-                    array(
-                        array(
-                            array(1, 2),
-                        ),
-                    ),
-                ),
-            )
+                        ],
+                    ],
+                ],
+            ],
+        ], $this->resolver->resolve(
+            [
+                'foo' => [
+                    [
+                        [
+                            [1, 2],
+                        ],
+                    ],
+                ],
+            ]
         ));
     }
 
@@ -1645,15 +1645,15 @@ public function testNestedArraysException()
         $this->resolver->setAllowedTypes('foo', 'float[][][][]');
 
         $this->resolver->resolve(
-            array(
-                'foo' => array(
-                    array(
-                        array(
-                            array(1, 2),
-                        ),
-                    ),
-                ),
-            )
+            [
+                'foo' => [
+                    [
+                        [
+                            [1, 2],
+                        ],
+                    ],
+                ],
+            ]
         );
     }
 
@@ -1665,11 +1665,11 @@ public function testNestedArrayException1()
     {
         $this->resolver->setDefined('foo');
         $this->resolver->setAllowedTypes('foo', 'int[][]');
-        $this->resolver->resolve(array(
-            'foo' => array(
-                array(1, true, 'str', array(2, 3)),
-            ),
-        ));
+        $this->resolver->resolve([
+            'foo' => [
+                [1, true, 'str', [2, 3]],
+            ],
+        ]);
     }
 
     /**
@@ -1680,11 +1680,11 @@ public function testNestedArrayException2()
     {
         $this->resolver->setDefined('foo');
         $this->resolver->setAllowedTypes('foo', 'int[][]');
-        $this->resolver->resolve(array(
-            'foo' => array(
-                array(true, 'str', array(2, 3)),
-            ),
-        ));
+        $this->resolver->resolve([
+            'foo' => [
+                [true, 'str', [2, 3]],
+            ],
+        ]);
     }
 
     /**
@@ -1695,11 +1695,11 @@ public function testNestedArrayException3()
     {
         $this->resolver->setDefined('foo');
         $this->resolver->setAllowedTypes('foo', 'string[][][]');
-        $this->resolver->resolve(array(
-            'foo' => array(
-                array('str', array(1, 2)),
-            ),
-        ));
+        $this->resolver->resolve([
+            'foo' => [
+                ['str', [1, 2]],
+            ],
+        ]);
     }
 
     /**
@@ -1710,12 +1710,12 @@ public function testNestedArrayException4()
     {
         $this->resolver->setDefined('foo');
         $this->resolver->setAllowedTypes('foo', 'string[][][]');
-        $this->resolver->resolve(array(
-            'foo' => array(
-                array(
-                    array('str'), array(1, 2), ),
-            ),
-        ));
+        $this->resolver->resolve([
+            'foo' => [
+                [
+                    ['str'], [1, 2], ],
+            ],
+        ]);
     }
 
     /**
@@ -1726,11 +1726,11 @@ public function testNestedArrayException5()
     {
         $this->resolver->setDefined('foo');
         $this->resolver->setAllowedTypes('foo', 'string[]');
-        $this->resolver->resolve(array(
-            'foo' => array(
-                array(
-                    array('str'), array(1, 2), ),
-            ),
-        ));
+        $this->resolver->resolve([
+            'foo' => [
+                [
+                    ['str'], [1, 2], ],
+            ],
+        ]);
     }
 }
diff --git a/src/Symfony/Component/Process/ExecutableFinder.php b/src/Symfony/Component/Process/ExecutableFinder.php
index ccfa4c09b09ae..614eacca68f9b 100644
--- a/src/Symfony/Component/Process/ExecutableFinder.php
+++ b/src/Symfony/Component/Process/ExecutableFinder.php
@@ -19,7 +19,7 @@
  */
 class ExecutableFinder
 {
-    private $suffixes = array('.exe', '.bat', '.cmd', '.com');
+    private $suffixes = ['.exe', '.bat', '.cmd', '.com'];
 
     /**
      * Replaces default suffixes of executable.
@@ -48,11 +48,11 @@ public function addSuffix($suffix)
      *
      * @return string The executable path or default value
      */
-    public function find($name, $default = null, array $extraDirs = array())
+    public function find($name, $default = null, array $extraDirs = [])
     {
         if (ini_get('open_basedir')) {
             $searchPath = explode(PATH_SEPARATOR, ini_get('open_basedir'));
-            $dirs = array();
+            $dirs = [];
             foreach ($searchPath as $path) {
                 // Silencing against https://bugs.php.net/69240
                 if (@is_dir($path)) {
@@ -70,7 +70,7 @@ public function find($name, $default = null, array $extraDirs = array())
             );
         }
 
-        $suffixes = array('');
+        $suffixes = [''];
         if ('\\' === \DIRECTORY_SEPARATOR) {
             $pathExt = getenv('PATHEXT');
             $suffixes = array_merge($pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes, $suffixes);
diff --git a/src/Symfony/Component/Process/InputStream.php b/src/Symfony/Component/Process/InputStream.php
index 0214014eb7f32..757d6294554e5 100644
--- a/src/Symfony/Component/Process/InputStream.php
+++ b/src/Symfony/Component/Process/InputStream.php
@@ -22,7 +22,7 @@ class InputStream implements \IteratorAggregate
 {
     /** @var callable|null */
     private $onEmpty = null;
-    private $input = array();
+    private $input = [];
     private $open = true;
 
     /**
diff --git a/src/Symfony/Component/Process/PhpExecutableFinder.php b/src/Symfony/Component/Process/PhpExecutableFinder.php
index 334de13fc0600..7f60cee1c8f12 100644
--- a/src/Symfony/Component/Process/PhpExecutableFinder.php
+++ b/src/Symfony/Component/Process/PhpExecutableFinder.php
@@ -44,7 +44,7 @@ public function find($includeArgs = true)
         }
 
         // PHP_BINARY return the current sapi executable
-        if (PHP_BINARY && \in_array(\PHP_SAPI, array('cli', 'cli-server', 'phpdbg'), true)) {
+        if (PHP_BINARY && \in_array(\PHP_SAPI, ['cli', 'cli-server', 'phpdbg'], true)) {
             return PHP_BINARY.$args;
         }
 
@@ -66,7 +66,7 @@ public function find($includeArgs = true)
             return $php;
         }
 
-        $dirs = array(PHP_BINDIR);
+        $dirs = [PHP_BINDIR];
         if ('\\' === \DIRECTORY_SEPARATOR) {
             $dirs[] = 'C:\xampp\php\\';
         }
diff --git a/src/Symfony/Component/Process/PhpProcess.php b/src/Symfony/Component/Process/PhpProcess.php
index 5b84783067af9..e1d749633e5a1 100644
--- a/src/Symfony/Component/Process/PhpProcess.php
+++ b/src/Symfony/Component/Process/PhpProcess.php
@@ -37,7 +37,7 @@ public function __construct($script, $cwd = null, array $env = null, $timeout =
         if (false === $php = $executableFinder->find(false)) {
             $php = null;
         } else {
-            $php = array_merge(array($php), $executableFinder->findArguments());
+            $php = array_merge([$php], $executableFinder->findArguments());
         }
         if ('phpdbg' === \PHP_SAPI) {
             $file = tempnam(sys_get_temp_dir(), 'dbg');
diff --git a/src/Symfony/Component/Process/Pipes/AbstractPipes.php b/src/Symfony/Component/Process/Pipes/AbstractPipes.php
index e5e26866afd93..23886b616387f 100644
--- a/src/Symfony/Component/Process/Pipes/AbstractPipes.php
+++ b/src/Symfony/Component/Process/Pipes/AbstractPipes.php
@@ -20,7 +20,7 @@
  */
 abstract class AbstractPipes implements PipesInterface
 {
-    public $pipes = array();
+    public $pipes = [];
 
     private $inputBuffer = '';
     private $input;
@@ -49,7 +49,7 @@ public function close()
         foreach ($this->pipes as $pipe) {
             fclose($pipe);
         }
-        $this->pipes = array();
+        $this->pipes = [];
     }
 
     /**
@@ -117,8 +117,8 @@ protected function write()
             }
         }
 
-        $r = $e = array();
-        $w = array($this->pipes[0]);
+        $r = $e = [];
+        $w = [$this->pipes[0]];
 
         // let's have a look if something changed in streams
         if (false === @stream_select($r, $w, $e, 0, 0)) {
@@ -130,7 +130,7 @@ protected function write()
                 $written = fwrite($stdin, $this->inputBuffer);
                 $this->inputBuffer = substr($this->inputBuffer, $written);
                 if (isset($this->inputBuffer[0])) {
-                    return array($this->pipes[0]);
+                    return [$this->pipes[0]];
                 }
             }
 
@@ -145,7 +145,7 @@ protected function write()
                     if (isset($data[0])) {
                         $this->inputBuffer = $data;
 
-                        return array($this->pipes[0]);
+                        return [$this->pipes[0]];
                     }
                 }
                 if (feof($input)) {
@@ -164,7 +164,7 @@ protected function write()
             fclose($this->pipes[0]);
             unset($this->pipes[0]);
         } elseif (!$w) {
-            return array($this->pipes[0]);
+            return [$this->pipes[0]];
         }
     }
 
diff --git a/src/Symfony/Component/Process/Pipes/UnixPipes.php b/src/Symfony/Component/Process/Pipes/UnixPipes.php
index 254df51902cb7..1ebf2138a56fa 100644
--- a/src/Symfony/Component/Process/Pipes/UnixPipes.php
+++ b/src/Symfony/Component/Process/Pipes/UnixPipes.php
@@ -48,34 +48,34 @@ public function getDescriptors()
         if (!$this->haveReadSupport) {
             $nullstream = fopen('/dev/null', 'c');
 
-            return array(
-                array('pipe', 'r'),
+            return [
+                ['pipe', 'r'],
                 $nullstream,
                 $nullstream,
-            );
+            ];
         }
 
         if ($this->ttyMode) {
-            return array(
-                array('file', '/dev/tty', 'r'),
-                array('file', '/dev/tty', 'w'),
-                array('file', '/dev/tty', 'w'),
-            );
+            return [
+                ['file', '/dev/tty', 'r'],
+                ['file', '/dev/tty', 'w'],
+                ['file', '/dev/tty', 'w'],
+            ];
         }
 
         if ($this->ptyMode && Process::isPtySupported()) {
-            return array(
-                array('pty'),
-                array('pty'),
-                array('pty'),
-            );
+            return [
+                ['pty'],
+                ['pty'],
+                ['pty'],
+            ];
         }
 
-        return array(
-            array('pipe', 'r'),
-            array('pipe', 'w'), // stdout
-            array('pipe', 'w'), // stderr
-        );
+        return [
+            ['pipe', 'r'],
+            ['pipe', 'w'], // stdout
+            ['pipe', 'w'], // stderr
+        ];
     }
 
     /**
@@ -83,7 +83,7 @@ public function getDescriptors()
      */
     public function getFiles()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -94,18 +94,18 @@ public function readAndWrite($blocking, $close = false)
         $this->unblock();
         $w = $this->write();
 
-        $read = $e = array();
+        $read = $e = [];
         $r = $this->pipes;
         unset($r[0]);
 
         // let's have a look if something changed in streams
-        set_error_handler(array($this, 'handleError'));
+        set_error_handler([$this, 'handleError']);
         if (($r || $w) && false === stream_select($r, $w, $e, 0, $blocking ? Process::TIMEOUT_PRECISION * 1E6 : 0)) {
             restore_error_handler();
             // if a system call has been interrupted, forget about it, let's try again
             // otherwise, an error occurred, let's reset pipes
             if (!$this->hasSystemCallBeenInterrupted()) {
-                $this->pipes = array();
+                $this->pipes = [];
             }
 
             return $read;
diff --git a/src/Symfony/Component/Process/Pipes/WindowsPipes.php b/src/Symfony/Component/Process/Pipes/WindowsPipes.php
index f577c08cc4403..1619e632f134a 100644
--- a/src/Symfony/Component/Process/Pipes/WindowsPipes.php
+++ b/src/Symfony/Component/Process/Pipes/WindowsPipes.php
@@ -26,13 +26,13 @@
  */
 class WindowsPipes extends AbstractPipes
 {
-    private $files = array();
-    private $fileHandles = array();
-    private $lockHandles = array();
-    private $readBytes = array(
+    private $files = [];
+    private $fileHandles = [];
+    private $lockHandles = [];
+    private $readBytes = [
         Process::STDOUT => 0,
         Process::STDERR => 0,
-    );
+    ];
     private $haveReadSupport;
 
     public function __construct($input, $haveReadSupport)
@@ -44,10 +44,10 @@ public function __construct($input, $haveReadSupport)
             // Workaround for this problem is to use temporary files instead of pipes on Windows platform.
             //
             // @see https://bugs.php.net/bug.php?id=51800
-            $pipes = array(
+            $pipes = [
                 Process::STDOUT => Process::OUT,
                 Process::STDERR => Process::ERR,
-            );
+            ];
             $tmpDir = sys_get_temp_dir();
             $lastError = 'unknown reason';
             set_error_handler(function ($type, $msg) use (&$lastError) { $lastError = $msg; });
@@ -98,21 +98,21 @@ public function getDescriptors()
         if (!$this->haveReadSupport) {
             $nullstream = fopen('NUL', 'c');
 
-            return array(
-                array('pipe', 'r'),
+            return [
+                ['pipe', 'r'],
                 $nullstream,
                 $nullstream,
-            );
+            ];
         }
 
         // We're not using pipe on Windows platform as it hangs (https://bugs.php.net/bug.php?id=51800)
         // We're not using file handles as it can produce corrupted output https://bugs.php.net/bug.php?id=65650
         // So we redirect output within the commandline and pass the nul device to the process
-        return array(
-            array('pipe', 'r'),
-            array('file', 'NUL', 'w'),
-            array('file', 'NUL', 'w'),
-        );
+        return [
+            ['pipe', 'r'],
+            ['file', 'NUL', 'w'],
+            ['file', 'NUL', 'w'],
+        ];
     }
 
     /**
@@ -130,7 +130,7 @@ public function readAndWrite($blocking, $close = false)
     {
         $this->unblock();
         $w = $this->write();
-        $read = $r = $e = array();
+        $read = $r = $e = [];
 
         if ($blocking) {
             if ($w) {
@@ -186,6 +186,6 @@ public function close()
             flock($this->lockHandles[$type], LOCK_UN);
             fclose($this->lockHandles[$type]);
         }
-        $this->fileHandles = $this->lockHandles = array();
+        $this->fileHandles = $this->lockHandles = [];
     }
 }
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
index 20af10324e8ba..7f7a2ef7a60c2 100644
--- a/src/Symfony/Component/Process/Process.php
+++ b/src/Symfony/Component/Process/Process.php
@@ -88,7 +88,7 @@ class Process implements \IteratorAggregate
      *
      * User-defined errors must use exit codes in the 64-113 range.
      */
-    public static $exitCodes = array(
+    public static $exitCodes = [
         0 => 'OK',
         1 => 'General error',
         2 => 'Misuse of shell builtins',
@@ -129,7 +129,7 @@ class Process implements \IteratorAggregate
         157 => 'Pollable event',
         // 158 - not defined
         159 => 'Bad syscall',
-    );
+    ];
 
     /**
      * @param string|array   $commandline The command line to run
@@ -287,7 +287,7 @@ public function start(callable $callback = null/*, array $env = array()*/)
         $inheritEnv = $this->inheritEnv;
 
         if (\is_array($commandline = $this->commandline)) {
-            $commandline = implode(' ', array_map(array($this, 'escapeArgument'), $commandline));
+            $commandline = implode(' ', array_map([$this, 'escapeArgument'], $commandline));
 
             if ('\\' !== \DIRECTORY_SEPARATOR) {
                 // exec is mandatory to deal with sending a signal to the process
@@ -316,7 +316,7 @@ public function start(callable $callback = null/*, array $env = array()*/)
             $commandline = $this->prepareWindowsCommandLine($commandline, $env);
         } elseif (!$this->useFileHandles && $this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
             // last exit code is output on the fourth pipe and caught to work around --enable-sigchild
-            $descriptors[3] = array('pipe', 'w');
+            $descriptors[3] = ['pipe', 'w'];
 
             // See https://unix.stackexchange.com/questions/71205/background-process-pipe-input
             $commandline = '{ ('.$commandline.') <&3 3<&- 3>/dev/null & } 3<&0;';
@@ -939,7 +939,7 @@ public function addErrorOutput($line)
      */
     public function getCommandLine()
     {
-        return \is_array($this->commandline) ? implode(' ', array_map(array($this, 'escapeArgument'), $this->commandline)) : $this->commandline;
+        return \is_array($this->commandline) ? implode(' ', array_map([$this, 'escapeArgument'], $this->commandline)) : $this->commandline;
     }
 
     /**
@@ -1359,7 +1359,7 @@ public static function isPtySupported()
             return $result = false;
         }
 
-        return $result = (bool) @proc_open('echo 1 >/dev/null', array(array('pty'), array('pty'), array('pty')), $pipes);
+        return $result = (bool) @proc_open('echo 1 >/dev/null', [['pty'], ['pty'], ['pty']], $pipes);
     }
 
     /**
@@ -1563,7 +1563,7 @@ private function resetProcessData()
         $this->starttime = null;
         $this->callback = null;
         $this->exitcode = null;
-        $this->fallbackStatus = array();
+        $this->fallbackStatus = [];
         $this->processInformation = null;
         $this->stdout = fopen('php://temp/maxmemory:'.(1024 * 1024), 'w+b');
         $this->stderr = fopen('php://temp/maxmemory:'.(1024 * 1024), 'w+b');
@@ -1610,7 +1610,7 @@ private function doSignal($signal, $throwException)
                 $ok = @proc_terminate($this->process, $signal);
             } elseif (\function_exists('posix_kill')) {
                 $ok = @posix_kill($pid, $signal);
-            } elseif ($ok = proc_open(sprintf('kill -%d %d', $signal, $pid), array(2 => array('pipe', 'w')), $pipes)) {
+            } elseif ($ok = proc_open(sprintf('kill -%d %d', $signal, $pid), [2 => ['pipe', 'w']], $pipes)) {
                 $ok = false === fgets($pipes[2]);
             }
             if (!$ok) {
@@ -1634,7 +1634,7 @@ private function prepareWindowsCommandLine($cmd, array &$env)
     {
         $uid = uniqid('', true);
         $varCount = 0;
-        $varCache = array();
+        $varCache = [];
         $cmd = preg_replace_callback(
             '/"(?:(
                 [^"%!^]*+
@@ -1657,7 +1657,7 @@ function ($m) use (&$env, &$varCache, &$varCount, $uid) {
                     return '"'.$value.'"';
                 }
 
-                $value = str_replace(array('!LF!', '"^!"', '"^%"', '"^^"', '""'), array("\n", '!', '%', '^', '"'), $value);
+                $value = str_replace(['!LF!', '"^!"', '"^%"', '"^^"', '""'], ["\n", '!', '%', '^', '"'], $value);
                 $value = '"'.preg_replace('/(\\\\*)"/', '$1$1\\"', $value).'"';
                 $var = $uid.++$varCount;
 
diff --git a/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php b/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php
index ee25eda02b453..e1997f186a794 100644
--- a/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php
+++ b/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php
@@ -73,7 +73,7 @@ public function testFindWithExtraDirs()
 
         $this->setPath('');
 
-        $extraDirs = array(\dirname(PHP_BINARY));
+        $extraDirs = [\dirname(PHP_BINARY)];
 
         $finder = new ExecutableFinder();
         $result = $finder->find($this->getPhpBinaryName(), null, $extraDirs);
diff --git a/src/Symfony/Component/Process/Tests/PipeStdinInStdoutStdErrStreamSelect.php b/src/Symfony/Component/Process/Tests/PipeStdinInStdoutStdErrStreamSelect.php
index 1ea0e127f76b4..bf0b99edb1b00 100644
--- a/src/Symfony/Component/Process/Tests/PipeStdinInStdoutStdErrStreamSelect.php
+++ b/src/Symfony/Component/Process/Tests/PipeStdinInStdoutStdErrStreamSelect.php
@@ -14,8 +14,8 @@
 define('ERR_READ_FAILED', 3);
 define('ERR_WRITE_FAILED', 4);
 
-$read = array(STDIN);
-$write = array(STDOUT, STDERR);
+$read = [STDIN];
+$write = [STDOUT, STDERR];
 
 stream_set_blocking(STDIN, 0);
 stream_set_blocking(STDOUT, 0);
@@ -42,7 +42,7 @@
         $out = (string) substr($out, $written);
     }
     if (null === $read && '' === $out) {
-        $write = array_diff($write, array(STDOUT));
+        $write = array_diff($write, [STDOUT]);
     }
 
     if (in_array(STDERR, $w) && strlen($err) > 0) {
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
index da74a3db225af..e5e6b55df758e 100644
--- a/src/Symfony/Component/Process/Tests/ProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -115,7 +115,7 @@ public function testFloatAndNullTimeout()
      */
     public function testStopWithTimeoutIsActuallyWorking()
     {
-        $p = $this->getProcess(array(self::$phpBin, __DIR__.'/NonStopableProcess.php', 30));
+        $p = $this->getProcess([self::$phpBin, __DIR__.'/NonStopableProcess.php', 30]);
         $p->start();
 
         while (false === strpos($p->getOutput(), 'received')) {
@@ -276,10 +276,10 @@ public function testInvalidInput($value)
 
     public function provideInvalidInputValues()
     {
-        return array(
-            array(array()),
-            array(new NonStringifiable()),
-        );
+        return [
+            [[]],
+            [new NonStringifiable()],
+        ];
     }
 
     /**
@@ -294,25 +294,25 @@ public function testValidInput($expected, $value)
 
     public function provideInputValues()
     {
-        return array(
-            array(null, null),
-            array('24.5', 24.5),
-            array('input data', 'input data'),
-        );
+        return [
+            [null, null],
+            ['24.5', 24.5],
+            ['input data', 'input data'],
+        ];
     }
 
     public function chainedCommandsOutputProvider()
     {
         if ('\\' === \DIRECTORY_SEPARATOR) {
-            return array(
-                array("2 \r\n2\r\n", '&&', '2'),
-            );
+            return [
+                ["2 \r\n2\r\n", '&&', '2'],
+            ];
         }
 
-        return array(
-            array("1\n1\n", ';', '1'),
-            array("2\n2\n", '&&', '2'),
-        );
+        return [
+            ["1\n1\n", ';', '1'],
+            ["2\n2\n", '&&', '2'],
+        ];
     }
 
     /**
@@ -381,7 +381,7 @@ public function testIncrementalOutput($getOutput, $getIncrementalOutput, $uri)
 
         $p->start();
 
-        foreach (array('foo', 'bar') as $s) {
+        foreach (['foo', 'bar'] as $s) {
             while (false === strpos($p->$getOutput(), $s)) {
                 usleep(1000);
             }
@@ -397,10 +397,10 @@ public function testIncrementalOutput($getOutput, $getIncrementalOutput, $uri)
 
     public function provideIncrementalOutput()
     {
-        return array(
-            array('getOutput', 'getIncrementalOutput', 'php://stdout'),
-            array('getErrorOutput', 'getIncrementalErrorOutput', 'php://stderr'),
-        );
+        return [
+            ['getOutput', 'getIncrementalOutput', 'php://stdout'],
+            ['getErrorOutput', 'getIncrementalErrorOutput', 'php://stderr'],
+        ];
     }
 
     public function testGetOutput()
@@ -907,7 +907,7 @@ public function testGetPidIsNullAfterRun()
      */
     public function testSignal()
     {
-        $process = $this->getProcess(array(self::$phpBin, __DIR__.'/SignalListener.php'));
+        $process = $this->getProcess([self::$phpBin, __DIR__.'/SignalListener.php']);
         $process->start();
 
         while (false === strpos($process->getOutput(), 'Caught')) {
@@ -969,13 +969,13 @@ public function testMethodsThatNeedARunningProcess($method)
 
     public function provideMethodsThatNeedARunningProcess()
     {
-        return array(
-            array('getOutput'),
-            array('getIncrementalOutput'),
-            array('getErrorOutput'),
-            array('getIncrementalErrorOutput'),
-            array('wait'),
-        );
+        return [
+            ['getOutput'],
+            ['getIncrementalOutput'],
+            ['getErrorOutput'],
+            ['getIncrementalErrorOutput'],
+            ['wait'],
+        ];
     }
 
     /**
@@ -1000,12 +1000,12 @@ public function testMethodsThatNeedATerminatedProcess($method)
 
     public function provideMethodsThatNeedATerminatedProcess()
     {
-        return array(
-            array('hasBeenSignaled'),
-            array('getTermSignal'),
-            array('hasBeenStopped'),
-            array('getStopSignal'),
-        );
+        return [
+            ['hasBeenSignaled'],
+            ['getTermSignal'],
+            ['hasBeenStopped'],
+            ['getStopSignal'],
+        ];
     }
 
     /**
@@ -1125,12 +1125,12 @@ public function testGetOutputWhileDisabled($fetchMethod)
 
     public function provideOutputFetchingMethods()
     {
-        return array(
-            array('getOutput'),
-            array('getIncrementalOutput'),
-            array('getErrorOutput'),
-            array('getIncrementalErrorOutput'),
-        );
+        return [
+            ['getOutput'],
+            ['getIncrementalOutput'],
+            ['getErrorOutput'],
+            ['getIncrementalErrorOutput'],
+        ];
     }
 
     public function testStopTerminatesProcessCleanly()
@@ -1162,32 +1162,32 @@ public function testTermSignalTerminatesProcessCleanly()
 
     public function responsesCodeProvider()
     {
-        return array(
+        return [
             //expected output / getter / code to execute
             //array(1,'getExitCode','exit(1);'),
             //array(true,'isSuccessful','exit();'),
-            array('output', 'getOutput', 'echo \'output\';'),
-        );
+            ['output', 'getOutput', 'echo \'output\';'],
+        ];
     }
 
     public function pipesCodeProvider()
     {
-        $variations = array(
+        $variations = [
             'fwrite(STDOUT, $in = file_get_contents(\'php://stdin\')); fwrite(STDERR, $in);',
             'include \''.__DIR__.'/PipeStdinInStdoutStdErrStreamSelect.php\';',
-        );
+        ];
 
         if ('\\' === \DIRECTORY_SEPARATOR) {
             // Avoid XL buffers on Windows because of https://bugs.php.net/bug.php?id=65650
-            $sizes = array(1, 2, 4, 8);
+            $sizes = [1, 2, 4, 8];
         } else {
-            $sizes = array(1, 16, 64, 1024, 4096);
+            $sizes = [1, 16, 64, 1024, 4096];
         }
 
-        $codes = array();
+        $codes = [];
         foreach ($sizes as $size) {
             foreach ($variations as $code) {
-                $codes[] = array($code, $size);
+                $codes[] = [$code, $size];
             }
         }
 
@@ -1215,10 +1215,10 @@ public function testIncrementalOutputDoesNotRequireAnotherCall($stream, $method)
 
     public function provideVariousIncrementals()
     {
-        return array(
-            array('php://stdout', 'getIncrementalOutput'),
-            array('php://stderr', 'getIncrementalErrorOutput'),
-        );
+        return [
+            ['php://stdout', 'getIncrementalOutput'],
+            ['php://stderr', 'getIncrementalErrorOutput'],
+        ];
     }
 
     public function testIteratorInput()
@@ -1323,32 +1323,32 @@ public function testIteratorOutput()
         $process = $this->getProcessForCode('fwrite(STDOUT, 123); fwrite(STDERR, 234); flush(); usleep(10000); fwrite(STDOUT, fread(STDIN, 3)); fwrite(STDERR, 456);');
         $process->setInput($input);
         $process->start();
-        $output = array();
+        $output = [];
 
         foreach ($process as $type => $data) {
-            $output[] = array($type, $data);
+            $output[] = [$type, $data];
             break;
         }
-        $expectedOutput = array(
-            array($process::OUT, '123'),
-        );
+        $expectedOutput = [
+            [$process::OUT, '123'],
+        ];
         $this->assertSame($expectedOutput, $output);
 
         $input->write(345);
 
         foreach ($process as $type => $data) {
-            $output[] = array($type, $data);
+            $output[] = [$type, $data];
         }
 
         $this->assertSame('', $process->getOutput());
         $this->assertFalse($process->isRunning());
 
-        $expectedOutput = array(
-            array($process::OUT, '123'),
-            array($process::ERR, '234'),
-            array($process::OUT, '345'),
-            array($process::ERR, '456'),
-        );
+        $expectedOutput = [
+            [$process::OUT, '123'],
+            [$process::ERR, '234'],
+            [$process::OUT, '345'],
+            [$process::ERR, '456'],
+        ];
         $this->assertSame($expectedOutput, $output);
     }
 
@@ -1359,32 +1359,32 @@ public function testNonBlockingNorClearingIteratorOutput()
         $process = $this->getProcessForCode('fwrite(STDOUT, fread(STDIN, 3));');
         $process->setInput($input);
         $process->start();
-        $output = array();
+        $output = [];
 
         foreach ($process->getIterator($process::ITER_NON_BLOCKING | $process::ITER_KEEP_OUTPUT) as $type => $data) {
-            $output[] = array($type, $data);
+            $output[] = [$type, $data];
             break;
         }
-        $expectedOutput = array(
-            array($process::OUT, ''),
-        );
+        $expectedOutput = [
+            [$process::OUT, ''],
+        ];
         $this->assertSame($expectedOutput, $output);
 
         $input->write(123);
 
         foreach ($process->getIterator($process::ITER_NON_BLOCKING | $process::ITER_KEEP_OUTPUT) as $type => $data) {
             if ('' !== $data) {
-                $output[] = array($type, $data);
+                $output[] = [$type, $data];
             }
         }
 
         $this->assertSame('123', $process->getOutput());
         $this->assertFalse($process->isRunning());
 
-        $expectedOutput = array(
-            array($process::OUT, ''),
-            array($process::OUT, '123'),
-        );
+        $expectedOutput = [
+            [$process::OUT, ''],
+            [$process::OUT, '123'],
+        ];
         $this->assertSame($expectedOutput, $output);
     }
 
@@ -1406,7 +1406,7 @@ public function testChainedProcesses()
     public function testSetBadEnv()
     {
         $process = $this->getProcess('echo hello');
-        $process->setEnv(array('bad%%' => '123'));
+        $process->setEnv(['bad%%' => '123']);
         $process->inheritEnvironmentVariables(true);
 
         $process->run();
@@ -1420,7 +1420,7 @@ public function testEnvBackupDoesNotDeleteExistingVars()
         putenv('existing_var=foo');
         $_ENV['existing_var'] = 'foo';
         $process = $this->getProcess('php -r "echo getenv(\'new_test_var\');"');
-        $process->setEnv(array('existing_var' => 'bar', 'new_test_var' => 'foo'));
+        $process->setEnv(['existing_var' => 'bar', 'new_test_var' => 'foo']);
         $process->inheritEnvironmentVariables();
 
         $process->run();
@@ -1435,14 +1435,14 @@ public function testEnvBackupDoesNotDeleteExistingVars()
 
     public function testEnvIsInherited()
     {
-        $process = $this->getProcessForCode('echo serialize($_SERVER);', null, array('BAR' => 'BAZ', 'EMPTY' => ''));
+        $process = $this->getProcessForCode('echo serialize($_SERVER);', null, ['BAR' => 'BAZ', 'EMPTY' => '']);
 
         putenv('FOO=BAR');
         $_ENV['FOO'] = 'BAR';
 
         $process->run();
 
-        $expected = array('BAR' => 'BAZ', 'EMPTY' => '', 'FOO' => 'BAR');
+        $expected = ['BAR' => 'BAZ', 'EMPTY' => '', 'FOO' => 'BAR'];
         $env = array_intersect_key(unserialize($process->getOutput()), $expected);
 
         $this->assertEquals($expected, $env);
@@ -1478,7 +1478,7 @@ public function testInheritEnvDisabled()
 
     public function testGetCommandLine()
     {
-        $p = new Process(array('/usr/bin/php'));
+        $p = new Process(['/usr/bin/php']);
 
         $expected = '\\' === \DIRECTORY_SEPARATOR ? '"/usr/bin/php"' : "'/usr/bin/php'";
         $this->assertSame($expected, $p->getCommandLine());
@@ -1489,7 +1489,7 @@ public function testGetCommandLine()
      */
     public function testEscapeArgument($arg)
     {
-        $p = new Process(array(self::$phpBin, '-r', 'echo $argv[1];', $arg));
+        $p = new Process([self::$phpBin, '-r', 'echo $argv[1];', $arg]);
         $p->run();
 
         $this->assertSame((string) $arg, $p->getOutput());
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
index 2e358f458600b..9cde0a88e2eb8 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -159,9 +159,9 @@ public function getValue($objectOrArray, $propertyPath)
     {
         $propertyPath = $this->getPropertyPath($propertyPath);
 
-        $zval = array(
+        $zval = [
             self::VALUE => $objectOrArray,
-        );
+        ];
         $propertyValues = $this->readPropertiesUntil($zval, $propertyPath, $propertyPath->getLength(), $this->ignoreInvalidIndices);
 
         return $propertyValues[\count($propertyValues) - 1][self::VALUE];
@@ -174,10 +174,10 @@ public function setValue(&$objectOrArray, $propertyPath, $value)
     {
         $propertyPath = $this->getPropertyPath($propertyPath);
 
-        $zval = array(
+        $zval = [
             self::VALUE => $objectOrArray,
             self::REF => &$objectOrArray,
-        );
+        ];
         $propertyValues = $this->readPropertiesUntil($zval, $propertyPath, $propertyPath->getLength() - 1);
         $overwrite = true;
 
@@ -280,9 +280,9 @@ public function isReadable($objectOrArray, $propertyPath)
         }
 
         try {
-            $zval = array(
+            $zval = [
                 self::VALUE => $objectOrArray,
-            );
+            ];
             $this->readPropertiesUntil($zval, $propertyPath, $propertyPath->getLength(), $this->ignoreInvalidIndices);
 
             return true;
@@ -301,9 +301,9 @@ public function isWritable($objectOrArray, $propertyPath)
         $propertyPath = $this->getPropertyPath($propertyPath);
 
         try {
-            $zval = array(
+            $zval = [
                 self::VALUE => $objectOrArray,
-            );
+            ];
             $propertyValues = $this->readPropertiesUntil($zval, $propertyPath, $propertyPath->getLength() - 1);
 
             for ($i = \count($propertyValues) - 1; 0 <= $i; --$i) {
@@ -353,7 +353,7 @@ private function readPropertiesUntil($zval, PropertyPathInterface $propertyPath,
         }
 
         // Add the root object to the list
-        $propertyValues = array($zval);
+        $propertyValues = [$zval];
 
         for ($i = 0; $i < $lastIndex; ++$i) {
             $property = $propertyPath->getElement($i);
@@ -378,10 +378,10 @@ private function readPropertiesUntil($zval, PropertyPathInterface $propertyPath,
 
                     if ($i + 1 < $propertyPath->getLength()) {
                         if (isset($zval[self::REF])) {
-                            $zval[self::VALUE][$property] = array();
+                            $zval[self::VALUE][$property] = [];
                             $zval[self::REF] = $zval[self::VALUE];
                         } else {
-                            $zval[self::VALUE] = array($property => array());
+                            $zval[self::VALUE] = [$property => []];
                         }
                     }
                 }
@@ -521,7 +521,7 @@ private function getReadAccessInfo($class, $property)
             }
         }
 
-        $access = array();
+        $access = [];
 
         $reflClass = new \ReflectionClass($class);
         $access[self::ACCESS_HAS_PROPERTY] = $reflClass->hasProperty($property);
@@ -556,7 +556,7 @@ private function getReadAccessInfo($class, $property)
             $access[self::ACCESS_TYPE] = self::ACCESS_TYPE_MAGIC;
             $access[self::ACCESS_NAME] = $getter;
         } else {
-            $methods = array($getter, $getsetter, $isser, $hasser, '__get');
+            $methods = [$getter, $getsetter, $isser, $hasser, '__get'];
             if ($this->magicCall) {
                 $methods[] = '__call';
             }
@@ -701,7 +701,7 @@ private function getWriteAccessInfo($class, $property, $value)
             }
         }
 
-        $access = array();
+        $access = [];
 
         $reflClass = new \ReflectionClass($class);
         $access[self::ACCESS_HAS_PROPERTY] = $reflClass->hasProperty($property);
@@ -786,7 +786,7 @@ private function isPropertyWritable($object, $property)
             return false;
         }
 
-        $access = $this->getWriteAccessInfo(\get_class($object), $property, array());
+        $access = $this->getWriteAccessInfo(\get_class($object), $property, []);
 
         $isWritable = self::ACCESS_TYPE_METHOD === $access[self::ACCESS_TYPE]
             || self::ACCESS_TYPE_PROPERTY === $access[self::ACCESS_TYPE]
@@ -837,7 +837,7 @@ private function findAdderAndRemover(\ReflectionClass $reflClass, array $singula
             $removeMethodFound = $this->isMethodAccessible($reflClass, $removeMethod, 1);
 
             if ($addMethodFound && $removeMethodFound) {
-                return array($addMethod, $removeMethod);
+                return [$addMethod, $removeMethod];
             }
         }
     }
diff --git a/src/Symfony/Component/PropertyAccess/PropertyPath.php b/src/Symfony/Component/PropertyAccess/PropertyPath.php
index 2897a4adfab8b..cb7d4ced85fe3 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyPath.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyPath.php
@@ -32,7 +32,7 @@ class PropertyPath implements \IteratorAggregate, PropertyPathInterface
      *
      * @var array
      */
-    private $elements = array();
+    private $elements = [];
 
     /**
      * The number of elements in the property path.
@@ -47,7 +47,7 @@ class PropertyPath implements \IteratorAggregate, PropertyPathInterface
      *
      * @var array
      */
-    private $isIndex = array();
+    private $isIndex = [];
 
     /**
      * String representation of the path.
diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
index e17c53c0d2129..ede9e6b3a5386 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
@@ -18,8 +18,8 @@
  */
 class PropertyPathBuilder
 {
-    private $elements = array();
-    private $isIndex = array();
+    private $elements = [];
+    private $isIndex = [];
 
     /**
      * Creates a new property path builder.
diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/NonTraversableArrayObject.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/NonTraversableArrayObject.php
index d2ff935851a53..4852e8d58ff98 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/NonTraversableArrayObject.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/NonTraversableArrayObject.php
@@ -21,7 +21,7 @@ class NonTraversableArrayObject implements \ArrayAccess, \Countable, \Serializab
 
     public function __construct(array $array = null)
     {
-        $this->array = $array ?: array();
+        $this->array = $array ?: [];
     }
 
     public function offsetExists($offset)
diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestSingularAndPluralProps.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestSingularAndPluralProps.php
index db17f3f612511..d8a8c76483147 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestSingularAndPluralProps.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestSingularAndPluralProps.php
@@ -21,7 +21,7 @@ class TestSingularAndPluralProps
     private $email;
 
     /** @var array */
-    private $emails = array();
+    private $emails = [];
 
     /**
      * @return string|null
@@ -60,6 +60,6 @@ public function addEmail($email)
      */
     public function removeEmail($email)
     {
-        $this->emails = array_diff($this->emails, array($email));
+        $this->emails = array_diff($this->emails, [$email]);
     }
 }
diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TraversableArrayObject.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TraversableArrayObject.php
index 6758f18fbcc43..9803a11f848fc 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TraversableArrayObject.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TraversableArrayObject.php
@@ -21,7 +21,7 @@ class TraversableArrayObject implements \ArrayAccess, \IteratorAggregate, \Count
 
     public function __construct(array $array = null)
     {
-        $this->array = $array ?: array();
+        $this->array = $array ?: [];
     }
 
     public function offsetExists($offset)
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayAccessTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayAccessTest.php
index b0ed69c85953e..3c007fde9343e 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayAccessTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayAccessTest.php
@@ -31,10 +31,10 @@ abstract protected function getContainer(array $array);
 
     public function getValidPropertyPaths()
     {
-        return array(
-            array($this->getContainer(array('firstName' => 'Bernhard')), '[firstName]', 'Bernhard'),
-            array($this->getContainer(array('person' => $this->getContainer(array('firstName' => 'Bernhard')))), '[person][firstName]', 'Bernhard'),
-        );
+        return [
+            [$this->getContainer(['firstName' => 'Bernhard']), '[firstName]', 'Bernhard'],
+            [$this->getContainer(['person' => $this->getContainer(['firstName' => 'Bernhard'])]), '[person][firstName]', 'Bernhard'],
+        ];
     }
 
     /**
@@ -54,7 +54,7 @@ public function testGetValueFailsIfNoSuchIndex()
             ->enableExceptionOnInvalidIndex()
             ->getPropertyAccessor();
 
-        $object = $this->getContainer(array('firstName' => 'Bernhard'));
+        $object = $this->getContainer(['firstName' => 'Bernhard']);
 
         $this->propertyAccessor->getValue($object, '[lastName]');
     }
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
index 8a7ab1042b325..1aee259a76c8f 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
@@ -102,9 +102,9 @@ abstract class PropertyAccessorCollectionTest extends PropertyAccessorArrayAcces
 {
     public function testSetValueCallsAdderAndRemoverForCollections()
     {
-        $axesBefore = $this->getContainer(array(1 => 'second', 3 => 'fourth', 4 => 'fifth'));
-        $axesMerged = $this->getContainer(array(1 => 'first', 2 => 'second', 3 => 'third'));
-        $axesAfter = $this->getContainer(array(1 => 'second', 5 => 'first', 6 => 'third'));
+        $axesBefore = $this->getContainer([1 => 'second', 3 => 'fourth', 4 => 'fifth']);
+        $axesMerged = $this->getContainer([1 => 'first', 2 => 'second', 3 => 'third']);
+        $axesAfter = $this->getContainer([1 => 'second', 5 => 'first', 6 => 'third']);
         $axesMergedCopy = \is_object($axesMerged) ? clone $axesMerged : $axesMerged;
 
         // Don't use a mock in order to test whether the collections are
@@ -123,8 +123,8 @@ public function testSetValueCallsAdderAndRemoverForNestedCollections()
     {
         $car = $this->getMockBuilder(__CLASS__.'_CompositeCar')->getMock();
         $structure = $this->getMockBuilder(__CLASS__.'_CarStructure')->getMock();
-        $axesBefore = $this->getContainer(array(1 => 'second', 3 => 'fourth'));
-        $axesAfter = $this->getContainer(array(0 => 'first', 1 => 'second', 2 => 'third'));
+        $axesBefore = $this->getContainer([1 => 'second', 3 => 'fourth']);
+        $axesAfter = $this->getContainer([0 => 'first', 1 => 'second', 2 => 'third']);
 
         $car->expects($this->any())
             ->method('getStructure')
@@ -153,8 +153,8 @@ public function testSetValueCallsAdderAndRemoverForNestedCollections()
     public function testSetValueFailsIfNoAdderNorRemoverFound()
     {
         $car = $this->getMockBuilder(__CLASS__.'_CarNoAdderAndRemover')->getMock();
-        $axesBefore = $this->getContainer(array(1 => 'second', 3 => 'fourth'));
-        $axesAfter = $this->getContainer(array(0 => 'first', 1 => 'second', 2 => 'third'));
+        $axesBefore = $this->getContainer([1 => 'second', 3 => 'fourth']);
+        $axesAfter = $this->getContainer([0 => 'first', 1 => 'second', 2 => 'third']);
 
         $car->expects($this->any())
             ->method('getAxes')
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
index 894fbd5c0df0e..9219d7167b3d0 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
@@ -40,47 +40,47 @@ protected function setUp()
 
     public function getPathsWithUnexpectedType()
     {
-        return array(
-            array('', 'foobar'),
-            array('foo', 'foobar'),
-            array(null, 'foobar'),
-            array(123, 'foobar'),
-            array((object) array('prop' => null), 'prop.foobar'),
-            array((object) array('prop' => (object) array('subProp' => null)), 'prop.subProp.foobar'),
-            array(array('index' => null), '[index][foobar]'),
-            array(array('index' => array('subIndex' => null)), '[index][subIndex][foobar]'),
-        );
+        return [
+            ['', 'foobar'],
+            ['foo', 'foobar'],
+            [null, 'foobar'],
+            [123, 'foobar'],
+            [(object) ['prop' => null], 'prop.foobar'],
+            [(object) ['prop' => (object) ['subProp' => null]], 'prop.subProp.foobar'],
+            [['index' => null], '[index][foobar]'],
+            [['index' => ['subIndex' => null]], '[index][subIndex][foobar]'],
+        ];
     }
 
     public function getPathsWithMissingProperty()
     {
-        return array(
-            array((object) array('firstName' => 'Bernhard'), 'lastName'),
-            array((object) array('property' => (object) array('firstName' => 'Bernhard')), 'property.lastName'),
-            array(array('index' => (object) array('firstName' => 'Bernhard')), '[index].lastName'),
-            array(new TestClass('Bernhard'), 'protectedProperty'),
-            array(new TestClass('Bernhard'), 'privateProperty'),
-            array(new TestClass('Bernhard'), 'protectedAccessor'),
-            array(new TestClass('Bernhard'), 'protectedIsAccessor'),
-            array(new TestClass('Bernhard'), 'protectedHasAccessor'),
-            array(new TestClass('Bernhard'), 'privateAccessor'),
-            array(new TestClass('Bernhard'), 'privateIsAccessor'),
-            array(new TestClass('Bernhard'), 'privateHasAccessor'),
+        return [
+            [(object) ['firstName' => 'Bernhard'], 'lastName'],
+            [(object) ['property' => (object) ['firstName' => 'Bernhard']], 'property.lastName'],
+            [['index' => (object) ['firstName' => 'Bernhard']], '[index].lastName'],
+            [new TestClass('Bernhard'), 'protectedProperty'],
+            [new TestClass('Bernhard'), 'privateProperty'],
+            [new TestClass('Bernhard'), 'protectedAccessor'],
+            [new TestClass('Bernhard'), 'protectedIsAccessor'],
+            [new TestClass('Bernhard'), 'protectedHasAccessor'],
+            [new TestClass('Bernhard'), 'privateAccessor'],
+            [new TestClass('Bernhard'), 'privateIsAccessor'],
+            [new TestClass('Bernhard'), 'privateHasAccessor'],
 
             // Properties are not camelized
-            array(new TestClass('Bernhard'), 'public_property'),
-        );
+            [new TestClass('Bernhard'), 'public_property'],
+        ];
     }
 
     public function getPathsWithMissingIndex()
     {
-        return array(
-            array(array('firstName' => 'Bernhard'), '[lastName]'),
-            array(array(), '[index][lastName]'),
-            array(array('index' => array()), '[index][lastName]'),
-            array(array('index' => array('firstName' => 'Bernhard')), '[index][lastName]'),
-            array((object) array('property' => array('firstName' => 'Bernhard')), 'property[lastName]'),
-        );
+        return [
+            [['firstName' => 'Bernhard'], '[lastName]'],
+            [[], '[index][lastName]'],
+            [['index' => []], '[index][lastName]'],
+            [['index' => ['firstName' => 'Bernhard']], '[index][lastName]'],
+            [(object) ['property' => ['firstName' => 'Bernhard']], 'property[lastName]'],
+        ];
     }
 
     /**
@@ -134,10 +134,10 @@ public function testGetValueReadsMagicGet()
     public function testGetValueReadsArrayWithMissingIndexForCustomPropertyPath()
     {
         $object = new \ArrayObject();
-        $array = array('child' => array('index' => $object));
+        $array = ['child' => ['index' => $object]];
 
         $this->assertNull($this->propertyAccessor->getValue($array, '[child][index][foo][bar]'));
-        $this->assertSame(array(), $object->getArrayCopy());
+        $this->assertSame([], $object->getArrayCopy());
     }
 
     // https://github.com/symfony/symfony/pull/4450
@@ -149,24 +149,24 @@ public function testGetValueReadsMagicGetThatReturnsConstant()
     public function testGetValueNotModifyObject()
     {
         $object = new \stdClass();
-        $object->firstName = array('Bernhard');
+        $object->firstName = ['Bernhard'];
 
         $this->assertNull($this->propertyAccessor->getValue($object, 'firstName[1]'));
-        $this->assertSame(array('Bernhard'), $object->firstName);
+        $this->assertSame(['Bernhard'], $object->firstName);
     }
 
     public function testGetValueNotModifyObjectException()
     {
         $propertyAccessor = new PropertyAccessor(false, true);
         $object = new \stdClass();
-        $object->firstName = array('Bernhard');
+        $object->firstName = ['Bernhard'];
 
         try {
             $propertyAccessor->getValue($object, 'firstName[1]');
         } catch (NoSuchIndexException $e) {
         }
 
-        $this->assertSame(array('Bernhard'), $object->firstName);
+        $this->assertSame(['Bernhard'], $object->firstName);
     }
 
     /**
@@ -289,7 +289,7 @@ public function testSetValueUpdatesMagicCallIfEnabled()
 
         $this->propertyAccessor->setValue($author, 'magicCallProperty', 'Updated');
 
-        $this->assertEquals('Updated', $author->__call('getMagicCallProperty', array()));
+        $this->assertEquals('Updated', $author->__call('getMagicCallProperty', []));
     }
 
     /**
@@ -305,7 +305,7 @@ public function testSetValueThrowsExceptionIfNotObjectOrArray($objectOrArray, $p
     public function testGetValueWhenArrayValueIsNull()
     {
         $this->propertyAccessor = new PropertyAccessor(false, true);
-        $this->assertNull($this->propertyAccessor->getValue(array('index' => array('nullable' => null)), '[index][nullable]'));
+        $this->assertNull($this->propertyAccessor->getValue(['index' => ['nullable' => null]], '[index][nullable]'));
     }
 
     /**
@@ -432,47 +432,47 @@ public function testIsWritableReturnsFalseIfNotObjectOrArray($objectOrArray, $pa
 
     public function getValidPropertyPaths()
     {
-        return array(
-            array(array('Bernhard', 'Schussek'), '[0]', 'Bernhard'),
-            array(array('Bernhard', 'Schussek'), '[1]', 'Schussek'),
-            array(array('firstName' => 'Bernhard'), '[firstName]', 'Bernhard'),
-            array(array('index' => array('firstName' => 'Bernhard')), '[index][firstName]', 'Bernhard'),
-            array((object) array('firstName' => 'Bernhard'), 'firstName', 'Bernhard'),
-            array((object) array('property' => array('firstName' => 'Bernhard')), 'property[firstName]', 'Bernhard'),
-            array(array('index' => (object) array('firstName' => 'Bernhard')), '[index].firstName', 'Bernhard'),
-            array((object) array('property' => (object) array('firstName' => 'Bernhard')), 'property.firstName', 'Bernhard'),
+        return [
+            [['Bernhard', 'Schussek'], '[0]', 'Bernhard'],
+            [['Bernhard', 'Schussek'], '[1]', 'Schussek'],
+            [['firstName' => 'Bernhard'], '[firstName]', 'Bernhard'],
+            [['index' => ['firstName' => 'Bernhard']], '[index][firstName]', 'Bernhard'],
+            [(object) ['firstName' => 'Bernhard'], 'firstName', 'Bernhard'],
+            [(object) ['property' => ['firstName' => 'Bernhard']], 'property[firstName]', 'Bernhard'],
+            [['index' => (object) ['firstName' => 'Bernhard']], '[index].firstName', 'Bernhard'],
+            [(object) ['property' => (object) ['firstName' => 'Bernhard']], 'property.firstName', 'Bernhard'],
 
             // Accessor methods
-            array(new TestClass('Bernhard'), 'publicProperty', 'Bernhard'),
-            array(new TestClass('Bernhard'), 'publicAccessor', 'Bernhard'),
-            array(new TestClass('Bernhard'), 'publicAccessorWithDefaultValue', 'Bernhard'),
-            array(new TestClass('Bernhard'), 'publicAccessorWithRequiredAndDefaultValue', 'Bernhard'),
-            array(new TestClass('Bernhard'), 'publicIsAccessor', 'Bernhard'),
-            array(new TestClass('Bernhard'), 'publicHasAccessor', 'Bernhard'),
-            array(new TestClass('Bernhard'), 'publicGetSetter', 'Bernhard'),
+            [new TestClass('Bernhard'), 'publicProperty', 'Bernhard'],
+            [new TestClass('Bernhard'), 'publicAccessor', 'Bernhard'],
+            [new TestClass('Bernhard'), 'publicAccessorWithDefaultValue', 'Bernhard'],
+            [new TestClass('Bernhard'), 'publicAccessorWithRequiredAndDefaultValue', 'Bernhard'],
+            [new TestClass('Bernhard'), 'publicIsAccessor', 'Bernhard'],
+            [new TestClass('Bernhard'), 'publicHasAccessor', 'Bernhard'],
+            [new TestClass('Bernhard'), 'publicGetSetter', 'Bernhard'],
 
             // Methods are camelized
-            array(new TestClass('Bernhard'), 'public_accessor', 'Bernhard'),
-            array(new TestClass('Bernhard'), '_public_accessor', 'Bernhard'),
+            [new TestClass('Bernhard'), 'public_accessor', 'Bernhard'],
+            [new TestClass('Bernhard'), '_public_accessor', 'Bernhard'],
 
             // Missing indices
-            array(array('index' => array()), '[index][firstName]', null),
-            array(array('root' => array('index' => array())), '[root][index][firstName]', null),
+            [['index' => []], '[index][firstName]', null],
+            [['root' => ['index' => []]], '[root][index][firstName]', null],
 
             // Special chars
-            array(array('%!@$§.' => 'Bernhard'), '[%!@$§.]', 'Bernhard'),
-            array(array('index' => array('%!@$§.' => 'Bernhard')), '[index][%!@$§.]', 'Bernhard'),
-            array((object) array('%!@$§' => 'Bernhard'), '%!@$§', 'Bernhard'),
-            array((object) array('property' => (object) array('%!@$§' => 'Bernhard')), 'property.%!@$§', 'Bernhard'),
+            [['%!@$§.' => 'Bernhard'], '[%!@$§.]', 'Bernhard'],
+            [['index' => ['%!@$§.' => 'Bernhard']], '[index][%!@$§.]', 'Bernhard'],
+            [(object) ['%!@$§' => 'Bernhard'], '%!@$§', 'Bernhard'],
+            [(object) ['property' => (object) ['%!@$§' => 'Bernhard']], 'property.%!@$§', 'Bernhard'],
 
             // nested objects and arrays
-            array(array('foo' => new TestClass('bar')), '[foo].publicGetSetter', 'bar'),
-            array(new TestClass(array('foo' => 'bar')), 'publicGetSetter[foo]', 'bar'),
-            array(new TestClass(new TestClass('bar')), 'publicGetter.publicGetSetter', 'bar'),
-            array(new TestClass(array('foo' => new TestClass('bar'))), 'publicGetter[foo].publicGetSetter', 'bar'),
-            array(new TestClass(new TestClass(new TestClass('bar'))), 'publicGetter.publicGetter.publicGetSetter', 'bar'),
-            array(new TestClass(array('foo' => array('baz' => new TestClass('bar')))), 'publicGetter[foo][baz].publicGetSetter', 'bar'),
-        );
+            [['foo' => new TestClass('bar')], '[foo].publicGetSetter', 'bar'],
+            [new TestClass(['foo' => 'bar']), 'publicGetSetter[foo]', 'bar'],
+            [new TestClass(new TestClass('bar')), 'publicGetter.publicGetSetter', 'bar'],
+            [new TestClass(['foo' => new TestClass('bar')]), 'publicGetter[foo].publicGetSetter', 'bar'],
+            [new TestClass(new TestClass(new TestClass('bar'))), 'publicGetter.publicGetter.publicGetSetter', 'bar'],
+            [new TestClass(['foo' => ['baz' => new TestClass('bar')]]), 'publicGetter[foo][baz].publicGetSetter', 'bar'],
+        ];
     }
 
     public function testTicket5755()
@@ -487,20 +487,20 @@ public function testTicket5755()
     public function testSetValueDeepWithMagicGetter()
     {
         $obj = new TestClassMagicGet('foo');
-        $obj->publicProperty = array('foo' => array('bar' => 'some_value'));
+        $obj->publicProperty = ['foo' => ['bar' => 'some_value']];
         $this->propertyAccessor->setValue($obj, 'publicProperty[foo][bar]', 'Updated');
         $this->assertSame('Updated', $obj->publicProperty['foo']['bar']);
     }
 
     public function getReferenceChainObjectsForSetValue()
     {
-        return array(
-            array(array('a' => array('b' => array('c' => 'old-value'))), '[a][b][c]', 'new-value'),
-            array(new TestClassSetValue(new TestClassSetValue('old-value')), 'value.value', 'new-value'),
-            array(new TestClassSetValue(array('a' => array('b' => array('c' => new TestClassSetValue('old-value'))))), 'value[a][b][c].value', 'new-value'),
-            array(new TestClassSetValue(array('a' => array('b' => 'old-value'))), 'value[a][b]', 'new-value'),
-            array(new \ArrayIterator(array('a' => array('b' => array('c' => 'old-value')))), '[a][b][c]', 'new-value'),
-        );
+        return [
+            [['a' => ['b' => ['c' => 'old-value']]], '[a][b][c]', 'new-value'],
+            [new TestClassSetValue(new TestClassSetValue('old-value')), 'value.value', 'new-value'],
+            [new TestClassSetValue(['a' => ['b' => ['c' => new TestClassSetValue('old-value')]]]), 'value[a][b][c].value', 'new-value'],
+            [new TestClassSetValue(['a' => ['b' => 'old-value']]), 'value[a][b]', 'new-value'],
+            [new \ArrayIterator(['a' => ['b' => ['c' => 'old-value']]]), '[a][b][c]', 'new-value'],
+        ];
     }
 
     /**
@@ -515,11 +515,11 @@ public function testSetValueForReferenceChainIssue($object, $path, $value)
 
     public function getReferenceChainObjectsForIsWritable()
     {
-        return array(
-            array(new TestClassIsWritable(array('a' => array('b' => 'old-value'))), 'value[a][b]', false),
-            array(new TestClassIsWritable(new \ArrayIterator(array('a' => array('b' => 'old-value')))), 'value[a][b]', true),
-            array(new TestClassIsWritable(array('a' => array('b' => array('c' => new TestClassSetValue('old-value'))))), 'value[a][b][c].value', true),
-        );
+        return [
+            [new TestClassIsWritable(['a' => ['b' => 'old-value']]), 'value[a][b]', false],
+            [new TestClassIsWritable(new \ArrayIterator(['a' => ['b' => 'old-value']])), 'value[a][b]', true],
+            [new TestClassIsWritable(['a' => ['b' => ['c' => new TestClassSetValue('old-value')]]]), 'value[a][b][c].value', true],
+        ];
     }
 
     /**
@@ -563,12 +563,12 @@ public function testSetTypeHint()
 
     public function testArrayNotBeeingOverwritten()
     {
-        $value = array('value1' => 'foo', 'value2' => 'bar');
+        $value = ['value1' => 'foo', 'value2' => 'bar'];
         $object = new TestClass($value);
 
         $this->propertyAccessor->setValue($object, 'publicAccessor[value2]', 'baz');
         $this->assertSame('baz', $this->propertyAccessor->getValue($object, 'publicAccessor[value2]'));
-        $this->assertSame(array('value1' => 'foo', 'value2' => 'baz'), $object->getPublicAccessor());
+        $this->assertSame(['value1' => 'foo', 'value2' => 'baz'], $object->getPublicAccessor());
     }
 
     public function testCacheReadAccess()
@@ -686,7 +686,7 @@ public function testDoNotDiscardReturnTypeError()
     {
         $object = new ReturnTyped();
 
-        $this->propertyAccessor->setValue($object, 'foos', array(new \DateTime()));
+        $this->propertyAccessor->setValue($object, 'foos', [new \DateTime()]);
     }
 
     /**
@@ -717,9 +717,9 @@ public function testWriteToPluralPropertyWhileSingularOneExists()
         $object = new TestSingularAndPluralProps();
 
         $this->propertyAccessor->isWritable($object, 'emails'); //cache access info
-        $this->propertyAccessor->setValue($object, 'emails', array('test@email.com'));
+        $this->propertyAccessor->setValue($object, 'emails', ['test@email.com']);
 
-        $this->assertEquals(array('test@email.com'), $object->getEmails());
+        $this->assertEquals(['test@email.com'], $object->getEmails());
         $this->assertNull($object->getEmail());
     }
 
@@ -728,9 +728,9 @@ public function testAdderAndRemoverArePreferredOverSetter()
         $object = new TestPluralAdderRemoverAndSetter();
 
         $this->propertyAccessor->isWritable($object, 'emails'); //cache access info
-        $this->propertyAccessor->setValue($object, 'emails', array('test@email.com'));
+        $this->propertyAccessor->setValue($object, 'emails', ['test@email.com']);
 
-        $this->assertEquals(array('test@email.com'), $object->getEmails());
+        $this->assertEquals(['test@email.com'], $object->getEmails());
     }
 
     public function testAdderAndRemoverArePreferredOverSetterForSameSingularAndPlural()
@@ -738,8 +738,8 @@ public function testAdderAndRemoverArePreferredOverSetterForSameSingularAndPlura
         $object = new TestPluralAdderRemoverAndSetterSameSingularAndPlural();
 
         $this->propertyAccessor->isWritable($object, 'aircraft'); //cache access info
-        $this->propertyAccessor->setValue($object, 'aircraft', array('aeroplane'));
+        $this->propertyAccessor->setValue($object, 'aircraft', ['aeroplane']);
 
-        $this->assertEquals(array('aeroplane'), $object->getAircraft());
+        $this->assertEquals(['aeroplane'], $object->getAircraft());
     }
 }
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyPathBuilderTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyPathBuilderTest.php
index 44822699a877f..287b4b1f8361c 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyPathBuilderTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyPathBuilderTest.php
@@ -204,10 +204,10 @@ public function testReplaceDoesNotAllowInvalidOffsets($offset)
 
     public function provideInvalidOffsets()
     {
-        return array(
-            array(6),
-            array(-7),
-        );
+        return [
+            [6],
+            [-7],
+        ];
     }
 
     public function testReplaceWithLengthGreaterOne()
diff --git a/src/Symfony/Component/PropertyAccess/Tests/TestPluralAdderRemoverAndSetter.php b/src/Symfony/Component/PropertyAccess/Tests/TestPluralAdderRemoverAndSetter.php
index ecb3f9b4a9d32..300e48e0d4061 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/TestPluralAdderRemoverAndSetter.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/TestPluralAdderRemoverAndSetter.php
@@ -13,7 +13,7 @@
 
 class TestPluralAdderRemoverAndSetter
 {
-    private $emails = array();
+    private $emails = [];
 
     public function getEmails()
     {
@@ -22,7 +22,7 @@ public function getEmails()
 
     public function setEmails(array $emails)
     {
-        $this->emails = array('foo@email.com');
+        $this->emails = ['foo@email.com'];
     }
 
     public function addEmail($email)
@@ -32,6 +32,6 @@ public function addEmail($email)
 
     public function removeEmail($email)
     {
-        $this->emails = array_diff($this->emails, array($email));
+        $this->emails = array_diff($this->emails, [$email]);
     }
 }
diff --git a/src/Symfony/Component/PropertyAccess/Tests/TestPluralAdderRemoverAndSetterSameSingularAndPlural.php b/src/Symfony/Component/PropertyAccess/Tests/TestPluralAdderRemoverAndSetterSameSingularAndPlural.php
index bb3b4f4688dc5..84eb9c9e75ad2 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/TestPluralAdderRemoverAndSetterSameSingularAndPlural.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/TestPluralAdderRemoverAndSetterSameSingularAndPlural.php
@@ -4,7 +4,7 @@
 
 class TestPluralAdderRemoverAndSetterSameSingularAndPlural
 {
-    private $aircraft = array();
+    private $aircraft = [];
 
     public function getAircraft()
     {
@@ -13,7 +13,7 @@ public function getAircraft()
 
     public function setAircraft(array $aircraft)
     {
-        $this->aircraft = array('plane');
+        $this->aircraft = ['plane'];
     }
 
     public function addAircraft($aircraft)
@@ -23,6 +23,6 @@ public function addAircraft($aircraft)
 
     public function removeAircraft($aircraft)
     {
-        $this->aircraft = array_diff($this->aircraft, array($aircraft));
+        $this->aircraft = array_diff($this->aircraft, [$aircraft]);
     }
 }
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
index c500d5fea8ebe..7d47cd047003f 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
@@ -36,7 +36,7 @@ class PhpDocExtractor implements PropertyDescriptionExtractorInterface, Property
     /**
      * @var DocBlock[]
      */
-    private $docBlocks = array();
+    private $docBlocks = [];
 
     private $docBlockFactory;
     private $contextFactory;
@@ -68,7 +68,7 @@ public function __construct(DocBlockFactoryInterface $docBlockFactory = null, ar
     /**
      * {@inheritdoc}
      */
-    public function getShortDescription($class, $property, array $context = array())
+    public function getShortDescription($class, $property, array $context = [])
     {
         /** @var $docBlock DocBlock */
         list($docBlock) = $this->getDocBlock($class, $property);
@@ -94,7 +94,7 @@ public function getShortDescription($class, $property, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function getLongDescription($class, $property, array $context = array())
+    public function getLongDescription($class, $property, array $context = [])
     {
         /** @var $docBlock DocBlock */
         list($docBlock) = $this->getDocBlock($class, $property);
@@ -110,7 +110,7 @@ public function getLongDescription($class, $property, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function getTypes($class, $property, array $context = array())
+    public function getTypes($class, $property, array $context = [])
     {
         /** @var $docBlock DocBlock */
         list($docBlock, $source, $prefix) = $this->getDocBlock($class, $property);
@@ -132,7 +132,7 @@ public function getTypes($class, $property, array $context = array())
                 break;
         }
 
-        $types = array();
+        $types = [];
         /** @var DocBlock\Tags\Var_|DocBlock\Tags\Return_|DocBlock\Tags\Param $tag */
         foreach ($docBlock->getTagsByName($tag) as $tag) {
             if ($tag && null !== $tag->getType()) {
@@ -148,7 +148,7 @@ public function getTypes($class, $property, array $context = array())
             return $types;
         }
 
-        return array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), $types[0]));
+        return [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), $types[0])];
     }
 
     /**
@@ -171,19 +171,19 @@ private function getDocBlock($class, $property)
 
         switch (true) {
             case $docBlock = $this->getDocBlockFromProperty($class, $property):
-                $data = array($docBlock, self::PROPERTY, null);
+                $data = [$docBlock, self::PROPERTY, null];
                 break;
 
             case list($docBlock) = $this->getDocBlockFromMethod($class, $ucFirstProperty, self::ACCESSOR):
-                $data = array($docBlock, self::ACCESSOR, null);
+                $data = [$docBlock, self::ACCESSOR, null];
                 break;
 
             case list($docBlock, $prefix) = $this->getDocBlockFromMethod($class, $ucFirstProperty, self::MUTATOR):
-                $data = array($docBlock, self::MUTATOR, $prefix);
+                $data = [$docBlock, self::MUTATOR, $prefix];
                 break;
 
             default:
-                $data = array(null, null, null);
+                $data = [null, null, null];
         }
 
         return $this->docBlocks[$propertyHash] = $data;
@@ -252,7 +252,7 @@ private function getDocBlockFromMethod($class, $ucFirstProperty, $type)
         }
 
         try {
-            return array($this->docBlockFactory->create($reflectionMethod, $this->contextFactory->createFromReflector($reflectionMethod)), $prefix);
+            return [$this->docBlockFactory->create($reflectionMethod, $this->contextFactory->createFromReflector($reflectionMethod)), $prefix];
         } catch (\InvalidArgumentException $e) {
             return null;
         }
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
index 41c947d8e3a3a..ef890a25a9a2a 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -77,7 +77,7 @@ public function __construct(array $mutatorPrefixes = null, array $accessorPrefix
     /**
      * {@inheritdoc}
      */
-    public function getProperties($class, array $context = array())
+    public function getProperties($class, array $context = [])
     {
         try {
             $reflectionClass = new \ReflectionClass($class);
@@ -87,7 +87,7 @@ public function getProperties($class, array $context = array())
 
         $reflectionProperties = $reflectionClass->getProperties();
 
-        $properties = array();
+        $properties = [];
         foreach ($reflectionProperties as $reflectionProperty) {
             if ($reflectionProperty->isPublic()) {
                 $properties[$reflectionProperty->name] = $reflectionProperty->name;
@@ -115,7 +115,7 @@ public function getProperties($class, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function getTypes($class, $property, array $context = array())
+    public function getTypes($class, $property, array $context = [])
     {
         if ($fromMutator = $this->extractFromMutator($class, $property)) {
             return $fromMutator;
@@ -129,7 +129,7 @@ public function getTypes($class, $property, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function isReadable($class, $property, array $context = array())
+    public function isReadable($class, $property, array $context = [])
     {
         if ($this->isPublicProperty($class, $property)) {
             return true;
@@ -143,7 +143,7 @@ public function isReadable($class, $property, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function isWritable($class, $property, array $context = array())
+    public function isWritable($class, $property, array $context = [])
     {
         if ($this->isPublicProperty($class, $property)) {
             return true;
@@ -198,7 +198,7 @@ private function extractFromMutator($class, $property)
             $type = new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), $type);
         }
 
-        return array($type);
+        return [$type];
     }
 
     /**
@@ -304,7 +304,7 @@ private function getAccessorMethod($class, $property)
                 }
 
                 if (0 === $reflectionMethod->getNumberOfRequiredParameters()) {
-                    return array($reflectionMethod, $prefix);
+                    return [$reflectionMethod, $prefix];
                 }
             } catch (\ReflectionException $e) {
                 // Return null if the property doesn't exist
@@ -329,7 +329,7 @@ private function getMutatorMethod($class, $property)
         $ucSingulars = (array) Inflector::singularize($ucProperty);
 
         foreach ($this->mutatorPrefixes as $prefix) {
-            $names = array($ucProperty);
+            $names = [$ucProperty];
             if (\in_array($prefix, $this->arrayMutatorPrefixes)) {
                 $names = array_merge($names, $ucSingulars);
             }
@@ -343,7 +343,7 @@ private function getMutatorMethod($class, $property)
 
                     // Parameter can be optional to allow things like: method(array $foo = null)
                     if ($reflectionMethod->getNumberOfParameters() >= 1) {
-                        return array($reflectionMethod, $prefix);
+                        return [$reflectionMethod, $prefix];
                     }
                 } catch (\ReflectionException $e) {
                     // Try the next prefix if the method doesn't exist
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/SerializerExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/SerializerExtractor.php
index 59acd4de2bbfc..12955b6ca0dd6 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/SerializerExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/SerializerExtractor.php
@@ -33,7 +33,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory)
     /**
      * {@inheritdoc}
      */
-    public function getProperties($class, array $context = array())
+    public function getProperties($class, array $context = [])
     {
         if (!isset($context['serializer_groups']) || !\is_array($context['serializer_groups'])) {
             return;
@@ -43,7 +43,7 @@ public function getProperties($class, array $context = array())
             return;
         }
 
-        $properties = array();
+        $properties = [];
         $serializerClassMetadata = $this->classMetadataFactory->getMetadataFor($class);
 
         foreach ($serializerClassMetadata->getAttributesMetadata() as $serializerAttributeMetadata) {
diff --git a/src/Symfony/Component/PropertyInfo/PropertyAccessExtractorInterface.php b/src/Symfony/Component/PropertyInfo/PropertyAccessExtractorInterface.php
index ecf44d9d656c7..49d5afb032c47 100644
--- a/src/Symfony/Component/PropertyInfo/PropertyAccessExtractorInterface.php
+++ b/src/Symfony/Component/PropertyInfo/PropertyAccessExtractorInterface.php
@@ -27,7 +27,7 @@ interface PropertyAccessExtractorInterface
      *
      * @return bool|null
      */
-    public function isReadable($class, $property, array $context = array());
+    public function isReadable($class, $property, array $context = []);
 
     /**
      * Is the property writable?
@@ -38,5 +38,5 @@ public function isReadable($class, $property, array $context = array());
      *
      * @return bool|null
      */
-    public function isWritable($class, $property, array $context = array());
+    public function isWritable($class, $property, array $context = []);
 }
diff --git a/src/Symfony/Component/PropertyInfo/PropertyDescriptionExtractorInterface.php b/src/Symfony/Component/PropertyInfo/PropertyDescriptionExtractorInterface.php
index 3f400a8fa53ea..385e772b9f09f 100644
--- a/src/Symfony/Component/PropertyInfo/PropertyDescriptionExtractorInterface.php
+++ b/src/Symfony/Component/PropertyInfo/PropertyDescriptionExtractorInterface.php
@@ -27,7 +27,7 @@ interface PropertyDescriptionExtractorInterface
      *
      * @return string|null
      */
-    public function getShortDescription($class, $property, array $context = array());
+    public function getShortDescription($class, $property, array $context = []);
 
     /**
      * Gets the long description of the property.
@@ -38,5 +38,5 @@ public function getShortDescription($class, $property, array $context = array())
      *
      * @return string|null
      */
-    public function getLongDescription($class, $property, array $context = array());
+    public function getLongDescription($class, $property, array $context = []);
 }
diff --git a/src/Symfony/Component/PropertyInfo/PropertyInfoCacheExtractor.php b/src/Symfony/Component/PropertyInfo/PropertyInfoCacheExtractor.php
index 52e94b8162e05..1cbed13a33c31 100644
--- a/src/Symfony/Component/PropertyInfo/PropertyInfoCacheExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/PropertyInfoCacheExtractor.php
@@ -24,7 +24,7 @@ class PropertyInfoCacheExtractor implements PropertyInfoExtractorInterface
 {
     private $propertyInfoExtractor;
     private $cacheItemPool;
-    private $arrayCache = array();
+    private $arrayCache = [];
 
     public function __construct(PropertyInfoExtractorInterface $propertyInfoExtractor, CacheItemPoolInterface $cacheItemPool)
     {
@@ -35,49 +35,49 @@ public function __construct(PropertyInfoExtractorInterface $propertyInfoExtracto
     /**
      * {@inheritdoc}
      */
-    public function isReadable($class, $property, array $context = array())
+    public function isReadable($class, $property, array $context = [])
     {
-        return $this->extract('isReadable', array($class, $property, $context));
+        return $this->extract('isReadable', [$class, $property, $context]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function isWritable($class, $property, array $context = array())
+    public function isWritable($class, $property, array $context = [])
     {
-        return $this->extract('isWritable', array($class, $property, $context));
+        return $this->extract('isWritable', [$class, $property, $context]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getShortDescription($class, $property, array $context = array())
+    public function getShortDescription($class, $property, array $context = [])
     {
-        return $this->extract('getShortDescription', array($class, $property, $context));
+        return $this->extract('getShortDescription', [$class, $property, $context]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getLongDescription($class, $property, array $context = array())
+    public function getLongDescription($class, $property, array $context = [])
     {
-        return $this->extract('getLongDescription', array($class, $property, $context));
+        return $this->extract('getLongDescription', [$class, $property, $context]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getProperties($class, array $context = array())
+    public function getProperties($class, array $context = [])
     {
-        return $this->extract('getProperties', array($class, $context));
+        return $this->extract('getProperties', [$class, $context]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getTypes($class, $property, array $context = array())
+    public function getTypes($class, $property, array $context = [])
     {
-        return $this->extract('getTypes', array($class, $property, $context));
+        return $this->extract('getTypes', [$class, $property, $context]);
     }
 
     /**
diff --git a/src/Symfony/Component/PropertyInfo/PropertyInfoExtractor.php b/src/Symfony/Component/PropertyInfo/PropertyInfoExtractor.php
index 53881fb71aa35..5939e00217096 100644
--- a/src/Symfony/Component/PropertyInfo/PropertyInfoExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/PropertyInfoExtractor.php
@@ -42,49 +42,49 @@ public function __construct($listExtractors = array(), $typeExtractors = array()
     /**
      * {@inheritdoc}
      */
-    public function getProperties($class, array $context = array())
+    public function getProperties($class, array $context = [])
     {
-        return $this->extract($this->listExtractors, 'getProperties', array($class, $context));
+        return $this->extract($this->listExtractors, 'getProperties', [$class, $context]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getShortDescription($class, $property, array $context = array())
+    public function getShortDescription($class, $property, array $context = [])
     {
-        return $this->extract($this->descriptionExtractors, 'getShortDescription', array($class, $property, $context));
+        return $this->extract($this->descriptionExtractors, 'getShortDescription', [$class, $property, $context]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getLongDescription($class, $property, array $context = array())
+    public function getLongDescription($class, $property, array $context = [])
     {
-        return $this->extract($this->descriptionExtractors, 'getLongDescription', array($class, $property, $context));
+        return $this->extract($this->descriptionExtractors, 'getLongDescription', [$class, $property, $context]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getTypes($class, $property, array $context = array())
+    public function getTypes($class, $property, array $context = [])
     {
-        return $this->extract($this->typeExtractors, 'getTypes', array($class, $property, $context));
+        return $this->extract($this->typeExtractors, 'getTypes', [$class, $property, $context]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function isReadable($class, $property, array $context = array())
+    public function isReadable($class, $property, array $context = [])
     {
-        return $this->extract($this->accessExtractors, 'isReadable', array($class, $property, $context));
+        return $this->extract($this->accessExtractors, 'isReadable', [$class, $property, $context]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function isWritable($class, $property, array $context = array())
+    public function isWritable($class, $property, array $context = [])
     {
-        return $this->extract($this->accessExtractors, 'isWritable', array($class, $property, $context));
+        return $this->extract($this->accessExtractors, 'isWritable', [$class, $property, $context]);
     }
 
     /**
diff --git a/src/Symfony/Component/PropertyInfo/PropertyListExtractorInterface.php b/src/Symfony/Component/PropertyInfo/PropertyListExtractorInterface.php
index 1faae33d02531..2c831731cf697 100644
--- a/src/Symfony/Component/PropertyInfo/PropertyListExtractorInterface.php
+++ b/src/Symfony/Component/PropertyInfo/PropertyListExtractorInterface.php
@@ -26,5 +26,5 @@ interface PropertyListExtractorInterface
      *
      * @return string[]|null
      */
-    public function getProperties($class, array $context = array());
+    public function getProperties($class, array $context = []);
 }
diff --git a/src/Symfony/Component/PropertyInfo/PropertyTypeExtractorInterface.php b/src/Symfony/Component/PropertyInfo/PropertyTypeExtractorInterface.php
index 8aa08b4e85e5e..c970530f2e93f 100644
--- a/src/Symfony/Component/PropertyInfo/PropertyTypeExtractorInterface.php
+++ b/src/Symfony/Component/PropertyInfo/PropertyTypeExtractorInterface.php
@@ -27,5 +27,5 @@ interface PropertyTypeExtractorInterface
      *
      * @return Type[]|null
      */
-    public function getTypes($class, $property, array $context = array());
+    public function getTypes($class, $property, array $context = []);
 }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/AbstractPropertyInfoExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/AbstractPropertyInfoExtractorTest.php
index 5b729c79e1e1f..87cea1c8dec60 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/AbstractPropertyInfoExtractorTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/AbstractPropertyInfoExtractorTest.php
@@ -43,31 +43,31 @@ public function testInstanceOf()
 
     public function testGetShortDescription()
     {
-        $this->assertSame('short', $this->propertyInfo->getShortDescription('Foo', 'bar', array()));
+        $this->assertSame('short', $this->propertyInfo->getShortDescription('Foo', 'bar', []));
     }
 
     public function testGetLongDescription()
     {
-        $this->assertSame('long', $this->propertyInfo->getLongDescription('Foo', 'bar', array()));
+        $this->assertSame('long', $this->propertyInfo->getLongDescription('Foo', 'bar', []));
     }
 
     public function testGetTypes()
     {
-        $this->assertEquals(array(new Type(Type::BUILTIN_TYPE_INT)), $this->propertyInfo->getTypes('Foo', 'bar', array()));
+        $this->assertEquals([new Type(Type::BUILTIN_TYPE_INT)], $this->propertyInfo->getTypes('Foo', 'bar', []));
     }
 
     public function testIsReadable()
     {
-        $this->assertTrue($this->propertyInfo->isReadable('Foo', 'bar', array()));
+        $this->assertTrue($this->propertyInfo->isReadable('Foo', 'bar', []));
     }
 
     public function testIsWritable()
     {
-        $this->assertTrue($this->propertyInfo->isWritable('Foo', 'bar', array()));
+        $this->assertTrue($this->propertyInfo->isWritable('Foo', 'bar', []));
     }
 
     public function testGetProperties()
     {
-        $this->assertEquals(array('a', 'b'), $this->propertyInfo->getProperties('Foo'));
+        $this->assertEquals(['a', 'b'], $this->propertyInfo->getProperties('Foo'));
     }
 }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
index 6766b249a77d8..6a778535efc82 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
@@ -193,17 +193,17 @@ public function testReturnNullOnEmptyDocBlock()
 
     public function dockBlockFallbackTypesProvider()
     {
-        return array(
-            'pub' => array(
-                'pub', array(new Type(Type::BUILTIN_TYPE_STRING)),
-            ),
-            'protAcc' => array(
-                'protAcc', array(new Type(Type::BUILTIN_TYPE_INT)),
-            ),
-            'protMut' => array(
-                'protMut', array(new Type(Type::BUILTIN_TYPE_BOOL)),
-            ),
-        );
+        return [
+            'pub' => [
+                'pub', [new Type(Type::BUILTIN_TYPE_STRING)],
+            ],
+            'protAcc' => [
+                'protAcc', [new Type(Type::BUILTIN_TYPE_INT)],
+            ],
+            'protMut' => [
+                'protMut', [new Type(Type::BUILTIN_TYPE_BOOL)],
+            ],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
index 24ef06239be59..0ed5390bb5882 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -34,7 +34,7 @@ protected function setUp()
     public function testGetProperties()
     {
         $this->assertSame(
-            array(
+            [
                 'bal',
                 'parent',
                 'collection',
@@ -63,7 +63,7 @@ public function testGetProperties()
                 'd',
                 'e',
                 'f',
-            ),
+            ],
             $this->extractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy')
         );
 
@@ -72,10 +72,10 @@ public function testGetProperties()
 
     public function testGetPropertiesWithCustomPrefixes()
     {
-        $customExtractor = new ReflectionExtractor(array('add', 'remove'), array('is', 'can'));
+        $customExtractor = new ReflectionExtractor(['add', 'remove'], ['is', 'can']);
 
         $this->assertSame(
-            array(
+            [
                 'bal',
                 'parent',
                 'collection',
@@ -98,17 +98,17 @@ public function testGetPropertiesWithCustomPrefixes()
                 'd',
                 'e',
                 'f',
-            ),
+            ],
             $customExtractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy')
         );
     }
 
     public function testGetPropertiesWithNoPrefixes()
     {
-        $noPrefixExtractor = new ReflectionExtractor(array(), array(), array());
+        $noPrefixExtractor = new ReflectionExtractor([], [], []);
 
         $this->assertSame(
-            array(
+            [
                 'bal',
                 'parent',
                 'collection',
@@ -127,7 +127,7 @@ public function testGetPropertiesWithNoPrefixes()
                 'foo4',
                 'foo5',
                 'files',
-            ),
+            ],
             $noPrefixExtractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy')
         );
     }
@@ -137,24 +137,24 @@ public function testGetPropertiesWithNoPrefixes()
      */
     public function testExtractors($property, array $type = null)
     {
-        $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', $property, array()));
+        $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', $property, []));
     }
 
     public function typesProvider()
     {
-        return array(
-            array('a', null),
-            array('b', array(new Type(Type::BUILTIN_TYPE_OBJECT, true, 'Symfony\Component\PropertyInfo\Tests\Fixtures\ParentDummy'))),
-            array('c', array(new Type(Type::BUILTIN_TYPE_BOOL))),
-            array('d', array(new Type(Type::BUILTIN_TYPE_BOOL))),
-            array('e', null),
-            array('f', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTime')))),
-            array('donotexist', null),
-            array('staticGetter', null),
-            array('staticSetter', null),
-            array('self', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy'))),
-            array('realParent', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\ParentDummy'))),
-        );
+        return [
+            ['a', null],
+            ['b', [new Type(Type::BUILTIN_TYPE_OBJECT, true, 'Symfony\Component\PropertyInfo\Tests\Fixtures\ParentDummy')]],
+            ['c', [new Type(Type::BUILTIN_TYPE_BOOL)]],
+            ['d', [new Type(Type::BUILTIN_TYPE_BOOL)]],
+            ['e', null],
+            ['f', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTime'))]],
+            ['donotexist', null],
+            ['staticGetter', null],
+            ['staticSetter', null],
+            ['self', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy')]],
+            ['realParent', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\ParentDummy')]],
+        ];
     }
 
     /**
@@ -163,19 +163,19 @@ public function typesProvider()
      */
     public function testExtractPhp7Type($property, array $type = null)
     {
-        $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php7Dummy', $property, array()));
+        $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php7Dummy', $property, []));
     }
 
     public function php7TypesProvider()
     {
-        return array(
-            array('foo', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true))),
-            array('bar', array(new Type(Type::BUILTIN_TYPE_INT))),
-            array('baz', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING)))),
-            array('buz', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\Php7Dummy'))),
-            array('biz', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'stdClass'))),
-            array('donotexist', null),
-        );
+        return [
+            ['foo', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true)]],
+            ['bar', [new Type(Type::BUILTIN_TYPE_INT)]],
+            ['baz', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING))]],
+            ['buz', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\Php7Dummy')]],
+            ['biz', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'stdClass')]],
+            ['donotexist', null],
+        ];
     }
 
     /**
@@ -184,18 +184,18 @@ public function php7TypesProvider()
      */
     public function testExtractPhp71Type($property, array $type = null)
     {
-        $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php71Dummy', $property, array()));
+        $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php71Dummy', $property, []));
     }
 
     public function php71TypesProvider()
     {
-        return array(
-            array('foo', array(new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true))),
-            array('buz', array(new Type(Type::BUILTIN_TYPE_NULL))),
-            array('bar', array(new Type(Type::BUILTIN_TYPE_INT, true))),
-            array('baz', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING)))),
-            array('donotexist', null),
-        );
+        return [
+            ['foo', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)]],
+            ['buz', [new Type(Type::BUILTIN_TYPE_NULL)]],
+            ['bar', [new Type(Type::BUILTIN_TYPE_INT, true)]],
+            ['baz', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING))]],
+            ['donotexist', null],
+        ];
     }
 
     /**
@@ -205,27 +205,27 @@ public function testIsReadable($property, $expected)
     {
         $this->assertSame(
             $expected,
-            $this->extractor->isReadable('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', $property, array())
+            $this->extractor->isReadable('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', $property, [])
         );
     }
 
     public function getReadableProperties()
     {
-        return array(
-            array('bar', false),
-            array('baz', false),
-            array('parent', true),
-            array('a', true),
-            array('b', false),
-            array('c', true),
-            array('d', true),
-            array('e', false),
-            array('f', false),
-            array('Id', true),
-            array('id', true),
-            array('Guid', true),
-            array('guid', false),
-        );
+        return [
+            ['bar', false],
+            ['baz', false],
+            ['parent', true],
+            ['a', true],
+            ['b', false],
+            ['c', true],
+            ['d', true],
+            ['e', false],
+            ['f', false],
+            ['Id', true],
+            ['id', true],
+            ['Guid', true],
+            ['guid', false],
+        ];
     }
 
     /**
@@ -235,32 +235,32 @@ public function testIsWritable($property, $expected)
     {
         $this->assertSame(
             $expected,
-            $this->extractor->isWritable('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', $property, array())
+            $this->extractor->isWritable('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', $property, [])
         );
     }
 
     public function getWritableProperties()
     {
-        return array(
-            array('bar', false),
-            array('baz', false),
-            array('parent', true),
-            array('a', false),
-            array('b', true),
-            array('c', false),
-            array('d', false),
-            array('e', true),
-            array('f', true),
-            array('Id', false),
-            array('Guid', true),
-            array('guid', false),
-        );
+        return [
+            ['bar', false],
+            ['baz', false],
+            ['parent', true],
+            ['a', false],
+            ['b', true],
+            ['c', false],
+            ['d', false],
+            ['e', true],
+            ['f', true],
+            ['Id', false],
+            ['Guid', true],
+            ['guid', false],
+        ];
     }
 
     public function testSingularize()
     {
         $this->assertTrue($this->extractor->isWritable(AdderRemoverDummy::class, 'analyses'));
         $this->assertTrue($this->extractor->isWritable(AdderRemoverDummy::class, 'feet'));
-        $this->assertEquals(array('analyses', 'feet'), $this->extractor->getProperties(AdderRemoverDummy::class));
+        $this->assertEquals(['analyses', 'feet'], $this->extractor->getProperties(AdderRemoverDummy::class));
     }
 }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/SerializerExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/SerializerExtractorTest.php
index 91cdf80f8d608..791398e3f2658 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/SerializerExtractorTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/SerializerExtractorTest.php
@@ -36,8 +36,8 @@ protected function setUp()
     public function testGetProperties()
     {
         $this->assertEquals(
-            array('collection'),
-            $this->extractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', array('serializer_groups' => array('a')))
+            ['collection'],
+            $this->extractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', ['serializer_groups' => ['a']])
         );
     }
 }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/DummyExtractor.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/DummyExtractor.php
index cfabcf2a90219..cb17020a55eb4 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/DummyExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/DummyExtractor.php
@@ -25,7 +25,7 @@ class DummyExtractor implements PropertyListExtractorInterface, PropertyDescript
     /**
      * {@inheritdoc}
      */
-    public function getShortDescription($class, $property, array $context = array())
+    public function getShortDescription($class, $property, array $context = [])
     {
         return 'short';
     }
@@ -33,7 +33,7 @@ public function getShortDescription($class, $property, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function getLongDescription($class, $property, array $context = array())
+    public function getLongDescription($class, $property, array $context = [])
     {
         return 'long';
     }
@@ -41,15 +41,15 @@ public function getLongDescription($class, $property, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function getTypes($class, $property, array $context = array())
+    public function getTypes($class, $property, array $context = [])
     {
-        return array(new Type(Type::BUILTIN_TYPE_INT));
+        return [new Type(Type::BUILTIN_TYPE_INT)];
     }
 
     /**
      * {@inheritdoc}
      */
-    public function isReadable($class, $property, array $context = array())
+    public function isReadable($class, $property, array $context = [])
     {
         return true;
     }
@@ -57,7 +57,7 @@ public function isReadable($class, $property, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function isWritable($class, $property, array $context = array())
+    public function isWritable($class, $property, array $context = [])
     {
         return true;
     }
@@ -65,8 +65,8 @@ public function isWritable($class, $property, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function getProperties($class, array $context = array())
+    public function getProperties($class, array $context = [])
     {
-        return array('a', 'b');
+        return ['a', 'b'];
     }
 }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/NullExtractor.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/NullExtractor.php
index 1f263bfc3cd75..c6a1785f4925e 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/NullExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/NullExtractor.php
@@ -26,7 +26,7 @@ class NullExtractor implements PropertyListExtractorInterface, PropertyDescripti
     /**
      * {@inheritdoc}
      */
-    public function getShortDescription($class, $property, array $context = array())
+    public function getShortDescription($class, $property, array $context = [])
     {
         $this->assertIsString($class);
         $this->assertIsString($property);
@@ -35,7 +35,7 @@ public function getShortDescription($class, $property, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function getLongDescription($class, $property, array $context = array())
+    public function getLongDescription($class, $property, array $context = [])
     {
         $this->assertIsString($class);
         $this->assertIsString($property);
@@ -44,7 +44,7 @@ public function getLongDescription($class, $property, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function getTypes($class, $property, array $context = array())
+    public function getTypes($class, $property, array $context = [])
     {
         $this->assertIsString($class);
         $this->assertIsString($property);
@@ -53,7 +53,7 @@ public function getTypes($class, $property, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function isReadable($class, $property, array $context = array())
+    public function isReadable($class, $property, array $context = [])
     {
         $this->assertIsString($class);
         $this->assertIsString($property);
@@ -62,7 +62,7 @@ public function isReadable($class, $property, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function isWritable($class, $property, array $context = array())
+    public function isWritable($class, $property, array $context = [])
     {
         $this->assertIsString($class);
         $this->assertIsString($property);
@@ -71,7 +71,7 @@ public function isWritable($class, $property, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function getProperties($class, array $context = array())
+    public function getProperties($class, array $context = [])
     {
         $this->assertIsString($class);
     }
diff --git a/src/Symfony/Component/PropertyInfo/Type.php b/src/Symfony/Component/PropertyInfo/Type.php
index 53974fa528938..e408867723fc5 100644
--- a/src/Symfony/Component/PropertyInfo/Type.php
+++ b/src/Symfony/Component/PropertyInfo/Type.php
@@ -36,7 +36,7 @@ class Type
      *
      * @var string[]
      */
-    public static $builtinTypes = array(
+    public static $builtinTypes = [
         self::BUILTIN_TYPE_INT,
         self::BUILTIN_TYPE_FLOAT,
         self::BUILTIN_TYPE_STRING,
@@ -47,7 +47,7 @@ class Type
         self::BUILTIN_TYPE_CALLABLE,
         self::BUILTIN_TYPE_NULL,
         self::BUILTIN_TYPE_ITERABLE,
-    );
+    ];
 
     private $builtinType;
     private $nullable;
diff --git a/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php b/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php
index 5031c12fc3a17..0879a0459087c 100644
--- a/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php
+++ b/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php
@@ -32,7 +32,7 @@ final class PhpDocTypeHelper
      */
     public function getTypes(DocType $varType)
     {
-        $types = array();
+        $types = [];
         $nullable = false;
 
         if ($varType instanceof Nullable) {
@@ -53,7 +53,7 @@ public function getTypes(DocType $varType)
             return $types;
         }
 
-        $varTypes = array();
+        $varTypes = [];
         for ($typeIndex = 0; $varType->has($typeIndex); ++$typeIndex) {
             $varTypes[] = (string) $varType->get($typeIndex);
         }
@@ -155,9 +155,9 @@ private function normalizeType($docType)
     private function getPhpTypeAndClass($docType)
     {
         if (\in_array($docType, Type::$builtinTypes)) {
-            return array($docType, null);
+            return [$docType, null];
         }
 
-        return array('object', substr($docType, 1));
+        return ['object', substr($docType, 1)];
     }
 }
diff --git a/src/Symfony/Component/Routing/Annotation/Route.php b/src/Symfony/Component/Routing/Annotation/Route.php
index da47cea4e09df..338ba512dfe47 100644
--- a/src/Symfony/Component/Routing/Annotation/Route.php
+++ b/src/Symfony/Component/Routing/Annotation/Route.php
@@ -23,12 +23,12 @@ class Route
 {
     private $path;
     private $name;
-    private $requirements = array();
-    private $options = array();
-    private $defaults = array();
+    private $requirements = [];
+    private $options = [];
+    private $defaults = [];
     private $host;
-    private $methods = array();
-    private $schemes = array();
+    private $methods = [];
+    private $schemes = [];
     private $condition;
 
     /**
@@ -114,7 +114,7 @@ public function getDefaults()
 
     public function setSchemes($schemes)
     {
-        $this->schemes = \is_array($schemes) ? $schemes : array($schemes);
+        $this->schemes = \is_array($schemes) ? $schemes : [$schemes];
     }
 
     public function getSchemes()
@@ -124,7 +124,7 @@ public function getSchemes()
 
     public function setMethods($methods)
     {
-        $this->methods = \is_array($methods) ? $methods : array($methods);
+        $this->methods = \is_array($methods) ? $methods : [$methods];
     }
 
     public function getMethods()
diff --git a/src/Symfony/Component/Routing/CompiledRoute.php b/src/Symfony/Component/Routing/CompiledRoute.php
index 8ecf5153ce2f7..d6c0f4508336c 100644
--- a/src/Symfony/Component/Routing/CompiledRoute.php
+++ b/src/Symfony/Component/Routing/CompiledRoute.php
@@ -54,7 +54,7 @@ public function __construct($staticPrefix, $regex, array $tokens, array $pathVar
      */
     public function serialize()
     {
-        return serialize(array(
+        return serialize([
             'vars' => $this->variables,
             'path_prefix' => $this->staticPrefix,
             'path_regex' => $this->regex,
@@ -63,7 +63,7 @@ public function serialize()
             'host_regex' => $this->hostRegex,
             'host_tokens' => $this->hostTokens,
             'host_vars' => $this->hostVariables,
-        ));
+        ]);
     }
 
     /**
diff --git a/src/Symfony/Component/Routing/DependencyInjection/RoutingResolverPass.php b/src/Symfony/Component/Routing/DependencyInjection/RoutingResolverPass.php
index 6e858104cf07d..5bdbfb8214d5f 100644
--- a/src/Symfony/Component/Routing/DependencyInjection/RoutingResolverPass.php
+++ b/src/Symfony/Component/Routing/DependencyInjection/RoutingResolverPass.php
@@ -43,7 +43,7 @@ public function process(ContainerBuilder $container)
         $definition = $container->getDefinition($this->resolverServiceId);
 
         foreach ($this->findAndSortTaggedServices($this->loaderTag, $container) as $id) {
-            $definition->addMethodCall('addLoader', array(new Reference($id)));
+            $definition->addMethodCall('addLoader', [new Reference($id)]);
         }
     }
 }
diff --git a/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php b/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php
index 712412fecec58..cf108354a68e8 100644
--- a/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php
+++ b/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php
@@ -20,7 +20,7 @@
  */
 class MethodNotAllowedException extends \RuntimeException implements ExceptionInterface
 {
-    protected $allowedMethods = array();
+    protected $allowedMethods = [];
 
     public function __construct(array $allowedMethods, $message = null, $code = 0, \Exception $previous = null)
     {
diff --git a/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumperInterface.php b/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumperInterface.php
index fed3472392773..096519aa1a72f 100644
--- a/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumperInterface.php
+++ b/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumperInterface.php
@@ -28,7 +28,7 @@ interface GeneratorDumperInterface
      *
      * @return string Executable code
      */
-    public function dump(array $options = array());
+    public function dump(array $options = []);
 
     /**
      * Gets the routes to dump.
diff --git a/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php b/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
index 60bdf1da3522c..9fc45c58f695e 100644
--- a/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
+++ b/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
@@ -31,12 +31,12 @@ class PhpGeneratorDumper extends GeneratorDumper
      *
      * @return string A PHP class representing the generator class
      */
-    public function dump(array $options = array())
+    public function dump(array $options = [])
     {
-        $options = array_merge(array(
+        $options = array_merge([
             'class' => 'ProjectUrlGenerator',
             'base_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
-        ), $options);
+        ], $options);
 
         return <<<EOF
 <?php
@@ -80,7 +80,7 @@ private function generateDeclaredRoutes()
         foreach ($this->getRoutes()->all() as $name => $route) {
             $compiledRoute = $route->compile();
 
-            $properties = array();
+            $properties = [];
             $properties[] = $compiledRoute->getVariables();
             $properties[] = $route->getDefaults();
             $properties[] = $route->getRequirements();
diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
index 6ed70cabdfc21..4409796ed669e 100644
--- a/src/Symfony/Component/Routing/Generator/UrlGenerator.php
+++ b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -45,7 +45,7 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
      * "?" and "#" (would be interpreted wrongly as query and fragment identifier),
      * "'" and """ (are used as delimiters in HTML).
      */
-    protected $decodedChars = array(
+    protected $decodedChars = [
         // the slash can be used to designate a hierarchical structure and we want allow using it with this meaning
         // some webservers don't allow the slash in encoded form in the path for security reasons anyway
         // see http://stackoverflow.com/questions/4069002/http-400-if-2f-part-of-get-url-in-jboss
@@ -63,7 +63,7 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
         '%21' => '!',
         '%2A' => '*',
         '%7C' => '|',
-    );
+    ];
 
     public function __construct(RouteCollection $routes, RequestContext $context, LoggerInterface $logger = null)
     {
@@ -107,7 +107,7 @@ public function isStrictRequirements()
     /**
      * {@inheritdoc}
      */
-    public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH)
+    public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH)
     {
         if (null === $route = $this->routes->get($name)) {
             throw new RouteNotFoundException(sprintf('Unable to generate a URL for the named route "%s" as such route does not exist.', $name));
@@ -124,7 +124,7 @@ public function generate($name, $parameters = array(), $referenceType = self::AB
      * @throws InvalidParameterException           When a parameter value for a placeholder is not correct because
      *                                             it does not match the requirement
      */
-    protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $referenceType, $hostTokens, array $requiredSchemes = array())
+    protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $referenceType, $hostTokens, array $requiredSchemes = [])
     {
         $variables = array_flip($variables);
         $mergedParams = array_replace($defaults, $this->context->getParameters(), $parameters);
@@ -143,11 +143,11 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
                     // check requirement
                     if (null !== $this->strictRequirements && !preg_match('#^'.$token[2].'$#'.(empty($token[4]) ? '' : 'u'), $mergedParams[$token[3]])) {
                         if ($this->strictRequirements) {
-                            throw new InvalidParameterException(strtr($message, array('{parameter}' => $token[3], '{route}' => $name, '{expected}' => $token[2], '{given}' => $mergedParams[$token[3]])));
+                            throw new InvalidParameterException(strtr($message, ['{parameter}' => $token[3], '{route}' => $name, '{expected}' => $token[2], '{given}' => $mergedParams[$token[3]]]));
                         }
 
                         if ($this->logger) {
-                            $this->logger->error($message, array('parameter' => $token[3], 'route' => $name, 'expected' => $token[2], 'given' => $mergedParams[$token[3]]));
+                            $this->logger->error($message, ['parameter' => $token[3], 'route' => $name, 'expected' => $token[2], 'given' => $mergedParams[$token[3]]]);
                         }
 
                         return;
@@ -173,7 +173,7 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
         // the path segments "." and ".." are interpreted as relative reference when resolving a URI; see http://tools.ietf.org/html/rfc3986#section-3.3
         // so we need to encode them as they are not used for this purpose here
         // otherwise we would generate a URI that, when followed by a user agent (e.g. browser), does not match this route
-        $url = strtr($url, array('/../' => '/%2E%2E/', '/./' => '/%2E/'));
+        $url = strtr($url, ['/../' => '/%2E%2E/', '/./' => '/%2E/']);
         if ('/..' === substr($url, -3)) {
             $url = substr($url, 0, -2).'%2E%2E';
         } elseif ('/.' === substr($url, -2)) {
@@ -197,11 +197,11 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
                 if ('variable' === $token[0]) {
                     if (null !== $this->strictRequirements && !preg_match('#^'.$token[2].'$#i'.(empty($token[4]) ? '' : 'u'), $mergedParams[$token[3]])) {
                         if ($this->strictRequirements) {
-                            throw new InvalidParameterException(strtr($message, array('{parameter}' => $token[3], '{route}' => $name, '{expected}' => $token[2], '{given}' => $mergedParams[$token[3]])));
+                            throw new InvalidParameterException(strtr($message, ['{parameter}' => $token[3], '{route}' => $name, '{expected}' => $token[2], '{given}' => $mergedParams[$token[3]]]));
                         }
 
                         if ($this->logger) {
-                            $this->logger->error($message, array('parameter' => $token[3], 'route' => $name, 'expected' => $token[2], 'given' => $mergedParams[$token[3]]));
+                            $this->logger->error($message, ['parameter' => $token[3], 'route' => $name, 'expected' => $token[2], 'given' => $mergedParams[$token[3]]]);
                         }
 
                         return;
@@ -258,11 +258,11 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
         if ($extra && $query = http_build_query($extra, '', '&', PHP_QUERY_RFC3986)) {
             // "/" and "?" can be left decoded for better user experience, see
             // http://tools.ietf.org/html/rfc3986#section-3.4
-            $url .= '?'.strtr($query, array('%2F' => '/'));
+            $url .= '?'.strtr($query, ['%2F' => '/']);
         }
 
         if ('' !== $fragment) {
-            $url .= '#'.strtr(rawurlencode($fragment), array('%2F' => '/', '%3F' => '?'));
+            $url .= '#'.strtr(rawurlencode($fragment), ['%2F' => '/', '%3F' => '?']);
         }
 
         return $url;
diff --git a/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php b/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php
index d6e7938e5ba06..f7d37b2564b12 100644
--- a/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php
+++ b/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php
@@ -82,5 +82,5 @@ interface UrlGeneratorInterface extends RequestContextAwareInterface
      * @throws InvalidParameterException           When a parameter value for a placeholder is not correct because
      *                                             it does not match the requirement
      */
-    public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH);
+    public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH);
 }
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php
index 034a1c580c770..dfea551fa16f5 100644
--- a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php
+++ b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php
@@ -105,7 +105,7 @@ protected function findClass($file)
 
             if (true === $namespace && T_STRING === $token[0]) {
                 $namespace = $token[1];
-                while (isset($tokens[++$i][1]) && \in_array($tokens[$i][0], array(T_NS_SEPARATOR, T_STRING))) {
+                while (isset($tokens[++$i][1]) && \in_array($tokens[$i][0], [T_NS_SEPARATOR, T_STRING])) {
                     $namespace .= $tokens[$i][1];
                 }
                 $token = $tokens[$i];
@@ -122,7 +122,7 @@ protected function findClass($file)
                     if (T_DOUBLE_COLON === $tokens[$j][0] || T_NEW === $tokens[$j][0]) {
                         $skipClassToken = true;
                         break;
-                    } elseif (!\in_array($tokens[$j][0], array(T_WHITESPACE, T_DOC_COMMENT, T_COMMENT))) {
+                    } elseif (!\in_array($tokens[$j][0], [T_WHITESPACE, T_DOC_COMMENT, T_COMMENT])) {
                         break;
                     }
                 }
diff --git a/src/Symfony/Component/Routing/Loader/Configurator/Traits/RouteTrait.php b/src/Symfony/Component/Routing/Loader/Configurator/Traits/RouteTrait.php
index 4d2e255b14076..1d019fe48f754 100644
--- a/src/Symfony/Component/Routing/Loader/Configurator/Traits/RouteTrait.php
+++ b/src/Symfony/Component/Routing/Loader/Configurator/Traits/RouteTrait.php
@@ -124,7 +124,7 @@ final public function methods(array $methods)
      */
     final public function controller($controller)
     {
-        $this->route->addDefaults(array('_controller' => $controller));
+        $this->route->addDefaults(['_controller' => $controller]);
 
         return $this;
     }
diff --git a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
index 689245b5ac40e..acc3c7611d6f6 100644
--- a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
@@ -149,7 +149,7 @@ protected function parseImport(RouteCollection $collection, \DOMElement $node, $
         $imported = $this->import($resource, ('' !== $type ? $type : null), false, $file);
 
         if (!\is_array($imported)) {
-            $imported = array($imported);
+            $imported = [$imported];
         }
 
         foreach ($imported as $subCollection) {
@@ -203,9 +203,9 @@ protected function loadFile($file)
      */
     private function parseConfigs(\DOMElement $node, $path)
     {
-        $defaults = array();
-        $requirements = array();
-        $options = array();
+        $defaults = [];
+        $requirements = [];
+        $options = [];
         $condition = null;
 
         foreach ($node->getElementsByTagNameNS(self::NAMESPACE_URI, '*') as $n) {
@@ -310,7 +310,7 @@ private function parseDefaultNode(\DOMElement $node, $path)
             case 'string':
                 return trim($node->nodeValue);
             case 'list':
-                $list = array();
+                $list = [];
 
                 foreach ($node->childNodes as $element) {
                     if (!$element instanceof \DOMElement) {
@@ -326,7 +326,7 @@ private function parseDefaultNode(\DOMElement $node, $path)
 
                 return $list;
             case 'map':
-                $map = array();
+                $map = [];
 
                 foreach ($node->childNodes as $element) {
                     if (!$element instanceof \DOMElement) {
diff --git a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
index d6511daac963b..29c32b57581c9 100644
--- a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
@@ -102,7 +102,7 @@ public function load($file, $type = null)
      */
     public function supports($resource, $type = null)
     {
-        return \is_string($resource) && \in_array(pathinfo($resource, PATHINFO_EXTENSION), array('yml', 'yaml'), true) && (!$type || 'yaml' === $type);
+        return \is_string($resource) && \in_array(pathinfo($resource, PATHINFO_EXTENSION), ['yml', 'yaml'], true) && (!$type || 'yaml' === $type);
     }
 
     /**
@@ -115,12 +115,12 @@ public function supports($resource, $type = null)
      */
     protected function parseRoute(RouteCollection $collection, $name, array $config, $path)
     {
-        $defaults = isset($config['defaults']) ? $config['defaults'] : array();
-        $requirements = isset($config['requirements']) ? $config['requirements'] : array();
-        $options = isset($config['options']) ? $config['options'] : array();
+        $defaults = isset($config['defaults']) ? $config['defaults'] : [];
+        $requirements = isset($config['requirements']) ? $config['requirements'] : [];
+        $options = isset($config['options']) ? $config['options'] : [];
         $host = isset($config['host']) ? $config['host'] : '';
-        $schemes = isset($config['schemes']) ? $config['schemes'] : array();
-        $methods = isset($config['methods']) ? $config['methods'] : array();
+        $schemes = isset($config['schemes']) ? $config['schemes'] : [];
+        $methods = isset($config['methods']) ? $config['methods'] : [];
         $condition = isset($config['condition']) ? $config['condition'] : null;
 
         if (isset($config['controller'])) {
@@ -144,9 +144,9 @@ protected function parseImport(RouteCollection $collection, array $config, $path
     {
         $type = isset($config['type']) ? $config['type'] : null;
         $prefix = isset($config['prefix']) ? $config['prefix'] : '';
-        $defaults = isset($config['defaults']) ? $config['defaults'] : array();
-        $requirements = isset($config['requirements']) ? $config['requirements'] : array();
-        $options = isset($config['options']) ? $config['options'] : array();
+        $defaults = isset($config['defaults']) ? $config['defaults'] : [];
+        $requirements = isset($config['requirements']) ? $config['requirements'] : [];
+        $options = isset($config['options']) ? $config['options'] : [];
         $host = isset($config['host']) ? $config['host'] : null;
         $condition = isset($config['condition']) ? $config['condition'] : null;
         $schemes = isset($config['schemes']) ? $config['schemes'] : null;
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumperInterface.php b/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumperInterface.php
index 5e7c134b9f394..2a25293aa3e5c 100644
--- a/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumperInterface.php
+++ b/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumperInterface.php
@@ -28,7 +28,7 @@ interface MatcherDumperInterface
      *
      * @return string Executable code
      */
-    public function dump(array $options = array());
+    public function dump(array $options = []);
 
     /**
      * Gets the routes to dump.
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
index ac1f8f813598b..7457531eecf8e 100644
--- a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
+++ b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -30,7 +30,7 @@ class PhpMatcherDumper extends MatcherDumper
     /**
      * @var ExpressionFunctionProviderInterface[]
      */
-    private $expressionLanguageProviders = array();
+    private $expressionLanguageProviders = [];
 
     /**
      * Dumps a set of routes to a PHP class.
@@ -44,12 +44,12 @@ class PhpMatcherDumper extends MatcherDumper
      *
      * @return string A PHP class representing the matcher class
      */
-    public function dump(array $options = array())
+    public function dump(array $options = [])
     {
-        $options = array_replace(array(
+        $options = array_replace([
             'class' => 'ProjectUrlMatcher',
             'base_class' => 'Symfony\\Component\\Routing\\Matcher\\UrlMatcher',
-        ), $options);
+        ], $options);
 
         // trailing slash support is only enabled if we know how to redirect the user
         $interfaces = class_implements($options['base_class']);
diff --git a/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php b/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
index 61cad8e692f13..3c3c4bfcf919e 100644
--- a/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
+++ b/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
@@ -31,7 +31,7 @@ class TraceableUrlMatcher extends UrlMatcher
 
     public function getTraces($pathinfo)
     {
-        $this->traces = array();
+        $this->traces = [];
 
         try {
             $this->match($pathinfo);
@@ -57,7 +57,7 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
 
             if (!preg_match($compiledRoute->getRegex(), $pathinfo, $matches)) {
                 // does it match without any requirements?
-                $r = new Route($route->getPath(), $route->getDefaults(), array(), $route->getOptions());
+                $r = new Route($route->getPath(), $route->getDefaults(), [], $route->getOptions());
                 $cr = $r->compile();
                 if (!preg_match($cr->getRegex(), $pathinfo)) {
                     $this->addTrace(sprintf('Path "%s" does not match', $route->getPath()), self::ROUTE_DOES_NOT_MATCH, $name, $route);
@@ -66,7 +66,7 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
                 }
 
                 foreach ($route->getRequirements() as $n => $regex) {
-                    $r = new Route($route->getPath(), $route->getDefaults(), array($n => $regex), $route->getOptions());
+                    $r = new Route($route->getPath(), $route->getDefaults(), [$n => $regex], $route->getOptions());
                     $cr = $r->compile();
 
                     if (\in_array($n, $cr->getVariables()) && !preg_match($cr->getRegex(), $pathinfo)) {
@@ -80,7 +80,7 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
             }
 
             // check host requirement
-            $hostMatches = array();
+            $hostMatches = [];
             if ($compiledRoute->getHostRegex() && !preg_match($compiledRoute->getHostRegex(), $this->context->getHost(), $hostMatches)) {
                 $this->addTrace(sprintf('Host "%s" does not match the requirement ("%s")', $this->context->getHost(), $route->getHost()), self::ROUTE_ALMOST_MATCHES, $name, $route);
 
@@ -105,7 +105,7 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
 
             // check condition
             if ($condition = $route->getCondition()) {
-                if (!$this->getExpressionLanguage()->evaluate($condition, array('context' => $this->context, 'request' => $this->request ?: $this->createRequest($pathinfo)))) {
+                if (!$this->getExpressionLanguage()->evaluate($condition, ['context' => $this->context, 'request' => $this->request ?: $this->createRequest($pathinfo)])) {
                     $this->addTrace(sprintf('Condition "%s" does not evaluate to "true"', $condition), self::ROUTE_ALMOST_MATCHES, $name, $route);
 
                     continue;
@@ -131,11 +131,11 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
 
     private function addTrace($log, $level = self::ROUTE_DOES_NOT_MATCH, $name = null, $route = null)
     {
-        $this->traces[] = array(
+        $this->traces[] = [
             'log' => $log,
             'name' => $name,
             'level' => $level,
             'path' => null !== $route ? $route->getPath() : null,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
index 4b6494288ec6e..fcd48bd9da4d9 100644
--- a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
+++ b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
@@ -184,7 +184,7 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
             return $this->getAttributes($route, $name, array_replace($matches, $hostMatches, isset($status[1]) ? $status[1] : array()));
         }
 
-        return array();
+        return [];
     }
 
     /**
@@ -270,9 +270,9 @@ protected function createRequest($pathinfo)
             return null;
         }
 
-        return Request::create($this->context->getScheme().'://'.$this->context->getHost().$this->context->getBaseUrl().$pathinfo, $this->context->getMethod(), $this->context->getParameters(), array(), array(), array(
+        return Request::create($this->context->getScheme().'://'.$this->context->getHost().$this->context->getBaseUrl().$pathinfo, $this->context->getMethod(), $this->context->getParameters(), [], [], [
             'SCRIPT_FILENAME' => $this->context->getBaseUrl(),
             'SCRIPT_NAME' => $this->context->getBaseUrl(),
-        ));
+        ]);
     }
 }
diff --git a/src/Symfony/Component/Routing/RequestContext.php b/src/Symfony/Component/Routing/RequestContext.php
index d62a7766ef859..df33ec2d21bbd 100644
--- a/src/Symfony/Component/Routing/RequestContext.php
+++ b/src/Symfony/Component/Routing/RequestContext.php
@@ -31,7 +31,7 @@ class RequestContext
     private $httpPort;
     private $httpsPort;
     private $queryString;
-    private $parameters = array();
+    private $parameters = [];
 
     /**
      * @param string $baseUrl     The base URL
diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php
index 46e3e5502b95c..07db3b23db4d4 100644
--- a/src/Symfony/Component/Routing/Route.php
+++ b/src/Symfony/Component/Routing/Route.php
@@ -21,11 +21,11 @@ class Route implements \Serializable
 {
     private $path = '/';
     private $host = '';
-    private $schemes = array();
-    private $methods = array();
-    private $defaults = array();
-    private $requirements = array();
-    private $options = array();
+    private $schemes = [];
+    private $methods = [];
+    private $defaults = [];
+    private $requirements = [];
+    private $options = [];
     private $condition = '';
 
     /**
@@ -67,7 +67,7 @@ public function __construct($path, array $defaults = array(), array $requirement
      */
     public function serialize()
     {
-        return serialize(array(
+        return serialize([
             'path' => $this->path,
             'host' => $this->host,
             'defaults' => $this->defaults,
@@ -77,7 +77,7 @@ public function serialize()
             'methods' => $this->methods,
             'condition' => $this->condition,
             'compiled' => $this->compiled,
-        ));
+        ]);
     }
 
     /**
@@ -249,9 +249,9 @@ public function getOptions()
      */
     public function setOptions(array $options)
     {
-        $this->options = array(
+        $this->options = [
             'compiler_class' => 'Symfony\\Component\\Routing\\RouteCompiler',
-        );
+        ];
 
         return $this->addOptions($options);
     }
@@ -338,7 +338,7 @@ public function getDefaults()
      */
     public function setDefaults(array $defaults)
     {
-        $this->defaults = array();
+        $this->defaults = [];
 
         return $this->addDefaults($defaults);
     }
@@ -423,7 +423,7 @@ public function getRequirements()
      */
     public function setRequirements(array $requirements)
     {
-        $this->requirements = array();
+        $this->requirements = [];
 
         return $this->addRequirements($requirements);
     }
diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php
index c42229af28782..feac415513081 100644
--- a/src/Symfony/Component/Routing/RouteCollection.php
+++ b/src/Symfony/Component/Routing/RouteCollection.php
@@ -28,12 +28,12 @@ class RouteCollection implements \IteratorAggregate, \Countable
     /**
      * @var Route[]
      */
-    private $routes = array();
+    private $routes = [];
 
     /**
      * @var array
      */
-    private $resources = array();
+    private $resources = [];
 
     public function __clone()
     {
@@ -138,7 +138,7 @@ public function addCollection(self $collection)
      * @param array  $defaults     An array of default values
      * @param array  $requirements An array of requirements
      */
-    public function addPrefix($prefix, array $defaults = array(), array $requirements = array())
+    public function addPrefix($prefix, array $defaults = [], array $requirements = [])
     {
         $prefix = trim(trim($prefix), '/');
 
@@ -160,7 +160,7 @@ public function addPrefix($prefix, array $defaults = array(), array $requirement
      * @param array  $defaults     An array of default values
      * @param array  $requirements An array of requirements
      */
-    public function setHost($pattern, array $defaults = array(), array $requirements = array())
+    public function setHost($pattern, array $defaults = [], array $requirements = [])
     {
         foreach ($this->routes as $route) {
             $route->setHost($pattern);
diff --git a/src/Symfony/Component/Routing/RouteCollectionBuilder.php b/src/Symfony/Component/Routing/RouteCollectionBuilder.php
index 05dcc3627f3f2..800e448cf3b46 100644
--- a/src/Symfony/Component/Routing/RouteCollectionBuilder.php
+++ b/src/Symfony/Component/Routing/RouteCollectionBuilder.php
@@ -25,18 +25,18 @@ class RouteCollectionBuilder
     /**
      * @var Route[]|RouteCollectionBuilder[]
      */
-    private $routes = array();
+    private $routes = [];
 
     private $loader;
-    private $defaults = array();
+    private $defaults = [];
     private $prefix;
     private $host;
     private $condition;
-    private $requirements = array();
-    private $options = array();
+    private $requirements = [];
+    private $options = [];
     private $schemes;
     private $methods;
-    private $resources = array();
+    private $resources = [];
 
     public function __construct(LoaderInterface $loader = null)
     {
@@ -332,7 +332,7 @@ private function generateRouteName(Route $route)
         $methods = implode('_', $route->getMethods()).'_';
 
         $routeName = $methods.$route->getPath();
-        $routeName = str_replace(array('/', ':', '|', '-'), '_', $routeName);
+        $routeName = str_replace(['/', ':', '|', '-'], '_', $routeName);
         $routeName = preg_replace('/[^a-z0-9A-Z_.]+/', '', $routeName);
 
         // Collapse consecutive underscores down into a single underscore.
@@ -360,7 +360,7 @@ private function load($resource, $type = null)
         if ($this->loader->supports($resource, $type)) {
             $collections = $this->loader->load($resource, $type);
 
-            return \is_array($collections) ? $collections : array($collections);
+            return \is_array($collections) ? $collections : [$collections];
         }
 
         if (null === $resolver = $this->loader->getResolver()) {
@@ -373,6 +373,6 @@ private function load($resource, $type = null)
 
         $collections = $loader->load($resource, $type);
 
-        return \is_array($collections) ? $collections : array($collections);
+        return \is_array($collections) ? $collections : [$collections];
     }
 }
diff --git a/src/Symfony/Component/Routing/RouteCompiler.php b/src/Symfony/Component/Routing/RouteCompiler.php
index 2562c185b7d1f..0eb2b6b323966 100644
--- a/src/Symfony/Component/Routing/RouteCompiler.php
+++ b/src/Symfony/Component/Routing/RouteCompiler.php
@@ -46,10 +46,10 @@ class RouteCompiler implements RouteCompilerInterface
      */
     public static function compile(Route $route)
     {
-        $hostVariables = array();
-        $variables = array();
+        $hostVariables = [];
+        $variables = [];
         $hostRegex = null;
-        $hostTokens = array();
+        $hostTokens = [];
 
         if ('' !== $host = $route->getHost()) {
             $result = self::compilePattern($route, $host, true);
@@ -94,9 +94,9 @@ public static function compile(Route $route)
 
     private static function compilePattern(Route $route, $pattern, $isHost)
     {
-        $tokens = array();
-        $variables = array();
-        $matches = array();
+        $tokens = [];
+        $variables = [];
+        $matches = [];
         $pos = 0;
         $defaultSeparator = $isHost ? '.' : '/';
         $useUtf8 = preg_match('//u', $pattern);
@@ -143,9 +143,9 @@ private static function compilePattern(Route $route, $pattern, $isHost)
             }
 
             if ($isSeparator && $precedingText !== $precedingChar) {
-                $tokens[] = array('text', substr($precedingText, 0, -\strlen($precedingChar)));
+                $tokens[] = ['text', substr($precedingText, 0, -\strlen($precedingChar))];
             } elseif (!$isSeparator && \strlen($precedingText) > 0) {
-                $tokens[] = array('text', $precedingText);
+                $tokens[] = ['text', $precedingText];
             }
 
             $regexp = $route->getRequirement($varName);
@@ -184,12 +184,12 @@ private static function compilePattern(Route $route, $pattern, $isHost)
                 }
             }
 
-            $tokens[] = array('variable', $isSeparator ? $precedingChar : '', $regexp, $varName);
+            $tokens[] = ['variable', $isSeparator ? $precedingChar : '', $regexp, $varName];
             $variables[] = $varName;
         }
 
         if ($pos < \strlen($pattern)) {
-            $tokens[] = array('text', substr($pattern, $pos));
+            $tokens[] = ['text', substr($pattern, $pos)];
         }
 
         // find the first optional token
@@ -222,12 +222,12 @@ private static function compilePattern(Route $route, $pattern, $isHost)
             }
         }
 
-        return array(
+        return [
             'staticPrefix' => self::determineStaticPrefix($route, $tokens),
             'regex' => $regexp,
             'tokens' => array_reverse($tokens),
             'variables' => $variables,
-        );
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php
index 3f4838ea023e8..5fa85a538acc9 100644
--- a/src/Symfony/Component/Routing/Router.php
+++ b/src/Symfony/Component/Routing/Router.php
@@ -66,7 +66,7 @@ class Router implements RouterInterface, RequestMatcherInterface
     /**
      * @var array
      */
-    protected $options = array();
+    protected $options = [];
 
     /**
      * @var LoggerInterface|null
@@ -81,7 +81,7 @@ class Router implements RouterInterface, RequestMatcherInterface
     /**
      * @var ExpressionFunctionProviderInterface[]
      */
-    private $expressionLanguageProviders = array();
+    private $expressionLanguageProviders = [];
 
     /**
      * @param LoaderInterface $loader   A LoaderInterface instance
@@ -90,7 +90,7 @@ class Router implements RouterInterface, RequestMatcherInterface
      * @param RequestContext  $context  The context
      * @param LoggerInterface $logger   A logger instance
      */
-    public function __construct(LoaderInterface $loader, $resource, array $options = array(), RequestContext $context = null, LoggerInterface $logger = null)
+    public function __construct(LoaderInterface $loader, $resource, array $options = [], RequestContext $context = null, LoggerInterface $logger = null)
     {
         $this->loader = $loader;
         $this->resource = $resource;
@@ -124,7 +124,7 @@ public function __construct(LoaderInterface $loader, $resource, array $options =
      */
     public function setOptions(array $options)
     {
-        $this->options = array(
+        $this->options = [
             'cache_dir' => null,
             'debug' => false,
             'generator_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
@@ -137,10 +137,10 @@ public function setOptions(array $options)
             'matcher_cache_class' => 'ProjectUrlMatcher',
             'resource_type' => null,
             'strict_requirements' => true,
-        );
+        ];
 
         // check option names and live merge, if errors are encountered Exception will be thrown
-        $invalid = array();
+        $invalid = [];
         foreach ($options as $key => $value) {
             if (array_key_exists($key, $this->options)) {
                 $this->options[$key] = $value;
@@ -235,7 +235,7 @@ public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFa
     /**
      * {@inheritdoc}
      */
-    public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH)
+    public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH)
     {
         return $this->getGenerator()->generate($name, $parameters, $referenceType);
     }
@@ -293,10 +293,10 @@ function (ConfigCacheInterface $cache) {
                     }
                 }
 
-                $options = array(
+                $options = [
                     'class' => $this->options['matcher_cache_class'],
                     'base_class' => $this->options['matcher_base_class'],
-                );
+                ];
 
                 $cache->write($dumper->dump($options), $this->getRouteCollection()->getResources());
             }
@@ -327,10 +327,10 @@ public function getGenerator()
                 function (ConfigCacheInterface $cache) {
                     $dumper = $this->getGeneratorDumperInstance();
 
-                    $options = array(
+                    $options = [
                         'class' => $this->options['generator_cache_class'],
                         'base_class' => $this->options['generator_base_class'],
-                    );
+                    ];
 
                     $cache->write($dumper->dump($options), $this->getRouteCollection()->getResources());
                 }
diff --git a/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php b/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
index 9af22f29f802f..7108d670b6c33 100644
--- a/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
+++ b/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
@@ -21,7 +21,7 @@ class RouteTest extends TestCase
      */
     public function testInvalidRouteParameter()
     {
-        $route = new Route(array('foo' => 'bar'));
+        $route = new Route(['foo' => 'bar']);
     }
 
     /**
diff --git a/src/Symfony/Component/Routing/Tests/CompiledRouteTest.php b/src/Symfony/Component/Routing/Tests/CompiledRouteTest.php
index 5bec7bbd7c863..9c9f4f286203f 100644
--- a/src/Symfony/Component/Routing/Tests/CompiledRouteTest.php
+++ b/src/Symfony/Component/Routing/Tests/CompiledRouteTest.php
@@ -18,10 +18,10 @@ class CompiledRouteTest extends TestCase
 {
     public function testAccessors()
     {
-        $compiled = new CompiledRoute('prefix', 'regex', array('tokens'), array(), null, array(), array(), array('variables'));
+        $compiled = new CompiledRoute('prefix', 'regex', ['tokens'], [], null, [], [], ['variables']);
         $this->assertEquals('prefix', $compiled->getStaticPrefix(), '__construct() takes a static prefix as its second argument');
         $this->assertEquals('regex', $compiled->getRegex(), '__construct() takes a regexp as its third argument');
-        $this->assertEquals(array('tokens'), $compiled->getTokens(), '__construct() takes an array of tokens as its fourth argument');
-        $this->assertEquals(array('variables'), $compiled->getVariables(), '__construct() takes an array of variables as its ninth argument');
+        $this->assertEquals(['tokens'], $compiled->getTokens(), '__construct() takes an array of tokens as its fourth argument');
+        $this->assertEquals(['variables'], $compiled->getVariables(), '__construct() takes an array of variables as its ninth argument');
     }
 }
diff --git a/src/Symfony/Component/Routing/Tests/DependencyInjection/RoutingResolverPassTest.php b/src/Symfony/Component/Routing/Tests/DependencyInjection/RoutingResolverPassTest.php
index 97a34c969c2fe..30c7516e59711 100644
--- a/src/Symfony/Component/Routing/Tests/DependencyInjection/RoutingResolverPassTest.php
+++ b/src/Symfony/Component/Routing/Tests/DependencyInjection/RoutingResolverPassTest.php
@@ -29,7 +29,7 @@ public function testProcess()
         (new RoutingResolverPass())->process($container);
 
         $this->assertEquals(
-            array(array('addLoader', array(new Reference('loader1'))), array('addLoader', array(new Reference('loader2')))),
+            [['addLoader', [new Reference('loader1')]], ['addLoader', [new Reference('loader2')]]],
             $container->getDefinition('routing.resolver')->getMethodCalls()
         );
     }
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/CustomRouteCompiler.php b/src/Symfony/Component/Routing/Tests/Fixtures/CustomRouteCompiler.php
index c2e2afd9afcd9..22b942d7bc871 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/CustomRouteCompiler.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/CustomRouteCompiler.php
@@ -21,6 +21,6 @@ class CustomRouteCompiler extends RouteCompiler
      */
     public static function compile(Route $route)
     {
-        return new CustomCompiledRoute('', '', array(), array());
+        return new CustomCompiledRoute('', '', [], []);
     }
 }
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/RedirectableUrlMatcher.php b/src/Symfony/Component/Routing/Tests/Fixtures/RedirectableUrlMatcher.php
index 08b67a0767782..79ae1cce54ca9 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/RedirectableUrlMatcher.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/RedirectableUrlMatcher.php
@@ -21,10 +21,10 @@ class RedirectableUrlMatcher extends UrlMatcher implements RedirectableUrlMatche
 {
     public function redirect($path, $route, $scheme = null)
     {
-        return array(
+        return [
             '_controller' => 'Some controller reference...',
             'path' => $path,
             'scheme' => $scheme,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/glob/php_dsl_bar.php b/src/Symfony/Component/Routing/Tests/Fixtures/glob/php_dsl_bar.php
index e2b91b17da490..e6ccf24f4e529 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/glob/php_dsl_bar.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/glob/php_dsl_bar.php
@@ -6,7 +6,7 @@
     $collection = $routes->collection();
 
     $collection->add('bar_route', '/bar')
-        ->defaults(array('_controller' => 'AppBundle:Bar:view'));
+        ->defaults(['_controller' => 'AppBundle:Bar:view']);
 
     return $collection;
 };
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/glob/php_dsl_baz.php b/src/Symfony/Component/Routing/Tests/Fixtures/glob/php_dsl_baz.php
index ca8f188a7633e..cce65d7054f96 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/glob/php_dsl_baz.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/glob/php_dsl_baz.php
@@ -6,7 +6,7 @@
     $collection = $routes->collection();
 
     $collection->add('baz_route', '/baz')
-        ->defaults(array('_controller' => 'AppBundle:Baz:view'));
+        ->defaults(['_controller' => 'AppBundle:Baz:view']);
 
     return $collection;
 };
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.php b/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.php
index 52ddfde0208f8..3ef0e14862f2a 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.php
@@ -6,12 +6,12 @@
 $collection = new RouteCollection();
 $collection->add('blog_show', new Route(
     '/blog/{slug}',
-    array('_controller' => 'MyBlogBundle:Blog:show'),
-    array('locale' => '\w+'),
-    array('compiler_class' => 'RouteCompiler'),
+    ['_controller' => 'MyBlogBundle:Blog:show'],
+    ['locale' => '\w+'],
+    ['compiler_class' => 'RouteCompiler'],
     '{locale}.example.com',
-    array('https'),
-    array('GET', 'POST', 'put', 'OpTiOnS'),
+    ['https'],
+    ['GET', 'POST', 'put', 'OpTiOnS'],
     'context.getMethod() == "GET"'
 ));
 
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/validresource.php b/src/Symfony/Component/Routing/Tests/Fixtures/validresource.php
index 482c80b29e919..31d354a34cd00 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/validresource.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/validresource.php
@@ -3,15 +3,15 @@
 /** @var $loader \Symfony\Component\Routing\Loader\PhpFileLoader */
 /** @var \Symfony\Component\Routing\RouteCollection $collection */
 $collection = $loader->import('validpattern.php');
-$collection->addDefaults(array(
+$collection->addDefaults([
     'foo' => 123,
-));
-$collection->addRequirements(array(
+]);
+$collection->addRequirements([
     'foo' => '\d+',
-));
-$collection->addOptions(array(
+]);
+$collection->addOptions([
     'foo' => 'bar',
-));
+]);
 $collection->setCondition('context.getMethod() == "POST"');
 $collection->addPrefix('/prefix');
 
diff --git a/src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php b/src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
index 32dc83e83e24c..a6a47b4ba2fd0 100644
--- a/src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
+++ b/src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
@@ -73,10 +73,10 @@ public function testDumpWithRoutes()
 
         $projectUrlGenerator = new \ProjectUrlGenerator(new RequestContext('/app.php'));
 
-        $absoluteUrlWithParameter = $projectUrlGenerator->generate('Test', array('foo' => 'bar'), UrlGeneratorInterface::ABSOLUTE_URL);
-        $absoluteUrlWithoutParameter = $projectUrlGenerator->generate('Test2', array(), UrlGeneratorInterface::ABSOLUTE_URL);
-        $relativeUrlWithParameter = $projectUrlGenerator->generate('Test', array('foo' => 'bar'), UrlGeneratorInterface::ABSOLUTE_PATH);
-        $relativeUrlWithoutParameter = $projectUrlGenerator->generate('Test2', array(), UrlGeneratorInterface::ABSOLUTE_PATH);
+        $absoluteUrlWithParameter = $projectUrlGenerator->generate('Test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_URL);
+        $absoluteUrlWithoutParameter = $projectUrlGenerator->generate('Test2', [], UrlGeneratorInterface::ABSOLUTE_URL);
+        $relativeUrlWithParameter = $projectUrlGenerator->generate('Test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_PATH);
+        $relativeUrlWithoutParameter = $projectUrlGenerator->generate('Test2', [], UrlGeneratorInterface::ABSOLUTE_PATH);
 
         $this->assertEquals('http://localhost/app.php/testing/bar', $absoluteUrlWithParameter);
         $this->assertEquals('http://localhost/app.php/testing2', $absoluteUrlWithoutParameter);
@@ -96,18 +96,18 @@ public function testDumpWithTooManyRoutes()
         }
         $this->routeCollection->add('Test2', new Route('/testing2'));
 
-        file_put_contents($this->largeTestTmpFilepath, $this->generatorDumper->dump(array(
+        file_put_contents($this->largeTestTmpFilepath, $this->generatorDumper->dump([
             'class' => 'ProjectLargeUrlGenerator',
-        )));
+        ]));
         $this->routeCollection = $this->generatorDumper = null;
         include $this->largeTestTmpFilepath;
 
         $projectUrlGenerator = new \ProjectLargeUrlGenerator(new RequestContext('/app.php'));
 
-        $absoluteUrlWithParameter = $projectUrlGenerator->generate('Test', array('foo' => 'bar'), UrlGeneratorInterface::ABSOLUTE_URL);
-        $absoluteUrlWithoutParameter = $projectUrlGenerator->generate('Test2', array(), UrlGeneratorInterface::ABSOLUTE_URL);
-        $relativeUrlWithParameter = $projectUrlGenerator->generate('Test', array('foo' => 'bar'), UrlGeneratorInterface::ABSOLUTE_PATH);
-        $relativeUrlWithoutParameter = $projectUrlGenerator->generate('Test2', array(), UrlGeneratorInterface::ABSOLUTE_PATH);
+        $absoluteUrlWithParameter = $projectUrlGenerator->generate('Test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_URL);
+        $absoluteUrlWithoutParameter = $projectUrlGenerator->generate('Test2', [], UrlGeneratorInterface::ABSOLUTE_URL);
+        $relativeUrlWithParameter = $projectUrlGenerator->generate('Test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_PATH);
+        $relativeUrlWithoutParameter = $projectUrlGenerator->generate('Test2', [], UrlGeneratorInterface::ABSOLUTE_PATH);
 
         $this->assertEquals('http://localhost/app.php/testing/bar', $absoluteUrlWithParameter);
         $this->assertEquals('http://localhost/app.php/testing2', $absoluteUrlWithoutParameter);
@@ -120,12 +120,12 @@ public function testDumpWithTooManyRoutes()
      */
     public function testDumpWithoutRoutes()
     {
-        file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump(array('class' => 'WithoutRoutesUrlGenerator')));
+        file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump(['class' => 'WithoutRoutesUrlGenerator']));
         include $this->testTmpFilepath;
 
         $projectUrlGenerator = new \WithoutRoutesUrlGenerator(new RequestContext('/app.php'));
 
-        $projectUrlGenerator->generate('Test', array());
+        $projectUrlGenerator->generate('Test', []);
     }
 
     /**
@@ -135,45 +135,45 @@ public function testGenerateNonExistingRoute()
     {
         $this->routeCollection->add('Test', new Route('/test'));
 
-        file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump(array('class' => 'NonExistingRoutesUrlGenerator')));
+        file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump(['class' => 'NonExistingRoutesUrlGenerator']));
         include $this->testTmpFilepath;
 
         $projectUrlGenerator = new \NonExistingRoutesUrlGenerator(new RequestContext());
-        $url = $projectUrlGenerator->generate('NonExisting', array());
+        $url = $projectUrlGenerator->generate('NonExisting', []);
     }
 
     public function testDumpForRouteWithDefaults()
     {
-        $this->routeCollection->add('Test', new Route('/testing/{foo}', array('foo' => 'bar')));
+        $this->routeCollection->add('Test', new Route('/testing/{foo}', ['foo' => 'bar']));
 
-        file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump(array('class' => 'DefaultRoutesUrlGenerator')));
+        file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump(['class' => 'DefaultRoutesUrlGenerator']));
         include $this->testTmpFilepath;
 
         $projectUrlGenerator = new \DefaultRoutesUrlGenerator(new RequestContext());
-        $url = $projectUrlGenerator->generate('Test', array());
+        $url = $projectUrlGenerator->generate('Test', []);
 
         $this->assertEquals('/testing', $url);
     }
 
     public function testDumpWithSchemeRequirement()
     {
-        $this->routeCollection->add('Test1', new Route('/testing', array(), array(), array(), '', array('ftp', 'https')));
+        $this->routeCollection->add('Test1', new Route('/testing', [], [], [], '', ['ftp', 'https']));
 
-        file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump(array('class' => 'SchemeUrlGenerator')));
+        file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump(['class' => 'SchemeUrlGenerator']));
         include $this->testTmpFilepath;
 
         $projectUrlGenerator = new \SchemeUrlGenerator(new RequestContext('/app.php'));
 
-        $absoluteUrl = $projectUrlGenerator->generate('Test1', array(), UrlGeneratorInterface::ABSOLUTE_URL);
-        $relativeUrl = $projectUrlGenerator->generate('Test1', array(), UrlGeneratorInterface::ABSOLUTE_PATH);
+        $absoluteUrl = $projectUrlGenerator->generate('Test1', [], UrlGeneratorInterface::ABSOLUTE_URL);
+        $relativeUrl = $projectUrlGenerator->generate('Test1', [], UrlGeneratorInterface::ABSOLUTE_PATH);
 
         $this->assertEquals('ftp://localhost/app.php/testing', $absoluteUrl);
         $this->assertEquals('ftp://localhost/app.php/testing', $relativeUrl);
 
         $projectUrlGenerator = new \SchemeUrlGenerator(new RequestContext('/app.php', 'GET', 'localhost', 'https'));
 
-        $absoluteUrl = $projectUrlGenerator->generate('Test1', array(), UrlGeneratorInterface::ABSOLUTE_URL);
-        $relativeUrl = $projectUrlGenerator->generate('Test1', array(), UrlGeneratorInterface::ABSOLUTE_PATH);
+        $absoluteUrl = $projectUrlGenerator->generate('Test1', [], UrlGeneratorInterface::ABSOLUTE_URL);
+        $relativeUrl = $projectUrlGenerator->generate('Test1', [], UrlGeneratorInterface::ABSOLUTE_PATH);
 
         $this->assertEquals('https://localhost/app.php/testing', $absoluteUrl);
         $this->assertEquals('/app.php/testing', $relativeUrl);
diff --git a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
index d4bf18ccac929..d92161c05c336 100644
--- a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
+++ b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
@@ -23,7 +23,7 @@ class UrlGeneratorTest extends TestCase
     public function testAbsoluteUrlWithPort80()
     {
         $routes = $this->getRoutes('test', new Route('/testing'));
-        $url = $this->getGenerator($routes)->generate('test', array(), UrlGeneratorInterface::ABSOLUTE_URL);
+        $url = $this->getGenerator($routes)->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL);
 
         $this->assertEquals('http://localhost/app.php/testing', $url);
     }
@@ -31,7 +31,7 @@ public function testAbsoluteUrlWithPort80()
     public function testAbsoluteSecureUrlWithPort443()
     {
         $routes = $this->getRoutes('test', new Route('/testing'));
-        $url = $this->getGenerator($routes, array('scheme' => 'https'))->generate('test', array(), UrlGeneratorInterface::ABSOLUTE_URL);
+        $url = $this->getGenerator($routes, ['scheme' => 'https'])->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL);
 
         $this->assertEquals('https://localhost/app.php/testing', $url);
     }
@@ -39,7 +39,7 @@ public function testAbsoluteSecureUrlWithPort443()
     public function testAbsoluteUrlWithNonStandardPort()
     {
         $routes = $this->getRoutes('test', new Route('/testing'));
-        $url = $this->getGenerator($routes, array('httpPort' => 8080))->generate('test', array(), UrlGeneratorInterface::ABSOLUTE_URL);
+        $url = $this->getGenerator($routes, ['httpPort' => 8080])->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL);
 
         $this->assertEquals('http://localhost:8080/app.php/testing', $url);
     }
@@ -47,7 +47,7 @@ public function testAbsoluteUrlWithNonStandardPort()
     public function testAbsoluteSecureUrlWithNonStandardPort()
     {
         $routes = $this->getRoutes('test', new Route('/testing'));
-        $url = $this->getGenerator($routes, array('httpsPort' => 8080, 'scheme' => 'https'))->generate('test', array(), UrlGeneratorInterface::ABSOLUTE_URL);
+        $url = $this->getGenerator($routes, ['httpsPort' => 8080, 'scheme' => 'https'])->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL);
 
         $this->assertEquals('https://localhost:8080/app.php/testing', $url);
     }
@@ -55,7 +55,7 @@ public function testAbsoluteSecureUrlWithNonStandardPort()
     public function testRelativeUrlWithoutParameters()
     {
         $routes = $this->getRoutes('test', new Route('/testing'));
-        $url = $this->getGenerator($routes)->generate('test', array(), UrlGeneratorInterface::ABSOLUTE_PATH);
+        $url = $this->getGenerator($routes)->generate('test', [], UrlGeneratorInterface::ABSOLUTE_PATH);
 
         $this->assertEquals('/app.php/testing', $url);
     }
@@ -63,15 +63,15 @@ public function testRelativeUrlWithoutParameters()
     public function testRelativeUrlWithParameter()
     {
         $routes = $this->getRoutes('test', new Route('/testing/{foo}'));
-        $url = $this->getGenerator($routes)->generate('test', array('foo' => 'bar'), UrlGeneratorInterface::ABSOLUTE_PATH);
+        $url = $this->getGenerator($routes)->generate('test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_PATH);
 
         $this->assertEquals('/app.php/testing/bar', $url);
     }
 
     public function testRelativeUrlWithNullParameter()
     {
-        $routes = $this->getRoutes('test', new Route('/testing.{format}', array('format' => null)));
-        $url = $this->getGenerator($routes)->generate('test', array(), UrlGeneratorInterface::ABSOLUTE_PATH);
+        $routes = $this->getRoutes('test', new Route('/testing.{format}', ['format' => null]));
+        $url = $this->getGenerator($routes)->generate('test', [], UrlGeneratorInterface::ABSOLUTE_PATH);
 
         $this->assertEquals('/app.php/testing', $url);
     }
@@ -81,31 +81,31 @@ public function testRelativeUrlWithNullParameter()
      */
     public function testRelativeUrlWithNullParameterButNotOptional()
     {
-        $routes = $this->getRoutes('test', new Route('/testing/{foo}/bar', array('foo' => null)));
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}/bar', ['foo' => null]));
         // This must raise an exception because the default requirement for "foo" is "[^/]+" which is not met with these params.
         // Generating path "/testing//bar" would be wrong as matching this route would fail.
-        $this->getGenerator($routes)->generate('test', array(), UrlGeneratorInterface::ABSOLUTE_PATH);
+        $this->getGenerator($routes)->generate('test', [], UrlGeneratorInterface::ABSOLUTE_PATH);
     }
 
     public function testRelativeUrlWithOptionalZeroParameter()
     {
         $routes = $this->getRoutes('test', new Route('/testing/{page}'));
-        $url = $this->getGenerator($routes)->generate('test', array('page' => 0), UrlGeneratorInterface::ABSOLUTE_PATH);
+        $url = $this->getGenerator($routes)->generate('test', ['page' => 0], UrlGeneratorInterface::ABSOLUTE_PATH);
 
         $this->assertEquals('/app.php/testing/0', $url);
     }
 
     public function testNotPassedOptionalParameterInBetween()
     {
-        $routes = $this->getRoutes('test', new Route('/{slug}/{page}', array('slug' => 'index', 'page' => 0)));
-        $this->assertSame('/app.php/index/1', $this->getGenerator($routes)->generate('test', array('page' => 1)));
+        $routes = $this->getRoutes('test', new Route('/{slug}/{page}', ['slug' => 'index', 'page' => 0]));
+        $this->assertSame('/app.php/index/1', $this->getGenerator($routes)->generate('test', ['page' => 1]));
         $this->assertSame('/app.php/', $this->getGenerator($routes)->generate('test'));
     }
 
     public function testRelativeUrlWithExtraParameters()
     {
         $routes = $this->getRoutes('test', new Route('/testing'));
-        $url = $this->getGenerator($routes)->generate('test', array('foo' => 'bar'), UrlGeneratorInterface::ABSOLUTE_PATH);
+        $url = $this->getGenerator($routes)->generate('test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_PATH);
 
         $this->assertEquals('/app.php/testing?foo=bar', $url);
     }
@@ -113,7 +113,7 @@ public function testRelativeUrlWithExtraParameters()
     public function testAbsoluteUrlWithExtraParameters()
     {
         $routes = $this->getRoutes('test', new Route('/testing'));
-        $url = $this->getGenerator($routes)->generate('test', array('foo' => 'bar'), UrlGeneratorInterface::ABSOLUTE_URL);
+        $url = $this->getGenerator($routes)->generate('test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_URL);
 
         $this->assertEquals('http://localhost/app.php/testing?foo=bar', $url);
     }
@@ -121,7 +121,7 @@ public function testAbsoluteUrlWithExtraParameters()
     public function testUrlWithNullExtraParameters()
     {
         $routes = $this->getRoutes('test', new Route('/testing'));
-        $url = $this->getGenerator($routes)->generate('test', array('foo' => null), UrlGeneratorInterface::ABSOLUTE_URL);
+        $url = $this->getGenerator($routes)->generate('test', ['foo' => null], UrlGeneratorInterface::ABSOLUTE_URL);
 
         $this->assertEquals('http://localhost/app.php/testing', $url);
     }
@@ -133,7 +133,7 @@ public function testUrlWithExtraParametersFromGlobals()
         $context = new RequestContext('/app.php');
         $context->setParameter('bar', 'bar');
         $generator->setContext($context);
-        $url = $generator->generate('test', array('foo' => 'bar'));
+        $url = $generator->generate('test', ['foo' => 'bar']);
 
         $this->assertEquals('/app.php/testing?foo=bar', $url);
     }
@@ -145,19 +145,19 @@ public function testUrlWithGlobalParameter()
         $context = new RequestContext('/app.php');
         $context->setParameter('foo', 'bar');
         $generator->setContext($context);
-        $url = $generator->generate('test', array());
+        $url = $generator->generate('test', []);
 
         $this->assertEquals('/app.php/testing/bar', $url);
     }
 
     public function testGlobalParameterHasHigherPriorityThanDefault()
     {
-        $routes = $this->getRoutes('test', new Route('/{_locale}', array('_locale' => 'en')));
+        $routes = $this->getRoutes('test', new Route('/{_locale}', ['_locale' => 'en']));
         $generator = $this->getGenerator($routes);
         $context = new RequestContext('/app.php');
         $context->setParameter('_locale', 'de');
         $generator->setContext($context);
-        $url = $generator->generate('test', array());
+        $url = $generator->generate('test', []);
 
         $this->assertSame('/app.php/de', $url);
     }
@@ -168,7 +168,7 @@ public function testGlobalParameterHasHigherPriorityThanDefault()
     public function testGenerateWithoutRoutes()
     {
         $routes = $this->getRoutes('foo', new Route('/testing/{foo}'));
-        $this->getGenerator($routes)->generate('test', array(), UrlGeneratorInterface::ABSOLUTE_URL);
+        $this->getGenerator($routes)->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL);
     }
 
     /**
@@ -177,7 +177,7 @@ public function testGenerateWithoutRoutes()
     public function testGenerateForRouteWithoutMandatoryParameter()
     {
         $routes = $this->getRoutes('test', new Route('/testing/{foo}'));
-        $this->getGenerator($routes)->generate('test', array(), UrlGeneratorInterface::ABSOLUTE_URL);
+        $this->getGenerator($routes)->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL);
     }
 
     /**
@@ -185,8 +185,8 @@ public function testGenerateForRouteWithoutMandatoryParameter()
      */
     public function testGenerateForRouteWithInvalidOptionalParameter()
     {
-        $routes = $this->getRoutes('test', new Route('/testing/{foo}', array('foo' => '1'), array('foo' => 'd+')));
-        $this->getGenerator($routes)->generate('test', array('foo' => 'bar'), UrlGeneratorInterface::ABSOLUTE_URL);
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}', ['foo' => '1'], ['foo' => 'd+']));
+        $this->getGenerator($routes)->generate('test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_URL);
     }
 
     /**
@@ -194,35 +194,35 @@ public function testGenerateForRouteWithInvalidOptionalParameter()
      */
     public function testGenerateForRouteWithInvalidParameter()
     {
-        $routes = $this->getRoutes('test', new Route('/testing/{foo}', array(), array('foo' => '1|2')));
-        $this->getGenerator($routes)->generate('test', array('foo' => '0'), UrlGeneratorInterface::ABSOLUTE_URL);
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}', [], ['foo' => '1|2']));
+        $this->getGenerator($routes)->generate('test', ['foo' => '0'], UrlGeneratorInterface::ABSOLUTE_URL);
     }
 
     public function testGenerateForRouteWithInvalidOptionalParameterNonStrict()
     {
-        $routes = $this->getRoutes('test', new Route('/testing/{foo}', array('foo' => '1'), array('foo' => 'd+')));
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}', ['foo' => '1'], ['foo' => 'd+']));
         $generator = $this->getGenerator($routes);
         $generator->setStrictRequirements(false);
-        $this->assertNull($generator->generate('test', array('foo' => 'bar'), UrlGeneratorInterface::ABSOLUTE_URL));
+        $this->assertNull($generator->generate('test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_URL));
     }
 
     public function testGenerateForRouteWithInvalidOptionalParameterNonStrictWithLogger()
     {
-        $routes = $this->getRoutes('test', new Route('/testing/{foo}', array('foo' => '1'), array('foo' => 'd+')));
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}', ['foo' => '1'], ['foo' => 'd+']));
         $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
         $logger->expects($this->once())
             ->method('error');
-        $generator = $this->getGenerator($routes, array(), $logger);
+        $generator = $this->getGenerator($routes, [], $logger);
         $generator->setStrictRequirements(false);
-        $this->assertNull($generator->generate('test', array('foo' => 'bar'), UrlGeneratorInterface::ABSOLUTE_URL));
+        $this->assertNull($generator->generate('test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_URL));
     }
 
     public function testGenerateForRouteWithInvalidParameterButDisabledRequirementsCheck()
     {
-        $routes = $this->getRoutes('test', new Route('/testing/{foo}', array('foo' => '1'), array('foo' => 'd+')));
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}', ['foo' => '1'], ['foo' => 'd+']));
         $generator = $this->getGenerator($routes);
         $generator->setStrictRequirements(null);
-        $this->assertSame('/app.php/testing/bar', $generator->generate('test', array('foo' => 'bar')));
+        $this->assertSame('/app.php/testing/bar', $generator->generate('test', ['foo' => 'bar']));
     }
 
     /**
@@ -230,8 +230,8 @@ public function testGenerateForRouteWithInvalidParameterButDisabledRequirementsC
      */
     public function testGenerateForRouteWithInvalidMandatoryParameter()
     {
-        $routes = $this->getRoutes('test', new Route('/testing/{foo}', array(), array('foo' => 'd+')));
-        $this->getGenerator($routes)->generate('test', array('foo' => 'bar'), UrlGeneratorInterface::ABSOLUTE_URL);
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}', [], ['foo' => 'd+']));
+        $this->getGenerator($routes)->generate('test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_URL);
     }
 
     /**
@@ -239,8 +239,8 @@ public function testGenerateForRouteWithInvalidMandatoryParameter()
      */
     public function testGenerateForRouteWithInvalidUtf8Parameter()
     {
-        $routes = $this->getRoutes('test', new Route('/testing/{foo}', array(), array('foo' => '\pL+'), array('utf8' => true)));
-        $this->getGenerator($routes)->generate('test', array('foo' => 'abc123'), UrlGeneratorInterface::ABSOLUTE_URL);
+        $routes = $this->getRoutes('test', new Route('/testing/{foo}', [], ['foo' => '\pL+'], ['utf8' => true]));
+        $this->getGenerator($routes)->generate('test', ['foo' => 'abc123'], UrlGeneratorInterface::ABSOLUTE_URL);
     }
 
     /**
@@ -248,31 +248,31 @@ public function testGenerateForRouteWithInvalidUtf8Parameter()
      */
     public function testRequiredParamAndEmptyPassed()
     {
-        $routes = $this->getRoutes('test', new Route('/{slug}', array(), array('slug' => '.+')));
-        $this->getGenerator($routes)->generate('test', array('slug' => ''));
+        $routes = $this->getRoutes('test', new Route('/{slug}', [], ['slug' => '.+']));
+        $this->getGenerator($routes)->generate('test', ['slug' => '']);
     }
 
     public function testSchemeRequirementDoesNothingIfSameCurrentScheme()
     {
-        $routes = $this->getRoutes('test', new Route('/', array(), array(), array(), '', array('http')));
+        $routes = $this->getRoutes('test', new Route('/', [], [], [], '', ['http']));
         $this->assertEquals('/app.php/', $this->getGenerator($routes)->generate('test'));
 
-        $routes = $this->getRoutes('test', new Route('/', array(), array(), array(), '', array('https')));
-        $this->assertEquals('/app.php/', $this->getGenerator($routes, array('scheme' => 'https'))->generate('test'));
+        $routes = $this->getRoutes('test', new Route('/', [], [], [], '', ['https']));
+        $this->assertEquals('/app.php/', $this->getGenerator($routes, ['scheme' => 'https'])->generate('test'));
     }
 
     public function testSchemeRequirementForcesAbsoluteUrl()
     {
-        $routes = $this->getRoutes('test', new Route('/', array(), array(), array(), '', array('https')));
+        $routes = $this->getRoutes('test', new Route('/', [], [], [], '', ['https']));
         $this->assertEquals('https://localhost/app.php/', $this->getGenerator($routes)->generate('test'));
 
-        $routes = $this->getRoutes('test', new Route('/', array(), array(), array(), '', array('http')));
-        $this->assertEquals('http://localhost/app.php/', $this->getGenerator($routes, array('scheme' => 'https'))->generate('test'));
+        $routes = $this->getRoutes('test', new Route('/', [], [], [], '', ['http']));
+        $this->assertEquals('http://localhost/app.php/', $this->getGenerator($routes, ['scheme' => 'https'])->generate('test'));
     }
 
     public function testSchemeRequirementCreatesUrlForFirstRequiredScheme()
     {
-        $routes = $this->getRoutes('test', new Route('/', array(), array(), array(), '', array('Ftp', 'https')));
+        $routes = $this->getRoutes('test', new Route('/', [], [], [], '', ['Ftp', 'https']));
         $this->assertEquals('ftp://localhost/app.php/', $this->getGenerator($routes)->generate('test'));
     }
 
@@ -281,48 +281,48 @@ public function testPathWithTwoStartingSlashes()
         $routes = $this->getRoutes('test', new Route('//path-and-not-domain'));
 
         // this must not generate '//path-and-not-domain' because that would be a network path
-        $this->assertSame('/path-and-not-domain', $this->getGenerator($routes, array('BaseUrl' => ''))->generate('test'));
+        $this->assertSame('/path-and-not-domain', $this->getGenerator($routes, ['BaseUrl' => ''])->generate('test'));
     }
 
     public function testNoTrailingSlashForMultipleOptionalParameters()
     {
-        $routes = $this->getRoutes('test', new Route('/category/{slug1}/{slug2}/{slug3}', array('slug2' => null, 'slug3' => null)));
+        $routes = $this->getRoutes('test', new Route('/category/{slug1}/{slug2}/{slug3}', ['slug2' => null, 'slug3' => null]));
 
-        $this->assertEquals('/app.php/category/foo', $this->getGenerator($routes)->generate('test', array('slug1' => 'foo')));
+        $this->assertEquals('/app.php/category/foo', $this->getGenerator($routes)->generate('test', ['slug1' => 'foo']));
     }
 
     public function testWithAnIntegerAsADefaultValue()
     {
-        $routes = $this->getRoutes('test', new Route('/{default}', array('default' => 0)));
+        $routes = $this->getRoutes('test', new Route('/{default}', ['default' => 0]));
 
-        $this->assertEquals('/app.php/foo', $this->getGenerator($routes)->generate('test', array('default' => 'foo')));
+        $this->assertEquals('/app.php/foo', $this->getGenerator($routes)->generate('test', ['default' => 'foo']));
     }
 
     public function testNullForOptionalParameterIsIgnored()
     {
-        $routes = $this->getRoutes('test', new Route('/test/{default}', array('default' => 0)));
+        $routes = $this->getRoutes('test', new Route('/test/{default}', ['default' => 0]));
 
-        $this->assertEquals('/app.php/test', $this->getGenerator($routes)->generate('test', array('default' => null)));
+        $this->assertEquals('/app.php/test', $this->getGenerator($routes)->generate('test', ['default' => null]));
     }
 
     public function testQueryParamSameAsDefault()
     {
-        $routes = $this->getRoutes('test', new Route('/test', array('page' => 1)));
+        $routes = $this->getRoutes('test', new Route('/test', ['page' => 1]));
 
-        $this->assertSame('/app.php/test?page=2', $this->getGenerator($routes)->generate('test', array('page' => 2)));
-        $this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test', array('page' => 1)));
-        $this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test', array('page' => '1')));
+        $this->assertSame('/app.php/test?page=2', $this->getGenerator($routes)->generate('test', ['page' => 2]));
+        $this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test', ['page' => 1]));
+        $this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test', ['page' => '1']));
         $this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test'));
     }
 
     public function testArrayQueryParamSameAsDefault()
     {
-        $routes = $this->getRoutes('test', new Route('/test', array('array' => array('foo', 'bar'))));
+        $routes = $this->getRoutes('test', new Route('/test', ['array' => ['foo', 'bar']]));
 
-        $this->assertSame('/app.php/test?array%5B0%5D=bar&array%5B1%5D=foo', $this->getGenerator($routes)->generate('test', array('array' => array('bar', 'foo'))));
-        $this->assertSame('/app.php/test?array%5Ba%5D=foo&array%5Bb%5D=bar', $this->getGenerator($routes)->generate('test', array('array' => array('a' => 'foo', 'b' => 'bar'))));
-        $this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test', array('array' => array('foo', 'bar'))));
-        $this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test', array('array' => array(1 => 'bar', 0 => 'foo'))));
+        $this->assertSame('/app.php/test?array%5B0%5D=bar&array%5B1%5D=foo', $this->getGenerator($routes)->generate('test', ['array' => ['bar', 'foo']]));
+        $this->assertSame('/app.php/test?array%5Ba%5D=foo&array%5Bb%5D=bar', $this->getGenerator($routes)->generate('test', ['array' => ['a' => 'foo', 'b' => 'bar']]));
+        $this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test', ['array' => ['foo', 'bar']]));
+        $this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test', ['array' => [1 => 'bar', 0 => 'foo']]));
         $this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test'));
     }
 
@@ -342,11 +342,11 @@ public function testUrlEncoding()
         // This tests the encoding of reserved characters that are used for delimiting of URI components (defined in RFC 3986)
         // and other special ASCII chars. These chars are tested as static text path, variable path and query param.
         $chars = '@:[]/()*\'" +,;-._~&$<>|{}%\\^`!?foo=bar#id';
-        $routes = $this->getRoutes('test', new Route("/$chars/{varpath}", array(), array('varpath' => '.+')));
-        $this->assertSame($expectedPath, $this->getGenerator($routes)->generate('test', array(
+        $routes = $this->getRoutes('test', new Route("/$chars/{varpath}", [], ['varpath' => '.+']));
+        $this->assertSame($expectedPath, $this->getGenerator($routes)->generate('test', [
             'varpath' => $chars,
             'query' => $chars,
-        )));
+        ]));
     }
 
     public function testEncodingOfRelativePathSegments()
@@ -361,24 +361,24 @@ public function testEncodingOfRelativePathSegments()
 
     public function testAdjacentVariables()
     {
-        $routes = $this->getRoutes('test', new Route('/{x}{y}{z}.{_format}', array('z' => 'default-z', '_format' => 'html'), array('y' => '\d+')));
+        $routes = $this->getRoutes('test', new Route('/{x}{y}{z}.{_format}', ['z' => 'default-z', '_format' => 'html'], ['y' => '\d+']));
         $generator = $this->getGenerator($routes);
-        $this->assertSame('/app.php/foo123', $generator->generate('test', array('x' => 'foo', 'y' => '123')));
-        $this->assertSame('/app.php/foo123bar.xml', $generator->generate('test', array('x' => 'foo', 'y' => '123', 'z' => 'bar', '_format' => 'xml')));
+        $this->assertSame('/app.php/foo123', $generator->generate('test', ['x' => 'foo', 'y' => '123']));
+        $this->assertSame('/app.php/foo123bar.xml', $generator->generate('test', ['x' => 'foo', 'y' => '123', 'z' => 'bar', '_format' => 'xml']));
 
         // The default requirement for 'x' should not allow the separator '.' in this case because it would otherwise match everything
         // and following optional variables like _format could never match.
         $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Routing\Exception\InvalidParameterException');
-        $generator->generate('test', array('x' => 'do.t', 'y' => '123', 'z' => 'bar', '_format' => 'xml'));
+        $generator->generate('test', ['x' => 'do.t', 'y' => '123', 'z' => 'bar', '_format' => 'xml']);
     }
 
     public function testOptionalVariableWithNoRealSeparator()
     {
-        $routes = $this->getRoutes('test', new Route('/get{what}', array('what' => 'All')));
+        $routes = $this->getRoutes('test', new Route('/get{what}', ['what' => 'All']));
         $generator = $this->getGenerator($routes);
 
         $this->assertSame('/app.php/get', $generator->generate('test'));
-        $this->assertSame('/app.php/getSites', $generator->generate('test', array('what' => 'Sites')));
+        $this->assertSame('/app.php/getSites', $generator->generate('test', ['what' => 'Sites']));
     }
 
     public function testRequiredVariableWithNoRealSeparator()
@@ -386,7 +386,7 @@ public function testRequiredVariableWithNoRealSeparator()
         $routes = $this->getRoutes('test', new Route('/get{what}Suffix'));
         $generator = $this->getGenerator($routes);
 
-        $this->assertSame('/app.php/getSitesSuffix', $generator->generate('test', array('what' => 'Sites')));
+        $this->assertSame('/app.php/getSitesSuffix', $generator->generate('test', ['what' => 'Sites']));
     }
 
     public function testDefaultRequirementOfVariable()
@@ -394,7 +394,7 @@ public function testDefaultRequirementOfVariable()
         $routes = $this->getRoutes('test', new Route('/{page}.{_format}'));
         $generator = $this->getGenerator($routes);
 
-        $this->assertSame('/app.php/index.mobile.html', $generator->generate('test', array('page' => 'index', '_format' => 'mobile.html')));
+        $this->assertSame('/app.php/index.mobile.html', $generator->generate('test', ['page' => 'index', '_format' => 'mobile.html']));
     }
 
     /**
@@ -403,7 +403,7 @@ public function testDefaultRequirementOfVariable()
     public function testDefaultRequirementOfVariableDisallowsSlash()
     {
         $routes = $this->getRoutes('test', new Route('/{page}.{_format}'));
-        $this->getGenerator($routes)->generate('test', array('page' => 'index', '_format' => 'sl/ash'));
+        $this->getGenerator($routes)->generate('test', ['page' => 'index', '_format' => 'sl/ash']);
     }
 
     /**
@@ -412,28 +412,28 @@ public function testDefaultRequirementOfVariableDisallowsSlash()
     public function testDefaultRequirementOfVariableDisallowsNextSeparator()
     {
         $routes = $this->getRoutes('test', new Route('/{page}.{_format}'));
-        $this->getGenerator($routes)->generate('test', array('page' => 'do.t', '_format' => 'html'));
+        $this->getGenerator($routes)->generate('test', ['page' => 'do.t', '_format' => 'html']);
     }
 
     public function testWithHostDifferentFromContext()
     {
-        $routes = $this->getRoutes('test', new Route('/{name}', array(), array(), array(), '{locale}.example.com'));
+        $routes = $this->getRoutes('test', new Route('/{name}', [], [], [], '{locale}.example.com'));
 
-        $this->assertEquals('//fr.example.com/app.php/Fabien', $this->getGenerator($routes)->generate('test', array('name' => 'Fabien', 'locale' => 'fr')));
+        $this->assertEquals('//fr.example.com/app.php/Fabien', $this->getGenerator($routes)->generate('test', ['name' => 'Fabien', 'locale' => 'fr']));
     }
 
     public function testWithHostSameAsContext()
     {
-        $routes = $this->getRoutes('test', new Route('/{name}', array(), array(), array(), '{locale}.example.com'));
+        $routes = $this->getRoutes('test', new Route('/{name}', [], [], [], '{locale}.example.com'));
 
-        $this->assertEquals('/app.php/Fabien', $this->getGenerator($routes, array('host' => 'fr.example.com'))->generate('test', array('name' => 'Fabien', 'locale' => 'fr')));
+        $this->assertEquals('/app.php/Fabien', $this->getGenerator($routes, ['host' => 'fr.example.com'])->generate('test', ['name' => 'Fabien', 'locale' => 'fr']));
     }
 
     public function testWithHostSameAsContextAndAbsolute()
     {
-        $routes = $this->getRoutes('test', new Route('/{name}', array(), array(), array(), '{locale}.example.com'));
+        $routes = $this->getRoutes('test', new Route('/{name}', [], [], [], '{locale}.example.com'));
 
-        $this->assertEquals('http://fr.example.com/app.php/Fabien', $this->getGenerator($routes, array('host' => 'fr.example.com'))->generate('test', array('name' => 'Fabien', 'locale' => 'fr'), UrlGeneratorInterface::ABSOLUTE_URL));
+        $this->assertEquals('http://fr.example.com/app.php/Fabien', $this->getGenerator($routes, ['host' => 'fr.example.com'])->generate('test', ['name' => 'Fabien', 'locale' => 'fr'], UrlGeneratorInterface::ABSOLUTE_URL));
     }
 
     /**
@@ -441,8 +441,8 @@ public function testWithHostSameAsContextAndAbsolute()
      */
     public function testUrlWithInvalidParameterInHost()
     {
-        $routes = $this->getRoutes('test', new Route('/', array(), array('foo' => 'bar'), array(), '{foo}.example.com'));
-        $this->getGenerator($routes)->generate('test', array('foo' => 'baz'), UrlGeneratorInterface::ABSOLUTE_PATH);
+        $routes = $this->getRoutes('test', new Route('/', [], ['foo' => 'bar'], [], '{foo}.example.com'));
+        $this->getGenerator($routes)->generate('test', ['foo' => 'baz'], UrlGeneratorInterface::ABSOLUTE_PATH);
     }
 
     /**
@@ -450,8 +450,8 @@ public function testUrlWithInvalidParameterInHost()
      */
     public function testUrlWithInvalidParameterInHostWhenParamHasADefaultValue()
     {
-        $routes = $this->getRoutes('test', new Route('/', array('foo' => 'bar'), array('foo' => 'bar'), array(), '{foo}.example.com'));
-        $this->getGenerator($routes)->generate('test', array('foo' => 'baz'), UrlGeneratorInterface::ABSOLUTE_PATH);
+        $routes = $this->getRoutes('test', new Route('/', ['foo' => 'bar'], ['foo' => 'bar'], [], '{foo}.example.com'));
+        $this->getGenerator($routes)->generate('test', ['foo' => 'baz'], UrlGeneratorInterface::ABSOLUTE_PATH);
     }
 
     /**
@@ -459,72 +459,72 @@ public function testUrlWithInvalidParameterInHostWhenParamHasADefaultValue()
      */
     public function testUrlWithInvalidParameterEqualsDefaultValueInHost()
     {
-        $routes = $this->getRoutes('test', new Route('/', array('foo' => 'baz'), array('foo' => 'bar'), array(), '{foo}.example.com'));
-        $this->getGenerator($routes)->generate('test', array('foo' => 'baz'), UrlGeneratorInterface::ABSOLUTE_PATH);
+        $routes = $this->getRoutes('test', new Route('/', ['foo' => 'baz'], ['foo' => 'bar'], [], '{foo}.example.com'));
+        $this->getGenerator($routes)->generate('test', ['foo' => 'baz'], UrlGeneratorInterface::ABSOLUTE_PATH);
     }
 
     public function testUrlWithInvalidParameterInHostInNonStrictMode()
     {
-        $routes = $this->getRoutes('test', new Route('/', array(), array('foo' => 'bar'), array(), '{foo}.example.com'));
+        $routes = $this->getRoutes('test', new Route('/', [], ['foo' => 'bar'], [], '{foo}.example.com'));
         $generator = $this->getGenerator($routes);
         $generator->setStrictRequirements(false);
-        $this->assertNull($generator->generate('test', array('foo' => 'baz'), UrlGeneratorInterface::ABSOLUTE_PATH));
+        $this->assertNull($generator->generate('test', ['foo' => 'baz'], UrlGeneratorInterface::ABSOLUTE_PATH));
     }
 
     public function testHostIsCaseInsensitive()
     {
-        $routes = $this->getRoutes('test', new Route('/', array(), array('locale' => 'en|de|fr'), array(), '{locale}.FooBar.com'));
+        $routes = $this->getRoutes('test', new Route('/', [], ['locale' => 'en|de|fr'], [], '{locale}.FooBar.com'));
         $generator = $this->getGenerator($routes);
-        $this->assertSame('//EN.FooBar.com/app.php/', $generator->generate('test', array('locale' => 'EN'), UrlGeneratorInterface::NETWORK_PATH));
+        $this->assertSame('//EN.FooBar.com/app.php/', $generator->generate('test', ['locale' => 'EN'], UrlGeneratorInterface::NETWORK_PATH));
     }
 
     public function testDefaultHostIsUsedWhenContextHostIsEmpty()
     {
-        $routes = $this->getRoutes('test', new Route('/route', array('domain' => 'my.fallback.host'), array('domain' => '.+'), array(), '{domain}', array('http')));
+        $routes = $this->getRoutes('test', new Route('/route', ['domain' => 'my.fallback.host'], ['domain' => '.+'], [], '{domain}', ['http']));
 
         $generator = $this->getGenerator($routes);
         $generator->getContext()->setHost('');
 
-        $this->assertSame('http://my.fallback.host/app.php/route', $generator->generate('test', array(), UrlGeneratorInterface::ABSOLUTE_URL));
+        $this->assertSame('http://my.fallback.host/app.php/route', $generator->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL));
     }
 
     public function testDefaultHostIsUsedWhenContextHostIsEmptyAndSchemeIsNot()
     {
-        $routes = $this->getRoutes('test', new Route('/route', array('domain' => 'my.fallback.host'), array('domain' => '.+'), array(), '{domain}', array('http', 'https')));
+        $routes = $this->getRoutes('test', new Route('/route', ['domain' => 'my.fallback.host'], ['domain' => '.+'], [], '{domain}', ['http', 'https']));
 
         $generator = $this->getGenerator($routes);
         $generator->getContext()->setHost('');
         $generator->getContext()->setScheme('https');
 
-        $this->assertSame('https://my.fallback.host/app.php/route', $generator->generate('test', array(), UrlGeneratorInterface::ABSOLUTE_URL));
+        $this->assertSame('https://my.fallback.host/app.php/route', $generator->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL));
     }
 
     public function testAbsoluteUrlFallbackToRelativeIfHostIsEmptyAndSchemeIsNot()
     {
-        $routes = $this->getRoutes('test', new Route('/route', array(), array(), array(), '', array('http', 'https')));
+        $routes = $this->getRoutes('test', new Route('/route', [], [], [], '', ['http', 'https']));
 
         $generator = $this->getGenerator($routes);
         $generator->getContext()->setHost('');
         $generator->getContext()->setScheme('https');
 
-        $this->assertSame('/app.php/route', $generator->generate('test', array(), UrlGeneratorInterface::ABSOLUTE_URL));
+        $this->assertSame('/app.php/route', $generator->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL));
     }
 
     public function testGenerateNetworkPath()
     {
-        $routes = $this->getRoutes('test', new Route('/{name}', array(), array(), array(), '{locale}.example.com', array('http')));
+        $routes = $this->getRoutes('test', new Route('/{name}', [], [], [], '{locale}.example.com', ['http']));
 
         $this->assertSame('//fr.example.com/app.php/Fabien', $this->getGenerator($routes)->generate('test',
-            array('name' => 'Fabien', 'locale' => 'fr'), UrlGeneratorInterface::NETWORK_PATH), 'network path with different host'
+            ['name' => 'Fabien', 'locale' => 'fr'], UrlGeneratorInterface::NETWORK_PATH), 'network path with different host'
         );
-        $this->assertSame('//fr.example.com/app.php/Fabien?query=string', $this->getGenerator($routes, array('host' => 'fr.example.com'))->generate('test',
-            array('name' => 'Fabien', 'locale' => 'fr', 'query' => 'string'), UrlGeneratorInterface::NETWORK_PATH), 'network path although host same as context'
+        $this->assertSame('//fr.example.com/app.php/Fabien?query=string', $this->getGenerator($routes, ['host' => 'fr.example.com'])->generate('test',
+            ['name' => 'Fabien', 'locale' => 'fr', 'query' => 'string'], UrlGeneratorInterface::NETWORK_PATH), 'network path although host same as context'
         );
-        $this->assertSame('http://fr.example.com/app.php/Fabien', $this->getGenerator($routes, array('scheme' => 'https'))->generate('test',
-            array('name' => 'Fabien', 'locale' => 'fr'), UrlGeneratorInterface::NETWORK_PATH), 'absolute URL because scheme requirement does not match context'
+        $this->assertSame('http://fr.example.com/app.php/Fabien', $this->getGenerator($routes, ['scheme' => 'https'])->generate('test',
+            ['name' => 'Fabien', 'locale' => 'fr'], UrlGeneratorInterface::NETWORK_PATH), 'absolute URL because scheme requirement does not match context'
         );
         $this->assertSame('http://fr.example.com/app.php/Fabien', $this->getGenerator($routes)->generate('test',
-            array('name' => 'Fabien', 'locale' => 'fr'), UrlGeneratorInterface::ABSOLUTE_URL), 'absolute URL with same scheme because it is requested'
+            ['name' => 'Fabien', 'locale' => 'fr'], UrlGeneratorInterface::ABSOLUTE_URL), 'absolute URL with same scheme because it is requested'
         );
     }
 
@@ -533,32 +533,32 @@ public function testGenerateRelativePath()
         $routes = new RouteCollection();
         $routes->add('article', new Route('/{author}/{article}/'));
         $routes->add('comments', new Route('/{author}/{article}/comments'));
-        $routes->add('host', new Route('/{article}', array(), array(), array(), '{author}.example.com'));
-        $routes->add('scheme', new Route('/{author}/blog', array(), array(), array(), '', array('https')));
+        $routes->add('host', new Route('/{article}', [], [], [], '{author}.example.com'));
+        $routes->add('scheme', new Route('/{author}/blog', [], [], [], '', ['https']));
         $routes->add('unrelated', new Route('/about'));
 
-        $generator = $this->getGenerator($routes, array('host' => 'example.com', 'pathInfo' => '/fabien/symfony-is-great/'));
+        $generator = $this->getGenerator($routes, ['host' => 'example.com', 'pathInfo' => '/fabien/symfony-is-great/']);
 
         $this->assertSame('comments', $generator->generate('comments',
-            array('author' => 'fabien', 'article' => 'symfony-is-great'), UrlGeneratorInterface::RELATIVE_PATH)
+            ['author' => 'fabien', 'article' => 'symfony-is-great'], UrlGeneratorInterface::RELATIVE_PATH)
         );
         $this->assertSame('comments?page=2', $generator->generate('comments',
-            array('author' => 'fabien', 'article' => 'symfony-is-great', 'page' => 2), UrlGeneratorInterface::RELATIVE_PATH)
+            ['author' => 'fabien', 'article' => 'symfony-is-great', 'page' => 2], UrlGeneratorInterface::RELATIVE_PATH)
         );
         $this->assertSame('../twig-is-great/', $generator->generate('article',
-            array('author' => 'fabien', 'article' => 'twig-is-great'), UrlGeneratorInterface::RELATIVE_PATH)
+            ['author' => 'fabien', 'article' => 'twig-is-great'], UrlGeneratorInterface::RELATIVE_PATH)
         );
         $this->assertSame('../../bernhard/forms-are-great/', $generator->generate('article',
-            array('author' => 'bernhard', 'article' => 'forms-are-great'), UrlGeneratorInterface::RELATIVE_PATH)
+            ['author' => 'bernhard', 'article' => 'forms-are-great'], UrlGeneratorInterface::RELATIVE_PATH)
         );
         $this->assertSame('//bernhard.example.com/app.php/forms-are-great', $generator->generate('host',
-            array('author' => 'bernhard', 'article' => 'forms-are-great'), UrlGeneratorInterface::RELATIVE_PATH)
+            ['author' => 'bernhard', 'article' => 'forms-are-great'], UrlGeneratorInterface::RELATIVE_PATH)
         );
         $this->assertSame('https://example.com/app.php/bernhard/blog', $generator->generate('scheme',
-                array('author' => 'bernhard'), UrlGeneratorInterface::RELATIVE_PATH)
+                ['author' => 'bernhard'], UrlGeneratorInterface::RELATIVE_PATH)
         );
         $this->assertSame('../../about', $generator->generate('unrelated',
-            array(), UrlGeneratorInterface::RELATIVE_PATH)
+            [], UrlGeneratorInterface::RELATIVE_PATH)
         );
     }
 
@@ -572,138 +572,138 @@ public function testGetRelativePath($sourcePath, $targetPath, $expectedPath)
 
     public function provideRelativePaths()
     {
-        return array(
-            array(
+        return [
+            [
                 '/same/dir/',
                 '/same/dir/',
                 '',
-            ),
-            array(
+            ],
+            [
                 '/same/file',
                 '/same/file',
                 '',
-            ),
-            array(
+            ],
+            [
                 '/',
                 '/file',
                 'file',
-            ),
-            array(
+            ],
+            [
                 '/',
                 '/dir/file',
                 'dir/file',
-            ),
-            array(
+            ],
+            [
                 '/dir/file.html',
                 '/dir/different-file.html',
                 'different-file.html',
-            ),
-            array(
+            ],
+            [
                 '/same/dir/extra-file',
                 '/same/dir/',
                 './',
-            ),
-            array(
+            ],
+            [
                 '/parent/dir/',
                 '/parent/',
                 '../',
-            ),
-            array(
+            ],
+            [
                 '/parent/dir/extra-file',
                 '/parent/',
                 '../',
-            ),
-            array(
+            ],
+            [
                 '/a/b/',
                 '/x/y/z/',
                 '../../x/y/z/',
-            ),
-            array(
+            ],
+            [
                 '/a/b/c/d/e',
                 '/a/c/d',
                 '../../../c/d',
-            ),
-            array(
+            ],
+            [
                 '/a/b/c//',
                 '/a/b/c/',
                 '../',
-            ),
-            array(
+            ],
+            [
                 '/a/b/c/',
                 '/a/b/c//',
                 './/',
-            ),
-            array(
+            ],
+            [
                 '/root/a/b/c/',
                 '/root/x/b/c/',
                 '../../../x/b/c/',
-            ),
-            array(
+            ],
+            [
                 '/a/b/c/d/',
                 '/a',
                 '../../../../a',
-            ),
-            array(
+            ],
+            [
                 '/special-chars/sp%20ce/1€/mäh/e=mc²',
                 '/special-chars/sp%20ce/1€/<µ>/e=mc²',
                 '../<µ>/e=mc²',
-            ),
-            array(
+            ],
+            [
                 'not-rooted',
                 'dir/file',
                 'dir/file',
-            ),
-            array(
+            ],
+            [
                 '//dir/',
                 '',
                 '../../',
-            ),
-            array(
+            ],
+            [
                 '/dir/',
                 '/dir/file:with-colon',
                 './file:with-colon',
-            ),
-            array(
+            ],
+            [
                 '/dir/',
                 '/dir/subdir/file:with-colon',
                 'subdir/file:with-colon',
-            ),
-            array(
+            ],
+            [
                 '/dir/',
                 '/dir/:subdir/',
                 './:subdir/',
-            ),
-        );
+            ],
+        ];
     }
 
     public function testFragmentsCanBeAppendedToUrls()
     {
         $routes = $this->getRoutes('test', new Route('/testing'));
 
-        $url = $this->getGenerator($routes)->generate('test', array('_fragment' => 'frag ment'), UrlGeneratorInterface::ABSOLUTE_PATH);
+        $url = $this->getGenerator($routes)->generate('test', ['_fragment' => 'frag ment'], UrlGeneratorInterface::ABSOLUTE_PATH);
         $this->assertEquals('/app.php/testing#frag%20ment', $url);
 
-        $url = $this->getGenerator($routes)->generate('test', array('_fragment' => '0'), UrlGeneratorInterface::ABSOLUTE_PATH);
+        $url = $this->getGenerator($routes)->generate('test', ['_fragment' => '0'], UrlGeneratorInterface::ABSOLUTE_PATH);
         $this->assertEquals('/app.php/testing#0', $url);
     }
 
     public function testFragmentsDoNotEscapeValidCharacters()
     {
         $routes = $this->getRoutes('test', new Route('/testing'));
-        $url = $this->getGenerator($routes)->generate('test', array('_fragment' => '?/'), UrlGeneratorInterface::ABSOLUTE_PATH);
+        $url = $this->getGenerator($routes)->generate('test', ['_fragment' => '?/'], UrlGeneratorInterface::ABSOLUTE_PATH);
 
         $this->assertEquals('/app.php/testing#?/', $url);
     }
 
     public function testFragmentsCanBeDefinedAsDefaults()
     {
-        $routes = $this->getRoutes('test', new Route('/testing', array('_fragment' => 'fragment')));
-        $url = $this->getGenerator($routes)->generate('test', array(), UrlGeneratorInterface::ABSOLUTE_PATH);
+        $routes = $this->getRoutes('test', new Route('/testing', ['_fragment' => 'fragment']));
+        $url = $this->getGenerator($routes)->generate('test', [], UrlGeneratorInterface::ABSOLUTE_PATH);
 
         $this->assertEquals('/app.php/testing#fragment', $url);
     }
 
-    protected function getGenerator(RouteCollection $routes, array $parameters = array(), $logger = null)
+    protected function getGenerator(RouteCollection $routes, array $parameters = [], $logger = null)
     {
         $context = new RequestContext('/app.php');
         foreach ($parameters as $key => $value) {
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AbstractAnnotationLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AbstractAnnotationLoaderTest.php
index e8bbe8fcf43e1..0ce4a47ec1317 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/AbstractAnnotationLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/AbstractAnnotationLoaderTest.php
@@ -26,7 +26,7 @@ public function getReader()
     public function getClassLoader($reader)
     {
         return $this->getMockBuilder('Symfony\Component\Routing\Loader\AnnotationClassLoader')
-            ->setConstructorArgs(array($reader))
+            ->setConstructorArgs([$reader])
             ->getMockForAbstractClass()
         ;
     }
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
index a0230ada88ec0..b93d54a063783 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
@@ -52,15 +52,15 @@ public function testSupportsChecksResource($resource, $expectedSupports)
 
     public function provideTestSupportsChecksResource()
     {
-        return array(
-            array('class', true),
-            array('\fully\qualified\class\name', true),
-            array('namespaced\class\without\leading\slash', true),
-            array('ÿClassWithLegalSpecialCharacters', true),
-            array('5', false),
-            array('foo.foo', false),
-            array(null, false),
-        );
+        return [
+            ['class', true],
+            ['\fully\qualified\class\name', true],
+            ['namespaced\class\without\leading\slash', true],
+            ['ÿClassWithLegalSpecialCharacters', true],
+            ['5', false],
+            ['foo.foo', false],
+            [null, false],
+        ];
     }
 
     public function testSupportsChecksTypeIfSpecified()
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php
index 901b858d91cd7..ac25493481ef6 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php
@@ -34,13 +34,13 @@ public function testLoad()
         $this->reader
             ->expects($this->any())
             ->method('getMethodAnnotations')
-            ->will($this->returnValue(array()))
+            ->will($this->returnValue([]))
         ;
 
         $this->reader
             ->expects($this->any())
             ->method('getClassAnnotations')
-            ->will($this->returnValue(array()))
+            ->will($this->returnValue([]))
         ;
 
         $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses');
@@ -48,22 +48,22 @@ public function testLoad()
 
     public function testLoadIgnoresHiddenDirectories()
     {
-        $this->expectAnnotationsToBeReadFrom(array(
+        $this->expectAnnotationsToBeReadFrom([
             'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass',
             'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass',
             'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\FooClass',
-        ));
+        ]);
 
         $this->reader
             ->expects($this->any())
             ->method('getMethodAnnotations')
-            ->will($this->returnValue(array()))
+            ->will($this->returnValue([]))
         ;
 
         $this->reader
             ->expects($this->any())
             ->method('getClassAnnotations')
-            ->will($this->returnValue(array()))
+            ->will($this->returnValue([]))
         ;
 
         $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses');
@@ -92,7 +92,7 @@ public function testLoadFileIfLocatedResourceIsFile()
         $this->reader
             ->expects($this->any())
             ->method('getMethodAnnotations')
-            ->will($this->returnValue(array()))
+            ->will($this->returnValue([]))
         ;
 
         $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses/FooClass.php');
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
index e0a95c8c01153..26a897ea64835 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
@@ -59,10 +59,10 @@ public function testLoadFileWithoutStartTag()
      */
     public function testLoadVariadic()
     {
-        $route = new Route(array('path' => '/path/to/{id}'));
+        $route = new Route(['path' => '/path/to/{id}']);
         $this->reader->expects($this->once())->method('getClassAnnotation');
         $this->reader->expects($this->once())->method('getMethodAnnotations')
-            ->will($this->returnValue(array($route)));
+            ->will($this->returnValue([$route]));
 
         $this->loader->load(__DIR__.'/../Fixtures/OtherAnnotatedClasses/VariadicClass.php');
     }
diff --git a/src/Symfony/Component/Routing/Tests/Loader/DirectoryLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/DirectoryLoaderTest.php
index 45968551b2454..2657751b38cda 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/DirectoryLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/DirectoryLoaderTest.php
@@ -30,11 +30,11 @@ protected function setUp()
         $locator = new FileLocator();
         $this->reader = $this->getReader();
         $this->loader = new DirectoryLoader($locator);
-        $resolver = new LoaderResolver(array(
+        $resolver = new LoaderResolver([
             new YamlFileLoader($locator),
             new AnnotationFileLoader($locator, $this->getClassLoader($this->reader)),
             $this->loader,
-        ));
+        ]);
         $this->loader->setResolver($resolver);
     }
 
diff --git a/src/Symfony/Component/Routing/Tests/Loader/ObjectRouteLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/ObjectRouteLoaderTest.php
index 408fa0b45c48c..ef9f59abed1e6 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/ObjectRouteLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/ObjectRouteLoaderTest.php
@@ -26,9 +26,9 @@ public function testLoadCallsServiceAndReturnsCollection()
         $collection = new RouteCollection();
         $collection->add('foo', new Route('/foo'));
 
-        $loader->loaderMap = array(
+        $loader->loaderMap = [
             'my_route_provider_service' => new RouteService($collection),
-        );
+        ];
 
         $actualRoutes = $loader->load(
             'my_route_provider_service:loadRoutes',
diff --git a/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
index 0dcf5d4941bef..ed1469736c71d 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
@@ -33,7 +33,7 @@ public function testSupports()
 
     public function testLoadWithRoute()
     {
-        $loader = new PhpFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new PhpFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $routeCollection = $loader->load('validpattern.php');
         $routes = $routeCollection->all();
 
@@ -45,14 +45,14 @@ public function testLoadWithRoute()
             $this->assertSame('MyBlogBundle:Blog:show', $route->getDefault('_controller'));
             $this->assertSame('{locale}.example.com', $route->getHost());
             $this->assertSame('RouteCompiler', $route->getOption('compiler_class'));
-            $this->assertEquals(array('GET', 'POST', 'PUT', 'OPTIONS'), $route->getMethods());
-            $this->assertEquals(array('https'), $route->getSchemes());
+            $this->assertEquals(['GET', 'POST', 'PUT', 'OPTIONS'], $route->getMethods());
+            $this->assertEquals(['https'], $route->getSchemes());
         }
     }
 
     public function testLoadWithImport()
     {
-        $loader = new PhpFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new PhpFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $routeCollection = $loader->load('validresource.php');
         $routes = $routeCollection->all();
 
@@ -64,14 +64,14 @@ public function testLoadWithImport()
             $this->assertSame('MyBlogBundle:Blog:show', $route->getDefault('_controller'));
             $this->assertSame('{locale}.example.com', $route->getHost());
             $this->assertSame('RouteCompiler', $route->getOption('compiler_class'));
-            $this->assertEquals(array('GET', 'POST', 'PUT', 'OPTIONS'), $route->getMethods());
-            $this->assertEquals(array('https'), $route->getSchemes());
+            $this->assertEquals(['GET', 'POST', 'PUT', 'OPTIONS'], $route->getMethods());
+            $this->assertEquals(['https'], $route->getSchemes());
         }
     }
 
     public function testThatDefiningVariableInConfigFileHasNoSideEffects()
     {
-        $locator = new FileLocator(array(__DIR__.'/../Fixtures'));
+        $locator = new FileLocator([__DIR__.'/../Fixtures']);
         $loader = new PhpFileLoader($locator);
         $routeCollection = $loader->load('with_define_path_variable.php');
         $resources = $routeCollection->getResources();
@@ -120,7 +120,7 @@ public function testRoutingConfigurator()
 
     public function testRoutingConfiguratorCanImportGlobPatterns()
     {
-        $locator = new FileLocator(array(__DIR__.'/../Fixtures/glob'));
+        $locator = new FileLocator([__DIR__.'/../Fixtures/glob']);
         $loader = new PhpFileLoader($locator);
         $routeCollection = $loader->load('php_dsl.php');
 
diff --git a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
index 21fc3400f249e..66588e7e900ac 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
@@ -31,7 +31,7 @@ public function testSupports()
 
     public function testLoadWithRoute()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $routeCollection = $loader->load('validpattern.xml');
         $route = $routeCollection->get('blog_show');
 
@@ -41,14 +41,14 @@ public function testLoadWithRoute()
         $this->assertSame('MyBundle:Blog:show', $route->getDefault('_controller'));
         $this->assertSame('\w+', $route->getRequirement('locale'));
         $this->assertSame('RouteCompiler', $route->getOption('compiler_class'));
-        $this->assertEquals(array('GET', 'POST', 'PUT', 'OPTIONS'), $route->getMethods());
-        $this->assertEquals(array('https'), $route->getSchemes());
+        $this->assertEquals(['GET', 'POST', 'PUT', 'OPTIONS'], $route->getMethods());
+        $this->assertEquals(['https'], $route->getSchemes());
         $this->assertEquals('context.getMethod() == "GET"', $route->getCondition());
     }
 
     public function testLoadWithNamespacePrefix()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $routeCollection = $loader->load('namespaceprefix.xml');
 
         $this->assertCount(1, $routeCollection->all(), 'One route is loaded');
@@ -66,7 +66,7 @@ public function testLoadWithNamespacePrefix()
 
     public function testLoadWithImport()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $routeCollection = $loader->load('validresource.xml');
         $routes = $routeCollection->all();
 
@@ -89,7 +89,7 @@ public function testLoadWithImport()
      */
     public function testLoadThrowsExceptionWithInvalidFile($filePath)
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $loader->load($filePath);
     }
 
@@ -99,13 +99,13 @@ public function testLoadThrowsExceptionWithInvalidFile($filePath)
      */
     public function testLoadThrowsExceptionWithInvalidFileEvenWithoutSchemaValidation($filePath)
     {
-        $loader = new CustomXmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new CustomXmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $loader->load($filePath);
     }
 
     public function getPathsToInvalidFiles()
     {
-        return array(array('nonvalidnode.xml'), array('nonvalidroute.xml'), array('nonvalid.xml'), array('missing_id.xml'), array('missing_path.xml'));
+        return [['nonvalidnode.xml'], ['nonvalidroute.xml'], ['nonvalid.xml'], ['missing_id.xml'], ['missing_path.xml']];
     }
 
     /**
@@ -114,13 +114,13 @@ public function getPathsToInvalidFiles()
      */
     public function testDocTypeIsNotAllowed()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $loader->load('withdoctype.xml');
     }
 
     public function testNullValues()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $routeCollection = $loader->load('null_values.xml');
         $route = $routeCollection->get('blog_show');
 
@@ -134,12 +134,12 @@ public function testNullValues()
 
     public function testScalarDataTypeDefaults()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $routeCollection = $loader->load('scalar_defaults.xml');
         $route = $routeCollection->get('blog');
 
         $this->assertSame(
-            array(
+            [
                 '_controller' => 'AcmeBlogBundle:Blog:index',
                 'slug' => null,
                 'published' => true,
@@ -150,147 +150,147 @@ public function testScalarDataTypeDefaults()
                 'locked' => false,
                 'foo' => null,
                 'bar' => null,
-            ),
+            ],
             $route->getDefaults()
         );
     }
 
     public function testListDefaults()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $routeCollection = $loader->load('list_defaults.xml');
         $route = $routeCollection->get('blog');
 
         $this->assertSame(
-            array(
+            [
                 '_controller' => 'AcmeBlogBundle:Blog:index',
-                'values' => array(true, 1, 3.5, 'foo'),
-            ),
+                'values' => [true, 1, 3.5, 'foo'],
+            ],
             $route->getDefaults()
         );
     }
 
     public function testListInListDefaults()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $routeCollection = $loader->load('list_in_list_defaults.xml');
         $route = $routeCollection->get('blog');
 
         $this->assertSame(
-            array(
+            [
                 '_controller' => 'AcmeBlogBundle:Blog:index',
-                'values' => array(array(true, 1, 3.5, 'foo')),
-            ),
+                'values' => [[true, 1, 3.5, 'foo']],
+            ],
             $route->getDefaults()
         );
     }
 
     public function testListInMapDefaults()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $routeCollection = $loader->load('list_in_map_defaults.xml');
         $route = $routeCollection->get('blog');
 
         $this->assertSame(
-            array(
+            [
                 '_controller' => 'AcmeBlogBundle:Blog:index',
-                'values' => array('list' => array(true, 1, 3.5, 'foo')),
-            ),
+                'values' => ['list' => [true, 1, 3.5, 'foo']],
+            ],
             $route->getDefaults()
         );
     }
 
     public function testMapDefaults()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $routeCollection = $loader->load('map_defaults.xml');
         $route = $routeCollection->get('blog');
 
         $this->assertSame(
-            array(
+            [
                 '_controller' => 'AcmeBlogBundle:Blog:index',
-                'values' => array(
+                'values' => [
                     'public' => true,
                     'page' => 1,
                     'price' => 3.5,
                     'title' => 'foo',
-                ),
-            ),
+                ],
+            ],
             $route->getDefaults()
         );
     }
 
     public function testMapInListDefaults()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $routeCollection = $loader->load('map_in_list_defaults.xml');
         $route = $routeCollection->get('blog');
 
         $this->assertSame(
-            array(
+            [
                 '_controller' => 'AcmeBlogBundle:Blog:index',
-                'values' => array(array(
+                'values' => [[
                     'public' => true,
                     'page' => 1,
                     'price' => 3.5,
                     'title' => 'foo',
-                )),
-            ),
+                ]],
+            ],
             $route->getDefaults()
         );
     }
 
     public function testMapInMapDefaults()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $routeCollection = $loader->load('map_in_map_defaults.xml');
         $route = $routeCollection->get('blog');
 
         $this->assertSame(
-            array(
+            [
                 '_controller' => 'AcmeBlogBundle:Blog:index',
-                'values' => array('map' => array(
+                'values' => ['map' => [
                     'public' => true,
                     'page' => 1,
                     'price' => 3.5,
                     'title' => 'foo',
-                )),
-            ),
+                ]],
+            ],
             $route->getDefaults()
         );
     }
 
     public function testNullValuesInList()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $routeCollection = $loader->load('list_null_values.xml');
         $route = $routeCollection->get('blog');
 
-        $this->assertSame(array(null, null, null, null, null, null), $route->getDefault('list'));
+        $this->assertSame([null, null, null, null, null, null], $route->getDefault('list'));
     }
 
     public function testNullValuesInMap()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $routeCollection = $loader->load('map_null_values.xml');
         $route = $routeCollection->get('blog');
 
         $this->assertSame(
-            array(
+            [
                 'boolean' => null,
                 'integer' => null,
                 'float' => null,
                 'string' => null,
                 'list' => null,
                 'map' => null,
-            ),
+            ],
             $route->getDefault('map')
         );
     }
 
     public function testLoadRouteWithControllerAttribute()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/controller')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $routeCollection = $loader->load('routing.xml');
 
         $route = $routeCollection->get('app_homepage');
@@ -300,7 +300,7 @@ public function testLoadRouteWithControllerAttribute()
 
     public function testLoadRouteWithoutControllerAttribute()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/controller')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $routeCollection = $loader->load('routing.xml');
 
         $route = $routeCollection->get('app_logout');
@@ -310,7 +310,7 @@ public function testLoadRouteWithoutControllerAttribute()
 
     public function testLoadRouteWithControllerSetInDefaults()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/controller')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $routeCollection = $loader->load('routing.xml');
 
         $route = $routeCollection->get('app_blog');
@@ -324,7 +324,7 @@ public function testLoadRouteWithControllerSetInDefaults()
      */
     public function testOverrideControllerInDefaults()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/controller')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $loader->load('override_defaults.xml');
     }
 
@@ -333,7 +333,7 @@ public function testOverrideControllerInDefaults()
      */
     public function testImportRouteWithController($file)
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/controller')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $routeCollection = $loader->load($file);
 
         $route = $routeCollection->get('app_homepage');
@@ -348,8 +348,8 @@ public function testImportRouteWithController($file)
 
     public function provideFilesImportingRoutesWithControllers()
     {
-        yield array('import_controller.xml');
-        yield array('import__controller.xml');
+        yield ['import_controller.xml'];
+        yield ['import__controller.xml'];
     }
 
     /**
@@ -358,13 +358,13 @@ public function provideFilesImportingRoutesWithControllers()
      */
     public function testImportWithOverriddenController()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/controller')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $loader->load('import_override_defaults.xml');
     }
 
     public function testImportRouteWithGlobMatchingSingleFile()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/glob')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/glob']));
         $routeCollection = $loader->load('import_single.xml');
 
         $route = $routeCollection->get('bar_route');
@@ -373,7 +373,7 @@ public function testImportRouteWithGlobMatchingSingleFile()
 
     public function testImportRouteWithGlobMatchingMultipleFiles()
     {
-        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/glob')));
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/glob']));
         $routeCollection = $loader->load('import_multiple.xml');
 
         $route = $routeCollection->get('bar_route');
diff --git a/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
index a89c58443f7dd..4944e5b636510 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
@@ -33,11 +33,11 @@ public function testSupports()
 
     public function testLoadDoesNothingIfEmpty()
     {
-        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $collection = $loader->load('empty.yml');
 
-        $this->assertEquals(array(), $collection->all());
-        $this->assertEquals(array(new FileResource(realpath(__DIR__.'/../Fixtures/empty.yml'))), $collection->getResources());
+        $this->assertEquals([], $collection->all());
+        $this->assertEquals([new FileResource(realpath(__DIR__.'/../Fixtures/empty.yml'))], $collection->getResources());
     }
 
     /**
@@ -46,26 +46,26 @@ public function testLoadDoesNothingIfEmpty()
      */
     public function testLoadThrowsExceptionWithInvalidFile($filePath)
     {
-        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $loader->load($filePath);
     }
 
     public function getPathsToInvalidFiles()
     {
-        return array(
-            array('nonvalid.yml'),
-            array('nonvalid2.yml'),
-            array('incomplete.yml'),
-            array('nonvalidkeys.yml'),
-            array('nonesense_resource_plus_path.yml'),
-            array('nonesense_type_without_resource.yml'),
-            array('bad_format.yml'),
-        );
+        return [
+            ['nonvalid.yml'],
+            ['nonvalid2.yml'],
+            ['incomplete.yml'],
+            ['nonvalidkeys.yml'],
+            ['nonesense_resource_plus_path.yml'],
+            ['nonesense_type_without_resource.yml'],
+            ['bad_format.yml'],
+        ];
     }
 
     public function testLoadSpecialRouteName()
     {
-        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $routeCollection = $loader->load('special_route_name.yml');
         $route = $routeCollection->get('#$péß^a|');
 
@@ -75,7 +75,7 @@ public function testLoadSpecialRouteName()
 
     public function testLoadWithRoute()
     {
-        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $routeCollection = $loader->load('validpattern.yml');
         $route = $routeCollection->get('blog_show');
 
@@ -85,14 +85,14 @@ public function testLoadWithRoute()
         $this->assertSame('MyBundle:Blog:show', $route->getDefault('_controller'));
         $this->assertSame('\w+', $route->getRequirement('locale'));
         $this->assertSame('RouteCompiler', $route->getOption('compiler_class'));
-        $this->assertEquals(array('GET', 'POST', 'PUT', 'OPTIONS'), $route->getMethods());
-        $this->assertEquals(array('https'), $route->getSchemes());
+        $this->assertEquals(['GET', 'POST', 'PUT', 'OPTIONS'], $route->getMethods());
+        $this->assertEquals(['https'], $route->getSchemes());
         $this->assertEquals('context.getMethod() == "GET"', $route->getCondition());
     }
 
     public function testLoadWithResource()
     {
-        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
         $routeCollection = $loader->load('validresource.yml');
         $routes = $routeCollection->all();
 
@@ -111,7 +111,7 @@ public function testLoadWithResource()
 
     public function testLoadRouteWithControllerAttribute()
     {
-        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/controller')));
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $routeCollection = $loader->load('routing.yml');
 
         $route = $routeCollection->get('app_homepage');
@@ -121,7 +121,7 @@ public function testLoadRouteWithControllerAttribute()
 
     public function testLoadRouteWithoutControllerAttribute()
     {
-        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/controller')));
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $routeCollection = $loader->load('routing.yml');
 
         $route = $routeCollection->get('app_logout');
@@ -131,7 +131,7 @@ public function testLoadRouteWithoutControllerAttribute()
 
     public function testLoadRouteWithControllerSetInDefaults()
     {
-        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/controller')));
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $routeCollection = $loader->load('routing.yml');
 
         $route = $routeCollection->get('app_blog');
@@ -145,7 +145,7 @@ public function testLoadRouteWithControllerSetInDefaults()
      */
     public function testOverrideControllerInDefaults()
     {
-        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/controller')));
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $loader->load('override_defaults.yml');
     }
 
@@ -154,7 +154,7 @@ public function testOverrideControllerInDefaults()
      */
     public function testImportRouteWithController($file)
     {
-        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/controller')));
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $routeCollection = $loader->load($file);
 
         $route = $routeCollection->get('app_homepage');
@@ -169,8 +169,8 @@ public function testImportRouteWithController($file)
 
     public function provideFilesImportingRoutesWithControllers()
     {
-        yield array('import_controller.yml');
-        yield array('import__controller.yml');
+        yield ['import_controller.yml'];
+        yield ['import__controller.yml'];
     }
 
     /**
@@ -179,13 +179,13 @@ public function provideFilesImportingRoutesWithControllers()
      */
     public function testImportWithOverriddenController()
     {
-        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/controller')));
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $loader->load('import_override_defaults.yml');
     }
 
     public function testImportRouteWithGlobMatchingSingleFile()
     {
-        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/glob')));
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/glob']));
         $routeCollection = $loader->load('import_single.yml');
 
         $route = $routeCollection->get('bar_route');
@@ -194,7 +194,7 @@ public function testImportRouteWithGlobMatchingSingleFile()
 
     public function testImportRouteWithGlobMatchingMultipleFiles()
     {
-        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/glob')));
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/glob']));
         $routeCollection = $loader->load('import_multiple.yml');
 
         $route = $routeCollection->get('bar_route');
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php
index 1785c3ad20f41..235e47768f505 100644
--- a/src/Symfony/Component/Routing/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php
+++ b/src/Symfony/Component/Routing/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php
@@ -25,11 +25,11 @@ protected function getUrlMatcher(RouteCollection $routes, RequestContext $contex
 
         $class = 'DumpedRedirectableUrlMatcher'.++$i;
         $dumper = new PhpMatcherDumper($routes);
-        eval('?>'.$dumper->dump(array('class' => $class, 'base_class' => 'Symfony\Component\Routing\Tests\Matcher\TestDumpedRedirectableUrlMatcher')));
+        eval('?>'.$dumper->dump(['class' => $class, 'base_class' => 'Symfony\Component\Routing\Tests\Matcher\TestDumpedRedirectableUrlMatcher']));
 
         return $this->getMockBuilder($class)
-            ->setConstructorArgs(array($context ?: new RequestContext()))
-            ->setMethods(array('redirect'))
+            ->setConstructorArgs([$context ?: new RequestContext()])
+            ->setMethods(['redirect'])
             ->getMock();
     }
 }
@@ -38,6 +38,6 @@ class TestDumpedRedirectableUrlMatcher extends UrlMatcher implements Redirectabl
 {
     public function redirect($path, $route, $scheme = null)
     {
-        return array();
+        return [];
     }
 }
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/DumpedUrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/DumpedUrlMatcherTest.php
index b00dfdf5fa8da..34946f3f2b26c 100644
--- a/src/Symfony/Component/Routing/Tests/Matcher/DumpedUrlMatcherTest.php
+++ b/src/Symfony/Component/Routing/Tests/Matcher/DumpedUrlMatcherTest.php
@@ -41,7 +41,7 @@ protected function getUrlMatcher(RouteCollection $routes, RequestContext $contex
 
         $class = 'DumpedUrlMatcher'.++$i;
         $dumper = new PhpMatcherDumper($routes);
-        eval('?>'.$dumper->dump(array('class' => $class)));
+        eval('?>'.$dumper->dump(['class' => $class]));
 
         return new $class($context ?: new RequestContext());
     }
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php b/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
index 68721bd63c516..da7ed4a095eba 100644
--- a/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
+++ b/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
@@ -76,7 +76,7 @@ public function testRedirectPreservesUrlEncoding()
                         ->setConstructorArgs(array(new RequestContext()))
                         ->getMock();
 
-        $matcher->expects($this->once())->method('redirect')->with('/foo%3Abar/', 'foo')->willReturn(array());
+        $matcher->expects($this->once())->method('redirect')->with('/foo%3Abar/', 'foo')->willReturn([]);
 
         $matcher->match('/foo%3Abar');
     }
@@ -84,7 +84,7 @@ public function testRedirectPreservesUrlEncoding()
     /**
      * @dataProvider getRouteCollections
      */
-    public function testDump(RouteCollection $collection, $fixture, $options = array())
+    public function testDump(RouteCollection $collection, $fixture, $options = [])
     {
         $basePath = __DIR__.'/../../Fixtures/dumper/';
 
@@ -103,28 +103,28 @@ public function getRouteCollections()
         // defaults and requirements
         $collection->add('foo', new Route(
             '/foo/{bar}',
-            array('def' => 'test'),
-            array('bar' => 'baz|symfony')
+            ['def' => 'test'],
+            ['bar' => 'baz|symfony']
         ));
         // method requirement
         $collection->add('bar', new Route(
             '/bar/{foo}',
-            array(),
-            array(),
-            array(),
+            [],
+            [],
+            [],
             '',
-            array(),
-            array('GET', 'head')
+            [],
+            ['GET', 'head']
         ));
         // GET method requirement automatically adds HEAD as valid
         $collection->add('barhead', new Route(
             '/barhead/{foo}',
-            array(),
-            array(),
-            array(),
+            [],
+            [],
+            [],
             '',
-            array(),
-            array('GET')
+            [],
+            ['GET']
         ));
         // simple
         $collection->add('baz', new Route(
@@ -145,33 +145,33 @@ public function getRouteCollections()
         // trailing slash and method
         $collection->add('baz5', new Route(
             '/test/{foo}/',
-            array(),
-            array(),
-            array(),
+            [],
+            [],
+            [],
             '',
-            array(),
-            array('post')
+            [],
+            ['post']
         ));
         // complex name
         $collection->add('baz.baz6', new Route(
             '/test/{foo}/',
-            array(),
-            array(),
-            array(),
+            [],
+            [],
+            [],
             '',
-            array(),
-            array('put')
+            [],
+            ['put']
         ));
         // defaults without variable
         $collection->add('foofoo', new Route(
             '/foofoo',
-            array('def' => 'test')
+            ['def' => 'test']
         ));
         // pattern with quotes
         $collection->add('quoter', new Route(
             '/{quoter}',
-            array(),
-            array('quoter' => '[\']+')
+            [],
+            ['quoter' => '[\']+']
         ));
         // space in pattern
         $collection->add('space', new Route(
@@ -198,7 +198,7 @@ public function getRouteCollections()
         // overridden through addCollection() and multiple sub-collections with no own prefix
         $collection1 = new RouteCollection();
         $collection1->add('overridden2', new Route('/old'));
-        $collection1->add('helloWorld', new Route('/hello/{who}', array('who' => 'World!')));
+        $collection1->add('helloWorld', new Route('/hello/{who}', ['who' => 'World!']));
         $collection2 = new RouteCollection();
         $collection3 = new RouteCollection();
         $collection3->add('overridden2', new Route('/new'));
@@ -229,22 +229,22 @@ public function getRouteCollections()
 
         $collection1 = new RouteCollection();
 
-        $route1 = new Route('/route1', array(), array(), array(), 'a.example.com');
+        $route1 = new Route('/route1', [], [], [], 'a.example.com');
         $collection1->add('route1', $route1);
 
-        $route2 = new Route('/c2/route2', array(), array(), array(), 'a.example.com');
+        $route2 = new Route('/c2/route2', [], [], [], 'a.example.com');
         $collection1->add('route2', $route2);
 
-        $route3 = new Route('/c2/route3', array(), array(), array(), 'b.example.com');
+        $route3 = new Route('/c2/route3', [], [], [], 'b.example.com');
         $collection1->add('route3', $route3);
 
-        $route4 = new Route('/route4', array(), array(), array(), 'a.example.com');
+        $route4 = new Route('/route4', [], [], [], 'a.example.com');
         $collection1->add('route4', $route4);
 
-        $route5 = new Route('/route5', array(), array(), array(), 'c.example.com');
+        $route5 = new Route('/route5', [], [], [], 'c.example.com');
         $collection1->add('route5', $route5);
 
-        $route6 = new Route('/route6', array(), array(), array(), null);
+        $route6 = new Route('/route6', [], [], [], null);
         $collection1->add('route6', $route6);
 
         $collection->addCollection($collection1);
@@ -253,25 +253,25 @@ public function getRouteCollections()
 
         $collection1 = new RouteCollection();
 
-        $route11 = new Route('/route11', array(), array(), array(), '{var1}.example.com');
+        $route11 = new Route('/route11', [], [], [], '{var1}.example.com');
         $collection1->add('route11', $route11);
 
-        $route12 = new Route('/route12', array('var1' => 'val'), array(), array(), '{var1}.example.com');
+        $route12 = new Route('/route12', ['var1' => 'val'], [], [], '{var1}.example.com');
         $collection1->add('route12', $route12);
 
-        $route13 = new Route('/route13/{name}', array(), array(), array(), '{var1}.example.com');
+        $route13 = new Route('/route13/{name}', [], [], [], '{var1}.example.com');
         $collection1->add('route13', $route13);
 
-        $route14 = new Route('/route14/{name}', array('var1' => 'val'), array(), array(), '{var1}.example.com');
+        $route14 = new Route('/route14/{name}', ['var1' => 'val'], [], [], '{var1}.example.com');
         $collection1->add('route14', $route14);
 
-        $route15 = new Route('/route15/{name}', array(), array(), array(), 'c.example.com');
+        $route15 = new Route('/route15/{name}', [], [], [], 'c.example.com');
         $collection1->add('route15', $route15);
 
-        $route16 = new Route('/route16/{name}', array('var1' => 'val'), array(), array(), null);
+        $route16 = new Route('/route16/{name}', ['var1' => 'val'], [], [], null);
         $collection1->add('route16', $route16);
 
-        $route17 = new Route('/route17', array(), array(), array(), null);
+        $route17 = new Route('/route17', [], [], [], null);
         $collection1->add('route17', $route17);
 
         $collection->addCollection($collection1);
@@ -328,57 +328,57 @@ public function getRouteCollections()
         $headMatchCasesCollection = new RouteCollection();
         $headMatchCasesCollection->add('just_head', new Route(
             '/just_head',
-            array(),
-            array(),
-            array(),
+            [],
+            [],
+            [],
             '',
-            array(),
-            array('HEAD')
+            [],
+            ['HEAD']
         ));
         $headMatchCasesCollection->add('head_and_get', new Route(
             '/head_and_get',
-            array(),
-            array(),
-            array(),
+            [],
+            [],
+            [],
             '',
-            array(),
-            array('HEAD', 'GET')
+            [],
+            ['HEAD', 'GET']
         ));
         $headMatchCasesCollection->add('get_and_head', new Route(
             '/get_and_head',
-            array(),
-            array(),
-            array(),
+            [],
+            [],
+            [],
             '',
-            array(),
-            array('GET', 'HEAD')
+            [],
+            ['GET', 'HEAD']
         ));
         $headMatchCasesCollection->add('post_and_head', new Route(
             '/post_and_head',
-            array(),
-            array(),
-            array(),
+            [],
+            [],
+            [],
             '',
-            array(),
-            array('POST', 'HEAD')
+            [],
+            ['POST', 'HEAD']
         ));
         $headMatchCasesCollection->add('put_and_post', new Route(
             '/put_and_post',
-            array(),
-            array(),
-            array(),
+            [],
+            [],
+            [],
             '',
-            array(),
-            array('PUT', 'POST')
+            [],
+            ['PUT', 'POST']
         ));
         $headMatchCasesCollection->add('put_and_get_and_head', new Route(
             '/put_and_post',
-            array(),
-            array(),
-            array(),
+            [],
+            [],
+            [],
             '',
-            array(),
-            array('PUT', 'GET', 'HEAD')
+            [],
+            ['PUT', 'GET', 'HEAD']
         ));
 
         /* test case 5 */
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/Dumper/StaticPrefixCollectionTest.php b/src/Symfony/Component/Routing/Tests/Matcher/Dumper/StaticPrefixCollectionTest.php
index 37419e7743640..148ecb6804517 100644
--- a/src/Symfony/Component/Routing/Tests/Matcher/Dumper/StaticPrefixCollectionTest.php
+++ b/src/Symfony/Component/Routing/Tests/Matcher/Dumper/StaticPrefixCollectionTest.php
@@ -135,14 +135,14 @@ public function routeProvider()
             ),
 
             'Group regardless of segments' => array(
-                array(
-                    array('/aaa-111/', 'a1'),
-                    array('/aaa-222/', 'a2'),
-                    array('/aaa-333/', 'a3'),
-                    array('/group-aa/', 'g1'),
-                    array('/group-bb/', 'g2'),
-                    array('/group-cc/', 'g3'),
-                ),
+                [
+                    ['/aaa-111/', 'a1'],
+                    ['/aaa-222/', 'a2'],
+                    ['/aaa-333/', 'a3'],
+                    ['/group-aa/', 'g1'],
+                    ['/group-bb/', 'g2'],
+                    ['/group-cc/', 'g3'],
+                ],
                 <<<EOF
 /aaa-
 -> /aaa-111 a1
@@ -159,7 +159,7 @@ public function routeProvider()
 
     private function dumpCollection(StaticPrefixCollection $collection, $prefix = '')
     {
-        $lines = array();
+        $lines = [];
 
         foreach ($collection->getItems() as $item) {
             if ($item instanceof StaticPrefixCollection) {
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php
index 9857f05024d72..1f0c42350a20e 100644
--- a/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php
+++ b/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php
@@ -23,7 +23,7 @@ public function testMissingTrailingSlash()
         $coll->add('foo', new Route('/foo/'));
 
         $matcher = $this->getUrlMatcher($coll);
-        $matcher->expects($this->once())->method('redirect')->will($this->returnValue(array()));
+        $matcher->expects($this->once())->method('redirect')->will($this->returnValue([]));
         $matcher->match('/foo');
     }
 
@@ -44,14 +44,14 @@ public function testRedirectWhenNoSlashForNonSafeMethod()
     public function testSchemeRedirectRedirectsToFirstScheme()
     {
         $coll = new RouteCollection();
-        $coll->add('foo', new Route('/foo', array(), array(), array(), '', array('FTP', 'HTTPS')));
+        $coll->add('foo', new Route('/foo', [], [], [], '', ['FTP', 'HTTPS']));
 
         $matcher = $this->getUrlMatcher($coll);
         $matcher
             ->expects($this->once())
             ->method('redirect')
             ->with('/foo', 'foo', 'ftp')
-            ->will($this->returnValue(array('_route' => 'foo')))
+            ->will($this->returnValue(['_route' => 'foo']))
         ;
         $matcher->match('/foo');
     }
@@ -59,7 +59,7 @@ public function testSchemeRedirectRedirectsToFirstScheme()
     public function testNoSchemaRedirectIfOneOfMultipleSchemesMatches()
     {
         $coll = new RouteCollection();
-        $coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https', 'http')));
+        $coll->add('foo', new Route('/foo', [], [], [], '', ['https', 'http']));
 
         $matcher = $this->getUrlMatcher($coll);
         $matcher
@@ -71,16 +71,16 @@ public function testNoSchemaRedirectIfOneOfMultipleSchemesMatches()
     public function testSchemeRedirectWithParams()
     {
         $coll = new RouteCollection();
-        $coll->add('foo', new Route('/foo/{bar}', array(), array(), array(), '', array('https')));
+        $coll->add('foo', new Route('/foo/{bar}', [], [], [], '', ['https']));
 
         $matcher = $this->getUrlMatcher($coll);
         $matcher
             ->expects($this->once())
             ->method('redirect')
             ->with('/foo/baz', 'foo', 'https')
-            ->will($this->returnValue(array('redirect' => 'value')))
+            ->will($this->returnValue(['redirect' => 'value']))
         ;
-        $this->assertEquals(array('_route' => 'foo', 'bar' => 'baz', 'redirect' => 'value'), $matcher->match('/foo/baz'));
+        $this->assertEquals(['_route' => 'foo', 'bar' => 'baz', 'redirect' => 'value'], $matcher->match('/foo/baz'));
     }
 
     public function testSlashRedirectWithParams()
@@ -93,9 +93,9 @@ public function testSlashRedirectWithParams()
             ->expects($this->once())
             ->method('redirect')
             ->with('/foo/baz/', 'foo', null)
-            ->will($this->returnValue(array('redirect' => 'value')))
+            ->will($this->returnValue(['redirect' => 'value']))
         ;
-        $this->assertEquals(array('_route' => 'foo', 'bar' => 'baz', 'redirect' => 'value'), $matcher->match('/foo/baz'));
+        $this->assertEquals(['_route' => 'foo', 'bar' => 'baz', 'redirect' => 'value'], $matcher->match('/foo/baz'));
     }
 
     public function testRedirectPreservesUrlEncoding()
@@ -104,17 +104,17 @@ public function testRedirectPreservesUrlEncoding()
         $coll->add('foo', new Route('/foo:bar/'));
 
         $matcher = $this->getUrlMatcher($coll);
-        $matcher->expects($this->once())->method('redirect')->with('/foo%3Abar/')->willReturn(array());
+        $matcher->expects($this->once())->method('redirect')->with('/foo%3Abar/')->willReturn([]);
         $matcher->match('/foo%3Abar');
     }
 
     public function testSchemeRequirement()
     {
         $coll = new RouteCollection();
-        $coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https')));
+        $coll->add('foo', new Route('/foo', [], [], [], '', ['https']));
         $matcher = $this->getUrlMatcher($coll, new RequestContext());
-        $matcher->expects($this->once())->method('redirect')->with('/foo', 'foo', 'https')->willReturn(array());
-        $this->assertSame(array('_route' => 'foo'), $matcher->match('/foo'));
+        $matcher->expects($this->once())->method('redirect')->with('/foo', 'foo', 'https')->willReturn([]);
+        $this->assertSame(['_route' => 'foo'], $matcher->match('/foo'));
     }
 
     public function testFallbackPage()
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/TraceableUrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/TraceableUrlMatcherTest.php
index 1f026a6ec7313..04ddf845f0d7e 100644
--- a/src/Symfony/Component/Routing/Tests/Matcher/TraceableUrlMatcherTest.php
+++ b/src/Symfony/Component/Routing/Tests/Matcher/TraceableUrlMatcherTest.php
@@ -23,41 +23,41 @@ class TraceableUrlMatcherTest extends TestCase
     public function test()
     {
         $coll = new RouteCollection();
-        $coll->add('foo', new Route('/foo', array(), array(), array(), '', array(), array('POST')));
-        $coll->add('bar', new Route('/bar/{id}', array(), array('id' => '\d+')));
-        $coll->add('bar1', new Route('/bar/{name}', array(), array('id' => '\w+'), array(), '', array(), array('POST')));
-        $coll->add('bar2', new Route('/foo', array(), array(), array(), 'baz'));
-        $coll->add('bar3', new Route('/foo1', array(), array(), array(), 'baz'));
-        $coll->add('bar4', new Route('/foo2', array(), array(), array(), 'baz', array(), array(), 'context.getMethod() == "GET"'));
+        $coll->add('foo', new Route('/foo', [], [], [], '', [], ['POST']));
+        $coll->add('bar', new Route('/bar/{id}', [], ['id' => '\d+']));
+        $coll->add('bar1', new Route('/bar/{name}', [], ['id' => '\w+'], [], '', [], ['POST']));
+        $coll->add('bar2', new Route('/foo', [], [], [], 'baz'));
+        $coll->add('bar3', new Route('/foo1', [], [], [], 'baz'));
+        $coll->add('bar4', new Route('/foo2', [], [], [], 'baz', [], [], 'context.getMethod() == "GET"'));
 
         $context = new RequestContext();
         $context->setHost('baz');
 
         $matcher = new TraceableUrlMatcher($coll, $context);
         $traces = $matcher->getTraces('/babar');
-        $this->assertSame(array(0, 0, 0, 0, 0, 0), $this->getLevels($traces));
+        $this->assertSame([0, 0, 0, 0, 0, 0], $this->getLevels($traces));
 
         $traces = $matcher->getTraces('/foo');
-        $this->assertSame(array(1, 0, 0, 2), $this->getLevels($traces));
+        $this->assertSame([1, 0, 0, 2], $this->getLevels($traces));
 
         $traces = $matcher->getTraces('/bar/12');
-        $this->assertSame(array(0, 2), $this->getLevels($traces));
+        $this->assertSame([0, 2], $this->getLevels($traces));
 
         $traces = $matcher->getTraces('/bar/dd');
-        $this->assertSame(array(0, 1, 1, 0, 0, 0), $this->getLevels($traces));
+        $this->assertSame([0, 1, 1, 0, 0, 0], $this->getLevels($traces));
 
         $traces = $matcher->getTraces('/foo1');
-        $this->assertSame(array(0, 0, 0, 0, 2), $this->getLevels($traces));
+        $this->assertSame([0, 0, 0, 0, 2], $this->getLevels($traces));
 
         $context->setMethod('POST');
         $traces = $matcher->getTraces('/foo');
-        $this->assertSame(array(2), $this->getLevels($traces));
+        $this->assertSame([2], $this->getLevels($traces));
 
         $traces = $matcher->getTraces('/bar/dd');
-        $this->assertSame(array(0, 1, 2), $this->getLevels($traces));
+        $this->assertSame([0, 1, 2], $this->getLevels($traces));
 
         $traces = $matcher->getTraces('/foo2');
-        $this->assertSame(array(0, 0, 0, 0, 0, 1), $this->getLevels($traces));
+        $this->assertSame([0, 0, 0, 0, 0, 1], $this->getLevels($traces));
     }
 
     public function testMatchRouteOnMultipleHosts()
@@ -65,17 +65,17 @@ public function testMatchRouteOnMultipleHosts()
         $routes = new RouteCollection();
         $routes->add('first', new Route(
             '/mypath/',
-            array('_controller' => 'MainBundle:Info:first'),
-            array(),
-            array(),
+            ['_controller' => 'MainBundle:Info:first'],
+            [],
+            [],
             'some.example.com'
         ));
 
         $routes->add('second', new Route(
             '/mypath/',
-            array('_controller' => 'MainBundle:Info:second'),
-            array(),
-            array(),
+            ['_controller' => 'MainBundle:Info:second'],
+            [],
+            [],
             'another.example.com'
         ));
 
@@ -86,14 +86,14 @@ public function testMatchRouteOnMultipleHosts()
 
         $traces = $matcher->getTraces('/mypath/');
         $this->assertSame(
-            array(TraceableUrlMatcher::ROUTE_ALMOST_MATCHES, TraceableUrlMatcher::ROUTE_ALMOST_MATCHES),
+            [TraceableUrlMatcher::ROUTE_ALMOST_MATCHES, TraceableUrlMatcher::ROUTE_ALMOST_MATCHES],
             $this->getLevels($traces)
         );
     }
 
     public function getLevels($traces)
     {
-        $levels = array();
+        $levels = [];
         foreach ($traces as $trace) {
             $levels[] = $trace['level'];
         }
@@ -104,7 +104,7 @@ public function getLevels($traces)
     public function testRoutesWithConditions()
     {
         $routes = new RouteCollection();
-        $routes->add('foo', new Route('/foo', array(), array(), array(), 'baz', array(), array(), "request.headers.get('User-Agent') matches '/firefox/i'"));
+        $routes->add('foo', new Route('/foo', [], [], [], 'baz', [], [], "request.headers.get('User-Agent') matches '/firefox/i'"));
 
         $context = new RequestContext();
         $context->setHost('baz');
@@ -115,7 +115,7 @@ public function testRoutesWithConditions()
         $traces = $matcher->getTracesForRequest($notMatchingRequest);
         $this->assertEquals("Condition \"request.headers.get('User-Agent') matches '/firefox/i'\" does not evaluate to \"true\"", $traces[0]['log']);
 
-        $matchingRequest = Request::create('/foo', 'GET', array(), array(), array(), array('HTTP_USER_AGENT' => 'Firefox'));
+        $matchingRequest = Request::create('/foo', 'GET', [], [], [], ['HTTP_USER_AGENT' => 'Firefox']);
         $traces = $matcher->getTracesForRequest($matchingRequest);
         $this->assertEquals('Route matches!', $traces[0]['log']);
     }
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php
index 85647f0bead22..6a4ba995397bc 100644
--- a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php
+++ b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php
@@ -33,7 +33,7 @@ public function testNoMethodSoAllowed()
     public function testMethodNotAllowed()
     {
         $coll = new RouteCollection();
-        $coll->add('foo', new Route('/foo', array(), array(), array(), '', array(), array('post')));
+        $coll->add('foo', new Route('/foo', [], [], [], '', [], ['post']));
 
         $matcher = $this->getUrlMatcher($coll);
 
@@ -41,14 +41,14 @@ public function testMethodNotAllowed()
             $matcher->match('/foo');
             $this->fail();
         } catch (MethodNotAllowedException $e) {
-            $this->assertEquals(array('POST'), $e->getAllowedMethods());
+            $this->assertEquals(['POST'], $e->getAllowedMethods());
         }
     }
 
     public function testMethodNotAllowedOnRoot()
     {
         $coll = new RouteCollection();
-        $coll->add('foo', new Route('/', array(), array(), array(), '', array(), array('GET')));
+        $coll->add('foo', new Route('/', [], [], [], '', [], ['GET']));
 
         $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST'));
 
@@ -56,14 +56,14 @@ public function testMethodNotAllowedOnRoot()
             $matcher->match('/');
             $this->fail();
         } catch (MethodNotAllowedException $e) {
-            $this->assertEquals(array('GET'), $e->getAllowedMethods());
+            $this->assertEquals(['GET'], $e->getAllowedMethods());
         }
     }
 
     public function testHeadAllowedWhenRequirementContainsGet()
     {
         $coll = new RouteCollection();
-        $coll->add('foo', new Route('/foo', array(), array(), array(), '', array(), array('get')));
+        $coll->add('foo', new Route('/foo', [], [], [], '', [], ['get']));
 
         $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'head'));
         $this->assertInternalType('array', $matcher->match('/foo'));
@@ -72,8 +72,8 @@ public function testHeadAllowedWhenRequirementContainsGet()
     public function testMethodNotAllowedAggregatesAllowedMethods()
     {
         $coll = new RouteCollection();
-        $coll->add('foo1', new Route('/foo', array(), array(), array(), '', array(), array('post')));
-        $coll->add('foo2', new Route('/foo', array(), array(), array(), '', array(), array('put', 'delete')));
+        $coll->add('foo1', new Route('/foo', [], [], [], '', [], ['post']));
+        $coll->add('foo2', new Route('/foo', [], [], [], '', [], ['put', 'delete']));
 
         $matcher = $this->getUrlMatcher($coll);
 
@@ -81,7 +81,7 @@ public function testMethodNotAllowedAggregatesAllowedMethods()
             $matcher->match('/foo');
             $this->fail();
         } catch (MethodNotAllowedException $e) {
-            $this->assertEquals(array('POST', 'PUT', 'DELETE'), $e->getAllowedMethods());
+            $this->assertEquals(['POST', 'PUT', 'DELETE'], $e->getAllowedMethods());
         }
     }
 
@@ -96,17 +96,17 @@ public function testMatch()
             $this->fail();
         } catch (ResourceNotFoundException $e) {
         }
-        $this->assertEquals(array('_route' => 'foo', 'bar' => 'baz'), $matcher->match('/foo/baz'));
+        $this->assertEquals(['_route' => 'foo', 'bar' => 'baz'], $matcher->match('/foo/baz'));
 
         // test that defaults are merged
         $collection = new RouteCollection();
-        $collection->add('foo', new Route('/foo/{bar}', array('def' => 'test')));
+        $collection->add('foo', new Route('/foo/{bar}', ['def' => 'test']));
         $matcher = $this->getUrlMatcher($collection);
-        $this->assertEquals(array('_route' => 'foo', 'bar' => 'baz', 'def' => 'test'), $matcher->match('/foo/baz'));
+        $this->assertEquals(['_route' => 'foo', 'bar' => 'baz', 'def' => 'test'], $matcher->match('/foo/baz'));
 
         // test that route "method" is ignored if no method is given in the context
         $collection = new RouteCollection();
-        $collection->add('foo', new Route('/foo', array(), array(), array(), '', array(), array('get', 'head')));
+        $collection->add('foo', new Route('/foo', [], [], [], '', [], ['get', 'head']));
         $matcher = $this->getUrlMatcher($collection);
         $this->assertInternalType('array', $matcher->match('/foo'));
 
@@ -126,24 +126,24 @@ public function testMatch()
 
         // route with an optional variable as the first segment
         $collection = new RouteCollection();
-        $collection->add('bar', new Route('/{bar}/foo', array('bar' => 'bar'), array('bar' => 'foo|bar')));
+        $collection->add('bar', new Route('/{bar}/foo', ['bar' => 'bar'], ['bar' => 'foo|bar']));
         $matcher = $this->getUrlMatcher($collection);
-        $this->assertEquals(array('_route' => 'bar', 'bar' => 'bar'), $matcher->match('/bar/foo'));
-        $this->assertEquals(array('_route' => 'bar', 'bar' => 'foo'), $matcher->match('/foo/foo'));
+        $this->assertEquals(['_route' => 'bar', 'bar' => 'bar'], $matcher->match('/bar/foo'));
+        $this->assertEquals(['_route' => 'bar', 'bar' => 'foo'], $matcher->match('/foo/foo'));
 
         $collection = new RouteCollection();
-        $collection->add('bar', new Route('/{bar}', array('bar' => 'bar'), array('bar' => 'foo|bar')));
+        $collection->add('bar', new Route('/{bar}', ['bar' => 'bar'], ['bar' => 'foo|bar']));
         $matcher = $this->getUrlMatcher($collection);
-        $this->assertEquals(array('_route' => 'bar', 'bar' => 'foo'), $matcher->match('/foo'));
-        $this->assertEquals(array('_route' => 'bar', 'bar' => 'bar'), $matcher->match('/'));
+        $this->assertEquals(['_route' => 'bar', 'bar' => 'foo'], $matcher->match('/foo'));
+        $this->assertEquals(['_route' => 'bar', 'bar' => 'bar'], $matcher->match('/'));
 
         // route with only optional variables
         $collection = new RouteCollection();
-        $collection->add('bar', new Route('/{foo}/{bar}', array('foo' => 'foo', 'bar' => 'bar'), array()));
+        $collection->add('bar', new Route('/{foo}/{bar}', ['foo' => 'foo', 'bar' => 'bar'], []));
         $matcher = $this->getUrlMatcher($collection);
-        $this->assertEquals(array('_route' => 'bar', 'foo' => 'foo', 'bar' => 'bar'), $matcher->match('/'));
-        $this->assertEquals(array('_route' => 'bar', 'foo' => 'a', 'bar' => 'bar'), $matcher->match('/a'));
-        $this->assertEquals(array('_route' => 'bar', 'foo' => 'a', 'bar' => 'b'), $matcher->match('/a/b'));
+        $this->assertEquals(['_route' => 'bar', 'foo' => 'foo', 'bar' => 'bar'], $matcher->match('/'));
+        $this->assertEquals(['_route' => 'bar', 'foo' => 'a', 'bar' => 'bar'], $matcher->match('/a'));
+        $this->assertEquals(['_route' => 'bar', 'foo' => 'a', 'bar' => 'b'], $matcher->match('/a/b'));
     }
 
     public function testMatchWithPrefixes()
@@ -154,7 +154,7 @@ public function testMatchWithPrefixes()
         $collection->addPrefix('/a');
 
         $matcher = $this->getUrlMatcher($collection);
-        $this->assertEquals(array('_route' => 'foo', 'foo' => 'foo'), $matcher->match('/a/b/foo'));
+        $this->assertEquals(['_route' => 'foo', 'foo' => 'foo'], $matcher->match('/a/b/foo'));
     }
 
     public function testMatchWithDynamicPrefix()
@@ -165,7 +165,7 @@ public function testMatchWithDynamicPrefix()
         $collection->addPrefix('/{_locale}');
 
         $matcher = $this->getUrlMatcher($collection);
-        $this->assertEquals(array('_locale' => 'fr', '_route' => 'foo', 'foo' => 'foo'), $matcher->match('/fr/b/foo'));
+        $this->assertEquals(['_locale' => 'fr', '_route' => 'foo', 'foo' => 'foo'], $matcher->match('/fr/b/foo'));
     }
 
     public function testMatchSpecialRouteName()
@@ -174,7 +174,7 @@ public function testMatchSpecialRouteName()
         $collection->add('$péß^a|', new Route('/bar'));
 
         $matcher = $this->getUrlMatcher($collection);
-        $this->assertEquals(array('_route' => '$péß^a|'), $matcher->match('/bar'));
+        $this->assertEquals(['_route' => '$péß^a|'], $matcher->match('/bar'));
     }
 
     /**
@@ -193,20 +193,20 @@ public function testMatchNonAlpha()
     {
         $collection = new RouteCollection();
         $chars = '!"$%éà &\'()*+,./:;<=>@ABCDEFGHIJKLMNOPQRSTUVWXYZ\\[]^_`abcdefghijklmnopqrstuvwxyz{|}~-';
-        $collection->add('foo', new Route('/{foo}/bar', array(), array('foo' => '['.preg_quote($chars).']+'), array('utf8' => true)));
+        $collection->add('foo', new Route('/{foo}/bar', [], ['foo' => '['.preg_quote($chars).']+'], ['utf8' => true]));
 
         $matcher = $this->getUrlMatcher($collection);
-        $this->assertEquals(array('_route' => 'foo', 'foo' => $chars), $matcher->match('/'.rawurlencode($chars).'/bar'));
-        $this->assertEquals(array('_route' => 'foo', 'foo' => $chars), $matcher->match('/'.strtr($chars, array('%' => '%25')).'/bar'));
+        $this->assertEquals(['_route' => 'foo', 'foo' => $chars], $matcher->match('/'.rawurlencode($chars).'/bar'));
+        $this->assertEquals(['_route' => 'foo', 'foo' => $chars], $matcher->match('/'.strtr($chars, ['%' => '%25']).'/bar'));
     }
 
     public function testMatchWithDotMetacharacterInRequirements()
     {
         $collection = new RouteCollection();
-        $collection->add('foo', new Route('/{foo}/bar', array(), array('foo' => '.+')));
+        $collection->add('foo', new Route('/{foo}/bar', [], ['foo' => '.+']));
 
         $matcher = $this->getUrlMatcher($collection);
-        $this->assertEquals(array('_route' => 'foo', 'foo' => "\n"), $matcher->match('/'.urlencode("\n").'/bar'), 'linefeed character is matched');
+        $this->assertEquals(['_route' => 'foo', 'foo' => "\n"], $matcher->match('/'.urlencode("\n").'/bar'), 'linefeed character is matched');
     }
 
     public function testMatchOverriddenRoute()
@@ -221,9 +221,9 @@ public function testMatchOverriddenRoute()
 
         $matcher = $this->getUrlMatcher($collection);
 
-        $this->assertEquals(array('_route' => 'foo'), $matcher->match('/foo1'));
+        $this->assertEquals(['_route' => 'foo'], $matcher->match('/foo1'));
         $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Routing\Exception\ResourceNotFoundException');
-        $this->assertEquals(array(), $matcher->match('/foo'));
+        $this->assertEquals([], $matcher->match('/foo'));
     }
 
     public function testMatchRegression()
@@ -233,7 +233,7 @@ public function testMatchRegression()
         $coll->add('bar', new Route('/foo/bar/{foo}'));
 
         $matcher = $this->getUrlMatcher($coll);
-        $this->assertEquals(array('foo' => 'bar', '_route' => 'bar'), $matcher->match('/foo/bar/bar'));
+        $this->assertEquals(['foo' => 'bar', '_route' => 'bar'], $matcher->match('/foo/bar/bar'));
 
         $collection = new RouteCollection();
         $collection->add('foo', new Route('/{bar}'));
@@ -248,36 +248,36 @@ public function testMatchRegression()
     public function testDefaultRequirementForOptionalVariables()
     {
         $coll = new RouteCollection();
-        $coll->add('test', new Route('/{page}.{_format}', array('page' => 'index', '_format' => 'html')));
+        $coll->add('test', new Route('/{page}.{_format}', ['page' => 'index', '_format' => 'html']));
 
         $matcher = $this->getUrlMatcher($coll);
-        $this->assertEquals(array('page' => 'my-page', '_format' => 'xml', '_route' => 'test'), $matcher->match('/my-page.xml'));
+        $this->assertEquals(['page' => 'my-page', '_format' => 'xml', '_route' => 'test'], $matcher->match('/my-page.xml'));
     }
 
     public function testMatchingIsEager()
     {
         $coll = new RouteCollection();
-        $coll->add('test', new Route('/{foo}-{bar}-', array(), array('foo' => '.+', 'bar' => '.+')));
+        $coll->add('test', new Route('/{foo}-{bar}-', [], ['foo' => '.+', 'bar' => '.+']));
 
         $matcher = $this->getUrlMatcher($coll);
-        $this->assertEquals(array('foo' => 'text1-text2-text3', 'bar' => 'text4', '_route' => 'test'), $matcher->match('/text1-text2-text3-text4-'));
+        $this->assertEquals(['foo' => 'text1-text2-text3', 'bar' => 'text4', '_route' => 'test'], $matcher->match('/text1-text2-text3-text4-'));
     }
 
     public function testAdjacentVariables()
     {
         $coll = new RouteCollection();
-        $coll->add('test', new Route('/{w}{x}{y}{z}.{_format}', array('z' => 'default-z', '_format' => 'html'), array('y' => 'y|Y')));
+        $coll->add('test', new Route('/{w}{x}{y}{z}.{_format}', ['z' => 'default-z', '_format' => 'html'], ['y' => 'y|Y']));
 
         $matcher = $this->getUrlMatcher($coll);
         // 'w' eagerly matches as much as possible and the other variables match the remaining chars.
         // This also shows that the variables w-z must all exclude the separating char (the dot '.' in this case) by default requirement.
         // Otherwise they would also consume '.xml' and _format would never match as it's an optional variable.
-        $this->assertEquals(array('w' => 'wwwww', 'x' => 'x', 'y' => 'Y', 'z' => 'Z', '_format' => 'xml', '_route' => 'test'), $matcher->match('/wwwwwxYZ.xml'));
+        $this->assertEquals(['w' => 'wwwww', 'x' => 'x', 'y' => 'Y', 'z' => 'Z', '_format' => 'xml', '_route' => 'test'], $matcher->match('/wwwwwxYZ.xml'));
         // As 'y' has custom requirement and can only be of value 'y|Y', it will leave  'ZZZ' to variable z.
         // So with carefully chosen requirements adjacent variables, can be useful.
-        $this->assertEquals(array('w' => 'wwwww', 'x' => 'x', 'y' => 'y', 'z' => 'ZZZ', '_format' => 'html', '_route' => 'test'), $matcher->match('/wwwwwxyZZZ'));
+        $this->assertEquals(['w' => 'wwwww', 'x' => 'x', 'y' => 'y', 'z' => 'ZZZ', '_format' => 'html', '_route' => 'test'], $matcher->match('/wwwwwxyZZZ'));
         // z and _format are optional.
-        $this->assertEquals(array('w' => 'wwwww', 'x' => 'x', 'y' => 'y', 'z' => 'default-z', '_format' => 'html', '_route' => 'test'), $matcher->match('/wwwwwxy'));
+        $this->assertEquals(['w' => 'wwwww', 'x' => 'x', 'y' => 'y', 'z' => 'default-z', '_format' => 'html', '_route' => 'test'], $matcher->match('/wwwwwxy'));
 
         $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Routing\Exception\ResourceNotFoundException');
         $matcher->match('/wxy.html');
@@ -286,11 +286,11 @@ public function testAdjacentVariables()
     public function testOptionalVariableWithNoRealSeparator()
     {
         $coll = new RouteCollection();
-        $coll->add('test', new Route('/get{what}', array('what' => 'All')));
+        $coll->add('test', new Route('/get{what}', ['what' => 'All']));
         $matcher = $this->getUrlMatcher($coll);
 
-        $this->assertEquals(array('what' => 'All', '_route' => 'test'), $matcher->match('/get'));
-        $this->assertEquals(array('what' => 'Sites', '_route' => 'test'), $matcher->match('/getSites'));
+        $this->assertEquals(['what' => 'All', '_route' => 'test'], $matcher->match('/get'));
+        $this->assertEquals(['what' => 'Sites', '_route' => 'test'], $matcher->match('/getSites'));
 
         // Usually the character in front of an optional parameter can be left out, e.g. with pattern '/get/{what}' just '/get' would match.
         // But here the 't' in 'get' is not a separating character, so it makes no sense to match without it.
@@ -304,7 +304,7 @@ public function testRequiredVariableWithNoRealSeparator()
         $coll->add('test', new Route('/get{what}Suffix'));
         $matcher = $this->getUrlMatcher($coll);
 
-        $this->assertEquals(array('what' => 'Sites', '_route' => 'test'), $matcher->match('/getSitesSuffix'));
+        $this->assertEquals(['what' => 'Sites', '_route' => 'test'], $matcher->match('/getSitesSuffix'));
     }
 
     public function testDefaultRequirementOfVariable()
@@ -313,7 +313,7 @@ public function testDefaultRequirementOfVariable()
         $coll->add('test', new Route('/{page}.{_format}'));
         $matcher = $this->getUrlMatcher($coll);
 
-        $this->assertEquals(array('page' => 'index', '_format' => 'mobile.html', '_route' => 'test'), $matcher->match('/index.mobile.html'));
+        $this->assertEquals(['page' => 'index', '_format' => 'mobile.html', '_route' => 'test'], $matcher->match('/index.mobile.html'));
     }
 
     /**
@@ -334,7 +334,7 @@ public function testDefaultRequirementOfVariableDisallowsSlash()
     public function testDefaultRequirementOfVariableDisallowsNextSeparator()
     {
         $coll = new RouteCollection();
-        $coll->add('test', new Route('/{page}.{_format}', array(), array('_format' => 'html|xml')));
+        $coll->add('test', new Route('/{page}.{_format}', [], ['_format' => 'html|xml']));
         $matcher = $this->getUrlMatcher($coll);
 
         $matcher->match('/do.t.html');
@@ -346,7 +346,7 @@ public function testDefaultRequirementOfVariableDisallowsNextSeparator()
     public function testSchemeRequirement()
     {
         $coll = new RouteCollection();
-        $coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https')));
+        $coll->add('foo', new Route('/foo', [], [], [], '', ['https']));
         $matcher = $this->getUrlMatcher($coll);
         $matcher->match('/foo');
     }
@@ -371,7 +371,7 @@ public function testRequestCondition()
         $route->setCondition('request.getBaseUrl() == "/sub/front.php" and request.getPathInfo() == "/foo/bar"');
         $coll->add('foo', $route);
         $matcher = $this->getUrlMatcher($coll, new RequestContext('/sub/front.php'));
-        $this->assertEquals(array('bar' => 'bar', '_route' => 'foo'), $matcher->match('/foo/bar'));
+        $this->assertEquals(['bar' => 'bar', '_route' => 'foo'], $matcher->match('/foo/bar'));
     }
 
     public function testDecodeOnce()
@@ -380,7 +380,7 @@ public function testDecodeOnce()
         $coll->add('foo', new Route('/foo/{foo}'));
 
         $matcher = $this->getUrlMatcher($coll);
-        $this->assertEquals(array('foo' => 'bar%23', '_route' => 'foo'), $matcher->match('/foo/bar%2523'));
+        $this->assertEquals(['foo' => 'bar%23', '_route' => 'foo'], $matcher->match('/foo/bar%2523'));
     }
 
     public function testCannotRelyOnPrefix()
@@ -396,30 +396,30 @@ public function testCannotRelyOnPrefix()
         $coll->addCollection($subColl);
 
         $matcher = $this->getUrlMatcher($coll);
-        $this->assertEquals(array('_route' => 'bar'), $matcher->match('/new'));
+        $this->assertEquals(['_route' => 'bar'], $matcher->match('/new'));
     }
 
     public function testWithHost()
     {
         $coll = new RouteCollection();
-        $coll->add('foo', new Route('/foo/{foo}', array(), array(), array(), '{locale}.example.com'));
+        $coll->add('foo', new Route('/foo/{foo}', [], [], [], '{locale}.example.com'));
 
         $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com'));
-        $this->assertEquals(array('foo' => 'bar', '_route' => 'foo', 'locale' => 'en'), $matcher->match('/foo/bar'));
+        $this->assertEquals(['foo' => 'bar', '_route' => 'foo', 'locale' => 'en'], $matcher->match('/foo/bar'));
     }
 
     public function testWithHostOnRouteCollection()
     {
         $coll = new RouteCollection();
         $coll->add('foo', new Route('/foo/{foo}'));
-        $coll->add('bar', new Route('/bar/{foo}', array(), array(), array(), '{locale}.example.net'));
+        $coll->add('bar', new Route('/bar/{foo}', [], [], [], '{locale}.example.net'));
         $coll->setHost('{locale}.example.com');
 
         $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com'));
-        $this->assertEquals(array('foo' => 'bar', '_route' => 'foo', 'locale' => 'en'), $matcher->match('/foo/bar'));
+        $this->assertEquals(['foo' => 'bar', '_route' => 'foo', 'locale' => 'en'], $matcher->match('/foo/bar'));
 
         $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com'));
-        $this->assertEquals(array('foo' => 'bar', '_route' => 'bar', 'locale' => 'en'), $matcher->match('/bar/bar'));
+        $this->assertEquals(['foo' => 'bar', '_route' => 'bar', 'locale' => 'en'], $matcher->match('/bar/bar'));
     }
 
     /**
@@ -428,7 +428,7 @@ public function testWithHostOnRouteCollection()
     public function testWithOutHostHostDoesNotMatch()
     {
         $coll = new RouteCollection();
-        $coll->add('foo', new Route('/foo/{foo}', array(), array(), array(), '{locale}.example.com'));
+        $coll->add('foo', new Route('/foo/{foo}', [], [], [], '{locale}.example.com'));
 
         $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'example.com'));
         $matcher->match('/foo/bar');
@@ -440,7 +440,7 @@ public function testWithOutHostHostDoesNotMatch()
     public function testPathIsCaseSensitive()
     {
         $coll = new RouteCollection();
-        $coll->add('foo', new Route('/locale', array(), array('locale' => 'EN|FR|DE')));
+        $coll->add('foo', new Route('/locale', [], ['locale' => 'EN|FR|DE']));
 
         $matcher = $this->getUrlMatcher($coll);
         $matcher->match('/en');
@@ -449,10 +449,10 @@ public function testPathIsCaseSensitive()
     public function testHostIsCaseInsensitive()
     {
         $coll = new RouteCollection();
-        $coll->add('foo', new Route('/', array(), array('locale' => 'EN|FR|DE'), array(), '{locale}.example.com'));
+        $coll->add('foo', new Route('/', [], ['locale' => 'EN|FR|DE'], [], '{locale}.example.com'));
 
         $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com'));
-        $this->assertEquals(array('_route' => 'foo', 'locale' => 'en'), $matcher->match('/'));
+        $this->assertEquals(['_route' => 'foo', 'locale' => 'en'], $matcher->match('/'));
     }
 
     /**
@@ -485,9 +485,9 @@ public function testNestedCollections()
         $coll->addCollection($subColl);
 
         $matcher = $this->getUrlMatcher($coll);
-        $this->assertEquals(array('_route' => 'a'), $matcher->match('/p/a'));
-        $this->assertEquals(array('_route' => 'baz', 'baz' => 'p'), $matcher->match('/p'));
-        $this->assertEquals(array('_route' => 'buz'), $matcher->match('/prefix/buz'));
+        $this->assertEquals(['_route' => 'a'], $matcher->match('/p/a'));
+        $this->assertEquals(['_route' => 'baz', 'baz' => 'p'], $matcher->match('/p'));
+        $this->assertEquals(['_route' => 'buz'], $matcher->match('/prefix/buz'));
     }
 
     /**
@@ -496,7 +496,7 @@ public function testNestedCollections()
     public function testSchemeAndMethodMismatch()
     {
         $coll = new RouteCollection();
-        $coll->add('foo', new Route('/', array(), array(), array(), null, array('https'), array('POST')));
+        $coll->add('foo', new Route('/', [], [], [], null, ['https'], ['POST']));
 
         $matcher = $this->getUrlMatcher($coll);
         $matcher->match('/');
@@ -505,25 +505,25 @@ public function testSchemeAndMethodMismatch()
     public function testSlashAndVerbPrecedence()
     {
         $coll = new RouteCollection();
-        $coll->add('a', new Route('/api/customers/{customerId}/contactpersons/', array(), array(), array(), '', array(), array('post')));
-        $coll->add('b', new Route('/api/customers/{customerId}/contactpersons', array(), array(), array(), '', array(), array('get')));
+        $coll->add('a', new Route('/api/customers/{customerId}/contactpersons/', [], [], [], '', [], ['post']));
+        $coll->add('b', new Route('/api/customers/{customerId}/contactpersons', [], [], [], '', [], ['get']));
 
         $matcher = $this->getUrlMatcher($coll);
-        $expected = array(
+        $expected = [
             '_route' => 'b',
             'customerId' => '123',
-        );
+        ];
         $this->assertEquals($expected, $matcher->match('/api/customers/123/contactpersons'));
 
         $coll = new RouteCollection();
-        $coll->add('a', new Route('/api/customers/{customerId}/contactpersons/', array(), array(), array(), '', array(), array('get')));
-        $coll->add('b', new Route('/api/customers/{customerId}/contactpersons', array(), array(), array(), '', array(), array('post')));
+        $coll->add('a', new Route('/api/customers/{customerId}/contactpersons/', [], [], [], '', [], ['get']));
+        $coll->add('b', new Route('/api/customers/{customerId}/contactpersons', [], [], [], '', [], ['post']));
 
         $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST'));
-        $expected = array(
+        $expected = [
             '_route' => 'b',
             'customerId' => '123',
-        );
+        ];
         $this->assertEquals($expected, $matcher->match('/api/customers/123/contactpersons'));
     }
 
diff --git a/src/Symfony/Component/Routing/Tests/RequestContextTest.php b/src/Symfony/Component/Routing/Tests/RequestContextTest.php
index ffe29d1a747c9..3d23b0e8947a2 100644
--- a/src/Symfony/Component/Routing/Tests/RequestContextTest.php
+++ b/src/Symfony/Component/Routing/Tests/RequestContextTest.php
@@ -68,16 +68,16 @@ public function testFromRequest()
     public function testGetParameters()
     {
         $requestContext = new RequestContext();
-        $this->assertEquals(array(), $requestContext->getParameters());
+        $this->assertEquals([], $requestContext->getParameters());
 
-        $requestContext->setParameters(array('foo' => 'bar'));
-        $this->assertEquals(array('foo' => 'bar'), $requestContext->getParameters());
+        $requestContext->setParameters(['foo' => 'bar']);
+        $this->assertEquals(['foo' => 'bar'], $requestContext->getParameters());
     }
 
     public function testHasParameter()
     {
         $requestContext = new RequestContext();
-        $requestContext->setParameters(array('foo' => 'bar'));
+        $requestContext->setParameters(['foo' => 'bar']);
 
         $this->assertTrue($requestContext->hasParameter('foo'));
         $this->assertFalse($requestContext->hasParameter('baz'));
@@ -86,7 +86,7 @@ public function testHasParameter()
     public function testGetParameter()
     {
         $requestContext = new RequestContext();
-        $requestContext->setParameters(array('foo' => 'bar'));
+        $requestContext->setParameters(['foo' => 'bar']);
 
         $this->assertEquals('bar', $requestContext->getParameter('foo'));
         $this->assertNull($requestContext->getParameter('baz'));
@@ -154,7 +154,7 @@ public function testFluentInterface()
         $this->assertSame($requestContext, $requestContext->setQueryString('foo=bar'));
         $this->assertSame($requestContext, $requestContext->setHttpPort(80));
         $this->assertSame($requestContext, $requestContext->setHttpsPort(443));
-        $this->assertSame($requestContext, $requestContext->setParameters(array()));
+        $this->assertSame($requestContext, $requestContext->setParameters([]));
         $this->assertSame($requestContext, $requestContext->setParameter('foo', 'bar'));
     }
 }
diff --git a/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php b/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php
index 76a042d670b29..20afdff484f8a 100644
--- a/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php
+++ b/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php
@@ -68,7 +68,7 @@ public function testImport()
 
     public function testImportAddResources()
     {
-        $routeCollectionBuilder = new RouteCollectionBuilder(new YamlFileLoader(new FileLocator(array(__DIR__.'/Fixtures/'))));
+        $routeCollectionBuilder = new RouteCollectionBuilder(new YamlFileLoader(new FileLocator([__DIR__.'/Fixtures/'])));
         $routeCollectionBuilder->import('file_resource.yml');
         $routeCollection = $routeCollectionBuilder->build();
 
@@ -131,13 +131,13 @@ public function testFlushOrdering()
 
         $this->assertCount(5, $actualCollection);
         $actualRouteNames = array_keys($actualCollection->all());
-        $this->assertEquals(array(
+        $this->assertEquals([
             'checkout_route',
             'imported_route1',
             'imported_route2',
             'homepage',
             'admin_dashboard',
-        ), $actualRouteNames);
+        ], $actualRouteNames);
 
         // make sure the defaults were set
         $checkoutRoute = $actualCollection->get('checkout_route');
@@ -154,18 +154,18 @@ public function testFlushSetsRouteNames()
         $collectionBuilder->add('/admin', 'AppBundle:Admin:dashboard', 'admin_dashboard');
         // add an unnamed route
         $collectionBuilder->add('/blogs', 'AppBundle:Blog:list')
-            ->setMethods(array('GET'));
+            ->setMethods(['GET']);
 
         // integer route names are allowed - they don't confuse things
         $collectionBuilder->add('/products', 'AppBundle:Product:list', 100);
 
         $actualCollection = $collectionBuilder->build();
         $actualRouteNames = array_keys($actualCollection->all());
-        $this->assertEquals(array(
+        $this->assertEquals([
             'admin_dashboard',
             'GET_blogs',
             '100',
-        ), $actualRouteNames);
+        ], $actualRouteNames);
     }
 
     public function testFlushSetsDetailsOnChildrenRoutes()
@@ -183,8 +183,8 @@ public function testFlushSetsDetailsOnChildrenRoutes()
             ->setOption('fooBar', true)
             ->setHost('example.com')
             ->setCondition('request.isSecure()')
-            ->setSchemes(array('https'))
-            ->setMethods(array('POST'));
+            ->setSchemes(['https'])
+            ->setMethods(['POST']);
 
         // a simple route, nothing added to it
         $routes->add('/blogs/{id}', 'editAction', 'blog_edit');
@@ -201,8 +201,8 @@ public function testFlushSetsDetailsOnChildrenRoutes()
             ->setDefault('_locale', 'fr')
             ->setRequirement('_locale', 'fr|en')
             ->setOption('niceRoute', true)
-            ->setSchemes(array('http'))
-            ->setMethods(array('GET', 'POST'));
+            ->setSchemes(['http'])
+            ->setMethods(['GET', 'POST']);
 
         $collection = $routes->build();
         $actualListRoute = $collection->get('blog_list');
@@ -216,8 +216,8 @@ public function testFlushSetsDetailsOnChildrenRoutes()
         $this->assertTrue($actualListRoute->getOption('fooBar'));
         $this->assertEquals('example.com', $actualListRoute->getHost());
         $this->assertEquals('request.isSecure()', $actualListRoute->getCondition());
-        $this->assertEquals(array('https'), $actualListRoute->getSchemes());
-        $this->assertEquals(array('POST'), $actualListRoute->getMethods());
+        $this->assertEquals(['https'], $actualListRoute->getSchemes());
+        $this->assertEquals(['POST'], $actualListRoute->getMethods());
         // inherited from the main collection
         $this->assertEquals('fr', $actualListRoute->getDefault('_locale'));
         $this->assertEquals('fr|en', $actualListRoute->getRequirement('_locale'));
@@ -227,8 +227,8 @@ public function testFlushSetsDetailsOnChildrenRoutes()
         // inherited from the collection
         $this->assertEquals('symfony.com', $actualEditRoute->getHost());
         $this->assertEquals('request.query.get("page")==1', $actualEditRoute->getCondition());
-        $this->assertEquals(array('http'), $actualEditRoute->getSchemes());
-        $this->assertEquals(array('GET', 'POST'), $actualEditRoute->getMethods());
+        $this->assertEquals(['http'], $actualEditRoute->getSchemes());
+        $this->assertEquals(['GET', 'POST'], $actualEditRoute->getMethods());
     }
 
     /**
@@ -250,16 +250,16 @@ public function testFlushPrefixesPaths($collectionPrefix, $routePath, $expectedP
 
     public function providePrefixTests()
     {
-        $tests = array();
+        $tests = [];
         // empty prefix is of course ok
-        $tests[] = array('', '/foo', '/foo');
+        $tests[] = ['', '/foo', '/foo'];
         // normal prefix - does not matter if it's a wildcard
-        $tests[] = array('/{admin}', '/foo', '/{admin}/foo');
+        $tests[] = ['/{admin}', '/foo', '/{admin}/foo'];
         // shows that a prefix will always be given the starting slash
-        $tests[] = array('0', '/foo', '/0/foo');
+        $tests[] = ['0', '/foo', '/0/foo'];
 
         // spaces are ok, and double slahses at the end are cleaned
-        $tests[] = array('/ /', '/foo', '/ /foo');
+        $tests[] = ['/ /', '/foo', '/ /foo'];
 
         return $tests;
     }
@@ -323,10 +323,10 @@ public function testAutomaticRouteNamesDoNotConflict()
         $accountRoutes = $routes->createBuilder();
         // route 2
         $accountRoutes->add('/dashboard', '')
-            ->setMethods(array('GET'));
+            ->setMethods(['GET']);
         // route 3
         $accountRoutes->add('/dashboard', '')
-            ->setMethods(array('POST'));
+            ->setMethods(['POST']);
 
         $routes->mount('/admin', $adminRoutes);
         $routes->mount('/account', $accountRoutes);
@@ -351,7 +351,7 @@ public function testAddsThePrefixOnlyOnceWhenLoadingMultipleCollections()
         $loader
             ->expects($this->any())
             ->method('load')
-            ->will($this->returnValue(array($firstCollection, $secondCollection)));
+            ->will($this->returnValue([$firstCollection, $secondCollection]));
 
         $routeCollectionBuilder = new RouteCollectionBuilder($loader);
         $routeCollectionBuilder->import('/directory/recurse/*', '/other/', 'glob');
diff --git a/src/Symfony/Component/Routing/Tests/RouteCollectionTest.php b/src/Symfony/Component/Routing/Tests/RouteCollectionTest.php
index 78eb5ba5395f8..2d29d32968d50 100644
--- a/src/Symfony/Component/Routing/Tests/RouteCollectionTest.php
+++ b/src/Symfony/Component/Routing/Tests/RouteCollectionTest.php
@@ -23,7 +23,7 @@ public function testRoute()
         $collection = new RouteCollection();
         $route = new Route('/foo');
         $collection->add('foo', $route);
-        $this->assertEquals(array('foo' => $route), $collection->all(), '->add() adds a route');
+        $this->assertEquals(['foo' => $route], $collection->all(), '->add() adds a route');
         $this->assertEquals($route, $collection->get('foo'), '->get() returns a route by name');
         $this->assertNull($collection->get('bar'), '->get() returns null if a route does not exist');
     }
@@ -67,7 +67,7 @@ public function testIterator()
         $collection->add('last', $last = new Route('/last'));
 
         $this->assertInstanceOf('\ArrayIterator', $collection->getIterator());
-        $this->assertSame(array('bar' => $bar, 'foo' => $foo, 'last' => $last), $collection->getIterator()->getArrayCopy());
+        $this->assertSame(['bar' => $bar, 'foo' => $foo, 'last' => $last], $collection->getIterator()->getArrayCopy());
     }
 
     public function testCount()
@@ -98,7 +98,7 @@ public function testAddCollection()
         $collection->addCollection($collection1);
         $collection->add('last', $last = new Route('/last'));
 
-        $this->assertSame(array('bar' => $bar, 'foo' => $foo, 'grandchild' => $grandchild, 'last' => $last), $collection->all(),
+        $this->assertSame(['bar' => $bar, 'foo' => $foo, 'grandchild' => $grandchild, 'last' => $last], $collection->all(),
             '->addCollection() imports routes of another collection, overrides if necessary and adds them at the end');
     }
 
@@ -109,7 +109,7 @@ public function testAddCollectionWithResources()
         $collection1 = new RouteCollection();
         $collection1->addResource($foo1 = new FileResource(__DIR__.'/Fixtures/foo1.xml'));
         $collection->addCollection($collection1);
-        $this->assertEquals(array($foo, $foo1), $collection->getResources(), '->addCollection() merges resources');
+        $this->assertEquals([$foo, $foo1], $collection->getResources(), '->addCollection() merges resources');
     }
 
     public function testAddDefaultsAndRequirementsAndOptions()
@@ -118,23 +118,23 @@ public function testAddDefaultsAndRequirementsAndOptions()
         $collection->add('foo', new Route('/{placeholder}'));
         $collection1 = new RouteCollection();
         $collection1->add('bar', new Route('/{placeholder}',
-            array('_controller' => 'fixed', 'placeholder' => 'default'), array('placeholder' => '.+'), array('option' => 'value'))
+            ['_controller' => 'fixed', 'placeholder' => 'default'], ['placeholder' => '.+'], ['option' => 'value'])
         );
         $collection->addCollection($collection1);
 
-        $collection->addDefaults(array('placeholder' => 'new-default'));
-        $this->assertEquals(array('placeholder' => 'new-default'), $collection->get('foo')->getDefaults(), '->addDefaults() adds defaults to all routes');
-        $this->assertEquals(array('_controller' => 'fixed', 'placeholder' => 'new-default'), $collection->get('bar')->getDefaults(),
+        $collection->addDefaults(['placeholder' => 'new-default']);
+        $this->assertEquals(['placeholder' => 'new-default'], $collection->get('foo')->getDefaults(), '->addDefaults() adds defaults to all routes');
+        $this->assertEquals(['_controller' => 'fixed', 'placeholder' => 'new-default'], $collection->get('bar')->getDefaults(),
             '->addDefaults() adds defaults to all routes and overwrites existing ones');
 
-        $collection->addRequirements(array('placeholder' => '\d+'));
-        $this->assertEquals(array('placeholder' => '\d+'), $collection->get('foo')->getRequirements(), '->addRequirements() adds requirements to all routes');
-        $this->assertEquals(array('placeholder' => '\d+'), $collection->get('bar')->getRequirements(),
+        $collection->addRequirements(['placeholder' => '\d+']);
+        $this->assertEquals(['placeholder' => '\d+'], $collection->get('foo')->getRequirements(), '->addRequirements() adds requirements to all routes');
+        $this->assertEquals(['placeholder' => '\d+'], $collection->get('bar')->getRequirements(),
             '->addRequirements() adds requirements to all routes and overwrites existing ones');
 
-        $collection->addOptions(array('option' => 'new-value'));
+        $collection->addOptions(['option' => 'new-value']);
         $this->assertEquals(
-            array('option' => 'new-value', 'compiler_class' => 'Symfony\\Component\\Routing\\RouteCompiler'),
+            ['option' => 'new-value', 'compiler_class' => 'Symfony\\Component\\Routing\\RouteCompiler'],
             $collection->get('bar')->getOptions(), '->addOptions() adds options to all routes and overwrites existing ones'
         );
     }
@@ -148,13 +148,13 @@ public function testAddPrefix()
         $collection->addCollection($collection2);
         $collection->addPrefix(' / ');
         $this->assertSame('/foo', $collection->get('foo')->getPath(), '->addPrefix() trims the prefix and a single slash has no effect');
-        $collection->addPrefix('/{admin}', array('admin' => 'admin'), array('admin' => '\d+'));
+        $collection->addPrefix('/{admin}', ['admin' => 'admin'], ['admin' => '\d+']);
         $this->assertEquals('/{admin}/foo', $collection->get('foo')->getPath(), '->addPrefix() adds a prefix to all routes');
         $this->assertEquals('/{admin}/bar', $collection->get('bar')->getPath(), '->addPrefix() adds a prefix to all routes');
-        $this->assertEquals(array('admin' => 'admin'), $collection->get('foo')->getDefaults(), '->addPrefix() adds defaults to all routes');
-        $this->assertEquals(array('admin' => 'admin'), $collection->get('bar')->getDefaults(), '->addPrefix() adds defaults to all routes');
-        $this->assertEquals(array('admin' => '\d+'), $collection->get('foo')->getRequirements(), '->addPrefix() adds requirements to all routes');
-        $this->assertEquals(array('admin' => '\d+'), $collection->get('bar')->getRequirements(), '->addPrefix() adds requirements to all routes');
+        $this->assertEquals(['admin' => 'admin'], $collection->get('foo')->getDefaults(), '->addPrefix() adds defaults to all routes');
+        $this->assertEquals(['admin' => 'admin'], $collection->get('bar')->getDefaults(), '->addPrefix() adds defaults to all routes');
+        $this->assertEquals(['admin' => '\d+'], $collection->get('foo')->getRequirements(), '->addPrefix() adds requirements to all routes');
+        $this->assertEquals(['admin' => '\d+'], $collection->get('bar')->getRequirements(), '->addPrefix() adds requirements to all routes');
         $collection->addPrefix('0');
         $this->assertEquals('/0/{admin}/foo', $collection->get('foo')->getPath(), '->addPrefix() ensures a prefix must start with a slash and must not end with a slash');
         $collection->addPrefix('/ /');
@@ -166,8 +166,8 @@ public function testAddPrefixOverridesDefaultsAndRequirements()
     {
         $collection = new RouteCollection();
         $collection->add('foo', $foo = new Route('/foo.{_format}'));
-        $collection->add('bar', $bar = new Route('/bar.{_format}', array(), array('_format' => 'json')));
-        $collection->addPrefix('/admin', array(), array('_format' => 'html'));
+        $collection->add('bar', $bar = new Route('/bar.{_format}', [], ['_format' => 'json']));
+        $collection->addPrefix('/admin', [], ['_format' => 'html']);
 
         $this->assertEquals('html', $collection->get('foo')->getRequirement('_format'), '->addPrefix() overrides existing requirements');
         $this->assertEquals('html', $collection->get('bar')->getRequirement('_format'), '->addPrefix() overrides existing requirements');
@@ -180,7 +180,7 @@ public function testResource()
         $collection->addResource($bar = new FileResource(__DIR__.'/Fixtures/bar.xml'));
         $collection->addResource(new FileResource(__DIR__.'/Fixtures/foo.xml'));
 
-        $this->assertEquals(array($foo, $bar), $collection->getResources(),
+        $this->assertEquals([$foo, $bar], $collection->getResources(),
             '->addResource() adds a resource and getResources() only returns unique ones by comparing the string representation');
     }
 
@@ -227,16 +227,16 @@ public function testRemove()
         $collection->add('last', $last = new Route('/last'));
 
         $collection->remove('foo');
-        $this->assertSame(array('bar' => $bar, 'last' => $last), $collection->all(), '->remove() can remove a single route');
-        $collection->remove(array('bar', 'last'));
-        $this->assertSame(array(), $collection->all(), '->remove() accepts an array and can remove multiple routes at once');
+        $this->assertSame(['bar' => $bar, 'last' => $last], $collection->all(), '->remove() can remove a single route');
+        $collection->remove(['bar', 'last']);
+        $this->assertSame([], $collection->all(), '->remove() accepts an array and can remove multiple routes at once');
     }
 
     public function testSetHost()
     {
         $collection = new RouteCollection();
         $routea = new Route('/a');
-        $routeb = new Route('/b', array(), array(), array(), '{locale}.example.net');
+        $routeb = new Route('/b', [], [], [], '{locale}.example.net');
         $collection->add('a', $routea);
         $collection->add('b', $routeb);
 
@@ -250,7 +250,7 @@ public function testSetCondition()
     {
         $collection = new RouteCollection();
         $routea = new Route('/a');
-        $routeb = new Route('/b', array(), array(), array(), '{locale}.example.net', array(), array(), 'context.getMethod() == "GET"');
+        $routeb = new Route('/b', [], [], [], '{locale}.example.net', [], [], 'context.getMethod() == "GET"');
         $collection->add('a', $routea);
         $collection->add('b', $routeb);
 
@@ -264,7 +264,7 @@ public function testClone()
     {
         $collection = new RouteCollection();
         $collection->add('a', new Route('/a'));
-        $collection->add('b', new Route('/b', array('placeholder' => 'default'), array('placeholder' => '.+')));
+        $collection->add('b', new Route('/b', ['placeholder' => 'default'], ['placeholder' => '.+']));
 
         $clonedCollection = clone $collection;
 
@@ -278,28 +278,28 @@ public function testClone()
     public function testSetSchemes()
     {
         $collection = new RouteCollection();
-        $routea = new Route('/a', array(), array(), array(), '', 'http');
+        $routea = new Route('/a', [], [], [], '', 'http');
         $routeb = new Route('/b');
         $collection->add('a', $routea);
         $collection->add('b', $routeb);
 
-        $collection->setSchemes(array('http', 'https'));
+        $collection->setSchemes(['http', 'https']);
 
-        $this->assertEquals(array('http', 'https'), $routea->getSchemes());
-        $this->assertEquals(array('http', 'https'), $routeb->getSchemes());
+        $this->assertEquals(['http', 'https'], $routea->getSchemes());
+        $this->assertEquals(['http', 'https'], $routeb->getSchemes());
     }
 
     public function testSetMethods()
     {
         $collection = new RouteCollection();
-        $routea = new Route('/a', array(), array(), array(), '', array(), array('GET', 'POST'));
+        $routea = new Route('/a', [], [], [], '', [], ['GET', 'POST']);
         $routeb = new Route('/b');
         $collection->add('a', $routea);
         $collection->add('b', $routeb);
 
         $collection->setMethods('PUT');
 
-        $this->assertEquals(array('PUT'), $routea->getMethods());
-        $this->assertEquals(array('PUT'), $routeb->getMethods());
+        $this->assertEquals(['PUT'], $routea->getMethods());
+        $this->assertEquals(['PUT'], $routeb->getMethods());
     }
 }
diff --git a/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php b/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php
index dc304e3e7d54e..47d541e34a9e5 100644
--- a/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php
+++ b/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php
@@ -202,45 +202,45 @@ public function testCompileImplicitUtf8Data($name, $arguments, $prefix, $regex,
 
     public function provideCompileImplicitUtf8Data()
     {
-        return array(
-            array(
+        return [
+            [
                 'Static UTF-8 route',
-                array('/foé'),
-                '/foé', '#^/foé$#sDu', array(), array(
-                    array('text', '/foé'),
-                ),
+                ['/foé'],
+                '/foé', '#^/foé$#sDu', [], [
+                    ['text', '/foé'],
+                ],
                 'patterns',
-            ),
+            ],
 
-            array(
+            [
                 'Route with an implicit UTF-8 requirement',
-                array('/{bar}', array('bar' => null), array('bar' => 'é')),
-                '', '#^/(?P<bar>é)?$#sDu', array('bar'), array(
-                    array('variable', '/', 'é', 'bar', true),
-                ),
+                ['/{bar}', ['bar' => null], ['bar' => 'é']],
+                '', '#^/(?P<bar>é)?$#sDu', ['bar'], [
+                    ['variable', '/', 'é', 'bar', true],
+                ],
                 'requirements',
-            ),
+            ],
 
-            array(
+            [
                 'Route with a UTF-8 class requirement',
-                array('/{bar}', array('bar' => null), array('bar' => '\pM')),
-                '', '#^/(?P<bar>\pM)?$#sDu', array('bar'), array(
-                    array('variable', '/', '\pM', 'bar', true),
-                ),
+                ['/{bar}', ['bar' => null], ['bar' => '\pM']],
+                '', '#^/(?P<bar>\pM)?$#sDu', ['bar'], [
+                    ['variable', '/', '\pM', 'bar', true],
+                ],
                 'requirements',
-            ),
+            ],
 
-            array(
+            [
                 'Route with a UTF-8 separator',
-                array('/foo/{bar}§{_format}', array(), array(), array('compiler_class' => Utf8RouteCompiler::class)),
-                '/foo', '#^/foo/(?P<bar>[^/§]++)§(?P<_format>[^/]++)$#sDu', array('bar', '_format'), array(
-                    array('variable', '§', '[^/]++', '_format', true),
-                    array('variable', '/', '[^/§]++', 'bar', true),
-                    array('text', '/foo'),
-                ),
+                ['/foo/{bar}§{_format}', [], [], ['compiler_class' => Utf8RouteCompiler::class]],
+                '/foo', '#^/foo/(?P<bar>[^/§]++)§(?P<_format>[^/]++)$#sDu', ['bar', '_format'], [
+                    ['variable', '§', '[^/]++', '_format', true],
+                    ['variable', '/', '[^/§]++', 'bar', true],
+                    ['text', '/foo'],
+                ],
                 'patterns',
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -258,7 +258,7 @@ public function testRouteWithSameVariableTwice()
      */
     public function testRouteCharsetMismatch()
     {
-        $route = new Route("/\xE9/{bar}", array(), array('bar' => '.'), array('utf8' => true));
+        $route = new Route("/\xE9/{bar}", [], ['bar' => '.'], ['utf8' => true]);
 
         $compiled = $route->compile();
     }
@@ -268,7 +268,7 @@ public function testRouteCharsetMismatch()
      */
     public function testRequirementCharsetMismatch()
     {
-        $route = new Route('/foo/{bar}', array(), array('bar' => "\xE9"), array('utf8' => true));
+        $route = new Route('/foo/{bar}', [], ['bar' => "\xE9"], ['utf8' => true]);
 
         $compiled = $route->compile();
     }
@@ -295,11 +295,11 @@ public function testRouteWithVariableNameStartingWithADigit($name)
 
     public function getVariableNamesStartingWithADigit()
     {
-        return array(
-           array('09'),
-           array('123'),
-           array('1e2'),
-        );
+        return [
+           ['09'],
+           ['123'],
+           ['1e2'],
+        ];
     }
 
     /**
@@ -312,65 +312,65 @@ public function testCompileWithHost($name, $arguments, $prefix, $regex, $variabl
 
         $compiled = $route->compile();
         $this->assertEquals($prefix, $compiled->getStaticPrefix(), $name.' (static prefix)');
-        $this->assertEquals($regex, str_replace(array("\n", ' '), '', $compiled->getRegex()), $name.' (regex)');
+        $this->assertEquals($regex, str_replace(["\n", ' '], '', $compiled->getRegex()), $name.' (regex)');
         $this->assertEquals($variables, $compiled->getVariables(), $name.' (variables)');
         $this->assertEquals($pathVariables, $compiled->getPathVariables(), $name.' (path variables)');
         $this->assertEquals($tokens, $compiled->getTokens(), $name.' (tokens)');
-        $this->assertEquals($hostRegex, str_replace(array("\n", ' '), '', $compiled->getHostRegex()), $name.' (host regex)');
+        $this->assertEquals($hostRegex, str_replace(["\n", ' '], '', $compiled->getHostRegex()), $name.' (host regex)');
         $this->assertEquals($hostVariables, $compiled->getHostVariables(), $name.' (host variables)');
         $this->assertEquals($hostTokens, $compiled->getHostTokens(), $name.' (host tokens)');
     }
 
     public function provideCompileWithHostData()
     {
-        return array(
-            array(
+        return [
+            [
                 'Route with host pattern',
-                array('/hello', array(), array(), array(), 'www.example.com'),
-                '/hello', '#^/hello$#sD', array(), array(), array(
-                    array('text', '/hello'),
-                ),
-                '#^www\.example\.com$#sDi', array(), array(
-                    array('text', 'www.example.com'),
-                ),
-            ),
-            array(
+                ['/hello', [], [], [], 'www.example.com'],
+                '/hello', '#^/hello$#sD', [], [], [
+                    ['text', '/hello'],
+                ],
+                '#^www\.example\.com$#sDi', [], [
+                    ['text', 'www.example.com'],
+                ],
+            ],
+            [
                 'Route with host pattern and some variables',
-                array('/hello/{name}', array(), array(), array(), 'www.example.{tld}'),
-                '/hello', '#^/hello/(?P<name>[^/]++)$#sD', array('tld', 'name'), array('name'), array(
-                    array('variable', '/', '[^/]++', 'name'),
-                    array('text', '/hello'),
-                ),
-                '#^www\.example\.(?P<tld>[^\.]++)$#sDi', array('tld'), array(
-                    array('variable', '.', '[^\.]++', 'tld'),
-                    array('text', 'www.example'),
-                ),
-            ),
-            array(
+                ['/hello/{name}', [], [], [], 'www.example.{tld}'],
+                '/hello', '#^/hello/(?P<name>[^/]++)$#sD', ['tld', 'name'], ['name'], [
+                    ['variable', '/', '[^/]++', 'name'],
+                    ['text', '/hello'],
+                ],
+                '#^www\.example\.(?P<tld>[^\.]++)$#sDi', ['tld'], [
+                    ['variable', '.', '[^\.]++', 'tld'],
+                    ['text', 'www.example'],
+                ],
+            ],
+            [
                 'Route with variable at beginning of host',
-                array('/hello', array(), array(), array(), '{locale}.example.{tld}'),
-                '/hello', '#^/hello$#sD', array('locale', 'tld'), array(), array(
-                    array('text', '/hello'),
-                ),
-                '#^(?P<locale>[^\.]++)\.example\.(?P<tld>[^\.]++)$#sDi', array('locale', 'tld'), array(
-                    array('variable', '.', '[^\.]++', 'tld'),
-                    array('text', '.example'),
-                    array('variable', '', '[^\.]++', 'locale'),
-                ),
-            ),
-            array(
+                ['/hello', [], [], [], '{locale}.example.{tld}'],
+                '/hello', '#^/hello$#sD', ['locale', 'tld'], [], [
+                    ['text', '/hello'],
+                ],
+                '#^(?P<locale>[^\.]++)\.example\.(?P<tld>[^\.]++)$#sDi', ['locale', 'tld'], [
+                    ['variable', '.', '[^\.]++', 'tld'],
+                    ['text', '.example'],
+                    ['variable', '', '[^\.]++', 'locale'],
+                ],
+            ],
+            [
                 'Route with host variables that has a default value',
-                array('/hello', array('locale' => 'a', 'tld' => 'b'), array(), array(), '{locale}.example.{tld}'),
-                '/hello', '#^/hello$#sD', array('locale', 'tld'), array(), array(
-                    array('text', '/hello'),
-                ),
-                '#^(?P<locale>[^\.]++)\.example\.(?P<tld>[^\.]++)$#sDi', array('locale', 'tld'), array(
-                    array('variable', '.', '[^\.]++', 'tld'),
-                    array('text', '.example'),
-                    array('variable', '', '[^\.]++', 'locale'),
-                ),
-            ),
-        );
+                ['/hello', ['locale' => 'a', 'tld' => 'b'], [], [], '{locale}.example.{tld}'],
+                '/hello', '#^/hello$#sD', ['locale', 'tld'], [], [
+                    ['text', '/hello'],
+                ],
+                '#^(?P<locale>[^\.]++)\.example\.(?P<tld>[^\.]++)$#sDi', ['locale', 'tld'], [
+                    ['variable', '.', '[^\.]++', 'tld'],
+                    ['text', '.example'],
+                    ['variable', '', '[^\.]++', 'locale'],
+                ],
+            ],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Routing/Tests/RouteTest.php b/src/Symfony/Component/Routing/Tests/RouteTest.php
index c7af058e3b09d..1c9f3e18671b1 100644
--- a/src/Symfony/Component/Routing/Tests/RouteTest.php
+++ b/src/Symfony/Component/Routing/Tests/RouteTest.php
@@ -18,21 +18,21 @@ class RouteTest extends TestCase
 {
     public function testConstructor()
     {
-        $route = new Route('/{foo}', array('foo' => 'bar'), array('foo' => '\d+'), array('foo' => 'bar'), '{locale}.example.com');
+        $route = new Route('/{foo}', ['foo' => 'bar'], ['foo' => '\d+'], ['foo' => 'bar'], '{locale}.example.com');
         $this->assertEquals('/{foo}', $route->getPath(), '__construct() takes a path as its first argument');
-        $this->assertEquals(array('foo' => 'bar'), $route->getDefaults(), '__construct() takes defaults as its second argument');
-        $this->assertEquals(array('foo' => '\d+'), $route->getRequirements(), '__construct() takes requirements as its third argument');
+        $this->assertEquals(['foo' => 'bar'], $route->getDefaults(), '__construct() takes defaults as its second argument');
+        $this->assertEquals(['foo' => '\d+'], $route->getRequirements(), '__construct() takes requirements as its third argument');
         $this->assertEquals('bar', $route->getOption('foo'), '__construct() takes options as its fourth argument');
         $this->assertEquals('{locale}.example.com', $route->getHost(), '__construct() takes a host pattern as its fifth argument');
 
-        $route = new Route('/', array(), array(), array(), '', array('Https'), array('POST', 'put'), 'context.getMethod() == "GET"');
-        $this->assertEquals(array('https'), $route->getSchemes(), '__construct() takes schemes as its sixth argument and lowercases it');
-        $this->assertEquals(array('POST', 'PUT'), $route->getMethods(), '__construct() takes methods as its seventh argument and uppercases it');
+        $route = new Route('/', [], [], [], '', ['Https'], ['POST', 'put'], 'context.getMethod() == "GET"');
+        $this->assertEquals(['https'], $route->getSchemes(), '__construct() takes schemes as its sixth argument and lowercases it');
+        $this->assertEquals(['POST', 'PUT'], $route->getMethods(), '__construct() takes methods as its seventh argument and uppercases it');
         $this->assertEquals('context.getMethod() == "GET"', $route->getCondition(), '__construct() takes a condition as its eight argument');
 
-        $route = new Route('/', array(), array(), array(), '', 'Https', 'Post');
-        $this->assertEquals(array('https'), $route->getSchemes(), '__construct() takes a single scheme as its sixth argument');
-        $this->assertEquals(array('POST'), $route->getMethods(), '__construct() takes a single method as its seventh argument');
+        $route = new Route('/', [], [], [], '', 'Https', 'Post');
+        $this->assertEquals(['https'], $route->getSchemes(), '__construct() takes a single scheme as its sixth argument');
+        $this->assertEquals(['POST'], $route->getMethods(), '__construct() takes a single method as its seventh argument');
     }
 
     public function testPath()
@@ -52,16 +52,16 @@ public function testPath()
     public function testOptions()
     {
         $route = new Route('/{foo}');
-        $route->setOptions(array('foo' => 'bar'));
-        $this->assertEquals(array_merge(array(
+        $route->setOptions(['foo' => 'bar']);
+        $this->assertEquals(array_merge([
         'compiler_class' => 'Symfony\\Component\\Routing\\RouteCompiler',
-        ), array('foo' => 'bar')), $route->getOptions(), '->setOptions() sets the options');
-        $this->assertEquals($route, $route->setOptions(array()), '->setOptions() implements a fluent interface');
+        ], ['foo' => 'bar']), $route->getOptions(), '->setOptions() sets the options');
+        $this->assertEquals($route, $route->setOptions([]), '->setOptions() implements a fluent interface');
 
-        $route->setOptions(array('foo' => 'foo'));
-        $route->addOptions(array('bar' => 'bar'));
-        $this->assertEquals($route, $route->addOptions(array()), '->addOptions() implements a fluent interface');
-        $this->assertEquals(array('foo' => 'foo', 'bar' => 'bar', 'compiler_class' => 'Symfony\\Component\\Routing\\RouteCompiler'), $route->getOptions(), '->addDefaults() keep previous defaults');
+        $route->setOptions(['foo' => 'foo']);
+        $route->addOptions(['bar' => 'bar']);
+        $this->assertEquals($route, $route->addOptions([]), '->addOptions() implements a fluent interface');
+        $this->assertEquals(['foo' => 'foo', 'bar' => 'bar', 'compiler_class' => 'Symfony\\Component\\Routing\\RouteCompiler'], $route->getOptions(), '->addDefaults() keep previous defaults');
     }
 
     public function testOption()
@@ -76,9 +76,9 @@ public function testOption()
     public function testDefaults()
     {
         $route = new Route('/{foo}');
-        $route->setDefaults(array('foo' => 'bar'));
-        $this->assertEquals(array('foo' => 'bar'), $route->getDefaults(), '->setDefaults() sets the defaults');
-        $this->assertEquals($route, $route->setDefaults(array()), '->setDefaults() implements a fluent interface');
+        $route->setDefaults(['foo' => 'bar']);
+        $this->assertEquals(['foo' => 'bar'], $route->getDefaults(), '->setDefaults() sets the defaults');
+        $this->assertEquals($route, $route->setDefaults([]), '->setDefaults() implements a fluent interface');
 
         $route->setDefault('foo', 'bar');
         $this->assertEquals('bar', $route->getDefault('foo'), '->setDefault() sets a default value');
@@ -90,27 +90,27 @@ public function testDefaults()
         $route->setDefault('_controller', $closure = function () { return 'Hello'; });
         $this->assertEquals($closure, $route->getDefault('_controller'), '->setDefault() sets a default value');
 
-        $route->setDefaults(array('foo' => 'foo'));
-        $route->addDefaults(array('bar' => 'bar'));
-        $this->assertEquals($route, $route->addDefaults(array()), '->addDefaults() implements a fluent interface');
-        $this->assertEquals(array('foo' => 'foo', 'bar' => 'bar'), $route->getDefaults(), '->addDefaults() keep previous defaults');
+        $route->setDefaults(['foo' => 'foo']);
+        $route->addDefaults(['bar' => 'bar']);
+        $this->assertEquals($route, $route->addDefaults([]), '->addDefaults() implements a fluent interface');
+        $this->assertEquals(['foo' => 'foo', 'bar' => 'bar'], $route->getDefaults(), '->addDefaults() keep previous defaults');
     }
 
     public function testRequirements()
     {
         $route = new Route('/{foo}');
-        $route->setRequirements(array('foo' => '\d+'));
-        $this->assertEquals(array('foo' => '\d+'), $route->getRequirements(), '->setRequirements() sets the requirements');
+        $route->setRequirements(['foo' => '\d+']);
+        $this->assertEquals(['foo' => '\d+'], $route->getRequirements(), '->setRequirements() sets the requirements');
         $this->assertEquals('\d+', $route->getRequirement('foo'), '->getRequirement() returns a requirement');
         $this->assertNull($route->getRequirement('bar'), '->getRequirement() returns null if a requirement is not defined');
-        $route->setRequirements(array('foo' => '^\d+$'));
+        $route->setRequirements(['foo' => '^\d+$']);
         $this->assertEquals('\d+', $route->getRequirement('foo'), '->getRequirement() removes ^ and $ from the path');
-        $this->assertEquals($route, $route->setRequirements(array()), '->setRequirements() implements a fluent interface');
+        $this->assertEquals($route, $route->setRequirements([]), '->setRequirements() implements a fluent interface');
 
-        $route->setRequirements(array('foo' => '\d+'));
-        $route->addRequirements(array('bar' => '\d+'));
-        $this->assertEquals($route, $route->addRequirements(array()), '->addRequirements() implements a fluent interface');
-        $this->assertEquals(array('foo' => '\d+', 'bar' => '\d+'), $route->getRequirements(), '->addRequirement() keep previous requirements');
+        $route->setRequirements(['foo' => '\d+']);
+        $route->addRequirements(['bar' => '\d+']);
+        $this->assertEquals($route, $route->addRequirements([]), '->addRequirements() implements a fluent interface');
+        $this->assertEquals(['foo' => '\d+', 'bar' => '\d+'], $route->getRequirements(), '->addRequirement() keep previous requirements');
     }
 
     public function testRequirement()
@@ -134,13 +134,13 @@ public function testSetInvalidRequirement($req)
 
     public function getInvalidRequirements()
     {
-        return array(
-           array(''),
-           array(array()),
-           array('^$'),
-           array('^'),
-           array('$'),
-        );
+        return [
+           [''],
+           [[]],
+           ['^$'],
+           ['^'],
+           ['$'],
+        ];
     }
 
     public function testHost()
@@ -153,14 +153,14 @@ public function testHost()
     public function testScheme()
     {
         $route = new Route('/');
-        $this->assertEquals(array(), $route->getSchemes(), 'schemes is initialized with array()');
+        $this->assertEquals([], $route->getSchemes(), 'schemes is initialized with array()');
         $this->assertFalse($route->hasScheme('http'));
         $route->setSchemes('hTTp');
-        $this->assertEquals(array('http'), $route->getSchemes(), '->setSchemes() accepts a single scheme string and lowercases it');
+        $this->assertEquals(['http'], $route->getSchemes(), '->setSchemes() accepts a single scheme string and lowercases it');
         $this->assertTrue($route->hasScheme('htTp'));
         $this->assertFalse($route->hasScheme('httpS'));
-        $route->setSchemes(array('HttpS', 'hTTp'));
-        $this->assertEquals(array('https', 'http'), $route->getSchemes(), '->setSchemes() accepts an array of schemes and lowercases them');
+        $route->setSchemes(['HttpS', 'hTTp']);
+        $this->assertEquals(['https', 'http'], $route->getSchemes(), '->setSchemes() accepts an array of schemes and lowercases them');
         $this->assertTrue($route->hasScheme('htTp'));
         $this->assertTrue($route->hasScheme('httpS'));
     }
@@ -168,11 +168,11 @@ public function testScheme()
     public function testMethod()
     {
         $route = new Route('/');
-        $this->assertEquals(array(), $route->getMethods(), 'methods is initialized with array()');
+        $this->assertEquals([], $route->getMethods(), 'methods is initialized with array()');
         $route->setMethods('gEt');
-        $this->assertEquals(array('GET'), $route->getMethods(), '->setMethods() accepts a single method string and uppercases it');
-        $route->setMethods(array('gEt', 'PosT'));
-        $this->assertEquals(array('GET', 'POST'), $route->getMethods(), '->setMethods() accepts an array of methods and uppercases them');
+        $this->assertEquals(['GET'], $route->getMethods(), '->setMethods() accepts a single method string and uppercases it');
+        $route->setMethods(['gEt', 'PosT']);
+        $this->assertEquals(['GET', 'POST'], $route->getMethods(), '->setMethods() accepts an array of methods and uppercases them');
     }
 
     public function testCondition()
@@ -194,7 +194,7 @@ public function testCompile()
 
     public function testSerialize()
     {
-        $route = new Route('/prefix/{foo}', array('foo' => 'default'), array('foo' => '\d+'));
+        $route = new Route('/prefix/{foo}', ['foo' => 'default'], ['foo' => '\d+']);
 
         $serialized = serialize($route);
         $unserialized = unserialize($serialized);
@@ -209,7 +209,7 @@ public function testSerialize()
      */
     public function testSerializeWhenCompiled()
     {
-        $route = new Route('/prefix/{foo}', array('foo' => 'default'), array('foo' => '\d+'));
+        $route = new Route('/prefix/{foo}', ['foo' => 'default'], ['foo' => '\d+']);
         $route->setHost('{locale}.example.net');
         $route->compile();
 
@@ -226,7 +226,7 @@ public function testSerializeWhenCompiled()
      */
     public function testSerializeWhenCompiledWithClass()
     {
-        $route = new Route('/', array(), array(), array('compiler_class' => '\Symfony\Component\Routing\Tests\Fixtures\CustomRouteCompiler'));
+        $route = new Route('/', [], [], ['compiler_class' => '\Symfony\Component\Routing\Tests\Fixtures\CustomRouteCompiler']);
         $this->assertInstanceOf('\Symfony\Component\Routing\Tests\Fixtures\CustomCompiledRoute', $route->compile(), '->compile() returned a proper route');
 
         $serialized = serialize($route);
@@ -248,7 +248,7 @@ public function testSerializedRepresentationKeepsWorking()
         $serialized = 'C:31:"Symfony\Component\Routing\Route":936:{a:8:{s:4:"path";s:13:"/prefix/{foo}";s:4:"host";s:20:"{locale}.example.net";s:8:"defaults";a:1:{s:3:"foo";s:7:"default";}s:12:"requirements";a:1:{s:3:"foo";s:3:"\d+";}s:7:"options";a:1:{s:14:"compiler_class";s:39:"Symfony\Component\Routing\RouteCompiler";}s:7:"schemes";a:0:{}s:7:"methods";a:0:{}s:8:"compiled";C:39:"Symfony\Component\Routing\CompiledRoute":571:{a:8:{s:4:"vars";a:2:{i:0;s:6:"locale";i:1;s:3:"foo";}s:11:"path_prefix";s:7:"/prefix";s:10:"path_regex";s:31:"#^/prefix(?:/(?P<foo>\d+))?$#sD";s:11:"path_tokens";a:2:{i:0;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:3:"\d+";i:3;s:3:"foo";}i:1;a:2:{i:0;s:4:"text";i:1;s:7:"/prefix";}}s:9:"path_vars";a:1:{i:0;s:3:"foo";}s:10:"host_regex";s:40:"#^(?P<locale>[^\.]++)\.example\.net$#sDi";s:11:"host_tokens";a:2:{i:0;a:2:{i:0;s:4:"text";i:1;s:12:".example.net";}i:1;a:4:{i:0;s:8:"variable";i:1;s:0:"";i:2;s:7:"[^\.]++";i:3;s:6:"locale";}}s:9:"host_vars";a:1:{i:0;s:6:"locale";}}}}}';
         $unserialized = unserialize($serialized);
 
-        $route = new Route('/prefix/{foo}', array('foo' => 'default'), array('foo' => '\d+'));
+        $route = new Route('/prefix/{foo}', ['foo' => 'default'], ['foo' => '\d+']);
         $route->setHost('{locale}.example.net');
         $route->compile();
 
diff --git a/src/Symfony/Component/Routing/Tests/RouterTest.php b/src/Symfony/Component/Routing/Tests/RouterTest.php
index e01bd9c610c27..589ce5403ac2b 100644
--- a/src/Symfony/Component/Routing/Tests/RouterTest.php
+++ b/src/Symfony/Component/Routing/Tests/RouterTest.php
@@ -30,11 +30,11 @@ protected function setUp()
 
     public function testSetOptionsWithSupportedOptions()
     {
-        $this->router->setOptions(array(
+        $this->router->setOptions([
             'cache_dir' => './cache',
             'debug' => true,
             'resource_type' => 'ResourceType',
-        ));
+        ]);
 
         $this->assertSame('./cache', $this->router->getOption('cache_dir'));
         $this->assertTrue($this->router->getOption('debug'));
@@ -47,12 +47,12 @@ public function testSetOptionsWithSupportedOptions()
      */
     public function testSetOptionsWithUnsupportedOptions()
     {
-        $this->router->setOptions(array(
+        $this->router->setOptions([
             'cache_dir' => './cache',
             'option_foo' => true,
             'option_bar' => 'baz',
             'resource_type' => 'ResourceType',
-        ));
+        ]);
     }
 
     public function testSetOptionWithSupportedOption()
@@ -109,10 +109,10 @@ public function testMatcherIsCreatedIfCacheIsNotConfigured($option)
 
     public function provideMatcherOptionsPreventingCaching()
     {
-        return array(
-            array('cache_dir'),
-            array('matcher_cache_class'),
-        );
+        return [
+            ['cache_dir'],
+            ['matcher_cache_class'],
+        ];
     }
 
     /**
@@ -131,10 +131,10 @@ public function testGeneratorIsCreatedIfCacheIsNotConfigured($option)
 
     public function provideGeneratorOptionsPreventingCaching()
     {
-        return array(
-            array('cache_dir'),
-            array('generator_cache_class'),
-        );
+        return [
+            ['cache_dir'],
+            ['generator_cache_class'],
+        ];
     }
 
     public function testMatchRequestWithUrlMatcherInterface()
diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/InMemoryTokenProvider.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/InMemoryTokenProvider.php
index 719d7a16d81df..71e3b6a8afe54 100644
--- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/InMemoryTokenProvider.php
+++ b/src/Symfony/Component/Security/Core/Authentication/RememberMe/InMemoryTokenProvider.php
@@ -20,7 +20,7 @@
  */
 class InMemoryTokenProvider implements TokenProviderInterface
 {
-    private $tokens = array();
+    private $tokens = [];
 
     /**
      * {@inheritdoc}
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
index 516a61fe0dcb0..eee4365ca2078 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
@@ -138,12 +138,12 @@ public function eraseCredentials()
     public function serialize()
     {
         return serialize(
-            array(
+            [
                 \is_object($this->user) ? clone $this->user : $this->user,
                 $this->authenticated,
                 array_map(function ($role) { return clone $role; }, $this->roles),
                 $this->attributes,
-            )
+            ]
         );
     }
 
@@ -224,7 +224,7 @@ public function __toString()
         $class = \get_class($this);
         $class = substr($class, strrpos($class, '\\') + 1);
 
-        $roles = array();
+        $roles = [];
         foreach ($this->roles as $role) {
             $roles[] = $role->getRole();
         }
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php
index 3c93664efcc70..52d9ff76edcb5 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php
@@ -59,7 +59,7 @@ public function getSecret()
      */
     public function serialize()
     {
-        return serialize(array($this->secret, parent::serialize()));
+        return serialize([$this->secret, parent::serialize()]);
     }
 
     /**
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php
index 84fdb4b00c086..b12003cb4be0f 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php
@@ -79,7 +79,7 @@ public function eraseCredentials()
      */
     public function serialize()
     {
-        return serialize(array($this->credentials, $this->providerKey, parent::serialize()));
+        return serialize([$this->credentials, $this->providerKey, parent::serialize()]);
     }
 
     /**
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php
index 4130a437da4cc..9512a50eb7ce6 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php
@@ -94,11 +94,11 @@ public function getCredentials()
      */
     public function serialize()
     {
-        return serialize(array(
+        return serialize([
             $this->secret,
             $this->providerKey,
             parent::serialize(),
-        ));
+        ]);
     }
 
     /**
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php
index 2df1472d8c2a1..45f2cd41ea3ca 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php
@@ -91,7 +91,7 @@ public function eraseCredentials()
      */
     public function serialize()
     {
-        return serialize(array($this->credentials, $this->providerKey, parent::serialize()));
+        return serialize([$this->credentials, $this->providerKey, parent::serialize()]);
     }
 
     /**
diff --git a/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php b/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php
index ff37531cda546..31744d3413564 100644
--- a/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php
+++ b/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php
@@ -60,7 +60,7 @@ final public function isGranted($attributes, $subject = null)
         }
 
         if (!\is_array($attributes)) {
-            $attributes = array($attributes);
+            $attributes = [$attributes];
         }
 
         return $this->accessDecisionManager->decide($token, $attributes, $subject);
diff --git a/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguageProvider.php b/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguageProvider.php
index 388040d5facb5..d8707525ebc2e 100644
--- a/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguageProvider.php
+++ b/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguageProvider.php
@@ -23,7 +23,7 @@ class ExpressionLanguageProvider implements ExpressionFunctionProviderInterface
 {
     public function getFunctions()
     {
-        return array(
+        return [
             new ExpressionFunction('is_anonymous', function () {
                 return '$trust_resolver->isAnonymous($token)';
             }, function (array $variables) {
@@ -53,6 +53,6 @@ public function getFunctions()
             }, function (array $variables, $role) {
                 return \in_array($role, $variables['roles']);
             }),
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
index d85afccd805b0..1a7be2b4d22a8 100644
--- a/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
+++ b/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
@@ -65,7 +65,7 @@ public function encodePassword($raw, $salt)
             throw new BadCredentialsException('Invalid password.');
         }
 
-        $options = array('cost' => $this->cost);
+        $options = ['cost' => $this->cost];
 
         if ($salt) {
             // Ignore $salt, the auto-generated one is always the best
diff --git a/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
index 75c4db896f2d0..3c3ea1aa17366 100644
--- a/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
+++ b/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
@@ -30,7 +30,7 @@ abstract class BasePasswordEncoder implements PasswordEncoderInterface
     protected function demergePasswordAndSalt($mergedPasswordSalt)
     {
         if (empty($mergedPasswordSalt)) {
-            return array('', '');
+            return ['', ''];
         }
 
         $password = $mergedPasswordSalt;
@@ -42,7 +42,7 @@ protected function demergePasswordAndSalt($mergedPasswordSalt)
             $password = substr($mergedPasswordSalt, 0, $saltBegins);
         }
 
-        return array($password, $salt);
+        return [$password, $salt];
     }
 
     /**
diff --git a/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php b/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
index a16044ff000a7..bafcacbedc606 100644
--- a/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
+++ b/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
@@ -18,7 +18,7 @@
  */
 class AccessDeniedException extends \RuntimeException
 {
-    private $attributes = array();
+    private $attributes = [];
     private $subject;
 
     public function __construct($message = 'Access Denied.', \Exception $previous = null)
diff --git a/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php b/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php
index 034ab792ee360..503d3fbad48a0 100644
--- a/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php
+++ b/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php
@@ -44,10 +44,10 @@ public function setUser(UserInterface $user)
      */
     public function serialize()
     {
-        return serialize(array(
+        return serialize([
             $this->user,
             parent::serialize(),
-        ));
+        ]);
     }
 
     /**
diff --git a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
index 8beb87bdb81bc..e0d1e471e8f90 100644
--- a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
+++ b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
@@ -40,13 +40,13 @@ public function setToken(TokenInterface $token)
 
     public function serialize()
     {
-        return serialize(array(
+        return serialize([
             $this->token,
             $this->code,
             $this->message,
             $this->file,
             $this->line,
-        ));
+        ]);
     }
 
     public function unserialize($str)
@@ -77,6 +77,6 @@ public function getMessageKey()
      */
     public function getMessageData()
     {
-        return array();
+        return [];
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAuthenticationException.php b/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAuthenticationException.php
index 9f5071f4307db..42ee88ed4166d 100644
--- a/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAuthenticationException.php
+++ b/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAuthenticationException.php
@@ -39,7 +39,7 @@ public function __construct($message = '', array $messageData = array(), $code =
      * @param string $messageKey  The message or message key
      * @param array  $messageData Data to be passed into the translator
      */
-    public function setSafeMessage($messageKey, array $messageData = array())
+    public function setSafeMessage($messageKey, array $messageData = [])
     {
         $this->messageKey = $messageKey;
         $this->messageData = $messageData;
@@ -60,11 +60,11 @@ public function getMessageData()
      */
     public function serialize()
     {
-        return serialize(array(
+        return serialize([
             parent::serialize(),
             $this->messageKey,
             $this->messageData,
-        ));
+        ]);
     }
 
     /**
diff --git a/src/Symfony/Component/Security/Core/Exception/UsernameNotFoundException.php b/src/Symfony/Component/Security/Core/Exception/UsernameNotFoundException.php
index 6979389a05987..6549307eee195 100644
--- a/src/Symfony/Component/Security/Core/Exception/UsernameNotFoundException.php
+++ b/src/Symfony/Component/Security/Core/Exception/UsernameNotFoundException.php
@@ -54,10 +54,10 @@ public function setUsername($username)
      */
     public function serialize()
     {
-        return serialize(array(
+        return serialize([
             $this->username,
             parent::serialize(),
-        ));
+        ]);
     }
 
     /**
@@ -75,6 +75,6 @@ public function unserialize($str)
      */
     public function getMessageData()
     {
-        return array('{{ username }}' => $this->username);
+        return ['{{ username }}' => $this->username];
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php b/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php
index ff487f2523ec8..f4a2e5b622974 100644
--- a/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php
+++ b/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php
@@ -52,10 +52,10 @@ public function getReachableRoles(array $roles)
 
     protected function buildRoleMap()
     {
-        $this->map = array();
+        $this->map = [];
         foreach ($this->hierarchy as $main => $roles) {
             $this->map[$main] = $roles;
-            $visited = array();
+            $visited = [];
             $additionalRoles = $roles;
             while ($role = array_shift($additionalRoles)) {
                 if (!isset($this->hierarchy[$role])) {
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php
index 947bd4f694ce9..a9cbe148cfa0a 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php
@@ -29,7 +29,7 @@ class AuthenticationProviderManagerTest extends TestCase
      */
     public function testAuthenticateWithoutProviders()
     {
-        new AuthenticationProviderManager(array());
+        new AuthenticationProviderManager([]);
     }
 
     /**
@@ -37,16 +37,16 @@ public function testAuthenticateWithoutProviders()
      */
     public function testAuthenticateWithProvidersWithIncorrectInterface()
     {
-        (new AuthenticationProviderManager(array(
+        (new AuthenticationProviderManager([
             new \stdClass(),
-        )))->authenticate($this->getMockBuilder(TokenInterface::class)->getMock());
+        ]))->authenticate($this->getMockBuilder(TokenInterface::class)->getMock());
     }
 
     public function testAuthenticateWhenNoProviderSupportsToken()
     {
-        $manager = new AuthenticationProviderManager(array(
+        $manager = new AuthenticationProviderManager([
             $this->getAuthenticationProvider(false),
-        ));
+        ]);
 
         try {
             $manager->authenticate($token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
@@ -58,9 +58,9 @@ public function testAuthenticateWhenNoProviderSupportsToken()
 
     public function testAuthenticateWhenProviderReturnsAccountStatusException()
     {
-        $manager = new AuthenticationProviderManager(array(
+        $manager = new AuthenticationProviderManager([
             $this->getAuthenticationProvider(true, null, 'Symfony\Component\Security\Core\Exception\AccountStatusException'),
-        ));
+        ]);
 
         try {
             $manager->authenticate($token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
@@ -72,9 +72,9 @@ public function testAuthenticateWhenProviderReturnsAccountStatusException()
 
     public function testAuthenticateWhenProviderReturnsAuthenticationException()
     {
-        $manager = new AuthenticationProviderManager(array(
+        $manager = new AuthenticationProviderManager([
             $this->getAuthenticationProvider(true, null, 'Symfony\Component\Security\Core\Exception\AuthenticationException'),
-        ));
+        ]);
 
         try {
             $manager->authenticate($token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
@@ -86,10 +86,10 @@ public function testAuthenticateWhenProviderReturnsAuthenticationException()
 
     public function testAuthenticateWhenOneReturnsAuthenticationExceptionButNotAll()
     {
-        $manager = new AuthenticationProviderManager(array(
+        $manager = new AuthenticationProviderManager([
             $this->getAuthenticationProvider(true, null, 'Symfony\Component\Security\Core\Exception\AuthenticationException'),
             $this->getAuthenticationProvider(true, $expected = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()),
-        ));
+        ]);
 
         $token = $manager->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
         $this->assertSame($expected, $token);
@@ -102,10 +102,10 @@ public function testAuthenticateReturnsTokenOfTheFirstMatchingProvider()
             ->expects($this->never())
             ->method('supports')
         ;
-        $manager = new AuthenticationProviderManager(array(
+        $manager = new AuthenticationProviderManager([
             $this->getAuthenticationProvider(true, $expected = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()),
             $second,
-        ));
+        ]);
 
         $token = $manager->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
         $this->assertSame($expected, $token);
@@ -113,16 +113,16 @@ public function testAuthenticateReturnsTokenOfTheFirstMatchingProvider()
 
     public function testEraseCredentialFlag()
     {
-        $manager = new AuthenticationProviderManager(array(
+        $manager = new AuthenticationProviderManager([
             $this->getAuthenticationProvider(true, $token = new UsernamePasswordToken('foo', 'bar', 'key')),
-        ));
+        ]);
 
         $token = $manager->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
         $this->assertEquals('', $token->getCredentials());
 
-        $manager = new AuthenticationProviderManager(array(
+        $manager = new AuthenticationProviderManager([
             $this->getAuthenticationProvider(true, $token = new UsernamePasswordToken('foo', 'bar', 'key')),
-        ), false);
+        ], false);
 
         $token = $manager->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
         $this->assertEquals('bar', $token->getCredentials());
@@ -141,7 +141,7 @@ public function testAuthenticateDispatchesAuthenticationFailureEvent()
             ->method('dispatch')
             ->with(AuthenticationEvents::AUTHENTICATION_FAILURE, $this->equalTo(new AuthenticationFailureEvent($token, $exception)));
 
-        $manager = new AuthenticationProviderManager(array($provider));
+        $manager = new AuthenticationProviderManager([$provider]);
         $manager->setEventDispatcher($dispatcher);
 
         try {
@@ -166,7 +166,7 @@ public function testAuthenticateDispatchesAuthenticationSuccessEvent()
             ->method('dispatch')
             ->with(AuthenticationEvents::AUTHENTICATION_SUCCESS, $this->equalTo(new AuthenticationEvent($token)));
 
-        $manager = new AuthenticationProviderManager(array($provider));
+        $manager = new AuthenticationProviderManager([$provider]);
         $manager->setEventDispatcher($dispatcher);
 
         $this->assertSame($token, $manager->authenticate($token));
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php
index 55ca05b43b5fb..1ae0d42fb9d1a 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php
@@ -53,12 +53,12 @@ protected function getToken()
 
     protected function getAnonymousToken()
     {
-        return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken')->setConstructorArgs(array('', ''))->getMock();
+        return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken')->setConstructorArgs(['', ''])->getMock();
     }
 
     protected function getRememberMeToken()
     {
-        return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\RememberMeToken')->setMethods(array('setPersistent'))->disableOriginalConstructor()->getMock();
+        return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\RememberMeToken')->setMethods(['setPersistent'])->disableOriginalConstructor()->getMock();
     }
 
     protected function getResolver()
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php
index e6c0f6853a7ca..92441ba5fc617 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php
@@ -55,7 +55,7 @@ public function testAuthenticate()
 
     protected function getSupportedToken($secret)
     {
-        $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken')->setMethods(array('getSecret'))->disableOriginalConstructor()->getMock();
+        $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken')->setMethods(['getSecret'])->disableOriginalConstructor()->getMock();
         $token->expects($this->any())
               ->method('getSecret')
               ->will($this->returnValue($secret))
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php
index 10e6eb78d8f89..a874a59dcb2d2 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php
@@ -261,7 +261,7 @@ public function testCheckAuthentication()
 
     protected function getSupportedToken()
     {
-        $mock = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Authentication\\Token\\UsernamePasswordToken')->setMethods(array('getCredentials', 'getUser', 'getProviderKey'))->disableOriginalConstructor()->getMock();
+        $mock = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Authentication\\Token\\UsernamePasswordToken')->setMethods(['getCredentials', 'getUser', 'getProviderKey'])->disableOriginalConstructor()->getMock();
         $mock
             ->expects($this->any())
             ->method('getProviderKey')
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php
index 68b4657fabf78..9fceb25f97758 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php
@@ -107,7 +107,7 @@ public function testQueryForDn()
     {
         $userProvider = $this->getMockBuilder(UserProviderInterface::class)->getMock();
 
-        $collection = new \ArrayIterator(array(new Entry('')));
+        $collection = new \ArrayIterator([new Entry('')]);
 
         $query = $this->getMockBuilder(QueryInterface::class)->getMock();
         $query
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php
index 5a6b04d5b4862..768ac1d677d1e 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php
@@ -62,7 +62,7 @@ public function testAuthenticate()
         $user
             ->expects($this->once())
             ->method('getRoles')
-            ->will($this->returnValue(array()))
+            ->will($this->returnValue([]))
         ;
         $provider = $this->getProvider($user);
 
@@ -70,8 +70,8 @@ public function testAuthenticate()
         $this->assertInstanceOf('Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken', $token);
         $this->assertEquals('pass', $token->getCredentials());
         $this->assertEquals('key', $token->getProviderKey());
-        $this->assertEquals(array(), $token->getRoles());
-        $this->assertEquals(array('foo' => 'bar'), $token->getAttributes(), '->authenticate() copies token attributes');
+        $this->assertEquals([], $token->getRoles());
+        $this->assertEquals(['foo' => 'bar'], $token->getAttributes(), '->authenticate() copies token attributes');
         $this->assertSame($user, $token->getUser());
     }
 
@@ -95,7 +95,7 @@ public function testAuthenticateWhenUserCheckerThrowsException()
 
     protected function getSupportedToken($user = false, $credentials = false)
     {
-        $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken')->setMethods(array('getUser', 'getCredentials', 'getProviderKey'))->disableOriginalConstructor()->getMock();
+        $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken')->setMethods(['getUser', 'getCredentials', 'getProviderKey'])->disableOriginalConstructor()->getMock();
         if (false !== $user) {
             $token->expects($this->once())
                   ->method('getUser')
@@ -115,7 +115,7 @@ protected function getSupportedToken($user = false, $credentials = false)
             ->will($this->returnValue('key'))
         ;
 
-        $token->setAttributes(array('foo' => 'bar'));
+        $token->setAttributes(['foo' => 'bar']);
 
         return $token;
     }
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php
index 497f315c33202..f1aa812e725a3 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php
@@ -69,7 +69,7 @@ public function testAuthenticate()
         $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
         $user->expects($this->exactly(2))
              ->method('getRoles')
-             ->will($this->returnValue(array('ROLE_FOO')));
+             ->will($this->returnValue(['ROLE_FOO']));
 
         $provider = $this->getProvider();
 
@@ -78,7 +78,7 @@ public function testAuthenticate()
 
         $this->assertInstanceOf('Symfony\Component\Security\Core\Authentication\Token\RememberMeToken', $authToken);
         $this->assertSame($user, $authToken->getUser());
-        $this->assertEquals(array(new Role('ROLE_FOO')), $authToken->getRoles());
+        $this->assertEquals([new Role('ROLE_FOO')], $authToken->getRoles());
         $this->assertEquals('', $authToken->getCredentials());
     }
 
@@ -89,10 +89,10 @@ protected function getSupportedToken($user = null, $secret = 'test')
             $user
                 ->expects($this->any())
                 ->method('getRoles')
-                ->will($this->returnValue(array()));
+                ->will($this->returnValue([]));
         }
 
-        $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\RememberMeToken')->setMethods(array('getProviderKey'))->setConstructorArgs(array($user, 'foo', $secret))->getMock();
+        $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\RememberMeToken')->setMethods(['getProviderKey'])->setConstructorArgs([$user, 'foo', $secret])->getMock();
         $token
             ->expects($this->once())
             ->method('getProviderKey')
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php
index a08ca3f813c87..e863514c8ac19 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php
@@ -165,7 +165,7 @@ public function testAuthenticate()
         $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
         $user->expects($this->once())
              ->method('getRoles')
-             ->will($this->returnValue(array('ROLE_FOO')))
+             ->will($this->returnValue(['ROLE_FOO']))
         ;
 
         $provider = $this->getProvider();
@@ -182,16 +182,16 @@ public function testAuthenticate()
 
         $token->expects($this->once())
               ->method('getRoles')
-              ->will($this->returnValue(array()))
+              ->will($this->returnValue([]))
         ;
 
         $authToken = $provider->authenticate($token);
 
         $this->assertInstanceOf('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken', $authToken);
         $this->assertSame($user, $authToken->getUser());
-        $this->assertEquals(array(new Role('ROLE_FOO')), $authToken->getRoles());
+        $this->assertEquals([new Role('ROLE_FOO')], $authToken->getRoles());
         $this->assertEquals('foo', $authToken->getCredentials());
-        $this->assertEquals(array('foo' => 'bar'), $authToken->getAttributes(), '->authenticate() copies token attributes');
+        $this->assertEquals(['foo' => 'bar'], $authToken->getAttributes(), '->authenticate() copies token attributes');
     }
 
     public function testAuthenticateWithPreservingRoleSwitchUserRole()
@@ -199,7 +199,7 @@ public function testAuthenticateWithPreservingRoleSwitchUserRole()
         $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
         $user->expects($this->once())
              ->method('getRoles')
-             ->will($this->returnValue(array('ROLE_FOO')))
+             ->will($this->returnValue(['ROLE_FOO']))
         ;
 
         $provider = $this->getProvider();
@@ -217,7 +217,7 @@ public function testAuthenticateWithPreservingRoleSwitchUserRole()
         $switchUserRole = new SwitchUserRole('foo', $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
         $token->expects($this->once())
               ->method('getRoles')
-              ->will($this->returnValue(array($switchUserRole)))
+              ->will($this->returnValue([$switchUserRole]))
         ;
 
         $authToken = $provider->authenticate($token);
@@ -227,19 +227,19 @@ public function testAuthenticateWithPreservingRoleSwitchUserRole()
         $this->assertContains(new Role('ROLE_FOO'), $authToken->getRoles(), '', false, false);
         $this->assertContains($switchUserRole, $authToken->getRoles(), '', false, false);
         $this->assertEquals('foo', $authToken->getCredentials());
-        $this->assertEquals(array('foo' => 'bar'), $authToken->getAttributes(), '->authenticate() copies token attributes');
+        $this->assertEquals(['foo' => 'bar'], $authToken->getAttributes(), '->authenticate() copies token attributes');
     }
 
     protected function getSupportedToken()
     {
-        $mock = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken')->setMethods(array('getCredentials', 'getProviderKey', 'getRoles'))->disableOriginalConstructor()->getMock();
+        $mock = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken')->setMethods(['getCredentials', 'getProviderKey', 'getRoles'])->disableOriginalConstructor()->getMock();
         $mock
             ->expects($this->any())
             ->method('getProviderKey')
             ->will($this->returnValue('key'))
         ;
 
-        $mock->setAttributes(array('foo' => 'bar'));
+        $mock->setAttributes(['foo' => 'bar']);
 
         return $mock;
     }
@@ -250,6 +250,6 @@ protected function getProvider($userChecker = false, $hide = true)
             $userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
         }
 
-        return $this->getMockForAbstractClass('Symfony\Component\Security\Core\Authentication\Provider\UserAuthenticationProvider', array($userChecker, 'key', $hide));
+        return $this->getMockForAbstractClass('Symfony\Component\Security\Core\Authentication\Provider\UserAuthenticationProvider', [$userChecker, 'key', $hide]);
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php
index 4cdf98267600a..d667052062352 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php
@@ -36,7 +36,7 @@ class ConcreteToken extends AbstractToken
 {
     private $credentials = 'credentials_value';
 
-    public function __construct($user, array $roles = array())
+    public function __construct($user, array $roles = [])
     {
         parent::__construct($roles);
 
@@ -45,7 +45,7 @@ public function __construct($user, array $roles = array())
 
     public function serialize()
     {
-        return serialize(array($this->credentials, parent::serialize()));
+        return serialize([$this->credentials, parent::serialize()]);
     }
 
     public function unserialize($serialized)
@@ -64,7 +64,7 @@ class AbstractTokenTest extends TestCase
 {
     public function testGetUsername()
     {
-        $token = $this->getToken(array('ROLE_FOO'));
+        $token = $this->getToken(['ROLE_FOO']);
         $token->setUser('fabien');
         $this->assertEquals('fabien', $token->getUsername());
 
@@ -79,7 +79,7 @@ public function testGetUsername()
 
     public function testEraseCredentials()
     {
-        $token = $this->getToken(array('ROLE_FOO'));
+        $token = $this->getToken(['ROLE_FOO']);
 
         $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
         $user->expects($this->once())->method('eraseCredentials');
@@ -90,8 +90,8 @@ public function testEraseCredentials()
 
     public function testSerialize()
     {
-        $token = $this->getToken(array('ROLE_FOO', new Role('ROLE_BAR')));
-        $token->setAttributes(array('foo' => 'bar'));
+        $token = $this->getToken(['ROLE_FOO', new Role('ROLE_BAR')]);
+        $token->setAttributes(['foo' => 'bar']);
 
         $uToken = unserialize(serialize($token));
 
@@ -101,7 +101,7 @@ public function testSerialize()
 
     public function testSerializeWithRoleObjects()
     {
-        $user = new User('name', 'password', array(new Role('ROLE_FOO'), new Role('ROLE_BAR')));
+        $user = new User('name', 'password', [new Role('ROLE_FOO'), new Role('ROLE_BAR')]);
         $token = new ConcreteToken($user, $user->getRoles());
 
         $serialized = serialize($token);
@@ -115,9 +115,9 @@ public function testSerializeWithRoleObjects()
     public function testSerializeParent()
     {
         $user = new TestUser('fabien');
-        $token = new ConcreteToken($user, array('ROLE_FOO'));
+        $token = new ConcreteToken($user, ['ROLE_FOO']);
 
-        $parentToken = new ConcreteToken($user, array(new SwitchUserRole('ROLE_PREVIOUS', $token)));
+        $parentToken = new ConcreteToken($user, [new SwitchUserRole('ROLE_PREVIOUS', $token)]);
         $uToken = unserialize(serialize($parentToken));
 
         $this->assertEquals(
@@ -128,14 +128,14 @@ public function testSerializeParent()
 
     public function testConstructor()
     {
-        $token = $this->getToken(array('ROLE_FOO'));
-        $this->assertEquals(array(new Role('ROLE_FOO')), $token->getRoles());
+        $token = $this->getToken(['ROLE_FOO']);
+        $this->assertEquals([new Role('ROLE_FOO')], $token->getRoles());
 
-        $token = $this->getToken(array(new Role('ROLE_FOO')));
-        $this->assertEquals(array(new Role('ROLE_FOO')), $token->getRoles());
+        $token = $this->getToken([new Role('ROLE_FOO')]);
+        $this->assertEquals([new Role('ROLE_FOO')], $token->getRoles());
 
-        $token = $this->getToken(array(new Role('ROLE_FOO'), 'ROLE_BAR'));
-        $this->assertEquals(array(new Role('ROLE_FOO'), new Role('ROLE_BAR')), $token->getRoles());
+        $token = $this->getToken([new Role('ROLE_FOO'), 'ROLE_BAR']);
+        $this->assertEquals([new Role('ROLE_FOO'), new Role('ROLE_BAR')], $token->getRoles());
     }
 
     public function testAuthenticatedFlag()
@@ -152,7 +152,7 @@ public function testAuthenticatedFlag()
 
     public function testAttributes()
     {
-        $attributes = array('foo' => 'bar');
+        $attributes = ['foo' => 'bar'];
         $token = $this->getToken();
         $token->setAttributes($attributes);
 
@@ -278,8 +278,8 @@ public function testSetUserDoesNotSetAuthenticatedToFalseWhenUserDoesNotChange($
         $this->assertTrue($token->isAuthenticated());
     }
 
-    protected function getToken(array $roles = array())
+    protected function getToken(array $roles = [])
     {
-        return $this->getMockForAbstractClass('Symfony\Component\Security\Core\Authentication\Token\AbstractToken', array($roles));
+        return $this->getMockForAbstractClass('Symfony\Component\Security\Core\Authentication\Token\AbstractToken', [$roles]);
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AnonymousTokenTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AnonymousTokenTest.php
index 1409752ac6456..7024cc5356cd4 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AnonymousTokenTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AnonymousTokenTest.php
@@ -22,8 +22,8 @@ public function testConstructor()
         $token = new AnonymousToken('foo', 'bar');
         $this->assertTrue($token->isAuthenticated());
 
-        $token = new AnonymousToken('foo', 'bar', array('ROLE_FOO'));
-        $this->assertEquals(array(new Role('ROLE_FOO')), $token->getRoles());
+        $token = new AnonymousToken('foo', 'bar', ['ROLE_FOO']);
+        $this->assertEquals([new Role('ROLE_FOO')], $token->getRoles());
     }
 
     public function testGetKey()
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/PreAuthenticatedTokenTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/PreAuthenticatedTokenTest.php
index 5b2b1c07e6643..7e64aa1a5d4e6 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/PreAuthenticatedTokenTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/PreAuthenticatedTokenTest.php
@@ -22,9 +22,9 @@ public function testConstructor()
         $token = new PreAuthenticatedToken('foo', 'bar', 'key');
         $this->assertFalse($token->isAuthenticated());
 
-        $token = new PreAuthenticatedToken('foo', 'bar', 'key', array('ROLE_FOO'));
+        $token = new PreAuthenticatedToken('foo', 'bar', 'key', ['ROLE_FOO']);
         $this->assertTrue($token->isAuthenticated());
-        $this->assertEquals(array(new Role('ROLE_FOO')), $token->getRoles());
+        $this->assertEquals([new Role('ROLE_FOO')], $token->getRoles());
         $this->assertEquals('key', $token->getProviderKey());
     }
 
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememberMeTokenTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememberMeTokenTest.php
index 1b233cd9daa43..0bdd54dc308bd 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememberMeTokenTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememberMeTokenTest.php
@@ -24,7 +24,7 @@ public function testConstructor()
 
         $this->assertEquals('fookey', $token->getProviderKey());
         $this->assertEquals('foo', $token->getSecret());
-        $this->assertEquals(array(new Role('ROLE_FOO')), $token->getRoles());
+        $this->assertEquals([new Role('ROLE_FOO')], $token->getRoles());
         $this->assertSame($user, $token->getUser());
         $this->assertTrue($token->isAuthenticated());
     }
@@ -53,7 +53,7 @@ public function testConstructorSecretCannotBeEmptyString()
         );
     }
 
-    protected function getUser($roles = array('ROLE_FOO'))
+    protected function getUser($roles = ['ROLE_FOO'])
     {
         $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
         $user
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/UsernamePasswordTokenTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/UsernamePasswordTokenTest.php
index 12897ab1d1149..87dceea3d8422 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/UsernamePasswordTokenTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/UsernamePasswordTokenTest.php
@@ -22,8 +22,8 @@ public function testConstructor()
         $token = new UsernamePasswordToken('foo', 'bar', 'key');
         $this->assertFalse($token->isAuthenticated());
 
-        $token = new UsernamePasswordToken('foo', 'bar', 'key', array('ROLE_FOO'));
-        $this->assertEquals(array(new Role('ROLE_FOO')), $token->getRoles());
+        $token = new UsernamePasswordToken('foo', 'bar', 'key', ['ROLE_FOO']);
+        $this->assertEquals([new Role('ROLE_FOO')], $token->getRoles());
         $this->assertTrue($token->isAuthenticated());
         $this->assertEquals('key', $token->getProviderKey());
     }
@@ -53,7 +53,7 @@ public function testEraseCredentials()
 
     public function testToString()
     {
-        $token = new UsernamePasswordToken('foo', '', 'foo', array('A', 'B'));
+        $token = new UsernamePasswordToken('foo', '', 'foo', ['A', 'B']);
         $this->assertEquals('UsernamePasswordToken(user="foo", authenticated=true, roles="A, B")', (string) $token);
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
index 61d85274fc383..bf861112254d6 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
@@ -25,7 +25,7 @@ class AccessDecisionManagerTest extends TestCase
      */
     public function testSetUnsupportedStrategy()
     {
-        new AccessDecisionManager(array($this->getVoter(VoterInterface::ACCESS_GRANTED)), 'fooBar');
+        new AccessDecisionManager([$this->getVoter(VoterInterface::ACCESS_GRANTED)], 'fooBar');
     }
 
     /**
@@ -36,7 +36,7 @@ public function testStrategies($strategy, $voters, $allowIfAllAbstainDecisions,
         $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
         $manager = new AccessDecisionManager($voters, $strategy, $allowIfAllAbstainDecisions, $allowIfEqualGrantedDeniedDecisions);
 
-        $this->assertSame($expected, $manager->decide($token, array('ROLE_FOO')));
+        $this->assertSame($expected, $manager->decide($token, ['ROLE_FOO']));
     }
 
     /**
@@ -44,27 +44,27 @@ public function testStrategies($strategy, $voters, $allowIfAllAbstainDecisions,
      */
     public function testStrategiesWith2Roles($token, $strategy, $voter, $expected)
     {
-        $manager = new AccessDecisionManager(array($voter), $strategy);
+        $manager = new AccessDecisionManager([$voter], $strategy);
 
-        $this->assertSame($expected, $manager->decide($token, array('ROLE_FOO', 'ROLE_BAR')));
+        $this->assertSame($expected, $manager->decide($token, ['ROLE_FOO', 'ROLE_BAR']));
     }
 
     public function getStrategiesWith2RolesTests()
     {
         $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
 
-        return array(
-            array($token, 'affirmative', $this->getVoter(VoterInterface::ACCESS_DENIED), false),
-            array($token, 'affirmative', $this->getVoter(VoterInterface::ACCESS_GRANTED), true),
+        return [
+            [$token, 'affirmative', $this->getVoter(VoterInterface::ACCESS_DENIED), false],
+            [$token, 'affirmative', $this->getVoter(VoterInterface::ACCESS_GRANTED), true],
 
-            array($token, 'consensus', $this->getVoter(VoterInterface::ACCESS_DENIED), false),
-            array($token, 'consensus', $this->getVoter(VoterInterface::ACCESS_GRANTED), true),
+            [$token, 'consensus', $this->getVoter(VoterInterface::ACCESS_DENIED), false],
+            [$token, 'consensus', $this->getVoter(VoterInterface::ACCESS_GRANTED), true],
 
-            array($token, 'unanimous', $this->getVoterFor2Roles($token, VoterInterface::ACCESS_DENIED, VoterInterface::ACCESS_DENIED), false),
-            array($token, 'unanimous', $this->getVoterFor2Roles($token, VoterInterface::ACCESS_DENIED, VoterInterface::ACCESS_GRANTED), false),
-            array($token, 'unanimous', $this->getVoterFor2Roles($token, VoterInterface::ACCESS_GRANTED, VoterInterface::ACCESS_DENIED), false),
-            array($token, 'unanimous', $this->getVoterFor2Roles($token, VoterInterface::ACCESS_GRANTED, VoterInterface::ACCESS_GRANTED), true),
-        );
+            [$token, 'unanimous', $this->getVoterFor2Roles($token, VoterInterface::ACCESS_DENIED, VoterInterface::ACCESS_DENIED), false],
+            [$token, 'unanimous', $this->getVoterFor2Roles($token, VoterInterface::ACCESS_DENIED, VoterInterface::ACCESS_GRANTED), false],
+            [$token, 'unanimous', $this->getVoterFor2Roles($token, VoterInterface::ACCESS_GRANTED, VoterInterface::ACCESS_DENIED), false],
+            [$token, 'unanimous', $this->getVoterFor2Roles($token, VoterInterface::ACCESS_GRANTED, VoterInterface::ACCESS_GRANTED), true],
+        ];
     }
 
     protected function getVoterFor2Roles($token, $vote1, $vote2)
@@ -72,10 +72,10 @@ protected function getVoterFor2Roles($token, $vote1, $vote2)
         $voter = $this->getMockBuilder('Symfony\Component\Security\Core\Authorization\Voter\VoterInterface')->getMock();
         $voter->expects($this->any())
               ->method('vote')
-              ->will($this->returnValueMap(array(
-                  array($token, null, array('ROLE_FOO'), $vote1),
-                  array($token, null, array('ROLE_BAR'), $vote2),
-              )))
+              ->will($this->returnValueMap([
+                  [$token, null, ['ROLE_FOO'], $vote1],
+                  [$token, null, ['ROLE_BAR'], $vote2],
+              ]))
         ;
 
         return $voter;
@@ -83,42 +83,42 @@ protected function getVoterFor2Roles($token, $vote1, $vote2)
 
     public function getStrategyTests()
     {
-        return array(
+        return [
             // affirmative
-            array(AccessDecisionManager::STRATEGY_AFFIRMATIVE, $this->getVoters(1, 0, 0), false, true, true),
-            array(AccessDecisionManager::STRATEGY_AFFIRMATIVE, $this->getVoters(1, 2, 0), false, true, true),
-            array(AccessDecisionManager::STRATEGY_AFFIRMATIVE, $this->getVoters(0, 1, 0), false, true, false),
-            array(AccessDecisionManager::STRATEGY_AFFIRMATIVE, $this->getVoters(0, 0, 1), false, true, false),
-            array(AccessDecisionManager::STRATEGY_AFFIRMATIVE, $this->getVoters(0, 0, 1), true, true, true),
+            [AccessDecisionManager::STRATEGY_AFFIRMATIVE, $this->getVoters(1, 0, 0), false, true, true],
+            [AccessDecisionManager::STRATEGY_AFFIRMATIVE, $this->getVoters(1, 2, 0), false, true, true],
+            [AccessDecisionManager::STRATEGY_AFFIRMATIVE, $this->getVoters(0, 1, 0), false, true, false],
+            [AccessDecisionManager::STRATEGY_AFFIRMATIVE, $this->getVoters(0, 0, 1), false, true, false],
+            [AccessDecisionManager::STRATEGY_AFFIRMATIVE, $this->getVoters(0, 0, 1), true, true, true],
 
             // consensus
-            array(AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(1, 0, 0), false, true, true),
-            array(AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(1, 2, 0), false, true, false),
-            array(AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(2, 1, 0), false, true, true),
+            [AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(1, 0, 0), false, true, true],
+            [AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(1, 2, 0), false, true, false],
+            [AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(2, 1, 0), false, true, true],
 
-            array(AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(0, 0, 1), false, true, false),
+            [AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(0, 0, 1), false, true, false],
 
-            array(AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(0, 0, 1), true, true, true),
+            [AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(0, 0, 1), true, true, true],
 
-            array(AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(2, 2, 0), false, true, true),
-            array(AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(2, 2, 1), false, true, true),
+            [AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(2, 2, 0), false, true, true],
+            [AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(2, 2, 1), false, true, true],
 
-            array(AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(2, 2, 0), false, false, false),
-            array(AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(2, 2, 1), false, false, false),
+            [AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(2, 2, 0), false, false, false],
+            [AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(2, 2, 1), false, false, false],
 
             // unanimous
-            array(AccessDecisionManager::STRATEGY_UNANIMOUS, $this->getVoters(1, 0, 0), false, true, true),
-            array(AccessDecisionManager::STRATEGY_UNANIMOUS, $this->getVoters(1, 0, 1), false, true, true),
-            array(AccessDecisionManager::STRATEGY_UNANIMOUS, $this->getVoters(1, 1, 0), false, true, false),
+            [AccessDecisionManager::STRATEGY_UNANIMOUS, $this->getVoters(1, 0, 0), false, true, true],
+            [AccessDecisionManager::STRATEGY_UNANIMOUS, $this->getVoters(1, 0, 1), false, true, true],
+            [AccessDecisionManager::STRATEGY_UNANIMOUS, $this->getVoters(1, 1, 0), false, true, false],
 
-            array(AccessDecisionManager::STRATEGY_UNANIMOUS, $this->getVoters(0, 0, 2), false, true, false),
-            array(AccessDecisionManager::STRATEGY_UNANIMOUS, $this->getVoters(0, 0, 2), true, true, true),
-        );
+            [AccessDecisionManager::STRATEGY_UNANIMOUS, $this->getVoters(0, 0, 2), false, true, false],
+            [AccessDecisionManager::STRATEGY_UNANIMOUS, $this->getVoters(0, 0, 2), true, true, true],
+        ];
     }
 
     protected function getVoters($grants, $denies, $abstains)
     {
-        $voters = array();
+        $voters = [];
         for ($i = 0; $i < $grants; ++$i) {
             $voters[] = $this->getVoter(VoterInterface::ACCESS_GRANTED);
         }
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/AuthorizationCheckerTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/AuthorizationCheckerTest.php
index e3e1c447af3cd..6a07c94f2039c 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authorization/AuthorizationCheckerTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authorization/AuthorizationCheckerTest.php
@@ -95,6 +95,6 @@ public function testIsGranted($decide)
 
     public function isGrantedProvider()
     {
-        return array(array(true), array(false));
+        return [[true], [false]];
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/ExpressionLanguageTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/ExpressionLanguageTest.php
index 873d9d57d17f3..5a4fa80d7bde6 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authorization/ExpressionLanguageTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authorization/ExpressionLanguageTest.php
@@ -41,7 +41,7 @@ public function testIsAuthenticated($token, $expression, $result, array $roles =
 
     public function provider()
     {
-        $roles = array('ROLE_USER', 'ROLE_ADMIN');
+        $roles = ['ROLE_USER', 'ROLE_ADMIN'];
         $user = new User('username', 'password', $roles);
 
         $noToken = null;
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/AuthenticatedVoterTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/AuthenticatedVoterTest.php
index 1ba7e39163ad1..6bbe07cfdc3c3 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/AuthenticatedVoterTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/AuthenticatedVoterTest.php
@@ -30,26 +30,26 @@ public function testVote($authenticated, $attributes, $expected)
 
     public function getVoteTests()
     {
-        return array(
-            array('fully', array(), VoterInterface::ACCESS_ABSTAIN),
-            array('fully', array('FOO'), VoterInterface::ACCESS_ABSTAIN),
-            array('remembered', array(), VoterInterface::ACCESS_ABSTAIN),
-            array('remembered', array('FOO'), VoterInterface::ACCESS_ABSTAIN),
-            array('anonymously', array(), VoterInterface::ACCESS_ABSTAIN),
-            array('anonymously', array('FOO'), VoterInterface::ACCESS_ABSTAIN),
+        return [
+            ['fully', [], VoterInterface::ACCESS_ABSTAIN],
+            ['fully', ['FOO'], VoterInterface::ACCESS_ABSTAIN],
+            ['remembered', [], VoterInterface::ACCESS_ABSTAIN],
+            ['remembered', ['FOO'], VoterInterface::ACCESS_ABSTAIN],
+            ['anonymously', [], VoterInterface::ACCESS_ABSTAIN],
+            ['anonymously', ['FOO'], VoterInterface::ACCESS_ABSTAIN],
 
-            array('fully', array('IS_AUTHENTICATED_ANONYMOUSLY'), VoterInterface::ACCESS_GRANTED),
-            array('remembered', array('IS_AUTHENTICATED_ANONYMOUSLY'), VoterInterface::ACCESS_GRANTED),
-            array('anonymously', array('IS_AUTHENTICATED_ANONYMOUSLY'), VoterInterface::ACCESS_GRANTED),
+            ['fully', ['IS_AUTHENTICATED_ANONYMOUSLY'], VoterInterface::ACCESS_GRANTED],
+            ['remembered', ['IS_AUTHENTICATED_ANONYMOUSLY'], VoterInterface::ACCESS_GRANTED],
+            ['anonymously', ['IS_AUTHENTICATED_ANONYMOUSLY'], VoterInterface::ACCESS_GRANTED],
 
-            array('fully', array('IS_AUTHENTICATED_REMEMBERED'), VoterInterface::ACCESS_GRANTED),
-            array('remembered', array('IS_AUTHENTICATED_REMEMBERED'), VoterInterface::ACCESS_GRANTED),
-            array('anonymously', array('IS_AUTHENTICATED_REMEMBERED'), VoterInterface::ACCESS_DENIED),
+            ['fully', ['IS_AUTHENTICATED_REMEMBERED'], VoterInterface::ACCESS_GRANTED],
+            ['remembered', ['IS_AUTHENTICATED_REMEMBERED'], VoterInterface::ACCESS_GRANTED],
+            ['anonymously', ['IS_AUTHENTICATED_REMEMBERED'], VoterInterface::ACCESS_DENIED],
 
-            array('fully', array('IS_AUTHENTICATED_FULLY'), VoterInterface::ACCESS_GRANTED),
-            array('remembered', array('IS_AUTHENTICATED_FULLY'), VoterInterface::ACCESS_DENIED),
-            array('anonymously', array('IS_AUTHENTICATED_FULLY'), VoterInterface::ACCESS_DENIED),
-        );
+            ['fully', ['IS_AUTHENTICATED_FULLY'], VoterInterface::ACCESS_GRANTED],
+            ['remembered', ['IS_AUTHENTICATED_FULLY'], VoterInterface::ACCESS_DENIED],
+            ['anonymously', ['IS_AUTHENTICATED_FULLY'], VoterInterface::ACCESS_DENIED],
+        ];
     }
 
     protected function getResolver()
@@ -65,9 +65,9 @@ protected function getToken($authenticated)
         if ('fully' === $authenticated) {
             return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
         } elseif ('remembered' === $authenticated) {
-            return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\RememberMeToken')->setMethods(array('setPersistent'))->disableOriginalConstructor()->getMock();
+            return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\RememberMeToken')->setMethods(['setPersistent'])->disableOriginalConstructor()->getMock();
         } else {
-            return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken')->setConstructorArgs(array('', ''))->getMock();
+            return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken')->setConstructorArgs(['', ''])->getMock();
         }
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/ExpressionVoterTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/ExpressionVoterTest.php
index 79626835264ab..7e435687c8c3c 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/ExpressionVoterTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/ExpressionVoterTest.php
@@ -30,15 +30,15 @@ public function testVote($roles, $attributes, $expected, $tokenExpectsGetRoles =
 
     public function getVoteTests()
     {
-        return array(
-            array(array(), array(), VoterInterface::ACCESS_ABSTAIN, false, false),
-            array(array(), array('FOO'), VoterInterface::ACCESS_ABSTAIN, false, false),
+        return [
+            [[], [], VoterInterface::ACCESS_ABSTAIN, false, false],
+            [[], ['FOO'], VoterInterface::ACCESS_ABSTAIN, false, false],
 
-            array(array(), array($this->createExpression()), VoterInterface::ACCESS_DENIED, true, false),
+            [[], [$this->createExpression()], VoterInterface::ACCESS_DENIED, true, false],
 
-            array(array('ROLE_FOO'), array($this->createExpression(), $this->createExpression()), VoterInterface::ACCESS_GRANTED),
-            array(array('ROLE_BAR', 'ROLE_FOO'), array($this->createExpression()), VoterInterface::ACCESS_GRANTED),
-        );
+            [['ROLE_FOO'], [$this->createExpression(), $this->createExpression()], VoterInterface::ACCESS_GRANTED],
+            [['ROLE_BAR', 'ROLE_FOO'], [$this->createExpression()], VoterInterface::ACCESS_GRANTED],
+        ];
     }
 
     protected function getToken(array $roles, $tokenExpectsGetRoles = true)
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/RoleHierarchyVoterTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/RoleHierarchyVoterTest.php
index 4b03bacd784a5..14705fbf960e5 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/RoleHierarchyVoterTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/RoleHierarchyVoterTest.php
@@ -22,16 +22,16 @@ class RoleHierarchyVoterTest extends RoleVoterTest
      */
     public function testVote($roles, $attributes, $expected)
     {
-        $voter = new RoleHierarchyVoter(new RoleHierarchy(array('ROLE_FOO' => array('ROLE_FOOBAR'))));
+        $voter = new RoleHierarchyVoter(new RoleHierarchy(['ROLE_FOO' => ['ROLE_FOOBAR']]));
 
         $this->assertSame($expected, $voter->vote($this->getToken($roles), null, $attributes));
     }
 
     public function getVoteTests()
     {
-        return array_merge(parent::getVoteTests(), array(
-            array(array('ROLE_FOO'), array('ROLE_FOOBAR'), VoterInterface::ACCESS_GRANTED),
-        ));
+        return array_merge(parent::getVoteTests(), [
+            [['ROLE_FOO'], ['ROLE_FOOBAR'], VoterInterface::ACCESS_GRANTED],
+        ]);
     }
 
     /**
@@ -39,7 +39,7 @@ public function getVoteTests()
      */
     public function testVoteWithEmptyHierarchy($roles, $attributes, $expected)
     {
-        $voter = new RoleHierarchyVoter(new RoleHierarchy(array()));
+        $voter = new RoleHierarchyVoter(new RoleHierarchy([]));
 
         $this->assertSame($expected, $voter->vote($this->getToken($roles), null, $attributes));
     }
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/RoleVoterTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/RoleVoterTest.php
index 242a2f5814f8e..5fb45e08b3925 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/RoleVoterTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/RoleVoterTest.php
@@ -30,20 +30,20 @@ public function testVote($roles, $attributes, $expected)
 
     public function getVoteTests()
     {
-        return array(
-            array(array(), array(), VoterInterface::ACCESS_ABSTAIN),
-            array(array(), array('FOO'), VoterInterface::ACCESS_ABSTAIN),
-            array(array(), array('ROLE_FOO'), VoterInterface::ACCESS_DENIED),
-            array(array('ROLE_FOO'), array('ROLE_FOO'), VoterInterface::ACCESS_GRANTED),
-            array(array('ROLE_FOO'), array('FOO', 'ROLE_FOO'), VoterInterface::ACCESS_GRANTED),
-            array(array('ROLE_BAR', 'ROLE_FOO'), array('ROLE_FOO'), VoterInterface::ACCESS_GRANTED),
+        return [
+            [[], [], VoterInterface::ACCESS_ABSTAIN],
+            [[], ['FOO'], VoterInterface::ACCESS_ABSTAIN],
+            [[], ['ROLE_FOO'], VoterInterface::ACCESS_DENIED],
+            [['ROLE_FOO'], ['ROLE_FOO'], VoterInterface::ACCESS_GRANTED],
+            [['ROLE_FOO'], ['FOO', 'ROLE_FOO'], VoterInterface::ACCESS_GRANTED],
+            [['ROLE_BAR', 'ROLE_FOO'], ['ROLE_FOO'], VoterInterface::ACCESS_GRANTED],
 
             // Test mixed Types
-            array(array(), array(array()), VoterInterface::ACCESS_ABSTAIN),
-            array(array(), array(new \stdClass()), VoterInterface::ACCESS_ABSTAIN),
-            array(array('ROLE_BAR'), array(new Role('ROLE_BAR')), VoterInterface::ACCESS_GRANTED),
-            array(array('ROLE_BAR'), array(new Role('ROLE_FOO')), VoterInterface::ACCESS_DENIED),
-        );
+            [[], [[]], VoterInterface::ACCESS_ABSTAIN],
+            [[], [new \stdClass()], VoterInterface::ACCESS_ABSTAIN],
+            [['ROLE_BAR'], [new Role('ROLE_BAR')], VoterInterface::ACCESS_GRANTED],
+            [['ROLE_BAR'], [new Role('ROLE_FOO')], VoterInterface::ACCESS_DENIED],
+        ];
     }
 
     protected function getToken(array $roles)
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/VoterTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/VoterTest.php
index f0e10cde1a28d..50dc84e435a90 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/VoterTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/VoterTest.php
@@ -27,23 +27,23 @@ protected function setUp()
 
     public function getTests()
     {
-        return array(
-            array(array('EDIT'), VoterInterface::ACCESS_GRANTED, new \stdClass(), 'ACCESS_GRANTED if attribute and class are supported and attribute grants access'),
-            array(array('CREATE'), VoterInterface::ACCESS_DENIED, new \stdClass(), 'ACCESS_DENIED if attribute and class are supported and attribute does not grant access'),
+        return [
+            [['EDIT'], VoterInterface::ACCESS_GRANTED, new \stdClass(), 'ACCESS_GRANTED if attribute and class are supported and attribute grants access'],
+            [['CREATE'], VoterInterface::ACCESS_DENIED, new \stdClass(), 'ACCESS_DENIED if attribute and class are supported and attribute does not grant access'],
 
-            array(array('DELETE', 'EDIT'), VoterInterface::ACCESS_GRANTED, new \stdClass(), 'ACCESS_GRANTED if one attribute is supported and grants access'),
-            array(array('DELETE', 'CREATE'), VoterInterface::ACCESS_DENIED, new \stdClass(), 'ACCESS_DENIED if one attribute is supported and denies access'),
+            [['DELETE', 'EDIT'], VoterInterface::ACCESS_GRANTED, new \stdClass(), 'ACCESS_GRANTED if one attribute is supported and grants access'],
+            [['DELETE', 'CREATE'], VoterInterface::ACCESS_DENIED, new \stdClass(), 'ACCESS_DENIED if one attribute is supported and denies access'],
 
-            array(array('CREATE', 'EDIT'), VoterInterface::ACCESS_GRANTED, new \stdClass(), 'ACCESS_GRANTED if one attribute grants access'),
+            [['CREATE', 'EDIT'], VoterInterface::ACCESS_GRANTED, new \stdClass(), 'ACCESS_GRANTED if one attribute grants access'],
 
-            array(array('DELETE'), VoterInterface::ACCESS_ABSTAIN, new \stdClass(), 'ACCESS_ABSTAIN if no attribute is supported'),
+            [['DELETE'], VoterInterface::ACCESS_ABSTAIN, new \stdClass(), 'ACCESS_ABSTAIN if no attribute is supported'],
 
-            array(array('EDIT'), VoterInterface::ACCESS_ABSTAIN, $this, 'ACCESS_ABSTAIN if class is not supported'),
+            [['EDIT'], VoterInterface::ACCESS_ABSTAIN, $this, 'ACCESS_ABSTAIN if class is not supported'],
 
-            array(array('EDIT'), VoterInterface::ACCESS_ABSTAIN, null, 'ACCESS_ABSTAIN if object is null'),
+            [['EDIT'], VoterInterface::ACCESS_ABSTAIN, null, 'ACCESS_ABSTAIN if object is null'],
 
-            array(array(), VoterInterface::ACCESS_ABSTAIN, new \stdClass(), 'ACCESS_ABSTAIN if no attributes were provided'),
-        );
+            [[], VoterInterface::ACCESS_ABSTAIN, new \stdClass(), 'ACCESS_ABSTAIN if no attributes were provided'],
+        ];
     }
 
     /**
@@ -66,6 +66,6 @@ protected function voteOnAttribute($attribute, $object, TokenInterface $token)
 
     protected function supports($attribute, $object)
     {
-        return $object instanceof \stdClass && \in_array($attribute, array('EDIT', 'CREATE'));
+        return $object instanceof \stdClass && \in_array($attribute, ['EDIT', 'CREATE']);
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Tests/Encoder/BCryptPasswordEncoderTest.php b/src/Symfony/Component/Security/Core/Tests/Encoder/BCryptPasswordEncoderTest.php
index 55590ffc3d0a1..7f9dbe7f33fd8 100644
--- a/src/Symfony/Component/Security/Core/Tests/Encoder/BCryptPasswordEncoderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Encoder/BCryptPasswordEncoderTest.php
@@ -49,7 +49,7 @@ public function testCostInRange($cost)
     public function validRangeData()
     {
         $costs = range(4, 31);
-        array_walk($costs, function (&$cost) { $cost = array($cost); });
+        array_walk($costs, function (&$cost) { $cost = [$cost]; });
 
         return $costs;
     }
diff --git a/src/Symfony/Component/Security/Core/Tests/Encoder/BasePasswordEncoderTest.php b/src/Symfony/Component/Security/Core/Tests/Encoder/BasePasswordEncoderTest.php
index 0742f421df564..2251cfdf906e0 100644
--- a/src/Symfony/Component/Security/Core/Tests/Encoder/BasePasswordEncoderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Encoder/BasePasswordEncoderTest.php
@@ -35,9 +35,9 @@ public function testComparePassword()
 
     public function testDemergePasswordAndSalt()
     {
-        $this->assertEquals(array('password', 'salt'), $this->invokeDemergePasswordAndSalt('password{salt}'));
-        $this->assertEquals(array('password', ''), $this->invokeDemergePasswordAndSalt('password'));
-        $this->assertEquals(array('', ''), $this->invokeDemergePasswordAndSalt(''));
+        $this->assertEquals(['password', 'salt'], $this->invokeDemergePasswordAndSalt('password{salt}'));
+        $this->assertEquals(['password', ''], $this->invokeDemergePasswordAndSalt('password'));
+        $this->assertEquals(['', ''], $this->invokeDemergePasswordAndSalt(''));
     }
 
     public function testMergePasswordAndSalt()
diff --git a/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php b/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php
index 9a56b838aae3f..ae8467af57530 100644
--- a/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php
@@ -22,10 +22,10 @@ class EncoderFactoryTest extends TestCase
 {
     public function testGetEncoderWithMessageDigestEncoder()
     {
-        $factory = new EncoderFactory(array('Symfony\Component\Security\Core\User\UserInterface' => array(
+        $factory = new EncoderFactory(['Symfony\Component\Security\Core\User\UserInterface' => [
             'class' => 'Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder',
-            'arguments' => array('sha512', true, 5),
-        )));
+            'arguments' => ['sha512', true, 5],
+        ]]);
 
         $encoder = $factory->getEncoder($this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock());
         $expectedEncoder = new MessageDigestPasswordEncoder('sha512', true, 5);
@@ -35,9 +35,9 @@ public function testGetEncoderWithMessageDigestEncoder()
 
     public function testGetEncoderWithService()
     {
-        $factory = new EncoderFactory(array(
+        $factory = new EncoderFactory([
             'Symfony\Component\Security\Core\User\UserInterface' => new MessageDigestPasswordEncoder('sha1'),
-        ));
+        ]);
 
         $encoder = $factory->getEncoder($this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock());
         $expectedEncoder = new MessageDigestPasswordEncoder('sha1');
@@ -50,9 +50,9 @@ public function testGetEncoderWithService()
 
     public function testGetEncoderWithClassName()
     {
-        $factory = new EncoderFactory(array(
+        $factory = new EncoderFactory([
             'Symfony\Component\Security\Core\User\UserInterface' => new MessageDigestPasswordEncoder('sha1'),
-        ));
+        ]);
 
         $encoder = $factory->getEncoder('Symfony\Component\Security\Core\Tests\Encoder\SomeChildUser');
         $expectedEncoder = new MessageDigestPasswordEncoder('sha1');
@@ -61,9 +61,9 @@ public function testGetEncoderWithClassName()
 
     public function testGetEncoderConfiguredForConcreteClassWithService()
     {
-        $factory = new EncoderFactory(array(
+        $factory = new EncoderFactory([
             'Symfony\Component\Security\Core\User\User' => new MessageDigestPasswordEncoder('sha1'),
-        ));
+        ]);
 
         $encoder = $factory->getEncoder(new User('user', 'pass'));
         $expectedEncoder = new MessageDigestPasswordEncoder('sha1');
@@ -72,9 +72,9 @@ public function testGetEncoderConfiguredForConcreteClassWithService()
 
     public function testGetEncoderConfiguredForConcreteClassWithClassName()
     {
-        $factory = new EncoderFactory(array(
+        $factory = new EncoderFactory([
             'Symfony\Component\Security\Core\Tests\Encoder\SomeUser' => new MessageDigestPasswordEncoder('sha1'),
-        ));
+        ]);
 
         $encoder = $factory->getEncoder('Symfony\Component\Security\Core\Tests\Encoder\SomeChildUser');
         $expectedEncoder = new MessageDigestPasswordEncoder('sha1');
@@ -83,10 +83,10 @@ public function testGetEncoderConfiguredForConcreteClassWithClassName()
 
     public function testGetNamedEncoderForEncoderAware()
     {
-        $factory = new EncoderFactory(array(
+        $factory = new EncoderFactory([
             'Symfony\Component\Security\Core\Tests\Encoder\EncAwareUser' => new MessageDigestPasswordEncoder('sha256'),
             'encoder_name' => new MessageDigestPasswordEncoder('sha1'),
-        ));
+        ]);
 
         $encoder = $factory->getEncoder(new EncAwareUser('user', 'pass'));
         $expectedEncoder = new MessageDigestPasswordEncoder('sha1');
@@ -95,10 +95,10 @@ public function testGetNamedEncoderForEncoderAware()
 
     public function testGetNullNamedEncoderForEncoderAware()
     {
-        $factory = new EncoderFactory(array(
+        $factory = new EncoderFactory([
             'Symfony\Component\Security\Core\Tests\Encoder\EncAwareUser' => new MessageDigestPasswordEncoder('sha1'),
             'encoder_name' => new MessageDigestPasswordEncoder('sha256'),
-        ));
+        ]);
 
         $user = new EncAwareUser('user', 'pass');
         $user->encoderName = null;
@@ -112,10 +112,10 @@ public function testGetNullNamedEncoderForEncoderAware()
      */
     public function testGetInvalidNamedEncoderForEncoderAware()
     {
-        $factory = new EncoderFactory(array(
+        $factory = new EncoderFactory([
             'Symfony\Component\Security\Core\Tests\Encoder\EncAwareUser' => new MessageDigestPasswordEncoder('sha1'),
             'encoder_name' => new MessageDigestPasswordEncoder('sha256'),
-        ));
+        ]);
 
         $user = new EncAwareUser('user', 'pass');
         $user->encoderName = 'invalid_encoder_name';
@@ -124,10 +124,10 @@ public function testGetInvalidNamedEncoderForEncoderAware()
 
     public function testGetEncoderForEncoderAwareWithClassName()
     {
-        $factory = new EncoderFactory(array(
+        $factory = new EncoderFactory([
             'Symfony\Component\Security\Core\Tests\Encoder\EncAwareUser' => new MessageDigestPasswordEncoder('sha1'),
             'encoder_name' => new MessageDigestPasswordEncoder('sha256'),
-        ));
+        ]);
 
         $encoder = $factory->getEncoder('Symfony\Component\Security\Core\Tests\Encoder\EncAwareUser');
         $expectedEncoder = new MessageDigestPasswordEncoder('sha1');
diff --git a/src/Symfony/Component/Security/Core/Tests/Exception/CustomUserMessageAuthenticationExceptionTest.php b/src/Symfony/Component/Security/Core/Tests/Exception/CustomUserMessageAuthenticationExceptionTest.php
index 5776a991011a0..ebf94384c0daa 100644
--- a/src/Symfony/Component/Security/Core/Tests/Exception/CustomUserMessageAuthenticationExceptionTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Exception/CustomUserMessageAuthenticationExceptionTest.php
@@ -18,10 +18,10 @@ class CustomUserMessageAuthenticationExceptionTest extends TestCase
 {
     public function testConstructWithSAfeMessage()
     {
-        $e = new CustomUserMessageAuthenticationException('SAFE MESSAGE', array('foo' => true));
+        $e = new CustomUserMessageAuthenticationException('SAFE MESSAGE', ['foo' => true]);
 
         $this->assertEquals('SAFE MESSAGE', $e->getMessageKey());
-        $this->assertEquals(array('foo' => true), $e->getMessageData());
+        $this->assertEquals(['foo' => true], $e->getMessageData());
         $this->assertEquals('SAFE MESSAGE', $e->getMessage());
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Tests/Exception/UsernameNotFoundExceptionTest.php b/src/Symfony/Component/Security/Core/Tests/Exception/UsernameNotFoundExceptionTest.php
index b7e5c556d75ae..8e256aac2ea11 100644
--- a/src/Symfony/Component/Security/Core/Tests/Exception/UsernameNotFoundExceptionTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Exception/UsernameNotFoundExceptionTest.php
@@ -19,8 +19,8 @@ class UsernameNotFoundExceptionTest extends TestCase
     public function testGetMessageData()
     {
         $exception = new UsernameNotFoundException('Username could not be found.');
-        $this->assertEquals(array('{{ username }}' => null), $exception->getMessageData());
+        $this->assertEquals(['{{ username }}' => null], $exception->getMessageData());
         $exception->setUsername('username');
-        $this->assertEquals(array('{{ username }}' => 'username'), $exception->getMessageData());
+        $this->assertEquals(['{{ username }}' => 'username'], $exception->getMessageData());
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Tests/Role/RoleHierarchyTest.php b/src/Symfony/Component/Security/Core/Tests/Role/RoleHierarchyTest.php
index 9e6b9d3a2b263..4451f391adb30 100644
--- a/src/Symfony/Component/Security/Core/Tests/Role/RoleHierarchyTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Role/RoleHierarchyTest.php
@@ -19,15 +19,15 @@ class RoleHierarchyTest extends TestCase
 {
     public function testGetReachableRoles()
     {
-        $role = new RoleHierarchy(array(
-            'ROLE_ADMIN' => array('ROLE_USER'),
-            'ROLE_SUPER_ADMIN' => array('ROLE_ADMIN', 'ROLE_FOO'),
-        ));
+        $role = new RoleHierarchy([
+            'ROLE_ADMIN' => ['ROLE_USER'],
+            'ROLE_SUPER_ADMIN' => ['ROLE_ADMIN', 'ROLE_FOO'],
+        ]);
 
-        $this->assertEquals(array(new Role('ROLE_USER')), $role->getReachableRoles(array(new Role('ROLE_USER'))));
-        $this->assertEquals(array(new Role('ROLE_FOO')), $role->getReachableRoles(array(new Role('ROLE_FOO'))));
-        $this->assertEquals(array(new Role('ROLE_ADMIN'), new Role('ROLE_USER')), $role->getReachableRoles(array(new Role('ROLE_ADMIN'))));
-        $this->assertEquals(array(new Role('ROLE_FOO'), new Role('ROLE_ADMIN'), new Role('ROLE_USER')), $role->getReachableRoles(array(new Role('ROLE_FOO'), new Role('ROLE_ADMIN'))));
-        $this->assertEquals(array(new Role('ROLE_SUPER_ADMIN'), new Role('ROLE_ADMIN'), new Role('ROLE_FOO'), new Role('ROLE_USER')), $role->getReachableRoles(array(new Role('ROLE_SUPER_ADMIN'))));
+        $this->assertEquals([new Role('ROLE_USER')], $role->getReachableRoles([new Role('ROLE_USER')]));
+        $this->assertEquals([new Role('ROLE_FOO')], $role->getReachableRoles([new Role('ROLE_FOO')]));
+        $this->assertEquals([new Role('ROLE_ADMIN'), new Role('ROLE_USER')], $role->getReachableRoles([new Role('ROLE_ADMIN')]));
+        $this->assertEquals([new Role('ROLE_FOO'), new Role('ROLE_ADMIN'), new Role('ROLE_USER')], $role->getReachableRoles([new Role('ROLE_FOO'), new Role('ROLE_ADMIN')]));
+        $this->assertEquals([new Role('ROLE_SUPER_ADMIN'), new Role('ROLE_ADMIN'), new Role('ROLE_FOO'), new Role('ROLE_USER')], $role->getReachableRoles([new Role('ROLE_SUPER_ADMIN')]));
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php b/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php
index 375927356422e..8baab88c829a5 100644
--- a/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php
@@ -36,7 +36,7 @@ public function testLoadUserByUsername()
             ->will($this->returnValue($account = $this->getAccount()))
         ;
 
-        $provider = new ChainUserProvider(array($provider1, $provider2));
+        $provider = new ChainUserProvider([$provider1, $provider2]);
         $this->assertSame($account, $provider->loadUserByUsername('foo'));
     }
 
@@ -61,7 +61,7 @@ public function testLoadUserByUsernameThrowsUsernameNotFoundException()
             ->will($this->throwException(new UsernameNotFoundException('not found')))
         ;
 
-        $provider = new ChainUserProvider(array($provider1, $provider2));
+        $provider = new ChainUserProvider([$provider1, $provider2]);
         $provider->loadUserByUsername('foo');
     }
 
@@ -81,7 +81,7 @@ public function testRefreshUser()
             ->will($this->returnValue($account = $this->getAccount()))
         ;
 
-        $provider = new ChainUserProvider(array($provider1, $provider2));
+        $provider = new ChainUserProvider([$provider1, $provider2]);
         $this->assertSame($account, $provider->refreshUser($this->getAccount()));
     }
 
@@ -101,7 +101,7 @@ public function testRefreshUserAgain()
             ->will($this->returnValue($account = $this->getAccount()))
         ;
 
-        $provider = new ChainUserProvider(array($provider1, $provider2));
+        $provider = new ChainUserProvider([$provider1, $provider2]);
         $this->assertSame($account, $provider->refreshUser($this->getAccount()));
     }
 
@@ -124,7 +124,7 @@ public function testRefreshUserThrowsUnsupportedUserException()
             ->will($this->throwException(new UnsupportedUserException('unsupported')))
         ;
 
-        $provider = new ChainUserProvider(array($provider1, $provider2));
+        $provider = new ChainUserProvider([$provider1, $provider2]);
         $provider->refreshUser($this->getAccount());
     }
 
@@ -146,7 +146,7 @@ public function testSupportsClass()
             ->will($this->returnValue(true))
         ;
 
-        $provider = new ChainUserProvider(array($provider1, $provider2));
+        $provider = new ChainUserProvider([$provider1, $provider2]);
         $this->assertTrue($provider->supportsClass('foo'));
     }
 
@@ -168,7 +168,7 @@ public function testSupportsClassWhenNotSupported()
             ->will($this->returnValue(false))
         ;
 
-        $provider = new ChainUserProvider(array($provider1, $provider2));
+        $provider = new ChainUserProvider([$provider1, $provider2]);
         $this->assertFalse($provider->supportsClass('foo'));
     }
 
@@ -188,7 +188,7 @@ public function testAcceptsTraversable()
             ->will($this->returnValue($account = $this->getAccount()))
         ;
 
-        $provider = new ChainUserProvider(new \ArrayObject(array($provider1, $provider2)));
+        $provider = new ChainUserProvider(new \ArrayObject([$provider1, $provider2]));
         $this->assertSame($account, $provider->refreshUser($this->getAccount()));
     }
 
diff --git a/src/Symfony/Component/Security/Core/Tests/User/InMemoryUserProviderTest.php b/src/Symfony/Component/Security/Core/Tests/User/InMemoryUserProviderTest.php
index 6647a76a1286c..b1ff3b66e17e7 100644
--- a/src/Symfony/Component/Security/Core/Tests/User/InMemoryUserProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/User/InMemoryUserProviderTest.php
@@ -23,7 +23,7 @@ public function testConstructor()
 
         $user = $provider->loadUserByUsername('fabien');
         $this->assertEquals('foo', $user->getPassword());
-        $this->assertEquals(array('ROLE_USER'), $user->getRoles());
+        $this->assertEquals(['ROLE_USER'], $user->getRoles());
         $this->assertFalse($user->isEnabled());
     }
 
@@ -35,7 +35,7 @@ public function testRefresh()
 
         $refreshedUser = $provider->refreshUser($user);
         $this->assertEquals('foo', $refreshedUser->getPassword());
-        $this->assertEquals(array('ROLE_USER'), $refreshedUser->getRoles());
+        $this->assertEquals(['ROLE_USER'], $refreshedUser->getRoles());
         $this->assertFalse($refreshedUser->isEnabled());
         $this->assertFalse($refreshedUser->isCredentialsNonExpired());
     }
@@ -45,13 +45,13 @@ public function testRefresh()
      */
     protected function createProvider()
     {
-        return new InMemoryUserProvider(array(
-            'fabien' => array(
+        return new InMemoryUserProvider([
+            'fabien' => [
                 'password' => 'foo',
                 'enabled' => false,
-                'roles' => array('ROLE_USER'),
-            ),
-        ));
+                'roles' => ['ROLE_USER'],
+            ],
+        ]);
     }
 
     public function testCreateUser()
diff --git a/src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php b/src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php
index 7d1da7c408e34..148dfe02cf84f 100644
--- a/src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php
@@ -123,10 +123,10 @@ public function testLoadUserByUsernameFailsIfMoreThanOneLdapPasswordsInEntry()
             ->expects($this->once())
             ->method('offsetGet')
             ->with(0)
-            ->will($this->returnValue(new Entry('foo', array(
-                    'sAMAccountName' => array('foo'),
-                    'userpassword' => array('bar', 'baz'),
-                )
+            ->will($this->returnValue(new Entry('foo', [
+                    'sAMAccountName' => ['foo'],
+                    'userpassword' => ['bar', 'baz'],
+                ]
             )))
         ;
         $result
@@ -145,7 +145,7 @@ public function testLoadUserByUsernameFailsIfMoreThanOneLdapPasswordsInEntry()
             ->will($this->returnValue($query))
         ;
 
-        $provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com', null, null, array(), 'sAMAccountName', '({uid_key}={username})', 'userpassword');
+        $provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com', null, null, [], 'sAMAccountName', '({uid_key}={username})', 'userpassword');
         $this->assertInstanceOf(
             'Symfony\Component\Security\Core\User\User',
             $provider->loadUserByUsername('foo')
@@ -166,7 +166,7 @@ public function testLoadUserByUsernameShouldNotFailIfEntryHasNoUidKeyAttribute()
             ->expects($this->once())
             ->method('offsetGet')
             ->with(0)
-            ->will($this->returnValue(new Entry('foo', array())))
+            ->will($this->returnValue(new Entry('foo', [])))
         ;
         $result
             ->expects($this->once())
@@ -184,7 +184,7 @@ public function testLoadUserByUsernameShouldNotFailIfEntryHasNoUidKeyAttribute()
             ->will($this->returnValue($query))
         ;
 
-        $provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com', null, null, array(), 'sAMAccountName', '({uid_key}={username})');
+        $provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com', null, null, [], 'sAMAccountName', '({uid_key}={username})');
         $this->assertInstanceOf(
             'Symfony\Component\Security\Core\User\User',
             $provider->loadUserByUsername('foo')
@@ -208,9 +208,9 @@ public function testLoadUserByUsernameFailsIfEntryHasNoPasswordAttribute()
             ->expects($this->once())
             ->method('offsetGet')
             ->with(0)
-            ->will($this->returnValue(new Entry('foo', array(
-                    'sAMAccountName' => array('foo'),
-                )
+            ->will($this->returnValue(new Entry('foo', [
+                    'sAMAccountName' => ['foo'],
+                ]
             )))
         ;
         $result
@@ -229,7 +229,7 @@ public function testLoadUserByUsernameFailsIfEntryHasNoPasswordAttribute()
             ->will($this->returnValue($query))
         ;
 
-        $provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com', null, null, array(), 'sAMAccountName', '({uid_key}={username})', 'userpassword');
+        $provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com', null, null, [], 'sAMAccountName', '({uid_key}={username})', 'userpassword');
         $this->assertInstanceOf(
             'Symfony\Component\Security\Core\User\User',
             $provider->loadUserByUsername('foo')
@@ -250,9 +250,9 @@ public function testLoadUserByUsernameIsSuccessfulWithoutPasswordAttribute()
             ->expects($this->once())
             ->method('offsetGet')
             ->with(0)
-            ->will($this->returnValue(new Entry('foo', array(
-                    'sAMAccountName' => array('foo'),
-                )
+            ->will($this->returnValue(new Entry('foo', [
+                    'sAMAccountName' => ['foo'],
+                ]
             )))
         ;
         $result
@@ -292,9 +292,9 @@ public function testLoadUserByUsernameIsSuccessfulWithoutPasswordAttributeAndWro
             ->expects($this->once())
             ->method('offsetGet')
             ->with(0)
-            ->will($this->returnValue(new Entry('foo', array(
-                    'sAMAccountName' => array('foo'),
-                )
+            ->will($this->returnValue(new Entry('foo', [
+                    'sAMAccountName' => ['foo'],
+                ]
             )))
         ;
         $result
@@ -331,10 +331,10 @@ public function testLoadUserByUsernameIsSuccessfulWithPasswordAttribute()
             ->expects($this->once())
             ->method('offsetGet')
             ->with(0)
-            ->will($this->returnValue(new Entry('foo', array(
-                    'sAMAccountName' => array('foo'),
-                    'userpassword' => array('bar'),
-                )
+            ->will($this->returnValue(new Entry('foo', [
+                    'sAMAccountName' => ['foo'],
+                    'userpassword' => ['bar'],
+                ]
             )))
         ;
         $result
@@ -353,7 +353,7 @@ public function testLoadUserByUsernameIsSuccessfulWithPasswordAttribute()
             ->will($this->returnValue($query))
         ;
 
-        $provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com', null, null, array(), 'sAMAccountName', '({uid_key}={username})', 'userpassword');
+        $provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com', null, null, [], 'sAMAccountName', '({uid_key}={username})', 'userpassword');
         $this->assertInstanceOf(
             'Symfony\Component\Security\Core\User\User',
             $provider->loadUserByUsername('foo')
diff --git a/src/Symfony/Component/Security/Core/Tests/User/UserTest.php b/src/Symfony/Component/Security/Core/Tests/User/UserTest.php
index fa9f33107d90c..9a8d65d537caf 100644
--- a/src/Symfony/Component/Security/Core/Tests/User/UserTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/User/UserTest.php
@@ -27,10 +27,10 @@ public function testConstructorException()
     public function testGetRoles()
     {
         $user = new User('fabien', 'superpass');
-        $this->assertEquals(array(), $user->getRoles());
+        $this->assertEquals([], $user->getRoles());
 
-        $user = new User('fabien', 'superpass', array('ROLE_ADMIN'));
-        $this->assertEquals(array('ROLE_ADMIN'), $user->getRoles());
+        $user = new User('fabien', 'superpass', ['ROLE_ADMIN']);
+        $this->assertEquals(['ROLE_ADMIN'], $user->getRoles());
     }
 
     public function testGetPassword()
@@ -56,7 +56,7 @@ public function testIsAccountNonExpired()
         $user = new User('fabien', 'superpass');
         $this->assertTrue($user->isAccountNonExpired());
 
-        $user = new User('fabien', 'superpass', array(), true, false);
+        $user = new User('fabien', 'superpass', [], true, false);
         $this->assertFalse($user->isAccountNonExpired());
     }
 
@@ -65,7 +65,7 @@ public function testIsCredentialsNonExpired()
         $user = new User('fabien', 'superpass');
         $this->assertTrue($user->isCredentialsNonExpired());
 
-        $user = new User('fabien', 'superpass', array(), true, true, false);
+        $user = new User('fabien', 'superpass', [], true, true, false);
         $this->assertFalse($user->isCredentialsNonExpired());
     }
 
@@ -74,7 +74,7 @@ public function testIsAccountNonLocked()
         $user = new User('fabien', 'superpass');
         $this->assertTrue($user->isAccountNonLocked());
 
-        $user = new User('fabien', 'superpass', array(), true, true, true, false);
+        $user = new User('fabien', 'superpass', [], true, true, true, false);
         $this->assertFalse($user->isAccountNonLocked());
     }
 
@@ -83,7 +83,7 @@ public function testIsEnabled()
         $user = new User('fabien', 'superpass');
         $this->assertTrue($user->isEnabled());
 
-        $user = new User('fabien', 'superpass', array(), false);
+        $user = new User('fabien', 'superpass', [], false);
         $this->assertFalse($user->isEnabled());
     }
 
diff --git a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
index 22bed799fb5d0..24c2c7adda187 100644
--- a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
@@ -58,9 +58,9 @@ protected function setUp()
 
     public function testPasswordIsValid()
     {
-        $constraint = new UserPassword(array(
+        $constraint = new UserPassword([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->encoder->expects($this->once())
             ->method('isPasswordValid')
@@ -74,9 +74,9 @@ public function testPasswordIsValid()
 
     public function testPasswordIsNotValid()
     {
-        $constraint = new UserPassword(array(
+        $constraint = new UserPassword([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->encoder->expects($this->once())
             ->method('isPasswordValid')
@@ -94,9 +94,9 @@ public function testPasswordIsNotValid()
      */
     public function testEmptyPasswordsAreNotValid($password)
     {
-        $constraint = new UserPassword(array(
+        $constraint = new UserPassword([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($password, $constraint);
 
@@ -106,10 +106,10 @@ public function testEmptyPasswordsAreNotValid($password)
 
     public function emptyPasswordData()
     {
-        return array(
-            array(null),
-            array(''),
-        );
+        return [
+            [null],
+            [''],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
index 199d95f90c8d6..a5ad3f10f59e6 100644
--- a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
+++ b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
@@ -32,12 +32,12 @@ class InMemoryUserProvider implements UserProviderInterface
      *
      * @param array $users An array of users
      */
-    public function __construct(array $users = array())
+    public function __construct(array $users = [])
     {
         foreach ($users as $username => $attributes) {
             $password = isset($attributes['password']) ? $attributes['password'] : null;
             $enabled = isset($attributes['enabled']) ? $attributes['enabled'] : true;
-            $roles = isset($attributes['roles']) ? $attributes['roles'] : array();
+            $roles = isset($attributes['roles']) ? $attributes['roles'] : [];
             $user = new User($username, $password, $roles, $enabled, true, true, true);
 
             $this->createUser($user);
diff --git a/src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php b/src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php
index 2ec282144cfe3..b954fc037b907 100644
--- a/src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php
+++ b/src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php
@@ -163,7 +163,7 @@ public function testNamespaced()
         $storage = $this->getMockBuilder('Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface')->getMock();
 
         $requestStack = new RequestStack();
-        $requestStack->push(new Request(array(), array(), array(), array(), array(), array('HTTPS' => 'on')));
+        $requestStack->push(new Request([], [], [], [], [], ['HTTPS' => 'on']));
 
         $manager = new CsrfTokenManager($generator, $storage, null, $requestStack);
 
@@ -173,41 +173,41 @@ public function testNamespaced()
 
     public function getManagerGeneratorAndStorage()
     {
-        $data = array();
+        $data = [];
 
         list($generator, $storage) = $this->getGeneratorAndStorage();
-        $data[] = array('', new CsrfTokenManager($generator, $storage, ''), $storage, $generator);
+        $data[] = ['', new CsrfTokenManager($generator, $storage, ''), $storage, $generator];
 
         list($generator, $storage) = $this->getGeneratorAndStorage();
-        $data[] = array('https-', new CsrfTokenManager($generator, $storage), $storage, $generator);
+        $data[] = ['https-', new CsrfTokenManager($generator, $storage), $storage, $generator];
 
         list($generator, $storage) = $this->getGeneratorAndStorage();
-        $data[] = array('aNamespace-', new CsrfTokenManager($generator, $storage, 'aNamespace-'), $storage, $generator);
+        $data[] = ['aNamespace-', new CsrfTokenManager($generator, $storage, 'aNamespace-'), $storage, $generator];
 
         $requestStack = new RequestStack();
-        $requestStack->push(new Request(array(), array(), array(), array(), array(), array('HTTPS' => 'on')));
+        $requestStack->push(new Request([], [], [], [], [], ['HTTPS' => 'on']));
         list($generator, $storage) = $this->getGeneratorAndStorage();
-        $data[] = array('https-', new CsrfTokenManager($generator, $storage, $requestStack), $storage, $generator);
+        $data[] = ['https-', new CsrfTokenManager($generator, $storage, $requestStack), $storage, $generator];
 
         list($generator, $storage) = $this->getGeneratorAndStorage();
-        $data[] = array('generated-', new CsrfTokenManager($generator, $storage, function () {
+        $data[] = ['generated-', new CsrfTokenManager($generator, $storage, function () {
             return 'generated-';
-        }), $storage, $generator);
+        }), $storage, $generator];
 
         $requestStack = new RequestStack();
         $requestStack->push(new Request());
         list($generator, $storage) = $this->getGeneratorAndStorage();
-        $data[] = array('', new CsrfTokenManager($generator, $storage, $requestStack), $storage, $generator);
+        $data[] = ['', new CsrfTokenManager($generator, $storage, $requestStack), $storage, $generator];
 
         return $data;
     }
 
     private function getGeneratorAndStorage()
     {
-        return array(
+        return [
             $this->getMockBuilder('Symfony\Component\Security\Csrf\TokenGenerator\TokenGeneratorInterface')->getMock(),
             $this->getMockBuilder('Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface')->getMock(),
-        );
+        ];
     }
 
     protected function setUp()
diff --git a/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php b/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
index c8d31093ceff2..86fb6e6b9cac6 100644
--- a/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
+++ b/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
@@ -31,7 +31,7 @@ class NativeSessionTokenStorageTest extends TestCase
 
     protected function setUp()
     {
-        $_SESSION = array();
+        $_SESSION = [];
 
         $this->storage = new NativeSessionTokenStorage(self::SESSION_NAMESPACE);
     }
@@ -40,7 +40,7 @@ public function testStoreTokenInClosedSession()
     {
         $this->storage->setToken('token_id', 'TOKEN');
 
-        $this->assertSame(array(self::SESSION_NAMESPACE => array('token_id' => 'TOKEN')), $_SESSION);
+        $this->assertSame([self::SESSION_NAMESPACE => ['token_id' => 'TOKEN']], $_SESSION);
     }
 
     public function testStoreTokenInClosedSessionWithExistingSessionId()
@@ -52,7 +52,7 @@ public function testStoreTokenInClosedSessionWithExistingSessionId()
         $this->storage->setToken('token_id', 'TOKEN');
 
         $this->assertSame(PHP_SESSION_ACTIVE, session_status());
-        $this->assertSame(array(self::SESSION_NAMESPACE => array('token_id' => 'TOKEN')), $_SESSION);
+        $this->assertSame([self::SESSION_NAMESPACE => ['token_id' => 'TOKEN']], $_SESSION);
     }
 
     public function testStoreTokenInActiveSession()
@@ -61,7 +61,7 @@ public function testStoreTokenInActiveSession()
 
         $this->storage->setToken('token_id', 'TOKEN');
 
-        $this->assertSame(array(self::SESSION_NAMESPACE => array('token_id' => 'TOKEN')), $_SESSION);
+        $this->assertSame([self::SESSION_NAMESPACE => ['token_id' => 'TOKEN']], $_SESSION);
     }
 
     /**
diff --git a/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php b/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php
index 2df09577bf0a6..2975138de51b3 100644
--- a/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php
@@ -67,7 +67,7 @@ public function __construct(GuardAuthenticatorHandler $guardHandler, Authenticat
     public function handle(GetResponseEvent $event)
     {
         if (null !== $this->logger) {
-            $context = array('firewall_key' => $this->providerKey);
+            $context = ['firewall_key' => $this->providerKey];
 
             if ($this->guardAuthenticators instanceof \Countable || \is_array($this->guardAuthenticators)) {
                 $context['authenticators'] = \count($this->guardAuthenticators);
@@ -85,7 +85,7 @@ public function handle(GetResponseEvent $event)
 
             if ($event->hasResponse()) {
                 if (null !== $this->logger) {
-                    $this->logger->debug('The "{authenticator}" authenticator set the response. Any later authenticator will not be called', array('authenticator' => \get_class($guardAuthenticator)));
+                    $this->logger->debug('The "{authenticator}" authenticator set the response. Any later authenticator will not be called', ['authenticator' => \get_class($guardAuthenticator)]);
                 }
 
                 break;
@@ -119,7 +119,7 @@ private function executeGuardAuthenticator($uniqueGuardKey, GuardAuthenticatorIn
             }
 
             if (null !== $this->logger) {
-                $this->logger->debug('Calling getCredentials() on guard authenticator.', array('firewall_key' => $this->providerKey, 'authenticator' => \get_class($guardAuthenticator)));
+                $this->logger->debug('Calling getCredentials() on guard authenticator.', ['firewall_key' => $this->providerKey, 'authenticator' => \get_class($guardAuthenticator)]);
             }
 
             // allow the authenticator to fetch authentication info from the request
@@ -144,14 +144,14 @@ private function executeGuardAuthenticator($uniqueGuardKey, GuardAuthenticatorIn
             $token = new PreAuthenticationGuardToken($credentials, $uniqueGuardKey);
 
             if (null !== $this->logger) {
-                $this->logger->debug('Passing guard token information to the GuardAuthenticationProvider', array('firewall_key' => $this->providerKey, 'authenticator' => \get_class($guardAuthenticator)));
+                $this->logger->debug('Passing guard token information to the GuardAuthenticationProvider', ['firewall_key' => $this->providerKey, 'authenticator' => \get_class($guardAuthenticator)]);
             }
             // pass the token into the AuthenticationManager system
             // this indirectly calls GuardAuthenticationProvider::authenticate()
             $token = $this->authenticationManager->authenticate($token);
 
             if (null !== $this->logger) {
-                $this->logger->info('Guard authentication successful!', array('token' => $token, 'authenticator' => \get_class($guardAuthenticator)));
+                $this->logger->info('Guard authentication successful!', ['token' => $token, 'authenticator' => \get_class($guardAuthenticator)]);
             }
 
             // sets the token on the token storage, etc
@@ -160,7 +160,7 @@ private function executeGuardAuthenticator($uniqueGuardKey, GuardAuthenticatorIn
             // oh no! Authentication failed!
 
             if (null !== $this->logger) {
-                $this->logger->info('Guard authentication failed.', array('exception' => $e, 'authenticator' => \get_class($guardAuthenticator)));
+                $this->logger->info('Guard authentication failed.', ['exception' => $e, 'authenticator' => \get_class($guardAuthenticator)]);
             }
 
             $response = $this->guardHandler->handleAuthenticationFailure($e, $request, $guardAuthenticator, $this->providerKey);
@@ -176,13 +176,13 @@ private function executeGuardAuthenticator($uniqueGuardKey, GuardAuthenticatorIn
         $response = $this->guardHandler->handleAuthenticationSuccess($token, $request, $guardAuthenticator, $this->providerKey);
         if ($response instanceof Response) {
             if (null !== $this->logger) {
-                $this->logger->debug('Guard authenticator set success response.', array('response' => $response, 'authenticator' => \get_class($guardAuthenticator)));
+                $this->logger->debug('Guard authenticator set success response.', ['response' => $response, 'authenticator' => \get_class($guardAuthenticator)]);
             }
 
             $event->setResponse($response);
         } else {
             if (null !== $this->logger) {
-                $this->logger->debug('Guard authenticator set no success response: request continues.', array('authenticator' => \get_class($guardAuthenticator)));
+                $this->logger->debug('Guard authenticator set no success response: request continues.', ['authenticator' => \get_class($guardAuthenticator)]);
             }
         }
 
@@ -206,7 +206,7 @@ private function triggerRememberMe(GuardAuthenticatorInterface $guardAuthenticat
     {
         if (null === $this->rememberMeServices) {
             if (null !== $this->logger) {
-                $this->logger->debug('Remember me skipped: it is not configured for the firewall.', array('authenticator' => \get_class($guardAuthenticator)));
+                $this->logger->debug('Remember me skipped: it is not configured for the firewall.', ['authenticator' => \get_class($guardAuthenticator)]);
             }
 
             return;
@@ -214,7 +214,7 @@ private function triggerRememberMe(GuardAuthenticatorInterface $guardAuthenticat
 
         if (!$guardAuthenticator->supportsRememberMe()) {
             if (null !== $this->logger) {
-                $this->logger->debug('Remember me skipped: your authenticator does not support it.', array('authenticator' => \get_class($guardAuthenticator)));
+                $this->logger->debug('Remember me skipped: your authenticator does not support it.', ['authenticator' => \get_class($guardAuthenticator)]);
             }
 
             return;
diff --git a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
index b962b7f13333e..1cdcf6b967ed3 100644
--- a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
+++ b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
@@ -42,7 +42,7 @@ class GuardAuthenticatorHandler
     /**
      * @param array $statelessProviderKeys An array of provider/firewall keys that are "stateless" and so do not need the session migrated on success
      */
-    public function __construct(TokenStorageInterface $tokenStorage, EventDispatcherInterface $eventDispatcher = null, array $statelessProviderKeys = array())
+    public function __construct(TokenStorageInterface $tokenStorage, EventDispatcherInterface $eventDispatcher = null, array $statelessProviderKeys = [])
     {
         $this->tokenStorage = $tokenStorage;
         $this->dispatcher = $eventDispatcher;
diff --git a/src/Symfony/Component/Security/Guard/Tests/Authenticator/FormLoginAuthenticatorTest.php b/src/Symfony/Component/Security/Guard/Tests/Authenticator/FormLoginAuthenticatorTest.php
index db26bc2e28b4d..ca472f87bc5e8 100644
--- a/src/Symfony/Component/Security/Guard/Tests/Authenticator/FormLoginAuthenticatorTest.php
+++ b/src/Symfony/Component/Security/Guard/Tests/Authenticator/FormLoginAuthenticatorTest.php
@@ -129,8 +129,8 @@ public function testStartWithSession()
 
     protected function setUp()
     {
-        $this->requestWithoutSession = new Request(array(), array(), array(), array(), array(), array());
-        $this->requestWithSession = new Request(array(), array(), array(), array(), array(), array());
+        $this->requestWithoutSession = new Request([], [], [], [], [], []);
+        $this->requestWithSession = new Request([], [], [], [], [], []);
 
         $session = $this->getMockBuilder('Symfony\\Component\\HttpFoundation\\Session\\SessionInterface')
             ->disableOriginalConstructor()
diff --git a/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php b/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
index ba874bcba6053..3ff1747bcaa8b 100644
--- a/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
@@ -41,7 +41,7 @@ public function testHandleSuccess()
         $authenticateToken = $this->getMockBuilder(TokenInterface::class)->getMock();
         $providerKey = 'my_firewall';
 
-        $credentials = array('username' => 'weaverryan', 'password' => 'all_your_base');
+        $credentials = ['username' => 'weaverryan', 'password' => 'all_your_base'];
 
         $authenticator
             ->expects($this->once())
@@ -77,7 +77,7 @@ public function testHandleSuccess()
             $this->guardAuthenticatorHandler,
             $this->authenticationManager,
             $providerKey,
-            array($authenticator),
+            [$authenticator],
             $this->logger
         );
 
@@ -117,7 +117,7 @@ public function testHandleSuccessStopsAfterResponseIsSet()
             $this->guardAuthenticatorHandler,
             $this->authenticationManager,
             'my_firewall',
-            array($authenticator1, $authenticator2),
+            [$authenticator1, $authenticator2],
             $this->logger
         );
 
@@ -139,7 +139,7 @@ public function testHandleSuccessWithRememberMe()
             ->expects($this->once())
             ->method('getCredentials')
             ->with($this->equalTo($this->request))
-            ->will($this->returnValue(array('username' => 'anything_not_empty')));
+            ->will($this->returnValue(['username' => 'anything_not_empty']));
 
         $this->authenticationManager
             ->expects($this->once())
@@ -156,7 +156,7 @@ public function testHandleSuccessWithRememberMe()
             $this->guardAuthenticatorHandler,
             $this->authenticationManager,
             $providerKey,
-            array($authenticator),
+            [$authenticator],
             $this->logger
         );
 
@@ -430,11 +430,11 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->request = new Request(array(), array(), array(), array(), array(), array());
+        $this->request = new Request([], [], [], [], [], []);
 
         $this->event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')
             ->disableOriginalConstructor()
-            ->setMethods(array('getRequest'))
+            ->setMethods(['getRequest'])
             ->getMock();
         $this->event
             ->expects($this->any())
diff --git a/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php b/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php
index 6f0bb6248aca8..9950426de9e2f 100644
--- a/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php
+++ b/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php
@@ -110,11 +110,11 @@ public function testHandleAuthenticationClearsToken($tokenClass, $tokenProviderK
 
     public function getTokenClearingTests()
     {
-        $tests = array();
+        $tests = [];
         // correct token class and matching firewall => clear the token
-        $tests[] = array('Symfony\Component\Security\Guard\Token\PostAuthenticationGuardToken', 'the_firewall_key', 'the_firewall_key');
-        $tests[] = array('Symfony\Component\Security\Guard\Token\PostAuthenticationGuardToken', 'the_firewall_key', 'different_key');
-        $tests[] = array('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken', 'the_firewall_key', 'the_firewall_key');
+        $tests[] = ['Symfony\Component\Security\Guard\Token\PostAuthenticationGuardToken', 'the_firewall_key', 'the_firewall_key'];
+        $tests[] = ['Symfony\Component\Security\Guard\Token\PostAuthenticationGuardToken', 'the_firewall_key', 'different_key'];
+        $tests[] = ['Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken', 'the_firewall_key', 'the_firewall_key'];
 
         return $tests;
     }
@@ -151,7 +151,7 @@ public function testSessionStrategyIsNotCalledWhenStateless()
         $this->sessionStrategy->expects($this->never())
             ->method('onAuthentication');
 
-        $handler = new GuardAuthenticatorHandler($this->tokenStorage, $this->dispatcher, array('some_provider_key'));
+        $handler = new GuardAuthenticatorHandler($this->tokenStorage, $this->dispatcher, ['some_provider_key']);
         $handler->setSessionAuthenticationStrategy($this->sessionStrategy);
         $handler->authenticateWithToken($this->token, $this->request, 'some_provider_key');
     }
@@ -161,7 +161,7 @@ protected function setUp()
         $this->tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
         $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
         $this->token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
-        $this->request = new Request(array(), array(), array(), array(), array(), array());
+        $this->request = new Request([], [], [], [], [], []);
         $this->sessionStrategy = $this->getMockBuilder('Symfony\Component\Security\Http\Session\SessionAuthenticationStrategyInterface')->getMock();
         $this->guardAuthenticator = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
     }
diff --git a/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php b/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
index 04c16dfd4d142..e11bb341aef38 100644
--- a/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
@@ -35,7 +35,7 @@ public function testAuthenticate()
         $authenticatorA = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
         $authenticatorB = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
         $authenticatorC = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
-        $authenticators = array($authenticatorA, $authenticatorB, $authenticatorC);
+        $authenticators = [$authenticatorA, $authenticatorB, $authenticatorC];
 
         // called 2 times - for authenticator A and B (stops on B because of match)
         $this->preAuthenticationToken->expects($this->exactly(2))
@@ -43,10 +43,10 @@ public function testAuthenticate()
             // it will return the "1" index, which will match authenticatorB
             ->will($this->returnValue('my_cool_firewall_1'));
 
-        $enteredCredentials = array(
+        $enteredCredentials = [
             'username' => '_weaverryan_test_user',
             'password' => 'guard_auth_ftw',
-        );
+        ];
         $this->preAuthenticationToken->expects($this->atLeastOnce())
             ->method('getCredentials')
             ->will($this->returnValue($enteredCredentials));
@@ -178,7 +178,7 @@ public function testCheckCredentialsReturningNonTrueFailsAuthentication()
             // authentication fails :(
             ->will($this->returnValue(null));
 
-        $provider = new GuardAuthenticationProvider(array($authenticator), $this->userProvider, $providerKey, $this->userChecker);
+        $provider = new GuardAuthenticationProvider([$authenticator], $this->userProvider, $providerKey, $this->userChecker);
         $provider->authenticate($this->preAuthenticationToken);
     }
 
@@ -192,10 +192,10 @@ public function testGuardWithNoLongerAuthenticatedTriggersLogout()
         // create a token and mark it as NOT authenticated anymore
         // this mimics what would happen if a user "changed" between request
         $mockedUser = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
-        $token = new PostAuthenticationGuardToken($mockedUser, $providerKey, array('ROLE_USER'));
+        $token = new PostAuthenticationGuardToken($mockedUser, $providerKey, ['ROLE_USER']);
         $token->setAuthenticated(false);
 
-        $provider = new GuardAuthenticationProvider(array(), $this->userProvider, $providerKey, $this->userChecker);
+        $provider = new GuardAuthenticationProvider([], $this->userProvider, $providerKey, $this->userChecker);
         $actualToken = $provider->authenticate($token);
     }
 
@@ -203,7 +203,7 @@ public function testSupportsChecksGuardAuthenticatorsTokenOrigin()
     {
         $authenticatorA = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
         $authenticatorB = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
-        $authenticators = array($authenticatorA, $authenticatorB);
+        $authenticators = [$authenticatorA, $authenticatorB];
 
         $mockedUser = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
         $provider = new GuardAuthenticationProvider($authenticators, $this->userProvider, 'first_firewall', $this->userChecker);
@@ -224,7 +224,7 @@ public function testSupportsChecksGuardAuthenticatorsTokenOrigin()
     public function testAuthenticateFailsOnNonOriginatingToken()
     {
         $authenticatorA = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
-        $authenticators = array($authenticatorA);
+        $authenticators = [$authenticatorA];
 
         $mockedUser = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
         $provider = new GuardAuthenticationProvider($authenticators, $this->userProvider, 'first_firewall', $this->userChecker);
diff --git a/src/Symfony/Component/Security/Guard/Token/PostAuthenticationGuardToken.php b/src/Symfony/Component/Security/Guard/Token/PostAuthenticationGuardToken.php
index f566b71242353..ca8549783fdb1 100644
--- a/src/Symfony/Component/Security/Guard/Token/PostAuthenticationGuardToken.php
+++ b/src/Symfony/Component/Security/Guard/Token/PostAuthenticationGuardToken.php
@@ -58,7 +58,7 @@ public function __construct(UserInterface $user, $providerKey, array $roles)
      */
     public function getCredentials()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -76,7 +76,7 @@ public function getProviderKey()
      */
     public function serialize()
     {
-        return serialize(array($this->providerKey, parent::serialize()));
+        return serialize([$this->providerKey, parent::serialize()]);
     }
 
     /**
diff --git a/src/Symfony/Component/Security/Guard/Token/PreAuthenticationGuardToken.php b/src/Symfony/Component/Security/Guard/Token/PreAuthenticationGuardToken.php
index e1b39417d78e2..b9aa53bf2a492 100644
--- a/src/Symfony/Component/Security/Guard/Token/PreAuthenticationGuardToken.php
+++ b/src/Symfony/Component/Security/Guard/Token/PreAuthenticationGuardToken.php
@@ -36,7 +36,7 @@ public function __construct($credentials, $guardProviderKey)
         $this->credentials = $credentials;
         $this->guardProviderKey = $guardProviderKey;
 
-        parent::__construct(array());
+        parent::__construct([]);
 
         // never authenticated
         parent::setAuthenticated(false);
diff --git a/src/Symfony/Component/Security/Http/AccessMap.php b/src/Symfony/Component/Security/Http/AccessMap.php
index 2f3757336edad..04c06da107683 100644
--- a/src/Symfony/Component/Security/Http/AccessMap.php
+++ b/src/Symfony/Component/Security/Http/AccessMap.php
@@ -22,16 +22,16 @@
  */
 class AccessMap implements AccessMapInterface
 {
-    private $map = array();
+    private $map = [];
 
     /**
      * @param RequestMatcherInterface $requestMatcher A RequestMatcherInterface instance
      * @param array                   $attributes     An array of attributes to pass to the access decision manager (like roles)
      * @param string|null             $channel        The channel to enforce (http, https, or null)
      */
-    public function add(RequestMatcherInterface $requestMatcher, array $attributes = array(), $channel = null)
+    public function add(RequestMatcherInterface $requestMatcher, array $attributes = [], $channel = null)
     {
-        $this->map[] = array($requestMatcher, $attributes, $channel);
+        $this->map[] = [$requestMatcher, $attributes, $channel];
     }
 
     /**
@@ -41,10 +41,10 @@ public function getPatterns(Request $request)
     {
         foreach ($this->map as $elements) {
             if (null === $elements[0] || $elements[0]->matches($request)) {
-                return array($elements[1], $elements[2]);
+                return [$elements[1], $elements[2]];
             }
         }
 
-        return array(null, null);
+        return [null, null];
     }
 }
diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
index ad1e4cb1940e1..cca62fd4c5c73 100644
--- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
+++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
@@ -35,14 +35,14 @@ class DefaultAuthenticationFailureHandler implements AuthenticationFailureHandle
     protected $httpUtils;
     protected $logger;
     protected $options;
-    protected $defaultOptions = array(
+    protected $defaultOptions = [
         'failure_path' => null,
         'failure_forward' => false,
         'login_path' => '/login',
         'failure_path_parameter' => '_failure_path',
-    );
+    ];
 
-    public function __construct(HttpKernelInterface $httpKernel, HttpUtils $httpUtils, array $options = array(), LoggerInterface $logger = null)
+    public function __construct(HttpKernelInterface $httpKernel, HttpUtils $httpUtils, array $options = [], LoggerInterface $logger = null)
     {
         $this->httpKernel = $httpKernel;
         $this->httpUtils = $httpUtils;
@@ -80,7 +80,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
 
         if ($this->options['failure_forward']) {
             if (null !== $this->logger) {
-                $this->logger->debug('Authentication failure, forward triggered.', array('failure_path' => $this->options['failure_path']));
+                $this->logger->debug('Authentication failure, forward triggered.', ['failure_path' => $this->options['failure_path']]);
             }
 
             $subRequest = $this->httpUtils->createRequest($request, $this->options['failure_path']);
@@ -90,7 +90,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
         }
 
         if (null !== $this->logger) {
-            $this->logger->debug('Authentication failure, redirect triggered.', array('failure_path' => $this->options['failure_path']));
+            $this->logger->debug('Authentication failure, redirect triggered.', ['failure_path' => $this->options['failure_path']]);
         }
 
         $request->getSession()->set(Security::AUTHENTICATION_ERROR, $exception);
diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
index 38d16a6f75849..8b65dc9ee592b 100644
--- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
+++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
@@ -31,19 +31,19 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle
     protected $httpUtils;
     protected $options;
     protected $providerKey;
-    protected $defaultOptions = array(
+    protected $defaultOptions = [
         'always_use_default_target_path' => false,
         'default_target_path' => '/',
         'login_path' => '/login',
         'target_path_parameter' => '_target_path',
         'use_referer' => false,
-    );
+    ];
 
     /**
      * @param HttpUtils $httpUtils
      * @param array     $options   Options for processing a successful authentication attempt
      */
-    public function __construct(HttpUtils $httpUtils, array $options = array())
+    public function __construct(HttpUtils $httpUtils, array $options = [])
     {
         $this->httpUtils = $httpUtils;
         $this->setOptions($options);
diff --git a/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php b/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php
index 484e60fe6e137..81809333087b2 100644
--- a/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php
+++ b/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php
@@ -55,7 +55,7 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token)
     {
         if ($this->simpleAuthenticator instanceof AuthenticationSuccessHandlerInterface) {
             if ($this->logger) {
-                $this->logger->debug('Selected an authentication success handler.', array('handler' => \get_class($this->simpleAuthenticator)));
+                $this->logger->debug('Selected an authentication success handler.', ['handler' => \get_class($this->simpleAuthenticator)]);
             }
 
             $response = $this->simpleAuthenticator->onAuthenticationSuccess($request, $token);
diff --git a/src/Symfony/Component/Security/Http/Firewall.php b/src/Symfony/Component/Security/Http/Firewall.php
index a0a2aa8411ca0..112604c25c8b4 100644
--- a/src/Symfony/Component/Security/Http/Firewall.php
+++ b/src/Symfony/Component/Security/Http/Firewall.php
@@ -99,10 +99,10 @@ public function onKernelFinishRequest(FinishRequestEvent $event)
      */
     public static function getSubscribedEvents()
     {
-        return array(
-            KernelEvents::REQUEST => array('onKernelRequest', 8),
+        return [
+            KernelEvents::REQUEST => ['onKernelRequest', 8],
             KernelEvents::FINISH_REQUEST => 'onKernelFinishRequest',
-        );
+        ];
     }
 
     protected function handleRequest(GetResponseEvent $event, $listeners)
diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
index 1227c116cc5c1..a64f25fe0781a 100644
--- a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
@@ -90,7 +90,7 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationM
         $this->providerKey = $providerKey;
         $this->successHandler = $successHandler;
         $this->failureHandler = $failureHandler;
-        $this->options = array_merge(array(
+        $this->options = array_merge([
             'check_path' => '/login_check',
             'login_path' => '/login',
             'always_use_default_target_path' => false,
@@ -100,7 +100,7 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationM
             'failure_path' => null,
             'failure_forward' => false,
             'require_previous_session' => true,
-        ), $options);
+        ], $options);
         $this->logger = $logger;
         $this->dispatcher = $dispatcher;
         $this->httpUtils = $httpUtils;
@@ -183,7 +183,7 @@ abstract protected function attemptAuthentication(Request $request);
     private function onFailure(Request $request, AuthenticationException $failed)
     {
         if (null !== $this->logger) {
-            $this->logger->info('Authentication request failed.', array('exception' => $failed));
+            $this->logger->info('Authentication request failed.', ['exception' => $failed]);
         }
 
         $token = $this->tokenStorage->getToken();
@@ -203,7 +203,7 @@ private function onFailure(Request $request, AuthenticationException $failed)
     private function onSuccess(Request $request, TokenInterface $token)
     {
         if (null !== $this->logger) {
-            $this->logger->info('User has been authenticated successfully.', array('username' => $token->getUsername()));
+            $this->logger->info('User has been authenticated successfully.', ['username' => $token->getUsername()]);
         }
 
         $this->tokenStorage->setToken($token);
diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php
index 7e580e7da5c3b..3bf597b6da349 100644
--- a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php
@@ -66,7 +66,7 @@ final public function handle(GetResponseEvent $event)
         }
 
         if (null !== $this->logger) {
-            $this->logger->debug('Checking current security token.', array('token' => (string) $this->tokenStorage->getToken()));
+            $this->logger->debug('Checking current security token.', ['token' => (string) $this->tokenStorage->getToken()]);
         }
 
         if (null !== $token = $this->tokenStorage->getToken()) {
@@ -76,14 +76,14 @@ final public function handle(GetResponseEvent $event)
         }
 
         if (null !== $this->logger) {
-            $this->logger->debug('Trying to pre-authenticate user.', array('username' => (string) $user));
+            $this->logger->debug('Trying to pre-authenticate user.', ['username' => (string) $user]);
         }
 
         try {
             $token = $this->authenticationManager->authenticate(new PreAuthenticatedToken($user, $credentials, $this->providerKey));
 
             if (null !== $this->logger) {
-                $this->logger->info('Pre-authentication successful.', array('token' => (string) $token));
+                $this->logger->info('Pre-authentication successful.', ['token' => (string) $token]);
             }
 
             $this->migrateSession($request, $token);
@@ -119,7 +119,7 @@ private function clearToken(AuthenticationException $exception)
             $this->tokenStorage->setToken(null);
 
             if (null !== $this->logger) {
-                $this->logger->info('Cleared security token due to an exception.', array('exception' => $exception));
+                $this->logger->info('Cleared security token due to an exception.', ['exception' => $exception]);
             }
         }
     }
diff --git a/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php
index efd92f8c2873e..cfa5a9f0a64cb 100644
--- a/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php
@@ -49,7 +49,7 @@ public function handle(GetResponseEvent $event)
         }
 
         try {
-            $token = new AnonymousToken($this->secret, 'anon.', array());
+            $token = new AnonymousToken($this->secret, 'anon.', []);
             if (null !== $this->authenticationManager) {
                 $token = $this->authenticationManager->authenticate($token);
             }
@@ -61,7 +61,7 @@ public function handle(GetResponseEvent $event)
             }
         } catch (AuthenticationException $failed) {
             if (null !== $this->logger) {
-                $this->logger->info('Anonymous authentication failed.', array('exception' => $failed));
+                $this->logger->info('Anonymous authentication failed.', ['exception' => $failed]);
             }
         }
     }
diff --git a/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php
index d1f79c16361a7..9329385fd8927 100644
--- a/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php
@@ -69,7 +69,7 @@ public function handle(GetResponseEvent $event)
         }
 
         if (null !== $this->logger) {
-            $this->logger->info('Basic authentication Authorization header found for user.', array('username' => $username));
+            $this->logger->info('Basic authentication Authorization header found for user.', ['username' => $username]);
         }
 
         try {
@@ -85,7 +85,7 @@ public function handle(GetResponseEvent $event)
             }
 
             if (null !== $this->logger) {
-                $this->logger->info('Basic authentication failed for user.', array('username' => $username, 'exception' => $e));
+                $this->logger->info('Basic authentication failed for user.', ['username' => $username, 'exception' => $e]);
             }
 
             if ($this->ignoreFailure) {
diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
index cdaebbca7589e..1ec762029050e 100644
--- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -79,7 +79,7 @@ public function setLogoutOnUserChange($logoutOnUserChange)
     public function handle(GetResponseEvent $event)
     {
         if (!$this->registered && null !== $this->dispatcher && $event->isMasterRequest()) {
-            $this->dispatcher->addListener(KernelEvents::RESPONSE, array($this, 'onKernelResponse'));
+            $this->dispatcher->addListener(KernelEvents::RESPONSE, [$this, 'onKernelResponse']);
             $this->registered = true;
         }
 
@@ -95,17 +95,17 @@ public function handle(GetResponseEvent $event)
         $token = $this->safelyUnserialize($token);
 
         if (null !== $this->logger) {
-            $this->logger->debug('Read existing security token from the session.', array(
+            $this->logger->debug('Read existing security token from the session.', [
                 'key' => $this->sessionKey,
                 'token_class' => \is_object($token) ? \get_class($token) : null,
-            ));
+            ]);
         }
 
         if ($token instanceof TokenInterface) {
             $token = $this->refreshUser($token);
         } elseif (null !== $token) {
             if (null !== $this->logger) {
-                $this->logger->warning('Expected a security token from the session, got something else.', array('key' => $this->sessionKey, 'received' => $token));
+                $this->logger->warning('Expected a security token from the session, got something else.', ['key' => $this->sessionKey, 'received' => $token]);
             }
 
             $token = null;
@@ -129,7 +129,7 @@ public function onKernelResponse(FilterResponseEvent $event)
             return;
         }
 
-        $this->dispatcher->removeListener(KernelEvents::RESPONSE, array($this, 'onKernelResponse'));
+        $this->dispatcher->removeListener(KernelEvents::RESPONSE, [$this, 'onKernelResponse']);
         $this->registered = false;
         $session = $request->getSession();
 
@@ -141,7 +141,7 @@ public function onKernelResponse(FilterResponseEvent $event)
             $session->set($this->sessionKey, serialize($token));
 
             if (null !== $this->logger) {
-                $this->logger->debug('Stored the security token in the session.', array('key' => $this->sessionKey));
+                $this->logger->debug('Stored the security token in the session.', ['key' => $this->sessionKey]);
             }
         }
     }
@@ -191,7 +191,7 @@ protected function refreshUser(TokenInterface $token)
                 $token->setUser($refreshedUser);
 
                 if (null !== $this->logger) {
-                    $context = array('provider' => \get_class($provider), 'username' => $refreshedUser->getUsername());
+                    $context = ['provider' => \get_class($provider), 'username' => $refreshedUser->getUsername()];
 
                     foreach ($token->getRoles() as $role) {
                         if ($role instanceof SwitchUserRole) {
@@ -208,7 +208,7 @@ protected function refreshUser(TokenInterface $token)
                 // let's try the next user provider
             } catch (UsernameNotFoundException $e) {
                 if (null !== $this->logger) {
-                    $this->logger->warning('Username could not be found in the selected user provider.', array('username' => $e->getUsername(), 'provider' => \get_class($provider)));
+                    $this->logger->warning('Username could not be found in the selected user provider.', ['username' => $e->getUsername(), 'provider' => \get_class($provider)]);
                 }
 
                 $userNotFoundByProvider = true;
@@ -234,7 +234,7 @@ private function safelyUnserialize($serializedToken)
     {
         $e = $token = null;
         $prevUnserializeHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
-        $prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = array()) use (&$prevErrorHandler) {
+        $prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$prevErrorHandler) {
             if (__FILE__ === $file) {
                 throw new \UnexpectedValueException($msg, 0x37313bc);
             }
diff --git a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
index e23d4e2a655b0..d107721471533 100644
--- a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
@@ -71,7 +71,7 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationT
      */
     public function register(EventDispatcherInterface $dispatcher)
     {
-        $dispatcher->addListener(KernelEvents::EXCEPTION, array($this, 'onKernelException'), 1);
+        $dispatcher->addListener(KernelEvents::EXCEPTION, [$this, 'onKernelException'], 1);
     }
 
     /**
@@ -79,7 +79,7 @@ public function register(EventDispatcherInterface $dispatcher)
      */
     public function unregister(EventDispatcherInterface $dispatcher)
     {
-        $dispatcher->removeListener(KernelEvents::EXCEPTION, array($this, 'onKernelException'));
+        $dispatcher->removeListener(KernelEvents::EXCEPTION, [$this, 'onKernelException']);
     }
 
     /**
@@ -102,7 +102,7 @@ public function onKernelException(GetResponseForExceptionEvent $event)
     private function handleAuthenticationException(GetResponseForExceptionEvent $event, AuthenticationException $exception)
     {
         if (null !== $this->logger) {
-            $this->logger->info('An AuthenticationException was thrown; redirecting to authentication entry point.', array('exception' => $exception));
+            $this->logger->info('An AuthenticationException was thrown; redirecting to authentication entry point.', ['exception' => $exception]);
         }
 
         try {
@@ -120,7 +120,7 @@ private function handleAccessDeniedException(GetResponseForExceptionEvent $event
         $token = $this->tokenStorage->getToken();
         if (!$this->authenticationTrustResolver->isFullFledged($token)) {
             if (null !== $this->logger) {
-                $this->logger->debug('Access denied, the user is not fully authenticated; redirecting to authentication entry point.', array('exception' => $exception));
+                $this->logger->debug('Access denied, the user is not fully authenticated; redirecting to authentication entry point.', ['exception' => $exception]);
             }
 
             try {
@@ -136,7 +136,7 @@ private function handleAccessDeniedException(GetResponseForExceptionEvent $event
         }
 
         if (null !== $this->logger) {
-            $this->logger->debug('Access denied, the user is neither anonymous, nor remember-me.', array('exception' => $exception));
+            $this->logger->debug('Access denied, the user is neither anonymous, nor remember-me.', ['exception' => $exception]);
         }
 
         try {
@@ -155,7 +155,7 @@ private function handleAccessDeniedException(GetResponseForExceptionEvent $event
             }
         } catch (\Exception $e) {
             if (null !== $this->logger) {
-                $this->logger->error('An exception was thrown when handling an AccessDeniedException.', array('exception' => $e));
+                $this->logger->error('An exception was thrown when handling an AccessDeniedException.', ['exception' => $e]);
             }
 
             $event->setException(new \RuntimeException('Exception thrown when handling an exception.', 0, $e));
@@ -165,7 +165,7 @@ private function handleAccessDeniedException(GetResponseForExceptionEvent $event
     private function handleLogoutException(LogoutException $exception)
     {
         if (null !== $this->logger) {
-            $this->logger->info('A LogoutException was thrown.', array('exception' => $exception));
+            $this->logger->info('A LogoutException was thrown.', ['exception' => $exception]);
         }
     }
 
@@ -177,7 +177,7 @@ private function handleLogoutException(LogoutException $exception)
     private function startAuthentication(Request $request, AuthenticationException $authException)
     {
         if (null === $this->authenticationEntryPoint) {
-            throw new HttpException(Response::HTTP_UNAUTHORIZED, $authException->getMessage(), $authException, array(), $authException->getCode());
+            throw new HttpException(Response::HTTP_UNAUTHORIZED, $authException->getMessage(), $authException, [], $authException->getCode());
         }
 
         if (null !== $this->logger) {
@@ -193,7 +193,7 @@ private function startAuthentication(Request $request, AuthenticationException $
             $this->tokenStorage->setToken(null);
 
             if (null !== $this->logger) {
-                $this->logger->info('The security token was removed due to an AccountStatusException.', array('exception' => $authException));
+                $this->logger->info('The security token was removed due to an AccountStatusException.', ['exception' => $authException]);
             }
         }
 
diff --git a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php
index 21819ce4a9968..6a762e1fbd578 100644
--- a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php
@@ -44,18 +44,18 @@ class LogoutListener implements ListenerInterface
      * @param array                          $options          An array of options to process a logout attempt
      * @param CsrfTokenManagerInterface|null $csrfTokenManager A CsrfTokenManagerInterface instance
      */
-    public function __construct(TokenStorageInterface $tokenStorage, HttpUtils $httpUtils, LogoutSuccessHandlerInterface $successHandler, array $options = array(), CsrfTokenManagerInterface $csrfTokenManager = null)
+    public function __construct(TokenStorageInterface $tokenStorage, HttpUtils $httpUtils, LogoutSuccessHandlerInterface $successHandler, array $options = [], CsrfTokenManagerInterface $csrfTokenManager = null)
     {
         $this->tokenStorage = $tokenStorage;
         $this->httpUtils = $httpUtils;
-        $this->options = array_merge(array(
+        $this->options = array_merge([
             'csrf_parameter' => '_csrf_token',
             'csrf_token_id' => 'logout',
             'logout_path' => '/logout',
-        ), $options);
+        ], $options);
         $this->successHandler = $successHandler;
         $this->csrfTokenManager = $csrfTokenManager;
-        $this->handlers = array();
+        $this->handlers = [];
     }
 
     public function addHandler(LogoutHandlerInterface $handler)
diff --git a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
index d5c457b5835d4..17d40a0e6f828 100644
--- a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
@@ -77,7 +77,7 @@ public function handle(GetResponseEvent $event)
                 $this->logger->warning(
                     'The token storage was not populated with remember-me token as the'
                    .' RememberMeServices was not able to create a token from the remember'
-                   .' me information.', array('exception' => $e)
+                   .' me information.', ['exception' => $e]
                 );
             }
 
@@ -110,7 +110,7 @@ public function handle(GetResponseEvent $event)
                 $this->logger->warning(
                     'The token storage was not populated with remember-me token as the'
                    .' AuthenticationManager rejected the AuthenticationToken returned'
-                   .' by the RememberMeServices.', array('exception' => $e)
+                   .' by the RememberMeServices.', ['exception' => $e]
                 );
             }
 
diff --git a/src/Symfony/Component/Security/Http/Firewall/RemoteUserAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/RemoteUserAuthenticationListener.php
index af692ed1635e3..fbba95db702ae 100644
--- a/src/Symfony/Component/Security/Http/Firewall/RemoteUserAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/RemoteUserAuthenticationListener.php
@@ -44,6 +44,6 @@ protected function getPreAuthenticatedData(Request $request)
             throw new BadCredentialsException(sprintf('User key was not found: %s', $this->userKey));
         }
 
-        return array($request->server->get($this->userKey), null);
+        return [$request->server->get($this->userKey), null];
     }
 }
diff --git a/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php
index a0f0863ac7efe..f241986d7729a 100644
--- a/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php
@@ -63,13 +63,13 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationM
         $this->simpleAuthenticator = $simpleAuthenticator;
         $this->csrfTokenManager = $csrfTokenManager;
 
-        $options = array_merge(array(
+        $options = array_merge([
             'username_parameter' => '_username',
             'password_parameter' => '_password',
             'csrf_parameter' => '_csrf_token',
             'csrf_token_id' => 'authenticate',
             'post_only' => true,
-        ), $options);
+        ], $options);
 
         parent::__construct($tokenStorage, $authenticationManager, $sessionStrategy, $httpUtils, $providerKey, $successHandler, $failureHandler, $options, $logger, $dispatcher);
     }
diff --git a/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php
index 60e19ee6c288c..7e376f5ef0cae 100644
--- a/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php
@@ -83,7 +83,7 @@ public function handle(GetResponseEvent $event)
         $request = $event->getRequest();
 
         if (null !== $this->logger) {
-            $this->logger->info('Attempting SimplePreAuthentication.', array('key' => $this->providerKey, 'authenticator' => \get_class($this->simpleAuthenticator)));
+            $this->logger->info('Attempting SimplePreAuthentication.', ['key' => $this->providerKey, 'authenticator' => \get_class($this->simpleAuthenticator)]);
         }
 
         if (null !== $this->tokenStorage->getToken() && !$this->tokenStorage->getToken() instanceof AnonymousToken) {
@@ -112,7 +112,7 @@ public function handle(GetResponseEvent $event)
             $this->tokenStorage->setToken(null);
 
             if (null !== $this->logger) {
-                $this->logger->info('SimplePreAuthentication request failed.', array('exception' => $e, 'authenticator' => \get_class($this->simpleAuthenticator)));
+                $this->logger->info('SimplePreAuthentication request failed.', ['exception' => $e, 'authenticator' => \get_class($this->simpleAuthenticator)]);
             }
 
             if ($this->simpleAuthenticator instanceof AuthenticationFailureHandlerInterface) {
diff --git a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
index 21c0bf7031dc0..f54bd992b6083 100644
--- a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
@@ -134,7 +134,7 @@ private function attemptSwitchUser(Request $request, $username)
         }
 
         if (null !== $this->logger) {
-            $this->logger->info('Attempting to switch to user.', array('username' => $username));
+            $this->logger->info('Attempting to switch to user.', ['username' => $username]);
         }
 
         $user = $this->provider->loadUserByUsername($username);
diff --git a/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php
index e16afd287d346..6a71a071ca496 100644
--- a/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php
@@ -65,7 +65,7 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationM
         $this->failureHandler = $failureHandler;
         $this->logger = $logger;
         $this->eventDispatcher = $eventDispatcher;
-        $this->options = array_merge(array('username_path' => 'username', 'password_path' => 'password'), $options);
+        $this->options = array_merge(['username_path' => 'username', 'password_path' => 'password'], $options);
         $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
     }
 
@@ -138,7 +138,7 @@ public function handle(GetResponseEvent $event)
     private function onSuccess(Request $request, TokenInterface $token)
     {
         if (null !== $this->logger) {
-            $this->logger->info('User has been authenticated successfully.', array('username' => $token->getUsername()));
+            $this->logger->info('User has been authenticated successfully.', ['username' => $token->getUsername()]);
         }
 
         $this->migrateSession($request, $token);
@@ -166,7 +166,7 @@ private function onSuccess(Request $request, TokenInterface $token)
     private function onFailure(Request $request, AuthenticationException $failed)
     {
         if (null !== $this->logger) {
-            $this->logger->info('Authentication request failed.', array('exception' => $failed));
+            $this->logger->info('Authentication request failed.', ['exception' => $failed]);
         }
 
         $token = $this->tokenStorage->getToken();
@@ -175,7 +175,7 @@ private function onFailure(Request $request, AuthenticationException $failed)
         }
 
         if (!$this->failureHandler) {
-            return new JsonResponse(array('error' => $failed->getMessageKey()), 401);
+            return new JsonResponse(['error' => $failed->getMessageKey()], 401);
         }
 
         $response = $this->failureHandler->onAuthenticationFailure($request, $failed);
diff --git a/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php
index d9a18624cca72..d17ef7464e7f3 100644
--- a/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php
@@ -52,6 +52,6 @@ protected function getPreAuthenticatedData(Request $request)
             throw new BadCredentialsException(sprintf('SSL credentials not found: %s, %s', $this->userKey, $this->credentialKey));
         }
 
-        return array($user, $request->server->get($this->credentialKey, ''));
+        return [$user, $request->server->get($this->credentialKey, '')];
     }
 }
diff --git a/src/Symfony/Component/Security/Http/FirewallMap.php b/src/Symfony/Component/Security/Http/FirewallMap.php
index 0f0c1fbefff1f..0ffd068dfbc28 100644
--- a/src/Symfony/Component/Security/Http/FirewallMap.php
+++ b/src/Symfony/Component/Security/Http/FirewallMap.php
@@ -24,11 +24,11 @@
  */
 class FirewallMap implements FirewallMapInterface
 {
-    private $map = array();
+    private $map = [];
 
-    public function add(RequestMatcherInterface $requestMatcher = null, array $listeners = array(), ExceptionListener $exceptionListener = null, LogoutListener $logoutListener = null)
+    public function add(RequestMatcherInterface $requestMatcher = null, array $listeners = [], ExceptionListener $exceptionListener = null, LogoutListener $logoutListener = null)
     {
-        $this->map[] = array($requestMatcher, $listeners, $exceptionListener, $logoutListener);
+        $this->map[] = [$requestMatcher, $listeners, $exceptionListener, $logoutListener];
     }
 
     /**
@@ -38,10 +38,10 @@ public function getListeners(Request $request)
     {
         foreach ($this->map as $elements) {
             if (null === $elements[0] || $elements[0]->matches($request)) {
-                return array($elements[1], $elements[2], $elements[3]);
+                return [$elements[1], $elements[2], $elements[3]];
             }
         }
 
-        return array(array(), null, null);
+        return [[], null, null];
     }
 }
diff --git a/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
index d7eeb03ba4121..c1709739d519e 100644
--- a/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
+++ b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
@@ -28,7 +28,7 @@ class LogoutUrlGenerator
     private $requestStack;
     private $router;
     private $tokenStorage;
-    private $listeners = array();
+    private $listeners = [];
     private $currentFirewall;
 
     public function __construct(RequestStack $requestStack = null, UrlGeneratorInterface $router = null, TokenStorageInterface $tokenStorage = null)
@@ -96,7 +96,7 @@ public function getLogoutUrl($key = null)
      */
     public function setCurrentFirewall($key, $context = null)
     {
-        $this->currentFirewall = array($key, $context);
+        $this->currentFirewall = [$key, $context];
     }
 
     /**
@@ -115,7 +115,7 @@ private function generateLogoutUrl($key, $referenceType)
             throw new \LogicException('Unable to generate the logout URL without a path.');
         }
 
-        $parameters = null !== $csrfTokenManager ? array($csrfParameter => (string) $csrfTokenManager->getToken($csrfTokenId)) : array();
+        $parameters = null !== $csrfTokenManager ? [$csrfParameter => (string) $csrfTokenManager->getToken($csrfTokenId)] : [];
 
         if ('/' === $logoutPath[0]) {
             if (!$this->requestStack) {
diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
index f17d573ae4fd4..c12c26e9d14cf 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
@@ -35,10 +35,10 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
     const COOKIE_DELIMITER = ':';
 
     protected $logger;
-    protected $options = array(
+    protected $options = [
         'secure' => false,
         'httponly' => true,
-    );
+    ];
     private $providerKey;
     private $secret;
     private $userProviders;
@@ -129,19 +129,19 @@ final public function autoLogin(Request $request)
             throw $e;
         } catch (UsernameNotFoundException $e) {
             if (null !== $this->logger) {
-                $this->logger->info('User for remember-me cookie not found.', array('exception' => $e));
+                $this->logger->info('User for remember-me cookie not found.', ['exception' => $e]);
             }
 
             $this->loginFail($request, $e);
         } catch (UnsupportedUserException $e) {
             if (null !== $this->logger) {
-                $this->logger->warning('User class for remember-me cookie not supported.', array('exception' => $e));
+                $this->logger->warning('User class for remember-me cookie not supported.', ['exception' => $e]);
             }
 
             $this->loginFail($request, $e);
         } catch (AuthenticationException $e) {
             if (null !== $this->logger) {
-                $this->logger->debug('Remember-Me authentication failed.', array('exception' => $e));
+                $this->logger->debug('Remember-Me authentication failed.', ['exception' => $e]);
             }
 
             $this->loginFail($request, $e);
@@ -274,7 +274,7 @@ protected function encodeCookie(array $cookieParts)
     protected function cancelCookie(Request $request)
     {
         if (null !== $this->logger) {
-            $this->logger->debug('Clearing remember-me cookie.', array('name' => $this->options['name']));
+            $this->logger->debug('Clearing remember-me cookie.', ['name' => $this->options['name']]);
         }
 
         $request->attributes->set(self::COOKIE_ATTR_NAME, new Cookie($this->options['name'], null, 1, $this->options['path'], $this->options['domain'], $this->options['secure'], $this->options['httponly']));
@@ -294,7 +294,7 @@ protected function isRememberMeRequested(Request $request)
         $parameter = ParameterBagUtils::getRequestParameterValue($request, $this->options['remember_me_parameter']);
 
         if (null === $parameter && null !== $this->logger) {
-            $this->logger->debug('Did not send remember-me cookie.', array('parameter' => $this->options['remember_me_parameter']));
+            $this->logger->debug('Did not send remember-me cookie.', ['parameter' => $this->options['remember_me_parameter']]);
         }
 
         return 'true' === $parameter || 'on' === $parameter || '1' === $parameter || 'yes' === $parameter || true === $parameter;
diff --git a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
index dcb7e1e64e067..272a5cc2db1c7 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
@@ -79,7 +79,7 @@ protected function processAutoLoginCookie(array $cookieParts, Request $request)
         $request->attributes->set(self::COOKIE_ATTR_NAME,
             new Cookie(
                 $this->options['name'],
-                $this->encodeCookie(array($series, $tokenValue)),
+                $this->encodeCookie([$series, $tokenValue]),
                 time() + $this->options['lifetime'],
                 $this->options['path'],
                 $this->options['domain'],
@@ -112,7 +112,7 @@ protected function onLoginSuccess(Request $request, Response $response, TokenInt
         $response->headers->setCookie(
             new Cookie(
                 $this->options['name'],
-                $this->encodeCookie(array($series, $tokenValue)),
+                $this->encodeCookie([$series, $tokenValue]),
                 time() + $this->options['lifetime'],
                 $this->options['path'],
                 $this->options['domain'],
diff --git a/src/Symfony/Component/Security/Http/RememberMe/ResponseListener.php b/src/Symfony/Component/Security/Http/RememberMe/ResponseListener.php
index 5467e02365e73..7d931166dd138 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/ResponseListener.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/ResponseListener.php
@@ -41,6 +41,6 @@ public function onKernelResponse(FilterResponseEvent $event)
      */
     public static function getSubscribedEvents()
     {
-        return array(KernelEvents::RESPONSE => 'onKernelResponse');
+        return [KernelEvents::RESPONSE => 'onKernelResponse'];
     }
 }
diff --git a/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
index dce2026f3a13d..48d88e5730b27 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
@@ -100,12 +100,12 @@ protected function generateCookieValue($class, $username, $expires, $password)
     {
         // $username is encoded because it might contain COOKIE_DELIMITER,
         // we assume other values don't
-        return $this->encodeCookie(array(
+        return $this->encodeCookie([
             $class,
             base64_encode($username),
             $expires,
             $this->generateCookieHash($class, $username, $expires, $password),
-        ));
+        ]);
     }
 
     /**
diff --git a/src/Symfony/Component/Security/Http/Tests/AccessMapTest.php b/src/Symfony/Component/Security/Http/Tests/AccessMapTest.php
index 822043d63c8c3..8ae9581e2c848 100644
--- a/src/Symfony/Component/Security/Http/Tests/AccessMapTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/AccessMapTest.php
@@ -23,10 +23,10 @@ public function testReturnsFirstMatchedPattern()
         $requestMatcher2 = $this->getRequestMatcher($request, true);
 
         $map = new AccessMap();
-        $map->add($requestMatcher1, array('ROLE_ADMIN'), 'http');
-        $map->add($requestMatcher2, array('ROLE_USER'), 'https');
+        $map->add($requestMatcher1, ['ROLE_ADMIN'], 'http');
+        $map->add($requestMatcher2, ['ROLE_USER'], 'https');
 
-        $this->assertSame(array(array('ROLE_USER'), 'https'), $map->getPatterns($request));
+        $this->assertSame([['ROLE_USER'], 'https'], $map->getPatterns($request));
     }
 
     public function testReturnsEmptyPatternIfNoneMatched()
@@ -35,9 +35,9 @@ public function testReturnsEmptyPatternIfNoneMatched()
         $requestMatcher = $this->getRequestMatcher($request, false);
 
         $map = new AccessMap();
-        $map->add($requestMatcher, array('ROLE_USER'), 'https');
+        $map->add($requestMatcher, ['ROLE_USER'], 'https');
 
-        $this->assertSame(array(null, null), $map->getPatterns($request));
+        $this->assertSame([null, null], $map->getPatterns($request));
     }
 
     private function getRequestMatcher($request, $matches)
diff --git a/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php
index cc2f504b88685..a9c18f3475d5c 100644
--- a/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php
@@ -35,12 +35,12 @@ protected function setUp()
         $this->session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\SessionInterface')->getMock();
         $this->request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
         $this->request->expects($this->any())->method('getSession')->will($this->returnValue($this->session));
-        $this->exception = $this->getMockBuilder('Symfony\Component\Security\Core\Exception\AuthenticationException')->setMethods(array('getMessage'))->getMock();
+        $this->exception = $this->getMockBuilder('Symfony\Component\Security\Core\Exception\AuthenticationException')->setMethods(['getMessage'])->getMock();
     }
 
     public function testForward()
     {
-        $options = array('failure_forward' => true);
+        $options = ['failure_forward' => true];
 
         $subRequest = $this->getRequest();
         $subRequest->attributes->expects($this->once())
@@ -67,7 +67,7 @@ public function testRedirect()
             ->method('createRedirectResponse')->with($this->request, '/login')
             ->will($this->returnValue($response));
 
-        $handler = new DefaultAuthenticationFailureHandler($this->httpKernel, $this->httpUtils, array(), $this->logger);
+        $handler = new DefaultAuthenticationFailureHandler($this->httpKernel, $this->httpUtils, [], $this->logger);
         $result = $handler->onAuthenticationFailure($this->request, $this->exception);
 
         $this->assertSame($response, $result);
@@ -78,13 +78,13 @@ public function testExceptionIsPersistedInSession()
         $this->session->expects($this->once())
             ->method('set')->with(Security::AUTHENTICATION_ERROR, $this->exception);
 
-        $handler = new DefaultAuthenticationFailureHandler($this->httpKernel, $this->httpUtils, array(), $this->logger);
+        $handler = new DefaultAuthenticationFailureHandler($this->httpKernel, $this->httpUtils, [], $this->logger);
         $handler->onAuthenticationFailure($this->request, $this->exception);
     }
 
     public function testExceptionIsPassedInRequestOnForward()
     {
-        $options = array('failure_forward' => true);
+        $options = ['failure_forward' => true];
 
         $subRequest = $this->getRequest();
         $subRequest->attributes->expects($this->once())
@@ -105,15 +105,15 @@ public function testRedirectIsLogged()
         $this->logger
             ->expects($this->once())
             ->method('debug')
-            ->with('Authentication failure, redirect triggered.', array('failure_path' => '/login'));
+            ->with('Authentication failure, redirect triggered.', ['failure_path' => '/login']);
 
-        $handler = new DefaultAuthenticationFailureHandler($this->httpKernel, $this->httpUtils, array(), $this->logger);
+        $handler = new DefaultAuthenticationFailureHandler($this->httpKernel, $this->httpUtils, [], $this->logger);
         $handler->onAuthenticationFailure($this->request, $this->exception);
     }
 
     public function testForwardIsLogged()
     {
-        $options = array('failure_forward' => true);
+        $options = ['failure_forward' => true];
 
         $this->httpUtils->expects($this->once())
             ->method('createRequest')->with($this->request, '/login')
@@ -122,7 +122,7 @@ public function testForwardIsLogged()
         $this->logger
             ->expects($this->once())
             ->method('debug')
-            ->with('Authentication failure, forward triggered.', array('failure_path' => '/login'));
+            ->with('Authentication failure, forward triggered.', ['failure_path' => '/login']);
 
         $handler = new DefaultAuthenticationFailureHandler($this->httpKernel, $this->httpUtils, $options, $this->logger);
         $handler->onAuthenticationFailure($this->request, $this->exception);
@@ -130,7 +130,7 @@ public function testForwardIsLogged()
 
     public function testFailurePathCanBeOverwritten()
     {
-        $options = array('failure_path' => '/auth/login');
+        $options = ['failure_path' => '/auth/login'];
 
         $this->httpUtils->expects($this->once())
             ->method('createRedirectResponse')->with($this->request, '/auth/login');
@@ -148,7 +148,7 @@ public function testFailurePathCanBeOverwrittenWithRequest()
         $this->httpUtils->expects($this->once())
             ->method('createRedirectResponse')->with($this->request, '/auth/login');
 
-        $handler = new DefaultAuthenticationFailureHandler($this->httpKernel, $this->httpUtils, array(), $this->logger);
+        $handler = new DefaultAuthenticationFailureHandler($this->httpKernel, $this->httpUtils, [], $this->logger);
         $handler->onAuthenticationFailure($this->request, $this->exception);
     }
 
@@ -156,18 +156,18 @@ public function testFailurePathCanBeOverwrittenWithNestedAttributeInRequest()
     {
         $this->request->expects($this->once())
             ->method('get')->with('_failure_path')
-            ->will($this->returnValue(array('value' => '/auth/login')));
+            ->will($this->returnValue(['value' => '/auth/login']));
 
         $this->httpUtils->expects($this->once())
             ->method('createRedirectResponse')->with($this->request, '/auth/login');
 
-        $handler = new DefaultAuthenticationFailureHandler($this->httpKernel, $this->httpUtils, array('failure_path_parameter' => '_failure_path[value]'), $this->logger);
+        $handler = new DefaultAuthenticationFailureHandler($this->httpKernel, $this->httpUtils, ['failure_path_parameter' => '_failure_path[value]'], $this->logger);
         $handler->onAuthenticationFailure($this->request, $this->exception);
     }
 
     public function testFailurePathParameterCanBeOverwritten()
     {
-        $options = array('failure_path_parameter' => '_my_failure_path');
+        $options = ['failure_path_parameter' => '_my_failure_path'];
 
         $this->request->expects($this->once())
             ->method('get')->with('_my_failure_path')
diff --git a/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php
index a7b8547b6b53d..531d49227f2c2 100644
--- a/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php
@@ -42,72 +42,72 @@ public function getRequestRedirections()
         $requestWithSession = Request::create('/');
         $requestWithSession->setSession($session);
 
-        return array(
-            'default' => array(
+        return [
+            'default' => [
                 Request::create('/'),
-                array(),
+                [],
                 '/',
-            ),
-            'forced target path' => array(
+            ],
+            'forced target path' => [
                 Request::create('/'),
-                array('always_use_default_target_path' => true, 'default_target_path' => '/dashboard'),
+                ['always_use_default_target_path' => true, 'default_target_path' => '/dashboard'],
                 '/dashboard',
-            ),
-            'target path as query string' => array(
+            ],
+            'target path as query string' => [
                 Request::create('/?_target_path=/dashboard'),
-                array(),
+                [],
                 '/dashboard',
-            ),
-            'target path name as query string is customized' => array(
+            ],
+            'target path name as query string is customized' => [
                 Request::create('/?_my_target_path=/dashboard'),
-                array('target_path_parameter' => '_my_target_path'),
+                ['target_path_parameter' => '_my_target_path'],
                 '/dashboard',
-            ),
-            'target path name as query string is customized and nested' => array(
+            ],
+            'target path name as query string is customized and nested' => [
                 Request::create('/?_target_path[value]=/dashboard'),
-                array('target_path_parameter' => '_target_path[value]'),
+                ['target_path_parameter' => '_target_path[value]'],
                 '/dashboard',
-            ),
-            'target path in session' => array(
+            ],
+            'target path in session' => [
                 $requestWithSession,
-                array(),
+                [],
                 '/admin/dashboard',
-            ),
-            'target path as referer' => array(
-                Request::create('/', 'GET', array(), array(), array(), array('HTTP_REFERER' => 'http://localhost/dashboard')),
-                array('use_referer' => true),
+            ],
+            'target path as referer' => [
+                Request::create('/', 'GET', [], [], [], ['HTTP_REFERER' => 'http://localhost/dashboard']),
+                ['use_referer' => true],
                 '/dashboard',
-            ),
-            'target path as referer is ignored if not configured' => array(
-                Request::create('/', 'GET', array(), array(), array(), array('HTTP_REFERER' => 'http://localhost/dashboard')),
-                array(),
+            ],
+            'target path as referer is ignored if not configured' => [
+                Request::create('/', 'GET', [], [], [], ['HTTP_REFERER' => 'http://localhost/dashboard']),
+                [],
                 '/',
-            ),
-            'target path as referer when referer not set' => array(
+            ],
+            'target path as referer when referer not set' => [
                 Request::create('/'),
-                array('use_referer' => true),
+                ['use_referer' => true],
                 '/',
-            ),
-            'target path as referer when referer is ?' => array(
-                Request::create('/', 'GET', array(), array(), array(), array('HTTP_REFERER' => '?')),
-                array('use_referer' => true),
+            ],
+            'target path as referer when referer is ?' => [
+                Request::create('/', 'GET', [], [], [], ['HTTP_REFERER' => '?']),
+                ['use_referer' => true],
                 '/',
-            ),
-            'target path should be different than login URL' => array(
-                Request::create('/', 'GET', array(), array(), array(), array('HTTP_REFERER' => 'http://localhost/login')),
-                array('use_referer' => true, 'login_path' => '/login'),
+            ],
+            'target path should be different than login URL' => [
+                Request::create('/', 'GET', [], [], [], ['HTTP_REFERER' => 'http://localhost/login']),
+                ['use_referer' => true, 'login_path' => '/login'],
                 '/',
-            ),
-            'target path should be different than login URL (query string does not matter)' => array(
-                Request::create('/', 'GET', array(), array(), array(), array('HTTP_REFERER' => 'http://localhost/login?t=1&p=2')),
-                array('use_referer' => true, 'login_path' => '/login'),
+            ],
+            'target path should be different than login URL (query string does not matter)' => [
+                Request::create('/', 'GET', [], [], [], ['HTTP_REFERER' => 'http://localhost/login?t=1&p=2']),
+                ['use_referer' => true, 'login_path' => '/login'],
                 '/',
-            ),
-            'target path should be different than login URL (login_path as a route)' => array(
-                Request::create('/', 'GET', array(), array(), array(), array('HTTP_REFERER' => 'http://localhost/login?t=1&p=2')),
-                array('use_referer' => true, 'login_path' => 'login_route'),
+            ],
+            'target path should be different than login URL (login_path as a route)' => [
+                Request::create('/', 'GET', [], [], [], ['HTTP_REFERER' => 'http://localhost/login?t=1&p=2']),
+                ['use_referer' => true, 'login_path' => 'login_route'],
                 '/',
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Security/Http/Tests/EntryPoint/RetryAuthenticationEntryPointTest.php b/src/Symfony/Component/Security/Http/Tests/EntryPoint/RetryAuthenticationEntryPointTest.php
index abd90fb4ae78f..05c85f23b70fd 100644
--- a/src/Symfony/Component/Security/Http/Tests/EntryPoint/RetryAuthenticationEntryPointTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/EntryPoint/RetryAuthenticationEntryPointTest.php
@@ -32,34 +32,34 @@ public function testStart($httpPort, $httpsPort, $request, $expectedUrl)
     public function dataForStart()
     {
         if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
-            return array(array());
+            return [[]];
         }
 
-        return array(
-            array(
+        return [
+            [
                 80,
                 443,
                 Request::create('http://localhost/foo/bar?baz=bat'),
                 'https://localhost/foo/bar?baz=bat',
-            ),
-            array(
+            ],
+            [
                 80,
                 443,
                 Request::create('https://localhost/foo/bar?baz=bat'),
                 'http://localhost/foo/bar?baz=bat',
-            ),
-            array(
+            ],
+            [
                 80,
                 123,
                 Request::create('http://localhost/foo/bar?baz=bat'),
                 'https://localhost:123/foo/bar?baz=bat',
-            ),
-            array(
+            ],
+            [
                 8080,
                 443,
                 Request::create('https://localhost/foo/bar?baz=bat'),
                 'http://localhost:8080/foo/bar?baz=bat',
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/AbstractPreAuthenticatedListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/AbstractPreAuthenticatedListenerTest.php
index dd7f75e67e221..ee74e61c01f70 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/AbstractPreAuthenticatedListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/AbstractPreAuthenticatedListenerTest.php
@@ -21,9 +21,9 @@ class AbstractPreAuthenticatedListenerTest extends TestCase
 {
     public function testHandleWithValidValues()
     {
-        $userCredentials = array('TheUser', 'TheCredentials');
+        $userCredentials = ['TheUser', 'TheCredentials'];
 
-        $request = new Request(array(), array(), array(), array(), array(), array());
+        $request = new Request([], [], [], [], [], []);
 
         $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
 
@@ -47,11 +47,11 @@ public function testHandleWithValidValues()
             ->will($this->returnValue($token))
         ;
 
-        $listener = $this->getMockForAbstractClass('Symfony\Component\Security\Http\Firewall\AbstractPreAuthenticatedListener', array(
+        $listener = $this->getMockForAbstractClass('Symfony\Component\Security\Http\Firewall\AbstractPreAuthenticatedListener', [
             $tokenStorage,
             $authenticationManager,
             'TheProviderKey',
-        ));
+        ]);
         $listener
             ->expects($this->once())
             ->method('getPreAuthenticatedData')
@@ -69,9 +69,9 @@ public function testHandleWithValidValues()
 
     public function testHandleWhenAuthenticationFails()
     {
-        $userCredentials = array('TheUser', 'TheCredentials');
+        $userCredentials = ['TheUser', 'TheCredentials'];
 
-        $request = new Request(array(), array(), array(), array(), array(), array());
+        $request = new Request([], [], [], [], [], []);
 
         $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
         $tokenStorage
@@ -93,11 +93,11 @@ public function testHandleWhenAuthenticationFails()
             ->will($this->throwException($exception))
         ;
 
-        $listener = $this->getMockForAbstractClass('Symfony\Component\Security\Http\Firewall\AbstractPreAuthenticatedListener', array(
+        $listener = $this->getMockForAbstractClass('Symfony\Component\Security\Http\Firewall\AbstractPreAuthenticatedListener', [
             $tokenStorage,
             $authenticationManager,
             'TheProviderKey',
-        ));
+        ]);
         $listener
             ->expects($this->once())
             ->method('getPreAuthenticatedData')
@@ -115,11 +115,11 @@ public function testHandleWhenAuthenticationFails()
 
     public function testHandleWhenAuthenticationFailsWithDifferentToken()
     {
-        $userCredentials = array('TheUser', 'TheCredentials');
+        $userCredentials = ['TheUser', 'TheCredentials'];
 
-        $token = new UsernamePasswordToken('TheUsername', 'ThePassword', 'TheProviderKey', array('ROLE_FOO'));
+        $token = new UsernamePasswordToken('TheUsername', 'ThePassword', 'TheProviderKey', ['ROLE_FOO']);
 
-        $request = new Request(array(), array(), array(), array(), array(), array());
+        $request = new Request([], [], [], [], [], []);
 
         $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
         $tokenStorage
@@ -141,11 +141,11 @@ public function testHandleWhenAuthenticationFailsWithDifferentToken()
             ->will($this->throwException($exception))
         ;
 
-        $listener = $this->getMockForAbstractClass('Symfony\Component\Security\Http\Firewall\AbstractPreAuthenticatedListener', array(
+        $listener = $this->getMockForAbstractClass('Symfony\Component\Security\Http\Firewall\AbstractPreAuthenticatedListener', [
             $tokenStorage,
             $authenticationManager,
             'TheProviderKey',
-        ));
+        ]);
         $listener
             ->expects($this->once())
             ->method('getPreAuthenticatedData')
@@ -163,11 +163,11 @@ public function testHandleWhenAuthenticationFailsWithDifferentToken()
 
     public function testHandleWithASimilarAuthenticatedToken()
     {
-        $userCredentials = array('TheUser', 'TheCredentials');
+        $userCredentials = ['TheUser', 'TheCredentials'];
 
-        $request = new Request(array(), array(), array(), array(), array(), array());
+        $request = new Request([], [], [], [], [], []);
 
-        $token = new PreAuthenticatedToken('TheUser', 'TheCredentials', 'TheProviderKey', array('ROLE_FOO'));
+        $token = new PreAuthenticatedToken('TheUser', 'TheCredentials', 'TheProviderKey', ['ROLE_FOO']);
 
         $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
         $tokenStorage
@@ -182,11 +182,11 @@ public function testHandleWithASimilarAuthenticatedToken()
             ->method('authenticate')
         ;
 
-        $listener = $this->getMockForAbstractClass('Symfony\Component\Security\Http\Firewall\AbstractPreAuthenticatedListener', array(
+        $listener = $this->getMockForAbstractClass('Symfony\Component\Security\Http\Firewall\AbstractPreAuthenticatedListener', [
             $tokenStorage,
             $authenticationManager,
             'TheProviderKey',
-        ));
+        ]);
         $listener
             ->expects($this->once())
             ->method('getPreAuthenticatedData')
@@ -204,11 +204,11 @@ public function testHandleWithASimilarAuthenticatedToken()
 
     public function testHandleWithAnInvalidSimilarToken()
     {
-        $userCredentials = array('TheUser', 'TheCredentials');
+        $userCredentials = ['TheUser', 'TheCredentials'];
 
-        $request = new Request(array(), array(), array(), array(), array(), array());
+        $request = new Request([], [], [], [], [], []);
 
-        $token = new PreAuthenticatedToken('AnotherUser', 'TheCredentials', 'TheProviderKey', array('ROLE_FOO'));
+        $token = new PreAuthenticatedToken('AnotherUser', 'TheCredentials', 'TheProviderKey', ['ROLE_FOO']);
 
         $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
         $tokenStorage
@@ -231,11 +231,11 @@ public function testHandleWithAnInvalidSimilarToken()
             ->will($this->throwException($exception))
         ;
 
-        $listener = $this->getMockForAbstractClass('Symfony\Component\Security\Http\Firewall\AbstractPreAuthenticatedListener', array(
+        $listener = $this->getMockForAbstractClass('Symfony\Component\Security\Http\Firewall\AbstractPreAuthenticatedListener', [
             $tokenStorage,
             $authenticationManager,
             'TheProviderKey',
-        ));
+        ]);
         $listener
             ->expects($this->once())
             ->method('getPreAuthenticatedData')
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php
index c49527bc14d66..92b2270877fbc 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php
@@ -28,7 +28,7 @@ public function testHandleWhenTheAccessDecisionManagerDecidesToRefuseAccess()
             ->expects($this->any())
             ->method('getPatterns')
             ->with($this->equalTo($request))
-            ->will($this->returnValue(array(array('foo' => 'bar'), null)))
+            ->will($this->returnValue([['foo' => 'bar'], null]))
         ;
 
         $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
@@ -49,7 +49,7 @@ public function testHandleWhenTheAccessDecisionManagerDecidesToRefuseAccess()
         $accessDecisionManager
             ->expects($this->once())
             ->method('decide')
-            ->with($this->equalTo($token), $this->equalTo(array('foo' => 'bar')), $this->equalTo($request))
+            ->with($this->equalTo($token), $this->equalTo(['foo' => 'bar']), $this->equalTo($request))
             ->will($this->returnValue(false))
         ;
 
@@ -79,7 +79,7 @@ public function testHandleWhenTheTokenIsNotAuthenticated()
             ->expects($this->any())
             ->method('getPatterns')
             ->with($this->equalTo($request))
-            ->will($this->returnValue(array(array('foo' => 'bar'), null)))
+            ->will($this->returnValue([['foo' => 'bar'], null]))
         ;
 
         $notAuthenticatedToken = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
@@ -120,7 +120,7 @@ public function testHandleWhenTheTokenIsNotAuthenticated()
         $accessDecisionManager
             ->expects($this->once())
             ->method('decide')
-            ->with($this->equalTo($authenticatedToken), $this->equalTo(array('foo' => 'bar')), $this->equalTo($request))
+            ->with($this->equalTo($authenticatedToken), $this->equalTo(['foo' => 'bar']), $this->equalTo($request))
             ->will($this->returnValue(true))
         ;
 
@@ -150,7 +150,7 @@ public function testHandleWhenThereIsNoAccessMapEntryMatchingTheRequest()
             ->expects($this->any())
             ->method('getPatterns')
             ->with($this->equalTo($request))
-            ->will($this->returnValue(array(null, null)))
+            ->will($this->returnValue([null, null]))
         ;
 
         $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php
index 5bd0c80829664..f6f36415d37e1 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php
@@ -49,7 +49,7 @@ public function testHandleWithTokenStorageHavingNoToken()
             ->will($this->returnValue(null))
         ;
 
-        $anonymousToken = new AnonymousToken('TheSecret', 'anon.', array());
+        $anonymousToken = new AnonymousToken('TheSecret', 'anon.', []);
 
         $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
         $authenticationManager
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/BasicAuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/BasicAuthenticationListenerTest.php
index 269dbaeeaa57e..2eec46b1d16a6 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/BasicAuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/BasicAuthenticationListenerTest.php
@@ -23,10 +23,10 @@ class BasicAuthenticationListenerTest extends TestCase
 {
     public function testHandleWithValidUsernameAndPasswordServerParameters()
     {
-        $request = new Request(array(), array(), array(), array(), array(), array(
+        $request = new Request([], [], [], [], [], [
             'PHP_AUTH_USER' => 'TheUsername',
             'PHP_AUTH_PW' => 'ThePassword',
-        ));
+        ]);
 
         $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
 
@@ -69,10 +69,10 @@ public function testHandleWithValidUsernameAndPasswordServerParameters()
 
     public function testHandleWhenAuthenticationFails()
     {
-        $request = new Request(array(), array(), array(), array(), array(), array(
+        $request = new Request([], [], [], [], [], [
             'PHP_AUTH_USER' => 'TheUsername',
             'PHP_AUTH_PW' => 'ThePassword',
-        ));
+        ]);
 
         $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
 
@@ -99,7 +99,7 @@ public function testHandleWhenAuthenticationFails()
 
         $listener = new BasicAuthenticationListener(
             $tokenStorage,
-            new AuthenticationProviderManager(array($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface')->getMock())),
+            new AuthenticationProviderManager([$this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface')->getMock()]),
             'TheProviderKey',
             $authenticationEntryPoint
         );
@@ -148,9 +148,9 @@ public function testHandleWithNoUsernameServerParameter()
 
     public function testHandleWithASimilarAuthenticatedToken()
     {
-        $request = new Request(array(), array(), array(), array(), array(), array('PHP_AUTH_USER' => 'TheUsername'));
+        $request = new Request([], [], [], [], [], ['PHP_AUTH_USER' => 'TheUsername']);
 
-        $token = new UsernamePasswordToken('TheUsername', 'ThePassword', 'TheProviderKey', array('ROLE_FOO'));
+        $token = new UsernamePasswordToken('TheUsername', 'ThePassword', 'TheProviderKey', ['ROLE_FOO']);
 
         $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
         $tokenStorage
@@ -198,12 +198,12 @@ public function testItRequiresProviderKey()
 
     public function testHandleWithADifferentAuthenticatedToken()
     {
-        $request = new Request(array(), array(), array(), array(), array(), array(
+        $request = new Request([], [], [], [], [], [
             'PHP_AUTH_USER' => 'TheUsername',
             'PHP_AUTH_PW' => 'ThePassword',
-        ));
+        ]);
 
-        $token = new PreAuthenticatedToken('TheUser', 'TheCredentials', 'TheProviderKey', array('ROLE_FOO'));
+        $token = new PreAuthenticatedToken('TheUser', 'TheCredentials', 'TheProviderKey', ['ROLE_FOO']);
 
         $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
         $tokenStorage
@@ -228,7 +228,7 @@ public function testHandleWithADifferentAuthenticatedToken()
 
         $listener = new BasicAuthenticationListener(
             $tokenStorage,
-            new AuthenticationProviderManager(array($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface')->getMock())),
+            new AuthenticationProviderManager([$this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface')->getMock()]),
             'TheProviderKey',
             $authenticationEntryPoint
         );
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ChannelListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ChannelListenerTest.php
index 3016269c04b27..3740faec8ba8e 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/ChannelListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/ChannelListenerTest.php
@@ -31,7 +31,7 @@ public function testHandleWithNotSecuredRequestAndHttpChannel()
             ->expects($this->any())
             ->method('getPatterns')
             ->with($this->equalTo($request))
-            ->will($this->returnValue(array(array(), 'http')))
+            ->will($this->returnValue([[], 'http']))
         ;
 
         $entryPoint = $this->getMockBuilder('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')->getMock();
@@ -69,7 +69,7 @@ public function testHandleWithSecuredRequestAndHttpsChannel()
             ->expects($this->any())
             ->method('getPatterns')
             ->with($this->equalTo($request))
-            ->will($this->returnValue(array(array(), 'https')))
+            ->will($this->returnValue([[], 'https']))
         ;
 
         $entryPoint = $this->getMockBuilder('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')->getMock();
@@ -109,7 +109,7 @@ public function testHandleWithNotSecuredRequestAndHttpsChannel()
             ->expects($this->any())
             ->method('getPatterns')
             ->with($this->equalTo($request))
-            ->will($this->returnValue(array(array(), 'https')))
+            ->will($this->returnValue([[], 'https']))
         ;
 
         $entryPoint = $this->getMockBuilder('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')->getMock();
@@ -152,7 +152,7 @@ public function testHandleWithSecuredRequestAndHttpChannel()
             ->expects($this->any())
             ->method('getPatterns')
             ->with($this->equalTo($request))
-            ->will($this->returnValue(array(array(), 'http')))
+            ->will($this->returnValue([[], 'http']))
         ;
 
         $entryPoint = $this->getMockBuilder('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')->getMock();
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
index bb49d039611c6..e970cd0592356 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
@@ -42,7 +42,7 @@ public function testItRequiresContextKey()
     {
         new ContextListener(
             $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock(),
-            array(),
+            [],
             ''
         );
     }
@@ -53,7 +53,7 @@ public function testItRequiresContextKey()
      */
     public function testUserProvidersNeedToImplementAnInterface()
     {
-        $this->handleEventWithPreviousSession(new TokenStorage(), array(new \stdClass()));
+        $this->handleEventWithPreviousSession(new TokenStorage(), [new \stdClass()]);
     }
 
     public function testOnKernelResponseWillAddSession()
@@ -112,7 +112,7 @@ public function testOnKernelResponseWithoutSession()
             new Response()
         );
 
-        $listener = new ContextListener($tokenStorage, array(), 'session', null, new EventDispatcher());
+        $listener = new ContextListener($tokenStorage, [], 'session', null, new EventDispatcher());
         $listener->onKernelResponse($event);
 
         $this->assertTrue($session->isStarted());
@@ -131,7 +131,7 @@ public function testOnKernelResponseWithoutSessionNorToken()
             new Response()
         );
 
-        $listener = new ContextListener(new TokenStorage(), array(), 'session', null, new EventDispatcher());
+        $listener = new ContextListener(new TokenStorage(), [], 'session', null, new EventDispatcher());
         $listener->onKernelResponse($event);
 
         $this->assertFalse($session->isStarted());
@@ -166,19 +166,19 @@ public function testInvalidTokenInSession($token)
             ->method('setToken')
             ->with(null);
 
-        $listener = new ContextListener($tokenStorage, array(), 'key123');
+        $listener = new ContextListener($tokenStorage, [], 'key123');
         $listener->handle($event);
     }
 
     public function provideInvalidToken()
     {
-        return array(
-            array('foo'),
-            array('O:8:"NotFound":0:{}'),
-            array(serialize(new \__PHP_Incomplete_Class())),
-            array(serialize(null)),
-            array(null),
-        );
+        return [
+            ['foo'],
+            ['O:8:"NotFound":0:{}'],
+            [serialize(new \__PHP_Incomplete_Class())],
+            [serialize(null)],
+            [null],
+        ];
     }
 
     public function testHandleAddsKernelResponseListener()
@@ -189,7 +189,7 @@ public function testHandleAddsKernelResponseListener()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $listener = new ContextListener($tokenStorage, array(), 'key123', null, $dispatcher);
+        $listener = new ContextListener($tokenStorage, [], 'key123', null, $dispatcher);
 
         $event->expects($this->any())
             ->method('isMasterRequest')
@@ -200,7 +200,7 @@ public function testHandleAddsKernelResponseListener()
 
         $dispatcher->expects($this->once())
             ->method('addListener')
-            ->with(KernelEvents::RESPONSE, array($listener, 'onKernelResponse'));
+            ->with(KernelEvents::RESPONSE, [$listener, 'onKernelResponse']);
 
         $listener->handle($event);
     }
@@ -213,7 +213,7 @@ public function testOnKernelResponseListenerRemovesItself()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $listener = new ContextListener($tokenStorage, array(), 'key123', null, $dispatcher);
+        $listener = new ContextListener($tokenStorage, [], 'key123', null, $dispatcher);
 
         $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
         $request->expects($this->any())
@@ -229,7 +229,7 @@ public function testOnKernelResponseListenerRemovesItself()
 
         $dispatcher->expects($this->once())
             ->method('removeListener')
-            ->with(KernelEvents::RESPONSE, array($listener, 'onKernelResponse'));
+            ->with(KernelEvents::RESPONSE, [$listener, 'onKernelResponse']);
 
         $listener->onKernelResponse($event);
     }
@@ -286,7 +286,7 @@ public function testTryAllUserProvidersUntilASupportingUserProviderIsFound()
     {
         $tokenStorage = new TokenStorage();
         $refreshedUser = new User('foobar', 'baz');
-        $this->handleEventWithPreviousSession($tokenStorage, array(new NotSupportingUserProvider(), new SupportingUserProvider($refreshedUser)), $refreshedUser);
+        $this->handleEventWithPreviousSession($tokenStorage, [new NotSupportingUserProvider(), new SupportingUserProvider($refreshedUser)], $refreshedUser);
 
         $this->assertSame($refreshedUser, $tokenStorage->getToken()->getUser());
     }
@@ -295,7 +295,7 @@ public function testNextSupportingUserProviderIsTriedIfPreviousSupportingUserPro
     {
         $tokenStorage = new TokenStorage();
         $refreshedUser = new User('foobar', 'baz');
-        $this->handleEventWithPreviousSession($tokenStorage, array(new SupportingUserProvider(), new SupportingUserProvider($refreshedUser)), $refreshedUser);
+        $this->handleEventWithPreviousSession($tokenStorage, [new SupportingUserProvider(), new SupportingUserProvider($refreshedUser)], $refreshedUser);
 
         $this->assertSame($refreshedUser, $tokenStorage->getToken()->getUser());
     }
@@ -303,7 +303,7 @@ public function testNextSupportingUserProviderIsTriedIfPreviousSupportingUserPro
     public function testTokenIsSetToNullIfNoUserWasLoadedByTheRegisteredUserProviders()
     {
         $tokenStorage = new TokenStorage();
-        $this->handleEventWithPreviousSession($tokenStorage, array(new NotSupportingUserProvider(), new SupportingUserProvider()));
+        $this->handleEventWithPreviousSession($tokenStorage, [new NotSupportingUserProvider(), new SupportingUserProvider()]);
 
         $this->assertNull($tokenStorage->getToken());
     }
@@ -313,14 +313,14 @@ public function testTokenIsSetToNullIfNoUserWasLoadedByTheRegisteredUserProvider
      */
     public function testRuntimeExceptionIsThrownIfNoSupportingUserProviderWasRegistered()
     {
-        $this->handleEventWithPreviousSession(new TokenStorage(), array(new NotSupportingUserProvider(), new NotSupportingUserProvider()));
+        $this->handleEventWithPreviousSession(new TokenStorage(), [new NotSupportingUserProvider(), new NotSupportingUserProvider()]);
     }
 
     public function testAcceptsProvidersAsTraversable()
     {
         $tokenStorage = new TokenStorage();
         $refreshedUser = new User('foobar', 'baz');
-        $this->handleEventWithPreviousSession($tokenStorage, new \ArrayObject(array(new NotSupportingUserProvider(), new SupportingUserProvider($refreshedUser))), $refreshedUser);
+        $this->handleEventWithPreviousSession($tokenStorage, new \ArrayObject([new NotSupportingUserProvider(), new SupportingUserProvider($refreshedUser)]), $refreshedUser);
 
         $this->assertSame($refreshedUser, $tokenStorage->getToken()->getUser());
     }
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php
index 08662acf16879..53fedebcad705 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php
@@ -63,13 +63,13 @@ public function testAuthenticationExceptionWithEntryPoint(\Exception $exception)
 
     public function getAuthenticationExceptionProvider()
     {
-        return array(
-            array($e = new AuthenticationException(), new HttpException(Response::HTTP_UNAUTHORIZED, '', $e, array(), 0)),
-            array(new \LogicException('random', 0, $e = new AuthenticationException()), new HttpException(Response::HTTP_UNAUTHORIZED, '', $e, array(), 0)),
-            array(new \LogicException('random', 0, $e = new AuthenticationException('embed', 0, new AuthenticationException())), new HttpException(Response::HTTP_UNAUTHORIZED, 'embed', $e, array(), 0)),
-            array(new \LogicException('random', 0, $e = new AuthenticationException('embed', 0, new AccessDeniedException())), new HttpException(Response::HTTP_UNAUTHORIZED, 'embed', $e, array(), 0)),
-            array($e = new AuthenticationException('random', 0, new \LogicException()), new HttpException(Response::HTTP_UNAUTHORIZED, 'random', $e, array(), 0)),
-        );
+        return [
+            [$e = new AuthenticationException(), new HttpException(Response::HTTP_UNAUTHORIZED, '', $e, [], 0)],
+            [new \LogicException('random', 0, $e = new AuthenticationException()), new HttpException(Response::HTTP_UNAUTHORIZED, '', $e, [], 0)],
+            [new \LogicException('random', 0, $e = new AuthenticationException('embed', 0, new AuthenticationException())), new HttpException(Response::HTTP_UNAUTHORIZED, 'embed', $e, [], 0)],
+            [new \LogicException('random', 0, $e = new AuthenticationException('embed', 0, new AccessDeniedException())), new HttpException(Response::HTTP_UNAUTHORIZED, 'embed', $e, [], 0)],
+            [$e = new AuthenticationException('random', 0, new \LogicException()), new HttpException(Response::HTTP_UNAUTHORIZED, 'random', $e, [], 0)],
+        ];
     }
 
     public function testExceptionWhenEntryPointReturnsBadValue()
@@ -159,13 +159,13 @@ public function testAccessDeniedExceptionNotFullFledged(\Exception $exception, \
 
     public function getAccessDeniedExceptionProvider()
     {
-        return array(
-            array(new AccessDeniedException()),
-            array(new \LogicException('random', 0, $e = new AccessDeniedException()), $e),
-            array(new \LogicException('random', 0, $e = new AccessDeniedException('embed', new AccessDeniedException())), $e),
-            array(new \LogicException('random', 0, $e = new AccessDeniedException('embed', new AuthenticationException())), $e),
-            array(new AccessDeniedException('random', new \LogicException())),
-        );
+        return [
+            [new AccessDeniedException()],
+            [new \LogicException('random', 0, $e = new AccessDeniedException()), $e],
+            [new \LogicException('random', 0, $e = new AccessDeniedException('embed', new AccessDeniedException())), $e],
+            [new \LogicException('random', 0, $e = new AccessDeniedException('embed', new AuthenticationException())), $e],
+            [new AccessDeniedException('random', new \LogicException())],
+        ];
     }
 
     private function createEntryPoint(Response $response = null)
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php
index c909c58eb4e2f..fbcea3d738e70 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php
@@ -191,7 +191,7 @@ private function getGetResponseEvent()
             ->method('getRequest')
             ->will($this->returnValue($request = new Request()));
 
-        return array($event, $request);
+        return [$event, $request];
     }
 
     private function getHandler()
@@ -212,16 +212,16 @@ private function getListener($successHandler = null, $tokenManager = null)
             $tokenStorage = $this->getTokenStorage(),
             $httpUtils = $this->getHttpUtils(),
             $successHandler ?: $this->getSuccessHandler(),
-            $options = array(
+            $options = [
                 'csrf_parameter' => '_csrf_token',
                 'csrf_token_id' => 'logout',
                 'logout_path' => '/logout',
                 'target_url' => '/',
-            ),
+            ],
             $tokenManager
         );
 
-        return array($listener, $tokenStorage, $httpUtils, $options);
+        return [$listener, $tokenStorage, $httpUtils, $options];
     }
 
     private function getSuccessHandler()
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
index 9acb804132636..356da44cae201 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
@@ -420,7 +420,7 @@ protected function getListener($withDispatcher = false, $catchExceptions = true,
             $sessionStrategy = ($withSessionStrategy ? $this->getSessionStrategy() : null)
         );
 
-        return array($listener, $tokenStorage, $service, $manager, $logger, $dispatcher, $sessionStrategy);
+        return [$listener, $tokenStorage, $service, $manager, $logger, $dispatcher, $sessionStrategy];
     }
 
     protected function getLogger()
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php
index c02812f6ce5c2..ee5334c1e79b2 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php
@@ -19,11 +19,11 @@ class RemoteUserAuthenticationListenerTest extends TestCase
 {
     public function testGetPreAuthenticatedData()
     {
-        $serverVars = array(
+        $serverVars = [
             'REMOTE_USER' => 'TheUser',
-        );
+        ];
 
-        $request = new Request(array(), array(), array(), array(), array(), $serverVars);
+        $request = new Request([], [], [], [], [], $serverVars);
 
         $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
 
@@ -38,8 +38,8 @@ public function testGetPreAuthenticatedData()
         $method = new \ReflectionMethod($listener, 'getPreAuthenticatedData');
         $method->setAccessible(true);
 
-        $result = $method->invokeArgs($listener, array($request));
-        $this->assertSame($result, array('TheUser', null));
+        $result = $method->invokeArgs($listener, [$request]);
+        $this->assertSame($result, ['TheUser', null]);
     }
 
     /**
@@ -47,7 +47,7 @@ public function testGetPreAuthenticatedData()
      */
     public function testGetPreAuthenticatedDataNoUser()
     {
-        $request = new Request(array(), array(), array(), array(), array(), array());
+        $request = new Request([], [], [], [], [], []);
 
         $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
 
@@ -62,16 +62,16 @@ public function testGetPreAuthenticatedDataNoUser()
         $method = new \ReflectionMethod($listener, 'getPreAuthenticatedData');
         $method->setAccessible(true);
 
-        $result = $method->invokeArgs($listener, array($request));
+        $result = $method->invokeArgs($listener, [$request]);
     }
 
     public function testGetPreAuthenticatedDataWithDifferentKeys()
     {
-        $userCredentials = array('TheUser', null);
+        $userCredentials = ['TheUser', null];
 
-        $request = new Request(array(), array(), array(), array(), array(), array(
+        $request = new Request([], [], [], [], [], [
             'TheUserKey' => 'TheUser',
-        ));
+        ]);
         $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
 
         $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
@@ -86,7 +86,7 @@ public function testGetPreAuthenticatedDataWithDifferentKeys()
         $method = new \ReflectionMethod($listener, 'getPreAuthenticatedData');
         $method->setAccessible(true);
 
-        $result = $method->invokeArgs($listener, array($request));
+        $result = $method->invokeArgs($listener, [$request]);
         $this->assertSame($result, $userCredentials);
     }
 }
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php
index 0c4229856b4f5..1cfb5983b1972 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php
@@ -102,7 +102,7 @@ protected function setUp()
 
         $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
 
-        $this->request = new Request(array(), array(), array(), array(), array(), array());
+        $this->request = new Request([], [], [], [], [], []);
 
         $this->event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
         $this->event
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
index 0e61ee208ee2c..de581859494fd 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
@@ -81,7 +81,7 @@ public function testExitUserThrowsAuthenticationExceptionIfNoCurrentToken()
      */
     public function testExitUserThrowsAuthenticationExceptionIfOriginalTokenCannotBeFound()
     {
-        $token = new UsernamePasswordToken('username', '', 'key', array('ROLE_FOO'));
+        $token = new UsernamePasswordToken('username', '', 'key', ['ROLE_FOO']);
 
         $this->tokenStorage->setToken($token);
         $this->request->query->set('_switch_user', SwitchUserListener::EXIT_VALUE);
@@ -92,15 +92,15 @@ public function testExitUserThrowsAuthenticationExceptionIfOriginalTokenCannotBe
 
     public function testExitUserUpdatesToken()
     {
-        $originalToken = new UsernamePasswordToken('username', '', 'key', array());
-        $this->tokenStorage->setToken(new UsernamePasswordToken('username', '', 'key', array(new SwitchUserRole('ROLE_PREVIOUS', $originalToken))));
+        $originalToken = new UsernamePasswordToken('username', '', 'key', []);
+        $this->tokenStorage->setToken(new UsernamePasswordToken('username', '', 'key', [new SwitchUserRole('ROLE_PREVIOUS', $originalToken)]));
 
         $this->request->query->set('_switch_user', SwitchUserListener::EXIT_VALUE);
 
         $listener = new SwitchUserListener($this->tokenStorage, $this->userProvider, $this->userChecker, 'provider123', $this->accessDecisionManager);
         $listener->handle($this->event);
 
-        $this->assertSame(array(), $this->request->query->all());
+        $this->assertSame([], $this->request->query->all());
         $this->assertSame('', $this->request->server->get('QUERY_STRING'));
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\RedirectResponse', $this->event->getResponse());
         $this->assertSame($this->request->getUri(), $this->event->getResponse()->getTargetUrl());
@@ -118,7 +118,7 @@ public function testExitUserDispatchesEventWithRefreshedUser()
             ->with($originalUser)
             ->willReturn($refreshedUser);
         $originalToken = new UsernamePasswordToken($originalUser, '', 'key');
-        $this->tokenStorage->setToken(new UsernamePasswordToken('username', '', 'key', array(new SwitchUserRole('ROLE_PREVIOUS', $originalToken))));
+        $this->tokenStorage->setToken(new UsernamePasswordToken('username', '', 'key', [new SwitchUserRole('ROLE_PREVIOUS', $originalToken)]));
         $this->request->query->set('_switch_user', SwitchUserListener::EXIT_VALUE);
 
         $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
@@ -142,7 +142,7 @@ public function testExitUserDoesNotDispatchEventWithStringUser()
             ->expects($this->never())
             ->method('refreshUser');
         $originalToken = new UsernamePasswordToken($originalUser, '', 'key');
-        $this->tokenStorage->setToken(new UsernamePasswordToken('username', '', 'key', array(new SwitchUserRole('ROLE_PREVIOUS', $originalToken))));
+        $this->tokenStorage->setToken(new UsernamePasswordToken('username', '', 'key', [new SwitchUserRole('ROLE_PREVIOUS', $originalToken)]));
         $this->request->query->set('_switch_user', SwitchUserListener::EXIT_VALUE);
 
         $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
@@ -160,13 +160,13 @@ public function testExitUserDoesNotDispatchEventWithStringUser()
      */
     public function testSwitchUserIsDisallowed()
     {
-        $token = new UsernamePasswordToken('username', '', 'key', array('ROLE_FOO'));
+        $token = new UsernamePasswordToken('username', '', 'key', ['ROLE_FOO']);
 
         $this->tokenStorage->setToken($token);
         $this->request->query->set('_switch_user', 'kuba');
 
         $this->accessDecisionManager->expects($this->once())
-            ->method('decide')->with($token, array('ROLE_ALLOWED_TO_SWITCH'))
+            ->method('decide')->with($token, ['ROLE_ALLOWED_TO_SWITCH'])
             ->will($this->returnValue(false));
 
         $listener = new SwitchUserListener($this->tokenStorage, $this->userProvider, $this->userChecker, 'provider123', $this->accessDecisionManager);
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordFormAuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordFormAuthenticationListenerTest.php
index 6ab543225c697..198ee6566dfdd 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordFormAuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordFormAuthenticationListenerTest.php
@@ -31,7 +31,7 @@ class UsernamePasswordFormAuthenticationListenerTest extends TestCase
      */
     public function testHandleWhenUsernameLength($username, $ok)
     {
-        $request = Request::create('/login_check', 'POST', array('_username' => $username));
+        $request = Request::create('/login_check', 'POST', ['_username' => $username]);
         $request->setSession($this->getMockBuilder('Symfony\Component\HttpFoundation\Session\SessionInterface')->getMock());
 
         $httpUtils = $this->getMockBuilder('Symfony\Component\Security\Http\HttpUtils')->getMock();
@@ -63,7 +63,7 @@ public function testHandleWhenUsernameLength($username, $ok)
             'TheProviderKey',
             $this->getMockBuilder('Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface')->getMock(),
             $failureHandler,
-            array('require_previous_session' => false)
+            ['require_previous_session' => false]
         );
 
         $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
@@ -83,7 +83,7 @@ public function testHandleWhenUsernameLength($username, $ok)
      */
     public function testHandleNonStringUsername($postOnly)
     {
-        $request = Request::create('/login_check', 'POST', array('_username' => array()));
+        $request = Request::create('/login_check', 'POST', ['_username' => []]);
         $request->setSession($this->getMockBuilder('Symfony\Component\HttpFoundation\Session\SessionInterface')->getMock());
         $listener = new UsernamePasswordFormAuthenticationListener(
             new TokenStorage(),
@@ -93,7 +93,7 @@ public function testHandleNonStringUsername($postOnly)
             'foo',
             new DefaultAuthenticationSuccessHandler($httpUtils),
             new DefaultAuthenticationFailureHandler($this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(), $httpUtils),
-            array('require_previous_session' => false, 'post_only' => $postOnly)
+            ['require_previous_session' => false, 'post_only' => $postOnly]
         );
         $event = new GetResponseEvent($this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(), $request, HttpKernelInterface::MASTER_REQUEST);
         $listener->handle($event);
@@ -101,17 +101,17 @@ public function testHandleNonStringUsername($postOnly)
 
     public function postOnlyDataProvider()
     {
-        return array(
-            array(true),
-            array(false),
-        );
+        return [
+            [true],
+            [false],
+        ];
     }
 
     public function getUsernameForLength()
     {
-        return array(
-            array(str_repeat('x', Security::MAX_USERNAME_LENGTH + 1), false),
-            array(str_repeat('x', Security::MAX_USERNAME_LENGTH - 1), true),
-        );
+        return [
+            [str_repeat('x', Security::MAX_USERNAME_LENGTH + 1), false],
+            [str_repeat('x', Security::MAX_USERNAME_LENGTH - 1), true],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordJsonAuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordJsonAuthenticationListenerTest.php
index d8bb77bb9e818..ed7acfbe5d7a7 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordJsonAuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordJsonAuthenticationListenerTest.php
@@ -36,7 +36,7 @@ class UsernamePasswordJsonAuthenticationListenerTest extends TestCase
      */
     private $listener;
 
-    private function createListener(array $options = array(), $success = true, $matchCheckPath = true)
+    private function createListener(array $options = [], $success = true, $matchCheckPath = true)
     {
         $tokenStorage = $this->getMockBuilder(TokenStorageInterface::class)->getMock();
         $httpUtils = $this->getMockBuilder(HttpUtils::class)->getMock();
@@ -66,7 +66,7 @@ private function createListener(array $options = array(), $success = true, $matc
     public function testHandleSuccessIfRequestContentTypeIsJson()
     {
         $this->createListener();
-        $request = new Request(array(), array(), array(), array(), array(), array('HTTP_CONTENT_TYPE' => 'application/json'), '{"username": "dunglas", "password": "foo"}');
+        $request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], '{"username": "dunglas", "password": "foo"}');
         $event = new GetResponseEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
 
         $this->listener->handle($event);
@@ -76,7 +76,7 @@ public function testHandleSuccessIfRequestContentTypeIsJson()
     public function testSuccessIfRequestFormatIsJsonLD()
     {
         $this->createListener();
-        $request = new Request(array(), array(), array(), array(), array(), array(), '{"username": "dunglas", "password": "foo"}');
+        $request = new Request([], [], [], [], [], [], '{"username": "dunglas", "password": "foo"}');
         $request->setRequestFormat('json-ld');
         $event = new GetResponseEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
 
@@ -86,8 +86,8 @@ public function testSuccessIfRequestFormatIsJsonLD()
 
     public function testHandleFailure()
     {
-        $this->createListener(array(), false);
-        $request = new Request(array(), array(), array(), array(), array(), array('HTTP_CONTENT_TYPE' => 'application/json'), '{"username": "dunglas", "password": "foo"}');
+        $this->createListener([], false);
+        $request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], '{"username": "dunglas", "password": "foo"}');
         $event = new GetResponseEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
 
         $this->listener->handle($event);
@@ -96,8 +96,8 @@ public function testHandleFailure()
 
     public function testUsePath()
     {
-        $this->createListener(array('username_path' => 'user.login', 'password_path' => 'user.pwd'));
-        $request = new Request(array(), array(), array(), array(), array(), array('HTTP_CONTENT_TYPE' => 'application/json'), '{"user": {"login": "dunglas", "pwd": "foo"}}');
+        $this->createListener(['username_path' => 'user.login', 'password_path' => 'user.pwd']);
+        $request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], '{"user": {"login": "dunglas", "pwd": "foo"}}');
         $event = new GetResponseEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
 
         $this->listener->handle($event);
@@ -125,7 +125,7 @@ public function testAttemptAuthenticationNoJson()
     public function testAttemptAuthenticationNoUsername()
     {
         $this->createListener();
-        $request = new Request(array(), array(), array(), array(), array(), array('HTTP_CONTENT_TYPE' => 'application/json'), '{"usr": "dunglas", "password": "foo"}');
+        $request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], '{"usr": "dunglas", "password": "foo"}');
         $event = new GetResponseEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
 
         $this->listener->handle($event);
@@ -138,7 +138,7 @@ public function testAttemptAuthenticationNoUsername()
     public function testAttemptAuthenticationNoPassword()
     {
         $this->createListener();
-        $request = new Request(array(), array(), array(), array(), array(), array('HTTP_CONTENT_TYPE' => 'application/json'), '{"username": "dunglas", "pass": "foo"}');
+        $request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], '{"username": "dunglas", "pass": "foo"}');
         $event = new GetResponseEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
 
         $this->listener->handle($event);
@@ -151,7 +151,7 @@ public function testAttemptAuthenticationNoPassword()
     public function testAttemptAuthenticationUsernameNotAString()
     {
         $this->createListener();
-        $request = new Request(array(), array(), array(), array(), array(), array('HTTP_CONTENT_TYPE' => 'application/json'), '{"username": 1, "password": "foo"}');
+        $request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], '{"username": 1, "password": "foo"}');
         $event = new GetResponseEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
 
         $this->listener->handle($event);
@@ -164,7 +164,7 @@ public function testAttemptAuthenticationUsernameNotAString()
     public function testAttemptAuthenticationPasswordNotAString()
     {
         $this->createListener();
-        $request = new Request(array(), array(), array(), array(), array(), array('HTTP_CONTENT_TYPE' => 'application/json'), '{"username": "dunglas", "password": 1}');
+        $request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], '{"username": "dunglas", "password": 1}');
         $event = new GetResponseEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
 
         $this->listener->handle($event);
@@ -174,7 +174,7 @@ public function testAttemptAuthenticationUsernameTooLong()
     {
         $this->createListener();
         $username = str_repeat('x', Security::MAX_USERNAME_LENGTH + 1);
-        $request = new Request(array(), array(), array(), array(), array(), array('HTTP_CONTENT_TYPE' => 'application/json'), sprintf('{"username": "%s", "password": 1}', $username));
+        $request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], sprintf('{"username": "%s", "password": 1}', $username));
         $event = new GetResponseEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
 
         $this->listener->handle($event);
@@ -183,8 +183,8 @@ public function testAttemptAuthenticationUsernameTooLong()
 
     public function testDoesNotAttemptAuthenticationIfRequestPathDoesNotMatchCheckPath()
     {
-        $this->createListener(array('check_path' => '/'), true, false);
-        $request = new Request(array(), array(), array(), array(), array(), array('HTTP_CONTENT_TYPE' => 'application/json'));
+        $this->createListener(['check_path' => '/'], true, false);
+        $request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json']);
         $event = new GetResponseEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
         $event->setResponse(new Response('original'));
 
@@ -195,7 +195,7 @@ public function testDoesNotAttemptAuthenticationIfRequestPathDoesNotMatchCheckPa
     public function testDoesNotAttemptAuthenticationIfRequestContentTypeIsNotJson()
     {
         $this->createListener();
-        $request = new Request(array(), array(), array(), array(), array(), array(), '{"username": "dunglas", "password": "foo"}');
+        $request = new Request([], [], [], [], [], [], '{"username": "dunglas", "password": "foo"}');
         $event = new GetResponseEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
         $event->setResponse(new Response('original'));
 
@@ -205,8 +205,8 @@ public function testDoesNotAttemptAuthenticationIfRequestContentTypeIsNotJson()
 
     public function testAttemptAuthenticationIfRequestPathMatchesCheckPath()
     {
-        $this->createListener(array('check_path' => '/'));
-        $request = new Request(array(), array(), array(), array(), array(), array('HTTP_CONTENT_TYPE' => 'application/json'), '{"username": "dunglas", "password": "foo"}');
+        $this->createListener(['check_path' => '/']);
+        $request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], '{"username": "dunglas", "password": "foo"}');
         $event = new GetResponseEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
 
         $this->listener->handle($event);
@@ -216,7 +216,7 @@ public function testAttemptAuthenticationIfRequestPathMatchesCheckPath()
     public function testNoErrorOnMissingSessionStrategy()
     {
         $this->createListener();
-        $request = new Request(array(), array(), array(), array(), array(), array('HTTP_CONTENT_TYPE' => 'application/json'), '{"username": "dunglas", "password": "foo"}');
+        $request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], '{"username": "dunglas", "password": "foo"}');
         $this->configurePreviousSession($request);
         $event = new GetResponseEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
 
@@ -227,7 +227,7 @@ public function testNoErrorOnMissingSessionStrategy()
     public function testMigratesViaSessionStrategy()
     {
         $this->createListener();
-        $request = new Request(array(), array(), array(), array(), array(), array('HTTP_CONTENT_TYPE' => 'application/json'), '{"username": "dunglas", "password": "foo"}');
+        $request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], '{"username": "dunglas", "password": "foo"}');
         $this->configurePreviousSession($request);
         $event = new GetResponseEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
 
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
index 07206202ab2c6..c55eaae0f3157 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
@@ -22,7 +22,7 @@ class X509AuthenticationListenerTest extends TestCase
      */
     public function testGetPreAuthenticatedData($user, $credentials)
     {
-        $serverVars = array();
+        $serverVars = [];
         if ('' !== $user) {
             $serverVars['SSL_CLIENT_S_DN_Email'] = $user;
         }
@@ -30,7 +30,7 @@ public function testGetPreAuthenticatedData($user, $credentials)
             $serverVars['SSL_CLIENT_S_DN'] = $credentials;
         }
 
-        $request = new Request(array(), array(), array(), array(), array(), $serverVars);
+        $request = new Request([], [], [], [], [], $serverVars);
 
         $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
 
@@ -41,16 +41,16 @@ public function testGetPreAuthenticatedData($user, $credentials)
         $method = new \ReflectionMethod($listener, 'getPreAuthenticatedData');
         $method->setAccessible(true);
 
-        $result = $method->invokeArgs($listener, array($request));
-        $this->assertSame($result, array($user, $credentials));
+        $result = $method->invokeArgs($listener, [$request]);
+        $this->assertSame($result, [$user, $credentials]);
     }
 
     public static function dataProviderGetPreAuthenticatedData()
     {
-        return array(
-            'validValues' => array('TheUser', 'TheCredentials'),
-            'noCredentials' => array('TheUser', ''),
-        );
+        return [
+            'validValues' => ['TheUser', 'TheCredentials'],
+            'noCredentials' => ['TheUser', ''],
+        ];
     }
 
     /**
@@ -59,7 +59,7 @@ public static function dataProviderGetPreAuthenticatedData()
     public function testGetPreAuthenticatedDataNoUser($emailAddress)
     {
         $credentials = 'CN=Sample certificate DN/emailAddress='.$emailAddress;
-        $request = new Request(array(), array(), array(), array(), array(), array('SSL_CLIENT_S_DN' => $credentials));
+        $request = new Request([], [], [], [], [], ['SSL_CLIENT_S_DN' => $credentials]);
 
         $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
 
@@ -70,16 +70,16 @@ public function testGetPreAuthenticatedDataNoUser($emailAddress)
         $method = new \ReflectionMethod($listener, 'getPreAuthenticatedData');
         $method->setAccessible(true);
 
-        $result = $method->invokeArgs($listener, array($request));
-        $this->assertSame($result, array($emailAddress, $credentials));
+        $result = $method->invokeArgs($listener, [$request]);
+        $this->assertSame($result, [$emailAddress, $credentials]);
     }
 
     public static function dataProviderGetPreAuthenticatedDataNoUser()
     {
-        return array(
-            'basicEmailAddress' => array('cert@example.com'),
-            'emailAddressWithPlusSign' => array('cert+something@example.com'),
-        );
+        return [
+            'basicEmailAddress' => ['cert@example.com'],
+            'emailAddressWithPlusSign' => ['cert+something@example.com'],
+        ];
     }
 
     /**
@@ -87,7 +87,7 @@ public static function dataProviderGetPreAuthenticatedDataNoUser()
      */
     public function testGetPreAuthenticatedDataNoData()
     {
-        $request = new Request(array(), array(), array(), array(), array(), array());
+        $request = new Request([], [], [], [], [], []);
 
         $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
 
@@ -98,17 +98,17 @@ public function testGetPreAuthenticatedDataNoData()
         $method = new \ReflectionMethod($listener, 'getPreAuthenticatedData');
         $method->setAccessible(true);
 
-        $result = $method->invokeArgs($listener, array($request));
+        $result = $method->invokeArgs($listener, [$request]);
     }
 
     public function testGetPreAuthenticatedDataWithDifferentKeys()
     {
-        $userCredentials = array('TheUser', 'TheCredentials');
+        $userCredentials = ['TheUser', 'TheCredentials'];
 
-        $request = new Request(array(), array(), array(), array(), array(), array(
+        $request = new Request([], [], [], [], [], [
             'TheUserKey' => 'TheUser',
             'TheCredentialsKey' => 'TheCredentials',
-        ));
+        ]);
         $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
 
         $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
@@ -118,7 +118,7 @@ public function testGetPreAuthenticatedDataWithDifferentKeys()
         $method = new \ReflectionMethod($listener, 'getPreAuthenticatedData');
         $method->setAccessible(true);
 
-        $result = $method->invokeArgs($listener, array($request));
+        $result = $method->invokeArgs($listener, [$request]);
         $this->assertSame($result, $userCredentials);
     }
 }
diff --git a/src/Symfony/Component/Security/Http/Tests/FirewallMapTest.php b/src/Symfony/Component/Security/Http/Tests/FirewallMapTest.php
index 5cd9d7dea353d..04fe3b4ea3052 100644
--- a/src/Symfony/Component/Security/Http/Tests/FirewallMapTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/FirewallMapTest.php
@@ -31,7 +31,7 @@ public function testGetListeners()
             ->will($this->returnValue(false))
         ;
 
-        $map->add($notMatchingMatcher, array($this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock()));
+        $map->add($notMatchingMatcher, [$this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock()]);
 
         $matchingMatcher = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestMatcher')->getMock();
         $matchingMatcher
@@ -43,7 +43,7 @@ public function testGetListeners()
         $theListener = $this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock();
         $theException = $this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ExceptionListener')->disableOriginalConstructor()->getMock();
 
-        $map->add($matchingMatcher, array($theListener), $theException);
+        $map->add($matchingMatcher, [$theListener], $theException);
 
         $tooLateMatcher = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestMatcher')->getMock();
         $tooLateMatcher
@@ -51,11 +51,11 @@ public function testGetListeners()
             ->method('matches')
         ;
 
-        $map->add($tooLateMatcher, array($this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock()));
+        $map->add($tooLateMatcher, [$this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock()]);
 
         list($listeners, $exception) = $map->getListeners($request);
 
-        $this->assertEquals(array($theListener), $listeners);
+        $this->assertEquals([$theListener], $listeners);
         $this->assertEquals($theException, $exception);
     }
 
@@ -73,12 +73,12 @@ public function testGetListenersWithAnEntryHavingNoRequestMatcher()
             ->will($this->returnValue(false))
         ;
 
-        $map->add($notMatchingMatcher, array($this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock()));
+        $map->add($notMatchingMatcher, [$this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock()]);
 
         $theListener = $this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock();
         $theException = $this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ExceptionListener')->disableOriginalConstructor()->getMock();
 
-        $map->add(null, array($theListener), $theException);
+        $map->add(null, [$theListener], $theException);
 
         $tooLateMatcher = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestMatcher')->getMock();
         $tooLateMatcher
@@ -86,11 +86,11 @@ public function testGetListenersWithAnEntryHavingNoRequestMatcher()
             ->method('matches')
         ;
 
-        $map->add($tooLateMatcher, array($this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock()));
+        $map->add($tooLateMatcher, [$this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock()]);
 
         list($listeners, $exception) = $map->getListeners($request);
 
-        $this->assertEquals(array($theListener), $listeners);
+        $this->assertEquals([$theListener], $listeners);
         $this->assertEquals($theException, $exception);
     }
 
@@ -108,11 +108,11 @@ public function testGetListenersWithNoMatchingEntry()
             ->will($this->returnValue(false))
         ;
 
-        $map->add($notMatchingMatcher, array($this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock()));
+        $map->add($notMatchingMatcher, [$this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock()]);
 
         list($listeners, $exception) = $map->getListeners($request);
 
-        $this->assertEquals(array(), $listeners);
+        $this->assertEquals([], $listeners);
         $this->assertNull($exception);
     }
 }
diff --git a/src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php b/src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php
index a0d6f79714414..60c854cdd9b83 100644
--- a/src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php
@@ -67,13 +67,13 @@ public function testCreateRedirectResponseWithBadRequestsDomain($url)
 
     public function badRequestDomainUrls()
     {
-        return array(
-            array('http://pirate.net/foo'),
-            array('http:\\\\pirate.net/foo'),
-            array('http:/\\pirate.net/foo'),
-            array('http:\\/pirate.net/foo'),
-            array('http://////pirate.net/foo'),
-        );
+        return [
+            ['http://pirate.net/foo'],
+            ['http:\\\\pirate.net/foo'],
+            ['http:/\\pirate.net/foo'],
+            ['http:\\/pirate.net/foo'],
+            ['http://////pirate.net/foo'],
+        ];
     }
 
     public function testCreateRedirectResponseWithProtocolRelativeTarget()
@@ -91,7 +91,7 @@ public function testCreateRedirectResponseWithRouteName()
         $urlGenerator
             ->expects($this->any())
             ->method('generate')
-            ->with('foobar', array(), UrlGeneratorInterface::ABSOLUTE_URL)
+            ->with('foobar', [], UrlGeneratorInterface::ABSOLUTE_URL)
             ->will($this->returnValue('http://localhost/foo/bar'))
         ;
         $urlGenerator
@@ -173,11 +173,11 @@ public function testCreateRequestPassesSecurityContextAttributesToTheNewRequest(
 
     public function provideSecurityContextAttributes()
     {
-        return array(
-            array(Security::AUTHENTICATION_ERROR),
-            array(Security::ACCESS_DENIED_ERROR),
-            array(Security::LAST_USERNAME),
-        );
+        return [
+            [Security::AUTHENTICATION_ERROR],
+            [Security::ACCESS_DENIED_ERROR],
+            [Security::LAST_USERNAME],
+        ];
     }
 
     public function testCheckRequestPath()
@@ -215,7 +215,7 @@ public function testCheckRequestPathWithUrlMatcherAndMethodNotAllowed()
             ->expects($this->any())
             ->method('matchRequest')
             ->with($request)
-            ->will($this->throwException(new MethodNotAllowedException(array())))
+            ->will($this->throwException(new MethodNotAllowedException([])))
         ;
 
         $utils = new HttpUtils(null, $urlMatcher);
@@ -229,7 +229,7 @@ public function testCheckRequestPathWithUrlMatcherAndResourceFoundByUrl()
             ->expects($this->any())
             ->method('match')
             ->with('/foo/bar')
-            ->will($this->returnValue(array('_route' => 'foobar')))
+            ->will($this->returnValue(['_route' => 'foobar']))
         ;
 
         $utils = new HttpUtils(null, $urlMatcher);
@@ -244,7 +244,7 @@ public function testCheckRequestPathWithUrlMatcherAndResourceFoundByRequest()
             ->expects($this->any())
             ->method('matchRequest')
             ->with($request)
-            ->will($this->returnValue(array('_route' => 'foobar')))
+            ->will($this->returnValue(['_route' => 'foobar']))
         ;
 
         $utils = new HttpUtils(null, $urlMatcher);
@@ -273,7 +273,7 @@ public function testCheckPathWithoutRouteParam()
         $urlMatcher
             ->expects($this->any())
             ->method('match')
-            ->willReturn(array('_controller' => 'PathController'))
+            ->willReturn(['_controller' => 'PathController'])
         ;
 
         $utils = new HttpUtils(null, $urlMatcher);
diff --git a/src/Symfony/Component/Security/Http/Tests/Logout/CookieClearingLogoutHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/Logout/CookieClearingLogoutHandlerTest.php
index f199d0ee03cb0..8dcc10338b768 100644
--- a/src/Symfony/Component/Security/Http/Tests/Logout/CookieClearingLogoutHandlerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Logout/CookieClearingLogoutHandlerTest.php
@@ -25,7 +25,7 @@ public function testLogout()
         $response = new Response();
         $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
 
-        $handler = new CookieClearingLogoutHandler(array('foo' => array('path' => '/foo', 'domain' => 'foo.foo'), 'foo2' => array('path' => null, 'domain' => null)));
+        $handler = new CookieClearingLogoutHandler(['foo' => ['path' => '/foo', 'domain' => 'foo.foo'], 'foo2' => ['path' => null, 'domain' => null]]);
 
         $cookies = $response->headers->getCookies();
         $this->assertCount(0, $cookies);
diff --git a/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php b/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php
index 5a35dd09ee217..38b8474ffc38b 100644
--- a/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php
@@ -21,7 +21,7 @@ class AbstractRememberMeServicesTest extends TestCase
 {
     public function testGetRememberMeParameter()
     {
-        $service = $this->getService(null, array('remember_me_parameter' => 'foo'));
+        $service = $this->getService(null, ['remember_me_parameter' => 'foo']);
 
         $this->assertEquals('foo', $service->getRememberMeParameter());
     }
@@ -34,7 +34,7 @@ public function testGetSecret()
 
     public function testAutoLoginReturnsNullWhenNoCookie()
     {
-        $service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null));
+        $service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null]);
 
         $this->assertNull($service->autoLogin(new Request()));
     }
@@ -44,7 +44,7 @@ public function testAutoLoginReturnsNullWhenNoCookie()
      */
     public function testAutoLoginThrowsExceptionWhenImplementationDoesNotReturnUserInterface()
     {
-        $service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null));
+        $service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null]);
         $request = new Request();
         $request->cookies->set('foo', 'foo');
 
@@ -59,7 +59,7 @@ public function testAutoLoginThrowsExceptionWhenImplementationDoesNotReturnUserI
 
     public function testAutoLogin()
     {
-        $service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null));
+        $service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null]);
         $request = new Request();
         $request->cookies->set('foo', 'foo');
 
@@ -67,7 +67,7 @@ public function testAutoLogin()
         $user
             ->expects($this->once())
             ->method('getRoles')
-            ->will($this->returnValue(array()))
+            ->will($this->returnValue([]))
         ;
 
         $service
@@ -105,15 +105,15 @@ public function testLogout(array $options)
 
     public function provideOptionsForLogout()
     {
-        return array(
-            array(array('name' => 'foo', 'path' => '/', 'domain' => null, 'secure' => false, 'httponly' => true)),
-            array(array('name' => 'foo', 'path' => '/bar', 'domain' => 'baz.com', 'secure' => true, 'httponly' => false)),
-        );
+        return [
+            [['name' => 'foo', 'path' => '/', 'domain' => null, 'secure' => false, 'httponly' => true]],
+            [['name' => 'foo', 'path' => '/bar', 'domain' => 'baz.com', 'secure' => true, 'httponly' => false]],
+        ];
     }
 
     public function testLoginFail()
     {
-        $service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null));
+        $service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null]);
         $request = new Request();
 
         $service->loginFail($request);
@@ -123,7 +123,7 @@ public function testLoginFail()
 
     public function testLoginSuccessIsNotProcessedWhenTokenDoesNotContainUserInterfaceImplementation()
     {
-        $service = $this->getService(null, array('name' => 'foo', 'always_remember_me' => true, 'path' => null, 'domain' => null));
+        $service = $this->getService(null, ['name' => 'foo', 'always_remember_me' => true, 'path' => null, 'domain' => null]);
         $request = new Request();
         $response = new Response();
         $account = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
@@ -146,7 +146,7 @@ public function testLoginSuccessIsNotProcessedWhenTokenDoesNotContainUserInterfa
 
     public function testLoginSuccessIsNotProcessedWhenRememberMeIsNotRequested()
     {
-        $service = $this->getService(null, array('name' => 'foo', 'always_remember_me' => false, 'remember_me_parameter' => 'foo', 'path' => null, 'domain' => null));
+        $service = $this->getService(null, ['name' => 'foo', 'always_remember_me' => false, 'remember_me_parameter' => 'foo', 'path' => null, 'domain' => null]);
         $request = new Request();
         $response = new Response();
         $account = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
@@ -170,7 +170,7 @@ public function testLoginSuccessIsNotProcessedWhenRememberMeIsNotRequested()
 
     public function testLoginSuccessWhenRememberMeAlwaysIsTrue()
     {
-        $service = $this->getService(null, array('name' => 'foo', 'always_remember_me' => true, 'path' => null, 'domain' => null));
+        $service = $this->getService(null, ['name' => 'foo', 'always_remember_me' => true, 'path' => null, 'domain' => null]);
         $request = new Request();
         $response = new Response();
         $account = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
@@ -195,10 +195,10 @@ public function testLoginSuccessWhenRememberMeAlwaysIsTrue()
      */
     public function testLoginSuccessWhenRememberMeParameterWithPathIsPositive($value)
     {
-        $service = $this->getService(null, array('name' => 'foo', 'always_remember_me' => false, 'remember_me_parameter' => 'foo[bar]', 'path' => null, 'domain' => null));
+        $service = $this->getService(null, ['name' => 'foo', 'always_remember_me' => false, 'remember_me_parameter' => 'foo[bar]', 'path' => null, 'domain' => null]);
 
         $request = new Request();
-        $request->request->set('foo', array('bar' => $value));
+        $request->request->set('foo', ['bar' => $value]);
         $response = new Response();
         $account = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
         $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
@@ -222,7 +222,7 @@ public function testLoginSuccessWhenRememberMeParameterWithPathIsPositive($value
      */
     public function testLoginSuccessWhenRememberMeParameterIsPositive($value)
     {
-        $service = $this->getService(null, array('name' => 'foo', 'always_remember_me' => false, 'remember_me_parameter' => 'foo', 'path' => null, 'domain' => null));
+        $service = $this->getService(null, ['name' => 'foo', 'always_remember_me' => false, 'remember_me_parameter' => 'foo', 'path' => null, 'domain' => null]);
 
         $request = new Request();
         $request->request->set('foo', $value);
@@ -246,24 +246,24 @@ public function testLoginSuccessWhenRememberMeParameterIsPositive($value)
 
     public function getPositiveRememberMeParameterValues()
     {
-        return array(
-            array('true'),
-            array('1'),
-            array('on'),
-            array('yes'),
-            array(true),
-        );
+        return [
+            ['true'],
+            ['1'],
+            ['on'],
+            ['yes'],
+            [true],
+        ];
     }
 
     public function testEncodeCookieAndDecodeCookieAreInvertible()
     {
-        $cookieParts = array('aa', 'bb', 'cc');
+        $cookieParts = ['aa', 'bb', 'cc'];
         $service = $this->getService();
 
-        $encoded = $this->callProtected($service, 'encodeCookie', array($cookieParts));
+        $encoded = $this->callProtected($service, 'encodeCookie', [$cookieParts]);
         $this->assertInternalType('string', $encoded);
 
-        $decoded = $this->callProtected($service, 'decodeCookie', array($encoded));
+        $decoded = $this->callProtected($service, 'decodeCookie', [$encoded]);
         $this->assertSame($cookieParts, $decoded);
     }
 
@@ -273,21 +273,21 @@ public function testEncodeCookieAndDecodeCookieAreInvertible()
      */
     public function testThereShouldBeNoCookieDelimiterInCookieParts()
     {
-        $cookieParts = array('aa', 'b'.AbstractRememberMeServices::COOKIE_DELIMITER.'b', 'cc');
+        $cookieParts = ['aa', 'b'.AbstractRememberMeServices::COOKIE_DELIMITER.'b', 'cc'];
         $service = $this->getService();
 
-        $this->callProtected($service, 'encodeCookie', array($cookieParts));
+        $this->callProtected($service, 'encodeCookie', [$cookieParts]);
     }
 
-    protected function getService($userProvider = null, $options = array(), $logger = null)
+    protected function getService($userProvider = null, $options = [], $logger = null)
     {
         if (null === $userProvider) {
             $userProvider = $this->getProvider();
         }
 
-        return $this->getMockForAbstractClass('Symfony\Component\Security\Http\RememberMe\AbstractRememberMeServices', array(
-            array($userProvider), 'foosecret', 'fookey', $options, $logger,
-        ));
+        return $this->getMockForAbstractClass('Symfony\Component\Security\Http\RememberMe\AbstractRememberMeServices', [
+            [$userProvider], 'foosecret', 'fookey', $options, $logger,
+        ]);
     }
 
     protected function getProvider()
diff --git a/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
index cf142ea2adcaf..3f6b94e2c7755 100644
--- a/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
@@ -35,14 +35,14 @@ public static function setUpBeforeClass()
 
     public function testAutoLoginReturnsNullWhenNoCookie()
     {
-        $service = $this->getService(null, array('name' => 'foo'));
+        $service = $this->getService(null, ['name' => 'foo']);
 
         $this->assertNull($service->autoLogin(new Request()));
     }
 
     public function testAutoLoginThrowsExceptionOnInvalidCookie()
     {
-        $service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => false, 'remember_me_parameter' => 'foo'));
+        $service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => false, 'remember_me_parameter' => 'foo']);
         $request = new Request();
         $request->request->set('foo', 'true');
         $request->cookies->set('foo', 'foo');
@@ -53,13 +53,13 @@ public function testAutoLoginThrowsExceptionOnInvalidCookie()
 
     public function testAutoLoginThrowsExceptionOnNonExistentToken()
     {
-        $service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => false, 'remember_me_parameter' => 'foo'));
+        $service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => false, 'remember_me_parameter' => 'foo']);
         $request = new Request();
         $request->request->set('foo', 'true');
-        $request->cookies->set('foo', $this->encodeCookie(array(
+        $request->cookies->set('foo', $this->encodeCookie([
             $series = 'fooseries',
             $tokenValue = 'foovalue',
-        )));
+        ]));
 
         $tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
         $tokenProvider
@@ -76,9 +76,9 @@ public function testAutoLoginThrowsExceptionOnNonExistentToken()
     public function testAutoLoginReturnsNullOnNonExistentUser()
     {
         $userProvider = $this->getProvider();
-        $service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600, 'secure' => false, 'httponly' => false));
+        $service = $this->getService($userProvider, ['name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600, 'secure' => false, 'httponly' => false]);
         $request = new Request();
-        $request->cookies->set('foo', $this->encodeCookie(array('fooseries', 'foovalue')));
+        $request->cookies->set('foo', $this->encodeCookie(['fooseries', 'foovalue']));
 
         $tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
         $tokenProvider
@@ -101,9 +101,9 @@ public function testAutoLoginReturnsNullOnNonExistentUser()
     public function testAutoLoginThrowsExceptionOnStolenCookieAndRemovesItFromThePersistentBackend()
     {
         $userProvider = $this->getProvider();
-        $service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true));
+        $service = $this->getService($userProvider, ['name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true]);
         $request = new Request();
-        $request->cookies->set('foo', $this->encodeCookie(array('fooseries', 'foovalue')));
+        $request->cookies->set('foo', $this->encodeCookie(['fooseries', 'foovalue']));
 
         $tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
         $service->setTokenProvider($tokenProvider);
@@ -132,9 +132,9 @@ public function testAutoLoginThrowsExceptionOnStolenCookieAndRemovesItFromThePer
 
     public function testAutoLoginDoesNotAcceptAnExpiredCookie()
     {
-        $service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600));
+        $service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600]);
         $request = new Request();
-        $request->cookies->set('foo', $this->encodeCookie(array('fooseries', 'foovalue')));
+        $request->cookies->set('foo', $this->encodeCookie(['fooseries', 'foovalue']));
 
         $tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
         $tokenProvider
@@ -155,7 +155,7 @@ public function testAutoLogin()
         $user
             ->expects($this->once())
             ->method('getRoles')
-            ->will($this->returnValue(array('ROLE_FOO')))
+            ->will($this->returnValue(['ROLE_FOO']))
         ;
 
         $userProvider = $this->getProvider();
@@ -166,9 +166,9 @@ public function testAutoLogin()
             ->will($this->returnValue($user))
         ;
 
-        $service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'secure' => false, 'httponly' => false, 'always_remember_me' => true, 'lifetime' => 3600));
+        $service = $this->getService($userProvider, ['name' => 'foo', 'path' => null, 'domain' => null, 'secure' => false, 'httponly' => false, 'always_remember_me' => true, 'lifetime' => 3600]);
         $request = new Request();
-        $request->cookies->set('foo', $this->encodeCookie(array('fooseries', 'foovalue')));
+        $request->cookies->set('foo', $this->encodeCookie(['fooseries', 'foovalue']));
 
         $tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
         $tokenProvider
@@ -189,9 +189,9 @@ public function testAutoLogin()
 
     public function testLogout()
     {
-        $service = $this->getService(null, array('name' => 'foo', 'path' => '/foo', 'domain' => 'foodomain.foo', 'secure' => true, 'httponly' => false));
+        $service = $this->getService(null, ['name' => 'foo', 'path' => '/foo', 'domain' => 'foodomain.foo', 'secure' => true, 'httponly' => false]);
         $request = new Request();
-        $request->cookies->set('foo', $this->encodeCookie(array('fooseries', 'foovalue')));
+        $request->cookies->set('foo', $this->encodeCookie(['fooseries', 'foovalue']));
         $response = new Response();
         $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
 
@@ -216,7 +216,7 @@ public function testLogout()
 
     public function testLogoutSimplyIgnoresNonSetRequestCookie()
     {
-        $service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null));
+        $service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null]);
         $request = new Request();
         $response = new Response();
         $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
@@ -238,7 +238,7 @@ public function testLogoutSimplyIgnoresNonSetRequestCookie()
 
     public function testLogoutSimplyIgnoresInvalidCookie()
     {
-        $service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null));
+        $service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null]);
         $request = new Request();
         $request->cookies->set('foo', 'somefoovalue');
         $response = new Response();
@@ -258,7 +258,7 @@ public function testLogoutSimplyIgnoresInvalidCookie()
 
     public function testLoginFail()
     {
-        $service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null));
+        $service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null]);
         $request = new Request();
 
         $this->assertFalse($request->attributes->has(RememberMeServicesInterface::COOKIE_ATTR_NAME));
@@ -316,13 +316,13 @@ protected function encodeCookie(array $parts)
         return $r->invoke($service, $parts);
     }
 
-    protected function getService($userProvider = null, $options = array(), $logger = null)
+    protected function getService($userProvider = null, $options = [], $logger = null)
     {
         if (null === $userProvider) {
             $userProvider = $this->getProvider();
         }
 
-        return new PersistentTokenBasedRememberMeServices(array($userProvider), 'foosecret', 'fookey', $options, $logger);
+        return new PersistentTokenBasedRememberMeServices([$userProvider], 'foosecret', 'fookey', $options, $logger);
     }
 
     protected function getProvider()
diff --git a/src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php b/src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php
index ba5906839467d..501d3850fa649 100644
--- a/src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php
@@ -26,9 +26,9 @@ public function testRememberMeCookieIsSentWithResponse()
     {
         $cookie = new Cookie('rememberme');
 
-        $request = $this->getRequest(array(
+        $request = $this->getRequest([
             RememberMeServicesInterface::COOKIE_ATTR_NAME => $cookie,
-        ));
+        ]);
 
         $response = $this->getResponse();
         $response->headers->expects($this->once())->method('setCookie')->with($cookie);
@@ -41,9 +41,9 @@ public function testRememberMeCookieIsNotSendWithResponseForSubRequests()
     {
         $cookie = new Cookie('rememberme');
 
-        $request = $this->getRequest(array(
+        $request = $this->getRequest([
             RememberMeServicesInterface::COOKIE_ATTR_NAME => $cookie,
-        ));
+        ]);
 
         $response = $this->getResponse();
         $response->headers->expects($this->never())->method('setCookie');
@@ -67,10 +67,10 @@ public function testItSubscribesToTheOnKernelResponseEvent()
     {
         $listener = new ResponseListener();
 
-        $this->assertSame(array(KernelEvents::RESPONSE => 'onKernelResponse'), ResponseListener::getSubscribedEvents());
+        $this->assertSame([KernelEvents::RESPONSE => 'onKernelResponse'], ResponseListener::getSubscribedEvents());
     }
 
-    private function getRequest(array $attributes = array())
+    private function getRequest(array $attributes = [])
     {
         $request = new Request();
 
diff --git a/src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php b/src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
index e30d68ba69519..dd07242f1d141 100644
--- a/src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
@@ -23,14 +23,14 @@ class TokenBasedRememberMeServicesTest extends TestCase
 {
     public function testAutoLoginReturnsNullWhenNoCookie()
     {
-        $service = $this->getService(null, array('name' => 'foo'));
+        $service = $this->getService(null, ['name' => 'foo']);
 
         $this->assertNull($service->autoLogin(new Request()));
     }
 
     public function testAutoLoginThrowsExceptionOnInvalidCookie()
     {
-        $service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => false, 'remember_me_parameter' => 'foo'));
+        $service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => false, 'remember_me_parameter' => 'foo']);
         $request = new Request();
         $request->request->set('foo', 'true');
         $request->cookies->set('foo', 'foo');
@@ -42,7 +42,7 @@ public function testAutoLoginThrowsExceptionOnInvalidCookie()
     public function testAutoLoginThrowsExceptionOnNonExistentUser()
     {
         $userProvider = $this->getProvider();
-        $service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600));
+        $service = $this->getService($userProvider, ['name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600]);
         $request = new Request();
         $request->cookies->set('foo', $this->getCookie('fooclass', 'foouser', time() + 3600, 'foopass'));
 
@@ -59,7 +59,7 @@ public function testAutoLoginThrowsExceptionOnNonExistentUser()
     public function testAutoLoginDoesNotAcceptCookieWithInvalidHash()
     {
         $userProvider = $this->getProvider();
-        $service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600));
+        $service = $this->getService($userProvider, ['name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600]);
         $request = new Request();
         $request->cookies->set('foo', base64_encode('class:'.base64_encode('foouser').':123456789:fooHash'));
 
@@ -84,7 +84,7 @@ public function testAutoLoginDoesNotAcceptCookieWithInvalidHash()
     public function testAutoLoginDoesNotAcceptAnExpiredCookie()
     {
         $userProvider = $this->getProvider();
-        $service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600));
+        $service = $this->getService($userProvider, ['name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600]);
         $request = new Request();
         $request->cookies->set('foo', $this->getCookie('fooclass', 'foouser', time() - 1, 'foopass'));
 
@@ -117,7 +117,7 @@ public function testAutoLogin($username)
         $user
             ->expects($this->once())
             ->method('getRoles')
-            ->will($this->returnValue(array('ROLE_FOO')))
+            ->will($this->returnValue(['ROLE_FOO']))
         ;
         $user
             ->expects($this->once())
@@ -133,7 +133,7 @@ public function testAutoLogin($username)
             ->will($this->returnValue($user))
         ;
 
-        $service = $this->getService($userProvider, array('name' => 'foo', 'always_remember_me' => true, 'lifetime' => 3600));
+        $service = $this->getService($userProvider, ['name' => 'foo', 'always_remember_me' => true, 'lifetime' => 3600]);
         $request = new Request();
         $request->cookies->set('foo', $this->getCookie('fooclass', $username, time() + 3600, 'foopass'));
 
@@ -146,15 +146,15 @@ public function testAutoLogin($username)
 
     public function provideUsernamesForAutoLogin()
     {
-        return array(
-            array('foouser', 'Simple username'),
-            array('foo'.TokenBasedRememberMeServices::COOKIE_DELIMITER.'user', 'Username might contain the delimiter'),
-        );
+        return [
+            ['foouser', 'Simple username'],
+            ['foo'.TokenBasedRememberMeServices::COOKIE_DELIMITER.'user', 'Username might contain the delimiter'],
+        ];
     }
 
     public function testLogout()
     {
-        $service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null, 'secure' => true, 'httponly' => false));
+        $service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null, 'secure' => true, 'httponly' => false]);
         $request = new Request();
         $response = new Response();
         $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
@@ -171,7 +171,7 @@ public function testLogout()
 
     public function testLoginFail()
     {
-        $service = $this->getService(null, array('name' => 'foo', 'path' => '/foo', 'domain' => 'foodomain.foo'));
+        $service = $this->getService(null, ['name' => 'foo', 'path' => '/foo', 'domain' => 'foodomain.foo']);
         $request = new Request();
 
         $service->loginFail($request);
@@ -184,7 +184,7 @@ public function testLoginFail()
 
     public function testLoginSuccessIgnoresTokensWhichDoNotContainAnUserInterfaceImplementation()
     {
-        $service = $this->getService(null, array('name' => 'foo', 'always_remember_me' => true, 'path' => null, 'domain' => null));
+        $service = $this->getService(null, ['name' => 'foo', 'always_remember_me' => true, 'path' => null, 'domain' => null]);
         $request = new Request();
         $response = new Response();
         $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
@@ -260,13 +260,13 @@ protected function encodeCookie(array $parts)
         return $r->invoke($service, $parts);
     }
 
-    protected function getService($userProvider = null, $options = array(), $logger = null)
+    protected function getService($userProvider = null, $options = [], $logger = null)
     {
         if (null === $userProvider) {
             $userProvider = $this->getProvider();
         }
 
-        $service = new TokenBasedRememberMeServices(array($userProvider), 'foosecret', 'fookey', $options, $logger);
+        $service = new TokenBasedRememberMeServices([$userProvider], 'foosecret', 'fookey', $options, $logger);
 
         return $service;
     }
diff --git a/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php b/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php
index 71af8eadc42e1..086cac259dc3e 100644
--- a/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php
@@ -24,10 +24,10 @@
  */
 class ChainDecoder implements DecoderInterface /*, ContextAwareDecoderInterface*/
 {
-    protected $decoders = array();
-    protected $decoderByFormat = array();
+    protected $decoders = [];
+    protected $decoderByFormat = [];
 
-    public function __construct(array $decoders = array())
+    public function __construct(array $decoders = [])
     {
         $this->decoders = $decoders;
     }
@@ -35,7 +35,7 @@ public function __construct(array $decoders = array())
     /**
      * {@inheritdoc}
      */
-    final public function decode($data, $format, array $context = array())
+    final public function decode($data, $format, array $context = [])
     {
         return $this->getDecoder($format, $context)->decode($data, $format, $context);
     }
diff --git a/src/Symfony/Component/Serializer/Encoder/ChainEncoder.php b/src/Symfony/Component/Serializer/Encoder/ChainEncoder.php
index 6e2b85bf27ee3..2ce403498752e 100644
--- a/src/Symfony/Component/Serializer/Encoder/ChainEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/ChainEncoder.php
@@ -24,10 +24,10 @@
  */
 class ChainEncoder implements EncoderInterface /*, ContextAwareEncoderInterface*/
 {
-    protected $encoders = array();
-    protected $encoderByFormat = array();
+    protected $encoders = [];
+    protected $encoderByFormat = [];
 
-    public function __construct(array $encoders = array())
+    public function __construct(array $encoders = [])
     {
         $this->encoders = $encoders;
     }
@@ -35,7 +35,7 @@ public function __construct(array $encoders = array())
     /**
      * {@inheritdoc}
      */
-    final public function encode($data, $format, array $context = array())
+    final public function encode($data, $format, array $context = [])
     {
         return $this->getEncoder($format, $context)->encode($data, $format, $context);
     }
diff --git a/src/Symfony/Component/Serializer/Encoder/ContextAwareDecoderInterface.php b/src/Symfony/Component/Serializer/Encoder/ContextAwareDecoderInterface.php
index eefea0ecae120..5ef89d5596cab 100644
--- a/src/Symfony/Component/Serializer/Encoder/ContextAwareDecoderInterface.php
+++ b/src/Symfony/Component/Serializer/Encoder/ContextAwareDecoderInterface.php
@@ -23,5 +23,5 @@ interface ContextAwareDecoderInterface extends DecoderInterface
      *
      * @param array $context options that decoders have access to
      */
-    public function supportsDecoding($format, array $context = array());
+    public function supportsDecoding($format, array $context = []);
 }
diff --git a/src/Symfony/Component/Serializer/Encoder/ContextAwareEncoderInterface.php b/src/Symfony/Component/Serializer/Encoder/ContextAwareEncoderInterface.php
index 0268df3d8d1cb..a8893a80f91b1 100644
--- a/src/Symfony/Component/Serializer/Encoder/ContextAwareEncoderInterface.php
+++ b/src/Symfony/Component/Serializer/Encoder/ContextAwareEncoderInterface.php
@@ -23,5 +23,5 @@ interface ContextAwareEncoderInterface extends EncoderInterface
      *
      * @param array $context options that encoders have access to
      */
-    public function supportsEncoding($format, array $context = array());
+    public function supportsEncoding($format, array $context = []);
 }
diff --git a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
index c2a70eed8d233..5845e856ea811 100644
--- a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
@@ -50,20 +50,20 @@ public function __construct($delimiter = ',', $enclosure = '"', $escapeChar = '\
     /**
      * {@inheritdoc}
      */
-    public function encode($data, $format, array $context = array())
+    public function encode($data, $format, array $context = [])
     {
         $handle = fopen('php://temp,', 'w+');
 
         if (!\is_array($data)) {
-            $data = array(array($data));
+            $data = [[$data]];
         } elseif (empty($data)) {
-            $data = array(array());
+            $data = [[]];
         } else {
             // Sequential arrays of arrays are considered as collections
             $i = 0;
             foreach ($data as $key => $value) {
                 if ($i !== $key || !\is_array($value)) {
-                    $data = array($data);
+                    $data = [$data];
                     break;
                 }
 
@@ -107,7 +107,7 @@ public function supportsEncoding($format)
     /**
      * {@inheritdoc}
      */
-    public function decode($data, $format, array $context = array())
+    public function decode($data, $format, array $context = [])
     {
         $handle = fopen('php://temp', 'r+');
         fwrite($handle, $data);
@@ -115,8 +115,8 @@ public function decode($data, $format, array $context = array())
 
         $headers = null;
         $nbHeaders = 0;
-        $headerCount = array();
-        $result = array();
+        $headerCount = [];
+        $result = [];
 
         list($delimiter, $enclosure, $escapeChar, $keySeparator) = $this->getCsvOptions($context);
 
@@ -135,7 +135,7 @@ public function decode($data, $format, array $context = array())
                 continue;
             }
 
-            $item = array();
+            $item = [];
             for ($i = 0; ($i < $nbCols) && ($i < $nbHeaders); ++$i) {
                 $depth = $headerCount[$i];
                 $arr = &$item;
@@ -148,7 +148,7 @@ public function decode($data, $format, array $context = array())
                     }
 
                     if (!isset($arr[$headers[$i][$j]])) {
-                        $arr[$headers[$i][$j]] = array();
+                        $arr[$headers[$i][$j]] = [];
                     }
 
                     $arr = &$arr[$headers[$i][$j]];
@@ -214,8 +214,8 @@ private function getCsvOptions(array $context)
      */
     private function extractHeaders(array $data)
     {
-        $headers = array();
-        $flippedHeaders = array();
+        $headers = [];
+        $flippedHeaders = [];
 
         foreach ($data as $row) {
             $previousHeader = null;
diff --git a/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php b/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php
index 0fa578099f13f..cfc591e7adf81 100644
--- a/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php
+++ b/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php
@@ -36,7 +36,7 @@ interface DecoderInterface
      *
      * @throws UnexpectedValueException
      */
-    public function decode($data, $format, array $context = array());
+    public function decode($data, $format, array $context = []);
 
     /**
      * Checks whether the deserializer can decode from given format.
diff --git a/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php b/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php
index 077e4422e484a..9b9862e2acb23 100644
--- a/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php
+++ b/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php
@@ -31,7 +31,7 @@ interface EncoderInterface
      *
      * @throws UnexpectedValueException
      */
-    public function encode($data, $format, array $context = array());
+    public function encode($data, $format, array $context = []);
 
     /**
      * Checks whether the serializer can encode to given format.
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonDecode.php b/src/Symfony/Component/Serializer/Encoder/JsonDecode.php
index bee1f7d4449f4..073aef5fcd72b 100644
--- a/src/Symfony/Component/Serializer/Encoder/JsonDecode.php
+++ b/src/Symfony/Component/Serializer/Encoder/JsonDecode.php
@@ -64,7 +64,7 @@ public function __construct($associative = false, $depth = 512)
      *
      * @see http://php.net/json_decode json_decode
      */
-    public function decode($data, $format, array $context = array())
+    public function decode($data, $format, array $context = [])
     {
         $context = $this->resolveContext($context);
 
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
index ef084eeab2b9c..3aa1701c01fec 100644
--- a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
+++ b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
@@ -32,7 +32,7 @@ public function __construct($bitmask = 0)
      *
      * {@inheritdoc}
      */
-    public function encode($data, $format, array $context = array())
+    public function encode($data, $format, array $context = [])
     {
         $context = $this->resolveContext($context);
 
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php b/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
index f4950cb3b3f47..87f6be0b177c9 100644
--- a/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
@@ -32,7 +32,7 @@ public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodin
     /**
      * {@inheritdoc}
      */
-    public function encode($data, $format, array $context = array())
+    public function encode($data, $format, array $context = [])
     {
         return $this->encodingImpl->encode($data, self::FORMAT, $context);
     }
@@ -40,7 +40,7 @@ public function encode($data, $format, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function decode($data, $format, array $context = array())
+    public function decode($data, $format, array $context = [])
     {
         return $this->decodingImpl->decode($data, self::FORMAT, $context);
     }
diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
index 96578c6bc75ea..4b84b1d47d1d7 100644
--- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -49,7 +49,7 @@ public function __construct($rootNodeName = 'response', $loadOptions = null)
     /**
      * {@inheritdoc}
      */
-    public function encode($data, $format, array $context = array())
+    public function encode($data, $format, array $context = [])
     {
         if ($data instanceof \DOMDocument) {
             return $data->saveXML();
@@ -75,7 +75,7 @@ public function encode($data, $format, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function decode($data, $format, array $context = array())
+    public function decode($data, $format, array $context = [])
     {
         if ('' === trim($data)) {
             throw new NotEncodableValueException('Invalid XML data, it can not be empty.');
@@ -111,7 +111,7 @@ public function decode($data, $format, array $context = array())
 
         if ($rootNode->hasChildNodes()) {
             $xpath = new \DOMXPath($dom);
-            $data = array();
+            $data = [];
             foreach ($xpath->query('namespace::*', $dom->documentElement) as $nsNode) {
                 $data['@'.$nsNode->nodeName] = $nsNode->nodeValue;
             }
@@ -129,7 +129,7 @@ public function decode($data, $format, array $context = array())
             return $rootNode->nodeValue;
         }
 
-        $data = array();
+        $data = [];
 
         foreach ($rootNode->attributes as $attrKey => $attr) {
             $data['@'.$attrKey] = $attr->nodeValue;
@@ -259,7 +259,7 @@ final protected function isElementNameValid($name)
      *
      * @return array|string
      */
-    private function parseXml(\DOMNode $node, array $context = array())
+    private function parseXml(\DOMNode $node, array $context = [])
     {
         $data = $this->parseXmlAttributes($node, $context);
 
diff --git a/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php b/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php
index 3ac1af679a4a1..62e5212077dce 100644
--- a/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php
@@ -26,9 +26,9 @@ class YamlEncoder implements EncoderInterface, DecoderInterface
 
     private $dumper;
     private $parser;
-    private $defaultContext = array('yaml_inline' => 0, 'yaml_indent' => 0, 'yaml_flags' => 0);
+    private $defaultContext = ['yaml_inline' => 0, 'yaml_indent' => 0, 'yaml_flags' => 0];
 
-    public function __construct(Dumper $dumper = null, Parser $parser = null, array $defaultContext = array())
+    public function __construct(Dumper $dumper = null, Parser $parser = null, array $defaultContext = [])
     {
         if (!class_exists(Dumper::class)) {
             throw new RuntimeException('The YamlEncoder class requires the "Yaml" component. Install "symfony/yaml" to use it.');
@@ -42,7 +42,7 @@ public function __construct(Dumper $dumper = null, Parser $parser = null, array
     /**
      * {@inheritdoc}
      */
-    public function encode($data, $format, array $context = array())
+    public function encode($data, $format, array $context = [])
     {
         $context = array_merge($this->defaultContext, $context);
 
@@ -60,7 +60,7 @@ public function supportsEncoding($format)
     /**
      * {@inheritdoc}
      */
-    public function decode($data, $format, array $context = array())
+    public function decode($data, $format, array $context = [])
     {
         $context = array_merge($this->defaultContext, $context);
 
diff --git a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php b/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
index 9ad6e30810d8f..2a1e24e05679b 100644
--- a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
+++ b/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
@@ -30,7 +30,7 @@ class AttributeMetadata implements AttributeMetadataInterface
      *           class' serialized representation. Do not access it. Use
      *           {@link getGroups()} instead.
      */
-    public $groups = array();
+    public $groups = [];
 
     /**
      * @var int|null
diff --git a/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php b/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
index 7858f74dbbe29..61257408886af 100644
--- a/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
+++ b/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
@@ -32,7 +32,7 @@ class ClassMetadata implements ClassMetadataInterface
      *           class' serialized representation. Do not access it. Use
      *           {@link getAttributesMetadata()} instead.
      */
-    public $attributesMetadata = array();
+    public $attributesMetadata = [];
 
     /**
      * @var \ReflectionClass
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php
index 76d064326f168..2013e5897b49e 100644
--- a/src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php
@@ -110,7 +110,7 @@ private function parseFile($file)
     private function getClassesFromXml()
     {
         $xml = $this->parseFile($this->file);
-        $classes = array();
+        $classes = [];
 
         foreach ($xml->class as $class) {
             $classes[(string) $class['name']] = $class;
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php
index 886da0d1b509f..910919106d14e 100644
--- a/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php
@@ -116,7 +116,7 @@ private function getClassesFromYaml()
         $classes = $this->yamlParser->parseFile($this->file);
 
         if (empty($classes)) {
-            return array();
+            return [];
         }
 
         if (!\is_array($classes)) {
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
index 28ebdb656ac3e..689a4bdc64a03 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -218,7 +218,7 @@ protected function getAllowedAttributes($classOrObject, array $context, $attribu
             return false;
         }
 
-        $allowedAttributes = array();
+        $allowedAttributes = [];
         foreach ($this->classMetadataFactory->getMetadataFor($classOrObject)->getAttributesMetadata() as $attributeMetadata) {
             $name = $attributeMetadata->getName();
 
@@ -243,7 +243,7 @@ protected function getAllowedAttributes($classOrObject, array $context, $attribu
      *
      * @return bool
      */
-    protected function isAllowedAttribute($classOrObject, $attribute, $format = null, array $context = array())
+    protected function isAllowedAttribute($classOrObject, $attribute, $format = null, array $context = [])
     {
         if (\in_array($attribute, $this->ignoredAttributes)) {
             return false;
@@ -335,7 +335,7 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
         if ($constructor) {
             $constructorParameters = $constructor->getParameters();
 
-            $params = array();
+            $params = [];
             foreach ($constructorParameters as $constructorParameter) {
                 $paramName = $constructorParameter->name;
                 $key = $this->nameConverter ? $this->nameConverter->normalize($paramName) : $paramName;
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index 1c3f54b60dbcd..3696d28f56973 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -55,7 +55,7 @@ public function supportsNormalization($data, $format = null)
     /**
      * {@inheritdoc}
      */
-    public function normalize($object, $format = null, array $context = array())
+    public function normalize($object, $format = null, array $context = [])
     {
         if (!isset($context['cache_key'])) {
             $context['cache_key'] = $this->getCacheKey($format, $context);
@@ -65,8 +65,8 @@ public function normalize($object, $format = null, array $context = array())
             return $this->handleCircularReference($object);
         }
 
-        $data = array();
-        $stack = array();
+        $data = [];
+        $stack = [];
         $attributes = $this->getAttributes($object, $format, $context);
         $class = \get_class($object);
         $attributesMetadata = $this->classMetadataFactory ? $this->classMetadataFactory->getMetadataFor($class)->getAttributesMetadata() : null;
@@ -148,7 +148,7 @@ protected function getAttributes($object, $format = null, array $context)
      *
      * @return string[]
      */
-    abstract protected function extractAttributes($object, $format = null, array $context = array());
+    abstract protected function extractAttributes($object, $format = null, array $context = []);
 
     /**
      * Gets the attribute value.
@@ -160,7 +160,7 @@ abstract protected function extractAttributes($object, $format = null, array $co
      *
      * @return mixed
      */
-    abstract protected function getAttributeValue($object, $attribute, $format = null, array $context = array());
+    abstract protected function getAttributeValue($object, $attribute, $format = null, array $context = []);
 
     /**
      * {@inheritdoc}
@@ -173,7 +173,7 @@ public function supportsDenormalization($data, $type, $format = null)
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $class, $format = null, array $context = array())
+    public function denormalize($data, $class, $format = null, array $context = [])
     {
         if (!isset($context['cache_key'])) {
             $context['cache_key'] = $this->getCacheKey($format, $context);
@@ -181,7 +181,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
 
         $allowedAttributes = $this->getAllowedAttributes($class, $context, true);
         $normalizedData = $this->prepareForDenormalization($data);
-        $extraAttributes = array();
+        $extraAttributes = [];
 
         $reflectionClass = new \ReflectionClass($class);
         $object = $this->instantiateObject($normalizedData, $class, $context, $reflectionClass, $allowedAttributes, $format);
@@ -223,7 +223,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
      * @param string|null $format
      * @param array       $context
      */
-    abstract protected function setAttributeValue($object, $attribute, $value, $format = null, array $context = array());
+    abstract protected function setAttributeValue($object, $attribute, $value, $format = null, array $context = []);
 
     /**
      * Validates the submitted data and denormalizes it.
@@ -245,7 +245,7 @@ private function validateAndDenormalize($currentClass, $attribute, $data, $forma
             return $data;
         }
 
-        $expectedTypes = array();
+        $expectedTypes = [];
         foreach ($types as $type) {
             if (null === $data && $type->isNullable()) {
                 return;
@@ -258,7 +258,7 @@ private function validateAndDenormalize($currentClass, $attribute, $data, $forma
                 // Fix a collection that contains the only one element
                 // This is special to xml format only
                 if ('xml' === $format && !\is_int(key($data))) {
-                    $data = array($data);
+                    $data = [$data];
                 }
 
                 if (null !== $collectionKeyType = $type->getCollectionKeyType()) {
diff --git a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
index 23b3a0e95b023..af7bea916336b 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
@@ -36,7 +36,7 @@ class ArrayDenormalizer implements DenormalizerInterface, SerializerAwareInterfa
      *
      * @throws NotNormalizableValueException
      */
-    public function denormalize($data, $class, $format = null, array $context = array())
+    public function denormalize($data, $class, $format = null, array $context = [])
     {
         if (null === $this->serializer) {
             throw new BadMethodCallException('Please set a serializer before calling denormalize()!');
diff --git a/src/Symfony/Component/Serializer/Normalizer/ContextAwareDenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/ContextAwareDenormalizerInterface.php
index f0bb48c5c649e..4e68dae1ee3dd 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ContextAwareDenormalizerInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ContextAwareDenormalizerInterface.php
@@ -23,5 +23,5 @@ interface ContextAwareDenormalizerInterface extends DenormalizerInterface
      *
      * @param array $context options that denormalizers have access to
      */
-    public function supportsDenormalization($data, $type, $format = null, array $context = array());
+    public function supportsDenormalization($data, $type, $format = null, array $context = []);
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/ContextAwareNormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/ContextAwareNormalizerInterface.php
index b6ab05b713af6..c278b7ded9f28 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ContextAwareNormalizerInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ContextAwareNormalizerInterface.php
@@ -23,5 +23,5 @@ interface ContextAwareNormalizerInterface extends NormalizerInterface
      *
      * @param array $context options that normalizers have access to
      */
-    public function supportsNormalization($data, $format = null, array $context = array());
+    public function supportsNormalization($data, $format = null, array $context = []);
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
index 6a15d8da90270..ddb33c3d7a9eb 100644
--- a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
@@ -35,7 +35,7 @@ public function normalize($object, $format = null, array $context = array())
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $class, $format = null, array $context = array())
+    public function denormalize($data, $class, $format = null, array $context = [])
     {
         $object = $this->extractObjectToPopulate($class, $context) ?: new $class();
         $object->denormalize($this->serializer, $data, $format, $context);
diff --git a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
index 995bdf1441776..0284ca6ebcc41 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
@@ -25,11 +25,11 @@
  */
 class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface
 {
-    private static $supportedTypes = array(
+    private static $supportedTypes = [
         \SplFileInfo::class => true,
         \SplFileObject::class => true,
         File::class => true,
-    );
+    ];
 
     /**
      * @var MimeTypeGuesserInterface
@@ -48,7 +48,7 @@ public function __construct(MimeTypeGuesserInterface $mimeTypeGuesser = null)
     /**
      * {@inheritdoc}
      */
-    public function normalize($object, $format = null, array $context = array())
+    public function normalize($object, $format = null, array $context = [])
     {
         if (!$object instanceof \SplFileInfo) {
             throw new InvalidArgumentException('The object must be an instance of "\SplFileInfo".');
@@ -89,7 +89,7 @@ public function supportsNormalization($data, $format = null)
      * @throws InvalidArgumentException
      * @throws NotNormalizableValueException
      */
-    public function denormalize($data, $class, $format = null, array $context = array())
+    public function denormalize($data, $class, $format = null, array $context = [])
     {
         if (!preg_match('/^data:([a-z0-9][a-z0-9\!\#\$\&\-\^\_\+\.]{0,126}\/[a-z0-9][a-z0-9\!\#\$\&\-\^\_\+\.]{0,126}(;[a-z0-9\-]+\=[a-z0-9\-]+)?)?(;base64)?,[a-z0-9\!\$\&\\\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*$/i', $data)) {
             throw new NotNormalizableValueException('The provided "data:" URI is not valid.');
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
index 7f23aec354d13..56527a8eb4ecf 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
@@ -39,7 +39,7 @@ public function __construct($format = 'P%yY%mM%dDT%hH%iM%sS')
      *
      * @throws InvalidArgumentException
      */
-    public function normalize($object, $format = null, array $context = array())
+    public function normalize($object, $format = null, array $context = [])
     {
         if (!$object instanceof \DateInterval) {
             throw new InvalidArgumentException('The object must be an instance of "\DateInterval".');
@@ -64,7 +64,7 @@ public function supportsNormalization($data, $format = null)
      * @throws InvalidArgumentException
      * @throws UnexpectedValueException
      */
-    public function denormalize($data, $class, $format = null, array $context = array())
+    public function denormalize($data, $class, $format = null, array $context = [])
     {
         if (!\is_string($data)) {
             throw new InvalidArgumentException(sprintf('Data expected to be a string, %s given.', \gettype($data)));
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
index aaa4e8b940a91..a4b628ef906cd 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
@@ -28,11 +28,11 @@ class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface
     private $format;
     private $timezone;
 
-    private static $supportedTypes = array(
+    private static $supportedTypes = [
         \DateTimeInterface::class => true,
         \DateTimeImmutable::class => true,
         \DateTime::class => true,
-    );
+    ];
 
     /**
      * @param string             $format
@@ -49,7 +49,7 @@ public function __construct($format = \DateTime::RFC3339, \DateTimeZone $timezon
      *
      * @throws InvalidArgumentException
      */
-    public function normalize($object, $format = null, array $context = array())
+    public function normalize($object, $format = null, array $context = [])
     {
         if (!$object instanceof \DateTimeInterface) {
             throw new InvalidArgumentException('The object must implement the "\DateTimeInterface".');
@@ -79,7 +79,7 @@ public function supportsNormalization($data, $format = null)
      *
      * @throws NotNormalizableValueException
      */
-    public function denormalize($data, $class, $format = null, array $context = array())
+    public function denormalize($data, $class, $format = null, array $context = [])
     {
         $dateTimeFormat = isset($context[self::FORMAT_KEY]) ? $context[self::FORMAT_KEY] : null;
         $timezone = $this->getTimezone($context);
@@ -133,7 +133,7 @@ public function supportsDenormalization($data, $type, $format = null)
      */
     private function formatDateTimeErrors(array $errors)
     {
-        $formattedErrors = array();
+        $formattedErrors = [];
 
         foreach ($errors as $pos => $message) {
             $formattedErrors[] = sprintf('at position %d: %s', $pos, $message);
diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
index 5db15418b5c02..31e27a85cb024 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
@@ -36,5 +36,5 @@ interface DenormalizableInterface
      *
      * @return object
      */
-    public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = array());
+    public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = []);
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
index c3a2bb535632e..54e41431e0ce0 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
@@ -42,7 +42,7 @@ interface DenormalizerInterface
      * @throws LogicException           Occurs when the normalizer is not supposed to denormalize
      * @throws RuntimeException         Occurs if the class cannot be instantiated
      */
-    public function denormalize($data, $class, $format = null, array $context = array());
+    public function denormalize($data, $class, $format = null, array $context = []);
 
     /**
      * Checks whether the given class is supported for denormalization by this normalizer.
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
index 6eec9dd4d9bd0..d8e931b8f968c 100644
--- a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -96,12 +96,12 @@ private function isGetMethod(\ReflectionMethod $method)
     /**
      * {@inheritdoc}
      */
-    protected function extractAttributes($object, $format = null, array $context = array())
+    protected function extractAttributes($object, $format = null, array $context = [])
     {
         $reflectionObject = new \ReflectionObject($object);
         $reflectionMethods = $reflectionObject->getMethods(\ReflectionMethod::IS_PUBLIC);
 
-        $attributes = array();
+        $attributes = [];
         foreach ($reflectionMethods as $method) {
             if (!$this->isGetMethod($method)) {
                 continue;
@@ -120,22 +120,22 @@ protected function extractAttributes($object, $format = null, array $context = a
     /**
      * {@inheritdoc}
      */
-    protected function getAttributeValue($object, $attribute, $format = null, array $context = array())
+    protected function getAttributeValue($object, $attribute, $format = null, array $context = [])
     {
         $ucfirsted = ucfirst($attribute);
 
         $getter = 'get'.$ucfirsted;
-        if (\is_callable(array($object, $getter))) {
+        if (\is_callable([$object, $getter])) {
             return $object->$getter();
         }
 
         $isser = 'is'.$ucfirsted;
-        if (\is_callable(array($object, $isser))) {
+        if (\is_callable([$object, $isser])) {
             return $object->$isser();
         }
 
         $haser = 'has'.$ucfirsted;
-        if (\is_callable(array($object, $haser))) {
+        if (\is_callable([$object, $haser])) {
             return $object->$haser();
         }
     }
@@ -143,13 +143,13 @@ protected function getAttributeValue($object, $attribute, $format = null, array
     /**
      * {@inheritdoc}
      */
-    protected function setAttributeValue($object, $attribute, $value, $format = null, array $context = array())
+    protected function setAttributeValue($object, $attribute, $value, $format = null, array $context = [])
     {
         $setter = 'set'.ucfirst($attribute);
         $key = \get_class($object).':'.$setter;
 
         if (!isset(self::$setterAccessibleCache[$key])) {
-            self::$setterAccessibleCache[$key] = \is_callable(array($object, $setter)) && !(new \ReflectionMethod($object, $setter))->isStatic();
+            self::$setterAccessibleCache[$key] = \is_callable([$object, $setter]) && !(new \ReflectionMethod($object, $setter))->isStatic();
         }
 
         if (self::$setterAccessibleCache[$key]) {
diff --git a/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php
index 27ccf8023cba3..b4e53e51358aa 100644
--- a/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php
@@ -24,7 +24,7 @@ class JsonSerializableNormalizer extends AbstractNormalizer
     /**
      * {@inheritdoc}
      */
-    public function normalize($object, $format = null, array $context = array())
+    public function normalize($object, $format = null, array $context = [])
     {
         if ($this->isCircularReference($object, $context)) {
             return $this->handleCircularReference($object);
@@ -60,7 +60,7 @@ public function supportsDenormalization($data, $type, $format = null)
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $class, $format = null, array $context = array())
+    public function denormalize($data, $class, $format = null, array $context = [])
     {
         throw new LogicException(sprintf('Cannot denormalize with "%s".', \JsonSerializable::class));
     }
diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php
index 8542e4f80e1c4..f7a5560143633 100644
--- a/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php
@@ -35,5 +35,5 @@ interface NormalizableInterface
      *
      * @return array|string|int|float|bool
      */
-    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = array());
+    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = []);
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
index 5cccdb3360095..09aca60ff23e2 100644
--- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
@@ -36,7 +36,7 @@ interface NormalizerInterface
      *                                    reference handler can fix it
      * @throws LogicException             Occurs when the normalizer is not called in an expected context
      */
-    public function normalize($object, $format = null, array $context = array());
+    public function normalize($object, $format = null, array $context = []);
 
     /**
      * Checks whether the given class is supported for normalization by this normalizer.
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
index 614d6cd4a93a2..ea17a81b47bc0 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -45,7 +45,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
     protected function extractAttributes($object, $format = null, array $context = array())
     {
         // If not using groups, detect manually
-        $attributes = array();
+        $attributes = [];
 
         // methods
         $reflClass = new \ReflectionClass($object);
@@ -98,7 +98,7 @@ protected function extractAttributes($object, $format = null, array $context = a
     /**
      * {@inheritdoc}
      */
-    protected function getAttributeValue($object, $attribute, $format = null, array $context = array())
+    protected function getAttributeValue($object, $attribute, $format = null, array $context = [])
     {
         return $this->propertyAccessor->getValue($object, $attribute);
     }
@@ -106,7 +106,7 @@ protected function getAttributeValue($object, $attribute, $format = null, array
     /**
      * {@inheritdoc}
      */
-    protected function setAttributeValue($object, $attribute, $value, $format = null, array $context = array())
+    protected function setAttributeValue($object, $attribute, $value, $format = null, array $context = [])
     {
         try {
             $this->propertyAccessor->setValue($object, $attribute, $value);
diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
index 52dc4f4a52dcc..7787a38e950ca 100644
--- a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -74,7 +74,7 @@ private function supports($class)
     /**
      * {@inheritdoc}
      */
-    protected function isAllowedAttribute($classOrObject, $attribute, $format = null, array $context = array())
+    protected function isAllowedAttribute($classOrObject, $attribute, $format = null, array $context = [])
     {
         if (!parent::isAllowedAttribute($classOrObject, $attribute, $format, $context)) {
             return false;
@@ -95,10 +95,10 @@ protected function isAllowedAttribute($classOrObject, $attribute, $format = null
     /**
      * {@inheritdoc}
      */
-    protected function extractAttributes($object, $format = null, array $context = array())
+    protected function extractAttributes($object, $format = null, array $context = [])
     {
         $reflectionObject = new \ReflectionObject($object);
-        $attributes = array();
+        $attributes = [];
 
         do {
             foreach ($reflectionObject->getProperties() as $property) {
@@ -116,7 +116,7 @@ protected function extractAttributes($object, $format = null, array $context = a
     /**
      * {@inheritdoc}
      */
-    protected function getAttributeValue($object, $attribute, $format = null, array $context = array())
+    protected function getAttributeValue($object, $attribute, $format = null, array $context = [])
     {
         try {
             $reflectionProperty = $this->getReflectionProperty($object, $attribute);
@@ -135,7 +135,7 @@ protected function getAttributeValue($object, $attribute, $format = null, array
     /**
      * {@inheritdoc}
      */
-    protected function setAttributeValue($object, $attribute, $value, $format = null, array $context = array())
+    protected function setAttributeValue($object, $attribute, $value, $format = null, array $context = [])
     {
         try {
             $reflectionProperty = $this->getReflectionProperty($object, $attribute);
diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php
index 72c5721c89928..52466b6b89938 100644
--- a/src/Symfony/Component/Serializer/Serializer.php
+++ b/src/Symfony/Component/Serializer/Serializer.php
@@ -86,8 +86,8 @@ public function __construct(array $normalizers = array(), array $encoders = arra
         }
         $this->normalizers = $normalizers;
 
-        $decoders = array();
-        $realEncoders = array();
+        $decoders = [];
+        $realEncoders = [];
         foreach ($encoders as $encoder) {
             if ($encoder instanceof SerializerAwareInterface) {
                 $encoder->setSerializer($this);
@@ -106,7 +106,7 @@ public function __construct(array $normalizers = array(), array $encoders = arra
     /**
      * {@inheritdoc}
      */
-    final public function serialize($data, $format, array $context = array())
+    final public function serialize($data, $format, array $context = [])
     {
         if (!$this->supportsEncoding($format, $context)) {
             throw new NotEncodableValueException(sprintf('Serialization for the format %s is not supported', $format));
@@ -122,7 +122,7 @@ final public function serialize($data, $format, array $context = array())
     /**
      * {@inheritdoc}
      */
-    final public function deserialize($data, $type, $format, array $context = array())
+    final public function deserialize($data, $type, $format, array $context = [])
     {
         if (!$this->supportsDecoding($format, $context)) {
             throw new NotEncodableValueException(sprintf('Deserialization for the format %s is not supported', $format));
@@ -136,7 +136,7 @@ final public function deserialize($data, $type, $format, array $context = array(
     /**
      * {@inheritdoc}
      */
-    public function normalize($data, $format = null, array $context = array())
+    public function normalize($data, $format = null, array $context = [])
     {
         // If a normalizer supports the given data, use it
         if ($normalizer = $this->getNormalizer($data, $format, $context)) {
@@ -148,7 +148,7 @@ public function normalize($data, $format = null, array $context = array())
         }
 
         if (\is_array($data) || $data instanceof \Traversable) {
-            $normalized = array();
+            $normalized = [];
             foreach ($data as $key => $val) {
                 $normalized[$key] = $this->normalize($val, $format, $context);
             }
@@ -172,7 +172,7 @@ public function normalize($data, $format = null, array $context = array())
      *
      * @throws NotNormalizableValueException
      */
-    public function denormalize($data, $type, $format = null, array $context = array())
+    public function denormalize($data, $type, $format = null, array $context = [])
     {
         if (!$this->normalizers) {
             throw new LogicException('You must register at least one normalizer to be able to denormalize objects.');
@@ -267,7 +267,7 @@ private function getDenormalizer($data, $class, $format, array $context)
     /**
      * {@inheritdoc}
      */
-    final public function encode($data, $format, array $context = array())
+    final public function encode($data, $format, array $context = [])
     {
         return $this->encoder->encode($data, $format, $context);
     }
@@ -275,7 +275,7 @@ final public function encode($data, $format, array $context = array())
     /**
      * {@inheritdoc}
      */
-    final public function decode($data, $format, array $context = array())
+    final public function decode($data, $format, array $context = [])
     {
         return $this->decoder->decode($data, $format, $context);
     }
diff --git a/src/Symfony/Component/Serializer/SerializerInterface.php b/src/Symfony/Component/Serializer/SerializerInterface.php
index 196bff1a21c62..7a03ef943a20c 100644
--- a/src/Symfony/Component/Serializer/SerializerInterface.php
+++ b/src/Symfony/Component/Serializer/SerializerInterface.php
@@ -27,7 +27,7 @@ interface SerializerInterface
      *
      * @return string
      */
-    public function serialize($data, $format, array $context = array());
+    public function serialize($data, $format, array $context = []);
 
     /**
      * Deserializes data into the given type.
@@ -39,5 +39,5 @@ public function serialize($data, $format, array $context = array());
      *
      * @return object
      */
-    public function deserialize($data, $type, $format, array $context = array());
+    public function deserialize($data, $type, $format, array $context = []);
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Annotation/GroupsTest.php b/src/Symfony/Component/Serializer/Tests/Annotation/GroupsTest.php
index 04729ccbb9765..9b54221d7630d 100644
--- a/src/Symfony/Component/Serializer/Tests/Annotation/GroupsTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Annotation/GroupsTest.php
@@ -24,7 +24,7 @@ class GroupsTest extends TestCase
      */
     public function testEmptyGroupsParameter()
     {
-        new Groups(array('value' => array()));
+        new Groups(['value' => []]);
     }
 
     /**
@@ -32,7 +32,7 @@ public function testEmptyGroupsParameter()
      */
     public function testNotAnArrayGroupsParameter()
     {
-        new Groups(array('value' => 12));
+        new Groups(['value' => 12]);
     }
 
     /**
@@ -40,20 +40,20 @@ public function testNotAnArrayGroupsParameter()
      */
     public function testInvalidGroupsParameter()
     {
-        new Groups(array('value' => array('a', 1, new \stdClass())));
+        new Groups(['value' => ['a', 1, new \stdClass()]]);
     }
 
     public function testGroupsParameters()
     {
-        $validData = array('a', 'b');
+        $validData = ['a', 'b'];
 
-        $groups = new Groups(array('value' => $validData));
+        $groups = new Groups(['value' => $validData]);
         $this->assertEquals($validData, $groups->getGroups());
     }
 
     public function testSingleGroup()
     {
-        $groups = new Groups(array('value' => 'a'));
-        $this->assertEquals(array('a'), $groups->getGroups());
+        $groups = new Groups(['value' => 'a']);
+        $this->assertEquals(['a'], $groups->getGroups());
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Annotation/MaxDepthTest.php b/src/Symfony/Component/Serializer/Tests/Annotation/MaxDepthTest.php
index 4554fc9905ca6..16f10e143459b 100644
--- a/src/Symfony/Component/Serializer/Tests/Annotation/MaxDepthTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Annotation/MaxDepthTest.php
@@ -25,17 +25,17 @@ class MaxDepthTest extends TestCase
      */
     public function testNotSetMaxDepthParameter()
     {
-        new MaxDepth(array());
+        new MaxDepth([]);
     }
 
     public function provideInvalidValues()
     {
-        return array(
-            array(''),
-            array('foo'),
-            array('1'),
-            array(0),
-        );
+        return [
+            [''],
+            ['foo'],
+            ['1'],
+            [0],
+        ];
     }
 
     /**
@@ -46,12 +46,12 @@ public function provideInvalidValues()
      */
     public function testNotAnIntMaxDepthParameter($value)
     {
-        new MaxDepth(array('value' => $value));
+        new MaxDepth(['value' => $value]);
     }
 
     public function testMaxDepthParameters()
     {
-        $maxDepth = new MaxDepth(array('value' => 3));
+        $maxDepth = new MaxDepth(['value' => 3]);
         $this->assertEquals(3, $maxDepth->getMaxDepth());
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/DependencyInjection/SerializerPassTest.php b/src/Symfony/Component/Serializer/Tests/DependencyInjection/SerializerPassTest.php
index fa12454fd094e..5c3fedfe895a7 100644
--- a/src/Symfony/Component/Serializer/Tests/DependencyInjection/SerializerPassTest.php
+++ b/src/Symfony/Component/Serializer/Tests/DependencyInjection/SerializerPassTest.php
@@ -44,8 +44,8 @@ public function testThrowExceptionWhenNoEncoders()
     {
         $container = new ContainerBuilder();
         $container->register('serializer')
-            ->addArgument(array())
-            ->addArgument(array());
+            ->addArgument([])
+            ->addArgument([]);
         $container->register('normalizer')->addTag('serializer.normalizer');
 
         $serializerPass = new SerializerPass();
@@ -56,19 +56,19 @@ public function testServicesAreOrderedAccordingToPriority()
     {
         $container = new ContainerBuilder();
 
-        $definition = $container->register('serializer')->setArguments(array(null, null));
-        $container->register('n2')->addTag('serializer.normalizer', array('priority' => 100))->addTag('serializer.encoder', array('priority' => 100));
-        $container->register('n1')->addTag('serializer.normalizer', array('priority' => 200))->addTag('serializer.encoder', array('priority' => 200));
+        $definition = $container->register('serializer')->setArguments([null, null]);
+        $container->register('n2')->addTag('serializer.normalizer', ['priority' => 100])->addTag('serializer.encoder', ['priority' => 100]);
+        $container->register('n1')->addTag('serializer.normalizer', ['priority' => 200])->addTag('serializer.encoder', ['priority' => 200]);
         $container->register('n3')->addTag('serializer.normalizer')->addTag('serializer.encoder');
 
         $serializerPass = new SerializerPass();
         $serializerPass->process($container);
 
-        $expected = array(
+        $expected = [
             new Reference('n1'),
             new Reference('n2'),
             new Reference('n3'),
-        );
+        ];
         $this->assertEquals($expected, $definition->getArgument(0));
         $this->assertEquals($expected, $definition->getArgument(1));
     }
diff --git a/src/Symfony/Component/Serializer/Tests/DeserializeNestedArrayOfObjectsTest.php b/src/Symfony/Component/Serializer/Tests/DeserializeNestedArrayOfObjectsTest.php
index e94c7dc0d89ac..ffdae811bb512 100644
--- a/src/Symfony/Component/Serializer/Tests/DeserializeNestedArrayOfObjectsTest.php
+++ b/src/Symfony/Component/Serializer/Tests/DeserializeNestedArrayOfObjectsTest.php
@@ -22,12 +22,12 @@ class DeserializeNestedArrayOfObjectsTest extends TestCase
 {
     public function provider()
     {
-        return array(
+        return [
             //from property PhpDoc
-            array(Zoo::class),
+            [Zoo::class],
             //from argument constructor PhpDoc
-            array(ZooImmutable::class),
-        );
+            [ZooImmutable::class],
+        ];
     }
 
     /**
@@ -43,10 +43,10 @@ public function testPropertyPhpDoc($class)
     ]
 }
 EOF;
-        $serializer = new Serializer(array(
+        $serializer = new Serializer([
             new ObjectNormalizer(null, null, null, new PhpDocExtractor()),
             new ArrayDenormalizer(),
-        ), array('json' => new JsonEncoder()));
+        ], ['json' => new JsonEncoder()]);
         //WHEN
         /** @var Zoo $zoo */
         $zoo = $serializer->deserialize($json, $class, 'json');
@@ -59,7 +59,7 @@ public function testPropertyPhpDoc($class)
 class Zoo
 {
     /** @var Animal[] */
-    private $animals = array();
+    private $animals = [];
 
     /**
      * @return Animal[]
@@ -81,12 +81,12 @@ public function setAnimals(array $animals)
 class ZooImmutable
 {
     /** @var Animal[] */
-    private $animals = array();
+    private $animals = [];
 
     /**
      * @param Animal[] $animals
      */
-    public function __construct(array $animals = array())
+    public function __construct(array $animals = [])
     {
         $this->animals = $animals;
     }
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/ChainDecoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/ChainDecoderTest.php
index 7d860f65f27f3..3a84d99dde286 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/ChainDecoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/ChainDecoderTest.php
@@ -32,12 +32,12 @@ protected function setUp()
 
         $this->decoder1
             ->method('supportsDecoding')
-            ->will($this->returnValueMap(array(
-                array(self::FORMAT_1, array(), true),
-                array(self::FORMAT_2, array(), false),
-                array(self::FORMAT_3, array(), false),
-                array(self::FORMAT_3, array('foo' => 'bar'), true),
-            )));
+            ->will($this->returnValueMap([
+                [self::FORMAT_1, [], true],
+                [self::FORMAT_2, [], false],
+                [self::FORMAT_3, [], false],
+                [self::FORMAT_3, ['foo' => 'bar'], true],
+            ]));
 
         $this->decoder2 = $this
             ->getMockBuilder('Symfony\Component\Serializer\Encoder\DecoderInterface')
@@ -45,13 +45,13 @@ protected function setUp()
 
         $this->decoder2
             ->method('supportsDecoding')
-            ->will($this->returnValueMap(array(
-                array(self::FORMAT_1, array(), false),
-                array(self::FORMAT_2, array(), true),
-                array(self::FORMAT_3, array(), false),
-            )));
+            ->will($this->returnValueMap([
+                [self::FORMAT_1, [], false],
+                [self::FORMAT_2, [], true],
+                [self::FORMAT_3, [], false],
+            ]));
 
-        $this->chainDecoder = new ChainDecoder(array($this->decoder1, $this->decoder2));
+        $this->chainDecoder = new ChainDecoder([$this->decoder1, $this->decoder2]);
     }
 
     public function testSupportsDecoding()
@@ -59,7 +59,7 @@ public function testSupportsDecoding()
         $this->assertTrue($this->chainDecoder->supportsDecoding(self::FORMAT_1));
         $this->assertTrue($this->chainDecoder->supportsDecoding(self::FORMAT_2));
         $this->assertFalse($this->chainDecoder->supportsDecoding(self::FORMAT_3));
-        $this->assertTrue($this->chainDecoder->supportsDecoding(self::FORMAT_3, array('foo' => 'bar')));
+        $this->assertTrue($this->chainDecoder->supportsDecoding(self::FORMAT_3, ['foo' => 'bar']));
     }
 
     public function testDecode()
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/ChainEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/ChainEncoderTest.php
index 82c64cc149c63..48ccbdca0aca6 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/ChainEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/ChainEncoderTest.php
@@ -34,12 +34,12 @@ protected function setUp()
 
         $this->encoder1
             ->method('supportsEncoding')
-            ->will($this->returnValueMap(array(
-                array(self::FORMAT_1, array(), true),
-                array(self::FORMAT_2, array(), false),
-                array(self::FORMAT_3, array(), false),
-                array(self::FORMAT_3, array('foo' => 'bar'), true),
-            )));
+            ->will($this->returnValueMap([
+                [self::FORMAT_1, [], true],
+                [self::FORMAT_2, [], false],
+                [self::FORMAT_3, [], false],
+                [self::FORMAT_3, ['foo' => 'bar'], true],
+            ]));
 
         $this->encoder2 = $this
             ->getMockBuilder('Symfony\Component\Serializer\Encoder\EncoderInterface')
@@ -47,13 +47,13 @@ protected function setUp()
 
         $this->encoder2
             ->method('supportsEncoding')
-            ->will($this->returnValueMap(array(
-                array(self::FORMAT_1, array(), false),
-                array(self::FORMAT_2, array(), true),
-                array(self::FORMAT_3, array(), false),
-            )));
+            ->will($this->returnValueMap([
+                [self::FORMAT_1, [], false],
+                [self::FORMAT_2, [], true],
+                [self::FORMAT_3, [], false],
+            ]));
 
-        $this->chainEncoder = new ChainEncoder(array($this->encoder1, $this->encoder2));
+        $this->chainEncoder = new ChainEncoder([$this->encoder1, $this->encoder2]);
     }
 
     public function testSupportsEncoding()
@@ -61,7 +61,7 @@ public function testSupportsEncoding()
         $this->assertTrue($this->chainEncoder->supportsEncoding(self::FORMAT_1));
         $this->assertTrue($this->chainEncoder->supportsEncoding(self::FORMAT_2));
         $this->assertFalse($this->chainEncoder->supportsEncoding(self::FORMAT_3));
-        $this->assertTrue($this->chainEncoder->supportsEncoding(self::FORMAT_3, array('foo' => 'bar')));
+        $this->assertTrue($this->chainEncoder->supportsEncoding(self::FORMAT_3, ['foo' => 'bar']));
     }
 
     public function testEncode()
@@ -69,7 +69,7 @@ public function testEncode()
         $this->encoder1->expects($this->never())->method('encode');
         $this->encoder2->expects($this->once())->method('encode');
 
-        $this->chainEncoder->encode(array('foo' => 123), self::FORMAT_2);
+        $this->chainEncoder->encode(['foo' => 123], self::FORMAT_2);
     }
 
     /**
@@ -77,7 +77,7 @@ public function testEncode()
      */
     public function testEncodeUnsupportedFormat()
     {
-        $this->chainEncoder->encode(array('foo' => 123), self::FORMAT_3);
+        $this->chainEncoder->encode(['foo' => 123], self::FORMAT_3);
     }
 
     public function testNeedsNormalizationBasic()
@@ -98,7 +98,7 @@ public function testNeedsNormalizationChainNormalizationAware($bool)
         $chainEncoder->method('supportsEncoding')->willReturn(true);
         $chainEncoder->method('needsNormalization')->willReturn($bool);
 
-        $sut = new ChainEncoder(array($chainEncoder));
+        $sut = new ChainEncoder([$chainEncoder]);
 
         $this->assertEquals($bool, $sut->needsNormalization(self::FORMAT_1));
     }
@@ -106,17 +106,17 @@ public function testNeedsNormalizationChainNormalizationAware($bool)
     public function testNeedsNormalizationNormalizationAware()
     {
         $encoder = new NormalizationAwareEncoder();
-        $sut = new ChainEncoder(array($encoder));
+        $sut = new ChainEncoder([$encoder]);
 
         $this->assertFalse($sut->needsNormalization(self::FORMAT_1));
     }
 
     public function booleanProvider()
     {
-        return array(
-            array(true),
-            array(false),
-        );
+        return [
+            [true],
+            [false],
+        ];
     }
 }
 
@@ -131,7 +131,7 @@ public function supportsEncoding($format)
         return true;
     }
 
-    public function encode($data, $format, array $context = array())
+    public function encode($data, $format, array $context = [])
     {
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
index a5e5c256f34ad..44a709e8c25a3 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
@@ -37,7 +37,7 @@ public function testSupportEncoding()
 
     public function testEncode()
     {
-        $value = array('foo' => 'hello', 'bar' => 'hey ho');
+        $value = ['foo' => 'hello', 'bar' => 'hey ho'];
 
         $this->assertEquals(<<<'CSV'
 foo,bar
@@ -49,10 +49,10 @@ public function testEncode()
 
     public function testEncodeCollection()
     {
-        $value = array(
-            array('foo' => 'hello', 'bar' => 'hey ho'),
-            array('foo' => 'hi', 'bar' => 'let\'s go'),
-        );
+        $value = [
+            ['foo' => 'hello', 'bar' => 'hey ho'],
+            ['foo' => 'hi', 'bar' => 'let\'s go'],
+        ];
 
         $this->assertEquals(<<<'CSV'
 foo,bar
@@ -70,7 +70,7 @@ public function testEncodePlainIndexedArray()
 a,b,c
 
 CSV
-            , $this->encoder->encode(array('a', 'b', 'c'), 'csv'));
+            , $this->encoder->encode(['a', 'b', 'c'], 'csv'));
     }
 
     public function testEncodeNonArray()
@@ -85,10 +85,10 @@ public function testEncodeNonArray()
 
     public function testEncodeNestedArrays()
     {
-        $value = array('foo' => 'hello', 'bar' => array(
-            array('id' => 'yo', 1 => 'wesh'),
-            array('baz' => 'Halo', 'foo' => 'olá'),
-        ));
+        $value = ['foo' => 'hello', 'bar' => [
+            ['id' => 'yo', 1 => 'wesh'],
+            ['baz' => 'Halo', 'foo' => 'olá'],
+        ]];
 
         $this->assertEquals(<<<'CSV'
 foo,bar.0.id,bar.0.1,bar.1.baz,bar.1.foo
@@ -102,7 +102,7 @@ public function testEncodeCustomSettings()
     {
         $this->encoder = new CsvEncoder(';', "'", '|', '-');
 
-        $value = array('a' => 'he\'llo', 'c' => array('d' => 'foo'));
+        $value = ['a' => 'he\'llo', 'c' => ['d' => 'foo']];
 
         $this->assertEquals(<<<'CSV'
 a;c-d
@@ -114,34 +114,34 @@ public function testEncodeCustomSettings()
 
     public function testEncodeCustomSettingsPassedInContext()
     {
-        $value = array('a' => 'he\'llo', 'c' => array('d' => 'foo'));
+        $value = ['a' => 'he\'llo', 'c' => ['d' => 'foo']];
 
         $this->assertSame(<<<'CSV'
 a;c-d
 'he''llo';foo
 
 CSV
-        , $this->encoder->encode($value, 'csv', array(
+        , $this->encoder->encode($value, 'csv', [
             CsvEncoder::DELIMITER_KEY => ';',
             CsvEncoder::ENCLOSURE_KEY => "'",
             CsvEncoder::ESCAPE_CHAR_KEY => '|',
             CsvEncoder::KEY_SEPARATOR_KEY => '-',
-        )));
+        ]));
     }
 
     public function testEncodeEmptyArray()
     {
-        $this->assertEquals("\n\n", $this->encoder->encode(array(), 'csv'));
-        $this->assertEquals("\n\n", $this->encoder->encode(array(array()), 'csv'));
+        $this->assertEquals("\n\n", $this->encoder->encode([], 'csv'));
+        $this->assertEquals("\n\n", $this->encoder->encode([[]], 'csv'));
     }
 
     public function testEncodeVariableStructure()
     {
-        $value = array(
-            array('a' => array('foo', 'bar')),
-            array('a' => array(), 'b' => 'baz'),
-            array('a' => array('bar', 'foo'), 'c' => 'pong'),
-        );
+        $value = [
+            ['a' => ['foo', 'bar']],
+            ['a' => [], 'b' => 'baz'],
+            ['a' => ['bar', 'foo'], 'c' => 'pong'],
+        ];
         $csv = <<<CSV
 a.0,a.1,c,b
 foo,bar,,
@@ -155,15 +155,15 @@ public function testEncodeVariableStructure()
 
     public function testEncodeCustomHeaders()
     {
-        $context = array(
-            CsvEncoder::HEADERS_KEY => array(
+        $context = [
+            CsvEncoder::HEADERS_KEY => [
                 'b',
                 'c',
-            ),
-        );
-        $value = array(
-            array('a' => 'foo', 'b' => 'bar'),
-        );
+            ],
+        ];
+        $value = [
+            ['a' => 'foo', 'b' => 'bar'],
+        ];
         $csv = <<<CSV
 b,c,a
 bar,,foo
@@ -181,7 +181,7 @@ public function testSupportsDecoding()
 
     public function testDecode()
     {
-        $expected = array('foo' => 'a', 'bar' => 'b');
+        $expected = ['foo' => 'a', 'bar' => 'b'];
 
         $this->assertEquals($expected, $this->encoder->decode(<<<'CSV'
 foo,bar
@@ -192,11 +192,11 @@ public function testDecode()
 
     public function testDecodeCollection()
     {
-        $expected = array(
-            array('foo' => 'a', 'bar' => 'b'),
-            array('foo' => 'c', 'bar' => 'd'),
-            array('foo' => 'f'),
-        );
+        $expected = [
+            ['foo' => 'a', 'bar' => 'b'],
+            ['foo' => 'c', 'bar' => 'd'],
+            ['foo' => 'f'],
+        ];
 
         $this->assertEquals($expected, $this->encoder->decode(<<<'CSV'
 foo,bar
@@ -210,12 +210,12 @@ public function testDecodeCollection()
 
     public function testDecodeToManyRelation()
     {
-        $expected = array(
-            array('foo' => 'bar', 'relations' => array(array('a' => 'b'), array('a' => 'b'))),
-            array('foo' => 'bat', 'relations' => array(array('a' => 'b'), array('a' => ''))),
-            array('foo' => 'bat', 'relations' => array(array('a' => 'b'))),
-            array('foo' => 'baz', 'relations' => array(array('a' => 'c'), array('a' => 'c'))),
-        );
+        $expected = [
+            ['foo' => 'bar', 'relations' => [['a' => 'b'], ['a' => 'b']]],
+            ['foo' => 'bat', 'relations' => [['a' => 'b'], ['a' => '']]],
+            ['foo' => 'bat', 'relations' => [['a' => 'b']]],
+            ['foo' => 'baz', 'relations' => [['a' => 'c'], ['a' => 'c']]],
+        ];
 
         $this->assertEquals($expected, $this->encoder->decode(<<<'CSV'
 foo,relations.0.a,relations.1.a
@@ -229,10 +229,10 @@ public function testDecodeToManyRelation()
 
     public function testDecodeNestedArrays()
     {
-        $expected = array(
-            array('foo' => 'a', 'bar' => array('baz' => array('bat' => 'b'))),
-            array('foo' => 'c', 'bar' => array('baz' => array('bat' => 'd'))),
-        );
+        $expected = [
+            ['foo' => 'a', 'bar' => ['baz' => ['bat' => 'b']]],
+            ['foo' => 'c', 'bar' => ['baz' => ['bat' => 'd']]],
+        ];
 
         $this->assertEquals($expected, $this->encoder->decode(<<<'CSV'
 foo,bar.baz.bat
@@ -289,6 +289,6 @@ public function testDecodeMalformedCollection()
 
     public function testDecodeEmptyArray()
     {
-        $this->assertEquals(array(), $this->encoder->decode('', 'csv'));
+        $this->assertEquals([], $this->encoder->decode('', 'csv'));
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/JsonDecodeTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/JsonDecodeTest.php
index 774064d43a853..76a1b6324631c 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/JsonDecodeTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/JsonDecodeTest.php
@@ -47,12 +47,12 @@ public function decodeProvider()
         $stdClass = new \stdClass();
         $stdClass->foo = 'bar';
 
-        $assoc = array('foo' => 'bar');
+        $assoc = ['foo' => 'bar'];
 
-        return array(
-            array('{"foo": "bar"}', $stdClass, array()),
-            array('{"foo": "bar"}', $assoc, array('json_decode_associative' => true)),
-        );
+        return [
+            ['{"foo": "bar"}', $stdClass, []],
+            ['{"foo": "bar"}', $assoc, ['json_decode_associative' => true]],
+        ];
     }
 
     /**
@@ -67,9 +67,9 @@ public function testDecodeWithException($value)
 
     public function decodeProviderException()
     {
-        return array(
-            array("{'foo': 'bar'}"),
-            array('kaboom!'),
-        );
+        return [
+            ["{'foo': 'bar'}"],
+            ['kaboom!'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncodeTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncodeTest.php
index ed33233fb47ea..42a460e520400 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncodeTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncodeTest.php
@@ -43,10 +43,10 @@ public function testEncode($toEncode, $expected, $context)
 
     public function encodeProvider()
     {
-        return array(
-            array(array(), '[]', array()),
-            array(array(), '{}', array('json_encode_options' => JSON_FORCE_OBJECT)),
-        );
+        return [
+            [[], '[]', []],
+            [[], '{}', ['json_encode_options' => JSON_FORCE_OBJECT]],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
index 1977d4f19ce84..439fbda1638a3 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
@@ -24,7 +24,7 @@ class JsonEncoderTest extends TestCase
     protected function setUp()
     {
         $this->encoder = new JsonEncoder();
-        $this->serializer = new Serializer(array(new CustomNormalizer()), array('json' => new JsonEncoder()));
+        $this->serializer = new Serializer([new CustomNormalizer()], ['json' => new JsonEncoder()]);
     }
 
     public function testEncodeScalar()
@@ -48,16 +48,16 @@ public function testComplexObject()
 
     public function testOptions()
     {
-        $context = array('json_encode_options' => JSON_NUMERIC_CHECK);
+        $context = ['json_encode_options' => JSON_NUMERIC_CHECK];
 
-        $arr = array();
+        $arr = [];
         $arr['foo'] = '3';
 
         $expected = '{"foo":3}';
 
         $this->assertEquals($expected, $this->serializer->serialize($arr, 'json', $context));
 
-        $arr = array();
+        $arr = [];
         $arr['foo'] = '3';
 
         $expected = '{"foo":"3"}';
@@ -70,22 +70,22 @@ public function testOptions()
      */
     public function testEncodeNotUtf8WithoutPartialOnError()
     {
-        $arr = array(
+        $arr = [
             'utf8' => 'Hello World!',
             'notUtf8' => "\xb0\xd0\xb5\xd0",
-        );
+        ];
 
         $this->encoder->encode($arr, 'json');
     }
 
     public function testEncodeNotUtf8WithPartialOnError()
     {
-        $context = array('json_encode_options' => JSON_PARTIAL_OUTPUT_ON_ERROR);
+        $context = ['json_encode_options' => JSON_PARTIAL_OUTPUT_ON_ERROR];
 
-        $arr = array(
+        $arr = [
             'utf8' => 'Hello World!',
             'notUtf8' => "\xb0\xd0\xb5\xd0",
-        );
+        ];
 
         $result = $this->encoder->encode($arr, 'json', $context);
         $jsonLastError = json_last_error();
@@ -112,8 +112,8 @@ protected function getObject()
     {
         $obj = new \stdClass();
         $obj->foo = 'foo';
-        $obj->bar = array('a', 'b');
-        $obj->baz = array('key' => 'val', 'key2' => 'val', 'A B' => 'bar', 'item' => array(array('title' => 'title1'), array('title' => 'title2')), 'Barry' => array('FooBar' => array('Baz' => 'Ed', '@id' => 1)));
+        $obj->bar = ['a', 'b'];
+        $obj->baz = ['key' => 'val', 'key2' => 'val', 'A B' => 'bar', 'item' => [['title' => 'title1'], ['title' => 'title2']], 'Barry' => ['FooBar' => ['Baz' => 'Ed', '@id' => 1]]];
         $obj->qux = '1';
 
         return $obj;
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
index df40892cadec2..509ba0c5ca183 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
@@ -32,7 +32,7 @@ class XmlEncoderTest extends TestCase
     protected function setUp()
     {
         $this->encoder = new XmlEncoder();
-        $serializer = new Serializer(array(new CustomNormalizer()), array('xml' => new XmlEncoder()));
+        $serializer = new Serializer([new CustomNormalizer()], ['xml' => new XmlEncoder()]);
         $this->encoder->setSerializer($serializer);
     }
 
@@ -71,19 +71,19 @@ public function testDocTypeIsNotAllowed()
     public function testAttributes()
     {
         $obj = new ScalarDummy();
-        $obj->xmlFoo = array(
-            'foo-bar' => array(
+        $obj->xmlFoo = [
+            'foo-bar' => [
                 '@id' => 1,
                 '@name' => 'Bar',
-            ),
-            'Foo' => array(
+            ],
+            'Foo' => [
                 'Bar' => 'Test',
                 '@Type' => 'test',
-            ),
+            ],
             'föo_bär' => 'a',
-            'Bar' => array(1, 2, 3),
+            'Bar' => [1, 2, 3],
             'a' => 'b',
-        );
+        ];
         $expected = '<?xml version="1.0"?>'."\n".
             '<response>'.
             '<foo-bar id="1" name="Bar"/>'.
@@ -100,11 +100,11 @@ public function testAttributes()
     public function testElementNameValid()
     {
         $obj = new ScalarDummy();
-        $obj->xmlFoo = array(
+        $obj->xmlFoo = [
             'foo-bar' => 'a',
             'foo_bar' => 'a',
             'föo_bär' => 'a',
-        );
+        ];
 
         $expected = '<?xml version="1.0"?>'."\n".
             '<response>'.
@@ -119,7 +119,7 @@ public function testElementNameValid()
     public function testEncodeSimpleXML()
     {
         $xml = simplexml_load_string('<firstname>Peter</firstname>');
-        $array = array('person' => $xml);
+        $array = ['person' => $xml];
 
         $expected = '<?xml version="1.0"?>'."\n".
             '<response><person><firstname>Peter</firstname></person></response>'."\n";
@@ -130,35 +130,35 @@ public function testEncodeSimpleXML()
     public function testEncodeXmlAttributes()
     {
         $xml = simplexml_load_string('<firstname>Peter</firstname>');
-        $array = array('person' => $xml);
+        $array = ['person' => $xml];
 
         $expected = '<?xml version="1.1" encoding="utf-8" standalone="yes"?>'."\n".
             '<response><person><firstname>Peter</firstname></person></response>'."\n";
 
-        $context = array(
+        $context = [
             'xml_version' => '1.1',
             'xml_encoding' => 'utf-8',
             'xml_standalone' => true,
-        );
+        ];
 
         $this->assertSame($expected, $this->encoder->encode($array, 'xml', $context));
     }
 
     public function testEncodeRemovingEmptyTags()
     {
-        $array = array('person' => array('firstname' => 'Peter', 'lastname' => null));
+        $array = ['person' => ['firstname' => 'Peter', 'lastname' => null]];
 
         $expected = '<?xml version="1.0"?>'."\n".
             '<response><person><firstname>Peter</firstname></person></response>'."\n";
 
-        $context = array('remove_empty_tags' => true);
+        $context = ['remove_empty_tags' => true];
 
         $this->assertSame($expected, $this->encoder->encode($array, 'xml', $context));
     }
 
     public function testEncodeNotRemovingEmptyTags()
     {
-        $array = array('person' => array('firstname' => 'Peter', 'lastname' => null));
+        $array = ['person' => ['firstname' => 'Peter', 'lastname' => null]];
 
         $expected = '<?xml version="1.0"?>'."\n".
             '<response><person><firstname>Peter</firstname><lastname/></person></response>'."\n";
@@ -168,7 +168,7 @@ public function testEncodeNotRemovingEmptyTags()
 
     public function testContext()
     {
-        $array = array('person' => array('name' => 'George Abitbol'));
+        $array = ['person' => ['name' => 'George Abitbol']];
         $expected = <<<'XML'
 <?xml version="1.0"?>
 <response>
@@ -179,19 +179,19 @@ public function testContext()
 
 XML;
 
-        $context = array(
+        $context = [
             'xml_format_output' => true,
-        );
+        ];
 
         $this->assertSame($expected, $this->encoder->encode($array, 'xml', $context));
     }
 
     public function testEncodeScalarRootAttributes()
     {
-        $array = array(
+        $array = [
             '#' => 'Paul',
             '@gender' => 'm',
-        );
+        ];
 
         $expected = '<?xml version="1.0"?>'."\n".
             '<response gender="m">Paul</response>'."\n";
@@ -201,10 +201,10 @@ public function testEncodeScalarRootAttributes()
 
     public function testEncodeRootAttributes()
     {
-        $array = array(
+        $array = [
             'firstname' => 'Paul',
             '@gender' => 'm',
-        );
+        ];
 
         $expected = '<?xml version="1.0"?>'."\n".
             '<response gender="m"><firstname>Paul</firstname></response>'."\n";
@@ -214,9 +214,9 @@ public function testEncodeRootAttributes()
 
     public function testEncodeCdataWrapping()
     {
-        $array = array(
+        $array = [
             'firstname' => 'Paul <or Me>',
-        );
+        ];
 
         $expected = '<?xml version="1.0"?>'."\n".
             '<response><firstname><![CDATA[Paul <or Me>]]></firstname></response>'."\n";
@@ -226,9 +226,9 @@ public function testEncodeCdataWrapping()
 
     public function testEncodeScalarWithAttribute()
     {
-        $array = array(
-            'person' => array('@gender' => 'M', '#' => 'Peter'),
-        );
+        $array = [
+            'person' => ['@gender' => 'M', '#' => 'Peter'],
+        ];
 
         $expected = '<?xml version="1.0"?>'."\n".
             '<response><person gender="M">Peter</person></response>'."\n";
@@ -251,7 +251,7 @@ public function testDecodeBigDigitAttributes()
 <document index="182077241760011681341821060401202210011000045913000000017100">Name</document>
 XML;
 
-        $this->assertSame(array('@index' => 182077241760011681341821060401202210011000045913000000017100, '#' => 'Name'), $this->encoder->decode($source, 'xml'));
+        $this->assertSame(['@index' => 182077241760011681341821060401202210011000045913000000017100, '#' => 'Name'], $this->encoder->decode($source, 'xml'));
     }
 
     public function testDecodeNegativeIntAttribute()
@@ -261,7 +261,7 @@ public function testDecodeNegativeIntAttribute()
 <document index="-1234">Name</document>
 XML;
 
-        $this->assertSame(array('@index' => -1234, '#' => 'Name'), $this->encoder->decode($source, 'xml'));
+        $this->assertSame(['@index' => -1234, '#' => 'Name'], $this->encoder->decode($source, 'xml'));
     }
 
     public function testDecodeFloatAttribute()
@@ -271,7 +271,7 @@ public function testDecodeFloatAttribute()
 <document index="-12.11">Name</document>
 XML;
 
-        $this->assertSame(array('@index' => -12.11, '#' => 'Name'), $this->encoder->decode($source, 'xml'));
+        $this->assertSame(['@index' => -12.11, '#' => 'Name'], $this->encoder->decode($source, 'xml'));
     }
 
     public function testDecodeNegativeFloatAttribute()
@@ -281,7 +281,7 @@ public function testDecodeNegativeFloatAttribute()
 <document index="-12.11">Name</document>
 XML;
 
-        $this->assertSame(array('@index' => -12.11, '#' => 'Name'), $this->encoder->decode($source, 'xml'));
+        $this->assertSame(['@index' => -12.11, '#' => 'Name'], $this->encoder->decode($source, 'xml'));
     }
 
     public function testNoTypeCastAttribute()
@@ -293,16 +293,16 @@ public function testNoTypeCastAttribute()
 </document>
 XML;
 
-        $data = $this->encoder->decode($source, 'xml', array('xml_type_cast_attributes' => false));
-        $expected = array(
+        $data = $this->encoder->decode($source, 'xml', ['xml_type_cast_attributes' => false]);
+        $expected = [
             '@a' => '018',
             '@b' => '-12.11',
-            'node' => array(
+            'node' => [
                 '@a' => '018',
                 '@b' => '-12.11',
                 '#' => '',
-            ),
-        );
+            ],
+        ];
         $this->assertSame($expected, $data);
     }
 
@@ -324,14 +324,14 @@ public function testEncodeWithNamespace()
 
     public function testEncodeSerializerXmlRootNodeNameOption()
     {
-        $options = array('xml_root_node_name' => 'test');
+        $options = ['xml_root_node_name' => 'test'];
         $this->encoder = new XmlEncoder();
-        $serializer = new Serializer(array(), array('xml' => new XmlEncoder()));
+        $serializer = new Serializer([], ['xml' => new XmlEncoder()]);
         $this->encoder->setSerializer($serializer);
 
-        $array = array(
-            'person' => array('@gender' => 'M', '#' => 'Peter'),
-        );
+        $array = [
+            'person' => ['@gender' => 'M', '#' => 'Peter'],
+        ];
 
         $expected = '<?xml version="1.0"?>'."\n".
             '<test><person gender="M">Peter</person></test>'."\n";
@@ -342,7 +342,7 @@ public function testEncodeSerializerXmlRootNodeNameOption()
     public function testEncodeTraversableWhenNormalizable()
     {
         $this->encoder = new XmlEncoder();
-        $serializer = new Serializer(array(new CustomNormalizer()), array('xml' => new XmlEncoder()));
+        $serializer = new Serializer([new CustomNormalizer()], ['xml' => new XmlEncoder()]);
         $this->encoder->setSerializer($serializer);
 
         $expected = <<<'XML'
@@ -364,9 +364,9 @@ public function testDecode()
 
     public function testDecodeCdataWrapping()
     {
-        $expected = array(
+        $expected = [
             'firstname' => 'Paul <or Me>',
-        );
+        ];
 
         $xml = '<?xml version="1.0"?>'."\n".
             '<response><firstname><![CDATA[Paul <or Me>]]></firstname></response>'."\n";
@@ -376,9 +376,9 @@ public function testDecodeCdataWrapping()
 
     public function testDecodeCdataWrappingAndWhitespace()
     {
-        $expected = array(
+        $expected = [
             'firstname' => 'Paul <or Me>',
-        );
+        ];
 
         $xml = '<?xml version="1.0"?>'."\n".
             '<response><firstname>'."\n".
@@ -400,9 +400,9 @@ public function testDecodeScalarWithAttribute()
         $source = '<?xml version="1.0"?>'."\n".
             '<response><person gender="M">Peter</person></response>'."\n";
 
-        $expected = array(
-            'person' => array('@gender' => 'M', '#' => 'Peter'),
-        );
+        $expected = [
+            'person' => ['@gender' => 'M', '#' => 'Peter'],
+        ];
 
         $this->assertEquals($expected, $this->encoder->decode($source, 'xml'));
     }
@@ -412,10 +412,10 @@ public function testDecodeScalarRootAttributes()
         $source = '<?xml version="1.0"?>'."\n".
             '<person gender="M">Peter</person>'."\n";
 
-        $expected = array(
+        $expected = [
             '#' => 'Peter',
             '@gender' => 'M',
-        );
+        ];
 
         $this->assertEquals($expected, $this->encoder->decode($source, 'xml'));
     }
@@ -425,11 +425,11 @@ public function testDecodeRootAttributes()
         $source = '<?xml version="1.0"?>'."\n".
             '<person gender="M"><firstname>Peter</firstname><lastname>Mac Calloway</lastname></person>'."\n";
 
-        $expected = array(
+        $expected = [
             'firstname' => 'Peter',
             'lastname' => 'Mac Calloway',
             '@gender' => 'M',
-        );
+        ];
 
         $this->assertEquals($expected, $this->encoder->decode($source, 'xml'));
     }
@@ -444,12 +444,12 @@ public function testDecodeArray()
             '</people>'.
             '</response>'."\n";
 
-        $expected = array(
-            'people' => array('person' => array(
-                array('firstname' => 'Benjamin', 'lastname' => 'Alexandre'),
-                array('firstname' => 'Damien', 'lastname' => 'Clay'),
-            )),
-        );
+        $expected = [
+            'people' => ['person' => [
+                ['firstname' => 'Benjamin', 'lastname' => 'Alexandre'],
+                ['firstname' => 'Damien', 'lastname' => 'Clay'],
+            ]],
+        ];
 
         $this->assertEquals($expected, $this->encoder->decode($source, 'xml'));
     }
@@ -507,10 +507,10 @@ public function testDecodeIgnoreWhiteSpace()
     </person>
 </people>
 XML;
-        $expected = array('person' => array(
-            array('firstname' => 'Benjamin', 'lastname' => 'Alexandre'),
-            array('firstname' => 'Damien', 'lastname' => 'Clay'),
-        ));
+        $expected = ['person' => [
+            ['firstname' => 'Benjamin', 'lastname' => 'Alexandre'],
+            ['firstname' => 'Damien', 'lastname' => 'Clay'],
+        ]];
 
         $this->assertEquals($expected, $this->encoder->decode($source, 'xml'));
     }
@@ -518,32 +518,32 @@ public function testDecodeIgnoreWhiteSpace()
     public function testDecodeWithoutItemHash()
     {
         $obj = new ScalarDummy();
-        $obj->xmlFoo = array(
-            'foo-bar' => array(
+        $obj->xmlFoo = [
+            'foo-bar' => [
                 '@key' => 'value',
-                'item' => array('@key' => 'key', 'key-val' => 'val'),
-            ),
-            'Foo' => array(
+                'item' => ['@key' => 'key', 'key-val' => 'val'],
+            ],
+            'Foo' => [
                 'Bar' => 'Test',
                 '@Type' => 'test',
-            ),
+            ],
             'föo_bär' => 'a',
-            'Bar' => array(1, 2, 3),
+            'Bar' => [1, 2, 3],
             'a' => 'b',
-        );
-        $expected = array(
-            'foo-bar' => array(
+        ];
+        $expected = [
+            'foo-bar' => [
                 '@key' => 'value',
-                'key' => array('@key' => 'key', 'key-val' => 'val'),
-            ),
-            'Foo' => array(
+                'key' => ['@key' => 'key', 'key-val' => 'val'],
+            ],
+            'Foo' => [
                 'Bar' => 'Test',
                 '@Type' => 'test',
-            ),
+            ],
             'föo_bär' => 'a',
-            'Bar' => array(1, 2, 3),
+            'Bar' => [1, 2, 3],
             'a' => 'b',
-        );
+        ];
         $xml = $this->encoder->encode($obj, 'xml');
         $this->assertEquals($expected, $this->encoder->decode($xml, 'xml'));
     }
@@ -603,7 +603,7 @@ protected function getNamespacedXmlSource()
 
     protected function getNamespacedArray()
     {
-        return array(
+        return [
             '@xmlns' => 'http://www.w3.org/2005/Atom',
             '@xmlns:app' => 'http://www.w3.org/2007/app',
             '@xmlns:media' => 'http://search.yahoo.com/mrss/',
@@ -611,36 +611,36 @@ protected function getNamespacedArray()
             '@xmlns:yt' => 'http://gdata.youtube.com/schemas/2007',
             'qux' => '1',
             'app:foo' => 'foo',
-            'yt:bar' => array('a', 'b'),
-            'media:baz' => array(
+            'yt:bar' => ['a', 'b'],
+            'media:baz' => [
                 'media:key' => 'val',
                 'media:key2' => 'val',
                 'A B' => 'bar',
-                'item' => array(
-                    array(
+                'item' => [
+                    [
                         'title' => 'title1',
-                    ),
-                    array(
+                    ],
+                    [
                         'title' => 'title2',
-                    ),
-                ),
-                'Barry' => array(
+                    ],
+                ],
+                'Barry' => [
                     '@size' => 'large',
-                    'FooBar' => array(
+                    'FooBar' => [
                         'Baz' => 'Ed',
                         '@gd:id' => 1,
-                    ),
-                ),
-            ),
-        );
+                    ],
+                ],
+            ],
+        ];
     }
 
     protected function getObject()
     {
         $obj = new Dummy();
         $obj->foo = 'foo';
-        $obj->bar = array('a', 'b');
-        $obj->baz = array('key' => 'val', 'key2' => 'val', 'A B' => 'bar', 'item' => array(array('title' => 'title1'), array('title' => 'title2')), 'Barry' => array('FooBar' => array('Baz' => 'Ed', '@id' => 1)));
+        $obj->bar = ['a', 'b'];
+        $obj->baz = ['key' => 'val', 'key2' => 'val', 'A B' => 'bar', 'item' => [['title' => 'title1'], ['title' => 'title2']], 'Barry' => ['FooBar' => ['Baz' => 'Ed', '@id' => 1]]];
         $obj->qux = '1';
 
         return $obj;
@@ -654,7 +654,7 @@ public function testEncodeXmlWithBoolValue()
 
 XML;
 
-        $actualXml = $this->encoder->encode(array('foo' => true, 'bar' => false), 'xml');
+        $actualXml = $this->encoder->encode(['foo' => true, 'bar' => false], 'xml');
 
         $this->assertEquals($expectedXml, $actualXml);
     }
@@ -663,7 +663,7 @@ public function testEncodeXmlWithDateTimeObjectValue()
     {
         $xmlEncoder = $this->createXmlEncoderWithDateTimeNormalizer();
 
-        $actualXml = $xmlEncoder->encode(array('dateTime' => new \DateTime($this->exampleDateTimeString)), 'xml');
+        $actualXml = $xmlEncoder->encode(['dateTime' => new \DateTime($this->exampleDateTimeString)], 'xml');
 
         $this->assertEquals($this->createXmlWithDateTime(), $actualXml);
     }
@@ -672,7 +672,7 @@ public function testEncodeXmlWithDateTimeObjectField()
     {
         $xmlEncoder = $this->createXmlEncoderWithDateTimeNormalizer();
 
-        $actualXml = $xmlEncoder->encode(array('foo' => array('@dateTime' => new \DateTime($this->exampleDateTimeString))), 'xml');
+        $actualXml = $xmlEncoder->encode(['foo' => ['@dateTime' => new \DateTime($this->exampleDateTimeString)]], 'xml');
 
         $this->assertEquals($this->createXmlWithDateTimeField(), $actualXml);
     }
@@ -683,7 +683,7 @@ public function testEncodeXmlWithDateTimeObjectField()
     private function createXmlEncoderWithDateTimeNormalizer()
     {
         $encoder = new XmlEncoder();
-        $serializer = new Serializer(array($this->createMockDateTimeNormalizer()), array('xml' => new XmlEncoder()));
+        $serializer = new Serializer([$this->createMockDateTimeNormalizer()], ['xml' => new XmlEncoder()]);
         $encoder->setSerializer($serializer);
 
         return $encoder;
@@ -699,7 +699,7 @@ private function createMockDateTimeNormalizer()
         $mock
             ->expects($this->once())
             ->method('normalize')
-            ->with(new \DateTime($this->exampleDateTimeString), 'xml', array())
+            ->with(new \DateTime($this->exampleDateTimeString), 'xml', [])
             ->willReturn($this->exampleDateTimeString);
 
         $mock
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/YamlEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/YamlEncoderTest.php
index d08272df50482..9936ecb8bc8cc 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/YamlEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/YamlEncoderTest.php
@@ -27,7 +27,7 @@ public function testEncode()
         $encoder = new YamlEncoder();
 
         $this->assertEquals('foo', $encoder->encode('foo', 'yaml'));
-        $this->assertEquals('{ foo: 1 }', $encoder->encode(array('foo' => 1), 'yaml'));
+        $this->assertEquals('{ foo: 1 }', $encoder->encode(['foo' => 1], 'yaml'));
     }
 
     public function testSupportsEncoding()
@@ -43,7 +43,7 @@ public function testDecode()
         $encoder = new YamlEncoder();
 
         $this->assertEquals('foo', $encoder->decode('foo', 'yaml'));
-        $this->assertEquals(array('foo' => 1), $encoder->decode('{ foo: 1 }', 'yaml'));
+        $this->assertEquals(['foo' => 1], $encoder->decode('{ foo: 1 }', 'yaml'));
     }
 
     public function testSupportsDecoding()
@@ -56,16 +56,16 @@ public function testSupportsDecoding()
 
     public function testContext()
     {
-        $encoder = new YamlEncoder(new Dumper(), new Parser(), array('yaml_inline' => 1, 'yaml_indent' => 4, 'yaml_flags' => Yaml::DUMP_OBJECT | Yaml::PARSE_OBJECT));
+        $encoder = new YamlEncoder(new Dumper(), new Parser(), ['yaml_inline' => 1, 'yaml_indent' => 4, 'yaml_flags' => Yaml::DUMP_OBJECT | Yaml::PARSE_OBJECT]);
 
         $obj = new \stdClass();
         $obj->bar = 2;
 
         $legacyTag = "    foo: !php/object:O:8:\"stdClass\":1:{s:3:\"bar\";i:2;}\n";
         $spacedTag = "    foo: !php/object 'O:8:\"stdClass\":1:{s:3:\"bar\";i:2;}'\n";
-        $this->assertThat($encoder->encode(array('foo' => $obj), 'yaml'), $this->logicalOr($this->equalTo($legacyTag), $this->equalTo($spacedTag)));
-        $this->assertEquals('  { foo: null }', $encoder->encode(array('foo' => $obj), 'yaml', array('yaml_inline' => 0, 'yaml_indent' => 2, 'yaml_flags' => 0)));
-        $this->assertEquals(array('foo' => $obj), $encoder->decode("foo: !php/object 'O:8:\"stdClass\":1:{s:3:\"bar\";i:2;}'", 'yaml'));
-        $this->assertEquals(array('foo' => null), $encoder->decode("foo: !php/object 'O:8:\"stdClass\":1:{s:3:\"bar\";i:2;}'", 'yaml', array('yaml_flags' => 0)));
+        $this->assertThat($encoder->encode(['foo' => $obj], 'yaml'), $this->logicalOr($this->equalTo($legacyTag), $this->equalTo($spacedTag)));
+        $this->assertEquals('  { foo: null }', $encoder->encode(['foo' => $obj], 'yaml', ['yaml_inline' => 0, 'yaml_indent' => 2, 'yaml_flags' => 0]));
+        $this->assertEquals(['foo' => $obj], $encoder->decode("foo: !php/object 'O:8:\"stdClass\":1:{s:3:\"bar\";i:2;}'", 'yaml'));
+        $this->assertEquals(['foo' => null], $encoder->decode("foo: !php/object 'O:8:\"stdClass\":1:{s:3:\"bar\";i:2;}'", 'yaml', ['yaml_flags' => 0]));
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/AbstractNormalizerDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/AbstractNormalizerDummy.php
index 27b2f24f53fb1..f576a241a4878 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/AbstractNormalizerDummy.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/AbstractNormalizerDummy.php
@@ -31,7 +31,7 @@ public function getAllowedAttributes($classOrObject, array $context, $attributes
     /**
      * {@inheritdoc}
      */
-    public function normalize($object, $format = null, array $context = array())
+    public function normalize($object, $format = null, array $context = [])
     {
     }
 
@@ -46,7 +46,7 @@ public function supportsNormalization($data, $format = null)
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $class, $format = null, array $context = array())
+    public function denormalize($data, $class, $format = null, array $context = [])
     {
     }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/DenormalizableDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/DenormalizableDummy.php
index d78f34a3cde71..ded194ba80fcb 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/DenormalizableDummy.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/DenormalizableDummy.php
@@ -16,7 +16,7 @@
 
 class DenormalizableDummy implements DenormalizableInterface
 {
-    public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = array())
+    public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = [])
     {
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/Dummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/Dummy.php
index 3f4582559e7a0..bb734ddc7e09b 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/Dummy.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/Dummy.php
@@ -23,17 +23,17 @@ class Dummy implements NormalizableInterface, DenormalizableInterface
     public $baz;
     public $qux;
 
-    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = array())
+    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
     {
-        return array(
+        return [
             'foo' => $this->foo,
             'bar' => $this->bar,
             'baz' => $this->baz,
             'qux' => $this->qux,
-        );
+        ];
     }
 
-    public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = array())
+    public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = [])
     {
         $this->foo = $data['foo'];
         $this->bar = $data['bar'];
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/JsonSerializableDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/JsonSerializableDummy.php
index 6d89890b8f4c6..958200fdc74e7 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/JsonSerializableDummy.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/JsonSerializableDummy.php
@@ -15,11 +15,11 @@ class JsonSerializableDummy implements \JsonSerializable
 {
     public function jsonSerialize()
     {
-        return array(
+        return [
             'foo' => 'a',
             'bar' => 'b',
             'baz' => 'c',
             'qux' => $this,
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/NormalizableTraversableDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/NormalizableTraversableDummy.php
index a786fa1cc1922..2ce2adffd798a 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/NormalizableTraversableDummy.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/NormalizableTraversableDummy.php
@@ -18,19 +18,19 @@
 
 class NormalizableTraversableDummy extends TraversableDummy implements NormalizableInterface, DenormalizableInterface
 {
-    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = array())
+    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
     {
-        return array(
+        return [
             'foo' => 'normalizedFoo',
             'bar' => 'normalizedBar',
-        );
+        ];
     }
 
-    public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = array())
+    public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = [])
     {
-        return array(
+        return [
             'foo' => 'denormalizedFoo',
             'bar' => 'denormalizedBar',
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/ScalarDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/ScalarDummy.php
index fb45e12c650ad..438a902e23e3f 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/ScalarDummy.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/ScalarDummy.php
@@ -21,12 +21,12 @@ class ScalarDummy implements NormalizableInterface, DenormalizableInterface
     public $foo;
     public $xmlFoo;
 
-    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = array())
+    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = [])
     {
         return 'xml' === $format ? $this->xmlFoo : $this->foo;
     }
 
-    public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = array())
+    public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = [])
     {
         if ('xml' === $format) {
             $this->xmlFoo = $data;
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/AttributeMetadataTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/AttributeMetadataTest.php
index 16ebcb1aac8dc..622a35ee6306e 100644
--- a/src/Symfony/Component/Serializer/Tests/Mapping/AttributeMetadataTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Mapping/AttributeMetadataTest.php
@@ -38,7 +38,7 @@ public function testGroups()
         $attributeMetadata->addGroup('a');
         $attributeMetadata->addGroup('b');
 
-        $this->assertEquals(array('a', 'b'), $attributeMetadata->getGroups());
+        $this->assertEquals(['a', 'b'], $attributeMetadata->getGroups());
     }
 
     public function testMaxDepth()
@@ -62,7 +62,7 @@ public function testMerge()
 
         $attributeMetadata1->merge($attributeMetadata2);
 
-        $this->assertEquals(array('a', 'b', 'c'), $attributeMetadata1->getGroups());
+        $this->assertEquals(['a', 'b', 'c'], $attributeMetadata1->getGroups());
         $this->assertEquals(2, $attributeMetadata1->getMaxDepth());
     }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/ClassMetadataTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/ClassMetadataTest.php
index f2db1c51f6fcd..f62967935dc52 100644
--- a/src/Symfony/Component/Serializer/Tests/Mapping/ClassMetadataTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Mapping/ClassMetadataTest.php
@@ -38,7 +38,7 @@ public function testAttributeMetadata()
         $classMetadata->addAttributeMetadata($a1);
         $classMetadata->addAttributeMetadata($a2);
 
-        $this->assertEquals(array('a1' => $a1, 'a2' => $a2), $classMetadata->getAttributesMetadata());
+        $this->assertEquals(['a1' => $a1, 'a2' => $a2], $classMetadata->getAttributesMetadata());
     }
 
     public function testMerge()
@@ -48,11 +48,11 @@ public function testMerge()
 
         $ac1 = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface')->getMock();
         $ac1->method('getName')->willReturn('a1');
-        $ac1->method('getGroups')->willReturn(array('a', 'b'));
+        $ac1->method('getGroups')->willReturn(['a', 'b']);
 
         $ac2 = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface')->getMock();
         $ac2->method('getName')->willReturn('a1');
-        $ac2->method('getGroups')->willReturn(array('b', 'c'));
+        $ac2->method('getGroups')->willReturn(['b', 'c']);
 
         $classMetadata1->addAttributeMetadata($ac1);
         $classMetadata2->addAttributeMetadata($ac2);
@@ -61,7 +61,7 @@ public function testMerge()
 
         $ac1->method('getGroups')->willReturn('a', 'b', 'c');
 
-        $this->assertEquals(array('a1' => $ac1), $classMetadata2->getAttributesMetadata());
+        $this->assertEquals(['a1' => $ac1], $classMetadata2->getAttributesMetadata());
     }
 
     public function testSerialize()
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryTest.php
index 903cc04d1f49f..3d2aaa4c7ccdd 100644
--- a/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryTest.php
@@ -25,7 +25,7 @@ class ClassMetadataFactoryTest extends TestCase
 {
     public function testInterface()
     {
-        $classMetadata = new ClassMetadataFactory(new LoaderChain(array()));
+        $classMetadata = new ClassMetadataFactory(new LoaderChain([]));
         $this->assertInstanceOf('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface', $classMetadata);
     }
 
diff --git a/src/Symfony/Component/Serializer/Tests/NameConverter/CamelCaseToSnakeCaseNameConverterTest.php b/src/Symfony/Component/Serializer/Tests/NameConverter/CamelCaseToSnakeCaseNameConverterTest.php
index b0dec5183976a..4847004c972cd 100644
--- a/src/Symfony/Component/Serializer/Tests/NameConverter/CamelCaseToSnakeCaseNameConverterTest.php
+++ b/src/Symfony/Component/Serializer/Tests/NameConverter/CamelCaseToSnakeCaseNameConverterTest.php
@@ -45,13 +45,13 @@ public function testDenormalize($underscored, $camelCased, $useLowerCamelCase)
 
     public function attributeProvider()
     {
-        return array(
-            array('coop_tilleuls', 'coopTilleuls', true),
-            array('_kevin_dunglas', '_kevinDunglas', true),
-            array('this_is_a_test', 'thisIsATest', true),
-            array('coop_tilleuls', 'CoopTilleuls', false),
-            array('_kevin_dunglas', '_kevinDunglas', false),
-            array('this_is_a_test', 'ThisIsATest', false),
-        );
+        return [
+            ['coop_tilleuls', 'coopTilleuls', true],
+            ['_kevin_dunglas', '_kevinDunglas', true],
+            ['this_is_a_test', 'thisIsATest', true],
+            ['coop_tilleuls', 'CoopTilleuls', false],
+            ['_kevin_dunglas', '_kevinDunglas', false],
+            ['this_is_a_test', 'ThisIsATest', false],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php
index 28edc05872710..891660ddf19ba 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php
@@ -33,8 +33,8 @@ class AbstractNormalizerTest extends TestCase
 
     protected function setUp()
     {
-        $loader = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\Loader\LoaderChain')->setConstructorArgs(array(array()))->getMock();
-        $this->classMetadata = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory')->setConstructorArgs(array($loader))->getMock();
+        $loader = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\Loader\LoaderChain')->setConstructorArgs([[]])->getMock();
+        $this->classMetadata = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory')->setConstructorArgs([$loader])->getMock();
         $this->normalizer = new AbstractNormalizerDummy($this->classMetadata);
     }
 
@@ -60,11 +60,11 @@ public function testGetAllowedAttributesAsString()
 
         $this->classMetadata->method('getMetadataFor')->willReturn($classMetadata);
 
-        $result = $this->normalizer->getAllowedAttributes('c', array(AbstractNormalizer::GROUPS => array('test')), true);
-        $this->assertEquals(array('a2', 'a4'), $result);
+        $result = $this->normalizer->getAllowedAttributes('c', [AbstractNormalizer::GROUPS => ['test']], true);
+        $this->assertEquals(['a2', 'a4'], $result);
 
-        $result = $this->normalizer->getAllowedAttributes('c', array(AbstractNormalizer::GROUPS => array('other')), true);
-        $this->assertEquals(array('a3', 'a4'), $result);
+        $result = $this->normalizer->getAllowedAttributes('c', [AbstractNormalizer::GROUPS => ['other']], true);
+        $this->assertEquals(['a3', 'a4'], $result);
     }
 
     public function testGetAllowedAttributesAsObjects()
@@ -111,7 +111,7 @@ public function testObjectToPopulateWithProxy()
     public function testObjectWithStaticConstructor()
     {
         $normalizer = new StaticConstructorNormalizer();
-        $dummy = $normalizer->denormalize(array('foo' => 'baz'), StaticConstructorDummy::class);
+        $dummy = $normalizer->denormalize(['foo' => 'baz'], StaticConstructorDummy::class);
 
         $this->assertInstanceOf(StaticConstructorDummy::class, $dummy);
         $this->assertEquals('baz', $dummy->quz);
@@ -124,7 +124,7 @@ public function testObjectWithStaticConstructor()
     public function testObjectWithNullableConstructorArgument()
     {
         $normalizer = new ObjectNormalizer();
-        $dummy = $normalizer->denormalize(array('foo' => null), NullableConstructorArgumentDummy::class);
+        $dummy = $normalizer->denormalize(['foo' => null], NullableConstructorArgumentDummy::class);
 
         $this->assertNull($dummy->getFoo());
     }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
index 73ccf6891dec0..1c56806a31cc0 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -29,7 +29,7 @@ class AbstractObjectNormalizerTest extends TestCase
     public function testDenormalize()
     {
         $normalizer = new AbstractObjectNormalizerDummy();
-        $normalizedData = $normalizer->denormalize(array('foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'), __NAMESPACE__.'\Dummy');
+        $normalizedData = $normalizer->denormalize(['foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'], __NAMESPACE__.'\Dummy');
 
         $this->assertSame('foo', $normalizedData->foo);
         $this->assertNull($normalizedData->bar);
@@ -38,13 +38,13 @@ public function testDenormalize()
 
     public function testInstantiateObjectDenormalizer()
     {
-        $data = array('foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz');
+        $data = ['foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'];
         $class = __NAMESPACE__.'\Dummy';
-        $context = array();
+        $context = [];
 
         $normalizer = new AbstractObjectNormalizerDummy();
 
-        $this->assertInstanceOf(__NAMESPACE__.'\Dummy', $normalizer->instantiateObject($data, $class, $context, new \ReflectionClass($class), array()));
+        $this->assertInstanceOf(__NAMESPACE__.'\Dummy', $normalizer->instantiateObject($data, $class, $context, new \ReflectionClass($class), []));
     }
 
     /**
@@ -56,10 +56,10 @@ public function testDenormalizeWithExtraAttributes()
         $factory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
         $normalizer = new AbstractObjectNormalizerDummy($factory);
         $normalizer->denormalize(
-            array('fooFoo' => 'foo', 'fooBar' => 'bar'),
+            ['fooFoo' => 'foo', 'fooBar' => 'bar'],
             __NAMESPACE__.'\Dummy',
             'any',
-            array('allow_extra_attributes' => false)
+            ['allow_extra_attributes' => false]
         );
     }
 
@@ -71,10 +71,10 @@ public function testDenormalizeWithExtraAttributesAndNoGroupsWithMetadataFactory
     {
         $normalizer = new AbstractObjectNormalizerWithMetadata();
         $normalizer->denormalize(
-            array('fooFoo' => 'foo', 'fooBar' => 'bar', 'bar' => 'bar'),
+            ['fooFoo' => 'foo', 'fooBar' => 'bar', 'bar' => 'bar'],
             Dummy::class,
             'any',
-            array('allow_extra_attributes' => false)
+            ['allow_extra_attributes' => false]
         );
     }
 
@@ -83,11 +83,11 @@ public function testDenormalizeCollectionDecodedFromXmlWithOneChild()
         $denormalizer = $this->getDenormalizerForDummyCollection();
 
         $dummyCollection = $denormalizer->denormalize(
-            array(
-                'children' => array(
+            [
+                'children' => [
                     'bar' => 'first',
-                ),
-            ),
+                ],
+            ],
             DummyCollection::class,
             'xml'
         );
@@ -103,12 +103,12 @@ public function testDenormalizeCollectionDecodedFromXmlWithTwoChildren()
         $denormalizer = $this->getDenormalizerForDummyCollection();
 
         $dummyCollection = $denormalizer->denormalize(
-            array(
-                'children' => array(
-                    array('bar' => 'first'),
-                    array('bar' => 'second'),
-                ),
-            ),
+            [
+                'children' => [
+                    ['bar' => 'first'],
+                    ['bar' => 'second'],
+                ],
+            ],
             DummyCollection::class,
             'xml'
         );
@@ -125,7 +125,7 @@ private function getDenormalizerForDummyCollection()
         $extractor = $this->getMockBuilder(PhpDocExtractor::class)->getMock();
         $extractor->method('getTypes')
             ->will($this->onConsecutiveCalls(
-                array(
+                [
                     new Type(
                         'array',
                         false,
@@ -134,13 +134,13 @@ private function getDenormalizerForDummyCollection()
                         new Type('int'),
                         new Type('object', false, DummyChild::class)
                     ),
-                ),
+                ],
                 null
             ));
 
         $denormalizer = new AbstractObjectNormalizerCollectionDummy(null, null, $extractor);
         $arrayDenormalizer = new ArrayDenormalizerDummy();
-        $serializer = new SerializerCollectionDummy(array($arrayDenormalizer, $denormalizer));
+        $serializer = new SerializerCollectionDummy([$arrayDenormalizer, $denormalizer]);
         $arrayDenormalizer->setSerializer($serializer);
         $denormalizer->setSerializer($serializer);
 
@@ -203,15 +203,15 @@ public function __construct()
         parent::__construct(new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader())));
     }
 
-    protected function extractAttributes($object, $format = null, array $context = array())
+    protected function extractAttributes($object, $format = null, array $context = [])
     {
     }
 
-    protected function getAttributeValue($object, $attribute, $format = null, array $context = array())
+    protected function getAttributeValue($object, $attribute, $format = null, array $context = [])
     {
     }
 
-    protected function setAttributeValue($object, $attribute, $value, $format = null, array $context = array())
+    protected function setAttributeValue($object, $attribute, $value, $format = null, array $context = [])
     {
         $object->$attribute = $value;
     }
@@ -240,15 +240,15 @@ public function __construct($normalizers)
         $this->normalizers = $normalizers;
     }
 
-    public function serialize($data, $format, array $context = array())
+    public function serialize($data, $format, array $context = [])
     {
     }
 
-    public function deserialize($data, $type, $format, array $context = array())
+    public function deserialize($data, $type, $format, array $context = [])
     {
     }
 
-    public function denormalize($data, $type, $format = null, array $context = array())
+    public function denormalize($data, $type, $format = null, array $context = [])
     {
         foreach ($this->normalizers as $normalizer) {
             if ($normalizer instanceof DenormalizerInterface && $normalizer->supportsDenormalization($data, $type, $format, $context)) {
@@ -265,20 +265,20 @@ public function supportsDenormalization($data, $type, $format = null)
 
 class AbstractObjectNormalizerCollectionDummy extends AbstractObjectNormalizer
 {
-    protected function extractAttributes($object, $format = null, array $context = array())
+    protected function extractAttributes($object, $format = null, array $context = [])
     {
     }
 
-    protected function getAttributeValue($object, $attribute, $format = null, array $context = array())
+    protected function getAttributeValue($object, $attribute, $format = null, array $context = [])
     {
     }
 
-    protected function setAttributeValue($object, $attribute, $value, $format = null, array $context = array())
+    protected function setAttributeValue($object, $attribute, $value, $format = null, array $context = [])
     {
         $object->$attribute = $value;
     }
 
-    protected function isAllowedAttribute($classOrObject, $attribute, $format = null, array $context = array())
+    protected function isAllowedAttribute($classOrObject, $attribute, $format = null, array $context = [])
     {
         return true;
     }
@@ -288,11 +288,11 @@ public function instantiateObject(array &$data, $class, array &$context, \Reflec
         return parent::instantiateObject($data, $class, $context, $reflectionClass, $allowedAttributes, $format);
     }
 
-    public function serialize($data, $format, array $context = array())
+    public function serialize($data, $format, array $context = [])
     {
     }
 
-    public function deserialize($data, $type, $format, array $context = array())
+    public function deserialize($data, $type, $format, array $context = [])
     {
     }
 }
@@ -309,7 +309,7 @@ class ArrayDenormalizerDummy implements DenormalizerInterface, SerializerAwareIn
      *
      * @throws NotNormalizableValueException
      */
-    public function denormalize($data, $class, $format = null, array $context = array())
+    public function denormalize($data, $class, $format = null, array $context = [])
     {
         $serializer = $this->serializer;
         $class = substr($class, 0, -2);
@@ -324,7 +324,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null, array $context = array())
+    public function supportsDenormalization($data, $type, $format = null, array $context = [])
     {
         return '[]' === substr($type, -2)
             && $this->serializer->supportsDenormalization($data, substr($type, 0, -2), $format, $context);
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php
index e5876a04e1e56..fd456cb9dd4d8 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php
@@ -38,27 +38,27 @@ public function testDenormalize()
     {
         $this->serializer->expects($this->at(0))
             ->method('denormalize')
-            ->with(array('foo' => 'one', 'bar' => 'two'))
+            ->with(['foo' => 'one', 'bar' => 'two'])
             ->will($this->returnValue(new ArrayDummy('one', 'two')));
 
         $this->serializer->expects($this->at(1))
             ->method('denormalize')
-            ->with(array('foo' => 'three', 'bar' => 'four'))
+            ->with(['foo' => 'three', 'bar' => 'four'])
             ->will($this->returnValue(new ArrayDummy('three', 'four')));
 
         $result = $this->denormalizer->denormalize(
-            array(
-                array('foo' => 'one', 'bar' => 'two'),
-                array('foo' => 'three', 'bar' => 'four'),
-            ),
+            [
+                ['foo' => 'one', 'bar' => 'two'],
+                ['foo' => 'three', 'bar' => 'four'],
+            ],
             __NAMESPACE__.'\ArrayDummy[]'
         );
 
         $this->assertEquals(
-            array(
+            [
                 new ArrayDummy('one', 'two'),
                 new ArrayDummy('three', 'four'),
-            ),
+            ],
             $result
         );
     }
@@ -72,10 +72,10 @@ public function testSupportsValidArray()
 
         $this->assertTrue(
             $this->denormalizer->supportsDenormalization(
-                array(
-                    array('foo' => 'one', 'bar' => 'two'),
-                    array('foo' => 'three', 'bar' => 'four'),
-                ),
+                [
+                    ['foo' => 'one', 'bar' => 'two'],
+                    ['foo' => 'three', 'bar' => 'four'],
+                ],
                 __NAMESPACE__.'\ArrayDummy[]'
             )
         );
@@ -89,10 +89,10 @@ public function testSupportsInvalidArray()
 
         $this->assertFalse(
             $this->denormalizer->supportsDenormalization(
-                array(
-                    array('foo' => 'one', 'bar' => 'two'),
-                    array('foo' => 'three', 'bar' => 'four'),
-                ),
+                [
+                    ['foo' => 'one', 'bar' => 'two'],
+                    ['foo' => 'three', 'bar' => 'four'],
+                ],
                 __NAMESPACE__.'\InvalidClass[]'
             )
         );
@@ -102,7 +102,7 @@ public function testSupportsNoArray()
     {
         $this->assertFalse(
             $this->denormalizer->supportsDenormalization(
-                array('foo' => 'one', 'bar' => 'two'),
+                ['foo' => 'one', 'bar' => 'two'],
                 __NAMESPACE__.'\ArrayDummy'
             )
         );
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
index 55378c773a557..28fb73ece5bcd 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
@@ -59,9 +59,9 @@ public function testDeserialize()
     public function testDenormalizeWithObjectToPopulateUsesProvidedObject()
     {
         $expected = new ScalarDummy();
-        $obj = $this->normalizer->denormalize('foo', ScalarDummy::class, 'json', array(
+        $obj = $this->normalizer->denormalize('foo', ScalarDummy::class, 'json', [
             'object_to_populate' => $expected,
-        ));
+        ]);
 
         $this->assertSame($expected, $obj);
         $this->assertEquals('foo', $obj->foo);
@@ -76,8 +76,8 @@ public function testSupportsNormalization()
 
     public function testSupportsDenormalization()
     {
-        $this->assertTrue($this->normalizer->supportsDenormalization(array(), 'Symfony\Component\Serializer\Tests\Fixtures\ScalarDummy'));
-        $this->assertFalse($this->normalizer->supportsDenormalization(array(), 'stdClass'));
-        $this->assertTrue($this->normalizer->supportsDenormalization(array(), 'Symfony\Component\Serializer\Tests\Fixtures\DenormalizableDummy'));
+        $this->assertTrue($this->normalizer->supportsDenormalization([], 'Symfony\Component\Serializer\Tests\Fixtures\ScalarDummy'));
+        $this->assertFalse($this->normalizer->supportsDenormalization([], 'stdClass'));
+        $this->assertTrue($this->normalizer->supportsDenormalization([], 'Symfony\Component\Serializer\Tests\Fixtures\DenormalizableDummy'));
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/DataUriNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/DataUriNormalizerTest.php
index d3ad2af836353..7518b8bff42f4 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/DataUriNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/DataUriNormalizerTest.php
@@ -131,19 +131,19 @@ public function testInvalidData($uri)
 
     public function invalidUriProvider()
     {
-        return array(
-            array('dataxbase64'),
-            array('data:HelloWorld'),
-            array('data:text/html;charset=,%3Ch1%3EHello!%3C%2Fh1%3E'),
-            array('data:text/html;charset,%3Ch1%3EHello!%3C%2Fh1%3E'),
-            array('data:base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC'),
-            array(''),
-            array('http://wikipedia.org'),
-            array('base64'),
-            array('iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC'),
-            array(' data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIBAMAAAA2IaO4AAAAFVBMVEXk5OTn5+ft7e319fX29vb5+fn///++GUmVAAAALUlEQVQIHWNICnYLZnALTgpmMGYIFWYIZTA2ZFAzTTFlSDFVMwVyQhmAwsYMAKDaBy0axX/iAAAAAElFTkSuQmCC'),
-            array('   data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIBAMAAAA2IaO4AAAAFVBMVEXk5OTn5+ft7e319fX29vb5+fn///++GUmVAAAALUlEQVQIHWNICnYLZnALTgpmMGYIFWYIZTA2ZFAzTTFlSDFVMwVyQhmAwsYMAKDaBy0axX/iAAAAAElFTkSuQmCC'),
-        );
+        return [
+            ['dataxbase64'],
+            ['data:HelloWorld'],
+            ['data:text/html;charset=,%3Ch1%3EHello!%3C%2Fh1%3E'],
+            ['data:text/html;charset,%3Ch1%3EHello!%3C%2Fh1%3E'],
+            ['data:base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC'],
+            [''],
+            ['http://wikipedia.org'],
+            ['base64'],
+            ['iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC'],
+            [' data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIBAMAAAA2IaO4AAAAFVBMVEXk5OTn5+ft7e319fX29vb5+fn///++GUmVAAAALUlEQVQIHWNICnYLZnALTgpmMGYIFWYIZTA2ZFAzTTFlSDFVMwVyQhmAwsYMAKDaBy0axX/iAAAAAElFTkSuQmCC'],
+            ['   data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIBAMAAAA2IaO4AAAAFVBMVEXk5OTn5+ft7e319fX29vb5+fn///++GUmVAAAALUlEQVQIHWNICnYLZnALTgpmMGYIFWYIZTA2ZFAzTTFlSDFVMwVyQhmAwsYMAKDaBy0axX/iAAAAAElFTkSuQmCC'],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php
index f6dc6c2475e53..b092c779a8cf8 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php
@@ -22,14 +22,14 @@ protected function setUp()
 
     public function dataProviderISO()
     {
-        $data = array(
-            array('P%YY%MM%DDT%HH%IM%SS', 'P00Y00M00DT00H00M00S', 'PT0S'),
-            array('P%yY%mM%dDT%hH%iM%sS', 'P0Y0M0DT0H0M0S', 'PT0S'),
-            array('P%yY%mM%dDT%hH%iM%sS', 'P10Y2M3DT16H5M6S', 'P10Y2M3DT16H5M6S'),
-            array('P%yY%mM%dDT%hH%iM', 'P10Y2M3DT16H5M', 'P10Y2M3DT16H5M'),
-            array('P%yY%mM%dDT%hH', 'P10Y2M3DT16H', 'P10Y2M3DT16H'),
-            array('P%yY%mM%dD', 'P10Y2M3D', 'P10Y2M3DT0H'),
-        );
+        $data = [
+            ['P%YY%MM%DDT%HH%IM%SS', 'P00Y00M00DT00H00M00S', 'PT0S'],
+            ['P%yY%mM%dDT%hH%iM%sS', 'P0Y0M0DT0H0M0S', 'PT0S'],
+            ['P%yY%mM%dDT%hH%iM%sS', 'P10Y2M3DT16H5M6S', 'P10Y2M3DT16H5M6S'],
+            ['P%yY%mM%dDT%hH%iM', 'P10Y2M3DT16H5M', 'P10Y2M3DT16H5M'],
+            ['P%yY%mM%dDT%hH', 'P10Y2M3DT16H', 'P10Y2M3DT16H'],
+            ['P%yY%mM%dD', 'P10Y2M3D', 'P10Y2M3DT0H'],
+        ];
 
         return $data;
     }
@@ -50,7 +50,7 @@ public function testNormalize()
      */
     public function testNormalizeUsingFormatPassedInContext($format, $output, $input)
     {
-        $this->assertEquals($output, $this->normalizer->normalize(new \DateInterval($input), null, array(DateIntervalNormalizer::FORMAT_KEY => $format)));
+        $this->assertEquals($output, $this->normalizer->normalize(new \DateInterval($input), null, [DateIntervalNormalizer::FORMAT_KEY => $format]));
     }
 
     /**
@@ -86,7 +86,7 @@ public function testDenormalize()
      */
     public function testDenormalizeUsingFormatPassedInContext($format, $input, $output)
     {
-        $this->assertDateIntervalEquals(new \DateInterval($output), $this->normalizer->denormalize($input, \DateInterval::class, null, array(DateIntervalNormalizer::FORMAT_KEY => $format)));
+        $this->assertDateIntervalEquals(new \DateInterval($output), $this->normalizer->denormalize($input, \DateInterval::class, null, [DateIntervalNormalizer::FORMAT_KEY => $format]));
     }
 
     /**
@@ -127,7 +127,7 @@ public function testDenormalizeInvalidDataThrowsException()
      */
     public function testDenormalizeFormatMismatchThrowsException()
     {
-        $this->normalizer->denormalize('P00Y00M00DT00H00M00S', \DateInterval::class, null, array(DateIntervalNormalizer::FORMAT_KEY => 'P%yY%mM%dD'));
+        $this->normalizer->denormalize('P00Y00M00DT00H00M00S', \DateInterval::class, null, [DateIntervalNormalizer::FORMAT_KEY => 'P%yY%mM%dD']);
     }
 
     private function assertDateIntervalEquals(\DateInterval $expected, \DateInterval $actual)
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/DateTimeNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/DateTimeNormalizerTest.php
index e86fbdc48df09..5ff41c80337a5 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/DateTimeNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/DateTimeNormalizerTest.php
@@ -44,7 +44,7 @@ public function testNormalize()
 
     public function testNormalizeUsingFormatPassedInContext()
     {
-        $this->assertEquals('2016', $this->normalizer->normalize(new \DateTime('2016/01/01'), null, array(DateTimeNormalizer::FORMAT_KEY => 'Y')));
+        $this->assertEquals('2016', $this->normalizer->normalize(new \DateTime('2016/01/01'), null, [DateTimeNormalizer::FORMAT_KEY => 'Y']));
     }
 
     public function testNormalizeUsingFormatPassedInConstructor()
@@ -65,17 +65,17 @@ public function testNormalizeUsingTimeZonePassedInConstructor()
      */
     public function testNormalizeUsingTimeZonePassedInContext($expected, $input, $timezone)
     {
-        $this->assertSame($expected, $this->normalizer->normalize($input, null, array(
+        $this->assertSame($expected, $this->normalizer->normalize($input, null, [
             DateTimeNormalizer::TIMEZONE_KEY => $timezone,
-        )));
+        ]));
     }
 
     public function normalizeUsingTimeZonePassedInContextProvider()
     {
-        yield array('2016-12-01T00:00:00+00:00', new \DateTime('2016/12/01', new \DateTimeZone('UTC')), null);
-        yield array('2016-12-01T00:00:00+09:00', new \DateTime('2016/12/01', new \DateTimeZone('Japan')), new \DateTimeZone('Japan'));
-        yield array('2016-12-01T09:00:00+09:00', new \DateTime('2016/12/01', new \DateTimeZone('UTC')), new \DateTimeZone('Japan'));
-        yield array('2016-12-01T09:00:00+09:00', new \DateTimeImmutable('2016/12/01', new \DateTimeZone('UTC')), new \DateTimeZone('Japan'));
+        yield ['2016-12-01T00:00:00+00:00', new \DateTime('2016/12/01', new \DateTimeZone('UTC')), null];
+        yield ['2016-12-01T00:00:00+09:00', new \DateTime('2016/12/01', new \DateTimeZone('Japan')), new \DateTimeZone('Japan')];
+        yield ['2016-12-01T09:00:00+09:00', new \DateTime('2016/12/01', new \DateTimeZone('UTC')), new \DateTimeZone('Japan')];
+        yield ['2016-12-01T09:00:00+09:00', new \DateTimeImmutable('2016/12/01', new \DateTimeZone('UTC')), new \DateTimeZone('Japan')];
     }
 
     /**
@@ -88,17 +88,17 @@ public function testNormalizeUsingTimeZonePassedInContextAndFormattedWithMicrose
             $this->normalizer->normalize(
                 $input,
                 null,
-                array(
+                [
                     DateTimeNormalizer::TIMEZONE_KEY => $timezone,
                     DateTimeNormalizer::FORMAT_KEY => $expectedFormat,
-                )
+                ]
             )
         );
     }
 
     public function normalizeUsingTimeZonePassedInContextAndExpectedFormatWithMicrosecondsProvider()
     {
-        yield array(
+        yield [
             '2018-12-01T18:03:06.067634',
             'Y-m-d\TH:i:s.u',
             \DateTime::createFromFormat(
@@ -107,9 +107,9 @@ public function normalizeUsingTimeZonePassedInContextAndExpectedFormatWithMicros
                 new \DateTimeZone('UTC')
             ),
             null,
-        );
+        ];
 
-        yield array(
+        yield [
             '2018-12-01T18:03:06.067634',
             'Y-m-d\TH:i:s.u',
             \DateTime::createFromFormat(
@@ -118,9 +118,9 @@ public function normalizeUsingTimeZonePassedInContextAndExpectedFormatWithMicros
                 new \DateTimeZone('UTC')
             ),
             new \DateTimeZone('UTC'),
-        );
+        ];
 
-        yield array(
+        yield [
             '2018-12-01T19:03:06.067634+01:00',
             'Y-m-d\TH:i:s.uP',
             \DateTimeImmutable::createFromFormat(
@@ -129,9 +129,9 @@ public function normalizeUsingTimeZonePassedInContextAndExpectedFormatWithMicros
                 new \DateTimeZone('UTC')
             ),
             new \DateTimeZone('Europe/Rome'),
-        );
+        ];
 
-        yield array(
+        yield [
             '2018-12-01T20:03:06.067634+02:00',
             'Y-m-d\TH:i:s.uP',
             \DateTime::createFromFormat(
@@ -140,9 +140,9 @@ public function normalizeUsingTimeZonePassedInContextAndExpectedFormatWithMicros
                 new \DateTimeZone('UTC')
             ),
             new \DateTimeZone('Europe/Kiev'),
-        );
+        ];
 
-        yield array(
+        yield [
             '2018-12-01T19:03:06.067634',
             'Y-m-d\TH:i:s.u',
             \DateTime::createFromFormat(
@@ -151,7 +151,7 @@ public function normalizeUsingTimeZonePassedInContextAndExpectedFormatWithMicros
                 new \DateTimeZone('UTC')
             ),
             new \DateTimeZone('Europe/Berlin'),
-        );
+        ];
     }
 
     /**
@@ -184,16 +184,16 @@ public function testDenormalizeUsingTimezonePassedInConstructor()
         $expected = new \DateTime('2016/12/01 17:35:00', $timezone);
         $normalizer = new DateTimeNormalizer(null, $timezone);
 
-        $this->assertEquals($expected, $normalizer->denormalize('2016.12.01 17:35:00', \DateTime::class, null, array(
+        $this->assertEquals($expected, $normalizer->denormalize('2016.12.01 17:35:00', \DateTime::class, null, [
             DateTimeNormalizer::FORMAT_KEY => 'Y.m.d H:i:s',
-        )));
+        ]));
     }
 
     public function testDenormalizeUsingFormatPassedInContext()
     {
-        $this->assertEquals(new \DateTimeImmutable('2016/01/01'), $this->normalizer->denormalize('2016.01.01', \DateTimeInterface::class, null, array(DateTimeNormalizer::FORMAT_KEY => 'Y.m.d|')));
-        $this->assertEquals(new \DateTimeImmutable('2016/01/01'), $this->normalizer->denormalize('2016.01.01', \DateTimeImmutable::class, null, array(DateTimeNormalizer::FORMAT_KEY => 'Y.m.d|')));
-        $this->assertEquals(new \DateTime('2016/01/01'), $this->normalizer->denormalize('2016.01.01', \DateTime::class, null, array(DateTimeNormalizer::FORMAT_KEY => 'Y.m.d|')));
+        $this->assertEquals(new \DateTimeImmutable('2016/01/01'), $this->normalizer->denormalize('2016.01.01', \DateTimeInterface::class, null, [DateTimeNormalizer::FORMAT_KEY => 'Y.m.d|']));
+        $this->assertEquals(new \DateTimeImmutable('2016/01/01'), $this->normalizer->denormalize('2016.01.01', \DateTimeImmutable::class, null, [DateTimeNormalizer::FORMAT_KEY => 'Y.m.d|']));
+        $this->assertEquals(new \DateTime('2016/01/01'), $this->normalizer->denormalize('2016.01.01', \DateTime::class, null, [DateTimeNormalizer::FORMAT_KEY => 'Y.m.d|']));
     }
 
     /**
@@ -201,38 +201,38 @@ public function testDenormalizeUsingFormatPassedInContext()
      */
     public function testDenormalizeUsingTimezonePassedInContext($input, $expected, $timezone, $format = null)
     {
-        $actual = $this->normalizer->denormalize($input, \DateTimeInterface::class, null, array(
+        $actual = $this->normalizer->denormalize($input, \DateTimeInterface::class, null, [
             DateTimeNormalizer::TIMEZONE_KEY => $timezone,
             DateTimeNormalizer::FORMAT_KEY => $format,
-        ));
+        ]);
 
         $this->assertEquals($expected, $actual);
     }
 
     public function denormalizeUsingTimezonePassedInContextProvider()
     {
-        yield 'with timezone' => array(
+        yield 'with timezone' => [
             '2016/12/01 17:35:00',
             new \DateTimeImmutable('2016/12/01 17:35:00', new \DateTimeZone('Japan')),
             new \DateTimeZone('Japan'),
-        );
-        yield 'with timezone as string' => array(
+        ];
+        yield 'with timezone as string' => [
             '2016/12/01 17:35:00',
             new \DateTimeImmutable('2016/12/01 17:35:00', new \DateTimeZone('Japan')),
             'Japan',
-        );
-        yield 'with format without timezone information' => array(
+        ];
+        yield 'with format without timezone information' => [
             '2016.12.01 17:35:00',
             new \DateTimeImmutable('2016/12/01 17:35:00', new \DateTimeZone('Japan')),
             new \DateTimeZone('Japan'),
             'Y.m.d H:i:s',
-        );
-        yield 'ignored with format with timezone information' => array(
+        ];
+        yield 'ignored with format with timezone information' => [
             '2016-12-01T17:35:00Z',
             new \DateTimeImmutable('2016/12/01 17:35:00', new \DateTimeZone('UTC')),
             'Europe/Paris',
             \DateTime::RFC3339,
-        );
+        ];
     }
 
     /**
@@ -266,6 +266,6 @@ public function testDenormalizeEmptyStringThrowsException()
      */
     public function testDenormalizeFormatMismatchThrowsException()
     {
-        $this->normalizer->denormalize('2016-01-01T00:00:00+00:00', \DateTimeInterface::class, null, array(DateTimeNormalizer::FORMAT_KEY => 'Y-m-d|'));
+        $this->normalizer->denormalize('2016-01-01T00:00:00+00:00', \DateTimeInterface::class, null, [DateTimeNormalizer::FORMAT_KEY => 'Y-m-d|']);
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
index a087d3de093dd..716f0122f5eea 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
@@ -67,14 +67,14 @@ public function testNormalize()
         ;
 
         $this->assertEquals(
-            array(
+            [
                 'foo' => 'foo',
                 'bar' => 'bar',
                 'baz' => true,
                 'fooBar' => 'foobar',
                 'camelCase' => 'camelcase',
                 'object' => 'string_object',
-            ),
+            ],
             $this->normalizer->normalize($obj, 'any')
         );
     }
@@ -82,7 +82,7 @@ public function testNormalize()
     public function testDenormalize()
     {
         $obj = $this->normalizer->denormalize(
-            array('foo' => 'foo', 'bar' => 'bar', 'baz' => true, 'fooBar' => 'foobar'),
+            ['foo' => 'foo', 'bar' => 'bar', 'baz' => true, 'fooBar' => 'foobar'],
             __NAMESPACE__.'\GetSetDummy',
             'any'
         );
@@ -110,7 +110,7 @@ public function testDenormalizeNull()
     public function testConstructorDenormalize()
     {
         $obj = $this->normalizer->denormalize(
-            array('foo' => 'foo', 'bar' => 'bar', 'baz' => true, 'fooBar' => 'foobar'),
+            ['foo' => 'foo', 'bar' => 'bar', 'baz' => true, 'fooBar' => 'foobar'],
             __NAMESPACE__.'\GetConstructorDummy', 'any');
         $this->assertEquals('foo', $obj->getFoo());
         $this->assertEquals('bar', $obj->getBar());
@@ -120,7 +120,7 @@ public function testConstructorDenormalize()
     public function testConstructorDenormalizeWithNullArgument()
     {
         $obj = $this->normalizer->denormalize(
-            array('foo' => 'foo', 'bar' => null, 'baz' => true),
+            ['foo' => 'foo', 'bar' => null, 'baz' => true],
             __NAMESPACE__.'\GetConstructorDummy', 'any');
         $this->assertEquals('foo', $obj->getFoo());
         $this->assertNull($obj->getBar());
@@ -130,19 +130,19 @@ public function testConstructorDenormalizeWithNullArgument()
     public function testConstructorDenormalizeWithMissingOptionalArgument()
     {
         $obj = $this->normalizer->denormalize(
-            array('foo' => 'test', 'baz' => array(1, 2, 3)),
+            ['foo' => 'test', 'baz' => [1, 2, 3]],
             __NAMESPACE__.'\GetConstructorOptionalArgsDummy', 'any');
         $this->assertEquals('test', $obj->getFoo());
-        $this->assertEquals(array(), $obj->getBar());
-        $this->assertEquals(array(1, 2, 3), $obj->getBaz());
+        $this->assertEquals([], $obj->getBar());
+        $this->assertEquals([1, 2, 3], $obj->getBaz());
     }
 
     public function testConstructorDenormalizeWithOptionalDefaultArgument()
     {
         $obj = $this->normalizer->denormalize(
-            array('bar' => 'test'),
+            ['bar' => 'test'],
             __NAMESPACE__.'\GetConstructorArgsWithDefaultValueDummy', 'any');
-        $this->assertEquals(array(), $obj->getFoo());
+        $this->assertEquals([], $obj->getFoo());
         $this->assertEquals('test', $obj->getBar());
     }
 
@@ -152,9 +152,9 @@ public function testConstructorDenormalizeWithOptionalDefaultArgument()
     public function testConstructorDenormalizeWithVariadicArgument()
     {
         $obj = $this->normalizer->denormalize(
-            array('foo' => array(1, 2, 3)),
+            ['foo' => [1, 2, 3]],
             'Symfony\Component\Serializer\Tests\Fixtures\VariadicConstructorArgsDummy', 'any');
-        $this->assertEquals(array(1, 2, 3), $obj->getFoo());
+        $this->assertEquals([1, 2, 3], $obj->getFoo());
     }
 
     /**
@@ -163,9 +163,9 @@ public function testConstructorDenormalizeWithVariadicArgument()
     public function testConstructorDenormalizeWithMissingVariadicArgument()
     {
         $obj = $this->normalizer->denormalize(
-            array(),
+            [],
             'Symfony\Component\Serializer\Tests\Fixtures\VariadicConstructorArgsDummy', 'any');
-        $this->assertEquals(array(), $obj->getFoo());
+        $this->assertEquals([], $obj->getFoo());
     }
 
     public function testConstructorWithObjectDenormalize()
@@ -182,7 +182,7 @@ public function testConstructorWithObjectDenormalize()
 
     public function testConstructorWArgWithPrivateMutator()
     {
-        $obj = $this->normalizer->denormalize(array('foo' => 'bar'), __NAMESPACE__.'\ObjectConstructorArgsWithPrivateMutatorDummy', 'any');
+        $obj = $this->normalizer->denormalize(['foo' => 'bar'], __NAMESPACE__.'\ObjectConstructorArgsWithPrivateMutatorDummy', 'any');
         $this->assertEquals('bar', $obj->getFoo());
     }
 
@@ -200,18 +200,18 @@ public function testGroupsNormalize()
         $obj->setKevin('kevin');
         $obj->setCoopTilleuls('coopTilleuls');
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'bar' => 'bar',
-        ), $this->normalizer->normalize($obj, null, array(GetSetMethodNormalizer::GROUPS => array('c'))));
+        ], $this->normalizer->normalize($obj, null, [GetSetMethodNormalizer::GROUPS => ['c']]));
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'symfony' => 'symfony',
             'foo' => 'foo',
             'fooBar' => 'fooBar',
             'bar' => 'bar',
             'kevin' => 'kevin',
             'coopTilleuls' => 'coopTilleuls',
-        ), $this->normalizer->normalize($obj, null, array(GetSetMethodNormalizer::GROUPS => array('a', 'c'))));
+        ], $this->normalizer->normalize($obj, null, [GetSetMethodNormalizer::GROUPS => ['a', 'c']]));
     }
 
     public function testGroupsDenormalize()
@@ -223,13 +223,13 @@ public function testGroupsDenormalize()
         $obj = new GroupDummy();
         $obj->setFoo('foo');
 
-        $toNormalize = array('foo' => 'foo', 'bar' => 'bar');
+        $toNormalize = ['foo' => 'foo', 'bar' => 'bar'];
 
         $normalized = $this->normalizer->denormalize(
             $toNormalize,
             'Symfony\Component\Serializer\Tests\Fixtures\GroupDummy',
             null,
-            array(GetSetMethodNormalizer::GROUPS => array('a'))
+            [GetSetMethodNormalizer::GROUPS => ['a']]
         );
         $this->assertEquals($obj, $normalized);
 
@@ -239,7 +239,7 @@ public function testGroupsDenormalize()
             $toNormalize,
             'Symfony\Component\Serializer\Tests\Fixtures\GroupDummy',
             null,
-            array(GetSetMethodNormalizer::GROUPS => array('a', 'b'))
+            [GetSetMethodNormalizer::GROUPS => ['a', 'b']]
         );
         $this->assertEquals($obj, $normalized);
     }
@@ -256,12 +256,12 @@ public function testGroupsNormalizeWithNameConverter()
         $obj->setCoopTilleuls('les-tilleuls.coop');
 
         $this->assertEquals(
-            array(
+            [
                 'bar' => null,
                 'foo_bar' => '@dunglas',
                 'symfony' => '@coopTilleuls',
-            ),
-            $this->normalizer->normalize($obj, null, array(GetSetMethodNormalizer::GROUPS => array('name_converter')))
+            ],
+            $this->normalizer->normalize($obj, null, [GetSetMethodNormalizer::GROUPS => ['name_converter']])
         );
     }
 
@@ -277,12 +277,12 @@ public function testGroupsDenormalizeWithNameConverter()
 
         $this->assertEquals(
             $obj,
-            $this->normalizer->denormalize(array(
+            $this->normalizer->denormalize([
                 'bar' => null,
                 'foo_bar' => '@dunglas',
                 'symfony' => '@coopTilleuls',
                 'coop_tilleuls' => 'les-tilleuls.coop',
-            ), 'Symfony\Component\Serializer\Tests\Fixtures\GroupDummy', null, array(GetSetMethodNormalizer::GROUPS => array('name_converter')))
+            ], 'Symfony\Component\Serializer\Tests\Fixtures\GroupDummy', null, [GetSetMethodNormalizer::GROUPS => ['name_converter']])
         );
     }
 
@@ -324,45 +324,45 @@ public function testIgnoredAttributes()
         $obj->setBaz(true);
 
         $this->assertEquals(
-            array('fooBar' => 'foobar'),
+            ['fooBar' => 'foobar'],
             $this->normalizer->normalize($obj, 'any')
         );
     }
 
     public function provideCallbacks()
     {
-        return array(
-            array(
-                array(
+        return [
+            [
+                [
                     'bar' => function ($bar) {
                         return 'baz';
                     },
-                ),
+                ],
                 'baz',
-                array('foo' => '', 'bar' => 'baz', 'baz' => true),
+                ['foo' => '', 'bar' => 'baz', 'baz' => true],
                 'Change a string',
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'bar' => function ($bar) {
                     },
-                ),
+                ],
                 'baz',
-                array('foo' => '', 'bar' => null, 'baz' => true),
+                ['foo' => '', 'bar' => null, 'baz' => true],
                 'Null an item',
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'bar' => function ($bar) {
                         return $bar->format('d-m-Y H:i:s');
                     },
-                ),
+                ],
                 new \DateTime('2011-09-10 06:30:00'),
-                array('foo' => '', 'bar' => '10-09-2011 06:30:00', 'baz' => true),
+                ['foo' => '', 'bar' => '10-09-2011 06:30:00', 'baz' => true],
                 'Format a date',
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'bar' => function ($bars) {
                         $foos = '';
                         foreach ($bars as $bar) {
@@ -371,22 +371,22 @@ public function provideCallbacks()
 
                         return $foos;
                     },
-                ),
-                array(new GetConstructorDummy('baz', '', false), new GetConstructorDummy('quux', '', false)),
-                array('foo' => '', 'bar' => 'bazquux', 'baz' => true),
+                ],
+                [new GetConstructorDummy('baz', '', false), new GetConstructorDummy('quux', '', false)],
+                ['foo' => '', 'bar' => 'bazquux', 'baz' => true],
                 'Collect a property',
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'bar' => function ($bars) {
                         return \count($bars);
                     },
-                ),
-                array(new GetConstructorDummy('baz', '', false), new GetConstructorDummy('quux', '', false)),
-                array('foo' => '', 'bar' => 2, 'baz' => true),
+                ],
+                [new GetConstructorDummy('baz', '', false), new GetConstructorDummy('quux', '', false)],
+                ['foo' => '', 'bar' => 2, 'baz' => true],
                 'Count a property',
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -444,7 +444,7 @@ public function testCircularReferenceHandler()
 
         $obj = new CircularReferenceDummy();
 
-        $expected = array('me' => 'Symfony\Component\Serializer\Tests\Fixtures\CircularReferenceDummy');
+        $expected = ['me' => 'Symfony\Component\Serializer\Tests\Fixtures\CircularReferenceDummy'];
         $this->assertEquals($expected, $this->normalizer->normalize($obj));
     }
 
@@ -454,10 +454,10 @@ public function testObjectToPopulate()
         $dummy->setFoo('foo');
 
         $obj = $this->normalizer->denormalize(
-            array('bar' => 'bar'),
+            ['bar' => 'bar'],
             __NAMESPACE__.'\GetSetDummy',
             null,
-            array(GetSetMethodNormalizer::OBJECT_TO_POPULATE => $dummy)
+            [GetSetMethodNormalizer::OBJECT_TO_POPULATE => $dummy]
         );
 
         $this->assertEquals($dummy, $obj);
@@ -469,13 +469,13 @@ public function testDenormalizeNonExistingAttribute()
     {
         $this->assertEquals(
             new GetSetDummy(),
-            $this->normalizer->denormalize(array('non_existing' => true), __NAMESPACE__.'\GetSetDummy')
+            $this->normalizer->denormalize(['non_existing' => true], __NAMESPACE__.'\GetSetDummy')
         );
     }
 
     public function testDenormalizeShouldNotSetStaticAttribute()
     {
-        $obj = $this->normalizer->denormalize(array('staticObject' => true), __NAMESPACE__.'\GetSetDummy');
+        $obj = $this->normalizer->denormalize(['staticObject' => true], __NAMESPACE__.'\GetSetDummy');
 
         $this->assertEquals(new GetSetDummy(), $obj);
         $this->assertNull(GetSetDummy::getStaticObject());
@@ -493,13 +493,13 @@ public function testNoStaticGetSetSupport()
 
     public function testPrivateSetter()
     {
-        $obj = $this->normalizer->denormalize(array('foo' => 'foobar'), __NAMESPACE__.'\ObjectWithPrivateSetterDummy');
+        $obj = $this->normalizer->denormalize(['foo' => 'foobar'], __NAMESPACE__.'\ObjectWithPrivateSetterDummy');
         $this->assertEquals('bar', $obj->getFoo());
     }
 
     public function testHasGetterDenormalize()
     {
-        $obj = $this->normalizer->denormalize(array('foo' => true), ObjectWithHasGetterDummy::class);
+        $obj = $this->normalizer->denormalize(['foo' => true], ObjectWithHasGetterDummy::class);
         $this->assertTrue($obj->hasFoo());
     }
 
@@ -509,7 +509,7 @@ public function testHasGetterNormalize()
         $obj->setFoo(true);
 
         $this->assertEquals(
-            array('foo' => true),
+            ['foo' => true],
             $this->normalizer->normalize($obj, 'any')
         );
     }
@@ -518,7 +518,7 @@ public function testMaxDepth()
     {
         $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
         $this->normalizer = new GetSetMethodNormalizer($classMetadataFactory);
-        $serializer = new Serializer(array($this->normalizer));
+        $serializer = new Serializer([$this->normalizer]);
         $this->normalizer->setSerializer($serializer);
 
         $level1 = new MaxDepthDummy();
@@ -536,20 +536,20 @@ public function testMaxDepth()
         $level4->bar = 'level4';
         $level3->child = $level4;
 
-        $result = $serializer->normalize($level1, null, array(GetSetMethodNormalizer::ENABLE_MAX_DEPTH => true));
+        $result = $serializer->normalize($level1, null, [GetSetMethodNormalizer::ENABLE_MAX_DEPTH => true]);
 
-        $expected = array(
+        $expected = [
             'bar' => 'level1',
-            'child' => array(
+            'child' => [
                     'bar' => 'level2',
-                    'child' => array(
+                    'child' => [
                             'bar' => 'level3',
-                            'child' => array(
+                            'child' => [
                                     'child' => null,
-                                ),
-                        ),
-                ),
-            );
+                                ],
+                        ],
+                ],
+            ];
 
         $this->assertEquals($expected, $result);
     }
@@ -684,7 +684,7 @@ class GetConstructorOptionalArgsDummy
     private $bar;
     private $baz;
 
-    public function __construct($foo, $bar = array(), $baz = array())
+    public function __construct($foo, $bar = [], $baz = [])
     {
         $this->foo = $foo;
         $this->bar = $bar;
@@ -717,7 +717,7 @@ class GetConstructorArgsWithDefaultValueDummy
     protected $foo;
     protected $bar;
 
-    public function __construct($foo = array(), $bar)
+    public function __construct($foo = [], $bar)
     {
         $this->foo = $foo;
         $this->bar = $bar;
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php
index 065d92b99f05e..c6b167cbbe13e 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php
@@ -51,7 +51,7 @@ public function testNormalize()
             ->expects($this->once())
             ->method('normalize')
             ->will($this->returnCallback(function ($data) {
-                $this->assertArraySubset(array('foo' => 'a', 'bar' => 'b', 'baz' => 'c'), $data);
+                $this->assertArraySubset(['foo' => 'a', 'bar' => 'b', 'baz' => 'c'], $data);
 
                 return 'string_object';
             }))
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
index 0a855d22be726..6fd88d68affdf 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -69,14 +69,14 @@ public function testNormalize()
         ;
 
         $this->assertEquals(
-            array(
+            [
                 'foo' => 'foo',
                 'bar' => 'bar',
                 'baz' => true,
                 'fooBar' => 'foobar',
                 'camelCase' => 'camelcase',
                 'object' => 'string_object',
-            ),
+            ],
             $this->normalizer->normalize($obj, 'any')
         );
     }
@@ -84,7 +84,7 @@ public function testNormalize()
     public function testDenormalize()
     {
         $obj = $this->normalizer->denormalize(
-            array('foo' => 'foo', 'bar' => 'bar', 'baz' => true, 'fooBar' => 'foobar'),
+            ['foo' => 'foo', 'bar' => 'bar', 'baz' => true, 'fooBar' => 'foobar'],
             __NAMESPACE__.'\ObjectDummy',
             'any'
         );
@@ -112,7 +112,7 @@ public function testDenormalizeNull()
     public function testConstructorDenormalize()
     {
         $obj = $this->normalizer->denormalize(
-            array('foo' => 'foo', 'bar' => 'bar', 'baz' => true, 'fooBar' => 'foobar'),
+            ['foo' => 'foo', 'bar' => 'bar', 'baz' => true, 'fooBar' => 'foobar'],
             __NAMESPACE__.'\ObjectConstructorDummy', 'any');
         $this->assertEquals('foo', $obj->getFoo());
         $this->assertEquals('bar', $obj->bar);
@@ -122,7 +122,7 @@ public function testConstructorDenormalize()
     public function testConstructorDenormalizeWithNullArgument()
     {
         $obj = $this->normalizer->denormalize(
-            array('foo' => 'foo', 'bar' => null, 'baz' => true),
+            ['foo' => 'foo', 'bar' => null, 'baz' => true],
             __NAMESPACE__.'\ObjectConstructorDummy', 'any');
         $this->assertEquals('foo', $obj->getFoo());
         $this->assertNull($obj->bar);
@@ -132,19 +132,19 @@ public function testConstructorDenormalizeWithNullArgument()
     public function testConstructorDenormalizeWithMissingOptionalArgument()
     {
         $obj = $this->normalizer->denormalize(
-            array('foo' => 'test', 'baz' => array(1, 2, 3)),
+            ['foo' => 'test', 'baz' => [1, 2, 3]],
             __NAMESPACE__.'\ObjectConstructorOptionalArgsDummy', 'any');
         $this->assertEquals('test', $obj->getFoo());
-        $this->assertEquals(array(), $obj->bar);
-        $this->assertEquals(array(1, 2, 3), $obj->getBaz());
+        $this->assertEquals([], $obj->bar);
+        $this->assertEquals([1, 2, 3], $obj->getBaz());
     }
 
     public function testConstructorDenormalizeWithOptionalDefaultArgument()
     {
         $obj = $this->normalizer->denormalize(
-            array('bar' => 'test'),
+            ['bar' => 'test'],
             __NAMESPACE__.'\ObjectConstructorArgsWithDefaultValueDummy', 'any');
-        $this->assertEquals(array(), $obj->getFoo());
+        $this->assertEquals([], $obj->getFoo());
         $this->assertEquals('test', $obj->getBar());
     }
 
@@ -162,16 +162,16 @@ public function testConstructorWithObjectDenormalize()
 
     public function testConstructorWithObjectTypeHintDenormalize()
     {
-        $data = array(
+        $data = [
             'id' => 10,
-            'inner' => array(
+            'inner' => [
                 'foo' => 'oof',
                 'bar' => 'rab',
-            ),
-        );
+            ],
+        ];
 
         $normalizer = new ObjectNormalizer();
-        $serializer = new Serializer(array($normalizer));
+        $serializer = new Serializer([$normalizer]);
         $normalizer->setSerializer($serializer);
 
         $obj = $normalizer->denormalize($data, DummyWithConstructorObject::class);
@@ -188,13 +188,13 @@ public function testConstructorWithObjectTypeHintDenormalize()
      */
     public function testConstructorWithUnknownObjectTypeHintDenormalize()
     {
-        $data = array(
+        $data = [
             'id' => 10,
-            'unknown' => array(
+            'unknown' => [
                 'foo' => 'oof',
                 'bar' => 'rab',
-            ),
-        );
+            ],
+        ];
 
         $normalizer = new ObjectNormalizer();
         $serializer = new Serializer(array($normalizer));
@@ -217,18 +217,18 @@ public function testGroupsNormalize()
         $obj->setKevin('kevin');
         $obj->setCoopTilleuls('coopTilleuls');
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'bar' => 'bar',
-        ), $this->normalizer->normalize($obj, null, array(ObjectNormalizer::GROUPS => array('c'))));
+        ], $this->normalizer->normalize($obj, null, [ObjectNormalizer::GROUPS => ['c']]));
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'symfony' => 'symfony',
             'foo' => 'foo',
             'fooBar' => 'fooBar',
             'bar' => 'bar',
             'kevin' => 'kevin',
             'coopTilleuls' => 'coopTilleuls',
-        ), $this->normalizer->normalize($obj, null, array(ObjectNormalizer::GROUPS => array('a', 'c'))));
+        ], $this->normalizer->normalize($obj, null, [ObjectNormalizer::GROUPS => ['a', 'c']]));
     }
 
     public function testGroupsDenormalize()
@@ -240,13 +240,13 @@ public function testGroupsDenormalize()
         $obj = new GroupDummy();
         $obj->setFoo('foo');
 
-        $toNormalize = array('foo' => 'foo', 'bar' => 'bar');
+        $toNormalize = ['foo' => 'foo', 'bar' => 'bar'];
 
         $normalized = $this->normalizer->denormalize(
             $toNormalize,
             'Symfony\Component\Serializer\Tests\Fixtures\GroupDummy',
             null,
-            array(ObjectNormalizer::GROUPS => array('a'))
+            [ObjectNormalizer::GROUPS => ['a']]
         );
         $this->assertEquals($obj, $normalized);
 
@@ -256,7 +256,7 @@ public function testGroupsDenormalize()
             $toNormalize,
             'Symfony\Component\Serializer\Tests\Fixtures\GroupDummy',
             null,
-            array(ObjectNormalizer::GROUPS => array('a', 'b'))
+            [ObjectNormalizer::GROUPS => ['a', 'b']]
         );
         $this->assertEquals($obj, $normalized);
     }
@@ -270,7 +270,7 @@ public function testNormalizeNoPropertyInGroup()
         $obj = new GroupDummy();
         $obj->setFoo('foo');
 
-        $this->assertEquals(array(), $this->normalizer->normalize($obj, null, array('groups' => array('notExist'))));
+        $this->assertEquals([], $this->normalizer->normalize($obj, null, ['groups' => ['notExist']]));
     }
 
     public function testGroupsNormalizeWithNameConverter()
@@ -285,12 +285,12 @@ public function testGroupsNormalizeWithNameConverter()
         $obj->setCoopTilleuls('les-tilleuls.coop');
 
         $this->assertEquals(
-            array(
+            [
                 'bar' => null,
                 'foo_bar' => '@dunglas',
                 'symfony' => '@coopTilleuls',
-            ),
-            $this->normalizer->normalize($obj, null, array(ObjectNormalizer::GROUPS => array('name_converter')))
+            ],
+            $this->normalizer->normalize($obj, null, [ObjectNormalizer::GROUPS => ['name_converter']])
         );
     }
 
@@ -404,8 +404,8 @@ public function provideCallbacks()
                 array('foo' => '', 'bar' => '10-09-2011 06:30:00', 'baz' => true),
                 'Format a date',
             ),
-            array(
-                array(
+            [
+                [
                     'bar' => function ($bars) {
                         $foos = '';
                         foreach ($bars as $bar) {
@@ -414,21 +414,21 @@ public function provideCallbacks()
 
                         return $foos;
                     },
-                ),
-                array(new ObjectConstructorDummy('baz', '', false), new ObjectConstructorDummy('quux', '', false)),
-                array('foo' => '', 'bar' => 'bazquux', 'baz' => true),
+                ],
+                [new ObjectConstructorDummy('baz', '', false), new ObjectConstructorDummy('quux', '', false)],
+                ['foo' => '', 'bar' => 'bazquux', 'baz' => true],
                 'Collect a property',
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'bar' => function ($bars) {
                         return \count($bars);
                     },
-                ),
-                array(new ObjectConstructorDummy('baz', '', false), new ObjectConstructorDummy('quux', '', false)),
-                array('foo' => '', 'bar' => 2, 'baz' => true),
+                ],
+                [new ObjectConstructorDummy('baz', '', false), new ObjectConstructorDummy('quux', '', false)],
+                ['foo' => '', 'bar' => 2, 'baz' => true],
                 'Count a property',
-            ),
+            ],
         );
     }
 
@@ -571,20 +571,20 @@ public function testMaxDepth()
      */
     public function testThrowUnexpectedValueException()
     {
-        $this->normalizer->denormalize(array('foo' => 'bar'), ObjectTypeHinted::class);
+        $this->normalizer->denormalize(['foo' => 'bar'], ObjectTypeHinted::class);
     }
 
     public function testDenomalizeRecursive()
     {
-        $extractor = new PropertyInfoExtractor(array(), array(new PhpDocExtractor(), new ReflectionExtractor()));
+        $extractor = new PropertyInfoExtractor([], [new PhpDocExtractor(), new ReflectionExtractor()]);
         $normalizer = new ObjectNormalizer(null, null, null, $extractor);
-        $serializer = new Serializer(array(new ArrayDenormalizer(), new DateTimeNormalizer(), $normalizer));
+        $serializer = new Serializer([new ArrayDenormalizer(), new DateTimeNormalizer(), $normalizer]);
 
-        $obj = $serializer->denormalize(array(
-            'inner' => array('foo' => 'foo', 'bar' => 'bar'),
+        $obj = $serializer->denormalize([
+            'inner' => ['foo' => 'foo', 'bar' => 'bar'],
             'date' => '1988/01/21',
-            'inners' => array(array('foo' => 1), array('foo' => 2)),
-        ), ObjectOuter::class);
+            'inners' => [['foo' => 1], ['foo' => 2]],
+        ], ObjectOuter::class);
 
         $this->assertSame('foo', $obj->getInner()->foo);
         $this->assertSame('bar', $obj->getInner()->bar);
@@ -595,12 +595,12 @@ public function testDenomalizeRecursive()
 
     public function testAcceptJsonNumber()
     {
-        $extractor = new PropertyInfoExtractor(array(), array(new PhpDocExtractor(), new ReflectionExtractor()));
+        $extractor = new PropertyInfoExtractor([], [new PhpDocExtractor(), new ReflectionExtractor()]);
         $normalizer = new ObjectNormalizer(null, null, null, $extractor);
-        $serializer = new Serializer(array(new ArrayDenormalizer(), new DateTimeNormalizer(), $normalizer));
+        $serializer = new Serializer([new ArrayDenormalizer(), new DateTimeNormalizer(), $normalizer]);
 
-        $this->assertSame(10.0, $serializer->denormalize(array('number' => 10), JsonNumber::class, 'json')->number);
-        $this->assertSame(10.0, $serializer->denormalize(array('number' => 10), JsonNumber::class, 'jsonld')->number);
+        $this->assertSame(10.0, $serializer->denormalize(['number' => 10], JsonNumber::class, 'json')->number);
+        $this->assertSame(10.0, $serializer->denormalize(['number' => 10], JsonNumber::class, 'jsonld')->number);
     }
 
     /**
@@ -610,9 +610,9 @@ public function testAcceptJsonNumber()
     public function testRejectInvalidType()
     {
         $normalizer = new ObjectNormalizer(null, null, null, new ReflectionExtractor());
-        $serializer = new Serializer(array($normalizer));
+        $serializer = new Serializer([$normalizer]);
 
-        $serializer->denormalize(array('date' => 'foo'), ObjectOuter::class);
+        $serializer->denormalize(['date' => 'foo'], ObjectOuter::class);
     }
 
     /**
@@ -621,21 +621,21 @@ public function testRejectInvalidType()
      */
     public function testRejectInvalidKey()
     {
-        $extractor = new PropertyInfoExtractor(array(), array(new PhpDocExtractor(), new ReflectionExtractor()));
+        $extractor = new PropertyInfoExtractor([], [new PhpDocExtractor(), new ReflectionExtractor()]);
         $normalizer = new ObjectNormalizer(null, null, null, $extractor);
-        $serializer = new Serializer(array(new ArrayDenormalizer(), new DateTimeNormalizer(), $normalizer));
+        $serializer = new Serializer([new ArrayDenormalizer(), new DateTimeNormalizer(), $normalizer]);
 
-        $serializer->denormalize(array('inners' => array('a' => array('foo' => 1))), ObjectOuter::class);
+        $serializer->denormalize(['inners' => ['a' => ['foo' => 1]]], ObjectOuter::class);
     }
 
     public function testDoNotRejectInvalidTypeOnDisableTypeEnforcementContextOption()
     {
-        $extractor = new PropertyInfoExtractor(array(), array(new PhpDocExtractor()));
+        $extractor = new PropertyInfoExtractor([], [new PhpDocExtractor()]);
         $normalizer = new ObjectNormalizer(null, null, null, $extractor);
-        $serializer = new Serializer(array($normalizer));
-        $context = array(ObjectNormalizer::DISABLE_TYPE_ENFORCEMENT => true);
+        $serializer = new Serializer([$normalizer]);
+        $context = [ObjectNormalizer::DISABLE_TYPE_ENFORCEMENT => true];
 
-        $this->assertSame('foo', $serializer->denormalize(array('number' => 'foo'), JsonNumber::class, null, $context)->number);
+        $this->assertSame('foo', $serializer->denormalize(['number' => 'foo'], JsonNumber::class, null, $context)->number);
     }
 
     public function testExtractAttributesRespectsFormat()
@@ -646,7 +646,7 @@ public function testExtractAttributesRespectsFormat()
         $data->setFoo('bar');
         $data->bar = 'foo';
 
-        $this->assertSame(array('foo' => 'bar', 'bar' => 'foo'), $normalizer->normalize($data, 'foo_and_bar_included'));
+        $this->assertSame(['foo' => 'bar', 'bar' => 'foo'], $normalizer->normalize($data, 'foo_and_bar_included'));
     }
 
     public function testExtractAttributesRespectsContext()
@@ -657,13 +657,13 @@ public function testExtractAttributesRespectsContext()
         $data->setFoo('bar');
         $data->bar = 'foo';
 
-        $this->assertSame(array('foo' => 'bar', 'bar' => 'foo'), $normalizer->normalize($data, null, array('include_foo_and_bar' => true)));
+        $this->assertSame(['foo' => 'bar', 'bar' => 'foo'], $normalizer->normalize($data, null, ['include_foo_and_bar' => true]));
     }
 
     public function testAttributesContextNormalize()
     {
         $normalizer = new ObjectNormalizer();
-        $serializer = new Serializer(array($normalizer));
+        $serializer = new Serializer([$normalizer]);
 
         $objectInner = new ObjectInner();
         $objectInner->foo = 'innerFoo';
@@ -674,23 +674,23 @@ public function testAttributesContextNormalize()
         $objectDummy->setBaz(true);
         $objectDummy->setObject($objectInner);
 
-        $context = array('attributes' => array('foo', 'baz', 'object' => array('foo')));
+        $context = ['attributes' => ['foo', 'baz', 'object' => ['foo']]];
         $this->assertEquals(
-            array(
+            [
                 'foo' => 'foo',
                 'baz' => true,
-                'object' => array('foo' => 'innerFoo'),
-            ),
+                'object' => ['foo' => 'innerFoo'],
+            ],
             $serializer->normalize($objectDummy, null, $context)
         );
 
-        $context = array('attributes' => array('foo', 'baz', 'object'));
+        $context = ['attributes' => ['foo', 'baz', 'object']];
         $this->assertEquals(
-            array(
+            [
                 'foo' => 'foo',
                 'baz' => true,
-                'object' => array('foo' => 'innerFoo', 'bar' => 'innerBar'),
-            ),
+                'object' => ['foo' => 'innerFoo', 'bar' => 'innerBar'],
+            ],
             $serializer->normalize($objectDummy, null, $context)
         );
     }
@@ -698,7 +698,7 @@ public function testAttributesContextNormalize()
     public function testAttributesContextDenormalize()
     {
         $normalizer = new ObjectNormalizer(null, null, null, new ReflectionExtractor());
-        $serializer = new Serializer(array($normalizer));
+        $serializer = new Serializer([$normalizer]);
 
         $objectInner = new ObjectInner();
         $objectInner->foo = 'innerFoo';
@@ -707,38 +707,38 @@ public function testAttributesContextDenormalize()
         $objectOuter->bar = 'bar';
         $objectOuter->setInner($objectInner);
 
-        $context = array('attributes' => array('bar', 'inner' => array('foo')));
+        $context = ['attributes' => ['bar', 'inner' => ['foo']]];
         $this->assertEquals($objectOuter, $serializer->denormalize(
-            array(
+            [
                 'foo' => 'foo',
                 'bar' => 'bar',
                 'date' => '2017-02-03',
-                'inner' => array('foo' => 'innerFoo', 'bar' => 'innerBar'),
-            ), ObjectOuter::class, null, $context));
+                'inner' => ['foo' => 'innerFoo', 'bar' => 'innerBar'],
+            ], ObjectOuter::class, null, $context));
     }
 
     public function testAttributesContextDenormalizeConstructor()
     {
         $normalizer = new ObjectNormalizer(null, null, null, new ReflectionExtractor());
-        $serializer = new Serializer(array($normalizer));
+        $serializer = new Serializer([$normalizer]);
 
         $objectInner = new ObjectInner();
         $objectInner->bar = 'bar';
 
         $obj = new DummyWithConstructorObjectAndDefaultValue('a', $objectInner);
 
-        $context = array('attributes' => array('inner' => array('bar')));
-        $this->assertEquals($obj, $serializer->denormalize(array(
+        $context = ['attributes' => ['inner' => ['bar']]];
+        $this->assertEquals($obj, $serializer->denormalize([
             'foo' => 'b',
-            'inner' => array('foo' => 'foo', 'bar' => 'bar'),
-        ), DummyWithConstructorObjectAndDefaultValue::class, null, $context));
+            'inner' => ['foo' => 'foo', 'bar' => 'bar'],
+        ], DummyWithConstructorObjectAndDefaultValue::class, null, $context));
     }
 
     public function testNormalizeSameObjectWithDifferentAttributes()
     {
         $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
         $this->normalizer = new ObjectNormalizer($classMetadataFactory);
-        $serializer = new Serializer(array($this->normalizer));
+        $serializer = new Serializer([$this->normalizer]);
         $this->normalizer->setSerializer($serializer);
 
         $dummy = new ObjectOuter();
@@ -750,14 +750,14 @@ public function testNormalizeSameObjectWithDifferentAttributes()
         $dummy->bar->foo = 'bar.foo';
         $dummy->bar->bar = 'bar.bar';
 
-        $this->assertEquals(array(
-            'foo' => array(
+        $this->assertEquals([
+            'foo' => [
                 'bar' => 'foo.bar',
-            ),
-            'bar' => array(
+            ],
+            'bar' => [
                 'foo' => 'bar.foo',
-            ),
-        ), $this->normalizer->normalize($dummy, 'json', array(
+            ],
+        ], $this->normalizer->normalize($dummy, 'json', array(
             'attributes' => array(
                 'foo' => array('bar'),
                 'bar' => array('foo'),
@@ -864,7 +864,7 @@ class ObjectConstructorOptionalArgsDummy
     public $bar;
     private $baz;
 
-    public function __construct($foo, $bar = array(), $baz = array())
+    public function __construct($foo, $bar = [], $baz = [])
     {
         $this->foo = $foo;
         $this->bar = $bar;
@@ -892,7 +892,7 @@ class ObjectConstructorArgsWithDefaultValueDummy
     protected $foo;
     protected $bar;
 
-    public function __construct($foo = array(), $bar)
+    public function __construct($foo = [], $bar)
     {
         $this->foo = $foo;
         $this->bar = $bar;
@@ -983,13 +983,13 @@ class ObjectInner
 
 class FormatAndContextAwareNormalizer extends ObjectNormalizer
 {
-    protected function isAllowedAttribute($classOrObject, $attribute, $format = null, array $context = array())
+    protected function isAllowedAttribute($classOrObject, $attribute, $format = null, array $context = [])
     {
-        if (\in_array($attribute, array('foo', 'bar')) && 'foo_and_bar_included' === $format) {
+        if (\in_array($attribute, ['foo', 'bar']) && 'foo_and_bar_included' === $format) {
             return true;
         }
 
-        if (\in_array($attribute, array('foo', 'bar')) && isset($context['include_foo_and_bar']) && true === $context['include_foo_and_bar']) {
+        if (\in_array($attribute, ['foo', 'bar']) && isset($context['include_foo_and_bar']) && true === $context['include_foo_and_bar']) {
             return true;
         }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectToPopulateTraitTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectToPopulateTraitTest.php
index def71e5def5d7..aa924be0dc922 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectToPopulateTraitTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectToPopulateTraitTest.php
@@ -12,25 +12,25 @@ class ObjectToPopulateTraitTest extends TestCase
 
     public function testExtractObjectToPopulateReturnsNullWhenKeyIsMissing()
     {
-        $object = $this->extractObjectToPopulate(ProxyDummy::class, array());
+        $object = $this->extractObjectToPopulate(ProxyDummy::class, []);
 
         $this->assertNull($object);
     }
 
     public function testExtractObjectToPopulateReturnsNullWhenNonObjectIsProvided()
     {
-        $object = $this->extractObjectToPopulate(ProxyDummy::class, array(
+        $object = $this->extractObjectToPopulate(ProxyDummy::class, [
             'object_to_populate' => 'not an object',
-        ));
+        ]);
 
         $this->assertNull($object);
     }
 
     public function testExtractObjectToPopulateReturnsNullWhenTheClassIsNotAnInstanceOfTheProvidedClass()
     {
-        $object = $this->extractObjectToPopulate(ProxyDummy::class, array(
+        $object = $this->extractObjectToPopulate(ProxyDummy::class, [
             'object_to_populate' => new \stdClass(),
-        ));
+        ]);
 
         $this->assertNull($object);
     }
@@ -38,9 +38,9 @@ public function testExtractObjectToPopulateReturnsNullWhenTheClassIsNotAnInstanc
     public function testExtractObjectToPopulateReturnsObjectWhenEverythingChecksOut()
     {
         $expected = new ProxyDummy();
-        $object = $this->extractObjectToPopulate(ProxyDummy::class, array(
+        $object = $this->extractObjectToPopulate(ProxyDummy::class, [
             'object_to_populate' => $expected,
-        ));
+        ]);
 
         $this->assertSame($expected, $object);
     }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
index 4cd20ab318f42..c506464fdaf18 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
@@ -50,7 +50,7 @@ public function testNormalize()
         $obj->setBar('bar');
         $obj->setCamelCase('camelcase');
         $this->assertEquals(
-            array('foo' => 'foo', 'bar' => 'bar', 'camelCase' => 'camelcase'),
+            ['foo' => 'foo', 'bar' => 'bar', 'camelCase' => 'camelcase'],
             $this->normalizer->normalize($obj, 'any')
         );
     }
@@ -58,7 +58,7 @@ public function testNormalize()
     public function testDenormalize()
     {
         $obj = $this->normalizer->denormalize(
-            array('foo' => 'foo', 'bar' => 'bar'),
+            ['foo' => 'foo', 'bar' => 'bar'],
             __NAMESPACE__.'\PropertyDummy',
             'any'
         );
@@ -75,7 +75,7 @@ public function testNormalizeWithParentClass()
         $group->setKevin('Kevin');
         $group->setCoopTilleuls('coop');
         $this->assertEquals(
-            array('foo' => 'foo', 'bar' => 'bar', 'kevin' => 'Kevin', 'coopTilleuls' => 'coop', 'fooBar' => null, 'symfony' => null, 'baz' => 'baz'),
+            ['foo' => 'foo', 'bar' => 'bar', 'kevin' => 'Kevin', 'coopTilleuls' => 'coop', 'fooBar' => null, 'symfony' => null, 'baz' => 'baz'],
             $this->normalizer->normalize($group, 'any')
         );
     }
@@ -83,7 +83,7 @@ public function testNormalizeWithParentClass()
     public function testDenormalizeWithParentClass()
     {
         $obj = $this->normalizer->denormalize(
-            array('foo' => 'foo', 'bar' => 'bar', 'kevin' => 'Kevin', 'baz' => 'baz'),
+            ['foo' => 'foo', 'bar' => 'bar', 'kevin' => 'Kevin', 'baz' => 'baz'],
             GroupDummyChild::class,
             'any'
         );
@@ -97,7 +97,7 @@ public function testDenormalizeWithParentClass()
     public function testConstructorDenormalize()
     {
         $obj = $this->normalizer->denormalize(
-            array('foo' => 'foo', 'bar' => 'bar'),
+            ['foo' => 'foo', 'bar' => 'bar'],
             __NAMESPACE__.'\PropertyConstructorDummy',
             'any'
         );
@@ -108,7 +108,7 @@ public function testConstructorDenormalize()
     public function testConstructorDenormalizeWithNullArgument()
     {
         $obj = $this->normalizer->denormalize(
-            array('foo' => null, 'bar' => 'bar'),
+            ['foo' => null, 'bar' => 'bar'],
             __NAMESPACE__.'\PropertyConstructorDummy', '
             any'
         );
@@ -172,19 +172,19 @@ public function testGroupsNormalize()
         $obj->setKevin('kevin');
         $obj->setCoopTilleuls('coopTilleuls');
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'bar' => 'bar',
-        ), $this->normalizer->normalize($obj, null, array(PropertyNormalizer::GROUPS => array('c'))));
+        ], $this->normalizer->normalize($obj, null, [PropertyNormalizer::GROUPS => ['c']]));
 
         // The PropertyNormalizer is also able to hydrate properties from parent classes
-        $this->assertEquals(array(
+        $this->assertEquals([
             'symfony' => 'symfony',
             'foo' => 'foo',
             'fooBar' => 'fooBar',
             'bar' => 'bar',
             'kevin' => 'kevin',
             'coopTilleuls' => 'coopTilleuls',
-        ), $this->normalizer->normalize($obj, null, array(PropertyNormalizer::GROUPS => array('a', 'c'))));
+        ], $this->normalizer->normalize($obj, null, [PropertyNormalizer::GROUPS => ['a', 'c']]));
     }
 
     public function testGroupsDenormalize()
@@ -196,13 +196,13 @@ public function testGroupsDenormalize()
         $obj = new GroupDummy();
         $obj->setFoo('foo');
 
-        $toNormalize = array('foo' => 'foo', 'bar' => 'bar');
+        $toNormalize = ['foo' => 'foo', 'bar' => 'bar'];
 
         $normalized = $this->normalizer->denormalize(
             $toNormalize,
             'Symfony\Component\Serializer\Tests\Fixtures\GroupDummy',
             null,
-            array(PropertyNormalizer::GROUPS => array('a'))
+            [PropertyNormalizer::GROUPS => ['a']]
         );
         $this->assertEquals($obj, $normalized);
 
@@ -212,7 +212,7 @@ public function testGroupsDenormalize()
             $toNormalize,
             'Symfony\Component\Serializer\Tests\Fixtures\GroupDummy',
             null,
-            array(PropertyNormalizer::GROUPS => array('a', 'b'))
+            [PropertyNormalizer::GROUPS => ['a', 'b']]
         );
         $this->assertEquals($obj, $normalized);
     }
@@ -229,12 +229,12 @@ public function testGroupsNormalizeWithNameConverter()
         $obj->setCoopTilleuls('les-tilleuls.coop');
 
         $this->assertEquals(
-            array(
+            [
                 'bar' => null,
                 'foo_bar' => '@dunglas',
                 'symfony' => '@coopTilleuls',
-            ),
-            $this->normalizer->normalize($obj, null, array(PropertyNormalizer::GROUPS => array('name_converter')))
+            ],
+            $this->normalizer->normalize($obj, null, [PropertyNormalizer::GROUPS => ['name_converter']])
         );
     }
 
@@ -303,18 +303,18 @@ public function provideCallbacks()
                         return $foos;
                     },
                 ),
-                array(new PropertyConstructorDummy('baz', ''), new PropertyConstructorDummy('quux', '')),
-                array('foo' => '', 'bar' => 'bazquux'),
+                [new PropertyConstructorDummy('baz', ''), new PropertyConstructorDummy('quux', '')],
+                ['foo' => '', 'bar' => 'bazquux'],
                 'Collect a property',
             ),
             array(
-                array(
+                [
                     'bar' => function ($bars) {
                         return \count($bars);
                     },
-                ),
-                array(new PropertyConstructorDummy('baz', ''), new PropertyConstructorDummy('quux', '')),
-                array('foo' => '', 'bar' => 2),
+                ],
+                [new PropertyConstructorDummy('baz', ''), new PropertyConstructorDummy('quux', '')],
+                ['foo' => '', 'bar' => 2],
                 'Count a property',
             ),
         );
@@ -359,7 +359,7 @@ public function testCircularReferenceHandler()
 
         $obj = new PropertyCircularReferenceDummy();
 
-        $expected = array('me' => 'Symfony\Component\Serializer\Tests\Fixtures\PropertyCircularReferenceDummy');
+        $expected = ['me' => 'Symfony\Component\Serializer\Tests\Fixtures\PropertyCircularReferenceDummy'];
         $this->assertEquals($expected, $this->normalizer->normalize($obj));
     }
 
@@ -367,13 +367,13 @@ public function testDenormalizeNonExistingAttribute()
     {
         $this->assertEquals(
             new PropertyDummy(),
-            $this->normalizer->denormalize(array('non_existing' => true), __NAMESPACE__.'\PropertyDummy')
+            $this->normalizer->denormalize(['non_existing' => true], __NAMESPACE__.'\PropertyDummy')
         );
     }
 
     public function testDenormalizeShouldIgnoreStaticProperty()
     {
-        $obj = $this->normalizer->denormalize(array('outOfScope' => true), __NAMESPACE__.'\PropertyDummy');
+        $obj = $this->normalizer->denormalize(['outOfScope' => true], __NAMESPACE__.'\PropertyDummy');
 
         $this->assertEquals(new PropertyDummy(), $obj);
         $this->assertEquals('out_of_scope', PropertyDummy::$outOfScope);
@@ -409,7 +409,7 @@ public function testMaxDepth()
     {
         $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
         $this->normalizer = new PropertyNormalizer($classMetadataFactory);
-        $serializer = new Serializer(array($this->normalizer));
+        $serializer = new Serializer([$this->normalizer]);
         $this->normalizer->setSerializer($serializer);
 
         $level1 = new MaxDepthDummy();
@@ -423,20 +423,20 @@ public function testMaxDepth()
         $level3->foo = 'level3';
         $level2->child = $level3;
 
-        $result = $serializer->normalize($level1, null, array(PropertyNormalizer::ENABLE_MAX_DEPTH => true));
+        $result = $serializer->normalize($level1, null, [PropertyNormalizer::ENABLE_MAX_DEPTH => true]);
 
-        $expected = array(
+        $expected = [
             'foo' => 'level1',
-            'child' => array(
+            'child' => [
                     'foo' => 'level2',
-                    'child' => array(
+                    'child' => [
                             'child' => null,
                             'bar' => null,
-                        ),
+                        ],
                     'bar' => null,
-                ),
+                ],
             'bar' => null,
-        );
+        ];
 
         $this->assertEquals($expected, $result);
     }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php b/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php
index 7525d5c92888e..036d2bb84cd5d 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php
@@ -23,7 +23,7 @@ class TestDenormalizer implements DenormalizerInterface
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $class, $format = null, array $context = array())
+    public function denormalize($data, $class, $format = null, array $context = [])
     {
     }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php b/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php
index 4b29e8fa5d10c..ea57d2dfff541 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php
@@ -23,7 +23,7 @@ class TestNormalizer implements NormalizerInterface
     /**
      * {@inheritdoc}
      */
-    public function normalize($object, $format = null, array $context = array())
+    public function normalize($object, $format = null, array $context = [])
     {
     }
 
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
index e320bee3a6da9..405317d5fb26a 100644
--- a/src/Symfony/Component/Serializer/Tests/SerializerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -46,20 +46,20 @@ public function testInterface()
      */
     public function testNormalizeNoMatch()
     {
-        $serializer = new Serializer(array($this->getMockBuilder('Symfony\Component\Serializer\Normalizer\CustomNormalizer')->getMock()));
+        $serializer = new Serializer([$this->getMockBuilder('Symfony\Component\Serializer\Normalizer\CustomNormalizer')->getMock()]);
         $serializer->normalize(new \stdClass(), 'xml');
     }
 
     public function testNormalizeTraversable()
     {
-        $serializer = new Serializer(array(), array('json' => new JsonEncoder()));
+        $serializer = new Serializer([], ['json' => new JsonEncoder()]);
         $result = $serializer->serialize(new TraversableDummy(), 'json');
         $this->assertEquals('{"foo":"foo","bar":"bar"}', $result);
     }
 
     public function testNormalizeGivesPriorityToInterfaceOverTraversable()
     {
-        $serializer = new Serializer(array(new CustomNormalizer()), array('json' => new JsonEncoder()));
+        $serializer = new Serializer([new CustomNormalizer()], ['json' => new JsonEncoder()]);
         $result = $serializer->serialize(new NormalizableTraversableDummy(), 'json');
         $this->assertEquals('{"foo":"normalizedFoo","bar":"normalizedBar"}', $result);
     }
@@ -69,7 +69,7 @@ public function testNormalizeGivesPriorityToInterfaceOverTraversable()
      */
     public function testNormalizeOnDenormalizer()
     {
-        $serializer = new Serializer(array(new TestDenormalizer()), array());
+        $serializer = new Serializer([new TestDenormalizer()], []);
         $this->assertTrue($serializer->normalize(new \stdClass(), 'json'));
     }
 
@@ -78,7 +78,7 @@ public function testNormalizeOnDenormalizer()
      */
     public function testDenormalizeNoMatch()
     {
-        $serializer = new Serializer(array($this->getMockBuilder('Symfony\Component\Serializer\Normalizer\CustomNormalizer')->getMock()));
+        $serializer = new Serializer([$this->getMockBuilder('Symfony\Component\Serializer\Normalizer\CustomNormalizer')->getMock()]);
         $serializer->denormalize('foo', 'stdClass');
     }
 
@@ -87,17 +87,17 @@ public function testDenormalizeNoMatch()
      */
     public function testDenormalizeOnNormalizer()
     {
-        $serializer = new Serializer(array(new TestNormalizer()), array());
-        $data = array('title' => 'foo', 'numbers' => array(5, 3));
+        $serializer = new Serializer([new TestNormalizer()], []);
+        $data = ['title' => 'foo', 'numbers' => [5, 3]];
         $this->assertTrue($serializer->denormalize(json_encode($data), 'stdClass', 'json'));
     }
 
     public function testCustomNormalizerCanNormalizeCollectionsAndScalar()
     {
-        $serializer = new Serializer(array(new TestNormalizer()), array());
-        $this->assertNull($serializer->normalize(array('a', 'b')));
-        $this->assertNull($serializer->normalize(new \ArrayObject(array('c', 'd'))));
-        $this->assertNull($serializer->normalize(array()));
+        $serializer = new Serializer([new TestNormalizer()], []);
+        $this->assertNull($serializer->normalize(['a', 'b']));
+        $this->assertNull($serializer->normalize(new \ArrayObject(['c', 'd'])));
+        $this->assertNull($serializer->normalize([]));
         $this->assertNull($serializer->normalize('test'));
     }
 
@@ -115,7 +115,7 @@ public function testNormalizeWithSupportOnData()
             ->willReturn(true);
         $normalizer2->method('normalize')->willReturn('test2');
 
-        $serializer = new Serializer(array($normalizer1, $normalizer2));
+        $serializer = new Serializer([$normalizer1, $normalizer2]);
 
         $data = new \stdClass();
         $data->test = true;
@@ -138,32 +138,32 @@ public function testDenormalizeWithSupportOnData()
             ->willReturn(true);
         $denormalizer2->method('denormalize')->willReturn('test2');
 
-        $serializer = new Serializer(array($denormalizer1, $denormalizer2));
+        $serializer = new Serializer([$denormalizer1, $denormalizer2]);
 
-        $this->assertEquals('test1', $serializer->denormalize(array('test1' => true), 'test'));
+        $this->assertEquals('test1', $serializer->denormalize(['test1' => true], 'test'));
 
-        $this->assertEquals('test2', $serializer->denormalize(array(), 'test'));
+        $this->assertEquals('test2', $serializer->denormalize([], 'test'));
     }
 
     public function testSerialize()
     {
-        $serializer = new Serializer(array(new GetSetMethodNormalizer()), array('json' => new JsonEncoder()));
-        $data = array('title' => 'foo', 'numbers' => array(5, 3));
+        $serializer = new Serializer([new GetSetMethodNormalizer()], ['json' => new JsonEncoder()]);
+        $data = ['title' => 'foo', 'numbers' => [5, 3]];
         $result = $serializer->serialize(Model::fromArray($data), 'json');
         $this->assertEquals(json_encode($data), $result);
     }
 
     public function testSerializeScalar()
     {
-        $serializer = new Serializer(array(), array('json' => new JsonEncoder()));
+        $serializer = new Serializer([], ['json' => new JsonEncoder()]);
         $result = $serializer->serialize('foo', 'json');
         $this->assertEquals('"foo"', $result);
     }
 
     public function testSerializeArrayOfScalars()
     {
-        $serializer = new Serializer(array(), array('json' => new JsonEncoder()));
-        $data = array('foo', array(5, 3));
+        $serializer = new Serializer([], ['json' => new JsonEncoder()]);
+        $data = ['foo', [5, 3]];
         $result = $serializer->serialize($data, 'json');
         $this->assertEquals(json_encode($data), $result);
     }
@@ -173,8 +173,8 @@ public function testSerializeArrayOfScalars()
      */
     public function testSerializeNoEncoder()
     {
-        $serializer = new Serializer(array(), array());
-        $data = array('title' => 'foo', 'numbers' => array(5, 3));
+        $serializer = new Serializer([], []);
+        $data = ['title' => 'foo', 'numbers' => [5, 3]];
         $serializer->serialize($data, 'json');
     }
 
@@ -183,25 +183,25 @@ public function testSerializeNoEncoder()
      */
     public function testSerializeNoNormalizer()
     {
-        $serializer = new Serializer(array(), array('json' => new JsonEncoder()));
-        $data = array('title' => 'foo', 'numbers' => array(5, 3));
+        $serializer = new Serializer([], ['json' => new JsonEncoder()]);
+        $data = ['title' => 'foo', 'numbers' => [5, 3]];
         $serializer->serialize(Model::fromArray($data), 'json');
     }
 
     public function testDeserialize()
     {
-        $serializer = new Serializer(array(new GetSetMethodNormalizer()), array('json' => new JsonEncoder()));
-        $data = array('title' => 'foo', 'numbers' => array(5, 3));
+        $serializer = new Serializer([new GetSetMethodNormalizer()], ['json' => new JsonEncoder()]);
+        $data = ['title' => 'foo', 'numbers' => [5, 3]];
         $result = $serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
         $this->assertEquals($data, $result->toArray());
     }
 
     public function testDeserializeUseCache()
     {
-        $serializer = new Serializer(array(new GetSetMethodNormalizer()), array('json' => new JsonEncoder()));
-        $data = array('title' => 'foo', 'numbers' => array(5, 3));
+        $serializer = new Serializer([new GetSetMethodNormalizer()], ['json' => new JsonEncoder()]);
+        $data = ['title' => 'foo', 'numbers' => [5, 3]];
         $serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
-        $data = array('title' => 'bar', 'numbers' => array(2, 8));
+        $data = ['title' => 'bar', 'numbers' => [2, 8]];
         $result = $serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
         $this->assertEquals($data, $result->toArray());
     }
@@ -211,8 +211,8 @@ public function testDeserializeUseCache()
      */
     public function testDeserializeNoNormalizer()
     {
-        $serializer = new Serializer(array(), array('json' => new JsonEncoder()));
-        $data = array('title' => 'foo', 'numbers' => array(5, 3));
+        $serializer = new Serializer([], ['json' => new JsonEncoder()]);
+        $data = ['title' => 'foo', 'numbers' => [5, 3]];
         $serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
     }
 
@@ -221,8 +221,8 @@ public function testDeserializeNoNormalizer()
      */
     public function testDeserializeWrongNormalizer()
     {
-        $serializer = new Serializer(array(new CustomNormalizer()), array('json' => new JsonEncoder()));
-        $data = array('title' => 'foo', 'numbers' => array(5, 3));
+        $serializer = new Serializer([new CustomNormalizer()], ['json' => new JsonEncoder()]);
+        $data = ['title' => 'foo', 'numbers' => [5, 3]];
         $serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
     }
 
@@ -231,44 +231,44 @@ public function testDeserializeWrongNormalizer()
      */
     public function testDeserializeNoEncoder()
     {
-        $serializer = new Serializer(array(), array());
-        $data = array('title' => 'foo', 'numbers' => array(5, 3));
+        $serializer = new Serializer([], []);
+        $data = ['title' => 'foo', 'numbers' => [5, 3]];
         $serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
     }
 
     public function testDeserializeSupported()
     {
-        $serializer = new Serializer(array(new GetSetMethodNormalizer()), array());
-        $data = array('title' => 'foo', 'numbers' => array(5, 3));
+        $serializer = new Serializer([new GetSetMethodNormalizer()], []);
+        $data = ['title' => 'foo', 'numbers' => [5, 3]];
         $this->assertTrue($serializer->supportsDenormalization(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json'));
     }
 
     public function testDeserializeNotSupported()
     {
-        $serializer = new Serializer(array(new GetSetMethodNormalizer()), array());
-        $data = array('title' => 'foo', 'numbers' => array(5, 3));
+        $serializer = new Serializer([new GetSetMethodNormalizer()], []);
+        $data = ['title' => 'foo', 'numbers' => [5, 3]];
         $this->assertFalse($serializer->supportsDenormalization(json_encode($data), 'stdClass', 'json'));
     }
 
     public function testDeserializeNotSupportedMissing()
     {
-        $serializer = new Serializer(array(), array());
-        $data = array('title' => 'foo', 'numbers' => array(5, 3));
+        $serializer = new Serializer([], []);
+        $data = ['title' => 'foo', 'numbers' => [5, 3]];
         $this->assertFalse($serializer->supportsDenormalization(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json'));
     }
 
     public function testEncode()
     {
-        $serializer = new Serializer(array(), array('json' => new JsonEncoder()));
-        $data = array('foo', array(5, 3));
+        $serializer = new Serializer([], ['json' => new JsonEncoder()]);
+        $data = ['foo', [5, 3]];
         $result = $serializer->encode($data, 'json');
         $this->assertEquals(json_encode($data), $result);
     }
 
     public function testDecode()
     {
-        $serializer = new Serializer(array(), array('json' => new JsonEncoder()));
-        $data = array('foo', array(5, 3));
+        $serializer = new Serializer([], ['json' => new JsonEncoder()]);
+        $data = ['foo', [5, 3]];
         $result = $serializer->decode(json_encode($data), 'json');
         $this->assertEquals($data, $result);
     }
@@ -276,20 +276,20 @@ public function testDecode()
     public function testSupportsArrayDeserialization()
     {
         $serializer = new Serializer(
-            array(
+            [
                 new GetSetMethodNormalizer(),
                 new PropertyNormalizer(),
                 new ObjectNormalizer(),
                 new CustomNormalizer(),
                 new ArrayDenormalizer(),
-            ),
-            array(
+            ],
+            [
                 'json' => new JsonEncoder(),
-            )
+            ]
         );
 
         $this->assertTrue(
-            $serializer->supportsDenormalization(array(), __NAMESPACE__.'\Model[]', 'json')
+            $serializer->supportsDenormalization([], __NAMESPACE__.'\Model[]', 'json')
         );
     }
 
@@ -297,19 +297,19 @@ public function testDeserializeArray()
     {
         $jsonData = '[{"title":"foo","numbers":[5,3]},{"title":"bar","numbers":[2,8]}]';
 
-        $expectedData = array(
-            Model::fromArray(array('title' => 'foo', 'numbers' => array(5, 3))),
-            Model::fromArray(array('title' => 'bar', 'numbers' => array(2, 8))),
-        );
+        $expectedData = [
+            Model::fromArray(['title' => 'foo', 'numbers' => [5, 3]]),
+            Model::fromArray(['title' => 'bar', 'numbers' => [2, 8]]),
+        ];
 
         $serializer = new Serializer(
-            array(
+            [
                 new GetSetMethodNormalizer(),
                 new ArrayDenormalizer(),
-            ),
-            array(
+            ],
+            [
                 'json' => new JsonEncoder(),
-            )
+            ]
         );
 
         $this->assertEquals(
@@ -325,7 +325,7 @@ public function testNormalizerAware()
             ->method('setNormalizer')
             ->with($this->isInstanceOf(NormalizerInterface::class));
 
-        new Serializer(array($normalizerAware));
+        new Serializer([$normalizerAware]);
     }
 
     public function testDenormalizerAware()
@@ -335,14 +335,14 @@ public function testDenormalizerAware()
             ->method('setDenormalizer')
             ->with($this->isInstanceOf(DenormalizerInterface::class));
 
-        new Serializer(array($denormalizerAware));
+        new Serializer([$denormalizerAware]);
     }
 
     public function testDeserializeObjectConstructorWithObjectTypeHint()
     {
         $jsonData = '{"bar":{"value":"baz"}}';
 
-        $serializer = new Serializer(array(new ObjectNormalizer()), array('json' => new JsonEncoder()));
+        $serializer = new Serializer([new ObjectNormalizer()], ['json' => new JsonEncoder()]);
 
         $this->assertEquals(new Foo(new Bar('baz')), $serializer->deserialize($jsonData, Foo::class, 'json'));
     }
@@ -388,7 +388,7 @@ public function setNumbers($numbers)
 
     public function toArray()
     {
-        return array('title' => $this->title, 'numbers' => $this->numbers);
+        return ['title' => $this->title, 'numbers' => $this->numbers];
     }
 }
 
diff --git a/src/Symfony/Component/Stopwatch/Section.php b/src/Symfony/Component/Stopwatch/Section.php
index 2be995bb2b130..14fba8b582d33 100644
--- a/src/Symfony/Component/Stopwatch/Section.php
+++ b/src/Symfony/Component/Stopwatch/Section.php
@@ -21,7 +21,7 @@ class Section
     /**
      * @var StopwatchEvent[]
      */
-    private $events = array();
+    private $events = [];
 
     /**
      * @var float|null
@@ -41,7 +41,7 @@ class Section
     /**
      * @var Section[]
      */
-    private $children = array();
+    private $children = [];
 
     /**
      * @param float|null $origin        Set the origin of the events in this section, use null to set their origin to their start time
diff --git a/src/Symfony/Component/Stopwatch/Stopwatch.php b/src/Symfony/Component/Stopwatch/Stopwatch.php
index 9da84f6ec0d76..da55f370f8070 100644
--- a/src/Symfony/Component/Stopwatch/Stopwatch.php
+++ b/src/Symfony/Component/Stopwatch/Stopwatch.php
@@ -163,7 +163,7 @@ public function getEvent($name)
      */
     public function getSectionEvents($id)
     {
-        return isset($this->sections[$id]) ? $this->sections[$id]->getEvents() : array();
+        return isset($this->sections[$id]) ? $this->sections[$id]->getEvents() : [];
     }
 
     /**
@@ -171,6 +171,6 @@ public function getSectionEvents($id)
      */
     public function reset()
     {
-        $this->sections = $this->activeSections = array('__root__' => new Section(null, $this->morePrecision));
+        $this->sections = $this->activeSections = ['__root__' => new Section(null, $this->morePrecision)];
     }
 }
diff --git a/src/Symfony/Component/Stopwatch/StopwatchEvent.php b/src/Symfony/Component/Stopwatch/StopwatchEvent.php
index f04f0ac1ebae7..bc8c6b5f47b79 100644
--- a/src/Symfony/Component/Stopwatch/StopwatchEvent.php
+++ b/src/Symfony/Component/Stopwatch/StopwatchEvent.php
@@ -21,7 +21,7 @@ class StopwatchEvent
     /**
      * @var StopwatchPeriod[]
      */
-    private $periods = array();
+    private $periods = [];
 
     /**
      * @var float
@@ -41,7 +41,7 @@ class StopwatchEvent
     /**
      * @var float[]
      */
-    private $started = array();
+    private $started = [];
 
     /**
      * @param float       $origin        The origin time in milliseconds
diff --git a/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php b/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php
index 2742ca544a3fe..415ab3e9d56b0 100644
--- a/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php
+++ b/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php
@@ -43,7 +43,7 @@ public function testGetCategory()
     public function testGetPeriods()
     {
         $event = new StopwatchEvent(microtime(true) * 1000);
-        $this->assertEquals(array(), $event->getPeriods());
+        $this->assertEquals([], $event->getPeriods());
 
         $event = new StopwatchEvent(microtime(true) * 1000);
         $event->start();
diff --git a/src/Symfony/Component/Stopwatch/Tests/StopwatchPeriodTest.php b/src/Symfony/Component/Stopwatch/Tests/StopwatchPeriodTest.php
index f2387b8285bec..717ff9d56aeeb 100644
--- a/src/Symfony/Component/Stopwatch/Tests/StopwatchPeriodTest.php
+++ b/src/Symfony/Component/Stopwatch/Tests/StopwatchPeriodTest.php
@@ -45,23 +45,23 @@ public function testGetDuration($start, $end, $useMorePrecision, $duration)
 
     public function provideTimeValues()
     {
-        yield array(0, false, 0);
-        yield array(0, true, 0.0);
-        yield array(0.0, false, 0);
-        yield array(0.0, true, 0.0);
-        yield array(2.71, false, 2);
-        yield array(2.71, true, 2.71);
+        yield [0, false, 0];
+        yield [0, true, 0.0];
+        yield [0.0, false, 0];
+        yield [0.0, true, 0.0];
+        yield [2.71, false, 2];
+        yield [2.71, true, 2.71];
     }
 
     public function provideDurationValues()
     {
-        yield array(0, 0, false, 0);
-        yield array(0, 0, true, 0.0);
-        yield array(0.0, 0.0, false, 0);
-        yield array(0.0, 0.0, true, 0.0);
-        yield array(2, 3.14, false, 1);
-        yield array(2, 3.14, true, 1.14);
-        yield array(2.71, 3.14, false, 1);
-        yield array(2.71, 3.14, true, 0.43);
+        yield [0, 0, false, 0];
+        yield [0, 0, true, 0.0];
+        yield [0.0, 0.0, false, 0];
+        yield [0.0, 0.0, true, 0.0];
+        yield [2, 3.14, false, 1];
+        yield [2, 3.14, true, 1.14];
+        yield [2.71, 3.14, false, 1];
+        yield [2.71, 3.14, true, 0.43];
     }
 }
diff --git a/src/Symfony/Component/Stopwatch/Tests/StopwatchTest.php b/src/Symfony/Component/Stopwatch/Tests/StopwatchTest.php
index 10e6a14af62dd..fe6f6d2962dd4 100644
--- a/src/Symfony/Component/Stopwatch/Tests/StopwatchTest.php
+++ b/src/Symfony/Component/Stopwatch/Tests/StopwatchTest.php
@@ -62,11 +62,11 @@ public function testIsNotStartedEvent()
         $events->setAccessible(true);
 
         $stopwatchMockEvent = $this->getMockBuilder('Symfony\Component\Stopwatch\StopwatchEvent')
-            ->setConstructorArgs(array(microtime(true) * 1000))
+            ->setConstructorArgs([microtime(true) * 1000])
             ->getMock()
         ;
 
-        $events->setValue(end($section), array('foo' => $stopwatchMockEvent));
+        $events->setValue(end($section), ['foo' => $stopwatchMockEvent]);
 
         $this->assertFalse($stopwatch->isStarted('foo'));
     }
diff --git a/src/Symfony/Component/Templating/DelegatingEngine.php b/src/Symfony/Component/Templating/DelegatingEngine.php
index b47a0f0620369..90cdbfa235de5 100644
--- a/src/Symfony/Component/Templating/DelegatingEngine.php
+++ b/src/Symfony/Component/Templating/DelegatingEngine.php
@@ -21,12 +21,12 @@ class DelegatingEngine implements EngineInterface, StreamingEngineInterface
     /**
      * @var EngineInterface[]
      */
-    protected $engines = array();
+    protected $engines = [];
 
     /**
      * @param EngineInterface[] $engines An array of EngineInterface instances to add
      */
-    public function __construct(array $engines = array())
+    public function __construct(array $engines = [])
     {
         foreach ($engines as $engine) {
             $this->addEngine($engine);
@@ -36,7 +36,7 @@ public function __construct(array $engines = array())
     /**
      * {@inheritdoc}
      */
-    public function render($name, array $parameters = array())
+    public function render($name, array $parameters = [])
     {
         return $this->getEngine($name)->render($name, $parameters);
     }
@@ -44,7 +44,7 @@ public function render($name, array $parameters = array())
     /**
      * {@inheritdoc}
      */
-    public function stream($name, array $parameters = array())
+    public function stream($name, array $parameters = [])
     {
         $engine = $this->getEngine($name);
         if (!$engine instanceof StreamingEngineInterface) {
diff --git a/src/Symfony/Component/Templating/EngineInterface.php b/src/Symfony/Component/Templating/EngineInterface.php
index fb02c80dafe65..ab4ccc71c0aaf 100644
--- a/src/Symfony/Component/Templating/EngineInterface.php
+++ b/src/Symfony/Component/Templating/EngineInterface.php
@@ -40,7 +40,7 @@ interface EngineInterface
      *
      * @throws \RuntimeException if the template cannot be rendered
      */
-    public function render($name, array $parameters = array());
+    public function render($name, array $parameters = []);
 
     /**
      * Returns true if the template exists.
diff --git a/src/Symfony/Component/Templating/Helper/SlotsHelper.php b/src/Symfony/Component/Templating/Helper/SlotsHelper.php
index e5faf7fe8871f..80acdc93b6df3 100644
--- a/src/Symfony/Component/Templating/Helper/SlotsHelper.php
+++ b/src/Symfony/Component/Templating/Helper/SlotsHelper.php
@@ -18,8 +18,8 @@
  */
 class SlotsHelper extends Helper
 {
-    protected $slots = array();
-    protected $openSlots = array();
+    protected $slots = [];
+    protected $openSlots = [];
 
     /**
      * Starts a new slot.
diff --git a/src/Symfony/Component/Templating/Loader/CacheLoader.php b/src/Symfony/Component/Templating/Loader/CacheLoader.php
index c26ffd6322d75..251c3292d3464 100644
--- a/src/Symfony/Component/Templating/Loader/CacheLoader.php
+++ b/src/Symfony/Component/Templating/Loader/CacheLoader.php
@@ -53,7 +53,7 @@ public function load(TemplateReferenceInterface $template)
 
         if (is_file($path)) {
             if (null !== $this->logger) {
-                $this->logger->debug('Fetching template from cache.', array('name' => $template->get('name')));
+                $this->logger->debug('Fetching template from cache.', ['name' => $template->get('name')]);
             }
 
             return new FileStorage($path);
@@ -72,7 +72,7 @@ public function load(TemplateReferenceInterface $template)
         file_put_contents($path, $content);
 
         if (null !== $this->logger) {
-            $this->logger->debug('Storing template in cache.', array('name' => $template->get('name')));
+            $this->logger->debug('Storing template in cache.', ['name' => $template->get('name')]);
         }
 
         return new FileStorage($path);
diff --git a/src/Symfony/Component/Templating/Loader/ChainLoader.php b/src/Symfony/Component/Templating/Loader/ChainLoader.php
index d66139e0b3ffa..3e5f375cb79a8 100644
--- a/src/Symfony/Component/Templating/Loader/ChainLoader.php
+++ b/src/Symfony/Component/Templating/Loader/ChainLoader.php
@@ -21,12 +21,12 @@
  */
 class ChainLoader extends Loader
 {
-    protected $loaders = array();
+    protected $loaders = [];
 
     /**
      * @param LoaderInterface[] $loaders An array of loader instances
      */
-    public function __construct(array $loaders = array())
+    public function __construct(array $loaders = [])
     {
         foreach ($loaders as $loader) {
             $this->addLoader($loader);
diff --git a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php
index 919c96fb200cb..016018cf1b2fc 100644
--- a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php
+++ b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php
@@ -45,16 +45,16 @@ public function load(TemplateReferenceInterface $template)
             return new FileStorage($file);
         }
 
-        $replacements = array();
+        $replacements = [];
         foreach ($template->all() as $key => $value) {
             $replacements['%'.$key.'%'] = $value;
         }
 
-        $fileFailures = array();
+        $fileFailures = [];
         foreach ($this->templatePathPatterns as $templatePathPattern) {
             if (is_file($file = strtr($templatePathPattern, $replacements)) && is_readable($file)) {
                 if (null !== $this->logger) {
-                    $this->logger->debug('Loaded template file.', array('file' => $file));
+                    $this->logger->debug('Loaded template file.', ['file' => $file]);
                 }
 
                 return new FileStorage($file);
@@ -68,7 +68,7 @@ public function load(TemplateReferenceInterface $template)
         // only log failures if no template could be loaded at all
         foreach ($fileFailures as $file) {
             if (null !== $this->logger) {
-                $this->logger->debug('Failed loading template file.', array('file' => $file));
+                $this->logger->debug('Failed loading template file.', ['file' => $file]);
             }
         }
 
diff --git a/src/Symfony/Component/Templating/PhpEngine.php b/src/Symfony/Component/Templating/PhpEngine.php
index 1d24448207d5f..f67c29d074b3c 100644
--- a/src/Symfony/Component/Templating/PhpEngine.php
+++ b/src/Symfony/Component/Templating/PhpEngine.php
@@ -29,14 +29,14 @@ class PhpEngine implements EngineInterface, \ArrayAccess
     /**
      * @var HelperInterface[]
      */
-    protected $helpers = array();
-    protected $parents = array();
-    protected $stack = array();
+    protected $helpers = [];
+    protected $parents = [];
+    protected $stack = [];
     protected $charset = 'UTF-8';
-    protected $cache = array();
-    protected $escapers = array();
-    protected static $escaperCache = array();
-    protected $globals = array();
+    protected $cache = [];
+    protected $escapers = [];
+    protected static $escaperCache = [];
+    protected $globals = [];
     protected $parser;
 
     private $evalTemplate;
@@ -47,7 +47,7 @@ class PhpEngine implements EngineInterface, \ArrayAccess
      * @param LoaderInterface             $loader  A loader instance
      * @param HelperInterface[]           $helpers An array of helper instances
      */
-    public function __construct(TemplateNameParserInterface $parser, LoaderInterface $loader, array $helpers = array())
+    public function __construct(TemplateNameParserInterface $parser, LoaderInterface $loader, array $helpers = [])
     {
         $this->parser = $parser;
         $this->loader = $loader;
@@ -65,7 +65,7 @@ public function __construct(TemplateNameParserInterface $parser, LoaderInterface
      *
      * @throws \InvalidArgumentException if the template does not exist
      */
-    public function render($name, array $parameters = array())
+    public function render($name, array $parameters = [])
     {
         $storage = $this->load($name);
         $key = hash('sha256', serialize($storage));
@@ -127,7 +127,7 @@ public function supports($name)
      *
      * @throws \InvalidArgumentException
      */
-    protected function evaluate(Storage $template, array $parameters = array())
+    protected function evaluate(Storage $template, array $parameters = [])
     {
         $this->evalTemplate = $template;
         $this->evalParameters = $parameters;
@@ -235,7 +235,7 @@ public function addHelpers(array $helpers)
      */
     public function setHelpers(array $helpers)
     {
-        $this->helpers = array();
+        $this->helpers = [];
         $this->addHelpers($helpers);
     }
 
@@ -358,7 +358,7 @@ public function getCharset()
     public function setEscaper($context, callable $escaper)
     {
         $this->escapers[$context] = $escaper;
-        self::$escaperCache[$context] = array();
+        self::$escaperCache[$context] = [];
     }
 
     /**
@@ -419,7 +419,7 @@ protected function initializeEscapers()
     {
         $flags = ENT_QUOTES | ENT_SUBSTITUTE;
 
-        $this->escapers = array(
+        $this->escapers = [
             'html' =>
                 /**
                  * Runs the PHP function htmlspecialchars on the value passed.
@@ -472,9 +472,9 @@ function ($value) {
 
                     return $value;
                 },
-        );
+        ];
 
-        self::$escaperCache = array();
+        self::$escaperCache = [];
     }
 
     /**
diff --git a/src/Symfony/Component/Templating/StreamingEngineInterface.php b/src/Symfony/Component/Templating/StreamingEngineInterface.php
index f8815f85f19b6..d389ccc52d813 100644
--- a/src/Symfony/Component/Templating/StreamingEngineInterface.php
+++ b/src/Symfony/Component/Templating/StreamingEngineInterface.php
@@ -29,5 +29,5 @@ interface StreamingEngineInterface
      * @throws \RuntimeException if the template cannot be rendered
      * @throws \LogicException   if the template cannot be streamed
      */
-    public function stream($name, array $parameters = array());
+    public function stream($name, array $parameters = []);
 }
diff --git a/src/Symfony/Component/Templating/TemplateReference.php b/src/Symfony/Component/Templating/TemplateReference.php
index 3477f088ff245..88f71f95b07dd 100644
--- a/src/Symfony/Component/Templating/TemplateReference.php
+++ b/src/Symfony/Component/Templating/TemplateReference.php
@@ -22,10 +22,10 @@ class TemplateReference implements TemplateReferenceInterface
 
     public function __construct($name = null, $engine = null)
     {
-        $this->parameters = array(
+        $this->parameters = [
             'name' => $name,
             'engine' => $engine,
-        );
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php b/src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php
index cadd9edf0b542..875672d27fff5 100644
--- a/src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php
+++ b/src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php
@@ -25,11 +25,11 @@ public function testRenderDelegatesToSupportedEngine()
 
         $secondEngine->expects($this->once())
             ->method('render')
-            ->with('template.php', array('foo' => 'bar'))
+            ->with('template.php', ['foo' => 'bar'])
             ->will($this->returnValue('<html />'));
 
-        $delegatingEngine = new DelegatingEngine(array($firstEngine, $secondEngine));
-        $result = $delegatingEngine->render('template.php', array('foo' => 'bar'));
+        $delegatingEngine = new DelegatingEngine([$firstEngine, $secondEngine]);
+        $result = $delegatingEngine->render('template.php', ['foo' => 'bar']);
 
         $this->assertSame('<html />', $result);
     }
@@ -43,8 +43,8 @@ public function testRenderWithNoSupportedEngine()
         $firstEngine = $this->getEngineMock('template.php', false);
         $secondEngine = $this->getEngineMock('template.php', false);
 
-        $delegatingEngine = new DelegatingEngine(array($firstEngine, $secondEngine));
-        $delegatingEngine->render('template.php', array('foo' => 'bar'));
+        $delegatingEngine = new DelegatingEngine([$firstEngine, $secondEngine]);
+        $delegatingEngine->render('template.php', ['foo' => 'bar']);
     }
 
     public function testStreamDelegatesToSupportedEngine()
@@ -52,11 +52,11 @@ public function testStreamDelegatesToSupportedEngine()
         $streamingEngine = $this->getStreamingEngineMock('template.php', true);
         $streamingEngine->expects($this->once())
             ->method('stream')
-            ->with('template.php', array('foo' => 'bar'))
+            ->with('template.php', ['foo' => 'bar'])
             ->will($this->returnValue('<html />'));
 
-        $delegatingEngine = new DelegatingEngine(array($streamingEngine));
-        $result = $delegatingEngine->stream('template.php', array('foo' => 'bar'));
+        $delegatingEngine = new DelegatingEngine([$streamingEngine]);
+        $result = $delegatingEngine->stream('template.php', ['foo' => 'bar']);
 
         $this->assertNull($result);
     }
@@ -67,8 +67,8 @@ public function testStreamDelegatesToSupportedEngine()
      */
     public function testStreamRequiresStreamingEngine()
     {
-        $delegatingEngine = new DelegatingEngine(array(new TestEngine()));
-        $delegatingEngine->stream('template.php', array('foo' => 'bar'));
+        $delegatingEngine = new DelegatingEngine([new TestEngine()]);
+        $delegatingEngine->stream('template.php', ['foo' => 'bar']);
     }
 
     public function testExists()
@@ -79,7 +79,7 @@ public function testExists()
             ->with('template.php')
             ->will($this->returnValue(true));
 
-        $delegatingEngine = new DelegatingEngine(array($engine));
+        $delegatingEngine = new DelegatingEngine([$engine]);
 
         $this->assertTrue($delegatingEngine->exists('template.php'));
     }
@@ -88,7 +88,7 @@ public function testSupports()
     {
         $engine = $this->getEngineMock('template.php', true);
 
-        $delegatingEngine = new DelegatingEngine(array($engine));
+        $delegatingEngine = new DelegatingEngine([$engine]);
 
         $this->assertTrue($delegatingEngine->supports('template.php'));
     }
@@ -97,7 +97,7 @@ public function testSupportsWithNoSupportedEngine()
     {
         $engine = $this->getEngineMock('template.php', false);
 
-        $delegatingEngine = new DelegatingEngine(array($engine));
+        $delegatingEngine = new DelegatingEngine([$engine]);
 
         $this->assertFalse($delegatingEngine->supports('template.php'));
     }
@@ -107,7 +107,7 @@ public function testGetExistingEngine()
         $firstEngine = $this->getEngineMock('template.php', false);
         $secondEngine = $this->getEngineMock('template.php', true);
 
-        $delegatingEngine = new DelegatingEngine(array($firstEngine, $secondEngine));
+        $delegatingEngine = new DelegatingEngine([$firstEngine, $secondEngine]);
 
         $this->assertSame($secondEngine, $delegatingEngine->getEngine('template.php'));
     }
@@ -121,7 +121,7 @@ public function testGetInvalidEngine()
         $firstEngine = $this->getEngineMock('template.php', false);
         $secondEngine = $this->getEngineMock('template.php', false);
 
-        $delegatingEngine = new DelegatingEngine(array($firstEngine, $secondEngine));
+        $delegatingEngine = new DelegatingEngine([$firstEngine, $secondEngine]);
         $delegatingEngine->getEngine('template.php');
     }
 
@@ -156,7 +156,7 @@ interface MyStreamingEngine extends StreamingEngineInterface, EngineInterface
 
 class TestEngine implements EngineInterface
 {
-    public function render($name, array $parameters = array())
+    public function render($name, array $parameters = [])
     {
     }
 
diff --git a/src/Symfony/Component/Templating/Tests/Loader/CacheLoaderTest.php b/src/Symfony/Component/Templating/Tests/Loader/CacheLoaderTest.php
index dbc89bc6d1fba..e66d62398a893 100644
--- a/src/Symfony/Component/Templating/Tests/Loader/CacheLoaderTest.php
+++ b/src/Symfony/Component/Templating/Tests/Loader/CacheLoaderTest.php
@@ -39,7 +39,7 @@ public function testLoad()
         $logger
             ->expects($this->once())
             ->method('debug')
-            ->with('Storing template in cache.', array('name' => 'index'));
+            ->with('Storing template in cache.', ['name' => 'index']);
         $loader->setLogger($logger);
         $loader->load(new TemplateReference('index'));
 
@@ -47,7 +47,7 @@ public function testLoad()
         $logger
             ->expects($this->once())
             ->method('debug')
-            ->with('Fetching template from cache.', array('name' => 'index'));
+            ->with('Fetching template from cache.', ['name' => 'index']);
         $loader->setLogger($logger);
         $loader->load(new TemplateReference('index'));
     }
diff --git a/src/Symfony/Component/Templating/Tests/Loader/ChainLoaderTest.php b/src/Symfony/Component/Templating/Tests/Loader/ChainLoaderTest.php
index 7e403995a0759..c81698bd89ca5 100644
--- a/src/Symfony/Component/Templating/Tests/Loader/ChainLoaderTest.php
+++ b/src/Symfony/Component/Templating/Tests/Loader/ChainLoaderTest.php
@@ -30,20 +30,20 @@ protected function setUp()
 
     public function testConstructor()
     {
-        $loader = new ProjectTemplateLoader1(array($this->loader1, $this->loader2));
-        $this->assertEquals(array($this->loader1, $this->loader2), $loader->getLoaders(), '__construct() takes an array of template loaders as its second argument');
+        $loader = new ProjectTemplateLoader1([$this->loader1, $this->loader2]);
+        $this->assertEquals([$this->loader1, $this->loader2], $loader->getLoaders(), '__construct() takes an array of template loaders as its second argument');
     }
 
     public function testAddLoader()
     {
-        $loader = new ProjectTemplateLoader1(array($this->loader1));
+        $loader = new ProjectTemplateLoader1([$this->loader1]);
         $loader->addLoader($this->loader2);
-        $this->assertEquals(array($this->loader1, $this->loader2), $loader->getLoaders(), '->addLoader() adds a template loader at the end of the loaders');
+        $this->assertEquals([$this->loader1, $this->loader2], $loader->getLoaders(), '->addLoader() adds a template loader at the end of the loaders');
     }
 
     public function testLoad()
     {
-        $loader = new ProjectTemplateLoader1(array($this->loader1, $this->loader2));
+        $loader = new ProjectTemplateLoader1([$this->loader1, $this->loader2]);
         $this->assertFalse($loader->load(new TemplateReference('bar', 'php')), '->load() returns false if the template is not found');
         $this->assertFalse($loader->load(new TemplateReference('foo', 'php')), '->load() returns false if the template does not exist for the given renderer');
         $this->assertInstanceOf(
diff --git a/src/Symfony/Component/Templating/Tests/Loader/FilesystemLoaderTest.php b/src/Symfony/Component/Templating/Tests/Loader/FilesystemLoaderTest.php
index 04b93fb1c575d..c6dcdefc95f51 100644
--- a/src/Symfony/Component/Templating/Tests/Loader/FilesystemLoaderTest.php
+++ b/src/Symfony/Component/Templating/Tests/Loader/FilesystemLoaderTest.php
@@ -29,9 +29,9 @@ public function testConstructor()
         $pathPattern = self::$fixturesPath.'/templates/%name%.%engine%';
         $path = self::$fixturesPath.'/templates';
         $loader = new ProjectTemplateLoader2($pathPattern);
-        $this->assertEquals(array($pathPattern), $loader->getTemplatePathPatterns(), '__construct() takes a path as its second argument');
-        $loader = new ProjectTemplateLoader2(array($pathPattern));
-        $this->assertEquals(array($pathPattern), $loader->getTemplatePathPatterns(), '__construct() takes an array of paths as its second argument');
+        $this->assertEquals([$pathPattern], $loader->getTemplatePathPatterns(), '__construct() takes a path as its second argument');
+        $loader = new ProjectTemplateLoader2([$pathPattern]);
+        $this->assertEquals([$pathPattern], $loader->getTemplatePathPatterns(), '__construct() takes an array of paths as its second argument');
     }
 
     public function testIsAbsolutePath()
@@ -66,7 +66,7 @@ public function testLoad()
         $loader->setLogger($logger);
         $this->assertFalse($loader->load(new TemplateReference('foo.xml', 'php')), '->load() returns false if the template does not exist for the given engine');
 
-        $loader = new ProjectTemplateLoader2(array(self::$fixturesPath.'/null/%name%', $pathPattern));
+        $loader = new ProjectTemplateLoader2([self::$fixturesPath.'/null/%name%', $pathPattern]);
         $loader->setLogger($logger);
         $loader->load(new TemplateReference('foo.php', 'php'));
     }
diff --git a/src/Symfony/Component/Templating/Tests/PhpEngineTest.php b/src/Symfony/Component/Templating/Tests/PhpEngineTest.php
index f677c3028d031..1b469d7e47654 100644
--- a/src/Symfony/Component/Templating/Tests/PhpEngineTest.php
+++ b/src/Symfony/Component/Templating/Tests/PhpEngineTest.php
@@ -93,7 +93,7 @@ public function testUnsetHelper()
 
     public function testExtendRender()
     {
-        $engine = new ProjectTemplateEngine(new TemplateNameParser(), $this->loader, array(), array(new SlotsHelper()));
+        $engine = new ProjectTemplateEngine(new TemplateNameParser(), $this->loader, [], [new SlotsHelper()]);
         try {
             $engine->render('name');
             $this->fail('->render() throws an InvalidArgumentException if the template does not exist');
@@ -102,25 +102,25 @@ public function testExtendRender()
             $this->assertEquals('The template "name" does not exist.', $e->getMessage(), '->render() throws an InvalidArgumentException if the template does not exist');
         }
 
-        $engine = new ProjectTemplateEngine(new TemplateNameParser(), $this->loader, array(new SlotsHelper()));
+        $engine = new ProjectTemplateEngine(new TemplateNameParser(), $this->loader, [new SlotsHelper()]);
         $engine->set(new \Symfony\Component\Templating\Tests\Fixtures\SimpleHelper('bar'));
         $this->loader->setTemplate('foo.php', '<?php $this->extend("layout.php"); echo $this[\'foo\'].$foo ?>');
         $this->loader->setTemplate('layout.php', '-<?php echo $this[\'slots\']->get("_content") ?>-');
-        $this->assertEquals('-barfoo-', $engine->render('foo.php', array('foo' => 'foo')), '->render() uses the decorator to decorate the template');
+        $this->assertEquals('-barfoo-', $engine->render('foo.php', ['foo' => 'foo']), '->render() uses the decorator to decorate the template');
 
-        $engine = new ProjectTemplateEngine(new TemplateNameParser(), $this->loader, array(new SlotsHelper()));
+        $engine = new ProjectTemplateEngine(new TemplateNameParser(), $this->loader, [new SlotsHelper()]);
         $engine->set(new \Symfony\Component\Templating\Tests\Fixtures\SimpleHelper('bar'));
         $this->loader->setTemplate('bar.php', 'bar');
         $this->loader->setTemplate('foo.php', '<?php $this->extend("layout.php"); echo $foo ?>');
         $this->loader->setTemplate('layout.php', '<?php echo $this->render("bar.php") ?>-<?php echo $this[\'slots\']->get("_content") ?>-');
-        $this->assertEquals('bar-foo-', $engine->render('foo.php', array('foo' => 'foo', 'bar' => 'bar')), '->render() supports render() calls in templates');
+        $this->assertEquals('bar-foo-', $engine->render('foo.php', ['foo' => 'foo', 'bar' => 'bar']), '->render() supports render() calls in templates');
     }
 
     public function testRenderParameter()
     {
         $engine = new ProjectTemplateEngine(new TemplateNameParser(), $this->loader);
         $this->loader->setTemplate('foo.php', '<?php echo $template . $parameters ?>');
-        $this->assertEquals('foobar', $engine->render('foo.php', array('template' => 'foo', 'parameters' => 'bar')), '->render() extract variables');
+        $this->assertEquals('foobar', $engine->render('foo.php', ['template' => 'foo', 'parameters' => 'bar']), '->render() extract variables');
     }
 
     /**
@@ -131,15 +131,15 @@ public function testRenderForbiddenParameter($name)
     {
         $engine = new ProjectTemplateEngine(new TemplateNameParser(), $this->loader);
         $this->loader->setTemplate('foo.php', 'bar');
-        $engine->render('foo.php', array($name => 'foo'));
+        $engine->render('foo.php', [$name => 'foo']);
     }
 
     public function forbiddenParameterNames()
     {
-        return array(
-            array('this'),
-            array('view'),
-        );
+        return [
+            ['this'],
+            ['view'],
+        ];
     }
 
     public function testEscape()
@@ -153,7 +153,7 @@ public function testEscape()
     public function testGetSetCharset()
     {
         $helper = new SlotsHelper();
-        $engine = new ProjectTemplateEngine(new TemplateNameParser(), $this->loader, array($helper));
+        $engine = new ProjectTemplateEngine(new TemplateNameParser(), $this->loader, [$helper]);
         $this->assertEquals('UTF-8', $engine->getCharset(), 'EngineInterface::getCharset() returns UTF-8 by default');
         $this->assertEquals('UTF-8', $helper->getCharset(), 'HelperInterface::getCharset() returns UTF-8 by default');
 
@@ -167,9 +167,9 @@ public function testGlobalVariables()
         $engine = new ProjectTemplateEngine(new TemplateNameParser(), $this->loader);
         $engine->addGlobal('global_variable', 'lorem ipsum');
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'global_variable' => 'lorem ipsum',
-        ), $engine->getGlobals());
+        ], $engine->getGlobals());
     }
 
     public function testGlobalsGetPassedToTemplate()
@@ -181,7 +181,7 @@ public function testGlobalsGetPassedToTemplate()
 
         $this->assertEquals($engine->render('global.php'), 'global variable');
 
-        $this->assertEquals($engine->render('global.php', array('global' => 'overwritten')), 'overwritten');
+        $this->assertEquals($engine->render('global.php', ['global' => 'overwritten']), 'overwritten');
     }
 
     public function testGetLoader()
@@ -202,7 +202,7 @@ public function getLoader()
 
 class ProjectTemplateLoader extends Loader
 {
-    public $templates = array();
+    public $templates = [];
 
     public function setTemplate($name, $content)
     {
diff --git a/src/Symfony/Component/Templating/Tests/TemplateNameParserTest.php b/src/Symfony/Component/Templating/Tests/TemplateNameParserTest.php
index 14a019402fd34..c67dc376c2364 100644
--- a/src/Symfony/Component/Templating/Tests/TemplateNameParserTest.php
+++ b/src/Symfony/Component/Templating/Tests/TemplateNameParserTest.php
@@ -42,10 +42,10 @@ public function testParse($name, $ref)
 
     public function getLogicalNameToTemplateProvider()
     {
-        return array(
-            array('/path/to/section/name.engine', new TemplateReference('/path/to/section/name.engine', 'engine')),
-            array('name.engine', new TemplateReference('name.engine', 'engine')),
-            array('name', new TemplateReference('name')),
-        );
+        return [
+            ['/path/to/section/name.engine', new TemplateReference('/path/to/section/name.engine', 'engine')],
+            ['name.engine', new TemplateReference('name.engine', 'engine')],
+            ['name', new TemplateReference('name')],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php b/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php
index a0765ddd66d03..b8fdc926839ee 100644
--- a/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php
+++ b/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php
@@ -70,7 +70,7 @@ public function __construct(MessageCatalogueInterface $source, MessageCatalogueI
         $this->source = $source;
         $this->target = $target;
         $this->result = new MessageCatalogue($source->getLocale());
-        $this->messages = array();
+        $this->messages = [];
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/Command/XliffLintCommand.php b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
index 885d20e4b0d36..f6ab8e13f9e4d 100644
--- a/src/Symfony/Component/Translation/Command/XliffLintCommand.php
+++ b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
@@ -104,7 +104,7 @@ private function validate($content, $file = null)
     {
         // Avoid: Warning DOMDocument::loadXML(): Empty string supplied as input
         if ('' === trim($content)) {
-            return array('file' => $file, 'valid' => true);
+            return ['file' => $file, 'valid' => true];
         }
 
         libxml_use_internal_errors(true);
@@ -193,7 +193,7 @@ private function getFiles($fileOrDirectory)
         }
 
         foreach ($this->getDirectoryIterator($fileOrDirectory) as $file) {
-            if (!\in_array($file->getExtension(), array('xlf', 'xliff'))) {
+            if (!\in_array($file->getExtension(), ['xlf', 'xliff'])) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
index edd712dd14571..7aabcb24d5591 100644
--- a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
+++ b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
@@ -57,7 +57,7 @@ public function collect(Request $request, Response $response, \Exception $except
      */
     public function reset()
     {
-        $this->data = array();
+        $this->data = [];
     }
 
     /**
@@ -65,7 +65,7 @@ public function reset()
      */
     public function getMessages()
     {
-        return isset($this->data['messages']) ? $this->data['messages'] : array();
+        return isset($this->data['messages']) ? $this->data['messages'] : [];
     }
 
     /**
@@ -99,7 +99,7 @@ public function getLocale()
 
     public function getFallbackLocales()
     {
-        return (isset($this->data['fallback_locales']) && \count($this->data['fallback_locales']) > 0) ? $this->data['fallback_locales'] : array();
+        return (isset($this->data['fallback_locales']) && \count($this->data['fallback_locales']) > 0) ? $this->data['fallback_locales'] : [];
     }
 
     /**
@@ -112,13 +112,13 @@ public function getName()
 
     private function sanitizeCollectedMessages($messages)
     {
-        $result = array();
+        $result = [];
         foreach ($messages as $key => $message) {
             $messageId = $message['locale'].$message['domain'].$message['id'];
 
             if (!isset($result[$messageId])) {
                 $message['count'] = 1;
-                $message['parameters'] = !empty($message['parameters']) ? array($message['parameters']) : array();
+                $message['parameters'] = !empty($message['parameters']) ? [$message['parameters']] : [];
                 $messages[$key]['translation'] = $this->sanitizeString($message['translation']);
                 $result[$messageId] = $message;
             } else {
@@ -137,11 +137,11 @@ private function sanitizeCollectedMessages($messages)
 
     private function computeCount($messages)
     {
-        $count = array(
+        $count = [
             DataCollectorTranslator::MESSAGE_DEFINED => 0,
             DataCollectorTranslator::MESSAGE_MISSING => 0,
             DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK => 0,
-        );
+        ];
 
         foreach ($messages as $message) {
             ++$count[$message['state']];
diff --git a/src/Symfony/Component/Translation/DataCollectorTranslator.php b/src/Symfony/Component/Translation/DataCollectorTranslator.php
index 00147bcf37f86..322a1bc83cf52 100644
--- a/src/Symfony/Component/Translation/DataCollectorTranslator.php
+++ b/src/Symfony/Component/Translation/DataCollectorTranslator.php
@@ -27,7 +27,7 @@ class DataCollectorTranslator implements TranslatorInterface, TranslatorBagInter
      */
     private $translator;
 
-    private $messages = array();
+    private $messages = [];
 
     /**
      * @param TranslatorInterface $translator The translator must implement TranslatorBagInterface
@@ -44,7 +44,7 @@ public function __construct(TranslatorInterface $translator)
     /**
      * {@inheritdoc}
      */
-    public function trans($id, array $parameters = array(), $domain = null, $locale = null)
+    public function trans($id, array $parameters = [], $domain = null, $locale = null)
     {
         $trans = $this->translator->trans($id, $parameters, $domain, $locale);
         $this->collectMessage($locale, $domain, $id, $trans, $parameters);
@@ -55,7 +55,7 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
     /**
      * {@inheritdoc}
      */
-    public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
+    public function transChoice($id, $number, array $parameters = [], $domain = null, $locale = null)
     {
         $trans = $this->translator->transChoice($id, $number, $parameters, $domain, $locale);
         $this->collectMessage($locale, $domain, $id, $trans, $parameters, $number);
@@ -98,7 +98,7 @@ public function getFallbackLocales()
             return $this->translator->getFallbackLocales();
         }
 
-        return array();
+        return [];
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslationDumperPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslationDumperPass.php
index 92bac5be2f573..4656d667a05a3 100644
--- a/src/Symfony/Component/Translation/DependencyInjection/TranslationDumperPass.php
+++ b/src/Symfony/Component/Translation/DependencyInjection/TranslationDumperPass.php
@@ -38,7 +38,7 @@ public function process(ContainerBuilder $container)
         $definition = $container->getDefinition($this->writerServiceId);
 
         foreach ($container->findTaggedServiceIds($this->dumperTag, true) as $id => $attributes) {
-            $definition->addMethodCall('addDumper', array($attributes[0]['alias'], new Reference($id)));
+            $definition->addMethodCall('addDumper', [$attributes[0]['alias'], new Reference($id)]);
         }
     }
 }
diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslationExtractorPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslationExtractorPass.php
index 4014d499cce60..bb4c5dca70d31 100644
--- a/src/Symfony/Component/Translation/DependencyInjection/TranslationExtractorPass.php
+++ b/src/Symfony/Component/Translation/DependencyInjection/TranslationExtractorPass.php
@@ -43,7 +43,7 @@ public function process(ContainerBuilder $container)
                 throw new RuntimeException(sprintf('The alias for the tag "translation.extractor" of service "%s" must be set.', $id));
             }
 
-            $definition->addMethodCall('addExtractor', array($attributes[0]['alias'], new Reference($id)));
+            $definition->addMethodCall('addExtractor', [$attributes[0]['alias'], new Reference($id)]);
         }
     }
 }
diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php
index 2d50715ffb352..e16dbe5fac6f3 100644
--- a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php
+++ b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php
@@ -43,8 +43,8 @@ public function process(ContainerBuilder $container)
             return;
         }
 
-        $loaders = array();
-        $loaderRefs = array();
+        $loaders = [];
+        $loaderRefs = [];
         foreach ($container->findTaggedServiceIds($this->loaderTag, true) as $id => $attributes) {
             $loaderRefs[$id] = new Reference($id);
             $loaders[$id][] = $attributes[0]['alias'];
@@ -57,7 +57,7 @@ public function process(ContainerBuilder $container)
             $definition = $container->getDefinition($this->readerServiceId);
             foreach ($loaders as $id => $formats) {
                 foreach ($formats as $format) {
-                    $definition->addMethodCall('addLoader', array($format, $loaderRefs[$id]));
+                    $definition->addMethodCall('addLoader', [$format, $loaderRefs[$id]]);
                 }
             }
         }
diff --git a/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php b/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php
index 0880528dc9b03..bfa8db61adefc 100644
--- a/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php
@@ -26,12 +26,12 @@ class CsvFileDumper extends FileDumper
     /**
      * {@inheritdoc}
      */
-    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
+    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = [])
     {
         $handle = fopen('php://memory', 'r+b');
 
         foreach ($messages->all($domain) as $source => $target) {
-            fputcsv($handle, array($source, $target), $this->delimiter, $this->enclosure);
+            fputcsv($handle, [$source, $target], $this->delimiter, $this->enclosure);
         }
 
         rewind($handle);
diff --git a/src/Symfony/Component/Translation/Dumper/DumperInterface.php b/src/Symfony/Component/Translation/Dumper/DumperInterface.php
index cebc65ed89d90..9965e8091f86a 100644
--- a/src/Symfony/Component/Translation/Dumper/DumperInterface.php
+++ b/src/Symfony/Component/Translation/Dumper/DumperInterface.php
@@ -27,5 +27,5 @@ interface DumperInterface
      * @param MessageCatalogue $messages The message catalogue
      * @param array            $options  Options that are used by the dumper
      */
-    public function dump(MessageCatalogue $messages, $options = array());
+    public function dump(MessageCatalogue $messages, $options = []);
 }
diff --git a/src/Symfony/Component/Translation/Dumper/FileDumper.php b/src/Symfony/Component/Translation/Dumper/FileDumper.php
index f81f79c3c9463..20d9e55212524 100644
--- a/src/Symfony/Component/Translation/Dumper/FileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/FileDumper.php
@@ -63,7 +63,7 @@ public function setBackup($backup)
     /**
      * {@inheritdoc}
      */
-    public function dump(MessageCatalogue $messages, $options = array())
+    public function dump(MessageCatalogue $messages, $options = [])
     {
         if (!array_key_exists('path', $options)) {
             throw new InvalidArgumentException('The file dumper needs a path option.');
@@ -98,7 +98,7 @@ public function dump(MessageCatalogue $messages, $options = array())
      *
      * @return string representation
      */
-    abstract public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array());
+    abstract public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = []);
 
     /**
      * Gets the file extension of the dumper.
@@ -117,10 +117,10 @@ abstract protected function getExtension();
      */
     private function getRelativePath($domain, $locale)
     {
-        return strtr($this->relativePathTemplate, array(
+        return strtr($this->relativePathTemplate, [
             '%domain%' => $domain,
             '%locale%' => $locale,
             '%extension%' => $this->getExtension(),
-        ));
+        ]);
     }
 }
diff --git a/src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php b/src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php
index efa9d7fee6bec..48d0befdf9412 100644
--- a/src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php
@@ -28,7 +28,7 @@ class IcuResFileDumper extends FileDumper
     /**
      * {@inheritdoc}
      */
-    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
+    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = [])
     {
         $data = $indexes = $resources = '';
 
diff --git a/src/Symfony/Component/Translation/Dumper/IniFileDumper.php b/src/Symfony/Component/Translation/Dumper/IniFileDumper.php
index 9ed3754037fb5..45ff9614b146b 100644
--- a/src/Symfony/Component/Translation/Dumper/IniFileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/IniFileDumper.php
@@ -23,7 +23,7 @@ class IniFileDumper extends FileDumper
     /**
      * {@inheritdoc}
      */
-    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
+    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = [])
     {
         $output = '';
 
diff --git a/src/Symfony/Component/Translation/Dumper/JsonFileDumper.php b/src/Symfony/Component/Translation/Dumper/JsonFileDumper.php
index 11fe13d0e7946..3ee446dc73183 100644
--- a/src/Symfony/Component/Translation/Dumper/JsonFileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/JsonFileDumper.php
@@ -23,7 +23,7 @@ class JsonFileDumper extends FileDumper
     /**
      * {@inheritdoc}
      */
-    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
+    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = [])
     {
         if (isset($options['json_encoding'])) {
             $flags = $options['json_encoding'];
diff --git a/src/Symfony/Component/Translation/Dumper/MoFileDumper.php b/src/Symfony/Component/Translation/Dumper/MoFileDumper.php
index 32ed0ac26805f..27be16d573f4e 100644
--- a/src/Symfony/Component/Translation/Dumper/MoFileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/MoFileDumper.php
@@ -24,20 +24,20 @@ class MoFileDumper extends FileDumper
     /**
      * {@inheritdoc}
      */
-    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
+    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = [])
     {
         $sources = $targets = $sourceOffsets = $targetOffsets = '';
-        $offsets = array();
+        $offsets = [];
         $size = 0;
 
         foreach ($messages->all($domain) as $source => $target) {
-            $offsets[] = array_map('strlen', array($sources, $source, $targets, $target));
+            $offsets[] = array_map('strlen', [$sources, $source, $targets, $target]);
             $sources .= "\0".$source;
             $targets .= "\0".$target;
             ++$size;
         }
 
-        $header = array(
+        $header = [
             'magicNumber' => MoFileLoader::MO_LITTLE_ENDIAN_MAGIC,
             'formatRevision' => 0,
             'count' => $size,
@@ -45,7 +45,7 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
             'offsetTranslated' => MoFileLoader::MO_HEADER_SIZE + (8 * $size),
             'sizeHashes' => 0,
             'offsetHashes' => MoFileLoader::MO_HEADER_SIZE + (16 * $size),
-        );
+        ];
 
         $sourcesSize = \strlen($sources);
         $sourcesStart = $header['offsetHashes'] + 1;
@@ -57,7 +57,7 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
                           .$this->writeLong($offset[2] + $sourcesStart + $sourcesSize);
         }
 
-        $output = implode('', array_map(array($this, 'writeLong'), $header))
+        $output = implode('', array_map([$this, 'writeLong'], $header))
                .$sourceOffsets
                .$targetOffsets
                .$sources
diff --git a/src/Symfony/Component/Translation/Dumper/PhpFileDumper.php b/src/Symfony/Component/Translation/Dumper/PhpFileDumper.php
index c7c37aac9232b..e77afc2fbfde3 100644
--- a/src/Symfony/Component/Translation/Dumper/PhpFileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/PhpFileDumper.php
@@ -23,7 +23,7 @@ class PhpFileDumper extends FileDumper
     /**
      * {@inheritdoc}
      */
-    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
+    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = [])
     {
         return "<?php\n\nreturn ".var_export($messages->all($domain), true).";\n";
     }
diff --git a/src/Symfony/Component/Translation/Dumper/PoFileDumper.php b/src/Symfony/Component/Translation/Dumper/PoFileDumper.php
index ed4418b1489ea..e9673b6d29908 100644
--- a/src/Symfony/Component/Translation/Dumper/PoFileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/PoFileDumper.php
@@ -23,7 +23,7 @@ class PoFileDumper extends FileDumper
     /**
      * {@inheritdoc}
      */
-    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
+    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = [])
     {
         $output = 'msgid ""'."\n";
         $output .= 'msgstr ""'."\n";
diff --git a/src/Symfony/Component/Translation/Dumper/QtFileDumper.php b/src/Symfony/Component/Translation/Dumper/QtFileDumper.php
index a9073f26df479..ec93f92e4a1f9 100644
--- a/src/Symfony/Component/Translation/Dumper/QtFileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/QtFileDumper.php
@@ -23,7 +23,7 @@ class QtFileDumper extends FileDumper
     /**
      * {@inheritdoc}
      */
-    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
+    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = [])
     {
         $dom = new \DOMDocument('1.0', 'utf-8');
         $dom->formatOutput = true;
diff --git a/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php b/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php
index e714463c9f0e0..a26d94987e888 100644
--- a/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php
@@ -24,7 +24,7 @@ class XliffFileDumper extends FileDumper
     /**
      * {@inheritdoc}
      */
-    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
+    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = [])
     {
         $xliffVersion = '1.2';
         if (array_key_exists('xliff_version', $options)) {
@@ -55,9 +55,9 @@ protected function getExtension()
         return 'xlf';
     }
 
-    private function dumpXliff1($defaultLocale, MessageCatalogue $messages, $domain, array $options = array())
+    private function dumpXliff1($defaultLocale, MessageCatalogue $messages, $domain, array $options = [])
     {
-        $toolInfo = array('tool-id' => 'symfony', 'tool-name' => 'Symfony');
+        $toolInfo = ['tool-id' => 'symfony', 'tool-name' => 'Symfony'];
         if (array_key_exists('tool_info', $options)) {
             $toolInfo = array_merge($toolInfo, $options['tool_info']);
         }
@@ -129,7 +129,7 @@ private function dumpXliff1($defaultLocale, MessageCatalogue $messages, $domain,
         return $dom->saveXML();
     }
 
-    private function dumpXliff2($defaultLocale, MessageCatalogue $messages, $domain, array $options = array())
+    private function dumpXliff2($defaultLocale, MessageCatalogue $messages, $domain, array $options = [])
     {
         $dom = new \DOMDocument('1.0', 'utf-8');
         $dom->formatOutput = true;
diff --git a/src/Symfony/Component/Translation/Dumper/YamlFileDumper.php b/src/Symfony/Component/Translation/Dumper/YamlFileDumper.php
index aab6ad9b234fb..f7e1bcb80b9be 100644
--- a/src/Symfony/Component/Translation/Dumper/YamlFileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/YamlFileDumper.php
@@ -33,7 +33,7 @@ public function __construct(/**string */$extension = 'yml')
     /**
      * {@inheritdoc}
      */
-    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
+    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = [])
     {
         if (!class_exists('Symfony\Component\Yaml\Yaml')) {
             throw new LogicException('Dumping translations in the YAML format requires the Symfony Yaml component.');
diff --git a/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php b/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php
index 184102236e091..08a27fb07c980 100644
--- a/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php
+++ b/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php
@@ -28,14 +28,14 @@ abstract class AbstractFileExtractor
     protected function extractFiles($resource)
     {
         if (\is_array($resource) || $resource instanceof \Traversable) {
-            $files = array();
+            $files = [];
             foreach ($resource as $file) {
                 if ($this->canBeExtracted($file)) {
                     $files[] = $this->toSplFileInfo($file);
                 }
             }
         } elseif (is_file($resource)) {
-            $files = $this->canBeExtracted($resource) ? array($this->toSplFileInfo($resource)) : array();
+            $files = $this->canBeExtracted($resource) ? [$this->toSplFileInfo($resource)] : [];
         } else {
             $files = $this->extractFromDirectory($resource);
         }
diff --git a/src/Symfony/Component/Translation/Extractor/ChainExtractor.php b/src/Symfony/Component/Translation/Extractor/ChainExtractor.php
index 50e3c84579f2b..69ee2dfc39e63 100644
--- a/src/Symfony/Component/Translation/Extractor/ChainExtractor.php
+++ b/src/Symfony/Component/Translation/Extractor/ChainExtractor.php
@@ -25,7 +25,7 @@ class ChainExtractor implements ExtractorInterface
      *
      * @var ExtractorInterface[]
      */
-    private $extractors = array();
+    private $extractors = [];
 
     /**
      * Adds a loader to the translation extractor.
diff --git a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
index ce62621238df3..bf7da431a7f10 100644
--- a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
+++ b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
@@ -37,8 +37,8 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
      *
      * @var array
      */
-    protected $sequences = array(
-        array(
+    protected $sequences = [
+        [
             '->',
             'trans',
             '(',
@@ -47,8 +47,8 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
             self::METHOD_ARGUMENTS_TOKEN,
             ',',
             self::DOMAIN_TOKEN,
-        ),
-        array(
+        ],
+        [
             '->',
             'transChoice',
             '(',
@@ -59,20 +59,20 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
             self::METHOD_ARGUMENTS_TOKEN,
             ',',
             self::DOMAIN_TOKEN,
-        ),
-        array(
+        ],
+        [
             '->',
             'trans',
             '(',
             self::MESSAGE_TOKEN,
-        ),
-        array(
+        ],
+        [
             '->',
             'transChoice',
             '(',
             self::MESSAGE_TOKEN,
-        ),
-    );
+        ],
+    ];
 
     /**
      * {@inheritdoc}
diff --git a/src/Symfony/Component/Translation/Extractor/PhpStringTokenParser.php b/src/Symfony/Component/Translation/Extractor/PhpStringTokenParser.php
index e8094e6c08ab2..8a8ccb1f1aae3 100644
--- a/src/Symfony/Component/Translation/Extractor/PhpStringTokenParser.php
+++ b/src/Symfony/Component/Translation/Extractor/PhpStringTokenParser.php
@@ -49,7 +49,7 @@
 
 class PhpStringTokenParser
 {
-    protected static $replacements = array(
+    protected static $replacements = [
         '\\' => '\\',
         '$' => '$',
         'n' => "\n",
@@ -58,7 +58,7 @@ class PhpStringTokenParser
         'f' => "\f",
         'v' => "\v",
         'e' => "\x1B",
-    );
+    ];
 
     /**
      * Parses a string token.
@@ -76,8 +76,8 @@ public static function parse($str)
 
         if ('\'' === $str[$bLength]) {
             return str_replace(
-                array('\\\\', '\\\''),
-                array('\\', '\''),
+                ['\\\\', '\\\''],
+                ['\\', '\''],
                 substr($str, $bLength + 1, -1)
             );
         } else {
@@ -101,7 +101,7 @@ public static function parseEscapeSequences($str, $quote)
 
         return preg_replace_callback(
             '~\\\\([\\\\$nrtfve]|[xX][0-9a-fA-F]{1,2}|[0-7]{1,3})~',
-            array(__CLASS__, 'parseCallback'),
+            [__CLASS__, 'parseCallback'],
             $str
         );
     }
diff --git a/src/Symfony/Component/Translation/Formatter/ChoiceMessageFormatterInterface.php b/src/Symfony/Component/Translation/Formatter/ChoiceMessageFormatterInterface.php
index 92acbcafe2032..027b2eb5ba4e1 100644
--- a/src/Symfony/Component/Translation/Formatter/ChoiceMessageFormatterInterface.php
+++ b/src/Symfony/Component/Translation/Formatter/ChoiceMessageFormatterInterface.php
@@ -26,5 +26,5 @@ interface ChoiceMessageFormatterInterface
      *
      * @return string
      */
-    public function choiceFormat($message, $number, $locale, array $parameters = array());
+    public function choiceFormat($message, $number, $locale, array $parameters = []);
 }
diff --git a/src/Symfony/Component/Translation/Formatter/MessageFormatter.php b/src/Symfony/Component/Translation/Formatter/MessageFormatter.php
index e174be36c3a46..1529e8d4e25f0 100644
--- a/src/Symfony/Component/Translation/Formatter/MessageFormatter.php
+++ b/src/Symfony/Component/Translation/Formatter/MessageFormatter.php
@@ -31,7 +31,7 @@ public function __construct(MessageSelector $selector = null)
     /**
      * {@inheritdoc}
      */
-    public function format($message, $locale, array $parameters = array())
+    public function format($message, $locale, array $parameters = [])
     {
         return strtr($message, $parameters);
     }
diff --git a/src/Symfony/Component/Translation/Formatter/MessageFormatterInterface.php b/src/Symfony/Component/Translation/Formatter/MessageFormatterInterface.php
index 86937fb2f0853..370c055866c0f 100644
--- a/src/Symfony/Component/Translation/Formatter/MessageFormatterInterface.php
+++ b/src/Symfony/Component/Translation/Formatter/MessageFormatterInterface.php
@@ -26,5 +26,5 @@ interface MessageFormatterInterface
      *
      * @return string
      */
-    public function format($message, $locale, array $parameters = array());
+    public function format($message, $locale, array $parameters = []);
 }
diff --git a/src/Symfony/Component/Translation/Loader/CsvFileLoader.php b/src/Symfony/Component/Translation/Loader/CsvFileLoader.php
index 8a763e725d6d7..18cc83ed686c6 100644
--- a/src/Symfony/Component/Translation/Loader/CsvFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/CsvFileLoader.php
@@ -29,7 +29,7 @@ class CsvFileLoader extends FileLoader
      */
     protected function loadResource($resource)
     {
-        $messages = array();
+        $messages = [];
 
         try {
             $file = new \SplFileObject($resource, 'rb');
diff --git a/src/Symfony/Component/Translation/Loader/FileLoader.php b/src/Symfony/Component/Translation/Loader/FileLoader.php
index 9a02f5250617f..7ec54a3c874fb 100644
--- a/src/Symfony/Component/Translation/Loader/FileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/FileLoader.php
@@ -37,7 +37,7 @@ public function load($resource, $locale, $domain = 'messages')
 
         // empty resource
         if (null === $messages) {
-            $messages = array();
+            $messages = [];
         }
 
         // not an array
diff --git a/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php b/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php
index fd2d1e4d3196c..b59c021469e6e 100644
--- a/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php
@@ -76,7 +76,7 @@ public function load($resource, $locale, $domain = 'messages')
      *
      * @return array the flattened ResourceBundle
      */
-    protected function flatten(\ResourceBundle $rb, array &$messages = array(), $path = null)
+    protected function flatten(\ResourceBundle $rb, array &$messages = [], $path = null)
     {
         foreach ($rb as $key => $value) {
             $nodePath = $path ? $path.'.'.$key : $key;
diff --git a/src/Symfony/Component/Translation/Loader/JsonFileLoader.php b/src/Symfony/Component/Translation/Loader/JsonFileLoader.php
index ce4e91ff4fbee..526721277d76e 100644
--- a/src/Symfony/Component/Translation/Loader/JsonFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/JsonFileLoader.php
@@ -25,7 +25,7 @@ class JsonFileLoader extends FileLoader
      */
     protected function loadResource($resource)
     {
-        $messages = array();
+        $messages = [];
         if ($data = file_get_contents($resource)) {
             $messages = json_decode($data, true);
 
diff --git a/src/Symfony/Component/Translation/Loader/MoFileLoader.php b/src/Symfony/Component/Translation/Loader/MoFileLoader.php
index 93ecffa665506..74d2b2f4411df 100644
--- a/src/Symfony/Component/Translation/Loader/MoFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/MoFileLoader.php
@@ -71,7 +71,7 @@ protected function loadResource($resource)
         // offsetHashes
         $this->readLong($stream, $isBigEndian);
 
-        $messages = array();
+        $messages = [];
 
         for ($i = 0; $i < $count; ++$i) {
             $pluralId = null;
@@ -108,13 +108,13 @@ protected function loadResource($resource)
                 $translated = explode("\000", $translated);
             }
 
-            $ids = array('singular' => $singularId, 'plural' => $pluralId);
+            $ids = ['singular' => $singularId, 'plural' => $pluralId];
             $item = compact('ids', 'translated');
 
             if (\is_array($item['translated'])) {
                 $messages[$item['ids']['singular']] = stripcslashes($item['translated'][0]);
                 if (isset($item['ids']['plural'])) {
-                    $plurals = array();
+                    $plurals = [];
                     foreach ($item['translated'] as $plural => $translated) {
                         $plurals[] = sprintf('{%d} %s', $plural, $translated);
                     }
diff --git a/src/Symfony/Component/Translation/Loader/PoFileLoader.php b/src/Symfony/Component/Translation/Loader/PoFileLoader.php
index 066168dc71d98..1412a786a79b7 100644
--- a/src/Symfony/Component/Translation/Loader/PoFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/PoFileLoader.php
@@ -64,14 +64,14 @@ protected function loadResource($resource)
     {
         $stream = fopen($resource, 'r');
 
-        $defaults = array(
-            'ids' => array(),
+        $defaults = [
+            'ids' => [],
             'translated' => null,
-        );
+        ];
 
-        $messages = array();
+        $messages = [];
         $item = $defaults;
-        $flags = array();
+        $flags = [];
 
         while ($line = fgets($stream)) {
             $line = trim($line);
@@ -82,7 +82,7 @@ protected function loadResource($resource)
                     $this->addMessage($messages, $item);
                 }
                 $item = $defaults;
-                $flags = array();
+                $flags = [];
             } elseif ('#,' === substr($line, 0, 2)) {
                 $flags = array_map('trim', explode(',', substr($line, 2)));
             } elseif ('msgid "' === substr($line, 0, 7)) {
diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
index 11a9ce4d4d74f..8464ffaf656cc 100644
--- a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
@@ -95,13 +95,13 @@ private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, $
 
             $catalogue->set((string) $source, $target, $domain);
 
-            $metadata = array();
+            $metadata = [];
             if ($notes = $this->parseNotesMetadata($translation->note, $encoding)) {
                 $metadata['notes'] = $notes;
             }
 
             if (isset($translation->target) && $translation->target->attributes()) {
-                $metadata['target-attributes'] = array();
+                $metadata['target-attributes'] = [];
                 foreach ($translation->target->attributes() as $key => $value) {
                     $metadata['target-attributes'][$key] = (string) $value;
                 }
@@ -137,18 +137,18 @@ private function extractXliff2(\DOMDocument $dom, MessageCatalogue $catalogue, $
 
                 $catalogue->set((string) $source, $target, $domain);
 
-                $metadata = array();
+                $metadata = [];
                 if (isset($segment->target) && $segment->target->attributes()) {
-                    $metadata['target-attributes'] = array();
+                    $metadata['target-attributes'] = [];
                     foreach ($segment->target->attributes() as $key => $value) {
                         $metadata['target-attributes'][$key] = (string) $value;
                     }
                 }
 
                 if (isset($unit->notes)) {
-                    $metadata['notes'] = array();
+                    $metadata['notes'] = [];
                     foreach ($unit->notes->note as $noteNode) {
-                        $note = array();
+                        $note = [];
                         foreach ($noteNode->attributes() as $key => $value) {
                             $note[$key] = (string) $value;
                         }
@@ -321,7 +321,7 @@ private function getVersionNumber(\DOMDocument $dom)
      */
     private function parseNotesMetadata(\SimpleXMLElement $noteElement = null, $encoding = null)
     {
-        $notes = array();
+        $notes = [];
 
         if (null === $noteElement) {
             return $notes;
@@ -330,7 +330,7 @@ private function parseNotesMetadata(\SimpleXMLElement $noteElement = null, $enco
         /** @var \SimpleXMLElement $xmlNote */
         foreach ($noteElement as $xmlNote) {
             $noteAttributes = $xmlNote->attributes();
-            $note = array('content' => $this->utf8ToCharset((string) $xmlNote, $encoding));
+            $note = ['content' => $this->utf8ToCharset((string) $xmlNote, $encoding)];
             if (isset($noteAttributes['priority'])) {
                 $note['priority'] = (int) $noteAttributes['priority'];
             }
diff --git a/src/Symfony/Component/Translation/LoggingTranslator.php b/src/Symfony/Component/Translation/LoggingTranslator.php
index 7fedac913f7b9..2dfa5a7132e63 100644
--- a/src/Symfony/Component/Translation/LoggingTranslator.php
+++ b/src/Symfony/Component/Translation/LoggingTranslator.php
@@ -43,7 +43,7 @@ public function __construct(TranslatorInterface $translator, LoggerInterface $lo
     /**
      * {@inheritdoc}
      */
-    public function trans($id, array $parameters = array(), $domain = null, $locale = null)
+    public function trans($id, array $parameters = [], $domain = null, $locale = null)
     {
         $trans = $this->translator->trans($id, $parameters, $domain, $locale);
         $this->log($id, $domain, $locale);
@@ -54,7 +54,7 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
     /**
      * {@inheritdoc}
      */
-    public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
+    public function transChoice($id, $number, array $parameters = [], $domain = null, $locale = null)
     {
         $trans = $this->translator->transChoice($id, $number, $parameters, $domain, $locale);
         $this->log($id, $domain, $locale);
@@ -97,7 +97,7 @@ public function getFallbackLocales()
             return $this->translator->getFallbackLocales();
         }
 
-        return array();
+        return [];
     }
 
     /**
@@ -128,9 +128,9 @@ private function log($id, $domain, $locale)
         }
 
         if ($catalogue->has($id, $domain)) {
-            $this->logger->debug('Translation use fallback catalogue.', array('id' => $id, 'domain' => $domain, 'locale' => $catalogue->getLocale()));
+            $this->logger->debug('Translation use fallback catalogue.', ['id' => $id, 'domain' => $domain, 'locale' => $catalogue->getLocale()]);
         } else {
-            $this->logger->warning('Translation not found.', array('id' => $id, 'domain' => $domain, 'locale' => $catalogue->getLocale()));
+            $this->logger->warning('Translation not found.', ['id' => $id, 'domain' => $domain, 'locale' => $catalogue->getLocale()]);
         }
     }
 }
diff --git a/src/Symfony/Component/Translation/MessageCatalogue.php b/src/Symfony/Component/Translation/MessageCatalogue.php
index df917bbba9e34..d0c20fc2efdad 100644
--- a/src/Symfony/Component/Translation/MessageCatalogue.php
+++ b/src/Symfony/Component/Translation/MessageCatalogue.php
@@ -19,9 +19,9 @@
  */
 class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterface
 {
-    private $messages = array();
-    private $metadata = array();
-    private $resources = array();
+    private $messages = [];
+    private $metadata = [];
+    private $resources = [];
     private $locale;
     private $fallbackCatalogue;
     private $parent;
@@ -69,7 +69,7 @@ public function all($domain = null)
      */
     public function set($id, $translation, $domain = 'messages')
     {
-        $this->add(array($id => $translation), $domain);
+        $this->add([$id => $translation], $domain);
     }
 
     /**
@@ -247,7 +247,7 @@ public function setMetadata($key, $value, $domain = 'messages')
     public function deleteMetadata($key = '', $domain = 'messages')
     {
         if ('' == $domain) {
-            $this->metadata = array();
+            $this->metadata = [];
         } elseif ('' == $key) {
             unset($this->metadata[$domain]);
         } else {
diff --git a/src/Symfony/Component/Translation/MessageSelector.php b/src/Symfony/Component/Translation/MessageSelector.php
index 5de171c5f4a40..a7743ebae30e1 100644
--- a/src/Symfony/Component/Translation/MessageSelector.php
+++ b/src/Symfony/Component/Translation/MessageSelector.php
@@ -49,15 +49,15 @@ class MessageSelector
      */
     public function choose($message, $number, $locale)
     {
-        $parts = array();
+        $parts = [];
         if (preg_match('/^\|++$/', $message)) {
             $parts = explode('|', $message);
         } elseif (preg_match_all('/(?:\|\||[^\|])++/', $message, $matches)) {
             $parts = $matches[0];
         }
 
-        $explicitRules = array();
-        $standardRules = array();
+        $explicitRules = [];
+        $standardRules = [];
         foreach ($parts as $part) {
             $part = trim(str_replace('||', '|', $part));
 
diff --git a/src/Symfony/Component/Translation/PluralizationRules.php b/src/Symfony/Component/Translation/PluralizationRules.php
index 3aca0ba963298..d369f5f3fabf3 100644
--- a/src/Symfony/Component/Translation/PluralizationRules.php
+++ b/src/Symfony/Component/Translation/PluralizationRules.php
@@ -18,7 +18,7 @@
  */
 class PluralizationRules
 {
-    private static $rules = array();
+    private static $rules = [];
 
     /**
      * Returns the plural position to use for the given locale and number.
diff --git a/src/Symfony/Component/Translation/Reader/TranslationReader.php b/src/Symfony/Component/Translation/Reader/TranslationReader.php
index 948edec492e58..e4554f39b4ee5 100644
--- a/src/Symfony/Component/Translation/Reader/TranslationReader.php
+++ b/src/Symfony/Component/Translation/Reader/TranslationReader.php
@@ -27,7 +27,7 @@ class TranslationReader implements TranslationReaderInterface
      *
      * @var array
      */
-    private $loaders = array();
+    private $loaders = [];
 
     /**
      * Adds a loader to the translation extractor.
diff --git a/src/Symfony/Component/Translation/Tests/Catalogue/AbstractOperationTest.php b/src/Symfony/Component/Translation/Tests/Catalogue/AbstractOperationTest.php
index 90cf4a5dc381e..e39ef39ec51fc 100644
--- a/src/Symfony/Component/Translation/Tests/Catalogue/AbstractOperationTest.php
+++ b/src/Symfony/Component/Translation/Tests/Catalogue/AbstractOperationTest.php
@@ -20,7 +20,7 @@ abstract class AbstractOperationTest extends TestCase
     public function testGetEmptyDomains()
     {
         $this->assertEquals(
-            array(),
+            [],
             $this->createOperation(
                 new MessageCatalogue('en'),
                 new MessageCatalogue('en')
@@ -31,10 +31,10 @@ public function testGetEmptyDomains()
     public function testGetMergedDomains()
     {
         $this->assertEquals(
-            array('a', 'b', 'c'),
+            ['a', 'b', 'c'],
             $this->createOperation(
-                new MessageCatalogue('en', array('a' => array(), 'b' => array())),
-                new MessageCatalogue('en', array('b' => array(), 'c' => array()))
+                new MessageCatalogue('en', ['a' => [], 'b' => []]),
+                new MessageCatalogue('en', ['b' => [], 'c' => []])
             )->getDomains()
         );
     }
@@ -51,9 +51,9 @@ public function testGetMessagesFromUnknownDomain()
     public function testGetEmptyMessages()
     {
         $this->assertEquals(
-            array(),
+            [],
             $this->createOperation(
-                new MessageCatalogue('en', array('a' => array())),
+                new MessageCatalogue('en', ['a' => []]),
                 new MessageCatalogue('en')
             )->getMessages('a')
         );
diff --git a/src/Symfony/Component/Translation/Tests/Catalogue/MergeOperationTest.php b/src/Symfony/Component/Translation/Tests/Catalogue/MergeOperationTest.php
index 8b51c15daec92..aabe92db56ec5 100644
--- a/src/Symfony/Component/Translation/Tests/Catalogue/MergeOperationTest.php
+++ b/src/Symfony/Component/Translation/Tests/Catalogue/MergeOperationTest.php
@@ -20,22 +20,22 @@ class MergeOperationTest extends AbstractOperationTest
     public function testGetMessagesFromSingleDomain()
     {
         $operation = $this->createOperation(
-            new MessageCatalogue('en', array('messages' => array('a' => 'old_a', 'b' => 'old_b'))),
-            new MessageCatalogue('en', array('messages' => array('a' => 'new_a', 'c' => 'new_c')))
+            new MessageCatalogue('en', ['messages' => ['a' => 'old_a', 'b' => 'old_b']]),
+            new MessageCatalogue('en', ['messages' => ['a' => 'new_a', 'c' => 'new_c']])
         );
 
         $this->assertEquals(
-            array('a' => 'old_a', 'b' => 'old_b', 'c' => 'new_c'),
+            ['a' => 'old_a', 'b' => 'old_b', 'c' => 'new_c'],
             $operation->getMessages('messages')
         );
 
         $this->assertEquals(
-            array('c' => 'new_c'),
+            ['c' => 'new_c'],
             $operation->getNewMessages('messages')
         );
 
         $this->assertEquals(
-            array(),
+            [],
             $operation->getObsoleteMessages('messages')
         );
     }
diff --git a/src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php b/src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php
index 271d17fb8f311..69de1d0fb1ace 100644
--- a/src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php
+++ b/src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php
@@ -20,22 +20,22 @@ class TargetOperationTest extends AbstractOperationTest
     public function testGetMessagesFromSingleDomain()
     {
         $operation = $this->createOperation(
-            new MessageCatalogue('en', array('messages' => array('a' => 'old_a', 'b' => 'old_b'))),
-            new MessageCatalogue('en', array('messages' => array('a' => 'new_a', 'c' => 'new_c')))
+            new MessageCatalogue('en', ['messages' => ['a' => 'old_a', 'b' => 'old_b']]),
+            new MessageCatalogue('en', ['messages' => ['a' => 'new_a', 'c' => 'new_c']])
         );
 
         $this->assertEquals(
-            array('a' => 'old_a', 'c' => 'new_c'),
+            ['a' => 'old_a', 'c' => 'new_c'],
             $operation->getMessages('messages')
         );
 
         $this->assertEquals(
-            array('c' => 'new_c'),
+            ['c' => 'new_c'],
             $operation->getNewMessages('messages')
         );
 
         $this->assertEquals(
-            array('b' => 'old_b'),
+            ['b' => 'old_b'],
             $operation->getObsoleteMessages('messages')
         );
     }
diff --git a/src/Symfony/Component/Translation/Tests/DataCollector/TranslationDataCollectorTest.php b/src/Symfony/Component/Translation/Tests/DataCollector/TranslationDataCollectorTest.php
index 6665eca49946e..b4d350ef862e5 100644
--- a/src/Symfony/Component/Translation/Tests/DataCollector/TranslationDataCollectorTest.php
+++ b/src/Symfony/Component/Translation/Tests/DataCollector/TranslationDataCollectorTest.php
@@ -27,7 +27,7 @@ protected function setUp()
     public function testCollectEmptyMessages()
     {
         $translator = $this->getTranslator();
-        $translator->expects($this->any())->method('getCollectedMessages')->will($this->returnValue(array()));
+        $translator->expects($this->any())->method('getCollectedMessages')->will($this->returnValue([]));
 
         $dataCollector = new TranslationDataCollector($translator);
         $dataCollector->lateCollect();
@@ -35,94 +35,94 @@ public function testCollectEmptyMessages()
         $this->assertEquals(0, $dataCollector->getCountMissings());
         $this->assertEquals(0, $dataCollector->getCountFallbacks());
         $this->assertEquals(0, $dataCollector->getCountDefines());
-        $this->assertEquals(array(), $dataCollector->getMessages()->getValue());
+        $this->assertEquals([], $dataCollector->getMessages()->getValue());
     }
 
     public function testCollect()
     {
-        $collectedMessages = array(
-            array(
+        $collectedMessages = [
+            [
                 'id' => 'foo',
                 'translation' => 'foo (en)',
                 'locale' => 'en',
                 'domain' => 'messages',
                 'state' => DataCollectorTranslator::MESSAGE_DEFINED,
-                'parameters' => array(),
+                'parameters' => [],
                 'transChoiceNumber' => null,
-            ),
-            array(
+            ],
+            [
                 'id' => 'bar',
                 'translation' => 'bar (fr)',
                 'locale' => 'fr',
                 'domain' => 'messages',
                 'state' => DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK,
-                'parameters' => array(),
+                'parameters' => [],
                 'transChoiceNumber' => null,
-            ),
-            array(
+            ],
+            [
                 'id' => 'choice',
                 'translation' => 'choice',
                 'locale' => 'en',
                 'domain' => 'messages',
                 'state' => DataCollectorTranslator::MESSAGE_MISSING,
-                'parameters' => array('%count%' => 3),
+                'parameters' => ['%count%' => 3],
                 'transChoiceNumber' => 3,
-            ),
-            array(
+            ],
+            [
                 'id' => 'choice',
                 'translation' => 'choice',
                 'locale' => 'en',
                 'domain' => 'messages',
                 'state' => DataCollectorTranslator::MESSAGE_MISSING,
-                'parameters' => array('%count%' => 3),
+                'parameters' => ['%count%' => 3],
                 'transChoiceNumber' => 3,
-            ),
-            array(
+            ],
+            [
                 'id' => 'choice',
                 'translation' => 'choice',
                 'locale' => 'en',
                 'domain' => 'messages',
                 'state' => DataCollectorTranslator::MESSAGE_MISSING,
-                'parameters' => array('%count%' => 4, '%foo%' => 'bar'),
+                'parameters' => ['%count%' => 4, '%foo%' => 'bar'],
                 'transChoiceNumber' => 4,
-            ),
-        );
-        $expectedMessages = array(
-            array(
+            ],
+        ];
+        $expectedMessages = [
+            [
                 'id' => 'foo',
                 'translation' => 'foo (en)',
                 'locale' => 'en',
                 'domain' => 'messages',
                 'state' => DataCollectorTranslator::MESSAGE_DEFINED,
                 'count' => 1,
-                'parameters' => array(),
+                'parameters' => [],
                 'transChoiceNumber' => null,
-            ),
-            array(
+            ],
+            [
                 'id' => 'bar',
                 'translation' => 'bar (fr)',
                 'locale' => 'fr',
                 'domain' => 'messages',
                 'state' => DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK,
                 'count' => 1,
-                'parameters' => array(),
+                'parameters' => [],
                 'transChoiceNumber' => null,
-            ),
-            array(
+            ],
+            [
                 'id' => 'choice',
                 'translation' => 'choice',
                 'locale' => 'en',
                 'domain' => 'messages',
                 'state' => DataCollectorTranslator::MESSAGE_MISSING,
                 'count' => 3,
-                'parameters' => array(
-                    array('%count%' => 3),
-                    array('%count%' => 3),
-                    array('%count%' => 4, '%foo%' => 'bar'),
-                ),
+                'parameters' => [
+                    ['%count%' => 3],
+                    ['%count%' => 3],
+                    ['%count%' => 4, '%foo%' => 'bar'],
+                ],
                 'transChoiceNumber' => 3,
-            ),
-        );
+            ],
+        ];
 
         $translator = $this->getTranslator();
         $translator->expects($this->any())->method('getCollectedMessages')->will($this->returnValue($collectedMessages));
diff --git a/src/Symfony/Component/Translation/Tests/DataCollectorTranslatorTest.php b/src/Symfony/Component/Translation/Tests/DataCollectorTranslatorTest.php
index 1cdd33b395f0d..881e914f777f8 100644
--- a/src/Symfony/Component/Translation/Tests/DataCollectorTranslatorTest.php
+++ b/src/Symfony/Component/Translation/Tests/DataCollectorTranslatorTest.php
@@ -83,9 +83,9 @@ private function createCollector()
     {
         $translator = new Translator('en');
         $translator->addLoader('array', new ArrayLoader());
-        $translator->addResource('array', array('foo' => 'foo (en)'), 'en');
-        $translator->addResource('array', array('bar' => 'bar (fr)'), 'fr');
-        $translator->addResource('array', array('bar_ru' => 'bar (ru)'), 'ru');
+        $translator->addResource('array', ['foo' => 'foo (en)'], 'en');
+        $translator->addResource('array', ['bar' => 'bar (fr)'], 'fr');
+        $translator->addResource('array', ['bar_ru' => 'bar (ru)'], 'ru');
 
         return new DataCollectorTranslator($translator);
     }
diff --git a/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationDumperPassTest.php b/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationDumperPassTest.php
index 759bb0e97d3b4..94769e9dae9e0 100644
--- a/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationDumperPassTest.php
+++ b/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationDumperPassTest.php
@@ -23,12 +23,12 @@ public function testProcess()
         $container = new ContainerBuilder();
         $writerDefinition = $container->register('translation.writer');
         $container->register('foo.id')
-            ->addTag('translation.dumper', array('alias' => 'bar.alias'));
+            ->addTag('translation.dumper', ['alias' => 'bar.alias']);
 
         $translationDumperPass = new TranslationDumperPass();
         $translationDumperPass->process($container);
 
-        $this->assertEquals(array(array('addDumper', array('bar.alias', new Reference('foo.id')))), $writerDefinition->getMethodCalls());
+        $this->assertEquals([['addDumper', ['bar.alias', new Reference('foo.id')]]], $writerDefinition->getMethodCalls());
     }
 
     public function testProcessNoDefinitionFound()
diff --git a/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationExtractorPassTest.php b/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationExtractorPassTest.php
index 14d164d0ee3c6..a638498b6bdef 100644
--- a/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationExtractorPassTest.php
+++ b/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationExtractorPassTest.php
@@ -23,12 +23,12 @@ public function testProcess()
         $container = new ContainerBuilder();
         $extractorDefinition = $container->register('translation.extractor');
         $container->register('foo.id')
-            ->addTag('translation.extractor', array('alias' => 'bar.alias'));
+            ->addTag('translation.extractor', ['alias' => 'bar.alias']);
 
         $translationDumperPass = new TranslationExtractorPass();
         $translationDumperPass->process($container);
 
-        $this->assertEquals(array(array('addExtractor', array('bar.alias', new Reference('foo.id')))), $extractorDefinition->getMethodCalls());
+        $this->assertEquals([['addExtractor', ['bar.alias', new Reference('foo.id')]]], $extractorDefinition->getMethodCalls());
     }
 
     public function testProcessNoDefinitionFound()
@@ -56,7 +56,7 @@ public function testProcessMissingAlias()
         $container = new ContainerBuilder();
         $container->register('translation.extractor');
         $container->register('foo.id')
-            ->addTag('translation.extractor', array());
+            ->addTag('translation.extractor', []);
 
         $definition->expects($this->never())->method('addMethodCall');
 
diff --git a/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationPassTest.php b/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationPassTest.php
index 4c03aaca57003..22e8797236656 100644
--- a/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationPassTest.php
+++ b/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationPassTest.php
@@ -23,12 +23,12 @@ class TranslationPassTest extends TestCase
     public function testValidCollector()
     {
         $loader = (new Definition())
-            ->addTag('translation.loader', array('alias' => 'xliff', 'legacy-alias' => 'xlf'));
+            ->addTag('translation.loader', ['alias' => 'xliff', 'legacy-alias' => 'xlf']);
 
         $reader = new Definition();
 
         $translator = (new Definition())
-            ->setArguments(array(null, null, null, null));
+            ->setArguments([null, null, null, null]);
 
         $container = new ContainerBuilder();
         $container->setDefinition('translator.default', $translator);
@@ -39,19 +39,19 @@ public function testValidCollector()
         $pass->process($container);
 
         $expectedReader = (new Definition())
-            ->addMethodCall('addLoader', array('xliff', new Reference('translation.xliff_loader')))
-            ->addMethodCall('addLoader', array('xlf', new Reference('translation.xliff_loader')))
+            ->addMethodCall('addLoader', ['xliff', new Reference('translation.xliff_loader')])
+            ->addMethodCall('addLoader', ['xlf', new Reference('translation.xliff_loader')])
         ;
         $this->assertEquals($expectedReader, $reader);
 
         $expectedLoader = (new Definition())
-            ->addTag('translation.loader', array('alias' => 'xliff', 'legacy-alias' => 'xlf'))
+            ->addTag('translation.loader', ['alias' => 'xliff', 'legacy-alias' => 'xlf'])
         ;
         $this->assertEquals($expectedLoader, $loader);
 
-        $this->assertSame(array('translation.xliff_loader' => array('xliff', 'xlf')), $translator->getArgument(3));
+        $this->assertSame(['translation.xliff_loader' => ['xliff', 'xlf']], $translator->getArgument(3));
 
-        $expected = array('translation.xliff_loader' => new ServiceClosureArgument(new Reference('translation.xliff_loader')));
+        $expected = ['translation.xliff_loader' => new ServiceClosureArgument(new Reference('translation.xliff_loader'))];
         $this->assertEquals($expected, $container->getDefinition((string) $translator->getArgument(0))->getArgument(0));
     }
 
diff --git a/src/Symfony/Component/Translation/Tests/Dumper/CsvFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/CsvFileDumperTest.php
index 9a7a059a4e823..0d1cf2c628651 100644
--- a/src/Symfony/Component/Translation/Tests/Dumper/CsvFileDumperTest.php
+++ b/src/Symfony/Component/Translation/Tests/Dumper/CsvFileDumperTest.php
@@ -20,8 +20,8 @@ class CsvFileDumperTest extends TestCase
     public function testFormatCatalogue()
     {
         $catalogue = new MessageCatalogue('en');
-        $catalogue->add(array('foo' => 'bar', 'bar' => 'foo
-foo', 'foo;foo' => 'bar'));
+        $catalogue->add(['foo' => 'bar', 'bar' => 'foo
+foo', 'foo;foo' => 'bar']);
 
         $dumper = new CsvFileDumper();
 
diff --git a/src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php
index bac567fd5fb7f..dcd9d8cbde636 100644
--- a/src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php
+++ b/src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php
@@ -22,10 +22,10 @@ public function testDump()
         $tempDir = sys_get_temp_dir();
 
         $catalogue = new MessageCatalogue('en');
-        $catalogue->add(array('foo' => 'bar'));
+        $catalogue->add(['foo' => 'bar']);
 
         $dumper = new ConcreteFileDumper();
-        $dumper->dump($catalogue, array('path' => $tempDir));
+        $dumper->dump($catalogue, ['path' => $tempDir]);
 
         $this->assertFileExists($tempDir.'/messages.en.concrete');
 
@@ -62,11 +62,11 @@ public function testDumpCreatesNestedDirectoriesAndFile()
         $file = $translationsDir.'/messages.en.concrete';
 
         $catalogue = new MessageCatalogue('en');
-        $catalogue->add(array('foo' => 'bar'));
+        $catalogue->add(['foo' => 'bar']);
 
         $dumper = new ConcreteFileDumper();
         $dumper->setRelativePathTemplate('test/translations/%domain%.%locale%.%extension%');
-        $dumper->dump($catalogue, array('path' => $tempDir));
+        $dumper->dump($catalogue, ['path' => $tempDir]);
 
         $this->assertFileExists($file);
 
@@ -77,7 +77,7 @@ public function testDumpCreatesNestedDirectoriesAndFile()
 
 class ConcreteFileDumper extends FileDumper
 {
-    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
+    public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = [])
     {
         return '';
     }
diff --git a/src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
index 78d0abb6e4e1c..dcb9c2c38f78b 100644
--- a/src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
+++ b/src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
@@ -20,7 +20,7 @@ class IcuResFileDumperTest extends TestCase
     public function testFormatCatalogue()
     {
         $catalogue = new MessageCatalogue('en');
-        $catalogue->add(array('foo' => 'bar'));
+        $catalogue->add(['foo' => 'bar']);
 
         $dumper = new IcuResFileDumper();
 
diff --git a/src/Symfony/Component/Translation/Tests/Dumper/IniFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/IniFileDumperTest.php
index 5f3c1236c7f50..1ed168bdc3a12 100644
--- a/src/Symfony/Component/Translation/Tests/Dumper/IniFileDumperTest.php
+++ b/src/Symfony/Component/Translation/Tests/Dumper/IniFileDumperTest.php
@@ -20,7 +20,7 @@ class IniFileDumperTest extends TestCase
     public function testFormatCatalogue()
     {
         $catalogue = new MessageCatalogue('en');
-        $catalogue->add(array('foo' => 'bar'));
+        $catalogue->add(['foo' => 'bar']);
 
         $dumper = new IniFileDumper();
 
diff --git a/src/Symfony/Component/Translation/Tests/Dumper/JsonFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/JsonFileDumperTest.php
index b134ce4f23149..04e3d86bec4cb 100644
--- a/src/Symfony/Component/Translation/Tests/Dumper/JsonFileDumperTest.php
+++ b/src/Symfony/Component/Translation/Tests/Dumper/JsonFileDumperTest.php
@@ -20,7 +20,7 @@ class JsonFileDumperTest extends TestCase
     public function testFormatCatalogue()
     {
         $catalogue = new MessageCatalogue('en');
-        $catalogue->add(array('foo' => 'bar'));
+        $catalogue->add(['foo' => 'bar']);
 
         $dumper = new JsonFileDumper();
 
@@ -30,10 +30,10 @@ public function testFormatCatalogue()
     public function testDumpWithCustomEncoding()
     {
         $catalogue = new MessageCatalogue('en');
-        $catalogue->add(array('foo' => '"bar"'));
+        $catalogue->add(['foo' => '"bar"']);
 
         $dumper = new JsonFileDumper();
 
-        $this->assertStringEqualsFile(__DIR__.'/../fixtures/resources.dump.json', $dumper->formatCatalogue($catalogue, 'messages', array('json_encoding' => JSON_HEX_QUOT)));
+        $this->assertStringEqualsFile(__DIR__.'/../fixtures/resources.dump.json', $dumper->formatCatalogue($catalogue, 'messages', ['json_encoding' => JSON_HEX_QUOT]));
     }
 }
diff --git a/src/Symfony/Component/Translation/Tests/Dumper/MoFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/MoFileDumperTest.php
index d0519675bc401..fbbd75dc3b490 100644
--- a/src/Symfony/Component/Translation/Tests/Dumper/MoFileDumperTest.php
+++ b/src/Symfony/Component/Translation/Tests/Dumper/MoFileDumperTest.php
@@ -20,7 +20,7 @@ class MoFileDumperTest extends TestCase
     public function testFormatCatalogue()
     {
         $catalogue = new MessageCatalogue('en');
-        $catalogue->add(array('foo' => 'bar'));
+        $catalogue->add(['foo' => 'bar']);
 
         $dumper = new MoFileDumper();
 
diff --git a/src/Symfony/Component/Translation/Tests/Dumper/PhpFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/PhpFileDumperTest.php
index 22a39dd43d73d..00e535da391cd 100644
--- a/src/Symfony/Component/Translation/Tests/Dumper/PhpFileDumperTest.php
+++ b/src/Symfony/Component/Translation/Tests/Dumper/PhpFileDumperTest.php
@@ -20,7 +20,7 @@ class PhpFileDumperTest extends TestCase
     public function testFormatCatalogue()
     {
         $catalogue = new MessageCatalogue('en');
-        $catalogue->add(array('foo' => 'bar'));
+        $catalogue->add(['foo' => 'bar']);
 
         $dumper = new PhpFileDumper();
 
diff --git a/src/Symfony/Component/Translation/Tests/Dumper/PoFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/PoFileDumperTest.php
index 5d75247103d80..d694a6dd3fb11 100644
--- a/src/Symfony/Component/Translation/Tests/Dumper/PoFileDumperTest.php
+++ b/src/Symfony/Component/Translation/Tests/Dumper/PoFileDumperTest.php
@@ -20,7 +20,7 @@ class PoFileDumperTest extends TestCase
     public function testFormatCatalogue()
     {
         $catalogue = new MessageCatalogue('en');
-        $catalogue->add(array('foo' => 'bar'));
+        $catalogue->add(['foo' => 'bar']);
 
         $dumper = new PoFileDumper();
 
diff --git a/src/Symfony/Component/Translation/Tests/Dumper/QtFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/QtFileDumperTest.php
index 8e4a6f43fcf67..edfad6005cb71 100644
--- a/src/Symfony/Component/Translation/Tests/Dumper/QtFileDumperTest.php
+++ b/src/Symfony/Component/Translation/Tests/Dumper/QtFileDumperTest.php
@@ -20,7 +20,7 @@ class QtFileDumperTest extends TestCase
     public function testFormatCatalogue()
     {
         $catalogue = new MessageCatalogue('en');
-        $catalogue->add(array('foo' => 'bar'), 'resources');
+        $catalogue->add(['foo' => 'bar'], 'resources');
 
         $dumper = new QtFileDumper();
 
diff --git a/src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php
index 443dccf2bcdc0..c634a27936711 100644
--- a/src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php
+++ b/src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php
@@ -20,49 +20,49 @@ class XliffFileDumperTest extends TestCase
     public function testFormatCatalogue()
     {
         $catalogue = new MessageCatalogue('en_US');
-        $catalogue->add(array(
+        $catalogue->add([
             'foo' => 'bar',
             'key' => '',
             'key.with.cdata' => '<source> & <target>',
-        ));
-        $catalogue->setMetadata('foo', array('notes' => array(array('priority' => 1, 'from' => 'bar', 'content' => 'baz'))));
-        $catalogue->setMetadata('key', array('notes' => array(array('content' => 'baz'), array('content' => 'qux'))));
+        ]);
+        $catalogue->setMetadata('foo', ['notes' => [['priority' => 1, 'from' => 'bar', 'content' => 'baz']]]);
+        $catalogue->setMetadata('key', ['notes' => [['content' => 'baz'], ['content' => 'qux']]]);
 
         $dumper = new XliffFileDumper();
 
         $this->assertStringEqualsFile(
             __DIR__.'/../fixtures/resources-clean.xlf',
-            $dumper->formatCatalogue($catalogue, 'messages', array('default_locale' => 'fr_FR'))
+            $dumper->formatCatalogue($catalogue, 'messages', ['default_locale' => 'fr_FR'])
         );
     }
 
     public function testFormatCatalogueXliff2()
     {
         $catalogue = new MessageCatalogue('en_US');
-        $catalogue->add(array(
+        $catalogue->add([
             'foo' => 'bar',
             'key' => '',
             'key.with.cdata' => '<source> & <target>',
-        ));
-        $catalogue->setMetadata('key', array('target-attributes' => array('order' => 1)));
+        ]);
+        $catalogue->setMetadata('key', ['target-attributes' => ['order' => 1]]);
 
         $dumper = new XliffFileDumper();
 
         $this->assertStringEqualsFile(
             __DIR__.'/../fixtures/resources-2.0-clean.xlf',
-            $dumper->formatCatalogue($catalogue, 'messages', array('default_locale' => 'fr_FR', 'xliff_version' => '2.0'))
+            $dumper->formatCatalogue($catalogue, 'messages', ['default_locale' => 'fr_FR', 'xliff_version' => '2.0'])
         );
     }
 
     public function testFormatCatalogueWithCustomToolInfo()
     {
-        $options = array(
+        $options = [
             'default_locale' => 'en_US',
-            'tool_info' => array('tool-id' => 'foo', 'tool-name' => 'foo', 'tool-version' => '0.0', 'tool-company' => 'Foo'),
-        );
+            'tool_info' => ['tool-id' => 'foo', 'tool-name' => 'foo', 'tool-version' => '0.0', 'tool-company' => 'Foo'],
+        ];
 
         $catalogue = new MessageCatalogue('en_US');
-        $catalogue->add(array('foo' => 'bar'));
+        $catalogue->add(['foo' => 'bar']);
 
         $dumper = new XliffFileDumper();
 
@@ -75,41 +75,41 @@ public function testFormatCatalogueWithCustomToolInfo()
     public function testFormatCatalogueWithTargetAttributesMetadata()
     {
         $catalogue = new MessageCatalogue('en_US');
-        $catalogue->add(array(
+        $catalogue->add([
             'foo' => 'bar',
-        ));
-        $catalogue->setMetadata('foo', array('target-attributes' => array('state' => 'needs-translation')));
+        ]);
+        $catalogue->setMetadata('foo', ['target-attributes' => ['state' => 'needs-translation']]);
 
         $dumper = new XliffFileDumper();
 
         $this->assertStringEqualsFile(
             __DIR__.'/../fixtures/resources-target-attributes.xlf',
-            $dumper->formatCatalogue($catalogue, 'messages', array('default_locale' => 'fr_FR'))
+            $dumper->formatCatalogue($catalogue, 'messages', ['default_locale' => 'fr_FR'])
         );
     }
 
     public function testFormatCatalogueWithNotesMetadata()
     {
         $catalogue = new MessageCatalogue('en_US');
-        $catalogue->add(array(
+        $catalogue->add([
             'foo' => 'bar',
             'baz' => 'biz',
-        ));
-        $catalogue->setMetadata('foo', array('notes' => array(
-            array('category' => 'state', 'content' => 'new'),
-            array('category' => 'approved', 'content' => 'true'),
-            array('category' => 'section', 'content' => 'user login', 'priority' => '1'),
-        )));
-        $catalogue->setMetadata('baz', array('notes' => array(
-            array('id' => 'x', 'content' => 'x_content'),
-            array('appliesTo' => 'target', 'category' => 'quality', 'content' => 'Fuzzy'),
-        )));
+        ]);
+        $catalogue->setMetadata('foo', ['notes' => [
+            ['category' => 'state', 'content' => 'new'],
+            ['category' => 'approved', 'content' => 'true'],
+            ['category' => 'section', 'content' => 'user login', 'priority' => '1'],
+        ]]);
+        $catalogue->setMetadata('baz', ['notes' => [
+            ['id' => 'x', 'content' => 'x_content'],
+            ['appliesTo' => 'target', 'category' => 'quality', 'content' => 'Fuzzy'],
+        ]]);
 
         $dumper = new XliffFileDumper();
 
         $this->assertStringEqualsFile(
             __DIR__.'/../fixtures/resources-notes-meta.xlf',
-            $dumper->formatCatalogue($catalogue, 'messages', array('default_locale' => 'fr_FR', 'xliff_version' => '2.0'))
+            $dumper->formatCatalogue($catalogue, 'messages', ['default_locale' => 'fr_FR', 'xliff_version' => '2.0'])
         );
     }
 }
diff --git a/src/Symfony/Component/Translation/Tests/Dumper/YamlFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/YamlFileDumperTest.php
index a5549a2e93007..24bc65ba248fb 100644
--- a/src/Symfony/Component/Translation/Tests/Dumper/YamlFileDumperTest.php
+++ b/src/Symfony/Component/Translation/Tests/Dumper/YamlFileDumperTest.php
@@ -21,24 +21,24 @@ public function testTreeFormatCatalogue()
     {
         $catalogue = new MessageCatalogue('en');
         $catalogue->add(
-            array(
+            [
                 'foo.bar1' => 'value1',
                 'foo.bar2' => 'value2',
-            ));
+            ]);
 
         $dumper = new YamlFileDumper();
 
-        $this->assertStringEqualsFile(__DIR__.'/../fixtures/messages.yml', $dumper->formatCatalogue($catalogue, 'messages', array('as_tree' => true, 'inline' => 999)));
+        $this->assertStringEqualsFile(__DIR__.'/../fixtures/messages.yml', $dumper->formatCatalogue($catalogue, 'messages', ['as_tree' => true, 'inline' => 999]));
     }
 
     public function testLinearFormatCatalogue()
     {
         $catalogue = new MessageCatalogue('en');
         $catalogue->add(
-            array(
+            [
                 'foo.bar1' => 'value1',
                 'foo.bar2' => 'value2',
-            ));
+            ]);
 
         $dumper = new YamlFileDumper();
 
diff --git a/src/Symfony/Component/Translation/Tests/Extractor/PhpExtractorTest.php b/src/Symfony/Component/Translation/Tests/Extractor/PhpExtractorTest.php
index 3487dd62489ee..f6a17d00c0f68 100644
--- a/src/Symfony/Component/Translation/Tests/Extractor/PhpExtractorTest.php
+++ b/src/Symfony/Component/Translation/Tests/Extractor/PhpExtractorTest.php
@@ -39,8 +39,8 @@ public function testExtraction($resource)
 nowdoc key with whitespace and nonescaped \$\n sequences
 EOF;
         // Assert
-        $expectedCatalogue = array(
-            'messages' => array(
+        $expectedCatalogue = [
+            'messages' => [
                 'single-quoted key' => 'prefixsingle-quoted key',
                 'double-quoted key' => 'prefixdouble-quoted key',
                 'heredoc key' => 'prefixheredoc key',
@@ -51,8 +51,8 @@ public function testExtraction($resource)
                 $expectedHeredoc => 'prefix'.$expectedHeredoc,
                 $expectedNowdoc => 'prefix'.$expectedNowdoc,
                 '{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples' => 'prefix{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples',
-            ),
-            'not_messages' => array(
+            ],
+            'not_messages' => [
                 'other-domain-test-no-params-short-array' => 'prefixother-domain-test-no-params-short-array',
                 'other-domain-test-no-params-long-array' => 'prefixother-domain-test-no-params-long-array',
                 'other-domain-test-params-short-array' => 'prefixother-domain-test-params-short-array',
@@ -62,8 +62,8 @@ public function testExtraction($resource)
                 'typecast' => 'prefixtypecast',
                 'msg1' => 'prefixmsg1',
                 'msg2' => 'prefixmsg2',
-            ),
-        );
+            ],
+        ];
         $actualCatalogue = $catalogue->all();
 
         $this->assertEquals($expectedCatalogue, $actualCatalogue);
@@ -72,7 +72,7 @@ public function testExtraction($resource)
     public function resourcesProvider()
     {
         $directory = __DIR__.'/../fixtures/extractor/';
-        $splFiles = array();
+        $splFiles = [];
         foreach (new \DirectoryIterator($directory) as $fileInfo) {
             if ($fileInfo->isDot()) {
                 continue;
@@ -83,13 +83,13 @@ public function resourcesProvider()
             $splFiles[] = $fileInfo->getFileInfo();
         }
 
-        return array(
-            array($directory),
-            array($phpFile),
-            array(glob($directory.'*')),
-            array($splFiles),
-            array(new \ArrayObject(glob($directory.'*'))),
-            array(new \ArrayObject($splFiles)),
-        );
+        return [
+            [$directory],
+            [$phpFile],
+            [glob($directory.'*')],
+            [$splFiles],
+            [new \ArrayObject(glob($directory.'*'))],
+            [new \ArrayObject($splFiles)],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Translation/Tests/Formatter/MessageFormatterTest.php b/src/Symfony/Component/Translation/Tests/Formatter/MessageFormatterTest.php
index 1fa736e7e3df4..17b815d306eed 100644
--- a/src/Symfony/Component/Translation/Tests/Formatter/MessageFormatterTest.php
+++ b/src/Symfony/Component/Translation/Tests/Formatter/MessageFormatterTest.php
@@ -19,7 +19,7 @@ class MessageFormatterTest extends TestCase
     /**
      * @dataProvider getTransMessages
      */
-    public function testFormat($expected, $message, $parameters = array())
+    public function testFormat($expected, $message, $parameters = [])
     {
         $this->assertEquals($expected, $this->getMessageFormatter()->format($message, 'en', $parameters));
     }
@@ -34,45 +34,45 @@ public function testFormatPlural($expected, $message, $number, $parameters)
 
     public function getTransMessages()
     {
-        return array(
-            array(
+        return [
+            [
                 'There is one apple',
                 'There is one apple',
-            ),
-            array(
+            ],
+            [
                 'There are 5 apples',
                 'There are %count% apples',
-                array('%count%' => 5),
-            ),
-            array(
+                ['%count%' => 5],
+            ],
+            [
                 'There are 5 apples',
                 'There are {{count}} apples',
-                array('{{count}}' => 5),
-            ),
-        );
+                ['{{count}}' => 5],
+            ],
+        ];
     }
 
     public function getTransChoiceMessages()
     {
-        return array(
-            array('Il y a 0 pomme', '[0,1] Il y a %count% pomme|]1,Inf] Il y a %count% pommes', 0, array('%count%' => 0)),
-            array('Il y a 1 pomme', '[0,1] Il y a %count% pomme|]1,Inf] Il y a %count% pommes', 1, array('%count%' => 1)),
-            array('Il y a 10 pommes', '[0,1] Il y a %count% pomme|]1,Inf] Il y a %count% pommes', 10, array('%count%' => 10)),
+        return [
+            ['Il y a 0 pomme', '[0,1] Il y a %count% pomme|]1,Inf] Il y a %count% pommes', 0, ['%count%' => 0]],
+            ['Il y a 1 pomme', '[0,1] Il y a %count% pomme|]1,Inf] Il y a %count% pommes', 1, ['%count%' => 1]],
+            ['Il y a 10 pommes', '[0,1] Il y a %count% pomme|]1,Inf] Il y a %count% pommes', 10, ['%count%' => 10]],
 
-            array('Il y a 0 pomme', 'Il y a %count% pomme|Il y a %count% pommes', 0, array('%count%' => 0)),
-            array('Il y a 1 pomme', 'Il y a %count% pomme|Il y a %count% pommes', 1, array('%count%' => 1)),
-            array('Il y a 10 pommes', 'Il y a %count% pomme|Il y a %count% pommes', 10, array('%count%' => 10)),
+            ['Il y a 0 pomme', 'Il y a %count% pomme|Il y a %count% pommes', 0, ['%count%' => 0]],
+            ['Il y a 1 pomme', 'Il y a %count% pomme|Il y a %count% pommes', 1, ['%count%' => 1]],
+            ['Il y a 10 pommes', 'Il y a %count% pomme|Il y a %count% pommes', 10, ['%count%' => 10]],
 
-            array('Il y a 0 pomme', 'one: Il y a %count% pomme|more: Il y a %count% pommes', 0, array('%count%' => 0)),
-            array('Il y a 1 pomme', 'one: Il y a %count% pomme|more: Il y a %count% pommes', 1, array('%count%' => 1)),
-            array('Il y a 10 pommes', 'one: Il y a %count% pomme|more: Il y a %count% pommes', 10, array('%count%' => 10)),
+            ['Il y a 0 pomme', 'one: Il y a %count% pomme|more: Il y a %count% pommes', 0, ['%count%' => 0]],
+            ['Il y a 1 pomme', 'one: Il y a %count% pomme|more: Il y a %count% pommes', 1, ['%count%' => 1]],
+            ['Il y a 10 pommes', 'one: Il y a %count% pomme|more: Il y a %count% pommes', 10, ['%count%' => 10]],
 
-            array('Il n\'y a aucune pomme', '{0} Il n\'y a aucune pomme|one: Il y a %count% pomme|more: Il y a %count% pommes', 0, array('%count%' => 0)),
-            array('Il y a 1 pomme', '{0} Il n\'y a aucune pomme|one: Il y a %count% pomme|more: Il y a %count% pommes', 1, array('%count%' => 1)),
-            array('Il y a 10 pommes', '{0} Il n\'y a aucune pomme|one: Il y a %count% pomme|more: Il y a %count% pommes', 10, array('%count%' => 10)),
+            ['Il n\'y a aucune pomme', '{0} Il n\'y a aucune pomme|one: Il y a %count% pomme|more: Il y a %count% pommes', 0, ['%count%' => 0]],
+            ['Il y a 1 pomme', '{0} Il n\'y a aucune pomme|one: Il y a %count% pomme|more: Il y a %count% pommes', 1, ['%count%' => 1]],
+            ['Il y a 10 pommes', '{0} Il n\'y a aucune pomme|one: Il y a %count% pomme|more: Il y a %count% pommes', 10, ['%count%' => 10]],
 
-            array('Il y a 0 pomme', '[0,1] Il y a %count% pomme|]1,Inf] Il y a %count% pommes', 0, array('%count%' => 0)),
-        );
+            ['Il y a 0 pomme', '[0,1] Il y a %count% pomme|]1,Inf] Il y a %count% pommes', 0, ['%count%' => 0]],
+        ];
     }
 
     private function getMessageFormatter()
diff --git a/src/Symfony/Component/Translation/Tests/IntervalTest.php b/src/Symfony/Component/Translation/Tests/IntervalTest.php
index 99b209a70825d..8da3bb151722a 100644
--- a/src/Symfony/Component/Translation/Tests/IntervalTest.php
+++ b/src/Symfony/Component/Translation/Tests/IntervalTest.php
@@ -34,16 +34,16 @@ public function testTestException()
 
     public function getTests()
     {
-        return array(
-            array(true, 3, '{1,2, 3 ,4}'),
-            array(false, 10, '{1,2, 3 ,4}'),
-            array(false, 3, '[1,2]'),
-            array(true, 1, '[1,2]'),
-            array(true, 2, '[1,2]'),
-            array(false, 1, ']1,2['),
-            array(false, 2, ']1,2['),
-            array(true, log(0), '[-Inf,2['),
-            array(true, -log(0), '[-2,+Inf]'),
-        );
+        return [
+            [true, 3, '{1,2, 3 ,4}'],
+            [false, 10, '{1,2, 3 ,4}'],
+            [false, 3, '[1,2]'],
+            [true, 1, '[1,2]'],
+            [true, 2, '[1,2]'],
+            [false, 1, ']1,2['],
+            [false, 2, ']1,2['],
+            [true, log(0), '[-Inf,2['],
+            [true, -log(0), '[-2,+Inf]'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Translation/Tests/Loader/CsvFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/CsvFileLoaderTest.php
index 29efdef00d96c..4fd5752db222b 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/CsvFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/CsvFileLoaderTest.php
@@ -23,9 +23,9 @@ public function testLoad()
         $resource = __DIR__.'/../fixtures/resources.csv';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
-        $this->assertEquals(array('foo' => 'bar'), $catalogue->all('domain1'));
+        $this->assertEquals(['foo' => 'bar'], $catalogue->all('domain1'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 
     public function testLoadDoesNothingIfEmpty()
@@ -34,9 +34,9 @@ public function testLoadDoesNothingIfEmpty()
         $resource = __DIR__.'/../fixtures/empty.csv';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
-        $this->assertEquals(array(), $catalogue->all('domain1'));
+        $this->assertEquals([], $catalogue->all('domain1'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/Tests/Loader/IcuDatFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/IcuDatFileLoaderTest.php
index e28db60135e44..601680af8afd1 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/IcuDatFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/IcuDatFileLoaderTest.php
@@ -37,9 +37,9 @@ public function testDatEnglishLoad()
         $resource = __DIR__.'/../fixtures/resourcebundle/dat/resources';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
-        $this->assertEquals(array('symfony' => 'Symfony 2 is great'), $catalogue->all('domain1'));
+        $this->assertEquals(['symfony' => 'Symfony 2 is great'], $catalogue->all('domain1'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource.'.dat')), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource.'.dat')], $catalogue->getResources());
     }
 
     public function testDatFrenchLoad()
@@ -48,9 +48,9 @@ public function testDatFrenchLoad()
         $resource = __DIR__.'/../fixtures/resourcebundle/dat/resources';
         $catalogue = $loader->load($resource, 'fr', 'domain1');
 
-        $this->assertEquals(array('symfony' => 'Symfony 2 est génial'), $catalogue->all('domain1'));
+        $this->assertEquals(['symfony' => 'Symfony 2 est génial'], $catalogue->all('domain1'));
         $this->assertEquals('fr', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource.'.dat')), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource.'.dat')], $catalogue->getResources());
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/Tests/Loader/IcuResFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/IcuResFileLoaderTest.php
index 92d8933c8e7e3..962c3af2efeb2 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/IcuResFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/IcuResFileLoaderTest.php
@@ -26,9 +26,9 @@ public function testLoad()
         $resource = __DIR__.'/../fixtures/resourcebundle/res';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
-        $this->assertEquals(array('foo' => 'bar'), $catalogue->all('domain1'));
+        $this->assertEquals(['foo' => 'bar'], $catalogue->all('domain1'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new DirectoryResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new DirectoryResource($resource)], $catalogue->getResources());
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/Tests/Loader/IniFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/IniFileLoaderTest.php
index d9dcc5e8f015e..e0d8b2f4c4a09 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/IniFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/IniFileLoaderTest.php
@@ -23,9 +23,9 @@ public function testLoad()
         $resource = __DIR__.'/../fixtures/resources.ini';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
-        $this->assertEquals(array('foo' => 'bar'), $catalogue->all('domain1'));
+        $this->assertEquals(['foo' => 'bar'], $catalogue->all('domain1'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 
     public function testLoadDoesNothingIfEmpty()
@@ -34,9 +34,9 @@ public function testLoadDoesNothingIfEmpty()
         $resource = __DIR__.'/../fixtures/empty.ini';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
-        $this->assertEquals(array(), $catalogue->all('domain1'));
+        $this->assertEquals([], $catalogue->all('domain1'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/Tests/Loader/JsonFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/JsonFileLoaderTest.php
index cea0aef4bb2f4..4c507da5abdfc 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/JsonFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/JsonFileLoaderTest.php
@@ -23,9 +23,9 @@ public function testLoad()
         $resource = __DIR__.'/../fixtures/resources.json';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
-        $this->assertEquals(array('foo' => 'bar'), $catalogue->all('domain1'));
+        $this->assertEquals(['foo' => 'bar'], $catalogue->all('domain1'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 
     public function testLoadDoesNothingIfEmpty()
@@ -34,9 +34,9 @@ public function testLoadDoesNothingIfEmpty()
         $resource = __DIR__.'/../fixtures/empty.json';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
-        $this->assertEquals(array(), $catalogue->all('domain1'));
+        $this->assertEquals([], $catalogue->all('domain1'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/Tests/Loader/MoFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/MoFileLoaderTest.php
index 6ad3d44d2144e..63de5cebaa4dc 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/MoFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/MoFileLoaderTest.php
@@ -23,9 +23,9 @@ public function testLoad()
         $resource = __DIR__.'/../fixtures/resources.mo';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
-        $this->assertEquals(array('foo' => 'bar'), $catalogue->all('domain1'));
+        $this->assertEquals(['foo' => 'bar'], $catalogue->all('domain1'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 
     public function testLoadPlurals()
@@ -34,9 +34,9 @@ public function testLoadPlurals()
         $resource = __DIR__.'/../fixtures/plurals.mo';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
-        $this->assertEquals(array('foo' => 'bar', 'foos' => '{0} bar|{1} bars'), $catalogue->all('domain1'));
+        $this->assertEquals(['foo' => 'bar', 'foos' => '{0} bar|{1} bars'], $catalogue->all('domain1'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 
     /**
@@ -65,8 +65,8 @@ public function testLoadEmptyTranslation()
         $resource = __DIR__.'/../fixtures/empty-translation.mo';
         $catalogue = $loader->load($resource, 'en', 'message');
 
-        $this->assertEquals(array(), $catalogue->all('message'));
+        $this->assertEquals([], $catalogue->all('message'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 }
diff --git a/src/Symfony/Component/Translation/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/PhpFileLoaderTest.php
index 01b7a5feab726..68cb2d0b72b51 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/PhpFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/PhpFileLoaderTest.php
@@ -23,9 +23,9 @@ public function testLoad()
         $resource = __DIR__.'/../fixtures/resources.php';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
-        $this->assertEquals(array('foo' => 'bar'), $catalogue->all('domain1'));
+        $this->assertEquals(['foo' => 'bar'], $catalogue->all('domain1'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php
index 4176cb7ffcc9e..4bf2ee6545b6f 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php
@@ -23,9 +23,9 @@ public function testLoad()
         $resource = __DIR__.'/../fixtures/resources.po';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
-        $this->assertEquals(array('foo' => 'bar'), $catalogue->all('domain1'));
+        $this->assertEquals(['foo' => 'bar'], $catalogue->all('domain1'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 
     public function testLoadPlurals()
@@ -34,9 +34,9 @@ public function testLoadPlurals()
         $resource = __DIR__.'/../fixtures/plurals.po';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
-        $this->assertEquals(array('foo' => 'bar', 'foos' => 'bar|bars'), $catalogue->all('domain1'));
+        $this->assertEquals(['foo' => 'bar', 'foos' => 'bar|bars'], $catalogue->all('domain1'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 
     public function testLoadDoesNothingIfEmpty()
@@ -45,9 +45,9 @@ public function testLoadDoesNothingIfEmpty()
         $resource = __DIR__.'/../fixtures/empty.po';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
-        $this->assertEquals(array(), $catalogue->all('domain1'));
+        $this->assertEquals([], $catalogue->all('domain1'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 
     /**
@@ -66,9 +66,9 @@ public function testLoadEmptyTranslation()
         $resource = __DIR__.'/../fixtures/empty-translation.po';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
-        $this->assertEquals(array('foo' => ''), $catalogue->all('domain1'));
+        $this->assertEquals(['foo' => ''], $catalogue->all('domain1'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 
     public function testEscapedId()
diff --git a/src/Symfony/Component/Translation/Tests/Loader/QtFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/QtFileLoaderTest.php
index 8a00fdedcf155..08f55e9022b89 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/QtFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/QtFileLoaderTest.php
@@ -23,9 +23,9 @@ public function testLoad()
         $resource = __DIR__.'/../fixtures/resources.ts';
         $catalogue = $loader->load($resource, 'en', 'resources');
 
-        $this->assertEquals(array('foo' => 'bar'), $catalogue->all('resources'));
+        $this->assertEquals(['foo' => 'bar'], $catalogue->all('resources'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
index c6958486c1206..7cb9f54fde2e2 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
@@ -24,8 +24,8 @@ public function testLoad()
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
-        $this->assertSame(array(), libxml_get_errors());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
+        $this->assertSame([], libxml_get_errors());
         $this->assertContainsOnly('string', $catalogue->all('domain1'));
     }
 
@@ -33,15 +33,15 @@ public function testLoadWithInternalErrorsEnabled()
     {
         $internalErrors = libxml_use_internal_errors(true);
 
-        $this->assertSame(array(), libxml_get_errors());
+        $this->assertSame([], libxml_get_errors());
 
         $loader = new XliffFileLoader();
         $resource = __DIR__.'/../fixtures/resources.xlf';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
-        $this->assertSame(array(), libxml_get_errors());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
+        $this->assertSame([], libxml_get_errors());
 
         libxml_clear_errors();
         libxml_use_internal_errors($internalErrors);
@@ -58,7 +58,7 @@ public function testLoadWithExternalEntitiesDisabled()
         libxml_disable_entity_loader($disableEntities);
 
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 
     public function testLoadWithResname()
@@ -66,7 +66,7 @@ public function testLoadWithResname()
         $loader = new XliffFileLoader();
         $catalogue = $loader->load(__DIR__.'/../fixtures/resname.xlf', 'en', 'domain1');
 
-        $this->assertEquals(array('foo' => 'bar', 'bar' => 'baz', 'baz' => 'foo', 'qux' => 'qux source'), $catalogue->all('domain1'));
+        $this->assertEquals(['foo' => 'bar', 'bar' => 'baz', 'baz' => 'foo', 'qux' => 'qux source'], $catalogue->all('domain1'));
     }
 
     public function testIncompleteResource()
@@ -74,7 +74,7 @@ public function testIncompleteResource()
         $loader = new XliffFileLoader();
         $catalogue = $loader->load(__DIR__.'/../fixtures/resources.xlf', 'en', 'domain1');
 
-        $this->assertEquals(array('foo' => 'bar', 'extra' => 'extra', 'key' => '', 'test' => 'with'), $catalogue->all('domain1'));
+        $this->assertEquals(['foo' => 'bar', 'extra' => 'extra', 'key' => '', 'test' => 'with'], $catalogue->all('domain1'));
     }
 
     public function testEncoding()
@@ -84,7 +84,7 @@ public function testEncoding()
 
         $this->assertEquals(utf8_decode('föö'), $catalogue->get('bar', 'domain1'));
         $this->assertEquals(utf8_decode('bär'), $catalogue->get('foo', 'domain1'));
-        $this->assertEquals(array('notes' => array(array('content' => utf8_decode('bäz'))), 'id' => '1'), $catalogue->getMetadata('foo', 'domain1'));
+        $this->assertEquals(['notes' => [['content' => utf8_decode('bäz')]], 'id' => '1'], $catalogue->getMetadata('foo', 'domain1'));
     }
 
     public function testTargetAttributesAreStoredCorrectly()
@@ -164,11 +164,11 @@ public function testLoadNotes()
         $loader = new XliffFileLoader();
         $catalogue = $loader->load(__DIR__.'/../fixtures/withnote.xlf', 'en', 'domain1');
 
-        $this->assertEquals(array('notes' => array(array('priority' => 1, 'content' => 'foo')), 'id' => '1'), $catalogue->getMetadata('foo', 'domain1'));
+        $this->assertEquals(['notes' => [['priority' => 1, 'content' => 'foo']], 'id' => '1'], $catalogue->getMetadata('foo', 'domain1'));
         // message without target
-        $this->assertEquals(array('notes' => array(array('content' => 'bar', 'from' => 'foo')), 'id' => '2'), $catalogue->getMetadata('extra', 'domain1'));
+        $this->assertEquals(['notes' => [['content' => 'bar', 'from' => 'foo']], 'id' => '2'], $catalogue->getMetadata('extra', 'domain1'));
         // message with empty target
-        $this->assertEquals(array('notes' => array(array('content' => 'baz'), array('priority' => 2, 'from' => 'bar', 'content' => 'qux')), 'id' => '123'), $catalogue->getMetadata('key', 'domain1'));
+        $this->assertEquals(['notes' => [['content' => 'baz'], ['priority' => 2, 'from' => 'bar', 'content' => 'qux']], 'id' => '123'], $catalogue->getMetadata('key', 'domain1'));
     }
 
     public function testLoadVersion2()
@@ -178,15 +178,15 @@ public function testLoadVersion2()
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
-        $this->assertSame(array(), libxml_get_errors());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
+        $this->assertSame([], libxml_get_errors());
 
         $domains = $catalogue->all();
         $this->assertCount(3, $domains['domain1']);
         $this->assertContainsOnly('string', $catalogue->all('domain1'));
 
         // target attributes
-        $this->assertEquals(array('target-attributes' => array('order' => 1)), $catalogue->getMetadata('bar', 'domain1'));
+        $this->assertEquals(['target-attributes' => ['order' => 1]], $catalogue->getMetadata('bar', 'domain1'));
     }
 
     public function testLoadVersion2WithNoteMeta()
@@ -196,8 +196,8 @@ public function testLoadVersion2WithNoteMeta()
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
-        $this->assertSame(array(), libxml_get_errors());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
+        $this->assertSame([], libxml_get_errors());
 
         // test for "foo" metadata
         $this->assertTrue($catalogue->defines('foo', 'domain1'));
@@ -236,7 +236,7 @@ public function testLoadVersion2WithMultiSegmentUnit()
         $catalog = $loader->load($resource, 'en', 'domain1');
 
         $this->assertSame('en', $catalog->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalog->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalog->getResources());
         $this->assertFalse(libxml_get_last_error());
 
         // test for "foo" metadata
diff --git a/src/Symfony/Component/Translation/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/YamlFileLoaderTest.php
index bb3c1a99a7dc7..a535db56fc0e4 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/YamlFileLoaderTest.php
@@ -23,9 +23,9 @@ public function testLoad()
         $resource = __DIR__.'/../fixtures/resources.yml';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
-        $this->assertEquals(array('foo' => 'bar'), $catalogue->all('domain1'));
+        $this->assertEquals(['foo' => 'bar'], $catalogue->all('domain1'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 
     public function testLoadDoesNothingIfEmpty()
@@ -34,9 +34,9 @@ public function testLoadDoesNothingIfEmpty()
         $resource = __DIR__.'/../fixtures/empty.yml';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
-        $this->assertEquals(array(), $catalogue->all('domain1'));
+        $this->assertEquals([], $catalogue->all('domain1'));
         $this->assertEquals('en', $catalogue->getLocale());
-        $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
+        $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/Tests/LoggingTranslatorTest.php b/src/Symfony/Component/Translation/Tests/LoggingTranslatorTest.php
index 022379e934834..3aa4b872a2ca6 100644
--- a/src/Symfony/Component/Translation/Tests/LoggingTranslatorTest.php
+++ b/src/Symfony/Component/Translation/Tests/LoggingTranslatorTest.php
@@ -41,10 +41,10 @@ public function testTransChoiceFallbackIsLogged()
         ;
 
         $translator = new Translator('ar');
-        $translator->setFallbackLocales(array('en'));
+        $translator->setFallbackLocales(['en']);
         $translator->addLoader('array', new ArrayLoader());
-        $translator->addResource('array', array('some_message2' => 'one thing|%count% things'), 'en');
+        $translator->addResource('array', ['some_message2' => 'one thing|%count% things'], 'en');
         $loggableTranslator = new LoggingTranslator($translator, $logger);
-        $loggableTranslator->transChoice('some_message2', 10, array('%count%' => 10));
+        $loggableTranslator->transChoice('some_message2', 10, ['%count%' => 10]);
     }
 }
diff --git a/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php b/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
index 1ab8246969ca5..27e8cc5107c7b 100644
--- a/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
+++ b/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
@@ -100,7 +100,7 @@ public function testAddCatalogue()
         $this->assertEquals('foo', $catalogue->get('foo', 'domain1'));
         $this->assertEquals('foo1', $catalogue->get('foo1', 'domain1'));
 
-        $this->assertEquals(array($r, $r1), $catalogue->getResources());
+        $this->assertEquals([$r, $r1], $catalogue->getResources());
     }
 
     public function testAddFallbackCatalogue()
@@ -114,10 +114,10 @@ public function testAddFallbackCatalogue()
         $r2 = $this->getMockBuilder('Symfony\Component\Config\Resource\ResourceInterface')->getMock();
         $r2->expects($this->any())->method('__toString')->will($this->returnValue('r2'));
 
-        $catalogue = new MessageCatalogue('fr_FR', array('domain1' => array('foo' => 'foo'), 'domain2' => array('bar' => 'bar')));
+        $catalogue = new MessageCatalogue('fr_FR', ['domain1' => ['foo' => 'foo'], 'domain2' => ['bar' => 'bar']]);
         $catalogue->addResource($r);
 
-        $catalogue1 = new MessageCatalogue('fr', array('domain1' => array('foo' => 'bar', 'foo1' => 'foo1')));
+        $catalogue1 = new MessageCatalogue('fr', ['domain1' => ['foo' => 'bar', 'foo1' => 'foo1']]);
         $catalogue1->addResource($r1);
 
         $catalogue2 = new MessageCatalogue('en');
@@ -129,7 +129,7 @@ public function testAddFallbackCatalogue()
         $this->assertEquals('foo', $catalogue->get('foo', 'domain1'));
         $this->assertEquals('foo1', $catalogue->get('foo1', 'domain1'));
 
-        $this->assertEquals(array($r, $r1, $r2), $catalogue->getResources());
+        $this->assertEquals([$r, $r1, $r2], $catalogue->getResources());
     }
 
     /**
@@ -164,7 +164,7 @@ public function testAddFallbackCatalogueWithFallbackCircularReference()
     public function testAddCatalogueWhenLocaleIsNotTheSameAsTheCurrentOne()
     {
         $catalogue = new MessageCatalogue('en');
-        $catalogue->addCatalogue(new MessageCatalogue('fr', array()));
+        $catalogue->addCatalogue(new MessageCatalogue('fr', []));
     }
 
     public function testGetAddResource()
@@ -178,13 +178,13 @@ public function testGetAddResource()
         $r1->expects($this->any())->method('__toString')->will($this->returnValue('r1'));
         $catalogue->addResource($r1);
 
-        $this->assertEquals(array($r, $r1), $catalogue->getResources());
+        $this->assertEquals([$r, $r1], $catalogue->getResources());
     }
 
     public function testMetadataDelete()
     {
         $catalogue = new MessageCatalogue('en');
-        $this->assertEquals(array(), $catalogue->getMetadata('', ''), 'Metadata is empty');
+        $this->assertEquals([], $catalogue->getMetadata('', ''), 'Metadata is empty');
         $catalogue->deleteMetadata('key', 'messages');
         $catalogue->deleteMetadata('', 'messages');
         $catalogue->deleteMetadata();
@@ -196,8 +196,8 @@ public function testMetadataSetGetDelete()
         $catalogue->setMetadata('key', 'value');
         $this->assertEquals('value', $catalogue->getMetadata('key', 'messages'), "Metadata 'key' = 'value'");
 
-        $catalogue->setMetadata('key2', array());
-        $this->assertEquals(array(), $catalogue->getMetadata('key2', 'messages'), 'Metadata key2 is array');
+        $catalogue->setMetadata('key2', []);
+        $this->assertEquals([], $catalogue->getMetadata('key2', 'messages'), 'Metadata key2 is array');
 
         $catalogue->deleteMetadata('key2', 'messages');
         $this->assertNull($catalogue->getMetadata('key2', 'messages'), 'Metadata key2 should is deleted.');
@@ -210,13 +210,13 @@ public function testMetadataMerge()
     {
         $cat1 = new MessageCatalogue('en');
         $cat1->setMetadata('a', 'b');
-        $this->assertEquals(array('messages' => array('a' => 'b')), $cat1->getMetadata('', ''), 'Cat1 contains messages metadata.');
+        $this->assertEquals(['messages' => ['a' => 'b']], $cat1->getMetadata('', ''), 'Cat1 contains messages metadata.');
 
         $cat2 = new MessageCatalogue('en');
         $cat2->setMetadata('b', 'c', 'domain');
-        $this->assertEquals(array('domain' => array('b' => 'c')), $cat2->getMetadata('', ''), 'Cat2 contains domain metadata.');
+        $this->assertEquals(['domain' => ['b' => 'c']], $cat2->getMetadata('', ''), 'Cat2 contains domain metadata.');
 
         $cat1->addCatalogue($cat2);
-        $this->assertEquals(array('messages' => array('a' => 'b'), 'domain' => array('b' => 'c')), $cat1->getMetadata('', ''), 'Cat1 contains merged metadata.');
+        $this->assertEquals(['messages' => ['a' => 'b'], 'domain' => ['b' => 'c']], $cat1->getMetadata('', ''), 'Cat1 contains merged metadata.');
     }
 }
diff --git a/src/Symfony/Component/Translation/Tests/MessageSelectorTest.php b/src/Symfony/Component/Translation/Tests/MessageSelectorTest.php
index 42b7e0a3fada8..a887411eed453 100644
--- a/src/Symfony/Component/Translation/Tests/MessageSelectorTest.php
+++ b/src/Symfony/Component/Translation/Tests/MessageSelectorTest.php
@@ -46,92 +46,92 @@ public function testThrowExceptionIfMatchingMessageCannotBeFound($id, $number)
 
     public function getNonMatchingMessages()
     {
-        return array(
-            array('{0} There are no apples|{1} There is one apple', 2),
-            array('{1} There is one apple|]1,Inf] There are %count% apples', 0),
-            array('{1} There is one apple|]2,Inf] There are %count% apples', 2),
-            array('{0} There are no apples|There is one apple', 2),
-        );
+        return [
+            ['{0} There are no apples|{1} There is one apple', 2],
+            ['{1} There is one apple|]1,Inf] There are %count% apples', 0],
+            ['{1} There is one apple|]2,Inf] There are %count% apples', 2],
+            ['{0} There are no apples|There is one apple', 2],
+        ];
     }
 
     public function getChooseTests()
     {
-        return array(
-            array('There are no apples', '{0} There are no apples|{1} There is one apple|]1,Inf] There are %count% apples', 0),
-            array('There are no apples', '{0}     There are no apples|{1} There is one apple|]1,Inf] There are %count% apples', 0),
-            array('There are no apples', '{0}There are no apples|{1} There is one apple|]1,Inf] There are %count% apples', 0),
+        return [
+            ['There are no apples', '{0} There are no apples|{1} There is one apple|]1,Inf] There are %count% apples', 0],
+            ['There are no apples', '{0}     There are no apples|{1} There is one apple|]1,Inf] There are %count% apples', 0],
+            ['There are no apples', '{0}There are no apples|{1} There is one apple|]1,Inf] There are %count% apples', 0],
 
-            array('There is one apple', '{0} There are no apples|{1} There is one apple|]1,Inf] There are %count% apples', 1),
+            ['There is one apple', '{0} There are no apples|{1} There is one apple|]1,Inf] There are %count% apples', 1],
 
-            array('There are %count% apples', '{0} There are no apples|{1} There is one apple|]1,Inf] There are %count% apples', 10),
-            array('There are %count% apples', '{0} There are no apples|{1} There is one apple|]1,Inf]There are %count% apples', 10),
-            array('There are %count% apples', '{0} There are no apples|{1} There is one apple|]1,Inf]     There are %count% apples', 10),
+            ['There are %count% apples', '{0} There are no apples|{1} There is one apple|]1,Inf] There are %count% apples', 10],
+            ['There are %count% apples', '{0} There are no apples|{1} There is one apple|]1,Inf]There are %count% apples', 10],
+            ['There are %count% apples', '{0} There are no apples|{1} There is one apple|]1,Inf]     There are %count% apples', 10],
 
-            array('There are %count% apples', 'There is one apple|There are %count% apples', 0),
-            array('There is one apple', 'There is one apple|There are %count% apples', 1),
-            array('There are %count% apples', 'There is one apple|There are %count% apples', 10),
+            ['There are %count% apples', 'There is one apple|There are %count% apples', 0],
+            ['There is one apple', 'There is one apple|There are %count% apples', 1],
+            ['There are %count% apples', 'There is one apple|There are %count% apples', 10],
 
-            array('There are %count% apples', 'one: There is one apple|more: There are %count% apples', 0),
-            array('There is one apple', 'one: There is one apple|more: There are %count% apples', 1),
-            array('There are %count% apples', 'one: There is one apple|more: There are %count% apples', 10),
+            ['There are %count% apples', 'one: There is one apple|more: There are %count% apples', 0],
+            ['There is one apple', 'one: There is one apple|more: There are %count% apples', 1],
+            ['There are %count% apples', 'one: There is one apple|more: There are %count% apples', 10],
 
-            array('There are no apples', '{0} There are no apples|one: There is one apple|more: There are %count% apples', 0),
-            array('There is one apple', '{0} There are no apples|one: There is one apple|more: There are %count% apples', 1),
-            array('There are %count% apples', '{0} There are no apples|one: There is one apple|more: There are %count% apples', 10),
+            ['There are no apples', '{0} There are no apples|one: There is one apple|more: There are %count% apples', 0],
+            ['There is one apple', '{0} There are no apples|one: There is one apple|more: There are %count% apples', 1],
+            ['There are %count% apples', '{0} There are no apples|one: There is one apple|more: There are %count% apples', 10],
 
-            array('', '{0}|{1} There is one apple|]1,Inf] There are %count% apples', 0),
-            array('', '{0} There are no apples|{1}|]1,Inf] There are %count% apples', 1),
+            ['', '{0}|{1} There is one apple|]1,Inf] There are %count% apples', 0],
+            ['', '{0} There are no apples|{1}|]1,Inf] There are %count% apples', 1],
 
             // Indexed only tests which are Gettext PoFile* compatible strings.
-            array('There are %count% apples', 'There is one apple|There are %count% apples', 0),
-            array('There is one apple', 'There is one apple|There are %count% apples', 1),
-            array('There are %count% apples', 'There is one apple|There are %count% apples', 2),
+            ['There are %count% apples', 'There is one apple|There are %count% apples', 0],
+            ['There is one apple', 'There is one apple|There are %count% apples', 1],
+            ['There are %count% apples', 'There is one apple|There are %count% apples', 2],
 
             // Tests for float numbers
-            array('There is almost one apple', '{0} There are no apples|]0,1[ There is almost one apple|{1} There is one apple|[1,Inf] There is more than one apple', 0.7),
-            array('There is one apple', '{0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 1),
-            array('There is more than one apple', '{0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 1.7),
-            array('There are no apples', '{0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0),
-            array('There are no apples', '{0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0.0),
-            array('There are no apples', '{0.0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0),
+            ['There is almost one apple', '{0} There are no apples|]0,1[ There is almost one apple|{1} There is one apple|[1,Inf] There is more than one apple', 0.7],
+            ['There is one apple', '{0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 1],
+            ['There is more than one apple', '{0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 1.7],
+            ['There are no apples', '{0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0],
+            ['There are no apples', '{0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0.0],
+            ['There are no apples', '{0.0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0],
 
             // Test texts with new-lines
             // with double-quotes and \n in id & double-quotes and actual newlines in text
-            array("This is a text with a\n            new-line in it. Selector = 0.", '{0}This is a text with a
+            ["This is a text with a\n            new-line in it. Selector = 0.", '{0}This is a text with a
             new-line in it. Selector = 0.|{1}This is a text with a
             new-line in it. Selector = 1.|[1,Inf]This is a text with a
-            new-line in it. Selector > 1.', 0),
+            new-line in it. Selector > 1.', 0],
             // with double-quotes and \n in id and single-quotes and actual newlines in text
-            array("This is a text with a\n            new-line in it. Selector = 1.", '{0}This is a text with a
+            ["This is a text with a\n            new-line in it. Selector = 1.", '{0}This is a text with a
             new-line in it. Selector = 0.|{1}This is a text with a
             new-line in it. Selector = 1.|[1,Inf]This is a text with a
-            new-line in it. Selector > 1.', 1),
-            array("This is a text with a\n            new-line in it. Selector > 1.", '{0}This is a text with a
+            new-line in it. Selector > 1.', 1],
+            ["This is a text with a\n            new-line in it. Selector > 1.", '{0}This is a text with a
             new-line in it. Selector = 0.|{1}This is a text with a
             new-line in it. Selector = 1.|[1,Inf]This is a text with a
-            new-line in it. Selector > 1.', 5),
+            new-line in it. Selector > 1.', 5],
             // with double-quotes and id split accros lines
-            array('This is a text with a
+            ['This is a text with a
             new-line in it. Selector = 1.', '{0}This is a text with a
             new-line in it. Selector = 0.|{1}This is a text with a
             new-line in it. Selector = 1.|[1,Inf]This is a text with a
-            new-line in it. Selector > 1.', 1),
+            new-line in it. Selector > 1.', 1],
             // with single-quotes and id split accros lines
-            array('This is a text with a
+            ['This is a text with a
             new-line in it. Selector > 1.', '{0}This is a text with a
             new-line in it. Selector = 0.|{1}This is a text with a
             new-line in it. Selector = 1.|[1,Inf]This is a text with a
-            new-line in it. Selector > 1.', 5),
+            new-line in it. Selector > 1.', 5],
             // with single-quotes and \n in text
-            array('This is a text with a\nnew-line in it. Selector = 0.', '{0}This is a text with a\nnew-line in it. Selector = 0.|{1}This is a text with a\nnew-line in it. Selector = 1.|[1,Inf]This is a text with a\nnew-line in it. Selector > 1.', 0),
+            ['This is a text with a\nnew-line in it. Selector = 0.', '{0}This is a text with a\nnew-line in it. Selector = 0.|{1}This is a text with a\nnew-line in it. Selector = 1.|[1,Inf]This is a text with a\nnew-line in it. Selector > 1.', 0],
             // with double-quotes and id split accros lines
-            array("This is a text with a\nnew-line in it. Selector = 1.", "{0}This is a text with a\nnew-line in it. Selector = 0.|{1}This is a text with a\nnew-line in it. Selector = 1.|[1,Inf]This is a text with a\nnew-line in it. Selector > 1.", 1),
+            ["This is a text with a\nnew-line in it. Selector = 1.", "{0}This is a text with a\nnew-line in it. Selector = 0.|{1}This is a text with a\nnew-line in it. Selector = 1.|[1,Inf]This is a text with a\nnew-line in it. Selector > 1.", 1],
             // esacape pipe
-            array('This is a text with | in it. Selector = 0.', '{0}This is a text with || in it. Selector = 0.|{1}This is a text with || in it. Selector = 1.', 0),
+            ['This is a text with | in it. Selector = 0.', '{0}This is a text with || in it. Selector = 0.|{1}This is a text with || in it. Selector = 1.', 0],
             // Empty plural set (2 plural forms) from a .PO file
-            array('', '|', 1),
+            ['', '|', 1],
             // Empty plural set (3 plural forms) from a .PO file
-            array('', '||', 1),
-        );
+            ['', '||', 1],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php b/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php
index 5eb6c01f5d21d..287764327a42f 100644
--- a/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php
+++ b/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php
@@ -60,13 +60,13 @@ public function testLangcodes($nplural, $langCodes)
      */
     public function successLangcodes()
     {
-        return array(
-            array('1', array('ay', 'bo', 'cgg', 'dz', 'id', 'ja', 'jbo', 'ka', 'kk', 'km', 'ko', 'ky')),
-            array('2', array('nl', 'fr', 'en', 'de', 'de_GE', 'hy', 'hy_AM')),
-            array('3', array('be', 'bs', 'cs', 'hr')),
-            array('4', array('cy', 'mt', 'sl')),
-            array('6', array('ar')),
-        );
+        return [
+            ['1', ['ay', 'bo', 'cgg', 'dz', 'id', 'ja', 'jbo', 'ka', 'kk', 'km', 'ko', 'ky']],
+            ['2', ['nl', 'fr', 'en', 'de', 'de_GE', 'hy', 'hy_AM']],
+            ['3', ['be', 'bs', 'cs', 'hr']],
+            ['4', ['cy', 'mt', 'sl']],
+            ['6', ['ar']],
+        ];
     }
 
     /**
@@ -79,13 +79,13 @@ public function successLangcodes()
      */
     public function failingLangcodes()
     {
-        return array(
-            array('1', array('fa')),
-            array('2', array('jbo')),
-            array('3', array('cbs')),
-            array('4', array('gd', 'kw')),
-            array('5', array('ga')),
-        );
+        return [
+            ['1', ['fa']],
+            ['2', ['jbo']],
+            ['3', ['cbs']],
+            ['4', ['gd', 'kw']],
+            ['5', ['ga']],
+        ];
     }
 
     /**
@@ -109,7 +109,7 @@ protected function validateMatrix($nplural, $matrix, $expectSuccess = true)
 
     protected function generateTestData($langCodes)
     {
-        $matrix = array();
+        $matrix = [];
         foreach ($langCodes as $langCode) {
             for ($count = 0; $count < 200; ++$count) {
                 $plural = PluralizationRules::get($count, $langCode);
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php b/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php
index 3e71ae74ec787..f95802ade4bc8 100644
--- a/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php
+++ b/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php
@@ -92,7 +92,7 @@ public function testCatalogueIsReloadedWhenResourcesAreNoLongerFresh()
         $format = 'some_format';
         $msgid = 'test';
 
-        $catalogue = new MessageCatalogue($locale, array());
+        $catalogue = new MessageCatalogue($locale, []);
         $catalogue->addResource(new StaleResource()); // better use a helper class than a mock, because it gets serialized in the cache and re-loaded
 
         /** @var LoaderInterface|\PHPUnit_Framework_MockObject_MockObject $loader */
@@ -133,26 +133,26 @@ public function testDifferentTranslatorsForSameLocaleDoNotOverwriteEachOthersCac
         // Create a Translator and prime its cache
         $translator = new Translator($locale, null, $this->tmpDir, $debug);
         $translator->addLoader($format, new ArrayLoader());
-        $translator->addResource($format, array($msgid => 'OK'), $locale);
+        $translator->addResource($format, [$msgid => 'OK'], $locale);
         $translator->trans($msgid);
 
         // Create another Translator with a different catalogue for the same locale
         $translator = new Translator($locale, null, $this->tmpDir, $debug);
         $translator->addLoader($format, new ArrayLoader());
-        $translator->addResource($format, array($msgid => 'FAIL'), $locale);
+        $translator->addResource($format, [$msgid => 'FAIL'], $locale);
         $translator->trans($msgid);
 
         // Now the first translator must still have a useable cache.
         $translator = new Translator($locale, null, $this->tmpDir, $debug);
         $translator->addLoader($format, $this->createFailingLoader());
-        $translator->addResource($format, array($msgid => 'OK'), $locale);
+        $translator->addResource($format, [$msgid => 'OK'], $locale);
         $this->assertEquals('OK', $translator->trans($msgid), '-> the cache was overwritten by another translator instance in '.($debug ? 'debug' : 'production'));
     }
 
     public function testGeneratedCacheFilesAreOnlyBelongRequestedLocales()
     {
         $translator = new Translator('a', null, $this->tmpDir);
-        $translator->setFallbackLocales(array('b'));
+        $translator->setFallbackLocales(['b']);
         $translator->trans('bar');
 
         $cachedFiles = glob($this->tmpDir.'/*.php');
@@ -168,24 +168,24 @@ public function testDifferentCacheFilesAreUsedForDifferentSetsOfFallbackLocales(
          * loading a catalogue from the cache.
          */
         $translator = new Translator('a', null, $this->tmpDir);
-        $translator->setFallbackLocales(array('b'));
+        $translator->setFallbackLocales(['b']);
 
         $translator->addLoader('array', new ArrayLoader());
-        $translator->addResource('array', array('foo' => 'foo (a)'), 'a');
-        $translator->addResource('array', array('bar' => 'bar (b)'), 'b');
+        $translator->addResource('array', ['foo' => 'foo (a)'], 'a');
+        $translator->addResource('array', ['bar' => 'bar (b)'], 'b');
 
         $this->assertEquals('bar (b)', $translator->trans('bar'));
 
         // Remove fallback locale
-        $translator->setFallbackLocales(array());
+        $translator->setFallbackLocales([]);
         $this->assertEquals('bar', $translator->trans('bar'));
 
         // Use a fresh translator with no fallback locales, result should be the same
         $translator = new Translator('a', null, $this->tmpDir);
 
         $translator->addLoader('array', new ArrayLoader());
-        $translator->addResource('array', array('foo' => 'foo (a)'), 'a');
-        $translator->addResource('array', array('bar' => 'bar (b)'), 'b');
+        $translator->addResource('array', ['foo' => 'foo (a)'], 'a');
+        $translator->addResource('array', ['bar' => 'bar (b)'], 'b');
 
         $this->assertEquals('bar', $translator->trans('bar'));
     }
@@ -246,7 +246,7 @@ public function testRefreshCacheWhenResourcesAreNoLongerFresh()
         $loader
             ->expects($this->exactly(2))
             ->method('load')
-            ->will($this->returnValue($this->getCatalogue('fr', array(), array($resource))));
+            ->will($this->returnValue($this->getCatalogue('fr', [], [$resource])));
 
         // prime the cache
         $translator = new Translator('fr', null, $this->tmpDir, true);
@@ -261,7 +261,7 @@ public function testRefreshCacheWhenResourcesAreNoLongerFresh()
         $translator->trans('foo');
     }
 
-    protected function getCatalogue($locale, $messages, $resources = array())
+    protected function getCatalogue($locale, $messages, $resources = [])
     {
         $catalogue = new MessageCatalogue($locale);
         foreach ($messages as $key => $translation) {
@@ -276,7 +276,7 @@ protected function getCatalogue($locale, $messages, $resources = array())
 
     public function runForDebugAndProduction()
     {
-        return array(array(true), array(false));
+        return [[true], [false]];
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorTest.php b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
index 3e54839f77ee8..fb06bbd09e331 100644
--- a/src/Symfony/Component/Translation/Tests/TranslatorTest.php
+++ b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
@@ -97,8 +97,8 @@ public function testGetCatalogueReturnsConsolidatedCatalogue()
         $translator = new Translator($locale);
         $translator->addLoader('loader-a', new ArrayLoader());
         $translator->addLoader('loader-b', new ArrayLoader());
-        $translator->addResource('loader-a', array('foo' => 'foofoo'), $locale, 'domain-a');
-        $translator->addResource('loader-b', array('bar' => 'foobar'), $locale, 'domain-b');
+        $translator->addResource('loader-a', ['foo' => 'foofoo'], $locale, 'domain-a');
+        $translator->addResource('loader-b', ['bar' => 'foobar'], $locale, 'domain-b');
 
         /*
          * Test that we get a single catalogue comprising messages
@@ -113,13 +113,13 @@ public function testSetFallbackLocales()
     {
         $translator = new Translator('en');
         $translator->addLoader('array', new ArrayLoader());
-        $translator->addResource('array', array('foo' => 'foofoo'), 'en');
-        $translator->addResource('array', array('bar' => 'foobar'), 'fr');
+        $translator->addResource('array', ['foo' => 'foofoo'], 'en');
+        $translator->addResource('array', ['bar' => 'foobar'], 'fr');
 
         // force catalogue loading
         $translator->trans('bar');
 
-        $translator->setFallbackLocales(array('fr'));
+        $translator->setFallbackLocales(['fr']);
         $this->assertEquals('foobar', $translator->trans('bar'));
     }
 
@@ -127,13 +127,13 @@ public function testSetFallbackLocalesMultiple()
     {
         $translator = new Translator('en');
         $translator->addLoader('array', new ArrayLoader());
-        $translator->addResource('array', array('foo' => 'foo (en)'), 'en');
-        $translator->addResource('array', array('bar' => 'bar (fr)'), 'fr');
+        $translator->addResource('array', ['foo' => 'foo (en)'], 'en');
+        $translator->addResource('array', ['bar' => 'bar (fr)'], 'fr');
 
         // force catalogue loading
         $translator->trans('bar');
 
-        $translator->setFallbackLocales(array('fr_FR', 'fr'));
+        $translator->setFallbackLocales(['fr_FR', 'fr']);
         $this->assertEquals('bar (fr)', $translator->trans('bar'));
     }
 
@@ -144,7 +144,7 @@ public function testSetFallbackLocalesMultiple()
     public function testSetFallbackInvalidLocales($locale)
     {
         $translator = new Translator('fr');
-        $translator->setFallbackLocales(array('fr', $locale));
+        $translator->setFallbackLocales(['fr', $locale]);
     }
 
     /**
@@ -153,7 +153,7 @@ public function testSetFallbackInvalidLocales($locale)
     public function testSetFallbackValidLocales($locale)
     {
         $translator = new Translator($locale);
-        $translator->setFallbackLocales(array('fr', $locale));
+        $translator->setFallbackLocales(['fr', $locale]);
         // no assertion. this method just asserts that no exception is thrown
         $this->addToAssertionCount(1);
     }
@@ -161,10 +161,10 @@ public function testSetFallbackValidLocales($locale)
     public function testTransWithFallbackLocale()
     {
         $translator = new Translator('fr_FR');
-        $translator->setFallbackLocales(array('en'));
+        $translator->setFallbackLocales(['en']);
 
         $translator->addLoader('array', new ArrayLoader());
-        $translator->addResource('array', array('bar' => 'foobar'), 'en');
+        $translator->addResource('array', ['bar' => 'foobar'], 'en');
 
         $this->assertEquals('foobar', $translator->trans('bar'));
     }
@@ -176,7 +176,7 @@ public function testTransWithFallbackLocale()
     public function testAddResourceInvalidLocales($locale)
     {
         $translator = new Translator('fr');
-        $translator->addResource('array', array('foo' => 'foofoo'), $locale);
+        $translator->addResource('array', ['foo' => 'foofoo'], $locale);
     }
 
     /**
@@ -185,7 +185,7 @@ public function testAddResourceInvalidLocales($locale)
     public function testAddResourceValidLocales($locale)
     {
         $translator = new Translator('fr');
-        $translator->addResource('array', array('foo' => 'foofoo'), $locale);
+        $translator->addResource('array', ['foo' => 'foofoo'], $locale);
         // no assertion. this method just asserts that no exception is thrown
         $this->addToAssertionCount(1);
     }
@@ -195,12 +195,12 @@ public function testAddResourceAfterTrans()
         $translator = new Translator('fr');
         $translator->addLoader('array', new ArrayLoader());
 
-        $translator->setFallbackLocales(array('en'));
+        $translator->setFallbackLocales(['en']);
 
-        $translator->addResource('array', array('foo' => 'foofoo'), 'en');
+        $translator->addResource('array', ['foo' => 'foofoo'], 'en');
         $this->assertEquals('foofoo', $translator->trans('foo'));
 
-        $translator->addResource('array', array('bar' => 'foobar'), 'en');
+        $translator->addResource('array', ['bar' => 'foobar'], 'en');
         $this->assertEquals('foobar', $translator->trans('bar'));
     }
 
@@ -247,10 +247,10 @@ public function testTransWithFallbackLocaleTer()
     {
         $translator = new Translator('fr_FR');
         $translator->addLoader('array', new ArrayLoader());
-        $translator->addResource('array', array('foo' => 'foo (en_US)'), 'en_US');
-        $translator->addResource('array', array('bar' => 'bar (en)'), 'en');
+        $translator->addResource('array', ['foo' => 'foo (en_US)'], 'en_US');
+        $translator->addResource('array', ['bar' => 'bar (en)'], 'en');
 
-        $translator->setFallbackLocales(array('en_US', 'en'));
+        $translator->setFallbackLocales(['en_US', 'en']);
 
         $this->assertEquals('foo (en_US)', $translator->trans('foo'));
         $this->assertEquals('bar (en)', $translator->trans('bar'));
@@ -259,7 +259,7 @@ public function testTransWithFallbackLocaleTer()
     public function testTransNonExistentWithFallback()
     {
         $translator = new Translator('fr');
-        $translator->setFallbackLocales(array('en'));
+        $translator->setFallbackLocales(['en']);
         $translator->addLoader('array', new ArrayLoader());
         $this->assertEquals('non-existent', $translator->trans('non-existent'));
     }
@@ -270,7 +270,7 @@ public function testTransNonExistentWithFallback()
     public function testWhenAResourceHasNoRegisteredLoader()
     {
         $translator = new Translator('en');
-        $translator->addResource('array', array('foo' => 'foofoo'), 'en');
+        $translator->addResource('array', ['foo' => 'foofoo'], 'en');
 
         $translator->trans('foo');
     }
@@ -278,7 +278,7 @@ public function testWhenAResourceHasNoRegisteredLoader()
     public function testNestedFallbackCatalogueWhenUsingMultipleLocales()
     {
         $translator = new Translator('fr');
-        $translator->setFallbackLocales(array('ru', 'en'));
+        $translator->setFallbackLocales(['ru', 'en']);
 
         $translator->getCatalogue('fr');
 
@@ -293,7 +293,7 @@ public function testFallbackCatalogueResources()
         $translator->addResource('yml', __DIR__.'/fixtures/resources.yml', 'en');
 
         // force catalogue loading
-        $this->assertEquals('bar', $translator->trans('foo', array()));
+        $this->assertEquals('bar', $translator->trans('foo', []));
 
         $resources = $translator->getCatalogue('en')->getResources();
         $this->assertCount(1, $resources);
@@ -312,7 +312,7 @@ public function testTrans($expected, $id, $translation, $parameters, $locale, $d
     {
         $translator = new Translator('en');
         $translator->addLoader('array', new ArrayLoader());
-        $translator->addResource('array', array((string) $id => $translation), $locale, $domain);
+        $translator->addResource('array', [(string) $id => $translation], $locale, $domain);
 
         $this->assertEquals($expected, $translator->trans($id, $parameters, $domain, $locale));
     }
@@ -325,9 +325,9 @@ public function testTransInvalidLocale($locale)
     {
         $translator = new Translator('en');
         $translator->addLoader('array', new ArrayLoader());
-        $translator->addResource('array', array('foo' => 'foofoo'), 'en');
+        $translator->addResource('array', ['foo' => 'foofoo'], 'en');
 
-        $translator->trans('foo', array(), '', $locale);
+        $translator->trans('foo', [], '', $locale);
     }
 
     /**
@@ -337,10 +337,10 @@ public function testTransValidLocale($locale)
     {
         $translator = new Translator($locale);
         $translator->addLoader('array', new ArrayLoader());
-        $translator->addResource('array', array('test' => 'OK'), $locale);
+        $translator->addResource('array', ['test' => 'OK'], $locale);
 
         $this->assertEquals('OK', $translator->trans('test'));
-        $this->assertEquals('OK', $translator->trans('test', array(), null, $locale));
+        $this->assertEquals('OK', $translator->trans('test', [], null, $locale));
     }
 
     /**
@@ -352,7 +352,7 @@ public function testFlattenedTrans($expected, $messages, $id)
         $translator->addLoader('array', new ArrayLoader());
         $translator->addResource('array', $messages, 'fr', '');
 
-        $this->assertEquals($expected, $translator->trans($id, array(), '', 'fr'));
+        $this->assertEquals($expected, $translator->trans($id, [], '', 'fr'));
     }
 
     /**
@@ -362,7 +362,7 @@ public function testTransChoice($expected, $id, $translation, $number, $paramete
     {
         $translator = new Translator('en');
         $translator->addLoader('array', new ArrayLoader());
-        $translator->addResource('array', array((string) $id => $translation), $locale, $domain);
+        $translator->addResource('array', [(string) $id => $translation], $locale, $domain);
 
         $this->assertEquals($expected, $translator->transChoice($id, $number, $parameters, $domain, $locale));
     }
@@ -375,9 +375,9 @@ public function testTransChoiceInvalidLocale($locale)
     {
         $translator = new Translator('en');
         $translator->addLoader('array', new ArrayLoader());
-        $translator->addResource('array', array('foo' => 'foofoo'), 'en');
+        $translator->addResource('array', ['foo' => 'foofoo'], 'en');
 
-        $translator->transChoice('foo', 1, array(), '', $locale);
+        $translator->transChoice('foo', 1, [], '', $locale);
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/Tests/Util/ArrayConverterTest.php b/src/Symfony/Component/Translation/Tests/Util/ArrayConverterTest.php
index dbb5424f1c69c..b0335415e1b3d 100644
--- a/src/Symfony/Component/Translation/Tests/Util/ArrayConverterTest.php
+++ b/src/Symfony/Component/Translation/Tests/Util/ArrayConverterTest.php
@@ -26,49 +26,49 @@ public function testDump($input, $expectedOutput)
 
     public function messagesData()
     {
-        return array(
-            array(
+        return [
+            [
                 // input
-                array(
+                [
                     'foo1' => 'bar',
                     'foo.bar' => 'value',
-                ),
+                ],
                 // expected output
-                array(
+                [
                     'foo1' => 'bar',
-                    'foo' => array('bar' => 'value'),
-                ),
-            ),
-            array(
+                    'foo' => ['bar' => 'value'],
+                ],
+            ],
+            [
                 // input
-                array(
+                [
                     'foo.bar' => 'value1',
                     'foo.bar.test' => 'value2',
-                ),
+                ],
                 // expected output
-                array(
-                    'foo' => array(
+                [
+                    'foo' => [
                         'bar' => 'value1',
                         'bar.test' => 'value2',
-                    ),
-                ),
-            ),
-            array(
+                    ],
+                ],
+            ],
+            [
                 // input
-                array(
+                [
                     'foo.level2.level3.level4' => 'value1',
                     'foo.level2' => 'value2',
                     'foo.bar' => 'value3',
-                ),
+                ],
                 // expected output
-                array(
-                    'foo' => array(
+                [
+                    'foo' => [
                         'level2' => 'value2',
                         'level2.level3.level4' => 'value1',
                         'bar' => 'value3',
-                    ),
-                ),
-            ),
-        );
+                    ],
+                ],
+            ],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Translation/Tests/Writer/TranslationWriterTest.php b/src/Symfony/Component/Translation/Tests/Writer/TranslationWriterTest.php
index 26a846ea90d94..b0165153aac80 100644
--- a/src/Symfony/Component/Translation/Tests/Writer/TranslationWriterTest.php
+++ b/src/Symfony/Component/Translation/Tests/Writer/TranslationWriterTest.php
@@ -62,7 +62,7 @@ public function testDisableBackup()
 
 class NonBackupDumper implements DumperInterface
 {
-    public function dump(MessageCatalogue $messages, $options = array())
+    public function dump(MessageCatalogue $messages, $options = [])
     {
     }
 }
@@ -71,7 +71,7 @@ class BackupDumper implements DumperInterface
 {
     public $backup = true;
 
-    public function dump(MessageCatalogue $messages, $options = array())
+    public function dump(MessageCatalogue $messages, $options = [])
     {
     }
 
diff --git a/src/Symfony/Component/Translation/Tests/fixtures/extractor/translation.html.php b/src/Symfony/Component/Translation/Tests/fixtures/extractor/translation.html.php
index 1ce8ea94fd339..11261311a1be5 100644
--- a/src/Symfony/Component/Translation/Tests/fixtures/extractor/translation.html.php
+++ b/src/Symfony/Component/Translation/Tests/fixtures/extractor/translation.html.php
@@ -29,21 +29,21 @@
 <?php echo $view['translator']->transChoice(
     '{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples',
     10,
-    array('%count%' => 10)
+    ['%count%' => 10]
 ); ?>
 
-<?php echo $view['translator']->trans('other-domain-test-no-params-short-array', array(), 'not_messages'); ?>
+<?php echo $view['translator']->trans('other-domain-test-no-params-short-array', [], 'not_messages'); ?>
 
-<?php echo $view['translator']->trans('other-domain-test-no-params-long-array', array(), 'not_messages'); ?>
+<?php echo $view['translator']->trans('other-domain-test-no-params-long-array', [], 'not_messages'); ?>
 
-<?php echo $view['translator']->trans('other-domain-test-params-short-array', array('foo' => 'bar'), 'not_messages'); ?>
+<?php echo $view['translator']->trans('other-domain-test-params-short-array', ['foo' => 'bar'], 'not_messages'); ?>
 
-<?php echo $view['translator']->trans('other-domain-test-params-long-array', array('foo' => 'bar'), 'not_messages'); ?>
+<?php echo $view['translator']->trans('other-domain-test-params-long-array', ['foo' => 'bar'], 'not_messages'); ?>
 
-<?php echo $view['translator']->transChoice('other-domain-test-trans-choice-short-array-%count%', 10, array('%count%' => 10), 'not_messages'); ?>
+<?php echo $view['translator']->transChoice('other-domain-test-trans-choice-short-array-%count%', 10, ['%count%' => 10], 'not_messages'); ?>
 
-<?php echo $view['translator']->transChoice('other-domain-test-trans-choice-long-array-%count%', 10, array('%count%' => 10), 'not_messages'); ?>
+<?php echo $view['translator']->transChoice('other-domain-test-trans-choice-long-array-%count%', 10, ['%count%' => 10], 'not_messages'); ?>
 
-<?php echo $view['translator']->trans('typecast', array('a' => (int) '123'), 'not_messages'); ?>
-<?php echo $view['translator']->transChoice('msg1', 10 + 1, array(), 'not_messages'); ?>
-<?php echo $view['translator']->transChoice('msg2', ceil(4.5), array(), 'not_messages'); ?>
+<?php echo $view['translator']->trans('typecast', ['a' => (int) '123'], 'not_messages'); ?>
+<?php echo $view['translator']->transChoice('msg1', 10 + 1, [], 'not_messages'); ?>
+<?php echo $view['translator']->transChoice('msg2', ceil(4.5), [], 'not_messages'); ?>
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
index c965a0bb4a71b..d0a6b266150e9 100644
--- a/src/Symfony/Component/Translation/Translator.php
+++ b/src/Symfony/Component/Translation/Translator.php
@@ -31,7 +31,7 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
     /**
      * @var MessageCatalogueInterface[]
      */
-    protected $catalogues = array();
+    protected $catalogues = [];
 
     /**
      * @var string
@@ -41,17 +41,17 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
     /**
      * @var array
      */
-    private $fallbackLocales = array();
+    private $fallbackLocales = [];
 
     /**
      * @var LoaderInterface[]
      */
-    private $loaders = array();
+    private $loaders = [];
 
     /**
      * @var array
      */
-    private $resources = array();
+    private $resources = [];
 
     /**
      * @var MessageFormatterInterface
@@ -131,10 +131,10 @@ public function addResource($format, $resource, $locale, $domain = null)
 
         $this->assertValidLocale($locale);
 
-        $this->resources[$locale][] = array($format, $resource, $domain);
+        $this->resources[$locale][] = [$format, $resource, $domain];
 
         if (\in_array($locale, $this->fallbackLocales)) {
-            $this->catalogues = array();
+            $this->catalogues = [];
         } else {
             unset($this->catalogues[$locale]);
         }
@@ -167,7 +167,7 @@ public function getLocale()
     public function setFallbackLocales(array $locales)
     {
         // needed as the fallback locales are linked to the already loaded catalogues
-        $this->catalogues = array();
+        $this->catalogues = [];
 
         foreach ($locales as $locale) {
             $this->assertValidLocale($locale);
@@ -189,7 +189,7 @@ public function getFallbackLocales()
     /**
      * {@inheritdoc}
      */
-    public function trans($id, array $parameters = array(), $domain = null, $locale = null)
+    public function trans($id, array $parameters = [], $domain = null, $locale = null)
     {
         if (null === $domain) {
             $domain = 'messages';
@@ -201,7 +201,7 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
     /**
      * {@inheritdoc}
      */
-    public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
+    public function transChoice($id, $number, array $parameters = [], $domain = null, $locale = null)
     {
         if (!$this->formatter instanceof ChoiceMessageFormatterInterface) {
             throw new LogicException(sprintf('The formatter "%s" does not support plural translations.', \get_class($this->formatter)));
diff --git a/src/Symfony/Component/Translation/TranslatorInterface.php b/src/Symfony/Component/Translation/TranslatorInterface.php
index 9fcfd5bcf4051..76fefabc16479 100644
--- a/src/Symfony/Component/Translation/TranslatorInterface.php
+++ b/src/Symfony/Component/Translation/TranslatorInterface.php
@@ -32,7 +32,7 @@ interface TranslatorInterface
      *
      * @throws InvalidArgumentException If the locale contains invalid characters
      */
-    public function trans($id, array $parameters = array(), $domain = null, $locale = null);
+    public function trans($id, array $parameters = [], $domain = null, $locale = null);
 
     /**
      * Translates the given choice message by choosing a translation according to a number.
@@ -47,7 +47,7 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
      *
      * @throws InvalidArgumentException If the locale contains invalid characters
      */
-    public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null);
+    public function transChoice($id, $number, array $parameters = [], $domain = null, $locale = null);
 
     /**
      * Sets the current locale.
diff --git a/src/Symfony/Component/Translation/Util/ArrayConverter.php b/src/Symfony/Component/Translation/Util/ArrayConverter.php
index e8b7559dfb1e8..a45ae2dbba794 100644
--- a/src/Symfony/Component/Translation/Util/ArrayConverter.php
+++ b/src/Symfony/Component/Translation/Util/ArrayConverter.php
@@ -35,7 +35,7 @@ class ArrayConverter
      */
     public static function expandToTree(array $messages)
     {
-        $tree = array();
+        $tree = [];
 
         foreach ($messages as $id => $value) {
             $referenceToElement = &self::getElementByPath($tree, explode('.', $id));
diff --git a/src/Symfony/Component/Translation/Writer/TranslationWriter.php b/src/Symfony/Component/Translation/Writer/TranslationWriter.php
index 459f707faf947..ecf2b4a08fadf 100644
--- a/src/Symfony/Component/Translation/Writer/TranslationWriter.php
+++ b/src/Symfony/Component/Translation/Writer/TranslationWriter.php
@@ -23,7 +23,7 @@
  */
 class TranslationWriter implements TranslationWriterInterface
 {
-    private $dumpers = array();
+    private $dumpers = [];
 
     /**
      * Adds a dumper to the writer.
@@ -67,7 +67,7 @@ public function getFormats()
      *
      * @throws InvalidArgumentException
      */
-    public function write(MessageCatalogue $catalogue, $format, $options = array())
+    public function write(MessageCatalogue $catalogue, $format, $options = [])
     {
         if (!isset($this->dumpers[$format])) {
             throw new InvalidArgumentException(sprintf('There is no dumper associated with format "%s".', $format));
diff --git a/src/Symfony/Component/Translation/Writer/TranslationWriterInterface.php b/src/Symfony/Component/Translation/Writer/TranslationWriterInterface.php
index 992ab769a0d59..b07c08e2366c7 100644
--- a/src/Symfony/Component/Translation/Writer/TranslationWriterInterface.php
+++ b/src/Symfony/Component/Translation/Writer/TranslationWriterInterface.php
@@ -30,5 +30,5 @@ interface TranslationWriterInterface
      *
      * @throws InvalidArgumentException
      */
-    public function write(MessageCatalogue $catalogue, $format, $options = array());
+    public function write(MessageCatalogue $catalogue, $format, $options = []);
 }
diff --git a/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/Constraint.php
index f96705521133f..4b7e6bc083a61 100644
--- a/src/Symfony/Component/Validator/Constraint.php
+++ b/src/Symfony/Component/Validator/Constraint.php
@@ -49,7 +49,7 @@ abstract class Constraint
     /**
      * Maps error codes to the names of their constants.
      */
-    protected static $errorNames = array();
+    protected static $errorNames = [];
 
     /**
      * Domain-specific data attached to a constraint.
@@ -105,7 +105,7 @@ public static function getErrorName($errorCode)
      */
     public function __construct($options = null)
     {
-        $invalidOptions = array();
+        $invalidOptions = [];
         $missingOptions = array_flip((array) $this->getRequiredOptions());
         $knownOptions = get_object_vars($this);
 
@@ -173,7 +173,7 @@ public function __set($option, $value)
             return;
         }
 
-        throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint %s', $option, \get_class($this)), array($option));
+        throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint %s', $option, \get_class($this)), [$option]);
     }
 
     /**
@@ -194,12 +194,12 @@ public function __set($option, $value)
     public function __get($option)
     {
         if ('groups' === $option) {
-            $this->groups = array(self::DEFAULT_GROUP);
+            $this->groups = [self::DEFAULT_GROUP];
 
             return $this->groups;
         }
 
-        throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint %s', $option, \get_class($this)), array($option));
+        throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint %s', $option, \get_class($this)), [$option]);
     }
 
     /**
@@ -248,7 +248,7 @@ public function getDefaultOption()
      */
     public function getRequiredOptions()
     {
-        return array();
+        return [];
     }
 
     /**
diff --git a/src/Symfony/Component/Validator/ConstraintValidatorFactory.php b/src/Symfony/Component/Validator/ConstraintValidatorFactory.php
index 86e44e2a5580f..45f3ca94e8e80 100644
--- a/src/Symfony/Component/Validator/ConstraintValidatorFactory.php
+++ b/src/Symfony/Component/Validator/ConstraintValidatorFactory.php
@@ -24,7 +24,7 @@
  */
 class ConstraintValidatorFactory implements ConstraintValidatorFactoryInterface
 {
-    protected $validators = array();
+    protected $validators = [];
 
     public function __construct()
     {
diff --git a/src/Symfony/Component/Validator/ConstraintViolationList.php b/src/Symfony/Component/Validator/ConstraintViolationList.php
index c18dd2195fab9..c30ee57cb268b 100644
--- a/src/Symfony/Component/Validator/ConstraintViolationList.php
+++ b/src/Symfony/Component/Validator/ConstraintViolationList.php
@@ -21,14 +21,14 @@ class ConstraintViolationList implements \IteratorAggregate, ConstraintViolation
     /**
      * @var ConstraintViolationInterface[]
      */
-    private $violations = array();
+    private $violations = [];
 
     /**
      * Creates a new constraint violation list.
      *
      * @param ConstraintViolationInterface[] $violations The constraint violations to add to the list
      */
-    public function __construct(array $violations = array())
+    public function __construct(array $violations = [])
     {
         foreach ($violations as $violation) {
             $this->add($violation);
@@ -169,7 +169,7 @@ public function offsetUnset($offset)
     public function findByCodes($codes)
     {
         $codes = (array) $codes;
-        $violations = array();
+        $violations = [];
         foreach ($this as $violation) {
             if (\in_array($violation->getCode(), $codes, true)) {
                 $violations[] = $violation;
diff --git a/src/Symfony/Component/Validator/Constraints/AbstractComparison.php b/src/Symfony/Component/Validator/Constraints/AbstractComparison.php
index 0a7e2f3fb733e..89c2690c081cd 100644
--- a/src/Symfony/Component/Validator/Constraints/AbstractComparison.php
+++ b/src/Symfony/Component/Validator/Constraints/AbstractComparison.php
@@ -33,7 +33,7 @@ abstract class AbstractComparison extends Constraint
     public function __construct($options = null)
     {
         if (null === $options) {
-            $options = array();
+            $options = [];
         }
 
         if (\is_array($options)) {
diff --git a/src/Symfony/Component/Validator/Constraints/All.php b/src/Symfony/Component/Validator/Constraints/All.php
index b531a1d645af3..d3fe49525f6fa 100644
--- a/src/Symfony/Component/Validator/Constraints/All.php
+++ b/src/Symfony/Component/Validator/Constraints/All.php
@@ -19,7 +19,7 @@
  */
 class All extends Composite
 {
-    public $constraints = array();
+    public $constraints = [];
 
     public function getDefaultOption()
     {
@@ -28,7 +28,7 @@ public function getDefaultOption()
 
     public function getRequiredOptions()
     {
-        return array('constraints');
+        return ['constraints'];
     }
 
     protected function getCompositeOption()
diff --git a/src/Symfony/Component/Validator/Constraints/Bic.php b/src/Symfony/Component/Validator/Constraints/Bic.php
index dee5d526938e9..5cb37b7df2b05 100644
--- a/src/Symfony/Component/Validator/Constraints/Bic.php
+++ b/src/Symfony/Component/Validator/Constraints/Bic.php
@@ -27,13 +27,13 @@ class Bic extends Constraint
     const INVALID_COUNTRY_CODE_ERROR = '1ce76f8d-3c1f-451c-9e62-fe9c3ed486ae';
     const INVALID_CASE_ERROR = '11884038-3312-4ae5-9d04-699f782130c7';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::INVALID_LENGTH_ERROR => 'INVALID_LENGTH_ERROR',
         self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
         self::INVALID_BANK_CODE_ERROR => 'INVALID_BANK_CODE_ERROR',
         self::INVALID_COUNTRY_CODE_ERROR => 'INVALID_COUNTRY_CODE_ERROR',
         self::INVALID_CASE_ERROR => 'INVALID_CASE_ERROR',
-    );
+    ];
 
     public $message = 'This is not a valid Business Identifier Code (BIC).';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/BicValidator.php b/src/Symfony/Component/Validator/Constraints/BicValidator.php
index 2a27beff9bf63..fc363461587e5 100644
--- a/src/Symfony/Component/Validator/Constraints/BicValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/BicValidator.php
@@ -38,7 +38,7 @@ public function validate($value, Constraint $constraint)
         $canonicalize = str_replace(' ', '', $value);
 
         // the bic must be either 8 or 11 characters long
-        if (!\in_array(\strlen($canonicalize), array(8, 11))) {
+        if (!\in_array(\strlen($canonicalize), [8, 11])) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
                 ->setCode(Bic::INVALID_LENGTH_ERROR)
diff --git a/src/Symfony/Component/Validator/Constraints/Blank.php b/src/Symfony/Component/Validator/Constraints/Blank.php
index 030b21f959d97..4fa913c85f9b6 100644
--- a/src/Symfony/Component/Validator/Constraints/Blank.php
+++ b/src/Symfony/Component/Validator/Constraints/Blank.php
@@ -23,9 +23,9 @@ class Blank extends Constraint
 {
     const NOT_BLANK_ERROR = '183ad2de-533d-4796-a439-6d3c3852b549';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::NOT_BLANK_ERROR => 'NOT_BLANK_ERROR',
-    );
+    ];
 
     public $message = 'This value should be blank.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/Callback.php b/src/Symfony/Component/Validator/Constraints/Callback.php
index 16231105e1f22..8bf6d68cac6c4 100644
--- a/src/Symfony/Component/Validator/Constraints/Callback.php
+++ b/src/Symfony/Component/Validator/Constraints/Callback.php
@@ -37,7 +37,7 @@ public function __construct($options = null)
         }
 
         if (\is_array($options) && !isset($options['callback']) && !isset($options['groups']) && !isset($options['payload'])) {
-            $options = array('callback' => $options);
+            $options = ['callback' => $options];
         }
 
         parent::__construct($options);
@@ -56,6 +56,6 @@ public function getDefaultOption()
      */
     public function getTargets()
     {
-        return array(self::CLASS_CONSTRAINT, self::PROPERTY_CONSTRAINT);
+        return [self::CLASS_CONSTRAINT, self::PROPERTY_CONSTRAINT];
     }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/CardScheme.php b/src/Symfony/Component/Validator/Constraints/CardScheme.php
index 40c32e879e83f..4284826008da6 100644
--- a/src/Symfony/Component/Validator/Constraints/CardScheme.php
+++ b/src/Symfony/Component/Validator/Constraints/CardScheme.php
@@ -27,10 +27,10 @@ class CardScheme extends Constraint
     const NOT_NUMERIC_ERROR = 'a2ad9231-e827-485f-8a1e-ef4d9a6d5c2e';
     const INVALID_FORMAT_ERROR = 'a8faedbf-1c2f-4695-8d22-55783be8efed';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::NOT_NUMERIC_ERROR => 'NOT_NUMERIC_ERROR',
         self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR',
-    );
+    ];
 
     public $message = 'Unsupported card type or invalid card number.';
     public $schemes;
@@ -42,6 +42,6 @@ public function getDefaultOption()
 
     public function getRequiredOptions()
     {
-        return array('schemes');
+        return ['schemes'];
     }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/Choice.php b/src/Symfony/Component/Validator/Constraints/Choice.php
index 4b93c70e4a5f4..222dca3d5d606 100644
--- a/src/Symfony/Component/Validator/Constraints/Choice.php
+++ b/src/Symfony/Component/Validator/Constraints/Choice.php
@@ -25,11 +25,11 @@ class Choice extends Constraint
     const TOO_FEW_ERROR = '11edd7eb-5872-4b6e-9f12-89923999fd0e';
     const TOO_MANY_ERROR = '9bd98e49-211c-433f-8630-fd1c2d0f08c3';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::NO_SUCH_CHOICE_ERROR => 'NO_SUCH_CHOICE_ERROR',
         self::TOO_FEW_ERROR => 'TOO_FEW_ERROR',
         self::TOO_MANY_ERROR => 'TOO_MANY_ERROR',
-    );
+    ];
 
     public $choices;
     public $callback;
diff --git a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
index e53b99a0d839e..00577ef462518 100644
--- a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
@@ -47,8 +47,8 @@ public function validate($value, Constraint $constraint)
         }
 
         if ($constraint->callback) {
-            if (!\is_callable($choices = array($this->context->getObject(), $constraint->callback))
-                && !\is_callable($choices = array($this->context->getClassName(), $constraint->callback))
+            if (!\is_callable($choices = [$this->context->getObject(), $constraint->callback])
+                && !\is_callable($choices = [$this->context->getClassName(), $constraint->callback])
                 && !\is_callable($choices = $constraint->callback)
             ) {
                 throw new ConstraintDefinitionException('The Choice constraint expects a valid callback');
diff --git a/src/Symfony/Component/Validator/Constraints/Collection.php b/src/Symfony/Component/Validator/Constraints/Collection.php
index 2b5679b22d07e..21427722d9491 100644
--- a/src/Symfony/Component/Validator/Constraints/Collection.php
+++ b/src/Symfony/Component/Validator/Constraints/Collection.php
@@ -24,12 +24,12 @@ class Collection extends Composite
     const MISSING_FIELD_ERROR = '2fa2158c-2a7f-484b-98aa-975522539ff8';
     const NO_SUCH_FIELD_ERROR = '7703c766-b5d5-4cef-ace7-ae0dd82304e9';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::MISSING_FIELD_ERROR => 'MISSING_FIELD_ERROR',
         self::NO_SUCH_FIELD_ERROR => 'NO_SUCH_FIELD_ERROR',
-    );
+    ];
 
-    public $fields = array();
+    public $fields = [];
     public $allowExtraFields = false;
     public $allowMissingFields = false;
     public $extraFieldsMessage = 'This field was not expected.';
@@ -42,8 +42,8 @@ public function __construct($options = null)
     {
         // no known options set? $options is the fields array
         if (\is_array($options)
-            && !array_intersect(array_keys($options), array('groups', 'fields', 'allowExtraFields', 'allowMissingFields', 'extraFieldsMessage', 'missingFieldsMessage'))) {
-            $options = array('fields' => $options);
+            && !array_intersect(array_keys($options), ['groups', 'fields', 'allowExtraFields', 'allowMissingFields', 'extraFieldsMessage', 'missingFieldsMessage'])) {
+            $options = ['fields' => $options];
         }
 
         parent::__construct($options);
@@ -75,7 +75,7 @@ protected function initializeNestedConstraints()
 
     public function getRequiredOptions()
     {
-        return array('fields');
+        return ['fields'];
     }
 
     protected function getCompositeOption()
diff --git a/src/Symfony/Component/Validator/Constraints/Composite.php b/src/Symfony/Component/Validator/Constraints/Composite.php
index d233f06335e1a..18ea5e319f7f1 100644
--- a/src/Symfony/Component/Validator/Constraints/Composite.php
+++ b/src/Symfony/Component/Validator/Constraints/Composite.php
@@ -62,7 +62,7 @@ public function __construct($options = null)
         $nestedConstraints = $this->$compositeOption;
 
         if (!\is_array($nestedConstraints)) {
-            $nestedConstraints = array($nestedConstraints);
+            $nestedConstraints = [$nestedConstraints];
         }
 
         foreach ($nestedConstraints as $constraint) {
@@ -80,7 +80,7 @@ public function __construct($options = null)
         }
 
         if (!property_exists($this, 'groups')) {
-            $mergedGroups = array();
+            $mergedGroups = [];
 
             foreach ($nestedConstraints as $constraint) {
                 foreach ($constraint->groups as $group) {
diff --git a/src/Symfony/Component/Validator/Constraints/Count.php b/src/Symfony/Component/Validator/Constraints/Count.php
index 0a54ee78db772..8de10edfc8800 100644
--- a/src/Symfony/Component/Validator/Constraints/Count.php
+++ b/src/Symfony/Component/Validator/Constraints/Count.php
@@ -25,10 +25,10 @@ class Count extends Constraint
     const TOO_FEW_ERROR = 'bef8e338-6ae5-4caf-b8e2-50e7b0579e69';
     const TOO_MANY_ERROR = '756b1212-697c-468d-a9ad-50dd783bb169';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::TOO_FEW_ERROR => 'TOO_FEW_ERROR',
         self::TOO_MANY_ERROR => 'TOO_MANY_ERROR',
-    );
+    ];
 
     public $minMessage = 'This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.';
     public $maxMessage = 'This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.';
@@ -39,16 +39,16 @@ class Count extends Constraint
     public function __construct($options = null)
     {
         if (null !== $options && !\is_array($options)) {
-            $options = array(
+            $options = [
                 'min' => $options,
                 'max' => $options,
-            );
+            ];
         }
 
         parent::__construct($options);
 
         if (null === $this->min && null === $this->max) {
-            throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s', __CLASS__), array('min', 'max'));
+            throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s', __CLASS__), ['min', 'max']);
         }
     }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/Country.php b/src/Symfony/Component/Validator/Constraints/Country.php
index 1b76570a8c5fd..7ed2e0582ed93 100644
--- a/src/Symfony/Component/Validator/Constraints/Country.php
+++ b/src/Symfony/Component/Validator/Constraints/Country.php
@@ -23,9 +23,9 @@ class Country extends Constraint
 {
     const NO_SUCH_COUNTRY_ERROR = '8f900c12-61bd-455d-9398-996cd040f7f0';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::NO_SUCH_COUNTRY_ERROR => 'NO_SUCH_COUNTRY_ERROR',
-    );
+    ];
 
     public $message = 'This value is not a valid country.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/Currency.php b/src/Symfony/Component/Validator/Constraints/Currency.php
index d28f94cb66a74..5d5ced59df9d1 100644
--- a/src/Symfony/Component/Validator/Constraints/Currency.php
+++ b/src/Symfony/Component/Validator/Constraints/Currency.php
@@ -24,9 +24,9 @@ class Currency extends Constraint
 {
     const NO_SUCH_CURRENCY_ERROR = '69945ac1-2db4-405f-bec7-d2772f73df52';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::NO_SUCH_CURRENCY_ERROR => 'NO_SUCH_CURRENCY_ERROR',
-    );
+    ];
 
     public $message = 'This value is not a valid currency.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/Date.php b/src/Symfony/Component/Validator/Constraints/Date.php
index 256341312246c..530475ff7d0ac 100644
--- a/src/Symfony/Component/Validator/Constraints/Date.php
+++ b/src/Symfony/Component/Validator/Constraints/Date.php
@@ -24,10 +24,10 @@ class Date extends Constraint
     const INVALID_FORMAT_ERROR = '69819696-02ac-4a99-9ff0-14e127c4d1bc';
     const INVALID_DATE_ERROR = '3c184ce5-b31d-4de7-8b76-326da7b2be93';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR',
         self::INVALID_DATE_ERROR => 'INVALID_DATE_ERROR',
-    );
+    ];
 
     public $message = 'This value is not a valid date.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/DateTime.php b/src/Symfony/Component/Validator/Constraints/DateTime.php
index c65f185ae428c..f88c62e0aea51 100644
--- a/src/Symfony/Component/Validator/Constraints/DateTime.php
+++ b/src/Symfony/Component/Validator/Constraints/DateTime.php
@@ -25,11 +25,11 @@ class DateTime extends Constraint
     const INVALID_DATE_ERROR = 'd52afa47-620d-4d99-9f08-f4d85b36e33c';
     const INVALID_TIME_ERROR = '5e797c9d-74f7-4098-baa3-94390c447b27';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR',
         self::INVALID_DATE_ERROR => 'INVALID_DATE_ERROR',
         self::INVALID_TIME_ERROR => 'INVALID_TIME_ERROR',
-    );
+    ];
 
     public $format = 'Y-m-d H:i:s';
     public $message = 'This value is not a valid datetime.';
diff --git a/src/Symfony/Component/Validator/Constraints/Email.php b/src/Symfony/Component/Validator/Constraints/Email.php
index a9d9ab15391fa..56ddd3da65ae2 100644
--- a/src/Symfony/Component/Validator/Constraints/Email.php
+++ b/src/Symfony/Component/Validator/Constraints/Email.php
@@ -25,11 +25,11 @@ class Email extends Constraint
     const MX_CHECK_FAILED_ERROR = 'bf447c1c-0266-4e10-9c6c-573df282e413';
     const HOST_CHECK_FAILED_ERROR = '7da53a8b-56f3-4288-bb3e-ee9ede4ef9a1';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::INVALID_FORMAT_ERROR => 'STRICT_CHECK_FAILED_ERROR',
         self::MX_CHECK_FAILED_ERROR => 'MX_CHECK_FAILED_ERROR',
         self::HOST_CHECK_FAILED_ERROR => 'HOST_CHECK_FAILED_ERROR',
-    );
+    ];
 
     public $message = 'This value is not a valid email address.';
     public $checkMX = false;
diff --git a/src/Symfony/Component/Validator/Constraints/EqualTo.php b/src/Symfony/Component/Validator/Constraints/EqualTo.php
index 4b22c6dcca3e1..ccd67675e7363 100644
--- a/src/Symfony/Component/Validator/Constraints/EqualTo.php
+++ b/src/Symfony/Component/Validator/Constraints/EqualTo.php
@@ -22,9 +22,9 @@ class EqualTo extends AbstractComparison
 {
     const NOT_EQUAL_ERROR = '478618a7-95ba-473d-9101-cabd45e49115';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::NOT_EQUAL_ERROR => 'NOT_EQUAL_ERROR',
-    );
+    ];
 
     public $message = 'This value should be equal to {{ compared_value }}.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/Existence.php b/src/Symfony/Component/Validator/Constraints/Existence.php
index 5ea6ffe643eec..903cf63913cfa 100644
--- a/src/Symfony/Component/Validator/Constraints/Existence.php
+++ b/src/Symfony/Component/Validator/Constraints/Existence.php
@@ -16,7 +16,7 @@
  */
 abstract class Existence extends Composite
 {
-    public $constraints = array();
+    public $constraints = [];
 
     public function getDefaultOption()
     {
diff --git a/src/Symfony/Component/Validator/Constraints/Expression.php b/src/Symfony/Component/Validator/Constraints/Expression.php
index 3329bd2494028..23eea2093f56c 100644
--- a/src/Symfony/Component/Validator/Constraints/Expression.php
+++ b/src/Symfony/Component/Validator/Constraints/Expression.php
@@ -24,9 +24,9 @@ class Expression extends Constraint
 {
     const EXPRESSION_FAILED_ERROR = '6b3befbc-2f01-4ddf-be21-b57898905284';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::EXPRESSION_FAILED_ERROR => 'EXPRESSION_FAILED_ERROR',
-    );
+    ];
 
     public $message = 'This value is not valid.';
     public $expression;
@@ -44,7 +44,7 @@ public function getDefaultOption()
      */
     public function getRequiredOptions()
     {
-        return array('expression');
+        return ['expression'];
     }
 
     /**
@@ -52,7 +52,7 @@ public function getRequiredOptions()
      */
     public function getTargets()
     {
-        return array(self::CLASS_CONSTRAINT, self::PROPERTY_CONSTRAINT);
+        return [self::CLASS_CONSTRAINT, self::PROPERTY_CONSTRAINT];
     }
 
     /**
diff --git a/src/Symfony/Component/Validator/Constraints/File.php b/src/Symfony/Component/Validator/Constraints/File.php
index 1e191382abe1f..5221857101af2 100644
--- a/src/Symfony/Component/Validator/Constraints/File.php
+++ b/src/Symfony/Component/Validator/Constraints/File.php
@@ -32,16 +32,16 @@ class File extends Constraint
     const TOO_LARGE_ERROR = 'df8637af-d466-48c6-a59d-e7126250a654';
     const INVALID_MIME_TYPE_ERROR = '744f00bc-4389-4c74-92de-9a43cde55534';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::NOT_FOUND_ERROR => 'NOT_FOUND_ERROR',
         self::NOT_READABLE_ERROR => 'NOT_READABLE_ERROR',
         self::EMPTY_ERROR => 'EMPTY_ERROR',
         self::TOO_LARGE_ERROR => 'TOO_LARGE_ERROR',
         self::INVALID_MIME_TYPE_ERROR => 'INVALID_MIME_TYPE_ERROR',
-    );
+    ];
 
     public $binaryFormat;
-    public $mimeTypes = array();
+    public $mimeTypes = [];
     public $notFoundMessage = 'The file could not be found.';
     public $notReadableMessage = 'The file is not readable.';
     public $maxSizeMessage = 'The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.';
@@ -99,12 +99,12 @@ public function __isset($option)
 
     private function normalizeBinaryFormat($maxSize)
     {
-        $factors = array(
+        $factors = [
             'k' => 1000,
             'ki' => 1 << 10,
             'm' => 1000000,
             'mi' => 1 << 20,
-        );
+        ];
         if (ctype_digit((string) $maxSize)) {
             $this->maxSize = (int) $maxSize;
             $this->binaryFormat = null === $this->binaryFormat ? false : $this->binaryFormat;
diff --git a/src/Symfony/Component/Validator/Constraints/FileValidator.php b/src/Symfony/Component/Validator/Constraints/FileValidator.php
index 7b556775df5df..d3e3833ab72c0 100644
--- a/src/Symfony/Component/Validator/Constraints/FileValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/FileValidator.php
@@ -27,13 +27,13 @@ class FileValidator extends ConstraintValidator
     const KIB_BYTES = 1024;
     const MIB_BYTES = 1048576;
 
-    private static $suffices = array(
+    private static $suffices = [
         1 => 'bytes',
         self::KB_BYTES => 'kB',
         self::MB_BYTES => 'MB',
         self::KIB_BYTES => 'KiB',
         self::MIB_BYTES => 'MiB',
-    );
+    ];
 
     /**
      * {@inheritdoc}
@@ -233,6 +233,6 @@ private function factorizeSizes($size, $limit, $binaryFormat)
             $sizeAsString = (string) round($size / $coef, 2);
         }
 
-        return array($sizeAsString, $limitAsString, self::$suffices[$coef]);
+        return [$sizeAsString, $limitAsString, self::$suffices[$coef]];
     }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/GreaterThan.php b/src/Symfony/Component/Validator/Constraints/GreaterThan.php
index c2ca2dcb82f23..ba225b44b6153 100644
--- a/src/Symfony/Component/Validator/Constraints/GreaterThan.php
+++ b/src/Symfony/Component/Validator/Constraints/GreaterThan.php
@@ -22,9 +22,9 @@ class GreaterThan extends AbstractComparison
 {
     const TOO_LOW_ERROR = '778b7ae0-84d3-481a-9dec-35fdb64b1d78';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::TOO_LOW_ERROR => 'TOO_LOW_ERROR',
-    );
+    ];
 
     public $message = 'This value should be greater than {{ compared_value }}.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/GreaterThanOrEqual.php b/src/Symfony/Component/Validator/Constraints/GreaterThanOrEqual.php
index 9b3743d073219..2c88f3ad05fb5 100644
--- a/src/Symfony/Component/Validator/Constraints/GreaterThanOrEqual.php
+++ b/src/Symfony/Component/Validator/Constraints/GreaterThanOrEqual.php
@@ -22,9 +22,9 @@ class GreaterThanOrEqual extends AbstractComparison
 {
     const TOO_LOW_ERROR = 'ea4e51d1-3342-48bd-87f1-9e672cd90cad';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::TOO_LOW_ERROR => 'TOO_LOW_ERROR',
-    );
+    ];
 
     public $message = 'This value should be greater than or equal to {{ compared_value }}.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/Iban.php b/src/Symfony/Component/Validator/Constraints/Iban.php
index bcb30655aa44b..231f8c838dd57 100644
--- a/src/Symfony/Component/Validator/Constraints/Iban.php
+++ b/src/Symfony/Component/Validator/Constraints/Iban.php
@@ -29,13 +29,13 @@ class Iban extends Constraint
     const INVALID_FORMAT_ERROR = 'c8d318f1-2ecc-41ba-b983-df70d225cf5a';
     const NOT_SUPPORTED_COUNTRY_CODE_ERROR = 'e2c259f3-4b46-48e6-b72e-891658158ec8';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::INVALID_COUNTRY_CODE_ERROR => 'INVALID_COUNTRY_CODE_ERROR',
         self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
         self::CHECKSUM_FAILED_ERROR => 'CHECKSUM_FAILED_ERROR',
         self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR',
         self::NOT_SUPPORTED_COUNTRY_CODE_ERROR => 'NOT_SUPPORTED_COUNTRY_CODE_ERROR',
-    );
+    ];
 
     public $message = 'This is not a valid International Bank Account Number (IBAN).';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/IbanValidator.php b/src/Symfony/Component/Validator/Constraints/IbanValidator.php
index 00f65049d038f..fc14eea7dbe47 100644
--- a/src/Symfony/Component/Validator/Constraints/IbanValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/IbanValidator.php
@@ -35,7 +35,7 @@ class IbanValidator extends ConstraintValidator
      *
      * @see https://www.swift.com/sites/default/files/resources/iban_registry.pdf
      */
-    private static $formats = array(
+    private static $formats = [
         'AD' => 'AD\d{2}\d{4}\d{4}[\dA-Z]{12}', // Andorra
         'AE' => 'AE\d{2}\d{3}\d{16}', // United Arab Emirates
         'AL' => 'AL\d{2}\d{8}[\dA-Z]{16}', // Albania
@@ -134,7 +134,7 @@ class IbanValidator extends ConstraintValidator
         'WF' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // Wallis and Futuna Islands
         'XK' => 'XK\d{2}\d{4}\d{10}\d{2}', // Republic of Kosovo
         'YT' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // Mayotte
-    );
+    ];
 
     /**
      * {@inheritdoc}
diff --git a/src/Symfony/Component/Validator/Constraints/IdenticalTo.php b/src/Symfony/Component/Validator/Constraints/IdenticalTo.php
index a7dadff833c5a..6c1bc2b1d7646 100644
--- a/src/Symfony/Component/Validator/Constraints/IdenticalTo.php
+++ b/src/Symfony/Component/Validator/Constraints/IdenticalTo.php
@@ -22,9 +22,9 @@ class IdenticalTo extends AbstractComparison
 {
     const NOT_IDENTICAL_ERROR = '2a8cc50f-58a2-4536-875e-060a2ce69ed5';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::NOT_IDENTICAL_ERROR => 'NOT_IDENTICAL_ERROR',
-    );
+    ];
 
     public $message = 'This value should be identical to {{ compared_value_type }} {{ compared_value }}.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/Image.php b/src/Symfony/Component/Validator/Constraints/Image.php
index c3c2c7a237a82..21005d9ea5533 100644
--- a/src/Symfony/Component/Validator/Constraints/Image.php
+++ b/src/Symfony/Component/Validator/Constraints/Image.php
@@ -36,7 +36,7 @@ class Image extends File
 
     // Include the mapping from the base class
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::NOT_FOUND_ERROR => 'NOT_FOUND_ERROR',
         self::NOT_READABLE_ERROR => 'NOT_READABLE_ERROR',
         self::EMPTY_ERROR => 'EMPTY_ERROR',
@@ -55,7 +55,7 @@ class Image extends File
         self::LANDSCAPE_NOT_ALLOWED_ERROR => 'LANDSCAPE_NOT_ALLOWED_ERROR',
         self::PORTRAIT_NOT_ALLOWED_ERROR => 'PORTRAIT_NOT_ALLOWED_ERROR',
         self::CORRUPTED_IMAGE_ERROR => 'CORRUPTED_IMAGE_ERROR',
-    );
+    ];
 
     public $mimeTypes = 'image/*';
     public $minWidth;
diff --git a/src/Symfony/Component/Validator/Constraints/Ip.php b/src/Symfony/Component/Validator/Constraints/Ip.php
index f45c4cacebca0..aff99d4672d77 100644
--- a/src/Symfony/Component/Validator/Constraints/Ip.php
+++ b/src/Symfony/Component/Validator/Constraints/Ip.php
@@ -46,7 +46,7 @@ class Ip extends Constraint
 
     const INVALID_IP_ERROR = 'b1b427ae-9f6f-41b0-aa9b-84511fbb3c5b';
 
-    protected static $versions = array(
+    protected static $versions = [
         self::V4,
         self::V6,
         self::ALL,
@@ -62,11 +62,11 @@ class Ip extends Constraint
         self::V4_ONLY_PUBLIC,
         self::V6_ONLY_PUBLIC,
         self::ALL_ONLY_PUBLIC,
-    );
+    ];
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::INVALID_IP_ERROR => 'INVALID_IP_ERROR',
-    );
+    ];
 
     public $version = self::V4;
 
diff --git a/src/Symfony/Component/Validator/Constraints/IsFalse.php b/src/Symfony/Component/Validator/Constraints/IsFalse.php
index 8332e1874f5c7..d488c616dd424 100644
--- a/src/Symfony/Component/Validator/Constraints/IsFalse.php
+++ b/src/Symfony/Component/Validator/Constraints/IsFalse.php
@@ -23,9 +23,9 @@ class IsFalse extends Constraint
 {
     const NOT_FALSE_ERROR = 'd53a91b0-def3-426a-83d7-269da7ab4200';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::NOT_FALSE_ERROR => 'NOT_FALSE_ERROR',
-    );
+    ];
 
     public $message = 'This value should be false.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/IsNull.php b/src/Symfony/Component/Validator/Constraints/IsNull.php
index fdd2930916ec8..e010f9cf0696d 100644
--- a/src/Symfony/Component/Validator/Constraints/IsNull.php
+++ b/src/Symfony/Component/Validator/Constraints/IsNull.php
@@ -23,9 +23,9 @@ class IsNull extends Constraint
 {
     const NOT_NULL_ERROR = '60d2f30b-8cfa-4372-b155-9656634de120';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::NOT_NULL_ERROR => 'NOT_NULL_ERROR',
-    );
+    ];
 
     public $message = 'This value should be null.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/IsTrue.php b/src/Symfony/Component/Validator/Constraints/IsTrue.php
index 405a96a422d17..84f6ce15a7c11 100644
--- a/src/Symfony/Component/Validator/Constraints/IsTrue.php
+++ b/src/Symfony/Component/Validator/Constraints/IsTrue.php
@@ -23,9 +23,9 @@ class IsTrue extends Constraint
 {
     const NOT_TRUE_ERROR = '2beabf1c-54c0-4882-a928-05249b26e23b';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::NOT_TRUE_ERROR => 'NOT_TRUE_ERROR',
-    );
+    ];
 
     public $message = 'This value should be true.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/Isbn.php b/src/Symfony/Component/Validator/Constraints/Isbn.php
index 615feb66416d4..6629c823e1aa7 100644
--- a/src/Symfony/Component/Validator/Constraints/Isbn.php
+++ b/src/Symfony/Component/Validator/Constraints/Isbn.php
@@ -29,13 +29,13 @@ class Isbn extends Constraint
     const CHECKSUM_FAILED_ERROR = '2881c032-660f-46b6-8153-d352d9706640';
     const TYPE_NOT_RECOGNIZED_ERROR = 'fa54a457-f042-441f-89c4-066ee5bdd3e1';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::TOO_SHORT_ERROR => 'TOO_SHORT_ERROR',
         self::TOO_LONG_ERROR => 'TOO_LONG_ERROR',
         self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
         self::CHECKSUM_FAILED_ERROR => 'CHECKSUM_FAILED_ERROR',
         self::TYPE_NOT_RECOGNIZED_ERROR => 'TYPE_NOT_RECOGNIZED_ERROR',
-    );
+    ];
 
     public $isbn10Message = 'This value is not a valid ISBN-10.';
     public $isbn13Message = 'This value is not a valid ISBN-13.';
diff --git a/src/Symfony/Component/Validator/Constraints/Issn.php b/src/Symfony/Component/Validator/Constraints/Issn.php
index a2fecdd35c386..88d181fa63af7 100644
--- a/src/Symfony/Component/Validator/Constraints/Issn.php
+++ b/src/Symfony/Component/Validator/Constraints/Issn.php
@@ -29,14 +29,14 @@ class Issn extends Constraint
     const INVALID_CASE_ERROR = '7b6dd393-7523-4a6c-b84d-72b91bba5e1a';
     const CHECKSUM_FAILED_ERROR = 'b0f92dbc-667c-48de-b526-ad9586d43e85';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::TOO_SHORT_ERROR => 'TOO_SHORT_ERROR',
         self::TOO_LONG_ERROR => 'TOO_LONG_ERROR',
         self::MISSING_HYPHEN_ERROR => 'MISSING_HYPHEN_ERROR',
         self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
         self::INVALID_CASE_ERROR => 'INVALID_CASE_ERROR',
         self::CHECKSUM_FAILED_ERROR => 'CHECKSUM_FAILED_ERROR',
-    );
+    ];
 
     public $message = 'This value is not a valid ISSN.';
     public $caseSensitive = false;
diff --git a/src/Symfony/Component/Validator/Constraints/Language.php b/src/Symfony/Component/Validator/Constraints/Language.php
index 0e676b7aabcda..745eb2055b68d 100644
--- a/src/Symfony/Component/Validator/Constraints/Language.php
+++ b/src/Symfony/Component/Validator/Constraints/Language.php
@@ -23,9 +23,9 @@ class Language extends Constraint
 {
     const NO_SUCH_LANGUAGE_ERROR = 'ee65fec4-9a20-4202-9f39-ca558cd7bdf7';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::NO_SUCH_LANGUAGE_ERROR => 'NO_SUCH_LANGUAGE_ERROR',
-    );
+    ];
 
     public $message = 'This value is not a valid language.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/Length.php b/src/Symfony/Component/Validator/Constraints/Length.php
index 20a17fabca55e..79aa473204eaf 100644
--- a/src/Symfony/Component/Validator/Constraints/Length.php
+++ b/src/Symfony/Component/Validator/Constraints/Length.php
@@ -26,11 +26,11 @@ class Length extends Constraint
     const TOO_LONG_ERROR = 'd94b19cc-114f-4f44-9cc4-4138e80a87b9';
     const INVALID_CHARACTERS_ERROR = '35e6a710-aa2e-4719-b58e-24b35749b767';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::TOO_SHORT_ERROR => 'TOO_SHORT_ERROR',
         self::TOO_LONG_ERROR => 'TOO_LONG_ERROR',
         self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
-    );
+    ];
 
     public $maxMessage = 'This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.';
     public $minMessage = 'This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.';
@@ -43,16 +43,16 @@ class Length extends Constraint
     public function __construct($options = null)
     {
         if (null !== $options && !\is_array($options)) {
-            $options = array(
+            $options = [
                 'min' => $options,
                 'max' => $options,
-            );
+            ];
         }
 
         parent::__construct($options);
 
         if (null === $this->min && null === $this->max) {
-            throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s', __CLASS__), array('min', 'max'));
+            throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s', __CLASS__), ['min', 'max']);
         }
     }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/LessThan.php b/src/Symfony/Component/Validator/Constraints/LessThan.php
index 1bbb50878b1a6..8ea07ace2e849 100644
--- a/src/Symfony/Component/Validator/Constraints/LessThan.php
+++ b/src/Symfony/Component/Validator/Constraints/LessThan.php
@@ -22,9 +22,9 @@ class LessThan extends AbstractComparison
 {
     const TOO_HIGH_ERROR = '079d7420-2d13-460c-8756-de810eeb37d2';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::TOO_HIGH_ERROR => 'TOO_HIGH_ERROR',
-    );
+    ];
 
     public $message = 'This value should be less than {{ compared_value }}.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/LessThanOrEqual.php b/src/Symfony/Component/Validator/Constraints/LessThanOrEqual.php
index d118942385c57..74f7aeb8fadea 100644
--- a/src/Symfony/Component/Validator/Constraints/LessThanOrEqual.php
+++ b/src/Symfony/Component/Validator/Constraints/LessThanOrEqual.php
@@ -22,9 +22,9 @@ class LessThanOrEqual extends AbstractComparison
 {
     const TOO_HIGH_ERROR = '079d7420-2d13-460c-8756-de810eeb37d2';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::TOO_HIGH_ERROR => 'TOO_HIGH_ERROR',
-    );
+    ];
 
     public $message = 'This value should be less than or equal to {{ compared_value }}.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/Locale.php b/src/Symfony/Component/Validator/Constraints/Locale.php
index 5aa7070402e2a..759f99e1909ec 100644
--- a/src/Symfony/Component/Validator/Constraints/Locale.php
+++ b/src/Symfony/Component/Validator/Constraints/Locale.php
@@ -23,9 +23,9 @@ class Locale extends Constraint
 {
     const NO_SUCH_LOCALE_ERROR = 'a0af4293-1f1a-4a1c-a328-979cba6182a2';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::NO_SUCH_LOCALE_ERROR => 'NO_SUCH_LOCALE_ERROR',
-    );
+    ];
 
     public $message = 'This value is not a valid locale.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/Luhn.php b/src/Symfony/Component/Validator/Constraints/Luhn.php
index 67f152d29dc53..85eebc793beab 100644
--- a/src/Symfony/Component/Validator/Constraints/Luhn.php
+++ b/src/Symfony/Component/Validator/Constraints/Luhn.php
@@ -28,10 +28,10 @@ class Luhn extends Constraint
     const INVALID_CHARACTERS_ERROR = 'dfad6d23-1b74-4374-929b-5cbb56fc0d9e';
     const CHECKSUM_FAILED_ERROR = '4d760774-3f50-4cd5-a6d5-b10a3299d8d3';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
         self::CHECKSUM_FAILED_ERROR => 'CHECKSUM_FAILED_ERROR',
-    );
+    ];
 
     public $message = 'Invalid card number.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/NotBlank.php b/src/Symfony/Component/Validator/Constraints/NotBlank.php
index e059f1028a2cb..7616c426c7da0 100644
--- a/src/Symfony/Component/Validator/Constraints/NotBlank.php
+++ b/src/Symfony/Component/Validator/Constraints/NotBlank.php
@@ -23,9 +23,9 @@ class NotBlank extends Constraint
 {
     const IS_BLANK_ERROR = 'c1051bb4-d103-4f74-8988-acbcafc7fdc3';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::IS_BLANK_ERROR => 'IS_BLANK_ERROR',
-    );
+    ];
 
     public $message = 'This value should not be blank.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/NotEqualTo.php b/src/Symfony/Component/Validator/Constraints/NotEqualTo.php
index 8c5abddaee422..a04f3a9b6c4b6 100644
--- a/src/Symfony/Component/Validator/Constraints/NotEqualTo.php
+++ b/src/Symfony/Component/Validator/Constraints/NotEqualTo.php
@@ -22,9 +22,9 @@ class NotEqualTo extends AbstractComparison
 {
     const IS_EQUAL_ERROR = 'aa2e33da-25c8-4d76-8c6c-812f02ea89dd';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::IS_EQUAL_ERROR => 'IS_EQUAL_ERROR',
-    );
+    ];
 
     public $message = 'This value should not be equal to {{ compared_value }}.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/NotIdenticalTo.php b/src/Symfony/Component/Validator/Constraints/NotIdenticalTo.php
index 4c9c63ea61e49..972e4a103c249 100644
--- a/src/Symfony/Component/Validator/Constraints/NotIdenticalTo.php
+++ b/src/Symfony/Component/Validator/Constraints/NotIdenticalTo.php
@@ -22,9 +22,9 @@ class NotIdenticalTo extends AbstractComparison
 {
     const IS_IDENTICAL_ERROR = '4aaac518-0dda-4129-a6d9-e216b9b454a0';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::IS_IDENTICAL_ERROR => 'IS_IDENTICAL_ERROR',
-    );
+    ];
 
     public $message = 'This value should not be identical to {{ compared_value_type }} {{ compared_value }}.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/NotNull.php b/src/Symfony/Component/Validator/Constraints/NotNull.php
index 1cfc1c80ecc07..a392104d0e662 100644
--- a/src/Symfony/Component/Validator/Constraints/NotNull.php
+++ b/src/Symfony/Component/Validator/Constraints/NotNull.php
@@ -23,9 +23,9 @@ class NotNull extends Constraint
 {
     const IS_NULL_ERROR = 'ad32d13f-c3d4-423b-909a-857b961eb720';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::IS_NULL_ERROR => 'IS_NULL_ERROR',
-    );
+    ];
 
     public $message = 'This value should not be null.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/Range.php b/src/Symfony/Component/Validator/Constraints/Range.php
index dcaf9db955246..65ece5d832007 100644
--- a/src/Symfony/Component/Validator/Constraints/Range.php
+++ b/src/Symfony/Component/Validator/Constraints/Range.php
@@ -26,11 +26,11 @@ class Range extends Constraint
     const TOO_HIGH_ERROR = '2d28afcb-e32e-45fb-a815-01c431a86a69';
     const TOO_LOW_ERROR = '76454e69-502c-46c5-9643-f447d837c4d5';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
         self::TOO_HIGH_ERROR => 'TOO_HIGH_ERROR',
         self::TOO_LOW_ERROR => 'TOO_LOW_ERROR',
-    );
+    ];
 
     public $minMessage = 'This value should be {{ limit }} or more.';
     public $maxMessage = 'This value should be {{ limit }} or less.';
@@ -43,7 +43,7 @@ public function __construct($options = null)
         parent::__construct($options);
 
         if (null === $this->min && null === $this->max) {
-            throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s', __CLASS__), array('min', 'max'));
+            throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s', __CLASS__), ['min', 'max']);
         }
     }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/Regex.php b/src/Symfony/Component/Validator/Constraints/Regex.php
index cb122102259c4..a71e4de2590e6 100644
--- a/src/Symfony/Component/Validator/Constraints/Regex.php
+++ b/src/Symfony/Component/Validator/Constraints/Regex.php
@@ -23,9 +23,9 @@ class Regex extends Constraint
 {
     const REGEX_FAILED_ERROR = 'de1e3db3-5ed4-4941-aae4-59f3667cc3a3';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::REGEX_FAILED_ERROR => 'REGEX_FAILED_ERROR',
-    );
+    ];
 
     public $message = 'This value is not valid.';
     public $pattern;
@@ -45,7 +45,7 @@ public function getDefaultOption()
      */
     public function getRequiredOptions()
     {
-        return array('pattern');
+        return ['pattern'];
     }
 
     /**
diff --git a/src/Symfony/Component/Validator/Constraints/Time.php b/src/Symfony/Component/Validator/Constraints/Time.php
index 6bd8dbda2e2aa..d1a3397b240a6 100644
--- a/src/Symfony/Component/Validator/Constraints/Time.php
+++ b/src/Symfony/Component/Validator/Constraints/Time.php
@@ -24,10 +24,10 @@ class Time extends Constraint
     const INVALID_FORMAT_ERROR = '9d27b2bb-f755-4fbf-b725-39b1edbdebdf';
     const INVALID_TIME_ERROR = '8532f9e1-84b2-4d67-8989-0818bc38533b';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR',
         self::INVALID_TIME_ERROR => 'INVALID_TIME_ERROR',
-    );
+    ];
 
     public $message = 'This value is not a valid time.';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/Type.php b/src/Symfony/Component/Validator/Constraints/Type.php
index e40b47820d6bb..ac798bcd44247 100644
--- a/src/Symfony/Component/Validator/Constraints/Type.php
+++ b/src/Symfony/Component/Validator/Constraints/Type.php
@@ -23,9 +23,9 @@ class Type extends Constraint
 {
     const INVALID_TYPE_ERROR = 'ba785a8c-82cb-4283-967c-3cf342181b40';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::INVALID_TYPE_ERROR => 'INVALID_TYPE_ERROR',
-    );
+    ];
 
     public $message = 'This value should be of type {{ type }}.';
     public $type;
@@ -43,6 +43,6 @@ public function getDefaultOption()
      */
     public function getRequiredOptions()
     {
-        return array('type');
+        return ['type'];
     }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/UrlValidator.php b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
index 3ccf4ba79b2b5..b3fe83067bfed 100644
--- a/src/Symfony/Component/Validator/Constraints/UrlValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
@@ -93,7 +93,7 @@ public function validate($value, Constraint $constraint)
                 Url::CHECK_DNS_TYPE_SRV,
                 Url::CHECK_DNS_TYPE_TXT,
             ), true)) {
-                throw new InvalidOptionsException(sprintf('Invalid value for option "checkDNS" in constraint %s', \get_class($constraint)), array('checkDNS'));
+                throw new InvalidOptionsException(sprintf('Invalid value for option "checkDNS" in constraint %s', \get_class($constraint)), ['checkDNS']);
             }
 
             $host = parse_url($value, PHP_URL_HOST);
diff --git a/src/Symfony/Component/Validator/Constraints/Uuid.php b/src/Symfony/Component/Validator/Constraints/Uuid.php
index 2deecbadd61c9..988f3c3b2dfd9 100644
--- a/src/Symfony/Component/Validator/Constraints/Uuid.php
+++ b/src/Symfony/Component/Validator/Constraints/Uuid.php
@@ -28,14 +28,14 @@ class Uuid extends Constraint
     const INVALID_VERSION_ERROR = '21ba13b4-b185-4882-ac6f-d147355987eb';
     const INVALID_VARIANT_ERROR = '164ef693-2b9d-46de-ad7f-836201f0c2db';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::TOO_SHORT_ERROR => 'TOO_SHORT_ERROR',
         self::TOO_LONG_ERROR => 'TOO_LONG_ERROR',
         self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
         self::INVALID_HYPHEN_PLACEMENT_ERROR => 'INVALID_HYPHEN_PLACEMENT_ERROR',
         self::INVALID_VERSION_ERROR => 'INVALID_VERSION_ERROR',
         self::INVALID_VARIANT_ERROR => 'INVALID_VARIANT_ERROR',
-    );
+    ];
 
     // Possible versions defined by RFC 4122
     const V1_MAC = 1;
@@ -67,11 +67,11 @@ class Uuid extends Constraint
      *
      * @var int[]
      */
-    public $versions = array(
+    public $versions = [
         self::V1_MAC,
         self::V2_DCE,
         self::V3_MD5,
         self::V4_RANDOM,
         self::V5_SHA1,
-    );
+    ];
 }
diff --git a/src/Symfony/Component/Validator/Constraints/ValidValidator.php b/src/Symfony/Component/Validator/Constraints/ValidValidator.php
index be5fbc12660ba..cc10ec5204efc 100644
--- a/src/Symfony/Component/Validator/Constraints/ValidValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/ValidValidator.php
@@ -33,6 +33,6 @@ public function validate($value, Constraint $constraint)
         $this->context
             ->getValidator()
             ->inContext($this->context)
-            ->validate($value, null, array($this->context->getGroup()));
+            ->validate($value, null, [$this->context->getGroup()]);
     }
 }
diff --git a/src/Symfony/Component/Validator/ContainerConstraintValidatorFactory.php b/src/Symfony/Component/Validator/ContainerConstraintValidatorFactory.php
index 43c8a0d7cb6d4..207a6bc33c2f9 100644
--- a/src/Symfony/Component/Validator/ContainerConstraintValidatorFactory.php
+++ b/src/Symfony/Component/Validator/ContainerConstraintValidatorFactory.php
@@ -28,7 +28,7 @@ class ContainerConstraintValidatorFactory implements ConstraintValidatorFactoryI
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
-        $this->validators = array();
+        $this->validators = [];
     }
 
     /**
diff --git a/src/Symfony/Component/Validator/Context/ExecutionContext.php b/src/Symfony/Component/Validator/Context/ExecutionContext.php
index 8118ac10ca7fe..7ca9caa80fefb 100644
--- a/src/Symfony/Component/Validator/Context/ExecutionContext.php
+++ b/src/Symfony/Component/Validator/Context/ExecutionContext.php
@@ -110,14 +110,14 @@ class ExecutionContext implements ExecutionContextInterface
      *
      * @var array
      */
-    private $validatedObjects = array();
+    private $validatedObjects = [];
 
     /**
      * Stores which class constraint has been validated for which object.
      *
      * @var array
      */
-    private $validatedConstraints = array();
+    private $validatedConstraints = [];
 
     /**
      * Stores which objects have been initialized.
@@ -179,7 +179,7 @@ public function setConstraint(Constraint $constraint)
     /**
      * {@inheritdoc}
      */
-    public function addViolation($message, array $parameters = array())
+    public function addViolation($message, array $parameters = [])
     {
         $this->violations->add(new ConstraintViolation(
             $this->translator->trans($message, $parameters, $this->translationDomain),
@@ -197,7 +197,7 @@ public function addViolation($message, array $parameters = array())
     /**
      * {@inheritdoc}
      */
-    public function buildViolation($message, array $parameters = array())
+    public function buildViolation($message, array $parameters = [])
     {
         return new ConstraintViolationBuilder(
             $this->violations,
@@ -303,7 +303,7 @@ public function getPropertyPath($subPath = '')
     public function markGroupAsValidated($cacheKey, $groupHash)
     {
         if (!isset($this->validatedObjects[$cacheKey])) {
-            $this->validatedObjects[$cacheKey] = array();
+            $this->validatedObjects[$cacheKey] = [];
         }
 
         $this->validatedObjects[$cacheKey][$groupHash] = true;
diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
index e4f7df1757da6..cac98495bcf5e 100644
--- a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
+++ b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
@@ -67,7 +67,7 @@ interface ExecutionContextInterface
      * @param string $message The error message
      * @param array  $params  The parameters substituted in the error message
      */
-    public function addViolation($message, array $params = array());
+    public function addViolation($message, array $params = []);
 
     /**
      * Returns a builder for adding a violation with extended information.
@@ -86,7 +86,7 @@ public function addViolation($message, array $params = array());
      *
      * @return ConstraintViolationBuilderInterface The violation builder
      */
-    public function buildViolation($message, array $parameters = array());
+    public function buildViolation($message, array $parameters = []);
 
     /**
      * Returns the validator.
diff --git a/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php b/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php
index f7165e5fbdae0..999a9968b07f5 100644
--- a/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php
+++ b/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php
@@ -45,10 +45,10 @@ public function collect(Request $request, Response $response, \Exception $except
 
     public function reset()
     {
-        $this->data = array(
-            'calls' => $this->cloneVar(array()),
+        $this->data = [
+            'calls' => $this->cloneVar([]),
             'violations_count' => 0,
-        );
+        ];
     }
 
     /**
@@ -89,9 +89,9 @@ public function getName()
 
     protected function getCasters()
     {
-        return parent::getCasters() + array(
+        return parent::getCasters() + [
             \Exception::class => function (\Exception $e, array $a, Stub $s) {
-                foreach (array("\0Exception\0previous", "\0Exception\0trace") as $k) {
+                foreach (["\0Exception\0previous", "\0Exception\0trace"] as $k) {
                     if (isset($a[$k])) {
                         unset($a[$k]);
                         ++$s->cut;
@@ -101,12 +101,12 @@ protected function getCasters()
                 return $a;
             },
             FormInterface::class => function (FormInterface $f, array $a) {
-                return array(
+                return [
                     Caster::PREFIX_VIRTUAL.'name' => $f->getName(),
                     Caster::PREFIX_VIRTUAL.'type_class' => new ClassStub(\get_class($f->getConfig()->getType()->getInnerType())),
                     Caster::PREFIX_VIRTUAL.'data' => $f->getData(),
-                );
+                ];
             },
-        );
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/DependencyInjection/AddConstraintValidatorsPass.php b/src/Symfony/Component/Validator/DependencyInjection/AddConstraintValidatorsPass.php
index d651188985f34..9098423413879 100644
--- a/src/Symfony/Component/Validator/DependencyInjection/AddConstraintValidatorsPass.php
+++ b/src/Symfony/Component/Validator/DependencyInjection/AddConstraintValidatorsPass.php
@@ -37,7 +37,7 @@ public function process(ContainerBuilder $container)
             return;
         }
 
-        $validators = array();
+        $validators = [];
         foreach ($container->findTaggedServiceIds($this->constraintValidatorTag, true) as $id => $attributes) {
             $definition = $container->getDefinition($id);
 
diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
index c4e5b11b87cbd..210d55ea42cea 100644
--- a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
+++ b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
@@ -53,7 +53,7 @@ class ClassMetadata extends GenericMetadata implements ClassMetadataInterface
      *           class' serialized representation. Do not access it. Use
      *           {@link getPropertyMetadata()} instead.
      */
-    public $members = array();
+    public $members = [];
 
     /**
      * @var PropertyMetadata[]
@@ -62,7 +62,7 @@ class ClassMetadata extends GenericMetadata implements ClassMetadataInterface
      *           class' serialized representation. Do not access it. Use
      *           {@link getPropertyMetadata()} instead.
      */
-    public $properties = array();
+    public $properties = [];
 
     /**
      * @var GetterMetadata[]
@@ -71,7 +71,7 @@ class ClassMetadata extends GenericMetadata implements ClassMetadataInterface
      *           class' serialized representation. Do not access it. Use
      *           {@link getPropertyMetadata()} instead.
      */
-    public $getters = array();
+    public $getters = [];
 
     /**
      * @var array
@@ -80,7 +80,7 @@ class ClassMetadata extends GenericMetadata implements ClassMetadataInterface
      *           class' serialized representation. Do not access it. Use
      *           {@link getGroupSequence()} instead.
      */
-    public $groupSequence = array();
+    public $groupSequence = [];
 
     /**
      * @var bool
@@ -135,7 +135,7 @@ public function __sleep()
         // Don't store the cascading strategy. Classes never cascade.
         unset($parentProperties[array_search('cascadingStrategy', $parentProperties)]);
 
-        return array_merge($parentProperties, array(
+        return array_merge($parentProperties, [
             'getters',
             'groupSequence',
             'groupSequenceProvider',
@@ -143,7 +143,7 @@ public function __sleep()
             'name',
             'properties',
             'defaultGroup',
-        ));
+        ]);
     }
 
     /**
@@ -380,7 +380,7 @@ public function hasPropertyMetadata($property)
     public function getPropertyMetadata($property)
     {
         if (!isset($this->members[$property])) {
-            return array();
+            return [];
         }
 
         return $this->members[$property];
diff --git a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
index 9d5da256f5dd5..cf0d08acce7f0 100644
--- a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
+++ b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
@@ -46,7 +46,7 @@ class LazyLoadingMetadataFactory implements MetadataFactoryInterface
      *
      * @var ClassMetadata[]
      */
-    protected $loadedClasses = array();
+    protected $loadedClasses = [];
 
     /**
      * Creates a new metadata factory.
diff --git a/src/Symfony/Component/Validator/Mapping/GenericMetadata.php b/src/Symfony/Component/Validator/Mapping/GenericMetadata.php
index a5364f9b08720..139d252fc06bf 100644
--- a/src/Symfony/Component/Validator/Mapping/GenericMetadata.php
+++ b/src/Symfony/Component/Validator/Mapping/GenericMetadata.php
@@ -32,7 +32,7 @@ class GenericMetadata implements MetadataInterface
      *           class' serialized representation. Do not access it. Use
      *           {@link getConstraints()} and {@link findConstraints()} instead.
      */
-    public $constraints = array();
+    public $constraints = [];
 
     /**
      * @var array
@@ -41,7 +41,7 @@ class GenericMetadata implements MetadataInterface
      *           class' serialized representation. Do not access it. Use
      *           {@link findConstraints()} instead.
      */
-    public $constraintsByGroup = array();
+    public $constraintsByGroup = [];
 
     /**
      * The strategy for cascading objects.
@@ -80,12 +80,12 @@ class GenericMetadata implements MetadataInterface
      */
     public function __sleep()
     {
-        return array(
+        return [
             'constraints',
             'constraintsByGroup',
             'cascadingStrategy',
             'traversalStrategy',
-        );
+        ];
     }
 
     /**
@@ -95,8 +95,8 @@ public function __clone()
     {
         $constraints = $this->constraints;
 
-        $this->constraints = array();
-        $this->constraintsByGroup = array();
+        $this->constraints = [];
+        $this->constraintsByGroup = [];
 
         foreach ($constraints as $constraint) {
             $this->addConstraint(clone $constraint);
@@ -189,7 +189,7 @@ public function findConstraints($group)
     {
         return isset($this->constraintsByGroup[$group])
             ? $this->constraintsByGroup[$group]
-            : array();
+            : [];
     }
 
     /**
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php
index 9d92de348ae5c..ae2e1e04cde2a 100644
--- a/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php
+++ b/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php
@@ -32,7 +32,7 @@ abstract class AbstractLoader implements LoaderInterface
      */
     const DEFAULT_NAMESPACE = '\\Symfony\\Component\\Validator\\Constraints\\';
 
-    protected $namespaces = array();
+    protected $namespaces = [];
 
     /**
      * Adds a namespace alias.
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/FilesLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/FilesLoader.php
index 571c7e7abb24f..0882c3932f01b 100644
--- a/src/Symfony/Component/Validator/Mapping/Loader/FilesLoader.php
+++ b/src/Symfony/Component/Validator/Mapping/Loader/FilesLoader.php
@@ -41,7 +41,7 @@ public function __construct(array $paths)
      */
     protected function getFileLoaders($paths)
     {
-        $loaders = array();
+        $loaders = [];
 
         foreach ($paths as $path) {
             $loaders[] = $this->getFileLoaderInstance($path);
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php
index 398d81e936633..cec3ea6c2d56e 100644
--- a/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php
@@ -72,7 +72,7 @@ public function getMappedClasses()
      */
     protected function parseConstraints(\SimpleXMLElement $nodes)
     {
-        $constraints = array();
+        $constraints = [];
 
         foreach ($nodes as $node) {
             if (\count($node) > 0) {
@@ -83,7 +83,7 @@ protected function parseConstraints(\SimpleXMLElement $nodes)
                 } elseif (\count($node->option) > 0) {
                     $options = $this->parseOptions($node->option);
                 } else {
-                    $options = array();
+                    $options = [];
                 }
             } elseif (\strlen((string) $node) > 0) {
                 $options = XmlUtils::phpize(trim($node));
@@ -106,7 +106,7 @@ protected function parseConstraints(\SimpleXMLElement $nodes)
      */
     protected function parseValues(\SimpleXMLElement $nodes)
     {
-        $values = array();
+        $values = [];
 
         foreach ($nodes as $node) {
             if (\count($node) > 0) {
@@ -115,7 +115,7 @@ protected function parseValues(\SimpleXMLElement $nodes)
                 } elseif (\count($node->constraint) > 0) {
                     $value = $this->parseConstraints($node->constraint);
                 } else {
-                    $value = array();
+                    $value = [];
                 }
             } else {
                 $value = trim($node);
@@ -140,7 +140,7 @@ protected function parseValues(\SimpleXMLElement $nodes)
      */
     protected function parseOptions(\SimpleXMLElement $nodes)
     {
-        $options = array();
+        $options = [];
 
         foreach ($nodes as $node) {
             if (\count($node) > 0) {
@@ -149,7 +149,7 @@ protected function parseOptions(\SimpleXMLElement $nodes)
                 } elseif (\count($node->constraint) > 0) {
                     $value = $this->parseConstraints($node->constraint);
                 } else {
-                    $value = array();
+                    $value = [];
                 }
             } else {
                 $value = XmlUtils::phpize($node);
@@ -190,7 +190,7 @@ private function loadClassesFromXml()
         // state before it completes
         $xml = $this->parseFile($this->file);
 
-        $this->classes = array();
+        $this->classes = [];
 
         foreach ($xml->namespace as $namespace) {
             $this->addNamespaceAlias((string) $namespace['prefix'], trim((string) $namespace));
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
index c1395bb2fccaa..0f6166674d01c 100644
--- a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
@@ -80,7 +80,7 @@ public function getMappedClasses()
      */
     protected function parseNodes(array $nodes)
     {
-        $values = array();
+        $values = [];
 
         foreach ($nodes as $name => $childNodes) {
             if (is_numeric($name) && \is_array($childNodes) && 1 === \count($childNodes)) {
@@ -131,7 +131,7 @@ private function parseFile($path)
 
         // empty file
         if (null === $classes) {
-            return array();
+            return [];
         }
 
         // not an array
diff --git a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
index 74a524b194c54..11bd54d33c951 100644
--- a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
+++ b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
@@ -52,7 +52,7 @@ abstract class MemberMetadata extends GenericMetadata implements PropertyMetadat
     /**
      * @var \ReflectionMethod[]|\ReflectionProperty[]
      */
-    private $reflMember = array();
+    private $reflMember = [];
 
     /**
      * @param string $class    The name of the class this member is defined on
@@ -85,11 +85,11 @@ public function addConstraint(Constraint $constraint)
      */
     public function __sleep()
     {
-        return array_merge(parent::__sleep(), array(
+        return array_merge(parent::__sleep(), [
             'class',
             'name',
             'property',
-        ));
+        ]);
     }
 
     /**
diff --git a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
index 087a90a1850d7..afe1f1a582e12 100644
--- a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
+++ b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
@@ -175,7 +175,7 @@ protected function expectValidateAt($i, $propertyPath, $value, $group)
             ->will($this->returnValue($validator));
         $validator->expects($this->at(2 * $i + 1))
             ->method('validate')
-            ->with($value, $this->logicalOr(null, array(), $this->isInstanceOf('\Symfony\Component\Validator\Constraints\Valid')), $group);
+            ->with($value, $this->logicalOr(null, [], $this->isInstanceOf('\Symfony\Component\Validator\Constraints\Valid')), $group);
     }
 
     protected function expectValidateValueAt($i, $propertyPath, $value, $constraints, $group = null)
@@ -224,7 +224,7 @@ class ConstraintViolationAssertion
     private $assertions;
 
     private $message;
-    private $parameters = array();
+    private $parameters = [];
     private $invalidValue = 'InvalidValue';
     private $propertyPath = 'property.path';
     private $plural;
@@ -232,7 +232,7 @@ class ConstraintViolationAssertion
     private $constraint;
     private $cause;
 
-    public function __construct(ExecutionContextInterface $context, $message, Constraint $constraint = null, array $assertions = array())
+    public function __construct(ExecutionContextInterface $context, $message, Constraint $constraint = null, array $assertions = [])
     {
         $this->context = $context;
         $this->message = $message;
@@ -306,7 +306,7 @@ public function buildNextViolation($message)
 
     public function assertRaised()
     {
-        $expected = array();
+        $expected = [];
         foreach ($this->assertions as $assertion) {
             $expected[] = $assertion->getViolation();
         }
diff --git a/src/Symfony/Component/Validator/Tests/ConstraintTest.php b/src/Symfony/Component/Validator/Tests/ConstraintTest.php
index a05741490fdde..87bac5b0a6e93 100644
--- a/src/Symfony/Component/Validator/Tests/ConstraintTest.php
+++ b/src/Symfony/Component/Validator/Tests/ConstraintTest.php
@@ -24,10 +24,10 @@ class ConstraintTest extends TestCase
 {
     public function testSetProperties()
     {
-        $constraint = new ConstraintA(array(
+        $constraint = new ConstraintA([
             'property1' => 'foo',
             'property2' => 'bar',
-        ));
+        ]);
 
         $this->assertEquals('foo', $constraint->property1);
         $this->assertEquals('bar', $constraint->property2);
@@ -37,9 +37,9 @@ public function testSetNotExistingPropertyThrowsException()
     {
         $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');
 
-        new ConstraintA(array(
+        new ConstraintA([
             'foo' => 'bar',
-        ));
+        ]);
     }
 
     public function testMagicPropertiesAreNotAllowed()
@@ -55,10 +55,10 @@ public function testInvalidAndRequiredOptionsPassed()
     {
         $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');
 
-        new ConstraintC(array(
+        new ConstraintC([
             'option1' => 'default',
             'foo' => 'bar',
-        ));
+        ]);
     }
 
     public function testSetDefaultProperty()
@@ -70,14 +70,14 @@ public function testSetDefaultProperty()
 
     public function testSetDefaultPropertyDoctrineStyle()
     {
-        $constraint = new ConstraintA(array('value' => 'foo'));
+        $constraint = new ConstraintA(['value' => 'foo']);
 
         $this->assertEquals('foo', $constraint->property2);
     }
 
     public function testSetDefaultPropertyDoctrineStylePlusOtherProperty()
     {
-        $constraint = new ConstraintA(array('value' => 'foo', 'property1' => 'bar'));
+        $constraint = new ConstraintA(['value' => 'foo', 'property1' => 'bar']);
 
         $this->assertEquals('foo', $constraint->property2);
         $this->assertEquals('bar', $constraint->property1);
@@ -85,7 +85,7 @@ public function testSetDefaultPropertyDoctrineStylePlusOtherProperty()
 
     public function testSetDefaultPropertyDoctrineStyleWhenDefaultPropertyIsNamedValue()
     {
-        $constraint = new ConstraintWithValueAsDefault(array('value' => 'foo'));
+        $constraint = new ConstraintWithValueAsDefault(['value' => 'foo']);
 
         $this->assertEquals('foo', $constraint->value);
         $this->assertNull($constraint->property);
@@ -93,7 +93,7 @@ public function testSetDefaultPropertyDoctrineStyleWhenDefaultPropertyIsNamedVal
 
     public function testDontSetDefaultPropertyIfValuePropertyExists()
     {
-        $constraint = new ConstraintWithValue(array('value' => 'foo'));
+        $constraint = new ConstraintWithValue(['value' => 'foo']);
 
         $this->assertEquals('foo', $constraint->value);
         $this->assertNull($constraint->property);
@@ -115,23 +115,23 @@ public function testRequiredOptionsMustBeDefined()
 
     public function testRequiredOptionsPassed()
     {
-        $constraint = new ConstraintC(array('option1' => 'default'));
+        $constraint = new ConstraintC(['option1' => 'default']);
 
         $this->assertSame('default', $constraint->option1);
     }
 
     public function testGroupsAreConvertedToArray()
     {
-        $constraint = new ConstraintA(array('groups' => 'Foo'));
+        $constraint = new ConstraintA(['groups' => 'Foo']);
 
-        $this->assertEquals(array('Foo'), $constraint->groups);
+        $this->assertEquals(['Foo'], $constraint->groups);
     }
 
     public function testAddDefaultGroupAddsGroup()
     {
-        $constraint = new ConstraintA(array('groups' => 'Default'));
+        $constraint = new ConstraintA(['groups' => 'Default']);
         $constraint->addImplicitGroupName('Foo');
-        $this->assertEquals(array('Default', 'Foo'), $constraint->groups);
+        $this->assertEquals(['Default', 'Foo'], $constraint->groups);
     }
 
     public function testAllowsSettingZeroRequiredPropertyValue()
@@ -142,9 +142,9 @@ public function testAllowsSettingZeroRequiredPropertyValue()
 
     public function testCanCreateConstraintWithNoDefaultOptionAndEmptyArray()
     {
-        $constraint = new ConstraintB(array());
+        $constraint = new ConstraintB([]);
 
-        $this->assertSame(array(Constraint::PROPERTY_CONSTRAINT, Constraint::CLASS_CONSTRAINT), $constraint->getTargets());
+        $this->assertSame([Constraint::PROPERTY_CONSTRAINT, Constraint::CLASS_CONSTRAINT], $constraint->getTargets());
     }
 
     public function testGetTargetsCanBeString()
@@ -158,15 +158,15 @@ public function testGetTargetsCanBeArray()
     {
         $constraint = new ConstraintA();
 
-        $this->assertEquals(array('property', 'class'), $constraint->getTargets());
+        $this->assertEquals(['property', 'class'], $constraint->getTargets());
     }
 
     public function testSerialize()
     {
-        $constraint = new ConstraintA(array(
+        $constraint = new ConstraintA([
             'property1' => 'foo',
             'property2' => 'bar',
-        ));
+        ]);
 
         $restoredConstraint = unserialize(serialize($constraint));
 
@@ -175,33 +175,33 @@ public function testSerialize()
 
     public function testSerializeInitializesGroupsOptionToDefault()
     {
-        $constraint = new ConstraintA(array(
+        $constraint = new ConstraintA([
             'property1' => 'foo',
             'property2' => 'bar',
-        ));
+        ]);
 
         $constraint = unserialize(serialize($constraint));
 
-        $expected = new ConstraintA(array(
+        $expected = new ConstraintA([
             'property1' => 'foo',
             'property2' => 'bar',
             'groups' => 'Default',
-        ));
+        ]);
 
         $this->assertEquals($expected, $constraint);
     }
 
     public function testSerializeKeepsCustomGroups()
     {
-        $constraint = new ConstraintA(array(
+        $constraint = new ConstraintA([
             'property1' => 'foo',
             'property2' => 'bar',
             'groups' => 'MyGroup',
-        ));
+        ]);
 
         $constraint = unserialize(serialize($constraint));
 
-        $this->assertSame(array('MyGroup'), $constraint->groups);
+        $this->assertSame(['MyGroup'], $constraint->groups);
     }
 
     /**
@@ -214,11 +214,11 @@ public function testGetErrorNameForUnknownCode()
 
     public function testOptionsAsDefaultOption()
     {
-        $constraint = new ConstraintA($options = array('value1'));
+        $constraint = new ConstraintA($options = ['value1']);
 
         $this->assertEquals($options, $constraint->property2);
 
-        $constraint = new ConstraintA($options = array('value1', 'property1' => 'value2'));
+        $constraint = new ConstraintA($options = ['value1', 'property1' => 'value2']);
 
         $this->assertEquals($options, $constraint->property2);
     }
@@ -229,12 +229,12 @@ public function testOptionsAsDefaultOption()
      */
     public function testInvalidOptions()
     {
-        new ConstraintA(array('property2' => 'foo', 'bar', 5 => 'baz'));
+        new ConstraintA(['property2' => 'foo', 'bar', 5 => 'baz']);
     }
 
     public function testOptionsWithInvalidInternalPointer()
     {
-        $options = array('property1' => 'foo');
+        $options = ['property1' => 'foo'];
         next($options);
         next($options);
 
diff --git a/src/Symfony/Component/Validator/Tests/ConstraintViolationListTest.php b/src/Symfony/Component/Validator/Tests/ConstraintViolationListTest.php
index f0e6afe20da3f..73d81cbfad9c4 100644
--- a/src/Symfony/Component/Validator/Tests/ConstraintViolationListTest.php
+++ b/src/Symfony/Component/Validator/Tests/ConstraintViolationListTest.php
@@ -37,7 +37,7 @@ public function testInit()
     public function testInitWithViolations()
     {
         $violation = $this->getViolation('Error');
-        $this->list = new ConstraintViolationList(array($violation));
+        $this->list = new ConstraintViolationList([$violation]);
 
         $this->assertCount(1, $this->list);
         $this->assertSame($violation, $this->list[0]);
@@ -54,11 +54,11 @@ public function testAdd()
 
     public function testAddAll()
     {
-        $violations = array(
+        $violations = [
             10 => $this->getViolation('Error 1'),
             20 => $this->getViolation('Error 2'),
             30 => $this->getViolation('Error 3'),
-        );
+        ];
         $otherList = new ConstraintViolationList($violations);
         $this->list->addAll($otherList);
 
@@ -71,11 +71,11 @@ public function testAddAll()
 
     public function testIterator()
     {
-        $violations = array(
+        $violations = [
             10 => $this->getViolation('Error 1'),
             20 => $this->getViolation('Error 2'),
             30 => $this->getViolation('Error 3'),
-        );
+        ];
 
         $this->list = new ConstraintViolationList($violations);
 
@@ -103,13 +103,13 @@ public function testArrayAccess()
 
     public function testToString()
     {
-        $this->list = new ConstraintViolationList(array(
+        $this->list = new ConstraintViolationList([
             $this->getViolation('Error 1', 'Root'),
             $this->getViolation('Error 2', 'Root', 'foo.bar'),
             $this->getViolation('Error 3', 'Root', '[baz]'),
             $this->getViolation('Error 4', '', 'foo.bar'),
             $this->getViolation('Error 5', '', '[baz]'),
-        ));
+        ]);
 
         $expected = <<<'EOF'
 Root:
@@ -133,11 +133,11 @@ public function testToString()
      */
     public function testFindByCodes($code, $violationsCount)
     {
-        $violations = array(
+        $violations = [
             $this->getViolation('Error', null, null, 'code1'),
             $this->getViolation('Error', null, null, 'code1'),
             $this->getViolation('Error', null, null, 'code2'),
-        );
+        ];
         $list = new ConstraintViolationList($violations);
 
         $specificErrors = $list->findByCodes($code);
@@ -148,15 +148,15 @@ public function testFindByCodes($code, $violationsCount)
 
     public function findByCodesProvider()
     {
-        return array(
-            array('code1', 2),
-            array(array('code1', 'code2'), 3),
-            array('code3', 0),
-        );
+        return [
+            ['code1', 2],
+            [['code1', 'code2'], 3],
+            ['code3', 0],
+        ];
     }
 
     protected function getViolation($message, $root = null, $propertyPath = null, $code = null)
     {
-        return new ConstraintViolation($message, $message, array(), $root, $propertyPath, null, null, $code);
+        return new ConstraintViolation($message, $message, [], $root, $propertyPath, null, null, $code);
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/ConstraintViolationTest.php b/src/Symfony/Component/Validator/Tests/ConstraintViolationTest.php
index edaa7fa50d6b0..b43e51f273360 100644
--- a/src/Symfony/Component/Validator/Tests/ConstraintViolationTest.php
+++ b/src/Symfony/Component/Validator/Tests/ConstraintViolationTest.php
@@ -21,7 +21,7 @@ public function testToStringHandlesArrays()
         $violation = new ConstraintViolation(
             'Array',
             '{{ value }}',
-            array('{{ value }}' => array(1, 2, 3)),
+            ['{{ value }}' => [1, 2, 3]],
             'Root',
             'property.path',
             null
@@ -40,8 +40,8 @@ public function testToStringHandlesArrayRoots()
         $violation = new ConstraintViolation(
             '42 cannot be used here',
             'this is the message template',
-            array(),
-            array('some_value' => 42),
+            [],
+            ['some_value' => 42],
             'some_value',
             null
         );
@@ -59,8 +59,8 @@ public function testToStringHandlesCodes()
         $violation = new ConstraintViolation(
             '42 cannot be used here',
             'this is the message template',
-            array(),
-            array('some_value' => 42),
+            [],
+            ['some_value' => 42],
             'some_value',
             null,
             null,
@@ -85,8 +85,8 @@ public function testToStringOmitsEmptyCodes()
         $violation = new ConstraintViolation(
             '42 cannot be used here',
             'this is the message template',
-            array(),
-            array('some_value' => 42),
+            [],
+            ['some_value' => 42],
             'some_value',
             null,
             null,
@@ -98,8 +98,8 @@ public function testToStringOmitsEmptyCodes()
         $violation = new ConstraintViolation(
             '42 cannot be used here',
             'this is the message template',
-            array(),
-            array('some_value' => 42),
+            [],
+            ['some_value' => 42],
             'some_value',
             null,
             null,
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php b/src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
index 5e9f2bceafcd4..2f27974a801ab 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
@@ -73,10 +73,10 @@ protected static function addPhp5Dot5Comparisons(array $comparisons)
 
     public function provideInvalidConstraintOptions()
     {
-        return array(
-            array(null),
-            array(array()),
-        );
+        return [
+            [null],
+            [[]],
+        ];
     }
 
     /**
@@ -95,10 +95,10 @@ public function testThrowsConstraintExceptionIfNoValueOrPropertyPath($options)
      */
     public function testThrowsConstraintExceptionIfBothValueAndPropertyPath()
     {
-        $this->createConstraint((array(
+        $this->createConstraint(([
             'value' => 'value',
             'propertyPath' => 'propertyPath',
-        )));
+        ]));
     }
 
     /**
@@ -109,7 +109,7 @@ public function testThrowsConstraintExceptionIfBothValueAndPropertyPath()
      */
     public function testValidComparisonToValue($dirtyValue, $comparisonValue)
     {
-        $constraint = $this->createConstraint(array('value' => $comparisonValue));
+        $constraint = $this->createConstraint(['value' => $comparisonValue]);
 
         $this->validator->validate($dirtyValue, $constraint);
 
@@ -137,7 +137,7 @@ public function provideAllValidComparisons()
      */
     public function testValidComparisonToPropertyPath($comparedValue)
     {
-        $constraint = $this->createConstraint(array('propertyPath' => 'value'));
+        $constraint = $this->createConstraint(['propertyPath' => 'value']);
 
         $object = new ComparisonTest_Class(5);
 
@@ -153,9 +153,9 @@ public function testValidComparisonToPropertyPath($comparedValue)
      */
     public function testValidComparisonToPropertyPathOnArray($comparedValue)
     {
-        $constraint = $this->createConstraint(array('propertyPath' => '[root][value]'));
+        $constraint = $this->createConstraint(['propertyPath' => '[root][value]']);
 
-        $this->setObject(array('root' => array('value' => 5)));
+        $this->setObject(['root' => ['value' => 5]]);
 
         $this->validator->validate($comparedValue, $constraint);
 
@@ -164,7 +164,7 @@ public function testValidComparisonToPropertyPathOnArray($comparedValue)
 
     public function testNoViolationOnNullObjectWithPropertyPath()
     {
-        $constraint = $this->createConstraint(array('propertyPath' => 'propertyPath'));
+        $constraint = $this->createConstraint(['propertyPath' => 'propertyPath']);
 
         $this->setObject(null);
 
@@ -175,7 +175,7 @@ public function testNoViolationOnNullObjectWithPropertyPath()
 
     public function testInvalidValuePath()
     {
-        $constraint = $this->createConstraint(array('propertyPath' => 'foo'));
+        $constraint = $this->createConstraint(['propertyPath' => 'foo']);
 
         if (method_exists($this, 'expectException')) {
             $this->expectException(ConstraintDefinitionException::class);
@@ -218,7 +218,7 @@ public function testInvalidComparisonToValue($dirtyValue, $dirtyValueAsString, $
             IntlTestHelper::requireIntl($this, '57.1');
         }
 
-        $constraint = $this->createConstraint(array('value' => $comparedValue));
+        $constraint = $this->createConstraint(['value' => $comparedValue]);
         $constraint->message = 'Constraint Message';
 
         $this->validator->validate($dirtyValue, $constraint);
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/AllTest.php b/src/Symfony/Component/Validator/Tests/Constraints/AllTest.php
index 25e71a1b44dc4..cdd72a22ebc58 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/AllTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/AllTest.php
@@ -25,9 +25,9 @@ class AllTest extends TestCase
      */
     public function testRejectNonConstraints()
     {
-        new All(array(
+        new All([
             'foo',
-        ));
+        ]);
     }
 
     /**
@@ -35,8 +35,8 @@ public function testRejectNonConstraints()
      */
     public function testRejectValidConstraint()
     {
-        new All(array(
+        new All([
             new Valid(),
-        ));
+        ]);
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/AllValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/AllValidatorTest.php
index 2792dc4014a73..1752f47e700a5 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/AllValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/AllValidatorTest.php
@@ -26,7 +26,7 @@ protected function createValidator()
 
     public function testNullIsValid()
     {
-        $this->validator->validate(null, new All(new Range(array('min' => 4))));
+        $this->validator->validate(null, new All(new Range(['min' => 4])));
 
         $this->assertNoViolation();
     }
@@ -36,7 +36,7 @@ public function testNullIsValid()
      */
     public function testThrowsExceptionIfNotTraversable()
     {
-        $this->validator->validate('foo.barbar', new All(new Range(array('min' => 4))));
+        $this->validator->validate('foo.barbar', new All(new Range(['min' => 4])));
     }
 
     /**
@@ -44,12 +44,12 @@ public function testThrowsExceptionIfNotTraversable()
      */
     public function testWalkSingleConstraint($array)
     {
-        $constraint = new Range(array('min' => 4));
+        $constraint = new Range(['min' => 4]);
 
         $i = 0;
 
         foreach ($array as $key => $value) {
-            $this->expectValidateValueAt($i++, '['.$key.']', $value, array($constraint));
+            $this->expectValidateValueAt($i++, '['.$key.']', $value, [$constraint]);
         }
 
         $this->validator->validate($array, new All($constraint));
@@ -62,15 +62,15 @@ public function testWalkSingleConstraint($array)
      */
     public function testWalkMultipleConstraints($array)
     {
-        $constraint1 = new Range(array('min' => 4));
+        $constraint1 = new Range(['min' => 4]);
         $constraint2 = new NotNull();
 
-        $constraints = array($constraint1, $constraint2);
+        $constraints = [$constraint1, $constraint2];
 
         $i = 0;
 
         foreach ($array as $key => $value) {
-            $this->expectValidateValueAt($i++, '['.$key.']', $value, array($constraint1, $constraint2));
+            $this->expectValidateValueAt($i++, '['.$key.']', $value, [$constraint1, $constraint2]);
         }
 
         $this->validator->validate($array, new All($constraints));
@@ -80,9 +80,9 @@ public function testWalkMultipleConstraints($array)
 
     public function getValidArguments()
     {
-        return array(
-            array(array(5, 6, 7)),
-            array(new \ArrayObject(array(5, 6, 7))),
-        );
+        return [
+            [[5, 6, 7]],
+            [new \ArrayObject([5, 6, 7])],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/BicValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/BicValidatorTest.php
index 5d21b93ced706..d4f1d01b8e21b 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/BicValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/BicValidatorTest.php
@@ -49,14 +49,14 @@ public function testValidBics($bic)
     public function getValidBics()
     {
         // http://formvalidation.io/validators/bic/
-        return array(
-            array('ASPKAT2LXXX'),
-            array('ASPKAT2L'),
-            array('DSBACNBXSHA'),
-            array('UNCRIT2B912'),
-            array('DABADKKK'),
-            array('RZOOAT2L303'),
-        );
+        return [
+            ['ASPKAT2LXXX'],
+            ['ASPKAT2L'],
+            ['DSBACNBXSHA'],
+            ['UNCRIT2B912'],
+            ['DABADKKK'],
+            ['RZOOAT2L303'],
+        ];
     }
 
     /**
@@ -64,9 +64,9 @@ public function getValidBics()
      */
     public function testInvalidBics($bic, $code)
     {
-        $constraint = new Bic(array(
+        $constraint = new Bic([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($bic, $constraint);
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/BlankValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/BlankValidatorTest.php
index 94c653b105a92..1d138348a9e7b 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/BlankValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/BlankValidatorTest.php
@@ -41,9 +41,9 @@ public function testBlankIsValid()
      */
     public function testInvalidValues($value, $valueAsString)
     {
-        $constraint = new Blank(array(
+        $constraint = new Blank([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -55,11 +55,11 @@ public function testInvalidValues($value, $valueAsString)
 
     public function getInvalidValues()
     {
-        return array(
-            array('foobar', '"foobar"'),
-            array(0, '0'),
-            array(false, 'false'),
-            array(1234, '1234'),
-        );
+        return [
+            ['foobar', '"foobar"'],
+            [0, '0'],
+            [false, 'false'],
+            [1234, '1234'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php
index cb1b5c7b012c2..1c771c2c13aa3 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php
@@ -21,7 +21,7 @@ class CallbackValidatorTest_Class
 {
     public static function validateCallback($object, ExecutionContextInterface $context)
     {
-        $context->addViolation('Callback message', array('{{ value }}' => 'foobar'));
+        $context->addViolation('Callback message', ['{{ value }}' => 'foobar']);
 
         return false;
     }
@@ -31,14 +31,14 @@ class CallbackValidatorTest_Object
 {
     public function validate(ExecutionContextInterface $context)
     {
-        $context->addViolation('My message', array('{{ value }}' => 'foobar'));
+        $context->addViolation('My message', ['{{ value }}' => 'foobar']);
 
         return false;
     }
 
     public static function validateStatic($object, ExecutionContextInterface $context)
     {
-        $context->addViolation('Static message', array('{{ value }}' => 'baz'));
+        $context->addViolation('Static message', ['{{ value }}' => 'baz']);
 
         return false;
     }
@@ -73,7 +73,7 @@ public function testSingleMethod()
     public function testSingleMethodExplicitName()
     {
         $object = new CallbackValidatorTest_Object();
-        $constraint = new Callback(array('callback' => 'validate'));
+        $constraint = new Callback(['callback' => 'validate']);
 
         $this->validator->validate($object, $constraint);
 
@@ -98,7 +98,7 @@ public function testClosure()
     {
         $object = new CallbackValidatorTest_Object();
         $constraint = new Callback(function ($object, ExecutionContextInterface $context) {
-            $context->addViolation('My message', array('{{ value }}' => 'foobar'));
+            $context->addViolation('My message', ['{{ value }}' => 'foobar']);
 
             return false;
         });
@@ -113,7 +113,7 @@ public function testClosure()
     public function testClosureNullObject()
     {
         $constraint = new Callback(function ($object, ExecutionContextInterface $context) {
-            $context->addViolation('My message', array('{{ value }}' => 'foobar'));
+            $context->addViolation('My message', ['{{ value }}' => 'foobar']);
 
             return false;
         });
@@ -128,13 +128,13 @@ public function testClosureNullObject()
     public function testClosureExplicitName()
     {
         $object = new CallbackValidatorTest_Object();
-        $constraint = new Callback(array(
+        $constraint = new Callback([
             'callback' => function ($object, ExecutionContextInterface $context) {
-                $context->addViolation('My message', array('{{ value }}' => 'foobar'));
+                $context->addViolation('My message', ['{{ value }}' => 'foobar']);
 
                 return false;
             },
-        ));
+        ]);
 
         $this->validator->validate($object, $constraint);
 
@@ -146,7 +146,7 @@ public function testClosureExplicitName()
     public function testArrayCallable()
     {
         $object = new CallbackValidatorTest_Object();
-        $constraint = new Callback(array(__CLASS__.'_Class', 'validateCallback'));
+        $constraint = new Callback([__CLASS__.'_Class', 'validateCallback']);
 
         $this->validator->validate($object, $constraint);
 
@@ -157,7 +157,7 @@ public function testArrayCallable()
 
     public function testArrayCallableNullObject()
     {
-        $constraint = new Callback(array(__CLASS__.'_Class', 'validateCallback'));
+        $constraint = new Callback([__CLASS__.'_Class', 'validateCallback']);
 
         $this->validator->validate(null, $constraint);
 
@@ -169,9 +169,9 @@ public function testArrayCallableNullObject()
     public function testArrayCallableExplicitName()
     {
         $object = new CallbackValidatorTest_Object();
-        $constraint = new Callback(array(
-            'callback' => array(__CLASS__.'_Class', 'validateCallback'),
-        ));
+        $constraint = new Callback([
+            'callback' => [__CLASS__.'_Class', 'validateCallback'],
+        ]);
 
         $this->validator->validate($object, $constraint);
 
@@ -187,7 +187,7 @@ public function testExpectValidMethods()
     {
         $object = new CallbackValidatorTest_Object();
 
-        $this->validator->validate($object, new Callback(array('callback' => array('foobar'))));
+        $this->validator->validate($object, new Callback(['callback' => ['foobar']]));
     }
 
     /**
@@ -197,13 +197,13 @@ public function testExpectValidCallbacks()
     {
         $object = new CallbackValidatorTest_Object();
 
-        $this->validator->validate($object, new Callback(array('callback' => array('foo', 'bar'))));
+        $this->validator->validate($object, new Callback(['callback' => ['foo', 'bar']]));
     }
 
     public function testConstraintGetTargets()
     {
-        $constraint = new Callback(array());
-        $targets = array(Constraint::CLASS_CONSTRAINT, Constraint::PROPERTY_CONSTRAINT);
+        $constraint = new Callback([]);
+        $targets = [Constraint::CLASS_CONSTRAINT, Constraint::PROPERTY_CONSTRAINT];
 
         $this->assertEquals($targets, $constraint->getTargets());
     }
@@ -213,21 +213,21 @@ public function testNoConstructorArguments()
     {
         $constraint = new Callback();
 
-        $this->assertSame(array(Constraint::CLASS_CONSTRAINT, Constraint::PROPERTY_CONSTRAINT), $constraint->getTargets());
+        $this->assertSame([Constraint::CLASS_CONSTRAINT, Constraint::PROPERTY_CONSTRAINT], $constraint->getTargets());
     }
 
     public function testAnnotationInvocationSingleValued()
     {
-        $constraint = new Callback(array('value' => 'validateStatic'));
+        $constraint = new Callback(['value' => 'validateStatic']);
 
         $this->assertEquals(new Callback('validateStatic'), $constraint);
     }
 
     public function testAnnotationInvocationMultiValued()
     {
-        $constraint = new Callback(array('value' => array(__CLASS__.'_Class', 'validateCallback')));
+        $constraint = new Callback(['value' => [__CLASS__.'_Class', 'validateCallback']]);
 
-        $this->assertEquals(new Callback(array(__CLASS__.'_Class', 'validateCallback')), $constraint);
+        $this->assertEquals(new Callback([__CLASS__.'_Class', 'validateCallback']), $constraint);
     }
 
     public function testPayloadIsPassedToCallback()
@@ -235,21 +235,21 @@ public function testPayloadIsPassedToCallback()
         $object = new \stdClass();
         $payloadCopy = null;
 
-        $constraint = new Callback(array(
+        $constraint = new Callback([
             'callback' => function ($object, ExecutionContextInterface $constraint, $payload) use (&$payloadCopy) {
                 $payloadCopy = $payload;
             },
             'payload' => 'Hello world!',
-        ));
+        ]);
         $this->validator->validate($object, $constraint);
         $this->assertEquals('Hello world!', $payloadCopy);
 
         $payloadCopy = null;
-        $constraint = new Callback(array(
+        $constraint = new Callback([
             'callback' => function ($object, ExecutionContextInterface $constraint, $payload) use (&$payloadCopy) {
                 $payloadCopy = $payload;
             },
-        ));
+        ]);
         $this->validator->validate($object, $constraint);
         $this->assertNull($payloadCopy);
     }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php
index b0280713d5285..10a4054bc1105 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php
@@ -24,14 +24,14 @@ protected function createValidator()
 
     public function testNullIsValid()
     {
-        $this->validator->validate(null, new CardScheme(array('schemes' => array())));
+        $this->validator->validate(null, new CardScheme(['schemes' => []]));
 
         $this->assertNoViolation();
     }
 
     public function testEmptyStringIsValid()
     {
-        $this->validator->validate('', new CardScheme(array('schemes' => array())));
+        $this->validator->validate('', new CardScheme(['schemes' => []]));
 
         $this->assertNoViolation();
     }
@@ -41,7 +41,7 @@ public function testEmptyStringIsValid()
      */
     public function testValidNumbers($scheme, $number)
     {
-        $this->validator->validate($number, new CardScheme(array('schemes' => $scheme)));
+        $this->validator->validate($number, new CardScheme(['schemes' => $scheme]));
 
         $this->assertNoViolation();
     }
@@ -51,10 +51,10 @@ public function testValidNumbers($scheme, $number)
      */
     public function testInvalidNumbers($scheme, $number, $code)
     {
-        $constraint = new CardScheme(array(
+        $constraint = new CardScheme([
             'schemes' => $scheme,
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($number, $constraint);
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
index 01483161c9fc4..c134764e2e616 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
@@ -17,7 +17,7 @@
 
 function choice_callback()
 {
-    return array('foo', 'bar');
+    return ['foo', 'bar'];
 }
 
 class ChoiceValidatorTest extends ConstraintValidatorTestCase
@@ -29,12 +29,12 @@ protected function createValidator()
 
     public static function staticCallback()
     {
-        return array('foo', 'bar');
+        return ['foo', 'bar'];
     }
 
     public function objectMethodCallback()
     {
-        return array('foo', 'bar');
+        return ['foo', 'bar'];
     }
 
     /**
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CollectionTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CollectionTest.php
index b5fbf6c0b0971..fec935082afe4 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CollectionTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CollectionTest.php
@@ -28,9 +28,9 @@ class CollectionTest extends TestCase
      */
     public function testRejectInvalidFieldsOption()
     {
-        new Collection(array(
+        new Collection([
             'fields' => 'foo',
-        ));
+        ]);
     }
 
     /**
@@ -38,9 +38,9 @@ public function testRejectInvalidFieldsOption()
      */
     public function testRejectNonConstraints()
     {
-        new Collection(array(
+        new Collection([
             'foo' => 'bar',
-        ));
+        ]);
     }
 
     /**
@@ -48,9 +48,9 @@ public function testRejectNonConstraints()
      */
     public function testRejectValidConstraint()
     {
-        new Collection(array(
+        new Collection([
             'foo' => new Valid(),
-        ));
+        ]);
     }
 
     /**
@@ -58,9 +58,9 @@ public function testRejectValidConstraint()
      */
     public function testRejectValidConstraintWithinOptional()
     {
-        new Collection(array(
+        new Collection([
             'foo' => new Optional(new Valid()),
-        ));
+        ]);
     }
 
     /**
@@ -68,45 +68,45 @@ public function testRejectValidConstraintWithinOptional()
      */
     public function testRejectValidConstraintWithinRequired()
     {
-        new Collection(array(
+        new Collection([
             'foo' => new Required(new Valid()),
-        ));
+        ]);
     }
 
     public function testAcceptOptionalConstraintAsOneElementArray()
     {
-        $collection1 = new Collection(array(
-            'fields' => array(
-                'alternate_email' => array(
+        $collection1 = new Collection([
+            'fields' => [
+                'alternate_email' => [
                     new Optional(new Email()),
-                ),
-            ),
-        ));
+                ],
+            ],
+        ]);
 
-        $collection2 = new Collection(array(
-            'fields' => array(
+        $collection2 = new Collection([
+            'fields' => [
                 'alternate_email' => new Optional(new Email()),
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertEquals($collection1, $collection2);
     }
 
     public function testAcceptRequiredConstraintAsOneElementArray()
     {
-        $collection1 = new Collection(array(
-            'fields' => array(
-                'alternate_email' => array(
+        $collection1 = new Collection([
+            'fields' => [
+                'alternate_email' => [
                     new Required(new Email()),
-                ),
-            ),
-        ));
+                ],
+            ],
+        ]);
 
-        $collection2 = new Collection(array(
-            'fields' => array(
+        $collection2 = new Collection([
+            'fields' => [
                 'alternate_email' => new Required(new Email()),
-            ),
-        ));
+            ],
+        ]);
 
         $this->assertEquals($collection1, $collection2);
     }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php
index 32aa8e359e771..fa2ee0985ef1a 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php
@@ -30,24 +30,24 @@ abstract protected function prepareTestData(array $contents);
 
     public function testNullIsValid()
     {
-        $this->validator->validate(null, new Collection(array('fields' => array(
-            'foo' => new Range(array('min' => 4)),
-        ))));
+        $this->validator->validate(null, new Collection(['fields' => [
+            'foo' => new Range(['min' => 4]),
+        ]]));
 
         $this->assertNoViolation();
     }
 
     public function testFieldsAsDefaultOption()
     {
-        $constraint = new Range(array('min' => 4));
+        $constraint = new Range(['min' => 4]);
 
-        $data = $this->prepareTestData(array('foo' => 'foobar'));
+        $data = $this->prepareTestData(['foo' => 'foobar']);
 
-        $this->expectValidateValueAt(0, '[foo]', $data['foo'], array($constraint));
+        $this->expectValidateValueAt(0, '[foo]', $data['foo'], [$constraint]);
 
-        $this->validator->validate($data, new Collection(array(
+        $this->validator->validate($data, new Collection([
             'foo' => $constraint,
-        )));
+        ]));
 
         $this->assertNoViolation();
     }
@@ -57,49 +57,49 @@ public function testFieldsAsDefaultOption()
      */
     public function testThrowsExceptionIfNotTraversable()
     {
-        $this->validator->validate('foobar', new Collection(array('fields' => array(
-            'foo' => new Range(array('min' => 4)),
-        ))));
+        $this->validator->validate('foobar', new Collection(['fields' => [
+            'foo' => new Range(['min' => 4]),
+        ]]));
     }
 
     public function testWalkSingleConstraint()
     {
-        $constraint = new Range(array('min' => 4));
+        $constraint = new Range(['min' => 4]);
 
-        $array = array(
+        $array = [
             'foo' => 3,
             'bar' => 5,
-        );
+        ];
 
         $i = 0;
 
         foreach ($array as $key => $value) {
-            $this->expectValidateValueAt($i++, '['.$key.']', $value, array($constraint));
+            $this->expectValidateValueAt($i++, '['.$key.']', $value, [$constraint]);
         }
 
         $data = $this->prepareTestData($array);
 
-        $this->validator->validate($data, new Collection(array(
-            'fields' => array(
+        $this->validator->validate($data, new Collection([
+            'fields' => [
                 'foo' => $constraint,
                 'bar' => $constraint,
-            ),
-        )));
+            ],
+        ]));
 
         $this->assertNoViolation();
     }
 
     public function testWalkMultipleConstraints()
     {
-        $constraints = array(
-            new Range(array('min' => 4)),
+        $constraints = [
+            new Range(['min' => 4]),
             new NotNull(),
-        );
+        ];
 
-        $array = array(
+        $array = [
             'foo' => 3,
             'bar' => 5,
-        );
+        ];
 
         $i = 0;
 
@@ -109,33 +109,33 @@ public function testWalkMultipleConstraints()
 
         $data = $this->prepareTestData($array);
 
-        $this->validator->validate($data, new Collection(array(
-            'fields' => array(
+        $this->validator->validate($data, new Collection([
+            'fields' => [
                 'foo' => $constraints,
                 'bar' => $constraints,
-            ),
-        )));
+            ],
+        ]));
 
         $this->assertNoViolation();
     }
 
     public function testExtraFieldsDisallowed()
     {
-        $constraint = new Range(array('min' => 4));
+        $constraint = new Range(['min' => 4]);
 
-        $data = $this->prepareTestData(array(
+        $data = $this->prepareTestData([
             'foo' => 5,
             'baz' => 6,
-        ));
+        ]);
 
-        $this->expectValidateValueAt(0, '[foo]', $data['foo'], array($constraint));
+        $this->expectValidateValueAt(0, '[foo]', $data['foo'], [$constraint]);
 
-        $this->validator->validate($data, new Collection(array(
-            'fields' => array(
+        $this->validator->validate($data, new Collection([
+            'fields' => [
                 'foo' => $constraint,
-            ),
+            ],
             'extraFieldsMessage' => 'myMessage',
-        )));
+        ]));
 
         $this->buildViolation('myMessage')
             ->setParameter('{{ field }}', '"baz"')
@@ -148,56 +148,56 @@ public function testExtraFieldsDisallowed()
     // bug fix
     public function testNullNotConsideredExtraField()
     {
-        $data = $this->prepareTestData(array(
+        $data = $this->prepareTestData([
             'foo' => null,
-        ));
+        ]);
 
-        $constraint = new Range(array('min' => 4));
+        $constraint = new Range(['min' => 4]);
 
-        $this->expectValidateValueAt(0, '[foo]', $data['foo'], array($constraint));
+        $this->expectValidateValueAt(0, '[foo]', $data['foo'], [$constraint]);
 
-        $this->validator->validate($data, new Collection(array(
-            'fields' => array(
+        $this->validator->validate($data, new Collection([
+            'fields' => [
                 'foo' => $constraint,
-            ),
-        )));
+            ],
+        ]));
 
         $this->assertNoViolation();
     }
 
     public function testExtraFieldsAllowed()
     {
-        $data = $this->prepareTestData(array(
+        $data = $this->prepareTestData([
             'foo' => 5,
             'bar' => 6,
-        ));
+        ]);
 
-        $constraint = new Range(array('min' => 4));
+        $constraint = new Range(['min' => 4]);
 
-        $this->expectValidateValueAt(0, '[foo]', $data['foo'], array($constraint));
+        $this->expectValidateValueAt(0, '[foo]', $data['foo'], [$constraint]);
 
-        $this->validator->validate($data, new Collection(array(
-            'fields' => array(
+        $this->validator->validate($data, new Collection([
+            'fields' => [
                 'foo' => $constraint,
-            ),
+            ],
             'allowExtraFields' => true,
-        )));
+        ]));
 
         $this->assertNoViolation();
     }
 
     public function testMissingFieldsDisallowed()
     {
-        $data = $this->prepareTestData(array());
+        $data = $this->prepareTestData([]);
 
-        $constraint = new Range(array('min' => 4));
+        $constraint = new Range(['min' => 4]);
 
-        $this->validator->validate($data, new Collection(array(
-            'fields' => array(
+        $this->validator->validate($data, new Collection([
+            'fields' => [
                 'foo' => $constraint,
-            ),
+            ],
             'missingFieldsMessage' => 'myMessage',
-        )));
+        ]));
 
         $this->buildViolation('myMessage')
             ->setParameter('{{ field }}', '"foo"')
@@ -209,108 +209,108 @@ public function testMissingFieldsDisallowed()
 
     public function testMissingFieldsAllowed()
     {
-        $data = $this->prepareTestData(array());
+        $data = $this->prepareTestData([]);
 
-        $constraint = new Range(array('min' => 4));
+        $constraint = new Range(['min' => 4]);
 
-        $this->validator->validate($data, new Collection(array(
-            'fields' => array(
+        $this->validator->validate($data, new Collection([
+            'fields' => [
                 'foo' => $constraint,
-            ),
+            ],
             'allowMissingFields' => true,
-        )));
+        ]));
 
         $this->assertNoViolation();
     }
 
     public function testOptionalFieldPresent()
     {
-        $data = $this->prepareTestData(array(
+        $data = $this->prepareTestData([
             'foo' => null,
-        ));
+        ]);
 
-        $this->validator->validate($data, new Collection(array(
+        $this->validator->validate($data, new Collection([
             'foo' => new Optional(),
-        )));
+        ]));
 
         $this->assertNoViolation();
     }
 
     public function testOptionalFieldNotPresent()
     {
-        $data = $this->prepareTestData(array());
+        $data = $this->prepareTestData([]);
 
-        $this->validator->validate($data, new Collection(array(
+        $this->validator->validate($data, new Collection([
             'foo' => new Optional(),
-        )));
+        ]));
 
         $this->assertNoViolation();
     }
 
     public function testOptionalFieldSingleConstraint()
     {
-        $array = array(
+        $array = [
             'foo' => 5,
-        );
+        ];
 
-        $constraint = new Range(array('min' => 4));
+        $constraint = new Range(['min' => 4]);
 
-        $this->expectValidateValueAt(0, '[foo]', $array['foo'], array($constraint));
+        $this->expectValidateValueAt(0, '[foo]', $array['foo'], [$constraint]);
 
         $data = $this->prepareTestData($array);
 
-        $this->validator->validate($data, new Collection(array(
+        $this->validator->validate($data, new Collection([
             'foo' => new Optional($constraint),
-        )));
+        ]));
 
         $this->assertNoViolation();
     }
 
     public function testOptionalFieldMultipleConstraints()
     {
-        $array = array(
+        $array = [
             'foo' => 5,
-        );
+        ];
 
-        $constraints = array(
+        $constraints = [
             new NotNull(),
-            new Range(array('min' => 4)),
-        );
+            new Range(['min' => 4]),
+        ];
 
         $this->expectValidateValueAt(0, '[foo]', $array['foo'], $constraints);
 
         $data = $this->prepareTestData($array);
 
-        $this->validator->validate($data, new Collection(array(
+        $this->validator->validate($data, new Collection([
             'foo' => new Optional($constraints),
-        )));
+        ]));
 
         $this->assertNoViolation();
     }
 
     public function testRequiredFieldPresent()
     {
-        $data = $this->prepareTestData(array(
+        $data = $this->prepareTestData([
             'foo' => null,
-        ));
+        ]);
 
-        $this->validator->validate($data, new Collection(array(
+        $this->validator->validate($data, new Collection([
             'foo' => new Required(),
-        )));
+        ]));
 
         $this->assertNoViolation();
     }
 
     public function testRequiredFieldNotPresent()
     {
-        $data = $this->prepareTestData(array());
+        $data = $this->prepareTestData([]);
 
-        $this->validator->validate($data, new Collection(array(
-            'fields' => array(
+        $this->validator->validate($data, new Collection([
+            'fields' => [
                 'foo' => new Required(),
-            ),
+            ],
             'missingFieldsMessage' => 'myMessage',
-        )));
+        ]));
 
         $this->buildViolation('myMessage')
             ->setParameter('{{ field }}', '"foo"')
@@ -322,63 +322,63 @@ public function testRequiredFieldNotPresent()
 
     public function testRequiredFieldSingleConstraint()
     {
-        $array = array(
+        $array = [
             'foo' => 5,
-        );
+        ];
 
-        $constraint = new Range(array('min' => 4));
+        $constraint = new Range(['min' => 4]);
 
-        $this->expectValidateValueAt(0, '[foo]', $array['foo'], array($constraint));
+        $this->expectValidateValueAt(0, '[foo]', $array['foo'], [$constraint]);
 
         $data = $this->prepareTestData($array);
 
-        $this->validator->validate($data, new Collection(array(
+        $this->validator->validate($data, new Collection([
             'foo' => new Required($constraint),
-        )));
+        ]));
 
         $this->assertNoViolation();
     }
 
     public function testRequiredFieldMultipleConstraints()
     {
-        $array = array(
+        $array = [
             'foo' => 5,
-        );
+        ];
 
-        $constraints = array(
+        $constraints = [
             new NotNull(),
-            new Range(array('min' => 4)),
-        );
+            new Range(['min' => 4]),
+        ];
 
         $this->expectValidateValueAt(0, '[foo]', $array['foo'], $constraints);
 
         $data = $this->prepareTestData($array);
 
-        $this->validator->validate($data, new Collection(array(
+        $this->validator->validate($data, new Collection([
             'foo' => new Required($constraints),
-        )));
+        ]));
 
         $this->assertNoViolation();
     }
 
     public function testObjectShouldBeLeftUnchanged()
     {
-        $value = new \ArrayObject(array(
+        $value = new \ArrayObject([
             'foo' => 3,
-        ));
+        ]);
 
-        $constraint = new Range(array('min' => 2));
+        $constraint = new Range(['min' => 2]);
 
-        $this->expectValidateValueAt(0, '[foo]', $value['foo'], array($constraint));
+        $this->expectValidateValueAt(0, '[foo]', $value['foo'], [$constraint]);
 
-        $this->validator->validate($value, new Collection(array(
-            'fields' => array(
+        $this->validator->validate($value, new Collection([
+            'fields' => [
                 'foo' => $constraint,
-            ),
-        )));
+            ],
+        ]));
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'foo' => 3,
-        ), (array) $value);
+        ], (array) $value);
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CompositeTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CompositeTest.php
index df4255007c5ca..3070e6a22f334 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CompositeTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CompositeTest.php
@@ -39,44 +39,44 @@ class CompositeTest extends TestCase
 {
     public function testMergeNestedGroupsIfNoExplicitParentGroup()
     {
-        $constraint = new ConcreteComposite(array(
-            new NotNull(array('groups' => 'Default')),
-            new NotBlank(array('groups' => array('Default', 'Strict'))),
-        ));
-
-        $this->assertEquals(array('Default', 'Strict'), $constraint->groups);
-        $this->assertEquals(array('Default'), $constraint->constraints[0]->groups);
-        $this->assertEquals(array('Default', 'Strict'), $constraint->constraints[1]->groups);
+        $constraint = new ConcreteComposite([
+            new NotNull(['groups' => 'Default']),
+            new NotBlank(['groups' => ['Default', 'Strict']]),
+        ]);
+
+        $this->assertEquals(['Default', 'Strict'], $constraint->groups);
+        $this->assertEquals(['Default'], $constraint->constraints[0]->groups);
+        $this->assertEquals(['Default', 'Strict'], $constraint->constraints[1]->groups);
     }
 
     public function testSetImplicitNestedGroupsIfExplicitParentGroup()
     {
-        $constraint = new ConcreteComposite(array(
-            'constraints' => array(
+        $constraint = new ConcreteComposite([
+            'constraints' => [
                 new NotNull(),
                 new NotBlank(),
-            ),
-            'groups' => array('Default', 'Strict'),
-        ));
+            ],
+            'groups' => ['Default', 'Strict'],
+        ]);
 
-        $this->assertEquals(array('Default', 'Strict'), $constraint->groups);
-        $this->assertEquals(array('Default', 'Strict'), $constraint->constraints[0]->groups);
-        $this->assertEquals(array('Default', 'Strict'), $constraint->constraints[1]->groups);
+        $this->assertEquals(['Default', 'Strict'], $constraint->groups);
+        $this->assertEquals(['Default', 'Strict'], $constraint->constraints[0]->groups);
+        $this->assertEquals(['Default', 'Strict'], $constraint->constraints[1]->groups);
     }
 
     public function testExplicitNestedGroupsMustBeSubsetOfExplicitParentGroups()
     {
-        $constraint = new ConcreteComposite(array(
-            'constraints' => array(
-                new NotNull(array('groups' => 'Default')),
-                new NotBlank(array('groups' => 'Strict')),
-            ),
-            'groups' => array('Default', 'Strict'),
-        ));
-
-        $this->assertEquals(array('Default', 'Strict'), $constraint->groups);
-        $this->assertEquals(array('Default'), $constraint->constraints[0]->groups);
-        $this->assertEquals(array('Strict'), $constraint->constraints[1]->groups);
+        $constraint = new ConcreteComposite([
+            'constraints' => [
+                new NotNull(['groups' => 'Default']),
+                new NotBlank(['groups' => 'Strict']),
+            ],
+            'groups' => ['Default', 'Strict'],
+        ]);
+
+        $this->assertEquals(['Default', 'Strict'], $constraint->groups);
+        $this->assertEquals(['Default'], $constraint->constraints[0]->groups);
+        $this->assertEquals(['Strict'], $constraint->constraints[1]->groups);
     }
 
     /**
@@ -84,26 +84,26 @@ public function testExplicitNestedGroupsMustBeSubsetOfExplicitParentGroups()
      */
     public function testFailIfExplicitNestedGroupsNotSubsetOfExplicitParentGroups()
     {
-        new ConcreteComposite(array(
-            'constraints' => array(
-                new NotNull(array('groups' => array('Default', 'Foobar'))),
-            ),
-            'groups' => array('Default', 'Strict'),
-        ));
+        new ConcreteComposite([
+            'constraints' => [
+                new NotNull(['groups' => ['Default', 'Foobar']]),
+            ],
+            'groups' => ['Default', 'Strict'],
+        ]);
     }
 
     public function testImplicitGroupNamesAreForwarded()
     {
-        $constraint = new ConcreteComposite(array(
-            new NotNull(array('groups' => 'Default')),
-            new NotBlank(array('groups' => 'Strict')),
-        ));
+        $constraint = new ConcreteComposite([
+            new NotNull(['groups' => 'Default']),
+            new NotBlank(['groups' => 'Strict']),
+        ]);
 
         $constraint->addImplicitGroupName('ImplicitGroup');
 
-        $this->assertEquals(array('Default', 'Strict', 'ImplicitGroup'), $constraint->groups);
-        $this->assertEquals(array('Default', 'ImplicitGroup'), $constraint->constraints[0]->groups);
-        $this->assertEquals(array('Strict'), $constraint->constraints[1]->groups);
+        $this->assertEquals(['Default', 'Strict', 'ImplicitGroup'], $constraint->groups);
+        $this->assertEquals(['Default', 'ImplicitGroup'], $constraint->constraints[0]->groups);
+        $this->assertEquals(['Strict'], $constraint->constraints[1]->groups);
     }
 
     public function testSingleConstraintsAccepted()
@@ -111,7 +111,7 @@ public function testSingleConstraintsAccepted()
         $nestedConstraint = new NotNull();
         $constraint = new ConcreteComposite($nestedConstraint);
 
-        $this->assertEquals(array($nestedConstraint), $constraint->constraints);
+        $this->assertEquals([$nestedConstraint], $constraint->constraints);
     }
 
     /**
@@ -119,10 +119,10 @@ public function testSingleConstraintsAccepted()
      */
     public function testFailIfNoConstraint()
     {
-        new ConcreteComposite(array(
-            new NotNull(array('groups' => 'Default')),
+        new ConcreteComposite([
+            new NotNull(['groups' => 'Default']),
             'NotBlank',
-        ));
+        ]);
     }
 
     /**
@@ -130,10 +130,10 @@ public function testFailIfNoConstraint()
      */
     public function testFailIfNoConstraintObject()
     {
-        new ConcreteComposite(array(
-            new NotNull(array('groups' => 'Default')),
+        new ConcreteComposite([
+            new NotNull(['groups' => 'Default']),
             new \ArrayObject(),
-        ));
+        ]);
     }
 
     /**
@@ -141,8 +141,8 @@ public function testFailIfNoConstraintObject()
      */
     public function testValidCantBeNested()
     {
-        new ConcreteComposite(array(
+        new ConcreteComposite([
             new Valid(),
-        ));
+        ]);
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorTest.php
index d23188a098213..8416136fd4af3 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorTest.php
@@ -44,29 +44,29 @@ public function testExpectsCountableType()
 
     public function getThreeOrLessElements()
     {
-        return array(
-            array($this->createCollection(array(1))),
-            array($this->createCollection(array(1, 2))),
-            array($this->createCollection(array(1, 2, 3))),
-            array($this->createCollection(array('a' => 1, 'b' => 2, 'c' => 3))),
-        );
+        return [
+            [$this->createCollection([1])],
+            [$this->createCollection([1, 2])],
+            [$this->createCollection([1, 2, 3])],
+            [$this->createCollection(['a' => 1, 'b' => 2, 'c' => 3])],
+        ];
     }
 
     public function getFourElements()
     {
-        return array(
-            array($this->createCollection(array(1, 2, 3, 4))),
-            array($this->createCollection(array('a' => 1, 'b' => 2, 'c' => 3, 'd' => 4))),
-        );
+        return [
+            [$this->createCollection([1, 2, 3, 4])],
+            [$this->createCollection(['a' => 1, 'b' => 2, 'c' => 3, 'd' => 4])],
+        ];
     }
 
     public function getFiveOrMoreElements()
     {
-        return array(
-            array($this->createCollection(array(1, 2, 3, 4, 5))),
-            array($this->createCollection(array(1, 2, 3, 4, 5, 6))),
-            array($this->createCollection(array('a' => 1, 'b' => 2, 'c' => 3, 'd' => 4, 'e' => 5))),
-        );
+        return [
+            [$this->createCollection([1, 2, 3, 4, 5])],
+            [$this->createCollection([1, 2, 3, 4, 5, 6])],
+            [$this->createCollection(['a' => 1, 'b' => 2, 'c' => 3, 'd' => 4, 'e' => 5])],
+        ];
     }
 
     /**
@@ -74,7 +74,7 @@ public function getFiveOrMoreElements()
      */
     public function testValidValuesMax($value)
     {
-        $constraint = new Count(array('max' => 3));
+        $constraint = new Count(['max' => 3]);
         $this->validator->validate($value, $constraint);
 
         $this->assertNoViolation();
@@ -85,7 +85,7 @@ public function testValidValuesMax($value)
      */
     public function testValidValuesMin($value)
     {
-        $constraint = new Count(array('min' => 5));
+        $constraint = new Count(['min' => 5]);
         $this->validator->validate($value, $constraint);
 
         $this->assertNoViolation();
@@ -107,10 +107,10 @@ public function testValidValuesExact($value)
      */
     public function testTooManyValues($value)
     {
-        $constraint = new Count(array(
+        $constraint = new Count([
             'max' => 4,
             'maxMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -128,10 +128,10 @@ public function testTooManyValues($value)
      */
     public function testTooFewValues($value)
     {
-        $constraint = new Count(array(
+        $constraint = new Count([
             'min' => 4,
             'minMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -149,11 +149,11 @@ public function testTooFewValues($value)
      */
     public function testTooManyValuesExact($value)
     {
-        $constraint = new Count(array(
+        $constraint = new Count([
             'min' => 4,
             'max' => 4,
             'exactMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -171,11 +171,11 @@ public function testTooManyValuesExact($value)
      */
     public function testTooFewValuesExact($value)
     {
-        $constraint = new Count(array(
+        $constraint = new Count([
             'min' => 4,
             'max' => 4,
             'exactMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php
index 044a742db630a..23c528363000a 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php
@@ -57,11 +57,11 @@ public function testValidCountries($country)
 
     public function getValidCountries()
     {
-        return array(
-            array('GB'),
-            array('AT'),
-            array('MY'),
-        );
+        return [
+            ['GB'],
+            ['AT'],
+            ['MY'],
+        ];
     }
 
     /**
@@ -69,9 +69,9 @@ public function getValidCountries()
      */
     public function testInvalidCountries($country)
     {
-        $constraint = new Country(array(
+        $constraint = new Country([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($country, $constraint);
 
@@ -83,10 +83,10 @@ public function testInvalidCountries($country)
 
     public function getInvalidCountries()
     {
-        return array(
-            array('foobar'),
-            array('EN'),
-        );
+        return [
+            ['foobar'],
+            ['EN'],
+        ];
     }
 
     public function testValidateUsingCountrySpecificLocale()
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php
index 1286ff31f89f3..c699f851f26f5 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php
@@ -71,13 +71,13 @@ public function testValidCurrenciesWithCountrySpecificLocale($currency)
 
     public function getValidCurrencies()
     {
-        return array(
-            array('EUR'),
-            array('USD'),
-            array('SIT'),
-            array('AUD'),
-            array('CAD'),
-        );
+        return [
+            ['EUR'],
+            ['USD'],
+            ['SIT'],
+            ['AUD'],
+            ['CAD'],
+        ];
     }
 
     /**
@@ -85,9 +85,9 @@ public function getValidCurrencies()
      */
     public function testInvalidCurrencies($currency)
     {
-        $constraint = new Currency(array(
+        $constraint = new Currency([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($currency, $constraint);
 
@@ -99,9 +99,9 @@ public function testInvalidCurrencies($currency)
 
     public function getInvalidCurrencies()
     {
-        return array(
-            array('EN'),
-            array('foobar'),
-        );
+        return [
+            ['EN'],
+            ['foobar'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
index fe553100339f8..6a8fa15b42030 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
@@ -77,9 +77,9 @@ public function testDateTimeWithDefaultFormat()
      */
     public function testValidDateTimes($format, $dateTime)
     {
-        $constraint = new DateTime(array(
+        $constraint = new DateTime([
             'format' => $format,
-        ));
+        ]);
 
         $this->validator->validate($dateTime, $constraint);
 
@@ -88,13 +88,13 @@ public function testValidDateTimes($format, $dateTime)
 
     public function getValidDateTimes()
     {
-        return array(
-            array('Y-m-d H:i:s e', '1995-03-24 00:00:00 UTC'),
-            array('Y-m-d H:i:s', '2010-01-01 01:02:03'),
-            array('Y/m/d H:i', '2010/01/01 01:02'),
-            array('F d, Y', 'December 31, 1999'),
-            array('d-m-Y', '10-05-1995'),
-        );
+        return [
+            ['Y-m-d H:i:s e', '1995-03-24 00:00:00 UTC'],
+            ['Y-m-d H:i:s', '2010-01-01 01:02:03'],
+            ['Y/m/d H:i', '2010/01/01 01:02'],
+            ['F d, Y', 'December 31, 1999'],
+            ['d-m-Y', '10-05-1995'],
+        ];
     }
 
     /**
@@ -102,10 +102,10 @@ public function getValidDateTimes()
      */
     public function testInvalidDateTimes($format, $dateTime, $code)
     {
-        $constraint = new DateTime(array(
+        $constraint = new DateTime([
             'message' => 'myMessage',
             'format' => $format,
-        ));
+        ]);
 
         $this->validator->validate($dateTime, $constraint);
 
@@ -117,17 +117,17 @@ public function testInvalidDateTimes($format, $dateTime, $code)
 
     public function getInvalidDateTimes()
     {
-        return array(
-            array('Y-m-d', 'foobar', DateTime::INVALID_FORMAT_ERROR),
-            array('H:i', '00:00:00', DateTime::INVALID_FORMAT_ERROR),
-            array('Y-m-d', '2010-01-01 00:00', DateTime::INVALID_FORMAT_ERROR),
-            array('Y-m-d e', '2010-01-01 TCU', DateTime::INVALID_FORMAT_ERROR),
-            array('Y-m-d H:i:s', '2010-13-01 00:00:00', DateTime::INVALID_DATE_ERROR),
-            array('Y-m-d H:i:s', '2010-04-32 00:00:00', DateTime::INVALID_DATE_ERROR),
-            array('Y-m-d H:i:s', '2010-02-29 00:00:00', DateTime::INVALID_DATE_ERROR),
-            array('Y-m-d H:i:s', '2010-01-01 24:00:00', DateTime::INVALID_TIME_ERROR),
-            array('Y-m-d H:i:s', '2010-01-01 00:60:00', DateTime::INVALID_TIME_ERROR),
-            array('Y-m-d H:i:s', '2010-01-01 00:00:60', DateTime::INVALID_TIME_ERROR),
-        );
+        return [
+            ['Y-m-d', 'foobar', DateTime::INVALID_FORMAT_ERROR],
+            ['H:i', '00:00:00', DateTime::INVALID_FORMAT_ERROR],
+            ['Y-m-d', '2010-01-01 00:00', DateTime::INVALID_FORMAT_ERROR],
+            ['Y-m-d e', '2010-01-01 TCU', DateTime::INVALID_FORMAT_ERROR],
+            ['Y-m-d H:i:s', '2010-13-01 00:00:00', DateTime::INVALID_DATE_ERROR],
+            ['Y-m-d H:i:s', '2010-04-32 00:00:00', DateTime::INVALID_DATE_ERROR],
+            ['Y-m-d H:i:s', '2010-02-29 00:00:00', DateTime::INVALID_DATE_ERROR],
+            ['Y-m-d H:i:s', '2010-01-01 24:00:00', DateTime::INVALID_TIME_ERROR],
+            ['Y-m-d H:i:s', '2010-01-01 00:60:00', DateTime::INVALID_TIME_ERROR],
+            ['Y-m-d H:i:s', '2010-01-01 00:00:60', DateTime::INVALID_TIME_ERROR],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
index 3b2b189a55215..0e0114f0ae650 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
@@ -70,11 +70,11 @@ public function testValidDates($date)
 
     public function getValidDates()
     {
-        return array(
-            array('2010-01-01'),
-            array('1955-12-12'),
-            array('2030-05-31'),
-        );
+        return [
+            ['2010-01-01'],
+            ['1955-12-12'],
+            ['2030-05-31'],
+        ];
     }
 
     /**
@@ -82,9 +82,9 @@ public function getValidDates()
      */
     public function testInvalidDates($date, $code)
     {
-        $constraint = new Date(array(
+        $constraint = new Date([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($date, $constraint);
 
@@ -96,13 +96,13 @@ public function testInvalidDates($date, $code)
 
     public function getInvalidDates()
     {
-        return array(
-            array('foobar', Date::INVALID_FORMAT_ERROR),
-            array('foobar 2010-13-01', Date::INVALID_FORMAT_ERROR),
-            array('2010-13-01 foobar', Date::INVALID_FORMAT_ERROR),
-            array('2010-13-01', Date::INVALID_DATE_ERROR),
-            array('2010-04-32', Date::INVALID_DATE_ERROR),
-            array('2010-02-29', Date::INVALID_DATE_ERROR),
-        );
+        return [
+            ['foobar', Date::INVALID_FORMAT_ERROR],
+            ['foobar 2010-13-01', Date::INVALID_FORMAT_ERROR],
+            ['2010-13-01 foobar', Date::INVALID_FORMAT_ERROR],
+            ['2010-13-01', Date::INVALID_DATE_ERROR],
+            ['2010-04-32', Date::INVALID_DATE_ERROR],
+            ['2010-02-29', Date::INVALID_DATE_ERROR],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
index ff6d5c466c364..7226cb65d03de 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
@@ -72,9 +72,9 @@ public function getValidEmails()
      */
     public function testInvalidEmails($email)
     {
-        $constraint = new Email(array(
+        $constraint = new Email([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($email, $constraint);
 
@@ -127,55 +127,55 @@ public function testStrictWithInvalidEmails($email)
      */
     public function getInvalidEmailsForStrictChecks()
     {
-        return array(
-            array('test@example.com test'),
-            array('user  name@example.com'),
-            array('user   name@example.com'),
-            array('example.@example.co.uk'),
-            array('example@example@example.co.uk'),
-            array('(test_exampel@example.fr)'),
-            array('example(example)example@example.co.uk'),
-            array('.example@localhost'),
-            array('ex\ample@localhost'),
-            array('example@local\host'),
-            array('example@localhost.'),
-            array('user name@example.com'),
-            array('username@ example . com'),
-            array('example@(fake).com'),
-            array('example@(fake.com'),
-            array('username@example,com'),
-            array('usern,ame@example.com'),
-            array('user[na]me@example.com'),
-            array('"""@iana.org'),
-            array('"\"@iana.org'),
-            array('"test"test@iana.org'),
-            array('"test""test"@iana.org'),
-            array('"test"."test"@iana.org'),
-            array('"test".test@iana.org'),
-            array('"test"'.\chr(0).'@iana.org'),
-            array('"test\"@iana.org'),
-            array(\chr(226).'@iana.org'),
-            array('test@'.\chr(226).'.org'),
-            array('\r\ntest@iana.org'),
-            array('\r\n test@iana.org'),
-            array('\r\n \r\ntest@iana.org'),
-            array('\r\n \r\ntest@iana.org'),
-            array('\r\n \r\n test@iana.org'),
-            array('test@iana.org \r\n'),
-            array('test@iana.org \r\n '),
-            array('test@iana.org \r\n \r\n'),
-            array('test@iana.org \r\n\r\n'),
-            array('test@iana.org  \r\n\r\n '),
-            array('test@iana/icann.org'),
-            array('test@foo;bar.com'),
-            array('test;123@foobar.com'),
-            array('test@example..com'),
-            array('email.email@email."'),
-            array('test@email>'),
-            array('test@email<'),
-            array('test@email{'),
-            array(str_repeat('x', 254).'@example.com'), //email with warnings
-        );
+        return [
+            ['test@example.com test'],
+            ['user  name@example.com'],
+            ['user   name@example.com'],
+            ['example.@example.co.uk'],
+            ['example@example@example.co.uk'],
+            ['(test_exampel@example.fr)'],
+            ['example(example)example@example.co.uk'],
+            ['.example@localhost'],
+            ['ex\ample@localhost'],
+            ['example@local\host'],
+            ['example@localhost.'],
+            ['user name@example.com'],
+            ['username@ example . com'],
+            ['example@(fake).com'],
+            ['example@(fake.com'],
+            ['username@example,com'],
+            ['usern,ame@example.com'],
+            ['user[na]me@example.com'],
+            ['"""@iana.org'],
+            ['"\"@iana.org'],
+            ['"test"test@iana.org'],
+            ['"test""test"@iana.org'],
+            ['"test"."test"@iana.org'],
+            ['"test".test@iana.org'],
+            ['"test"'.\chr(0).'@iana.org'],
+            ['"test\"@iana.org'],
+            [\chr(226).'@iana.org'],
+            ['test@'.\chr(226).'.org'],
+            ['\r\ntest@iana.org'],
+            ['\r\n test@iana.org'],
+            ['\r\n \r\ntest@iana.org'],
+            ['\r\n \r\ntest@iana.org'],
+            ['\r\n \r\n test@iana.org'],
+            ['test@iana.org \r\n'],
+            ['test@iana.org \r\n '],
+            ['test@iana.org \r\n \r\n'],
+            ['test@iana.org \r\n\r\n'],
+            ['test@iana.org  \r\n\r\n '],
+            ['test@iana/icann.org'],
+            ['test@foo;bar.com'],
+            ['test;123@foobar.com'],
+            ['test@example..com'],
+            ['email.email@email."'],
+            ['test@email>'],
+            ['test@email<'],
+            ['test@email{'],
+            [str_repeat('x', 254).'@example.com'], //email with warnings
+        ];
     }
 
     /**
@@ -184,12 +184,12 @@ public function getInvalidEmailsForStrictChecks()
      */
     public function testDnsChecks($type, $violation)
     {
-        DnsMock::withMockedHosts(array('example.com' => array(array('type' => $violation ? false : $type))));
+        DnsMock::withMockedHosts(['example.com' => [['type' => $violation ? false : $type]]]);
 
-        $constraint = new Email(array(
+        $constraint = new Email([
             'message' => 'myMessage',
             'MX' === $type ? 'checkMX' : 'checkHost' => true,
-        ));
+        ]);
 
         $this->validator->validate('foo@example.com', $constraint);
 
@@ -205,14 +205,14 @@ public function testDnsChecks($type, $violation)
 
     public function getDnsChecks()
     {
-        return array(
-            array('MX', false),
-            array('MX', Email::MX_CHECK_FAILED_ERROR),
-            array('A', false),
-            array('A', Email::HOST_CHECK_FAILED_ERROR),
-            array('AAAA', false),
-            array('AAAA', Email::HOST_CHECK_FAILED_ERROR),
-        );
+        return [
+            ['MX', false],
+            ['MX', Email::MX_CHECK_FAILED_ERROR],
+            ['A', false],
+            ['A', Email::HOST_CHECK_FAILED_ERROR],
+            ['AAAA', false],
+            ['AAAA', Email::HOST_CHECK_FAILED_ERROR],
+        ];
     }
 
     /**
@@ -220,11 +220,11 @@ public function getDnsChecks()
      */
     public function testHostnameIsProperlyParsed()
     {
-        DnsMock::withMockedHosts(array('baz.com' => array(array('type' => 'MX'))));
+        DnsMock::withMockedHosts(['baz.com' => [['type' => 'MX']]]);
 
         $this->validator->validate(
             '"foo@bar"@baz.com',
-            new Email(array('checkMX' => true))
+            new Email(['checkMX' => true])
         );
 
         $this->assertNoViolation();
@@ -237,10 +237,10 @@ public function testEmptyHostIsNotValid($checkType, $violation)
     {
         $this->validator->validate(
             'foo@bar.fr@',
-            new Email(array(
+            new Email([
                 'message' => 'myMessage',
                 $checkType => true,
-            ))
+            ])
         );
 
         $this
@@ -252,9 +252,9 @@ public function testEmptyHostIsNotValid($checkType, $violation)
 
     public function provideCheckTypes()
     {
-        return array(
-            array('checkMX', Email::MX_CHECK_FAILED_ERROR),
-            array('checkHost', Email::HOST_CHECK_FAILED_ERROR),
-        );
+        return [
+            ['checkMX', Email::MX_CHECK_FAILED_ERROR],
+            ['checkHost', Email::HOST_CHECK_FAILED_ERROR],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php
index e47de8fce2e59..c1eb2f93ad754 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php
@@ -39,16 +39,16 @@ protected function getErrorCode()
      */
     public function provideValidComparisons()
     {
-        return array(
-            array(3, 3),
-            array(3, '3'),
-            array('a', 'a'),
-            array(new \DateTime('2000-01-01'), new \DateTime('2000-01-01')),
-            array(new \DateTime('2000-01-01'), '2000-01-01'),
-            array(new \DateTime('2000-01-01 UTC'), '2000-01-01 UTC'),
-            array(new ComparisonTest_Class(5), new ComparisonTest_Class(5)),
-            array(null, 1),
-        );
+        return [
+            [3, 3],
+            [3, '3'],
+            ['a', 'a'],
+            [new \DateTime('2000-01-01'), new \DateTime('2000-01-01')],
+            [new \DateTime('2000-01-01'), '2000-01-01'],
+            [new \DateTime('2000-01-01 UTC'), '2000-01-01 UTC'],
+            [new ComparisonTest_Class(5), new ComparisonTest_Class(5)],
+            [null, 1],
+        ];
     }
 
     /**
@@ -56,9 +56,9 @@ public function provideValidComparisons()
      */
     public function provideValidComparisonsToPropertyPath()
     {
-        return array(
-            array(5),
-        );
+        return [
+            [5],
+        ];
     }
 
     /**
@@ -66,13 +66,13 @@ public function provideValidComparisonsToPropertyPath()
      */
     public function provideInvalidComparisons()
     {
-        return array(
-            array(1, '1', 2, '2', 'integer'),
-            array('22', '"22"', '333', '"333"', 'string'),
-            array(new \DateTime('2001-01-01'), 'Jan 1, 2001, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2001-01-01'), 'Jan 1, 2001, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2001-01-01 UTC'), 'Jan 1, 2001, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array(new ComparisonTest_Class(4), '4', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'),
-        );
+        return [
+            [1, '1', 2, '2', 'integer'],
+            ['22', '"22"', '333', '"333"', 'string'],
+            [new \DateTime('2001-01-01'), 'Jan 1, 2001, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [new \DateTime('2001-01-01'), 'Jan 1, 2001, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [new \DateTime('2001-01-01 UTC'), 'Jan 1, 2001, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [new ComparisonTest_Class(4), '4', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php
index 07f17d648aa39..5cffcefd52726 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php
@@ -26,10 +26,10 @@ protected function createValidator()
 
     public function testExpressionIsEvaluatedWithNullValue()
     {
-        $constraint = new Expression(array(
+        $constraint = new Expression([
             'expression' => 'false',
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate(null, $constraint);
 
@@ -41,10 +41,10 @@ public function testExpressionIsEvaluatedWithNullValue()
 
     public function testExpressionIsEvaluatedWithEmptyStringValue()
     {
-        $constraint = new Expression(array(
+        $constraint = new Expression([
             'expression' => 'false',
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate('', $constraint);
 
@@ -70,10 +70,10 @@ public function testSucceedingExpressionAtObjectLevel()
 
     public function testFailingExpressionAtObjectLevel()
     {
-        $constraint = new Expression(array(
+        $constraint = new Expression([
             'expression' => 'this.data == 1',
             'message' => 'myMessage',
-        ));
+        ]);
 
         $object = new Entity();
         $object->data = '2';
@@ -104,10 +104,10 @@ public function testSucceedingExpressionAtObjectLevelWithToString()
 
     public function testFailingExpressionAtObjectLevelWithToString()
     {
-        $constraint = new Expression(array(
+        $constraint = new Expression([
             'expression' => 'this.data == 1',
             'message' => 'myMessage',
-        ));
+        ]);
 
         $object = new ToString();
         $object->data = '2';
@@ -140,10 +140,10 @@ public function testSucceedingExpressionAtPropertyLevel()
 
     public function testFailingExpressionAtPropertyLevel()
     {
-        $constraint = new Expression(array(
+        $constraint = new Expression([
             'expression' => 'value == this.data',
             'message' => 'myMessage',
-        ));
+        ]);
 
         $object = new Entity();
         $object->data = '1';
@@ -182,10 +182,10 @@ public function testSucceedingExpressionAtNestedPropertyLevel()
 
     public function testFailingExpressionAtNestedPropertyLevel()
     {
-        $constraint = new Expression(array(
+        $constraint = new Expression([
             'expression' => 'value == this.data',
             'message' => 'myMessage',
-        ));
+        ]);
 
         $object = new Entity();
         $object->data = '1';
@@ -229,10 +229,10 @@ public function testSucceedingExpressionAtPropertyLevelWithoutRoot()
      */
     public function testFailingExpressionAtPropertyLevelWithoutRoot()
     {
-        $constraint = new Expression(array(
+        $constraint = new Expression([
             'expression' => 'value == "1"',
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->setRoot('2');
         $this->setPropertyPath('');
@@ -249,9 +249,9 @@ public function testFailingExpressionAtPropertyLevelWithoutRoot()
 
     public function testExpressionLanguageUsage()
     {
-        $constraint = new Expression(array(
+        $constraint = new Expression([
             'expression' => 'false',
-        ));
+        ]);
 
         $expressionLanguage = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ExpressionLanguage')->getMock();
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileTest.php b/src/Symfony/Component/Validator/Tests/Constraints/FileTest.php
index b7745f44fa13a..d3117ed44a245 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/FileTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/FileTest.php
@@ -22,7 +22,7 @@ class FileTest extends TestCase
      */
     public function testMaxSize($maxSize, $bytes, $binaryFormat)
     {
-        $file = new File(array('maxSize' => $maxSize));
+        $file = new File(['maxSize' => $maxSize]);
 
         $this->assertSame($bytes, $file->maxSize);
         $this->assertSame($binaryFormat, $file->binaryFormat);
@@ -31,7 +31,7 @@ public function testMaxSize($maxSize, $bytes, $binaryFormat)
 
     public function testMagicIsset()
     {
-        $file = new File(array('maxSize' => 1));
+        $file = new File(['maxSize' => 1]);
 
         $this->assertTrue($file->__isset('maxSize'));
         $this->assertTrue($file->__isset('groups'));
@@ -56,7 +56,7 @@ public function testMaxSizeCanBeSetAfterInitialization($maxSize, $bytes, $binary
      */
     public function testInvalidValueForMaxSizeThrowsExceptionAfterInitialization($maxSize)
     {
-        $file = new File(array('maxSize' => 1000));
+        $file = new File(['maxSize' => 1000]);
         $file->maxSize = $maxSize;
     }
 
@@ -65,7 +65,7 @@ public function testInvalidValueForMaxSizeThrowsExceptionAfterInitialization($ma
      */
     public function testMaxSizeCannotBeSetToInvalidValueAfterInitialization($maxSize)
     {
-        $file = new File(array('maxSize' => 1000));
+        $file = new File(['maxSize' => 1000]);
 
         try {
             $file->maxSize = $maxSize;
@@ -81,35 +81,35 @@ public function testMaxSizeCannotBeSetToInvalidValueAfterInitialization($maxSize
      */
     public function testInvalidMaxSize($maxSize)
     {
-        new File(array('maxSize' => $maxSize));
+        new File(['maxSize' => $maxSize]);
     }
 
     public function provideValidSizes()
     {
-        return array(
-            array('500', 500, false),
-            array(12300, 12300, false),
-            array('1ki', 1024, true),
-            array('1KI', 1024, true),
-            array('2k', 2000, false),
-            array('2K', 2000, false),
-            array('1mi', 1048576, true),
-            array('1MI', 1048576, true),
-            array('3m', 3000000, false),
-            array('3M', 3000000, false),
-        );
+        return [
+            ['500', 500, false],
+            [12300, 12300, false],
+            ['1ki', 1024, true],
+            ['1KI', 1024, true],
+            ['2k', 2000, false],
+            ['2K', 2000, false],
+            ['1mi', 1048576, true],
+            ['1MI', 1048576, true],
+            ['3m', 3000000, false],
+            ['3M', 3000000, false],
+        ];
     }
 
     public function provideInvalidSizes()
     {
-        return array(
-            array('+100'),
-            array('foo'),
-            array('1Ko'),
-            array('1kio'),
-            array('1G'),
-            array('1Gi'),
-        );
+        return [
+            ['+100'],
+            ['foo'],
+            ['1Ko'],
+            ['1kio'],
+            ['1G'],
+            ['1Gi'],
+        ];
     }
 
     /**
@@ -117,23 +117,23 @@ public function provideInvalidSizes()
      */
     public function testBinaryFormat($maxSize, $guessedFormat, $binaryFormat)
     {
-        $file = new File(array('maxSize' => $maxSize, 'binaryFormat' => $guessedFormat));
+        $file = new File(['maxSize' => $maxSize, 'binaryFormat' => $guessedFormat]);
 
         $this->assertSame($binaryFormat, $file->binaryFormat);
     }
 
     public function provideFormats()
     {
-        return array(
-            array(100, null, false),
-            array(100, true, true),
-            array(100, false, false),
-            array('100K', null, false),
-            array('100K', true, true),
-            array('100K', false, false),
-            array('100Ki', null, true),
-            array('100Ki', true, true),
-            array('100Ki', false, false),
-        );
+        return [
+            [100, null, false],
+            [100, true, true],
+            [100, false, false],
+            ['100K', null, false],
+            ['100K', true, true],
+            ['100K', false, false],
+            ['100Ki', null, true],
+            ['100Ki', true, true],
+            ['100Ki', false, false],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorPathTest.php b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorPathTest.php
index 11b8d4cb7987c..dfd82f15ccf4d 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorPathTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorPathTest.php
@@ -22,9 +22,9 @@ protected function getFile($filename)
 
     public function testFileNotFound()
     {
-        $constraint = new File(array(
+        $constraint = new File([
             'notFoundMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate('foobar', $constraint);
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
index f2b6242d5234f..8c68b12f60932 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
@@ -115,44 +115,44 @@ public function provideMaxSizeExceededTests()
         // same unit used to specify the limit.
 
         // As of Symfony 2.5, the above logic is implemented.
-        return array(
+        return [
             // limit in bytes
-            array(1001, 1000, '1001', '1000', 'bytes'),
-            array(1004, 1000, '1004', '1000', 'bytes'),
-            array(1005, 1000, '1.01', '1', 'kB'),
+            [1001, 1000, '1001', '1000', 'bytes'],
+            [1004, 1000, '1004', '1000', 'bytes'],
+            [1005, 1000, '1.01', '1', 'kB'],
 
-            array(1000001, 1000000, '1000001', '1000000', 'bytes'),
-            array(1004999, 1000000, '1005', '1000', 'kB'),
-            array(1005000, 1000000, '1.01', '1', 'MB'),
+            [1000001, 1000000, '1000001', '1000000', 'bytes'],
+            [1004999, 1000000, '1005', '1000', 'kB'],
+            [1005000, 1000000, '1.01', '1', 'MB'],
 
             // limit in kB
-            array(1001, '1k', '1001', '1000', 'bytes'),
-            array(1004, '1k', '1004', '1000', 'bytes'),
-            array(1005, '1k', '1.01', '1', 'kB'),
+            [1001, '1k', '1001', '1000', 'bytes'],
+            [1004, '1k', '1004', '1000', 'bytes'],
+            [1005, '1k', '1.01', '1', 'kB'],
 
-            array(1000001, '1000k', '1000001', '1000000', 'bytes'),
-            array(1004999, '1000k', '1005', '1000', 'kB'),
-            array(1005000, '1000k', '1.01', '1', 'MB'),
+            [1000001, '1000k', '1000001', '1000000', 'bytes'],
+            [1004999, '1000k', '1005', '1000', 'kB'],
+            [1005000, '1000k', '1.01', '1', 'MB'],
 
             // limit in MB
-            array(1000001, '1M', '1000001', '1000000', 'bytes'),
-            array(1004999, '1M', '1005', '1000', 'kB'),
-            array(1005000, '1M', '1.01', '1', 'MB'),
+            [1000001, '1M', '1000001', '1000000', 'bytes'],
+            [1004999, '1M', '1005', '1000', 'kB'],
+            [1005000, '1M', '1.01', '1', 'MB'],
 
             // limit in KiB
-            array(1025, '1Ki', '1025', '1024', 'bytes'),
-            array(1029, '1Ki', '1029', '1024', 'bytes'),
-            array(1030, '1Ki', '1.01', '1', 'KiB'),
+            [1025, '1Ki', '1025', '1024', 'bytes'],
+            [1029, '1Ki', '1029', '1024', 'bytes'],
+            [1030, '1Ki', '1.01', '1', 'KiB'],
 
-            array(1048577, '1024Ki', '1048577', '1048576', 'bytes'),
-            array(1053818, '1024Ki', '1029.12', '1024', 'KiB'),
-            array(1053819, '1024Ki', '1.01', '1', 'MiB'),
+            [1048577, '1024Ki', '1048577', '1048576', 'bytes'],
+            [1053818, '1024Ki', '1029.12', '1024', 'KiB'],
+            [1053819, '1024Ki', '1.01', '1', 'MiB'],
 
             // limit in MiB
-            array(1048577, '1Mi', '1048577', '1048576', 'bytes'),
-            array(1053818, '1Mi', '1029.12', '1024', 'KiB'),
-            array(1053819, '1Mi', '1.01', '1', 'MiB'),
-        );
+            [1048577, '1Mi', '1048577', '1048576', 'bytes'],
+            [1053818, '1Mi', '1029.12', '1024', 'KiB'],
+            [1053819, '1Mi', '1.01', '1', 'MiB'],
+        ];
     }
 
     /**
@@ -164,10 +164,10 @@ public function testMaxSizeExceeded($bytesWritten, $limit, $sizeAsString, $limit
         fwrite($this->file, '0');
         fclose($this->file);
 
-        $constraint = new File(array(
+        $constraint = new File([
             'maxSize' => $limit,
             'maxSizeMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($this->getFile($this->path), $constraint);
 
@@ -182,25 +182,25 @@ public function testMaxSizeExceeded($bytesWritten, $limit, $sizeAsString, $limit
 
     public function provideMaxSizeNotExceededTests()
     {
-        return array(
+        return [
             // limit in bytes
-            array(1000, 1000),
-            array(1000000, 1000000),
+            [1000, 1000],
+            [1000000, 1000000],
 
             // limit in kB
-            array(1000, '1k'),
-            array(1000000, '1000k'),
+            [1000, '1k'],
+            [1000000, '1000k'],
 
             // limit in MB
-            array(1000000, '1M'),
+            [1000000, '1M'],
 
             // limit in KiB
-            array(1024, '1Ki'),
-            array(1048576, '1024Ki'),
+            [1024, '1Ki'],
+            [1048576, '1024Ki'],
 
             // limit in MiB
-            array(1048576, '1Mi'),
-        );
+            [1048576, '1Mi'],
+        ];
     }
 
     /**
@@ -212,10 +212,10 @@ public function testMaxSizeNotExceeded($bytesWritten, $limit)
         fwrite($this->file, '0');
         fclose($this->file);
 
-        $constraint = new File(array(
+        $constraint = new File([
             'maxSize' => $limit,
             'maxSizeMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($this->getFile($this->path), $constraint);
 
@@ -227,33 +227,33 @@ public function testMaxSizeNotExceeded($bytesWritten, $limit)
      */
     public function testInvalidMaxSize()
     {
-        $constraint = new File(array(
+        $constraint = new File([
             'maxSize' => '1abc',
-        ));
+        ]);
 
         $this->validator->validate($this->path, $constraint);
     }
 
     public function provideBinaryFormatTests()
     {
-        return array(
-            array(11, 10, null, '11', '10', 'bytes'),
-            array(11, 10, true, '11', '10', 'bytes'),
-            array(11, 10, false, '11', '10', 'bytes'),
+        return [
+            [11, 10, null, '11', '10', 'bytes'],
+            [11, 10, true, '11', '10', 'bytes'],
+            [11, 10, false, '11', '10', 'bytes'],
 
             // round(size) == 1.01kB, limit == 1kB
-            array(ceil(1000 * 1.01), 1000, null, '1.01', '1', 'kB'),
-            array(ceil(1000 * 1.01), '1k', null, '1.01', '1', 'kB'),
-            array(ceil(1024 * 1.01), '1Ki', null, '1.01', '1', 'KiB'),
-
-            array(ceil(1024 * 1.01), 1024, true, '1.01', '1', 'KiB'),
-            array(ceil(1024 * 1.01 * 1000), '1024k', true, '1010', '1000', 'KiB'),
-            array(ceil(1024 * 1.01), '1Ki', true, '1.01', '1', 'KiB'),
-
-            array(ceil(1000 * 1.01), 1000, false, '1.01', '1', 'kB'),
-            array(ceil(1000 * 1.01), '1k', false, '1.01', '1', 'kB'),
-            array(ceil(1024 * 1.01 * 10), '10Ki', false, '10.34', '10.24', 'kB'),
-        );
+            [ceil(1000 * 1.01), 1000, null, '1.01', '1', 'kB'],
+            [ceil(1000 * 1.01), '1k', null, '1.01', '1', 'kB'],
+            [ceil(1024 * 1.01), '1Ki', null, '1.01', '1', 'KiB'],
+
+            [ceil(1024 * 1.01), 1024, true, '1.01', '1', 'KiB'],
+            [ceil(1024 * 1.01 * 1000), '1024k', true, '1010', '1000', 'KiB'],
+            [ceil(1024 * 1.01), '1Ki', true, '1.01', '1', 'KiB'],
+
+            [ceil(1000 * 1.01), 1000, false, '1.01', '1', 'kB'],
+            [ceil(1000 * 1.01), '1k', false, '1.01', '1', 'kB'],
+            [ceil(1024 * 1.01 * 10), '10Ki', false, '10.34', '10.24', 'kB'],
+        ];
     }
 
     /**
@@ -265,11 +265,11 @@ public function testBinaryFormat($bytesWritten, $limit, $binaryFormat, $sizeAsSt
         fwrite($this->file, '0');
         fclose($this->file);
 
-        $constraint = new File(array(
+        $constraint = new File([
             'maxSize' => $limit,
             'binaryFormat' => $binaryFormat,
             'maxSizeMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($this->getFile($this->path), $constraint);
 
@@ -286,7 +286,7 @@ public function testValidMimeType()
     {
         $file = $this
             ->getMockBuilder('Symfony\Component\HttpFoundation\File\File')
-            ->setConstructorArgs(array(__DIR__.'/Fixtures/foo'))
+            ->setConstructorArgs([__DIR__.'/Fixtures/foo'])
             ->getMock();
         $file
             ->expects($this->once())
@@ -297,9 +297,9 @@ public function testValidMimeType()
             ->method('getMimeType')
             ->will($this->returnValue('image/jpg'));
 
-        $constraint = new File(array(
-            'mimeTypes' => array('image/png', 'image/jpg'),
-        ));
+        $constraint = new File([
+            'mimeTypes' => ['image/png', 'image/jpg'],
+        ]);
 
         $this->validator->validate($file, $constraint);
 
@@ -310,7 +310,7 @@ public function testValidWildcardMimeType()
     {
         $file = $this
             ->getMockBuilder('Symfony\Component\HttpFoundation\File\File')
-            ->setConstructorArgs(array(__DIR__.'/Fixtures/foo'))
+            ->setConstructorArgs([__DIR__.'/Fixtures/foo'])
             ->getMock();
         $file
             ->expects($this->once())
@@ -321,9 +321,9 @@ public function testValidWildcardMimeType()
             ->method('getMimeType')
             ->will($this->returnValue('image/jpg'));
 
-        $constraint = new File(array(
-            'mimeTypes' => array('image/*'),
-        ));
+        $constraint = new File([
+            'mimeTypes' => ['image/*'],
+        ]);
 
         $this->validator->validate($file, $constraint);
 
@@ -334,7 +334,7 @@ public function testInvalidMimeType()
     {
         $file = $this
             ->getMockBuilder('Symfony\Component\HttpFoundation\File\File')
-            ->setConstructorArgs(array(__DIR__.'/Fixtures/foo'))
+            ->setConstructorArgs([__DIR__.'/Fixtures/foo'])
             ->getMock();
         $file
             ->expects($this->once())
@@ -345,10 +345,10 @@ public function testInvalidMimeType()
             ->method('getMimeType')
             ->will($this->returnValue('application/pdf'));
 
-        $constraint = new File(array(
-            'mimeTypes' => array('image/png', 'image/jpg'),
+        $constraint = new File([
+            'mimeTypes' => ['image/png', 'image/jpg'],
             'mimeTypesMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($file, $constraint);
 
@@ -364,7 +364,7 @@ public function testInvalidWildcardMimeType()
     {
         $file = $this
             ->getMockBuilder('Symfony\Component\HttpFoundation\File\File')
-            ->setConstructorArgs(array(__DIR__.'/Fixtures/foo'))
+            ->setConstructorArgs([__DIR__.'/Fixtures/foo'])
             ->getMock();
         $file
             ->expects($this->once())
@@ -375,10 +375,10 @@ public function testInvalidWildcardMimeType()
             ->method('getMimeType')
             ->will($this->returnValue('application/pdf'));
 
-        $constraint = new File(array(
-            'mimeTypes' => array('image/*', 'image/jpg'),
+        $constraint = new File([
+            'mimeTypes' => ['image/*', 'image/jpg'],
             'mimeTypesMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($file, $constraint);
 
@@ -394,9 +394,9 @@ public function testDisallowEmpty()
     {
         ftruncate($this->file, 0);
 
-        $constraint = new File(array(
+        $constraint = new File([
             'disallowEmptyMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($this->getFile($this->path), $constraint);
 
@@ -428,47 +428,47 @@ public function testUploadedFileError($error, $message, array $params = array(),
 
     public function uploadedFileErrorProvider()
     {
-        $tests = array(
-            array(UPLOAD_ERR_FORM_SIZE, 'uploadFormSizeErrorMessage'),
-            array(UPLOAD_ERR_PARTIAL, 'uploadPartialErrorMessage'),
-            array(UPLOAD_ERR_NO_FILE, 'uploadNoFileErrorMessage'),
-            array(UPLOAD_ERR_NO_TMP_DIR, 'uploadNoTmpDirErrorMessage'),
-            array(UPLOAD_ERR_CANT_WRITE, 'uploadCantWriteErrorMessage'),
-            array(UPLOAD_ERR_EXTENSION, 'uploadExtensionErrorMessage'),
-        );
+        $tests = [
+            [UPLOAD_ERR_FORM_SIZE, 'uploadFormSizeErrorMessage'],
+            [UPLOAD_ERR_PARTIAL, 'uploadPartialErrorMessage'],
+            [UPLOAD_ERR_NO_FILE, 'uploadNoFileErrorMessage'],
+            [UPLOAD_ERR_NO_TMP_DIR, 'uploadNoTmpDirErrorMessage'],
+            [UPLOAD_ERR_CANT_WRITE, 'uploadCantWriteErrorMessage'],
+            [UPLOAD_ERR_EXTENSION, 'uploadExtensionErrorMessage'],
+        ];
 
         if (class_exists('Symfony\Component\HttpFoundation\File\UploadedFile')) {
             // when no maxSize is specified on constraint, it should use the ini value
-            $tests[] = array(UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', array(
+            $tests[] = [UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', [
                 '{{ limit }}' => UploadedFile::getMaxFilesize() / 1048576,
                 '{{ suffix }}' => 'MiB',
-            ));
+            ]];
 
             // it should use the smaller limitation (maxSize option in this case)
-            $tests[] = array(UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', array(
+            $tests[] = [UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', [
                 '{{ limit }}' => 1,
                 '{{ suffix }}' => 'bytes',
-            ), '1');
+            ], '1'];
 
             // access FileValidator::factorizeSizes() private method to format max file size
             $reflection = new \ReflectionClass(\get_class(new FileValidator()));
             $method = $reflection->getMethod('factorizeSizes');
             $method->setAccessible(true);
-            list($sizeAsString, $limit, $suffix) = $method->invokeArgs(new FileValidator(), array(0, UploadedFile::getMaxFilesize(), false));
+            list($sizeAsString, $limit, $suffix) = $method->invokeArgs(new FileValidator(), [0, UploadedFile::getMaxFilesize(), false]);
 
             // it correctly parses the maxSize option and not only uses simple string comparison
             // 1000M should be bigger than the ini value
-            $tests[] = array(UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', array(
+            $tests[] = [UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', [
                 '{{ limit }}' => $limit,
                 '{{ suffix }}' => $suffix,
-            ), '1000M');
+            ], '1000M'];
 
             // it correctly parses the maxSize option and not only uses simple string comparison
             // 1000M should be bigger than the ini value
-            $tests[] = array(UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', array(
+            $tests[] = [UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', [
                 '{{ limit }}' => '0.1',
                 '{{ suffix }}' => 'MB',
-            ), '100K');
+            ], '100K'];
         }
 
         return $tests;
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php
index 22fb9b662bad7..d8d8eab8bdeee 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php
@@ -39,19 +39,19 @@ protected function getErrorCode()
      */
     public function provideValidComparisons()
     {
-        return array(
-            array(3, 2),
-            array(1, 1),
-            array(new \DateTime('2010/01/01'), new \DateTime('2000/01/01')),
-            array(new \DateTime('2000/01/01'), new \DateTime('2000/01/01')),
-            array(new \DateTime('2010/01/01'), '2000/01/01'),
-            array(new \DateTime('2000/01/01'), '2000/01/01'),
-            array(new \DateTime('2010/01/01 UTC'), '2000/01/01 UTC'),
-            array(new \DateTime('2000/01/01 UTC'), '2000/01/01 UTC'),
-            array('a', 'a'),
-            array('z', 'a'),
-            array(null, 1),
-        );
+        return [
+            [3, 2],
+            [1, 1],
+            [new \DateTime('2010/01/01'), new \DateTime('2000/01/01')],
+            [new \DateTime('2000/01/01'), new \DateTime('2000/01/01')],
+            [new \DateTime('2010/01/01'), '2000/01/01'],
+            [new \DateTime('2000/01/01'), '2000/01/01'],
+            [new \DateTime('2010/01/01 UTC'), '2000/01/01 UTC'],
+            [new \DateTime('2000/01/01 UTC'), '2000/01/01 UTC'],
+            ['a', 'a'],
+            ['z', 'a'],
+            [null, 1],
+        ];
     }
 
     /**
@@ -59,10 +59,10 @@ public function provideValidComparisons()
      */
     public function provideValidComparisonsToPropertyPath()
     {
-        return array(
-            array(5),
-            array(6),
-        );
+        return [
+            [5],
+            [6],
+        ];
     }
 
     /**
@@ -70,12 +70,12 @@ public function provideValidComparisonsToPropertyPath()
      */
     public function provideInvalidComparisons()
     {
-        return array(
-            array(1, '1', 2, '2', 'integer'),
-            array(new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2005/01/01'), 'Jan 1, 2005, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', '2005/01/01', 'Jan 1, 2005, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2000/01/01 UTC'), 'Jan 1, 2000, 12:00 AM', '2005/01/01 UTC', 'Jan 1, 2005, 12:00 AM', 'DateTime'),
-            array('b', '"b"', 'c', '"c"', 'string'),
-        );
+        return [
+            [1, '1', 2, '2', 'integer'],
+            [new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2005/01/01'), 'Jan 1, 2005, 12:00 AM', 'DateTime'],
+            [new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', '2005/01/01', 'Jan 1, 2005, 12:00 AM', 'DateTime'],
+            [new \DateTime('2000/01/01 UTC'), 'Jan 1, 2000, 12:00 AM', '2005/01/01 UTC', 'Jan 1, 2005, 12:00 AM', 'DateTime'],
+            ['b', '"b"', 'c', '"c"', 'string'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php
index 08446ec847073..e678496c41e68 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php
@@ -39,15 +39,15 @@ protected function getErrorCode()
      */
     public function provideValidComparisons()
     {
-        return array(
-            array(2, 1),
-            array(new \DateTime('2005/01/01'), new \DateTime('2001/01/01')),
-            array(new \DateTime('2005/01/01'), '2001/01/01'),
-            array(new \DateTime('2005/01/01 UTC'), '2001/01/01 UTC'),
-            array(new ComparisonTest_Class(5), new ComparisonTest_Class(4)),
-            array('333', '22'),
-            array(null, 1),
-        );
+        return [
+            [2, 1],
+            [new \DateTime('2005/01/01'), new \DateTime('2001/01/01')],
+            [new \DateTime('2005/01/01'), '2001/01/01'],
+            [new \DateTime('2005/01/01 UTC'), '2001/01/01 UTC'],
+            [new ComparisonTest_Class(5), new ComparisonTest_Class(4)],
+            ['333', '22'],
+            [null, 1],
+        ];
     }
 
     /**
@@ -55,9 +55,9 @@ public function provideValidComparisons()
      */
     public function provideValidComparisonsToPropertyPath()
     {
-        return array(
-            array(6),
-        );
+        return [
+            [6],
+        ];
     }
 
     /**
@@ -65,19 +65,19 @@ public function provideValidComparisonsToPropertyPath()
      */
     public function provideInvalidComparisons()
     {
-        return array(
-            array(1, '1', 2, '2', 'integer'),
-            array(2, '2', 2, '2', 'integer'),
-            array(new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2005/01/01'), 'Jan 1, 2005, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', '2005/01/01', 'Jan 1, 2005, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', '2000/01/01', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2000/01/01 UTC'), 'Jan 1, 2000, 12:00 AM', '2005/01/01 UTC', 'Jan 1, 2005, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2000/01/01 UTC'), 'Jan 1, 2000, 12:00 AM', '2000/01/01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array(new ComparisonTest_Class(4), '4', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'),
-            array(new ComparisonTest_Class(5), '5', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'),
-            array('22', '"22"', '333', '"333"', 'string'),
-            array('22', '"22"', '22', '"22"', 'string'),
-        );
+        return [
+            [1, '1', 2, '2', 'integer'],
+            [2, '2', 2, '2', 'integer'],
+            [new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2005/01/01'), 'Jan 1, 2005, 12:00 AM', 'DateTime'],
+            [new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', '2005/01/01', 'Jan 1, 2005, 12:00 AM', 'DateTime'],
+            [new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', '2000/01/01', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [new \DateTime('2000/01/01 UTC'), 'Jan 1, 2000, 12:00 AM', '2005/01/01 UTC', 'Jan 1, 2005, 12:00 AM', 'DateTime'],
+            [new \DateTime('2000/01/01 UTC'), 'Jan 1, 2000, 12:00 AM', '2000/01/01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [new ComparisonTest_Class(4), '4', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'],
+            [new ComparisonTest_Class(5), '5', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'],
+            ['22', '"22"', '333', '"333"', 'string'],
+            ['22', '"22"', '22', '"22"', 'string'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/GroupSequenceTest.php b/src/Symfony/Component/Validator/Tests/Constraints/GroupSequenceTest.php
index 98653274a9c66..7803a73cc95d1 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/GroupSequenceTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/GroupSequenceTest.php
@@ -21,15 +21,15 @@ class GroupSequenceTest extends TestCase
 {
     public function testCreate()
     {
-        $sequence = new GroupSequence(array('Group 1', 'Group 2'));
+        $sequence = new GroupSequence(['Group 1', 'Group 2']);
 
-        $this->assertSame(array('Group 1', 'Group 2'), $sequence->groups);
+        $this->assertSame(['Group 1', 'Group 2'], $sequence->groups);
     }
 
     public function testCreateDoctrineStyle()
     {
-        $sequence = new GroupSequence(array('value' => array('Group 1', 'Group 2')));
+        $sequence = new GroupSequence(['value' => ['Group 1', 'Group 2']]);
 
-        $this->assertSame(array('Group 1', 'Group 2'), $sequence->groups);
+        $this->assertSame(['Group 1', 'Group 2'], $sequence->groups);
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
index e5c63c3654b79..ba426799ca4e1 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
@@ -48,116 +48,116 @@ public function testValidIbans($iban)
 
     public function getValidIbans()
     {
-        return array(
-            array('CH9300762011623852957'), // Switzerland without spaces
-            array('CH93  0076 2011 6238 5295 7'), // Switzerland with multiple spaces
+        return [
+            ['CH9300762011623852957'], // Switzerland without spaces
+            ['CH93  0076 2011 6238 5295 7'], // Switzerland with multiple spaces
 
             // Country list
             // http://www.rbs.co.uk/corporate/international/g0/guide-to-international-business/regulatory-information/iban/iban-example.ashx
 
-            array('AL47 2121 1009 0000 0002 3569 8741'), //Albania
-            array('AD12 0001 2030 2003 5910 0100'), //Andorra
-            array('AT61 1904 3002 3457 3201'), //Austria
-            array('AZ21 NABZ 0000 0000 1370 1000 1944'), //Azerbaijan
-            array('BH67 BMAG 0000 1299 1234 56'), //Bahrain
-            array('BE62 5100 0754 7061'), //Belgium
-            array('BA39 1290 0794 0102 8494'), //Bosnia and Herzegovina
-            array('BG80 BNBG 9661 1020 3456 78'), //Bulgaria
-            array('BY 13 NBRB 3600 900000002Z00AB00'), //Belarus
-            array('BY13 NBRB 3600 900000002Z00AB00'), //Belarus
-            array('BY22NB23324232T78YR7823HR32U'), //Belarus
-            array('HR12 1001 0051 8630 0016 0'), //Croatia
-            array('CY17 0020 0128 0000 0012 0052 7600'), //Cyprus
-            array('CZ65 0800 0000 1920 0014 5399'), //Czech Republic
-            array('DK50 0040 0440 1162 43'), //Denmark
-            array('EE38 2200 2210 2014 5685'), //Estonia
-            array('FO97 5432 0388 8999 44'), //Faroe Islands
-            array('FI21 1234 5600 0007 85'), //Finland
-            array('FR14 2004 1010 0505 0001 3M02 606'), //France
-            array('GE29 NB00 0000 0101 9049 17'), //Georgia
-            array('DE89 3704 0044 0532 0130 00'), //Germany
-            array('GI75 NWBK 0000 0000 7099 453'), //Gibraltar
-            array('GR16 0110 1250 0000 0001 2300 695'), //Greece
-            array('GL56 0444 9876 5432 10'), //Greenland
-            array('HU42 1177 3016 1111 1018 0000 0000'), //Hungary
-            array('IS14 0159 2600 7654 5510 7303 39'), //Iceland
-            array('IE29 AIBK 9311 5212 3456 78'), //Ireland
-            array('IL62 0108 0000 0009 9999 999'), //Israel
-            array('IT40 S054 2811 1010 0000 0123 456'), //Italy
-            array('LV80 BANK 0000 4351 9500 1'), //Latvia
-            array('LB62 0999 0000 0001 0019 0122 9114'), //Lebanon
-            array('LI21 0881 0000 2324 013A A'), //Liechtenstein
-            array('LT12 1000 0111 0100 1000'), //Lithuania
-            array('LU28 0019 4006 4475 0000'), //Luxembourg
-            array('MK072 5012 0000 0589 84'), //Macedonia
-            array('MT84 MALT 0110 0001 2345 MTLC AST0 01S'), //Malta
-            array('MU17 BOMM 0101 1010 3030 0200 000M UR'), //Mauritius
-            array('MD24 AG00 0225 1000 1310 4168'), //Moldova
-            array('MC93 2005 2222 1001 1223 3M44 555'), //Monaco
-            array('ME25 5050 0001 2345 6789 51'), //Montenegro
-            array('NL39 RABO 0300 0652 64'), //Netherlands
-            array('NO93 8601 1117 947'), //Norway
-            array('PK36 SCBL 0000 0011 2345 6702'), //Pakistan
-            array('PL60 1020 1026 0000 0422 7020 1111'), //Poland
-            array('PT50 0002 0123 1234 5678 9015 4'), //Portugal
-            array('RO49 AAAA 1B31 0075 9384 0000'), //Romania
-            array('SM86 U032 2509 8000 0000 0270 100'), //San Marino
-            array('SA03 8000 0000 6080 1016 7519'), //Saudi Arabia
-            array('RS35 2600 0560 1001 6113 79'), //Serbia
-            array('SK31 1200 0000 1987 4263 7541'), //Slovak Republic
-            array('SI56 1910 0000 0123 438'), //Slovenia
-            array('ES80 2310 0001 1800 0001 2345'), //Spain
-            array('SE35 5000 0000 0549 1000 0003'), //Sweden
-            array('CH93 0076 2011 6238 5295 7'), //Switzerland
-            array('TN59 1000 6035 1835 9847 8831'), //Tunisia
-            array('TR33 0006 1005 1978 6457 8413 26'), //Turkey
-            array('AE07 0331 2345 6789 0123 456'), //UAE
-            array('GB12 CPBK 0892 9965 0449 91'), //United Kingdom
+            ['AL47 2121 1009 0000 0002 3569 8741'], //Albania
+            ['AD12 0001 2030 2003 5910 0100'], //Andorra
+            ['AT61 1904 3002 3457 3201'], //Austria
+            ['AZ21 NABZ 0000 0000 1370 1000 1944'], //Azerbaijan
+            ['BH67 BMAG 0000 1299 1234 56'], //Bahrain
+            ['BE62 5100 0754 7061'], //Belgium
+            ['BA39 1290 0794 0102 8494'], //Bosnia and Herzegovina
+            ['BG80 BNBG 9661 1020 3456 78'], //Bulgaria
+            ['BY 13 NBRB 3600 900000002Z00AB00'], //Belarus
+            ['BY13 NBRB 3600 900000002Z00AB00'], //Belarus
+            ['BY22NB23324232T78YR7823HR32U'], //Belarus
+            ['HR12 1001 0051 8630 0016 0'], //Croatia
+            ['CY17 0020 0128 0000 0012 0052 7600'], //Cyprus
+            ['CZ65 0800 0000 1920 0014 5399'], //Czech Republic
+            ['DK50 0040 0440 1162 43'], //Denmark
+            ['EE38 2200 2210 2014 5685'], //Estonia
+            ['FO97 5432 0388 8999 44'], //Faroe Islands
+            ['FI21 1234 5600 0007 85'], //Finland
+            ['FR14 2004 1010 0505 0001 3M02 606'], //France
+            ['GE29 NB00 0000 0101 9049 17'], //Georgia
+            ['DE89 3704 0044 0532 0130 00'], //Germany
+            ['GI75 NWBK 0000 0000 7099 453'], //Gibraltar
+            ['GR16 0110 1250 0000 0001 2300 695'], //Greece
+            ['GL56 0444 9876 5432 10'], //Greenland
+            ['HU42 1177 3016 1111 1018 0000 0000'], //Hungary
+            ['IS14 0159 2600 7654 5510 7303 39'], //Iceland
+            ['IE29 AIBK 9311 5212 3456 78'], //Ireland
+            ['IL62 0108 0000 0009 9999 999'], //Israel
+            ['IT40 S054 2811 1010 0000 0123 456'], //Italy
+            ['LV80 BANK 0000 4351 9500 1'], //Latvia
+            ['LB62 0999 0000 0001 0019 0122 9114'], //Lebanon
+            ['LI21 0881 0000 2324 013A A'], //Liechtenstein
+            ['LT12 1000 0111 0100 1000'], //Lithuania
+            ['LU28 0019 4006 4475 0000'], //Luxembourg
+            ['MK072 5012 0000 0589 84'], //Macedonia
+            ['MT84 MALT 0110 0001 2345 MTLC AST0 01S'], //Malta
+            ['MU17 BOMM 0101 1010 3030 0200 000M UR'], //Mauritius
+            ['MD24 AG00 0225 1000 1310 4168'], //Moldova
+            ['MC93 2005 2222 1001 1223 3M44 555'], //Monaco
+            ['ME25 5050 0001 2345 6789 51'], //Montenegro
+            ['NL39 RABO 0300 0652 64'], //Netherlands
+            ['NO93 8601 1117 947'], //Norway
+            ['PK36 SCBL 0000 0011 2345 6702'], //Pakistan
+            ['PL60 1020 1026 0000 0422 7020 1111'], //Poland
+            ['PT50 0002 0123 1234 5678 9015 4'], //Portugal
+            ['RO49 AAAA 1B31 0075 9384 0000'], //Romania
+            ['SM86 U032 2509 8000 0000 0270 100'], //San Marino
+            ['SA03 8000 0000 6080 1016 7519'], //Saudi Arabia
+            ['RS35 2600 0560 1001 6113 79'], //Serbia
+            ['SK31 1200 0000 1987 4263 7541'], //Slovak Republic
+            ['SI56 1910 0000 0123 438'], //Slovenia
+            ['ES80 2310 0001 1800 0001 2345'], //Spain
+            ['SE35 5000 0000 0549 1000 0003'], //Sweden
+            ['CH93 0076 2011 6238 5295 7'], //Switzerland
+            ['TN59 1000 6035 1835 9847 8831'], //Tunisia
+            ['TR33 0006 1005 1978 6457 8413 26'], //Turkey
+            ['AE07 0331 2345 6789 0123 456'], //UAE
+            ['GB12 CPBK 0892 9965 0449 91'], //United Kingdom
 
             //Extended country list
             //http://www.nordea.com/Our+services/International+products+and+services/Cash+Management/IBAN+countries/908462.html
             // https://www.swift.com/sites/default/files/resources/iban_registry.pdf
-            array('AO06000600000100037131174'), //Angola
-            array('AZ21NABZ00000000137010001944'), //Azerbaijan
-            array('BH29BMAG1299123456BH00'), //Bahrain
-            array('BJ11B00610100400271101192591'), //Benin
-            array('BR9700360305000010009795493P1'), // Brazil
-            array('BR1800000000141455123924100C2'), // Brazil
-            array('VG96VPVG0000012345678901'), //British Virgin Islands
-            array('BF1030134020015400945000643'), //Burkina Faso
-            array('BI43201011067444'), //Burundi
-            array('CM2110003001000500000605306'), //Cameroon
-            array('CV64000300004547069110176'), //Cape Verde
-            array('FR7630007000110009970004942'), //Central African Republic
-            array('CG5230011000202151234567890'), //Congo
-            array('CR05015202001026284066'), //Costa Rica
-            array('DO28BAGR00000001212453611324'), //Dominican Republic
-            array('GT82TRAJ01020000001210029690'), //Guatemala
-            array('IR580540105180021273113007'), //Iran
-            array('IL620108000000099999999'), //Israel
-            array('CI05A00060174100178530011852'), //Ivory Coast
-            array('JO94CBJO0010000000000131000302'), // Jordan
-            array('KZ176010251000042993'), //Kazakhstan
-            array('KW74NBOK0000000000001000372151'), //Kuwait
-            array('LB30099900000001001925579115'), //Lebanon
-            array('MG4600005030010101914016056'), //Madagascar
-            array('ML03D00890170001002120000447'), //Mali
-            array('MR1300012000010000002037372'), //Mauritania
-            array('MU17BOMM0101101030300200000MUR'), //Mauritius
-            array('MZ59000100000011834194157'), //Mozambique
-            array('PS92PALS000000000400123456702'), //Palestinian Territory
-            array('QA58DOHB00001234567890ABCDEFG'), //Qatar
-            array('XK051212012345678906'), //Republic of Kosovo
-            array('PT50000200000163099310355'), //Sao Tome and Principe
-            array('SA0380000000608010167519'), //Saudi Arabia
-            array('SN12K00100152000025690007542'), //Senegal
-            array('TL380080012345678910157'), //Timor-Leste
-            array('TN5914207207100707129648'), //Tunisia
-            array('TR330006100519786457841326'), //Turkey
-            array('UA213223130000026007233566001'), //Ukraine
-            array('AE260211000000230064016'), //United Arab Emirates
-            array('VA59001123000012345678'), //Vatican City State
-        );
+            ['AO06000600000100037131174'], //Angola
+            ['AZ21NABZ00000000137010001944'], //Azerbaijan
+            ['BH29BMAG1299123456BH00'], //Bahrain
+            ['BJ11B00610100400271101192591'], //Benin
+            ['BR9700360305000010009795493P1'], // Brazil
+            ['BR1800000000141455123924100C2'], // Brazil
+            ['VG96VPVG0000012345678901'], //British Virgin Islands
+            ['BF1030134020015400945000643'], //Burkina Faso
+            ['BI43201011067444'], //Burundi
+            ['CM2110003001000500000605306'], //Cameroon
+            ['CV64000300004547069110176'], //Cape Verde
+            ['FR7630007000110009970004942'], //Central African Republic
+            ['CG5230011000202151234567890'], //Congo
+            ['CR05015202001026284066'], //Costa Rica
+            ['DO28BAGR00000001212453611324'], //Dominican Republic
+            ['GT82TRAJ01020000001210029690'], //Guatemala
+            ['IR580540105180021273113007'], //Iran
+            ['IL620108000000099999999'], //Israel
+            ['CI05A00060174100178530011852'], //Ivory Coast
+            ['JO94CBJO0010000000000131000302'], // Jordan
+            ['KZ176010251000042993'], //Kazakhstan
+            ['KW74NBOK0000000000001000372151'], //Kuwait
+            ['LB30099900000001001925579115'], //Lebanon
+            ['MG4600005030010101914016056'], //Madagascar
+            ['ML03D00890170001002120000447'], //Mali
+            ['MR1300012000010000002037372'], //Mauritania
+            ['MU17BOMM0101101030300200000MUR'], //Mauritius
+            ['MZ59000100000011834194157'], //Mozambique
+            ['PS92PALS000000000400123456702'], //Palestinian Territory
+            ['QA58DOHB00001234567890ABCDEFG'], //Qatar
+            ['XK051212012345678906'], //Republic of Kosovo
+            ['PT50000200000163099310355'], //Sao Tome and Principe
+            ['SA0380000000608010167519'], //Saudi Arabia
+            ['SN12K00100152000025690007542'], //Senegal
+            ['TL380080012345678910157'], //Timor-Leste
+            ['TN5914207207100707129648'], //Tunisia
+            ['TR330006100519786457841326'], //Turkey
+            ['UA213223130000026007233566001'], //Ukraine
+            ['AE260211000000230064016'], //United Arab Emirates
+            ['VA59001123000012345678'], //Vatican City State
+        ];
     }
 
     /**
@@ -170,113 +170,113 @@ public function testIbansWithInvalidFormat($iban)
 
     public function getIbansWithInvalidFormat()
     {
-        return array(
-            array('AL47 2121 1009 0000 0002 3569 874'), //Albania
-            array('AD12 0001 2030 2003 5910 010'), //Andorra
-            array('AT61 1904 3002 3457 320'), //Austria
-            array('AZ21 NABZ 0000 0000 1370 1000 194'), //Azerbaijan
-            array('AZ21 N1BZ 0000 0000 1370 1000 1944'), //Azerbaijan
-            array('BH67 BMAG 0000 1299 1234 5'), //Bahrain
-            array('BH67 B2AG 0000 1299 1234 56'), //Bahrain
-            array('BE62 5100 0754 7061 2'), //Belgium
-            array('BA39 1290 0794 0102 8494 4'), //Bosnia and Herzegovina
-            array('BG80 BNBG 9661 1020 3456 7'), //Bulgaria
-            array('BG80 B2BG 9661 1020 3456 78'), //Bulgaria
-            array('BY 13 NBRB 3600 900000002Z00AB001'), //Belarus
-            array('BY 13 NBRB 3600 900000002Z00AB0'), //Belarus
-            array('BYRO NBRB 3600 900000002Z00AB0'), //Belarus
-            array('BY 13 3600 NBRB 900000002Z00AB05'), //Belarus
-            array('HR12 1001 0051 8630 0016 01'), //Croatia
-            array('CY17 0020 0128 0000 0012 0052 7600 1'), //Cyprus
-            array('CZ65 0800 0000 1920 0014 5399 1'), //Czech Republic
-            array('DK50 0040 0440 1162 431'), //Denmark
-            array('EE38 2200 2210 2014 5685 1'), //Estonia
-            array('FO97 5432 0388 8999 441'), //Faroe Islands
-            array('FI21 1234 5600 0007 851'), //Finland
-            array('FR14 2004 1010 0505 0001 3M02 6061'), //France
-            array('GE29 NB00 0000 0101 9049 171'), //Georgia
-            array('DE89 3704 0044 0532 0130 001'), //Germany
-            array('GI75 NWBK 0000 0000 7099 4531'), //Gibraltar
-            array('GR16 0110 1250 0000 0001 2300 6951'), //Greece
-            array('GL56 0444 9876 5432 101'), //Greenland
-            array('HU42 1177 3016 1111 1018 0000 0000 1'), //Hungary
-            array('IS14 0159 2600 7654 5510 7303 391'), //Iceland
-            array('IE29 AIBK 9311 5212 3456 781'), //Ireland
-            array('IL62 0108 0000 0009 9999 9991'), //Israel
-            array('IT40 S054 2811 1010 0000 0123 4561'), //Italy
-            array('LV80 BANK 0000 4351 9500 11'), //Latvia
-            array('LB62 0999 0000 0001 0019 0122 9114 1'), //Lebanon
-            array('LI21 0881 0000 2324 013A A1'), //Liechtenstein
-            array('LT12 1000 0111 0100 1000 1'), //Lithuania
-            array('LU28 0019 4006 4475 0000 1'), //Luxembourg
-            array('MK072 5012 0000 0589 84 1'), //Macedonia
-            array('MT84 MALT 0110 0001 2345 MTLC AST0 01SA'), //Malta
-            array('MU17 BOMM 0101 1010 3030 0200 000M URA'), //Mauritius
-            array('MD24 AG00 0225 1000 1310 4168 1'), //Moldova
-            array('MC93 2005 2222 1001 1223 3M44 5551'), //Monaco
-            array('ME25 5050 0001 2345 6789 511'), //Montenegro
-            array('NL39 RABO 0300 0652 641'), //Netherlands
-            array('NO93 8601 1117 9471'), //Norway
-            array('PK36 SCBL 0000 0011 2345 6702 1'), //Pakistan
-            array('PL60 1020 1026 0000 0422 7020 1111 1'), //Poland
-            array('PT50 0002 0123 1234 5678 9015 41'), //Portugal
-            array('RO49 AAAA 1B31 0075 9384 0000 1'), //Romania
-            array('SM86 U032 2509 8000 0000 0270 1001'), //San Marino
-            array('SA03 8000 0000 6080 1016 7519 1'), //Saudi Arabia
-            array('RS35 2600 0560 1001 6113 791'), //Serbia
-            array('SK31 1200 0000 1987 4263 7541 1'), //Slovak Republic
-            array('SI56 1910 0000 0123 4381'), //Slovenia
-            array('ES80 2310 0001 1800 0001 2345 1'), //Spain
-            array('SE35 5000 0000 0549 1000 0003 1'), //Sweden
-            array('CH93 0076 2011 6238 5295 71'), //Switzerland
-            array('TN59 1000 6035 1835 9847 8831 1'), //Tunisia
-            array('TR33 0006 1005 1978 6457 8413 261'), //Turkey
-            array('AE07 0331 2345 6789 0123 4561'), //UAE
-            array('GB12 CPBK 0892 9965 0449 911'), //United Kingdom
+        return [
+            ['AL47 2121 1009 0000 0002 3569 874'], //Albania
+            ['AD12 0001 2030 2003 5910 010'], //Andorra
+            ['AT61 1904 3002 3457 320'], //Austria
+            ['AZ21 NABZ 0000 0000 1370 1000 194'], //Azerbaijan
+            ['AZ21 N1BZ 0000 0000 1370 1000 1944'], //Azerbaijan
+            ['BH67 BMAG 0000 1299 1234 5'], //Bahrain
+            ['BH67 B2AG 0000 1299 1234 56'], //Bahrain
+            ['BE62 5100 0754 7061 2'], //Belgium
+            ['BA39 1290 0794 0102 8494 4'], //Bosnia and Herzegovina
+            ['BG80 BNBG 9661 1020 3456 7'], //Bulgaria
+            ['BG80 B2BG 9661 1020 3456 78'], //Bulgaria
+            ['BY 13 NBRB 3600 900000002Z00AB001'], //Belarus
+            ['BY 13 NBRB 3600 900000002Z00AB0'], //Belarus
+            ['BYRO NBRB 3600 900000002Z00AB0'], //Belarus
+            ['BY 13 3600 NBRB 900000002Z00AB05'], //Belarus
+            ['HR12 1001 0051 8630 0016 01'], //Croatia
+            ['CY17 0020 0128 0000 0012 0052 7600 1'], //Cyprus
+            ['CZ65 0800 0000 1920 0014 5399 1'], //Czech Republic
+            ['DK50 0040 0440 1162 431'], //Denmark
+            ['EE38 2200 2210 2014 5685 1'], //Estonia
+            ['FO97 5432 0388 8999 441'], //Faroe Islands
+            ['FI21 1234 5600 0007 851'], //Finland
+            ['FR14 2004 1010 0505 0001 3M02 6061'], //France
+            ['GE29 NB00 0000 0101 9049 171'], //Georgia
+            ['DE89 3704 0044 0532 0130 001'], //Germany
+            ['GI75 NWBK 0000 0000 7099 4531'], //Gibraltar
+            ['GR16 0110 1250 0000 0001 2300 6951'], //Greece
+            ['GL56 0444 9876 5432 101'], //Greenland
+            ['HU42 1177 3016 1111 1018 0000 0000 1'], //Hungary
+            ['IS14 0159 2600 7654 5510 7303 391'], //Iceland
+            ['IE29 AIBK 9311 5212 3456 781'], //Ireland
+            ['IL62 0108 0000 0009 9999 9991'], //Israel
+            ['IT40 S054 2811 1010 0000 0123 4561'], //Italy
+            ['LV80 BANK 0000 4351 9500 11'], //Latvia
+            ['LB62 0999 0000 0001 0019 0122 9114 1'], //Lebanon
+            ['LI21 0881 0000 2324 013A A1'], //Liechtenstein
+            ['LT12 1000 0111 0100 1000 1'], //Lithuania
+            ['LU28 0019 4006 4475 0000 1'], //Luxembourg
+            ['MK072 5012 0000 0589 84 1'], //Macedonia
+            ['MT84 MALT 0110 0001 2345 MTLC AST0 01SA'], //Malta
+            ['MU17 BOMM 0101 1010 3030 0200 000M URA'], //Mauritius
+            ['MD24 AG00 0225 1000 1310 4168 1'], //Moldova
+            ['MC93 2005 2222 1001 1223 3M44 5551'], //Monaco
+            ['ME25 5050 0001 2345 6789 511'], //Montenegro
+            ['NL39 RABO 0300 0652 641'], //Netherlands
+            ['NO93 8601 1117 9471'], //Norway
+            ['PK36 SCBL 0000 0011 2345 6702 1'], //Pakistan
+            ['PL60 1020 1026 0000 0422 7020 1111 1'], //Poland
+            ['PT50 0002 0123 1234 5678 9015 41'], //Portugal
+            ['RO49 AAAA 1B31 0075 9384 0000 1'], //Romania
+            ['SM86 U032 2509 8000 0000 0270 1001'], //San Marino
+            ['SA03 8000 0000 6080 1016 7519 1'], //Saudi Arabia
+            ['RS35 2600 0560 1001 6113 791'], //Serbia
+            ['SK31 1200 0000 1987 4263 7541 1'], //Slovak Republic
+            ['SI56 1910 0000 0123 4381'], //Slovenia
+            ['ES80 2310 0001 1800 0001 2345 1'], //Spain
+            ['SE35 5000 0000 0549 1000 0003 1'], //Sweden
+            ['CH93 0076 2011 6238 5295 71'], //Switzerland
+            ['TN59 1000 6035 1835 9847 8831 1'], //Tunisia
+            ['TR33 0006 1005 1978 6457 8413 261'], //Turkey
+            ['AE07 0331 2345 6789 0123 4561'], //UAE
+            ['GB12 CPBK 0892 9965 0449 911'], //United Kingdom
 
             //Extended country list
-            array('AO060006000001000371311741'), //Angola
-            array('AZ21NABZ000000001370100019441'), //Azerbaijan
-            array('BH29BMAG1299123456BH001'), //Bahrain
-            array('BJ11B006101004002711011925911'), //Benin
-            array('BR9700360305000010009795493P11'), // Brazil
-            array('BR1800000000141455123924100C21'), // Brazil
-            array('VG96VPVG00000123456789011'), //British Virgin Islands
-            array('BF10301340200154009450006431'), //Burkina Faso
-            array('BI432010110674441'), //Burundi
-            array('CM21100030010005000006053061'), //Cameroon
-            array('CV640003000045470691101761'), //Cape Verde
-            array('FR76300070001100099700049421'), //Central African Republic
-            array('CG52300110002021512345678901'), //Congo
-            array('CR05152020010262840661'), //Costa Rica
-            array('CR0515202001026284066'), //Costa Rica
-            array('DO28BAGR000000012124536113241'), //Dominican Republic
-            array('GT82TRAJ010200000012100296901'), //Guatemala
-            array('IR5805401051800212731130071'), //Iran
-            array('IL6201080000000999999991'), //Israel
-            array('CI05A000601741001785300118521'), //Ivory Coast
-            array('JO94CBJO00100000000001310003021'), // Jordan
-            array('KZ1760102510000429931'), //Kazakhstan
-            array('KW74NBOK00000000000010003721511'), //Kuwait
-            array('LB300999000000010019255791151'), //Lebanon
-            array('MG46000050300101019140160561'), //Madagascar
-            array('ML03D008901700010021200004471'), //Mali
-            array('MR13000120000100000020373721'), //Mauritania
-            array('MU17BOMM0101101030300200000MUR1'), //Mauritius
-            array('MZ590001000000118341941571'), //Mozambique
-            array('PS92PALS0000000004001234567021'), //Palestinian Territory
-            array('QA58DOHB00001234567890ABCDEFG1'), //Qatar
-            array('XK0512120123456789061'), //Republic of Kosovo
-            array('PT500002000001630993103551'), //Sao Tome and Principe
-            array('SA03800000006080101675191'), //Saudi Arabia
-            array('SN12K001001520000256900075421'), //Senegal
-            array('TL3800800123456789101571'), //Timor-Leste
-            array('TN59142072071007071296481'), //Tunisia
-            array('TR3300061005197864578413261'), //Turkey
-            array('UA21AAAA1300000260072335660012'), //Ukraine
-            array('AE2602110000002300640161'), //United Arab Emirates
-            array('VA590011230000123456781'), //Vatican City State
-        );
+            ['AO060006000001000371311741'], //Angola
+            ['AZ21NABZ000000001370100019441'], //Azerbaijan
+            ['BH29BMAG1299123456BH001'], //Bahrain
+            ['BJ11B006101004002711011925911'], //Benin
+            ['BR9700360305000010009795493P11'], // Brazil
+            ['BR1800000000141455123924100C21'], // Brazil
+            ['VG96VPVG00000123456789011'], //British Virgin Islands
+            ['BF10301340200154009450006431'], //Burkina Faso
+            ['BI432010110674441'], //Burundi
+            ['CM21100030010005000006053061'], //Cameroon
+            ['CV640003000045470691101761'], //Cape Verde
+            ['FR76300070001100099700049421'], //Central African Republic
+            ['CG52300110002021512345678901'], //Congo
+            ['CR05152020010262840661'], //Costa Rica
+            ['CR0515202001026284066'], //Costa Rica
+            ['DO28BAGR000000012124536113241'], //Dominican Republic
+            ['GT82TRAJ010200000012100296901'], //Guatemala
+            ['IR5805401051800212731130071'], //Iran
+            ['IL6201080000000999999991'], //Israel
+            ['CI05A000601741001785300118521'], //Ivory Coast
+            ['JO94CBJO00100000000001310003021'], // Jordan
+            ['KZ1760102510000429931'], //Kazakhstan
+            ['KW74NBOK00000000000010003721511'], //Kuwait
+            ['LB300999000000010019255791151'], //Lebanon
+            ['MG46000050300101019140160561'], //Madagascar
+            ['ML03D008901700010021200004471'], //Mali
+            ['MR13000120000100000020373721'], //Mauritania
+            ['MU17BOMM0101101030300200000MUR1'], //Mauritius
+            ['MZ590001000000118341941571'], //Mozambique
+            ['PS92PALS0000000004001234567021'], //Palestinian Territory
+            ['QA58DOHB00001234567890ABCDEFG1'], //Qatar
+            ['XK0512120123456789061'], //Republic of Kosovo
+            ['PT500002000001630993103551'], //Sao Tome and Principe
+            ['SA03800000006080101675191'], //Saudi Arabia
+            ['SN12K001001520000256900075421'], //Senegal
+            ['TL3800800123456789101571'], //Timor-Leste
+            ['TN59142072071007071296481'], //Tunisia
+            ['TR3300061005197864578413261'], //Turkey
+            ['UA21AAAA1300000260072335660012'], //Ukraine
+            ['AE2602110000002300640161'], //United Arab Emirates
+            ['VA590011230000123456781'], //Vatican City State
+        ];
     }
 
     /**
@@ -289,106 +289,106 @@ public function testIbansWithValidFormatButIncorrectChecksum($iban)
 
     public function getIbansWithValidFormatButIncorrectChecksum()
     {
-        return array(
-            array('AL47 2121 1009 0000 0002 3569 8742'), //Albania
-            array('AD12 0001 2030 2003 5910 0101'), //Andorra
-            array('AT61 1904 3002 3457 3202'), //Austria
-            array('AZ21 NABZ 0000 0000 1370 1000 1945'), //Azerbaijan
-            array('BH67 BMAG 0000 1299 1234 57'), //Bahrain
-            array('BE62 5100 0754 7062'), //Belgium
-            array('BA39 1290 0794 0102 8495'), //Bosnia and Herzegovina
-            array('BG80 BNBG 9661 1020 3456 79'), //Bulgaria
-            array('BY90 NBRB 3600 900000002Z00AB00'), //Belarus
-            array('HR12 1001 0051 8630 0016 1'), //Croatia
-            array('CY17 0020 0128 0000 0012 0052 7601'), //Cyprus
-            array('CZ65 0800 0000 1920 0014 5398'), //Czech Republic
-            array('DK50 0040 0440 1162 44'), //Denmark
-            array('EE38 2200 2210 2014 5684'), //Estonia
-            array('FO97 5432 0388 8999 43'), //Faroe Islands
-            array('FI21 1234 5600 0007 84'), //Finland
-            array('FR14 2004 1010 0505 0001 3M02 605'), //France
-            array('GE29 NB00 0000 0101 9049 16'), //Georgia
-            array('DE89 3704 0044 0532 0130 01'), //Germany
-            array('GI75 NWBK 0000 0000 7099 452'), //Gibraltar
-            array('GR16 0110 1250 0000 0001 2300 694'), //Greece
-            array('GL56 0444 9876 5432 11'), //Greenland
-            array('HU42 1177 3016 1111 1018 0000 0001'), //Hungary
-            array('IS14 0159 2600 7654 5510 7303 38'), //Iceland
-            array('IE29 AIBK 9311 5212 3456 79'), //Ireland
-            array('IL62 0108 0000 0009 9999 998'), //Israel
-            array('IT40 S054 2811 1010 0000 0123 457'), //Italy
-            array('LV80 BANK 0000 4351 9500 2'), //Latvia
-            array('LB62 0999 0000 0001 0019 0122 9115'), //Lebanon
-            array('LI21 0881 0000 2324 013A B'), //Liechtenstein
-            array('LT12 1000 0111 0100 1001'), //Lithuania
-            array('LU28 0019 4006 4475 0001'), //Luxembourg
-            array('MK072 5012 0000 0589 85'), //Macedonia
-            array('MT84 MALT 0110 0001 2345 MTLC AST0 01T'), //Malta
-            array('MU17 BOMM 0101 1010 3030 0200 000M UP'), //Mauritius
-            array('MD24 AG00 0225 1000 1310 4169'), //Moldova
-            array('MC93 2005 2222 1001 1223 3M44 554'), //Monaco
-            array('ME25 5050 0001 2345 6789 52'), //Montenegro
-            array('NL39 RABO 0300 0652 65'), //Netherlands
-            array('NO93 8601 1117 948'), //Norway
-            array('PK36 SCBL 0000 0011 2345 6703'), //Pakistan
-            array('PL60 1020 1026 0000 0422 7020 1112'), //Poland
-            array('PT50 0002 0123 1234 5678 9015 5'), //Portugal
-            array('RO49 AAAA 1B31 0075 9384 0001'), //Romania
-            array('SM86 U032 2509 8000 0000 0270 101'), //San Marino
-            array('SA03 8000 0000 6080 1016 7518'), //Saudi Arabia
-            array('RS35 2600 0560 1001 6113 78'), //Serbia
-            array('SK31 1200 0000 1987 4263 7542'), //Slovak Republic
-            array('SI56 1910 0000 0123 439'), //Slovenia
-            array('ES80 2310 0001 1800 0001 2346'), //Spain
-            array('SE35 5000 0000 0549 1000 0004'), //Sweden
-            array('CH93 0076 2011 6238 5295 8'), //Switzerland
-            array('TN59 1000 6035 1835 9847 8832'), //Tunisia
-            array('TR33 0006 1005 1978 6457 8413 27'), //Turkey
-            array('AE07 0331 2345 6789 0123 457'), //UAE
-            array('GB12 CPBK 0892 9965 0449 92'), //United Kingdom
+        return [
+            ['AL47 2121 1009 0000 0002 3569 8742'], //Albania
+            ['AD12 0001 2030 2003 5910 0101'], //Andorra
+            ['AT61 1904 3002 3457 3202'], //Austria
+            ['AZ21 NABZ 0000 0000 1370 1000 1945'], //Azerbaijan
+            ['BH67 BMAG 0000 1299 1234 57'], //Bahrain
+            ['BE62 5100 0754 7062'], //Belgium
+            ['BA39 1290 0794 0102 8495'], //Bosnia and Herzegovina
+            ['BG80 BNBG 9661 1020 3456 79'], //Bulgaria
+            ['BY90 NBRB 3600 900000002Z00AB00'], //Belarus
+            ['HR12 1001 0051 8630 0016 1'], //Croatia
+            ['CY17 0020 0128 0000 0012 0052 7601'], //Cyprus
+            ['CZ65 0800 0000 1920 0014 5398'], //Czech Republic
+            ['DK50 0040 0440 1162 44'], //Denmark
+            ['EE38 2200 2210 2014 5684'], //Estonia
+            ['FO97 5432 0388 8999 43'], //Faroe Islands
+            ['FI21 1234 5600 0007 84'], //Finland
+            ['FR14 2004 1010 0505 0001 3M02 605'], //France
+            ['GE29 NB00 0000 0101 9049 16'], //Georgia
+            ['DE89 3704 0044 0532 0130 01'], //Germany
+            ['GI75 NWBK 0000 0000 7099 452'], //Gibraltar
+            ['GR16 0110 1250 0000 0001 2300 694'], //Greece
+            ['GL56 0444 9876 5432 11'], //Greenland
+            ['HU42 1177 3016 1111 1018 0000 0001'], //Hungary
+            ['IS14 0159 2600 7654 5510 7303 38'], //Iceland
+            ['IE29 AIBK 9311 5212 3456 79'], //Ireland
+            ['IL62 0108 0000 0009 9999 998'], //Israel
+            ['IT40 S054 2811 1010 0000 0123 457'], //Italy
+            ['LV80 BANK 0000 4351 9500 2'], //Latvia
+            ['LB62 0999 0000 0001 0019 0122 9115'], //Lebanon
+            ['LI21 0881 0000 2324 013A B'], //Liechtenstein
+            ['LT12 1000 0111 0100 1001'], //Lithuania
+            ['LU28 0019 4006 4475 0001'], //Luxembourg
+            ['MK072 5012 0000 0589 85'], //Macedonia
+            ['MT84 MALT 0110 0001 2345 MTLC AST0 01T'], //Malta
+            ['MU17 BOMM 0101 1010 3030 0200 000M UP'], //Mauritius
+            ['MD24 AG00 0225 1000 1310 4169'], //Moldova
+            ['MC93 2005 2222 1001 1223 3M44 554'], //Monaco
+            ['ME25 5050 0001 2345 6789 52'], //Montenegro
+            ['NL39 RABO 0300 0652 65'], //Netherlands
+            ['NO93 8601 1117 948'], //Norway
+            ['PK36 SCBL 0000 0011 2345 6703'], //Pakistan
+            ['PL60 1020 1026 0000 0422 7020 1112'], //Poland
+            ['PT50 0002 0123 1234 5678 9015 5'], //Portugal
+            ['RO49 AAAA 1B31 0075 9384 0001'], //Romania
+            ['SM86 U032 2509 8000 0000 0270 101'], //San Marino
+            ['SA03 8000 0000 6080 1016 7518'], //Saudi Arabia
+            ['RS35 2600 0560 1001 6113 78'], //Serbia
+            ['SK31 1200 0000 1987 4263 7542'], //Slovak Republic
+            ['SI56 1910 0000 0123 439'], //Slovenia
+            ['ES80 2310 0001 1800 0001 2346'], //Spain
+            ['SE35 5000 0000 0549 1000 0004'], //Sweden
+            ['CH93 0076 2011 6238 5295 8'], //Switzerland
+            ['TN59 1000 6035 1835 9847 8832'], //Tunisia
+            ['TR33 0006 1005 1978 6457 8413 27'], //Turkey
+            ['AE07 0331 2345 6789 0123 457'], //UAE
+            ['GB12 CPBK 0892 9965 0449 92'], //United Kingdom
 
             //Extended country list
-            array('AO06000600000100037131175'), //Angola
-            array('AZ21NABZ00000000137010001945'), //Azerbaijan
-            array('BH29BMAG1299123456BH01'), //Bahrain
-            array('BJ11B00610100400271101192592'), //Benin
-            array('BR9700360305000010009795493P2'), // Brazil
-            array('BR1800000000141455123924100C3'), // Brazil
-            array('VG96VPVG0000012345678902'), //British Virgin Islands
-            array('BF1030134020015400945000644'), //Burkina Faso
-            array('BI43201011067445'), //Burundi
-            array('CM2110003001000500000605307'), //Cameroon
-            array('CV64000300004547069110177'), //Cape Verde
-            array('FR7630007000110009970004943'), //Central African Republic
-            array('CG5230011000202151234567891'), //Congo
-            array('CR96042332432534543564'), //Costa Rica
-            array('DO28BAGR00000001212453611325'), //Dominican Republic
-            array('GT82TRAJ01020000001210029691'), //Guatemala
-            array('IR580540105180021273113008'), //Iran
-            array('IL620108000000099999998'), //Israel
-            array('CI05A00060174100178530011853'), //Ivory Coast
-            array('JO94CBJO0010000000000131000303'), // Jordan
-            array('KZ176010251000042994'), //Kazakhstan
-            array('KW74NBOK0000000000001000372152'), //Kuwait
-            array('LB30099900000001001925579116'), //Lebanon
-            array('MG4600005030010101914016057'), //Madagascar
-            array('ML03D00890170001002120000448'), //Mali
-            array('MR1300012000010000002037373'), //Mauritania
-            array('MU17BOMM0101101030300200000MUP'), //Mauritius
-            array('MZ59000100000011834194158'), //Mozambique
-            array('PS92PALS000000000400123456703'), //Palestinian Territory
-            array('QA58DOHB00001234567890ABCDEFH'), //Qatar
-            array('XK051212012345678907'), //Republic of Kosovo
-            array('PT50000200000163099310356'), //Sao Tome and Principe
-            array('SA0380000000608010167518'), //Saudi Arabia
-            array('SN12K00100152000025690007543'), //Senegal
-            array('TL380080012345678910158'), //Timor-Leste
-            array('TN5914207207100707129649'), //Tunisia
-            array('TR330006100519786457841327'), //Turkey
-            array('UA213223130000026007233566002'), //Ukraine
-            array('AE260211000000230064017'), //United Arab Emirates
-            array('VA59001123000012345671'), //Vatican City State
-        );
+            ['AO06000600000100037131175'], //Angola
+            ['AZ21NABZ00000000137010001945'], //Azerbaijan
+            ['BH29BMAG1299123456BH01'], //Bahrain
+            ['BJ11B00610100400271101192592'], //Benin
+            ['BR9700360305000010009795493P2'], // Brazil
+            ['BR1800000000141455123924100C3'], // Brazil
+            ['VG96VPVG0000012345678902'], //British Virgin Islands
+            ['BF1030134020015400945000644'], //Burkina Faso
+            ['BI43201011067445'], //Burundi
+            ['CM2110003001000500000605307'], //Cameroon
+            ['CV64000300004547069110177'], //Cape Verde
+            ['FR7630007000110009970004943'], //Central African Republic
+            ['CG5230011000202151234567891'], //Congo
+            ['CR96042332432534543564'], //Costa Rica
+            ['DO28BAGR00000001212453611325'], //Dominican Republic
+            ['GT82TRAJ01020000001210029691'], //Guatemala
+            ['IR580540105180021273113008'], //Iran
+            ['IL620108000000099999998'], //Israel
+            ['CI05A00060174100178530011853'], //Ivory Coast
+            ['JO94CBJO0010000000000131000303'], // Jordan
+            ['KZ176010251000042994'], //Kazakhstan
+            ['KW74NBOK0000000000001000372152'], //Kuwait
+            ['LB30099900000001001925579116'], //Lebanon
+            ['MG4600005030010101914016057'], //Madagascar
+            ['ML03D00890170001002120000448'], //Mali
+            ['MR1300012000010000002037373'], //Mauritania
+            ['MU17BOMM0101101030300200000MUP'], //Mauritius
+            ['MZ59000100000011834194158'], //Mozambique
+            ['PS92PALS000000000400123456703'], //Palestinian Territory
+            ['QA58DOHB00001234567890ABCDEFH'], //Qatar
+            ['XK051212012345678907'], //Republic of Kosovo
+            ['PT50000200000163099310356'], //Sao Tome and Principe
+            ['SA0380000000608010167518'], //Saudi Arabia
+            ['SN12K00100152000025690007543'], //Senegal
+            ['TL380080012345678910158'], //Timor-Leste
+            ['TN5914207207100707129649'], //Tunisia
+            ['TR330006100519786457841327'], //Turkey
+            ['UA213223130000026007233566002'], //Ukraine
+            ['AE260211000000230064017'], //United Arab Emirates
+            ['VA59001123000012345671'], //Vatican City State
+        ];
     }
 
     /**
@@ -401,13 +401,13 @@ public function testIbansWithUnsupportedCountryCode($countryCode)
 
     public function getUnsupportedCountryCodes()
     {
-        return array(
-            array('AG'),
-            array('AI'),
-            array('AQ'),
-            array('AS'),
-            array('AW'),
-        );
+        return [
+            ['AG'],
+            ['AI'],
+            ['AQ'],
+            ['AS'],
+            ['AW'],
+        ];
     }
 
     public function testIbansWithInvalidCharacters()
@@ -425,18 +425,18 @@ public function testIbansWithInvalidCountryCode($iban)
 
     public function getIbansWithInvalidCountryCode()
     {
-        return array(
-            array('0750447346'),
-            array('2X0750447346'),
-            array('A20750447346'),
-        );
+        return [
+            ['0750447346'],
+            ['2X0750447346'],
+            ['A20750447346'],
+        ];
     }
 
     private function assertViolationRaised($iban, $code)
     {
-        $constraint = new Iban(array(
+        $constraint = new Iban([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($iban, $constraint);
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php
index 360eccabc7025..c96ac16a91930 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php
@@ -55,16 +55,16 @@ public function provideValidComparisons()
         $date = new \DateTime('2000-01-01');
         $object = new ComparisonTest_Class(2);
 
-        $comparisons = array(
-            array(3, 3),
-            array('a', 'a'),
-            array($date, $date),
-            array($object, $object),
-            array(null, 1),
-        );
+        $comparisons = [
+            [3, 3],
+            ['a', 'a'],
+            [$date, $date],
+            [$object, $object],
+            [null, 1],
+        ];
 
         $immutableDate = new \DateTimeImmutable('2000-01-01');
-        $comparisons[] = array($immutableDate, $immutableDate);
+        $comparisons[] = [$immutableDate, $immutableDate];
 
         return $comparisons;
     }
@@ -74,9 +74,9 @@ public function provideValidComparisons()
      */
     public function provideValidComparisonsToPropertyPath()
     {
-        return array(
-            array(5),
-        );
+        return [
+            [5],
+        ];
     }
 
     /**
@@ -84,13 +84,13 @@ public function provideValidComparisonsToPropertyPath()
      */
     public function provideInvalidComparisons()
     {
-        return array(
-            array(1, '1', 2, '2', 'integer'),
-            array(2, '2', '2', '"2"', 'string'),
-            array('22', '"22"', '333', '"333"', 'string'),
-            array(new \DateTime('2001-01-01'), 'Jan 1, 2001, 12:00 AM', new \DateTime('2001-01-01'), 'Jan 1, 2001, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2001-01-01'), 'Jan 1, 2001, 12:00 AM', new \DateTime('1999-01-01'), 'Jan 1, 1999, 12:00 AM', 'DateTime'),
-            array(new ComparisonTest_Class(4), '4', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'),
-        );
+        return [
+            [1, '1', 2, '2', 'integer'],
+            [2, '2', '2', '"2"', 'string'],
+            ['22', '"22"', '333', '"333"', 'string'],
+            [new \DateTime('2001-01-01'), 'Jan 1, 2001, 12:00 AM', new \DateTime('2001-01-01'), 'Jan 1, 2001, 12:00 AM', 'DateTime'],
+            [new \DateTime('2001-01-01'), 'Jan 1, 2001, 12:00 AM', new \DateTime('1999-01-01'), 'Jan 1, 1999, 12:00 AM', 'DateTime'],
+            [new ComparisonTest_Class(4), '4', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
index 9d80f88d89dfa..aa8ad4cf55dc7 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
@@ -74,9 +74,9 @@ public function testValidImage()
     public function testFileNotFound()
     {
         // Check that the logic from FileValidator still works
-        $constraint = new Image(array(
+        $constraint = new Image([
             'notFoundMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate('foobar', $constraint);
 
@@ -88,12 +88,12 @@ public function testFileNotFound()
 
     public function testValidSize()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'minWidth' => 1,
             'maxWidth' => 2,
             'minHeight' => 1,
             'maxHeight' => 2,
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
 
@@ -102,10 +102,10 @@ public function testValidSize()
 
     public function testWidthTooSmall()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'minWidth' => 3,
             'minWidthMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
 
@@ -118,10 +118,10 @@ public function testWidthTooSmall()
 
     public function testWidthTooBig()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'maxWidth' => 1,
             'maxWidthMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
 
@@ -134,10 +134,10 @@ public function testWidthTooBig()
 
     public function testHeightTooSmall()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'minHeight' => 3,
             'minHeightMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
 
@@ -150,10 +150,10 @@ public function testHeightTooSmall()
 
     public function testHeightTooBig()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'maxHeight' => 1,
             'maxHeightMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
 
@@ -166,10 +166,10 @@ public function testHeightTooBig()
 
     public function testPixelsTooFew()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'minPixels' => 5,
             'minPixelsMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
 
@@ -184,10 +184,10 @@ public function testPixelsTooFew()
 
     public function testPixelsTooMany()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'maxPixels' => 3,
             'maxPixelsMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
 
@@ -205,9 +205,9 @@ public function testPixelsTooMany()
      */
     public function testInvalidMinWidth()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'minWidth' => '1abc',
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
     }
@@ -217,9 +217,9 @@ public function testInvalidMinWidth()
      */
     public function testInvalidMaxWidth()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'maxWidth' => '1abc',
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
     }
@@ -229,9 +229,9 @@ public function testInvalidMaxWidth()
      */
     public function testInvalidMinHeight()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'minHeight' => '1abc',
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
     }
@@ -241,9 +241,9 @@ public function testInvalidMinHeight()
      */
     public function testInvalidMaxHeight()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'maxHeight' => '1abc',
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
     }
@@ -253,9 +253,9 @@ public function testInvalidMaxHeight()
      */
     public function testInvalidMinPixels()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'minPixels' => '1abc',
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
     }
@@ -265,19 +265,19 @@ public function testInvalidMinPixels()
      */
     public function testInvalidMaxPixels()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'maxPixels' => '1abc',
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
     }
 
     public function testRatioTooSmall()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'minRatio' => 2,
             'minRatioMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
 
@@ -290,10 +290,10 @@ public function testRatioTooSmall()
 
     public function testRatioTooBig()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'maxRatio' => 0.5,
             'maxRatioMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
 
@@ -306,9 +306,9 @@ public function testRatioTooBig()
 
     public function testMaxRatioUsesTwoDecimalsOnly()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'maxRatio' => 1.33,
-        ));
+        ]);
 
         $this->validator->validate($this->image4By3, $constraint);
 
@@ -320,9 +320,9 @@ public function testMaxRatioUsesTwoDecimalsOnly()
      */
     public function testInvalidMinRatio()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'minRatio' => '1abc',
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
     }
@@ -332,19 +332,19 @@ public function testInvalidMinRatio()
      */
     public function testInvalidMaxRatio()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'maxRatio' => '1abc',
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
     }
 
     public function testSquareNotAllowed()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'allowSquare' => false,
             'allowSquareMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
 
@@ -357,10 +357,10 @@ public function testSquareNotAllowed()
 
     public function testLandscapeNotAllowed()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'allowLandscape' => false,
             'allowLandscapeMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($this->imageLandscape, $constraint);
 
@@ -373,10 +373,10 @@ public function testLandscapeNotAllowed()
 
     public function testPortraitNotAllowed()
     {
-        $constraint = new Image(array(
+        $constraint = new Image([
             'allowPortrait' => false,
             'allowPortraitMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($this->imagePortrait, $constraint);
 
@@ -393,10 +393,10 @@ public function testCorrupted()
             $this->markTestSkipped('This test require GD extension');
         }
 
-        $constraint = new Image(array(
+        $constraint = new Image([
             'detectCorrupted' => true,
             'corruptedMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($this->image, $constraint);
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php
index 985bd9577d2d5..1ee44e7c518d6 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php
@@ -49,9 +49,9 @@ public function testExpectsStringCompatibleType()
      */
     public function testInvalidValidatorVersion()
     {
-        new Ip(array(
+        new Ip([
             'version' => 666,
-        ));
+        ]);
     }
 
     /**
@@ -59,25 +59,25 @@ public function testInvalidValidatorVersion()
      */
     public function testValidIpsV4($ip)
     {
-        $this->validator->validate($ip, new Ip(array(
+        $this->validator->validate($ip, new Ip([
             'version' => Ip::V4,
-        )));
+        ]));
 
         $this->assertNoViolation();
     }
 
     public function getValidIpsV4()
     {
-        return array(
-            array('0.0.0.0'),
-            array('10.0.0.0'),
-            array('123.45.67.178'),
-            array('172.16.0.0'),
-            array('192.168.1.0'),
-            array('224.0.0.1'),
-            array('255.255.255.255'),
-            array('127.0.0.0'),
-        );
+        return [
+            ['0.0.0.0'],
+            ['10.0.0.0'],
+            ['123.45.67.178'],
+            ['172.16.0.0'],
+            ['192.168.1.0'],
+            ['224.0.0.1'],
+            ['255.255.255.255'],
+            ['127.0.0.0'],
+        ];
     }
 
     /**
@@ -85,36 +85,36 @@ public function getValidIpsV4()
      */
     public function testValidIpsV6($ip)
     {
-        $this->validator->validate($ip, new Ip(array(
+        $this->validator->validate($ip, new Ip([
             'version' => Ip::V6,
-        )));
+        ]));
 
         $this->assertNoViolation();
     }
 
     public function getValidIpsV6()
     {
-        return array(
-            array('2001:0db8:85a3:0000:0000:8a2e:0370:7334'),
-            array('2001:0DB8:85A3:0000:0000:8A2E:0370:7334'),
-            array('2001:0Db8:85a3:0000:0000:8A2e:0370:7334'),
-            array('fdfe:dcba:9876:ffff:fdc6:c46b:bb8f:7d4c'),
-            array('fdc6:c46b:bb8f:7d4c:fdc6:c46b:bb8f:7d4c'),
-            array('fdc6:c46b:bb8f:7d4c:0000:8a2e:0370:7334'),
-            array('fe80:0000:0000:0000:0202:b3ff:fe1e:8329'),
-            array('fe80:0:0:0:202:b3ff:fe1e:8329'),
-            array('fe80::202:b3ff:fe1e:8329'),
-            array('0:0:0:0:0:0:0:0'),
-            array('::'),
-            array('0::'),
-            array('::0'),
-            array('0::0'),
+        return [
+            ['2001:0db8:85a3:0000:0000:8a2e:0370:7334'],
+            ['2001:0DB8:85A3:0000:0000:8A2E:0370:7334'],
+            ['2001:0Db8:85a3:0000:0000:8A2e:0370:7334'],
+            ['fdfe:dcba:9876:ffff:fdc6:c46b:bb8f:7d4c'],
+            ['fdc6:c46b:bb8f:7d4c:fdc6:c46b:bb8f:7d4c'],
+            ['fdc6:c46b:bb8f:7d4c:0000:8a2e:0370:7334'],
+            ['fe80:0000:0000:0000:0202:b3ff:fe1e:8329'],
+            ['fe80:0:0:0:202:b3ff:fe1e:8329'],
+            ['fe80::202:b3ff:fe1e:8329'],
+            ['0:0:0:0:0:0:0:0'],
+            ['::'],
+            ['0::'],
+            ['::0'],
+            ['0::0'],
             // IPv4 mapped to IPv6
-            array('2001:0db8:85a3:0000:0000:8a2e:0.0.0.0'),
-            array('::0.0.0.0'),
-            array('::255.255.255.255'),
-            array('::123.45.67.178'),
-        );
+            ['2001:0db8:85a3:0000:0000:8a2e:0.0.0.0'],
+            ['::0.0.0.0'],
+            ['::255.255.255.255'],
+            ['::123.45.67.178'],
+        ];
     }
 
     /**
@@ -122,9 +122,9 @@ public function getValidIpsV6()
      */
     public function testValidIpsAll($ip)
     {
-        $this->validator->validate($ip, new Ip(array(
+        $this->validator->validate($ip, new Ip([
             'version' => Ip::ALL,
-        )));
+        ]));
 
         $this->assertNoViolation();
     }
@@ -139,10 +139,10 @@ public function getValidIpsAll()
      */
     public function testInvalidIpsV4($ip)
     {
-        $constraint = new Ip(array(
+        $constraint = new Ip([
             'version' => Ip::V4,
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($ip, $constraint);
 
@@ -154,17 +154,17 @@ public function testInvalidIpsV4($ip)
 
     public function getInvalidIpsV4()
     {
-        return array(
-            array('0'),
-            array('0.0'),
-            array('0.0.0'),
-            array('256.0.0.0'),
-            array('0.256.0.0'),
-            array('0.0.256.0'),
-            array('0.0.0.256'),
-            array('-1.0.0.0'),
-            array('foobar'),
-        );
+        return [
+            ['0'],
+            ['0.0'],
+            ['0.0.0'],
+            ['256.0.0.0'],
+            ['0.256.0.0'],
+            ['0.0.256.0'],
+            ['0.0.0.256'],
+            ['-1.0.0.0'],
+            ['foobar'],
+        ];
     }
 
     /**
@@ -172,10 +172,10 @@ public function getInvalidIpsV4()
      */
     public function testInvalidPrivateIpsV4($ip)
     {
-        $constraint = new Ip(array(
+        $constraint = new Ip([
             'version' => Ip::V4_NO_PRIV,
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($ip, $constraint);
 
@@ -187,11 +187,11 @@ public function testInvalidPrivateIpsV4($ip)
 
     public function getInvalidPrivateIpsV4()
     {
-        return array(
-            array('10.0.0.0'),
-            array('172.16.0.0'),
-            array('192.168.1.0'),
-        );
+        return [
+            ['10.0.0.0'],
+            ['172.16.0.0'],
+            ['192.168.1.0'],
+        ];
     }
 
     /**
@@ -199,10 +199,10 @@ public function getInvalidPrivateIpsV4()
      */
     public function testInvalidReservedIpsV4($ip)
     {
-        $constraint = new Ip(array(
+        $constraint = new Ip([
             'version' => Ip::V4_NO_RES,
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($ip, $constraint);
 
@@ -214,11 +214,11 @@ public function testInvalidReservedIpsV4($ip)
 
     public function getInvalidReservedIpsV4()
     {
-        return array(
-            array('0.0.0.0'),
-            array('240.0.0.1'),
-            array('255.255.255.255'),
-        );
+        return [
+            ['0.0.0.0'],
+            ['240.0.0.1'],
+            ['255.255.255.255'],
+        ];
     }
 
     /**
@@ -226,10 +226,10 @@ public function getInvalidReservedIpsV4()
      */
     public function testInvalidPublicIpsV4($ip)
     {
-        $constraint = new Ip(array(
+        $constraint = new Ip([
             'version' => Ip::V4_ONLY_PUBLIC,
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($ip, $constraint);
 
@@ -249,10 +249,10 @@ public function getInvalidPublicIpsV4()
      */
     public function testInvalidIpsV6($ip)
     {
-        $constraint = new Ip(array(
+        $constraint = new Ip([
             'version' => Ip::V6,
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($ip, $constraint);
 
@@ -264,21 +264,21 @@ public function testInvalidIpsV6($ip)
 
     public function getInvalidIpsV6()
     {
-        return array(
-            array('z001:0db8:85a3:0000:0000:8a2e:0370:7334'),
-            array('fe80'),
-            array('fe80:8329'),
-            array('fe80:::202:b3ff:fe1e:8329'),
-            array('fe80::202:b3ff::fe1e:8329'),
+        return [
+            ['z001:0db8:85a3:0000:0000:8a2e:0370:7334'],
+            ['fe80'],
+            ['fe80:8329'],
+            ['fe80:::202:b3ff:fe1e:8329'],
+            ['fe80::202:b3ff::fe1e:8329'],
             // IPv4 mapped to IPv6
-            array('2001:0db8:85a3:0000:0000:8a2e:0370:0.0.0.0'),
-            array('::0.0'),
-            array('::0.0.0'),
-            array('::256.0.0.0'),
-            array('::0.256.0.0'),
-            array('::0.0.256.0'),
-            array('::0.0.0.256'),
-        );
+            ['2001:0db8:85a3:0000:0000:8a2e:0370:0.0.0.0'],
+            ['::0.0'],
+            ['::0.0.0'],
+            ['::256.0.0.0'],
+            ['::0.256.0.0'],
+            ['::0.0.256.0'],
+            ['::0.0.0.256'],
+        ];
     }
 
     /**
@@ -286,10 +286,10 @@ public function getInvalidIpsV6()
      */
     public function testInvalidPrivateIpsV6($ip)
     {
-        $constraint = new Ip(array(
+        $constraint = new Ip([
             'version' => Ip::V6_NO_PRIV,
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($ip, $constraint);
 
@@ -301,11 +301,11 @@ public function testInvalidPrivateIpsV6($ip)
 
     public function getInvalidPrivateIpsV6()
     {
-        return array(
-            array('fdfe:dcba:9876:ffff:fdc6:c46b:bb8f:7d4c'),
-            array('fdc6:c46b:bb8f:7d4c:fdc6:c46b:bb8f:7d4c'),
-            array('fdc6:c46b:bb8f:7d4c:0000:8a2e:0370:7334'),
-        );
+        return [
+            ['fdfe:dcba:9876:ffff:fdc6:c46b:bb8f:7d4c'],
+            ['fdc6:c46b:bb8f:7d4c:fdc6:c46b:bb8f:7d4c'],
+            ['fdc6:c46b:bb8f:7d4c:0000:8a2e:0370:7334'],
+        ];
     }
 
     /**
@@ -313,10 +313,10 @@ public function getInvalidPrivateIpsV6()
      */
     public function testInvalidReservedIpsV6($ip)
     {
-        $constraint = new Ip(array(
+        $constraint = new Ip([
             'version' => Ip::V6_NO_RES,
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($ip, $constraint);
 
@@ -339,10 +339,10 @@ public function getInvalidReservedIpsV6()
      */
     public function testInvalidPublicIpsV6($ip)
     {
-        $constraint = new Ip(array(
+        $constraint = new Ip([
             'version' => Ip::V6_ONLY_PUBLIC,
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($ip, $constraint);
 
@@ -362,10 +362,10 @@ public function getInvalidPublicIpsV6()
      */
     public function testInvalidIpsAll($ip)
     {
-        $constraint = new Ip(array(
+        $constraint = new Ip([
             'version' => Ip::ALL,
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($ip, $constraint);
 
@@ -385,10 +385,10 @@ public function getInvalidIpsAll()
      */
     public function testInvalidPrivateIpsAll($ip)
     {
-        $constraint = new Ip(array(
+        $constraint = new Ip([
             'version' => Ip::ALL_NO_PRIV,
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($ip, $constraint);
 
@@ -408,10 +408,10 @@ public function getInvalidPrivateIpsAll()
      */
     public function testInvalidReservedIpsAll($ip)
     {
-        $constraint = new Ip(array(
+        $constraint = new Ip([
             'version' => Ip::ALL_NO_RES,
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($ip, $constraint);
 
@@ -431,10 +431,10 @@ public function getInvalidReservedIpsAll()
      */
     public function testInvalidPublicIpsAll($ip)
     {
-        $constraint = new Ip(array(
+        $constraint = new Ip([
             'version' => Ip::ALL_ONLY_PUBLIC,
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($ip, $constraint);
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IsFalseValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IsFalseValidatorTest.php
index ab139a93fd7d3..65aecf94be599 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/IsFalseValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/IsFalseValidatorTest.php
@@ -38,9 +38,9 @@ public function testFalseIsValid()
 
     public function testTrueIsInvalid()
     {
-        $constraint = new IsFalse(array(
+        $constraint = new IsFalse([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate(true, $constraint);
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IsNullValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IsNullValidatorTest.php
index 2cc289b85739d..60f9e95f473a4 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/IsNullValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/IsNullValidatorTest.php
@@ -34,9 +34,9 @@ public function testNullIsValid()
      */
     public function testInvalidValues($value, $valueAsString)
     {
-        $constraint = new IsNull(array(
+        $constraint = new IsNull([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -48,15 +48,15 @@ public function testInvalidValues($value, $valueAsString)
 
     public function getInvalidValues()
     {
-        return array(
-            array(0, '0'),
-            array(false, 'false'),
-            array(true, 'true'),
-            array('', '""'),
-            array('foo bar', '"foo bar"'),
-            array(new \DateTime(), 'object'),
-            array(new \stdClass(), 'object'),
-            array(array(), 'array'),
-        );
+        return [
+            [0, '0'],
+            [false, 'false'],
+            [true, 'true'],
+            ['', '""'],
+            ['foo bar', '"foo bar"'],
+            [new \DateTime(), 'object'],
+            [new \stdClass(), 'object'],
+            [[], 'array'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IsTrueValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IsTrueValidatorTest.php
index 821d54da29e59..e3e0c52b93a63 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/IsTrueValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/IsTrueValidatorTest.php
@@ -38,9 +38,9 @@ public function testTrueIsValid()
 
     public function testFalseIsInvalid()
     {
-        $constraint = new IsTrue(array(
+        $constraint = new IsTrue([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate(false, $constraint);
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
index f810fc9820ae8..3c17fd403ad0b 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
@@ -27,79 +27,79 @@ protected function createValidator()
 
     public function getValidIsbn10()
     {
-        return array(
-            array('2723442284'),
-            array('2723442276'),
-            array('2723455041'),
-            array('2070546810'),
-            array('2711858839'),
-            array('2756406767'),
-            array('2870971648'),
-            array('226623854X'),
-            array('2851806424'),
-            array('0321812700'),
-            array('0-45122-5244'),
-            array('0-4712-92311'),
-            array('0-9752298-0-X'),
-        );
+        return [
+            ['2723442284'],
+            ['2723442276'],
+            ['2723455041'],
+            ['2070546810'],
+            ['2711858839'],
+            ['2756406767'],
+            ['2870971648'],
+            ['226623854X'],
+            ['2851806424'],
+            ['0321812700'],
+            ['0-45122-5244'],
+            ['0-4712-92311'],
+            ['0-9752298-0-X'],
+        ];
     }
 
     public function getInvalidIsbn10()
     {
-        return array(
-            array('27234422841', Isbn::TOO_LONG_ERROR),
-            array('272344228', Isbn::TOO_SHORT_ERROR),
-            array('0-4712-9231', Isbn::TOO_SHORT_ERROR),
-            array('1234567890', Isbn::CHECKSUM_FAILED_ERROR),
-            array('0987656789', Isbn::CHECKSUM_FAILED_ERROR),
-            array('7-35622-5444', Isbn::CHECKSUM_FAILED_ERROR),
-            array('0-4X19-92611', Isbn::CHECKSUM_FAILED_ERROR),
-            array('0_45122_5244', Isbn::INVALID_CHARACTERS_ERROR),
-            array('2870#971#648', Isbn::INVALID_CHARACTERS_ERROR),
-            array('0-9752298-0-x', Isbn::INVALID_CHARACTERS_ERROR),
-            array('1A34567890', Isbn::INVALID_CHARACTERS_ERROR),
+        return [
+            ['27234422841', Isbn::TOO_LONG_ERROR],
+            ['272344228', Isbn::TOO_SHORT_ERROR],
+            ['0-4712-9231', Isbn::TOO_SHORT_ERROR],
+            ['1234567890', Isbn::CHECKSUM_FAILED_ERROR],
+            ['0987656789', Isbn::CHECKSUM_FAILED_ERROR],
+            ['7-35622-5444', Isbn::CHECKSUM_FAILED_ERROR],
+            ['0-4X19-92611', Isbn::CHECKSUM_FAILED_ERROR],
+            ['0_45122_5244', Isbn::INVALID_CHARACTERS_ERROR],
+            ['2870#971#648', Isbn::INVALID_CHARACTERS_ERROR],
+            ['0-9752298-0-x', Isbn::INVALID_CHARACTERS_ERROR],
+            ['1A34567890', Isbn::INVALID_CHARACTERS_ERROR],
             // chr(1) evaluates to 0
             // 2070546810 is valid
-            array('2'.\chr(1).'70546810', Isbn::INVALID_CHARACTERS_ERROR),
-        );
+            ['2'.\chr(1).'70546810', Isbn::INVALID_CHARACTERS_ERROR],
+        ];
     }
 
     public function getValidIsbn13()
     {
-        return array(
-            array('978-2723442282'),
-            array('978-2723442275'),
-            array('978-2723455046'),
-            array('978-2070546817'),
-            array('978-2711858835'),
-            array('978-2756406763'),
-            array('978-2870971642'),
-            array('978-2266238540'),
-            array('978-2851806420'),
-            array('978-0321812704'),
-            array('978-0451225245'),
-            array('978-0471292319'),
-        );
+        return [
+            ['978-2723442282'],
+            ['978-2723442275'],
+            ['978-2723455046'],
+            ['978-2070546817'],
+            ['978-2711858835'],
+            ['978-2756406763'],
+            ['978-2870971642'],
+            ['978-2266238540'],
+            ['978-2851806420'],
+            ['978-0321812704'],
+            ['978-0451225245'],
+            ['978-0471292319'],
+        ];
     }
 
     public function getInvalidIsbn13()
     {
-        return array(
-            array('978-27234422821', Isbn::TOO_LONG_ERROR),
-            array('978-272344228', Isbn::TOO_SHORT_ERROR),
-            array('978-2723442-82', Isbn::TOO_SHORT_ERROR),
-            array('978-2723442281', Isbn::CHECKSUM_FAILED_ERROR),
-            array('978-0321513774', Isbn::CHECKSUM_FAILED_ERROR),
-            array('979-0431225385', Isbn::CHECKSUM_FAILED_ERROR),
-            array('980-0474292319', Isbn::CHECKSUM_FAILED_ERROR),
-            array('0-4X19-92619812', Isbn::INVALID_CHARACTERS_ERROR),
-            array('978_2723442282', Isbn::INVALID_CHARACTERS_ERROR),
-            array('978#2723442282', Isbn::INVALID_CHARACTERS_ERROR),
-            array('978-272C442282', Isbn::INVALID_CHARACTERS_ERROR),
+        return [
+            ['978-27234422821', Isbn::TOO_LONG_ERROR],
+            ['978-272344228', Isbn::TOO_SHORT_ERROR],
+            ['978-2723442-82', Isbn::TOO_SHORT_ERROR],
+            ['978-2723442281', Isbn::CHECKSUM_FAILED_ERROR],
+            ['978-0321513774', Isbn::CHECKSUM_FAILED_ERROR],
+            ['979-0431225385', Isbn::CHECKSUM_FAILED_ERROR],
+            ['980-0474292319', Isbn::CHECKSUM_FAILED_ERROR],
+            ['0-4X19-92619812', Isbn::INVALID_CHARACTERS_ERROR],
+            ['978_2723442282', Isbn::INVALID_CHARACTERS_ERROR],
+            ['978#2723442282', Isbn::INVALID_CHARACTERS_ERROR],
+            ['978-272C442282', Isbn::INVALID_CHARACTERS_ERROR],
             // chr(1) evaluates to 0
             // 978-2070546817 is valid
-            array('978-2'.\chr(1).'70546817', Isbn::INVALID_CHARACTERS_ERROR),
-        );
+            ['978-2'.\chr(1).'70546817', Isbn::INVALID_CHARACTERS_ERROR],
+        ];
     }
 
     public function getValidIsbn()
@@ -151,9 +151,9 @@ public function testExpectsStringCompatibleType()
      */
     public function testValidIsbn10($isbn)
     {
-        $constraint = new Isbn(array(
+        $constraint = new Isbn([
             'type' => 'isbn10',
-        ));
+        ]);
 
         $this->validator->validate($isbn, $constraint);
 
@@ -165,10 +165,10 @@ public function testValidIsbn10($isbn)
      */
     public function testInvalidIsbn10($isbn, $code)
     {
-        $constraint = new Isbn(array(
+        $constraint = new Isbn([
             'type' => 'isbn10',
             'isbn10Message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($isbn, $constraint);
 
@@ -183,7 +183,7 @@ public function testInvalidIsbn10($isbn, $code)
      */
     public function testValidIsbn13($isbn)
     {
-        $constraint = new Isbn(array('type' => 'isbn13'));
+        $constraint = new Isbn(['type' => 'isbn13']);
 
         $this->validator->validate($isbn, $constraint);
 
@@ -195,10 +195,10 @@ public function testValidIsbn13($isbn)
      */
     public function testInvalidIsbn13($isbn, $code)
     {
-        $constraint = new Isbn(array(
+        $constraint = new Isbn([
             'type' => 'isbn13',
             'isbn13Message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($isbn, $constraint);
 
@@ -225,9 +225,9 @@ public function testValidIsbnAny($isbn)
      */
     public function testInvalidIsbnAnyIsbn10($isbn, $code)
     {
-        $constraint = new Isbn(array(
+        $constraint = new Isbn([
             'bothIsbnMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($isbn, $constraint);
 
@@ -247,9 +247,9 @@ public function testInvalidIsbnAnyIsbn10($isbn, $code)
      */
     public function testInvalidIsbnAnyIsbn13($isbn, $code)
     {
-        $constraint = new Isbn(array(
+        $constraint = new Isbn([
             'bothIsbnMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($isbn, $constraint);
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php
index ca61ffac4c550..c9ca7ade88773 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php
@@ -27,42 +27,42 @@ protected function createValidator()
 
     public function getValidLowerCasedIssn()
     {
-        return array(
-            array('2162-321x'),
-            array('2160-200x'),
-            array('1537-453x'),
-            array('1937-710x'),
-            array('0002-922x'),
-            array('1553-345x'),
-            array('1553-619x'),
-        );
+        return [
+            ['2162-321x'],
+            ['2160-200x'],
+            ['1537-453x'],
+            ['1937-710x'],
+            ['0002-922x'],
+            ['1553-345x'],
+            ['1553-619x'],
+        ];
     }
 
     public function getValidNonHyphenatedIssn()
     {
-        return array(
-            array('2162321X'),
-            array('01896016'),
-            array('15744647'),
-            array('14350645'),
-            array('07174055'),
-            array('20905076'),
-            array('14401592'),
-        );
+        return [
+            ['2162321X'],
+            ['01896016'],
+            ['15744647'],
+            ['14350645'],
+            ['07174055'],
+            ['20905076'],
+            ['14401592'],
+        ];
     }
 
     public function getFullValidIssn()
     {
-        return array(
-            array('1550-7416'),
-            array('1539-8560'),
-            array('2156-5376'),
-            array('1119-023X'),
-            array('1684-5315'),
-            array('1996-0786'),
-            array('1684-5374'),
-            array('1996-0794'),
-        );
+        return [
+            ['1550-7416'],
+            ['1539-8560'],
+            ['2156-5376'],
+            ['1119-023X'],
+            ['1684-5315'],
+            ['1996-0786'],
+            ['1684-5374'],
+            ['1996-0794'],
+        ];
     }
 
     public function getValidIssn()
@@ -76,16 +76,16 @@ public function getValidIssn()
 
     public function getInvalidIssn()
     {
-        return array(
-            array(0, Issn::TOO_SHORT_ERROR),
-            array('1539', Issn::TOO_SHORT_ERROR),
-            array('2156-537A', Issn::INVALID_CHARACTERS_ERROR),
-            array('1119-0231', Issn::CHECKSUM_FAILED_ERROR),
-            array('1684-5312', Issn::CHECKSUM_FAILED_ERROR),
-            array('1996-0783', Issn::CHECKSUM_FAILED_ERROR),
-            array('1684-537X', Issn::CHECKSUM_FAILED_ERROR),
-            array('1996-0795', Issn::CHECKSUM_FAILED_ERROR),
-        );
+        return [
+            [0, Issn::TOO_SHORT_ERROR],
+            ['1539', Issn::TOO_SHORT_ERROR],
+            ['2156-537A', Issn::INVALID_CHARACTERS_ERROR],
+            ['1119-0231', Issn::CHECKSUM_FAILED_ERROR],
+            ['1684-5312', Issn::CHECKSUM_FAILED_ERROR],
+            ['1996-0783', Issn::CHECKSUM_FAILED_ERROR],
+            ['1684-537X', Issn::CHECKSUM_FAILED_ERROR],
+            ['1996-0795', Issn::CHECKSUM_FAILED_ERROR],
+        ];
     }
 
     public function testNullIsValid()
@@ -120,10 +120,10 @@ public function testExpectsStringCompatibleType()
      */
     public function testCaseSensitiveIssns($issn)
     {
-        $constraint = new Issn(array(
+        $constraint = new Issn([
             'caseSensitive' => true,
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($issn, $constraint);
 
@@ -138,10 +138,10 @@ public function testCaseSensitiveIssns($issn)
      */
     public function testRequireHyphenIssns($issn)
     {
-        $constraint = new Issn(array(
+        $constraint = new Issn([
             'requireHyphen' => true,
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($issn, $constraint);
 
@@ -168,9 +168,9 @@ public function testValidIssn($issn)
      */
     public function testInvalidIssn($issn, $code)
     {
-        $constraint = new Issn(array(
+        $constraint = new Issn([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($issn, $constraint);
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LanguageValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LanguageValidatorTest.php
index 2980f2a233193..247301df2e169 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LanguageValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LanguageValidatorTest.php
@@ -57,11 +57,11 @@ public function testValidLanguages($language)
 
     public function getValidLanguages()
     {
-        return array(
-            array('en'),
-            array('en_US'),
-            array('my'),
-        );
+        return [
+            ['en'],
+            ['en_US'],
+            ['my'],
+        ];
     }
 
     /**
@@ -69,9 +69,9 @@ public function getValidLanguages()
      */
     public function testInvalidLanguages($language)
     {
-        $constraint = new Language(array(
+        $constraint = new Language([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($language, $constraint);
 
@@ -83,10 +83,10 @@ public function testInvalidLanguages($language)
 
     public function getInvalidLanguages()
     {
-        return array(
-            array('EN'),
-            array('foobar'),
-        );
+        return [
+            ['EN'],
+            ['foobar'],
+        ];
     }
 
     public function testValidateUsingCountrySpecificLocale()
@@ -96,9 +96,9 @@ public function testValidateUsingCountrySpecificLocale()
         \Locale::setDefault('fr_FR');
         $existingLanguage = 'en';
 
-        $this->validator->validate($existingLanguage, new Language(array(
+        $this->validator->validate($existingLanguage, new Language([
             'message' => 'aMessage',
-        )));
+        ]));
 
         $this->assertNoViolation();
     }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
index da98387ccb466..955d8b556453e 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
@@ -46,50 +46,50 @@ public function testExpectsStringCompatibleType()
 
     public function getThreeOrLessCharacters()
     {
-        return array(
-            array(12),
-            array('12'),
-            array('üü'),
-            array('éé'),
-            array(123),
-            array('123'),
-            array('üüü'),
-            array('ééé'),
-        );
+        return [
+            [12],
+            ['12'],
+            ['üü'],
+            ['éé'],
+            [123],
+            ['123'],
+            ['üüü'],
+            ['ééé'],
+        ];
     }
 
     public function getFourCharacters()
     {
-        return array(
-            array(1234),
-            array('1234'),
-            array('üüüü'),
-            array('éééé'),
-        );
+        return [
+            [1234],
+            ['1234'],
+            ['üüüü'],
+            ['éééé'],
+        ];
     }
 
     public function getFiveOrMoreCharacters()
     {
-        return array(
-            array(12345),
-            array('12345'),
-            array('üüüüü'),
-            array('ééééé'),
-            array(123456),
-            array('123456'),
-            array('üüüüüü'),
-            array('éééééé'),
-        );
+        return [
+            [12345],
+            ['12345'],
+            ['üüüüü'],
+            ['ééééé'],
+            [123456],
+            ['123456'],
+            ['üüüüüü'],
+            ['éééééé'],
+        ];
     }
 
     public function getOneCharset()
     {
-        return array(
-            array('é', 'utf8', true),
-            array("\xE9", 'CP1252', true),
-            array("\xE9", 'XXX', false),
-            array("\xE9", 'utf8', false),
-        );
+        return [
+            ['é', 'utf8', true],
+            ["\xE9", 'CP1252', true],
+            ["\xE9", 'XXX', false],
+            ["\xE9", 'utf8', false],
+        ];
     }
 
     /**
@@ -97,7 +97,7 @@ public function getOneCharset()
      */
     public function testValidValuesMin($value)
     {
-        $constraint = new Length(array('min' => 5));
+        $constraint = new Length(['min' => 5]);
         $this->validator->validate($value, $constraint);
 
         $this->assertNoViolation();
@@ -108,7 +108,7 @@ public function testValidValuesMin($value)
      */
     public function testValidValuesMax($value)
     {
-        $constraint = new Length(array('max' => 3));
+        $constraint = new Length(['max' => 3]);
         $this->validator->validate($value, $constraint);
 
         $this->assertNoViolation();
@@ -130,10 +130,10 @@ public function testValidValuesExact($value)
      */
     public function testInvalidValuesMin($value)
     {
-        $constraint = new Length(array(
+        $constraint = new Length([
             'min' => 4,
             'minMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -151,10 +151,10 @@ public function testInvalidValuesMin($value)
      */
     public function testInvalidValuesMax($value)
     {
-        $constraint = new Length(array(
+        $constraint = new Length([
             'max' => 4,
             'maxMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -172,11 +172,11 @@ public function testInvalidValuesMax($value)
      */
     public function testInvalidValuesExactLessThanFour($value)
     {
-        $constraint = new Length(array(
+        $constraint = new Length([
             'min' => 4,
             'max' => 4,
             'exactMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -194,11 +194,11 @@ public function testInvalidValuesExactLessThanFour($value)
      */
     public function testInvalidValuesExactMoreThanFour($value)
     {
-        $constraint = new Length(array(
+        $constraint = new Length([
             'min' => 4,
             'max' => 4,
             'exactMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -216,12 +216,12 @@ public function testInvalidValuesExactMoreThanFour($value)
      */
     public function testOneCharset($value, $charset, $isValid)
     {
-        $constraint = new Length(array(
+        $constraint = new Length([
             'min' => 1,
             'max' => 1,
             'charset' => $charset,
             'charsetMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php
index f31a50e673c8f..b77deff6163d6 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php
@@ -39,21 +39,21 @@ protected function getErrorCode()
      */
     public function provideValidComparisons()
     {
-        return array(
-            array(1, 2),
-            array(1, 1),
-            array(new \DateTime('2000-01-01'), new \DateTime('2000-01-01')),
-            array(new \DateTime('2000-01-01'), new \DateTime('2020-01-01')),
-            array(new \DateTime('2000-01-01'), '2000-01-01'),
-            array(new \DateTime('2000-01-01'), '2020-01-01'),
-            array(new \DateTime('2000-01-01 UTC'), '2000-01-01 UTC'),
-            array(new \DateTime('2000-01-01 UTC'), '2020-01-01 UTC'),
-            array(new ComparisonTest_Class(4), new ComparisonTest_Class(5)),
-            array(new ComparisonTest_Class(5), new ComparisonTest_Class(5)),
-            array('a', 'a'),
-            array('a', 'z'),
-            array(null, 1),
-        );
+        return [
+            [1, 2],
+            [1, 1],
+            [new \DateTime('2000-01-01'), new \DateTime('2000-01-01')],
+            [new \DateTime('2000-01-01'), new \DateTime('2020-01-01')],
+            [new \DateTime('2000-01-01'), '2000-01-01'],
+            [new \DateTime('2000-01-01'), '2020-01-01'],
+            [new \DateTime('2000-01-01 UTC'), '2000-01-01 UTC'],
+            [new \DateTime('2000-01-01 UTC'), '2020-01-01 UTC'],
+            [new ComparisonTest_Class(4), new ComparisonTest_Class(5)],
+            [new ComparisonTest_Class(5), new ComparisonTest_Class(5)],
+            ['a', 'a'],
+            ['a', 'z'],
+            [null, 1],
+        ];
     }
 
     /**
@@ -61,10 +61,10 @@ public function provideValidComparisons()
      */
     public function provideValidComparisonsToPropertyPath()
     {
-        return array(
-            array(4),
-            array(5),
-        );
+        return [
+            [4],
+            [5],
+        ];
     }
 
     /**
@@ -72,13 +72,13 @@ public function provideValidComparisonsToPropertyPath()
      */
     public function provideInvalidComparisons()
     {
-        return array(
-            array(2, '2', 1, '1', 'integer'),
-            array(new \DateTime('2010-01-01'), 'Jan 1, 2010, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2010-01-01'), 'Jan 1, 2010, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2010-01-01 UTC'), 'Jan 1, 2010, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array(new ComparisonTest_Class(5), '5', new ComparisonTest_Class(4), '4', __NAMESPACE__.'\ComparisonTest_Class'),
-            array('c', '"c"', 'b', '"b"', 'string'),
-        );
+        return [
+            [2, '2', 1, '1', 'integer'],
+            [new \DateTime('2010-01-01'), 'Jan 1, 2010, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [new \DateTime('2010-01-01'), 'Jan 1, 2010, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [new \DateTime('2010-01-01 UTC'), 'Jan 1, 2010, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [new ComparisonTest_Class(5), '5', new ComparisonTest_Class(4), '4', __NAMESPACE__.'\ComparisonTest_Class'],
+            ['c', '"c"', 'b', '"b"', 'string'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php
index a5d69355d7e58..7d209ed5d4719 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php
@@ -39,15 +39,15 @@ protected function getErrorCode()
      */
     public function provideValidComparisons()
     {
-        return array(
-            array(1, 2),
-            array(new \DateTime('2000-01-01'), new \DateTime('2010-01-01')),
-            array(new \DateTime('2000-01-01'), '2010-01-01'),
-            array(new \DateTime('2000-01-01 UTC'), '2010-01-01 UTC'),
-            array(new ComparisonTest_Class(4), new ComparisonTest_Class(5)),
-            array('22', '333'),
-            array(null, 1),
-        );
+        return [
+            [1, 2],
+            [new \DateTime('2000-01-01'), new \DateTime('2010-01-01')],
+            [new \DateTime('2000-01-01'), '2010-01-01'],
+            [new \DateTime('2000-01-01 UTC'), '2010-01-01 UTC'],
+            [new ComparisonTest_Class(4), new ComparisonTest_Class(5)],
+            ['22', '333'],
+            [null, 1],
+        ];
     }
 
     /**
@@ -55,9 +55,9 @@ public function provideValidComparisons()
      */
     public function provideValidComparisonsToPropertyPath()
     {
-        return array(
-            array(4),
-        );
+        return [
+            [4],
+        ];
     }
 
     /**
@@ -65,18 +65,18 @@ public function provideValidComparisonsToPropertyPath()
      */
     public function provideInvalidComparisons()
     {
-        return array(
-            array(3, '3', 2, '2', 'integer'),
-            array(2, '2', 2, '2', 'integer'),
-            array(new \DateTime('2010-01-01'), 'Jan 1, 2010, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2010-01-01'), 'Jan 1, 2010, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2010-01-01 UTC'), 'Jan 1, 2010, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2000-01-01 UTC'), 'Jan 1, 2000, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array(new ComparisonTest_Class(5), '5', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'),
-            array(new ComparisonTest_Class(6), '6', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'),
-            array('333', '"333"', '22', '"22"', 'string'),
-        );
+        return [
+            [3, '3', 2, '2', 'integer'],
+            [2, '2', 2, '2', 'integer'],
+            [new \DateTime('2010-01-01'), 'Jan 1, 2010, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [new \DateTime('2010-01-01'), 'Jan 1, 2010, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [new \DateTime('2010-01-01 UTC'), 'Jan 1, 2010, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [new \DateTime('2000-01-01 UTC'), 'Jan 1, 2000, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [new ComparisonTest_Class(5), '5', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'],
+            [new ComparisonTest_Class(6), '6', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'],
+            ['333', '"333"', '22', '"22"', 'string'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LuhnValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LuhnValidatorTest.php
index 3ee04d7f46820..02aae3adbc317 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LuhnValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LuhnValidatorTest.php
@@ -48,26 +48,26 @@ public function testValidNumbers($number)
 
     public function getValidNumbers()
     {
-        return array(
-            array('42424242424242424242'),
-            array('378282246310005'),
-            array('371449635398431'),
-            array('378734493671000'),
-            array('5610591081018250'),
-            array('30569309025904'),
-            array('38520000023237'),
-            array('6011111111111117'),
-            array('6011000990139424'),
-            array('3530111333300000'),
-            array('3566002020360505'),
-            array('5555555555554444'),
-            array('5105105105105100'),
-            array('4111111111111111'),
-            array('4012888888881881'),
-            array('4222222222222'),
-            array('5019717010103742'),
-            array('6331101999990016'),
-        );
+        return [
+            ['42424242424242424242'],
+            ['378282246310005'],
+            ['371449635398431'],
+            ['378734493671000'],
+            ['5610591081018250'],
+            ['30569309025904'],
+            ['38520000023237'],
+            ['6011111111111117'],
+            ['6011000990139424'],
+            ['3530111333300000'],
+            ['3566002020360505'],
+            ['5555555555554444'],
+            ['5105105105105100'],
+            ['4111111111111111'],
+            ['4012888888881881'],
+            ['4222222222222'],
+            ['5019717010103742'],
+            ['6331101999990016'],
+        ];
     }
 
     /**
@@ -75,9 +75,9 @@ public function getValidNumbers()
      */
     public function testInvalidNumbers($number, $code)
     {
-        $constraint = new Luhn(array(
+        $constraint = new Luhn([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($number, $constraint);
 
@@ -89,13 +89,13 @@ public function testInvalidNumbers($number, $code)
 
     public function getInvalidNumbers()
     {
-        return array(
-            array('1234567812345678', Luhn::CHECKSUM_FAILED_ERROR),
-            array('4222222222222222', Luhn::CHECKSUM_FAILED_ERROR),
-            array('0000000000000000', Luhn::CHECKSUM_FAILED_ERROR),
-            array('000000!000000000', Luhn::INVALID_CHARACTERS_ERROR),
-            array('42-22222222222222', Luhn::INVALID_CHARACTERS_ERROR),
-        );
+        return [
+            ['1234567812345678', Luhn::CHECKSUM_FAILED_ERROR],
+            ['4222222222222222', Luhn::CHECKSUM_FAILED_ERROR],
+            ['0000000000000000', Luhn::CHECKSUM_FAILED_ERROR],
+            ['000000!000000000', Luhn::INVALID_CHARACTERS_ERROR],
+            ['42-22222222222222', Luhn::INVALID_CHARACTERS_ERROR],
+        ];
     }
 
     /**
@@ -111,12 +111,12 @@ public function testInvalidTypes($number)
 
     public function getInvalidTypes()
     {
-        return array(
-            array(0),
-            array(123),
-            array(42424242424242424242),
-            array(378282246310005),
-            array(371449635398431),
-        );
+        return [
+            [0],
+            [123],
+            [42424242424242424242],
+            [378282246310005],
+            [371449635398431],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/NotBlankValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/NotBlankValidatorTest.php
index fd92febf9b29b..f634e0c11c248 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/NotBlankValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/NotBlankValidatorTest.php
@@ -34,20 +34,20 @@ public function testValidValues($value)
 
     public function getValidValues()
     {
-        return array(
-            array('foobar'),
-            array(0),
-            array(0.0),
-            array('0'),
-            array(1234),
-        );
+        return [
+            ['foobar'],
+            [0],
+            [0.0],
+            ['0'],
+            [1234],
+        ];
     }
 
     public function testNullIsInvalid()
     {
-        $constraint = new NotBlank(array(
+        $constraint = new NotBlank([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate(null, $constraint);
 
@@ -59,9 +59,9 @@ public function testNullIsInvalid()
 
     public function testBlankIsInvalid()
     {
-        $constraint = new NotBlank(array(
+        $constraint = new NotBlank([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate('', $constraint);
 
@@ -73,9 +73,9 @@ public function testBlankIsInvalid()
 
     public function testFalseIsInvalid()
     {
-        $constraint = new NotBlank(array(
+        $constraint = new NotBlank([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate(false, $constraint);
 
@@ -87,11 +87,11 @@ public function testFalseIsInvalid()
 
     public function testEmptyArrayIsInvalid()
     {
-        $constraint = new NotBlank(array(
+        $constraint = new NotBlank([
             'message' => 'myMessage',
-        ));
+        ]);
 
-        $this->validator->validate(array(), $constraint);
+        $this->validator->validate([], $constraint);
 
         $this->buildViolation('myMessage')
             ->setParameter('{{ value }}', 'array')
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php
index e7031d4c4dfd8..810f7a175f104 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php
@@ -39,15 +39,15 @@ protected function getErrorCode()
      */
     public function provideValidComparisons()
     {
-        return array(
-            array(1, 2),
-            array('22', '333'),
-            array(new \DateTime('2001-01-01'), new \DateTime('2000-01-01')),
-            array(new \DateTime('2001-01-01'), '2000-01-01'),
-            array(new \DateTime('2001-01-01 UTC'), '2000-01-01 UTC'),
-            array(new ComparisonTest_Class(6), new ComparisonTest_Class(5)),
-            array(null, 1),
-        );
+        return [
+            [1, 2],
+            ['22', '333'],
+            [new \DateTime('2001-01-01'), new \DateTime('2000-01-01')],
+            [new \DateTime('2001-01-01'), '2000-01-01'],
+            [new \DateTime('2001-01-01 UTC'), '2000-01-01 UTC'],
+            [new ComparisonTest_Class(6), new ComparisonTest_Class(5)],
+            [null, 1],
+        ];
     }
 
     /**
@@ -55,9 +55,9 @@ public function provideValidComparisons()
      */
     public function provideValidComparisonsToPropertyPath()
     {
-        return array(
-            array(0),
-        );
+        return [
+            [0],
+        ];
     }
 
     /**
@@ -65,14 +65,14 @@ public function provideValidComparisonsToPropertyPath()
      */
     public function provideInvalidComparisons()
     {
-        return array(
-            array(3, '3', 3, '3', 'integer'),
-            array('2', '"2"', 2, '2', 'integer'),
-            array('a', '"a"', 'a', '"a"', 'string'),
-            array(new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array(new \DateTime('2000-01-01 UTC'), 'Jan 1, 2000, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array(new ComparisonTest_Class(5), '5', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'),
-        );
+        return [
+            [3, '3', 3, '3', 'integer'],
+            ['2', '"2"', 2, '2', 'integer'],
+            ['a', '"a"', 'a', '"a"', 'string'],
+            [new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [new \DateTime('2000-01-01 UTC'), 'Jan 1, 2000, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [new ComparisonTest_Class(5), '5', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/NotIdenticalToValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/NotIdenticalToValidatorTest.php
index 907f36c063290..0cb9ec543114c 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/NotIdenticalToValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/NotIdenticalToValidatorTest.php
@@ -39,18 +39,18 @@ protected function getErrorCode()
      */
     public function provideValidComparisons()
     {
-        return array(
-            array(1, 2),
-            array('2', 2),
-            array('22', '333'),
-            array(new \DateTime('2001-01-01'), new \DateTime('2000-01-01')),
-            array(new \DateTime('2000-01-01'), new \DateTime('2000-01-01')),
-            array(new \DateTime('2001-01-01'), '2000-01-01'),
-            array(new \DateTime('2000-01-01'), '2000-01-01'),
-            array(new \DateTime('2001-01-01'), '2000-01-01'),
-            array(new \DateTime('2000-01-01 UTC'), '2000-01-01 UTC'),
-            array(null, 1),
-        );
+        return [
+            [1, 2],
+            ['2', 2],
+            ['22', '333'],
+            [new \DateTime('2001-01-01'), new \DateTime('2000-01-01')],
+            [new \DateTime('2000-01-01'), new \DateTime('2000-01-01')],
+            [new \DateTime('2001-01-01'), '2000-01-01'],
+            [new \DateTime('2000-01-01'), '2000-01-01'],
+            [new \DateTime('2001-01-01'), '2000-01-01'],
+            [new \DateTime('2000-01-01 UTC'), '2000-01-01 UTC'],
+            [null, 1],
+        ];
     }
 
     /**
@@ -58,9 +58,9 @@ public function provideValidComparisons()
      */
     public function provideValidComparisonsToPropertyPath()
     {
-        return array(
-            array(0),
-        );
+        return [
+            [0],
+        ];
     }
 
     public function provideAllInvalidComparisons()
@@ -84,12 +84,12 @@ public function provideInvalidComparisons()
         $date = new \DateTime('2000-01-01');
         $object = new ComparisonTest_Class(2);
 
-        $comparisons = array(
-            array(3, '3', 3, '3', 'integer'),
-            array('a', '"a"', 'a', '"a"', 'string'),
-            array($date, 'Jan 1, 2000, 12:00 AM', $date, 'Jan 1, 2000, 12:00 AM', 'DateTime'),
-            array($object, '2', $object, '2', __NAMESPACE__.'\ComparisonTest_Class'),
-        );
+        $comparisons = [
+            [3, '3', 3, '3', 'integer'],
+            ['a', '"a"', 'a', '"a"', 'string'],
+            [$date, 'Jan 1, 2000, 12:00 AM', $date, 'Jan 1, 2000, 12:00 AM', 'DateTime'],
+            [$object, '2', $object, '2', __NAMESPACE__.'\ComparisonTest_Class'],
+        ];
 
         return $comparisons;
     }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/NotNullValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/NotNullValidatorTest.php
index feb3c2f8e787f..a726d063b9931 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/NotNullValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/NotNullValidatorTest.php
@@ -34,19 +34,19 @@ public function testValidValues($value)
 
     public function getValidValues()
     {
-        return array(
-            array(0),
-            array(false),
-            array(true),
-            array(''),
-        );
+        return [
+            [0],
+            [false],
+            [true],
+            [''],
+        ];
     }
 
     public function testNullIsInvalid()
     {
-        $constraint = new NotNull(array(
+        $constraint = new NotNull([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate(null, $constraint);
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/RangeValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/RangeValidatorTest.php
index 7eb931ee92039..661161d886a20 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/RangeValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/RangeValidatorTest.php
@@ -25,43 +25,43 @@ protected function createValidator()
 
     public function testNullIsValid()
     {
-        $this->validator->validate(null, new Range(array('min' => 10, 'max' => 20)));
+        $this->validator->validate(null, new Range(['min' => 10, 'max' => 20]));
 
         $this->assertNoViolation();
     }
 
     public function getTenToTwenty()
     {
-        return array(
-            array(10.00001),
-            array(19.99999),
-            array('10.00001'),
-            array('19.99999'),
-            array(10),
-            array(20),
-            array(10.0),
-            array(20.0),
-        );
+        return [
+            [10.00001],
+            [19.99999],
+            ['10.00001'],
+            ['19.99999'],
+            [10],
+            [20],
+            [10.0],
+            [20.0],
+        ];
     }
 
     public function getLessThanTen()
     {
-        return array(
-            array(9.99999, '9.99999'),
-            array('9.99999', '"9.99999"'),
-            array(5, '5'),
-            array(1.0, '1.0'),
-        );
+        return [
+            [9.99999, '9.99999'],
+            ['9.99999', '"9.99999"'],
+            [5, '5'],
+            [1.0, '1.0'],
+        ];
     }
 
     public function getMoreThanTwenty()
     {
-        return array(
-            array(20.000001, '20.000001'),
-            array('20.000001', '"20.000001"'),
-            array(21, '21'),
-            array(30.0, '30.0'),
-        );
+        return [
+            [20.000001, '20.000001'],
+            ['20.000001', '"20.000001"'],
+            [21, '21'],
+            [30.0, '30.0'],
+        ];
     }
 
     /**
@@ -69,7 +69,7 @@ public function getMoreThanTwenty()
      */
     public function testValidValuesMin($value)
     {
-        $constraint = new Range(array('min' => 10));
+        $constraint = new Range(['min' => 10]);
         $this->validator->validate($value, $constraint);
 
         $this->assertNoViolation();
@@ -80,7 +80,7 @@ public function testValidValuesMin($value)
      */
     public function testValidValuesMax($value)
     {
-        $constraint = new Range(array('max' => 20));
+        $constraint = new Range(['max' => 20]);
         $this->validator->validate($value, $constraint);
 
         $this->assertNoViolation();
@@ -91,7 +91,7 @@ public function testValidValuesMax($value)
      */
     public function testValidValuesMinMax($value)
     {
-        $constraint = new Range(array('min' => 10, 'max' => 20));
+        $constraint = new Range(['min' => 10, 'max' => 20]);
         $this->validator->validate($value, $constraint);
 
         $this->assertNoViolation();
@@ -102,10 +102,10 @@ public function testValidValuesMinMax($value)
      */
     public function testInvalidValuesMin($value, $formattedValue)
     {
-        $constraint = new Range(array(
+        $constraint = new Range([
             'min' => 10,
             'minMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -121,10 +121,10 @@ public function testInvalidValuesMin($value, $formattedValue)
      */
     public function testInvalidValuesMax($value, $formattedValue)
     {
-        $constraint = new Range(array(
+        $constraint = new Range([
             'max' => 20,
             'maxMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -140,12 +140,12 @@ public function testInvalidValuesMax($value, $formattedValue)
      */
     public function testInvalidValuesCombinedMax($value, $formattedValue)
     {
-        $constraint = new Range(array(
+        $constraint = new Range([
             'min' => 10,
             'max' => 20,
             'minMessage' => 'myMinMessage',
             'maxMessage' => 'myMaxMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -161,12 +161,12 @@ public function testInvalidValuesCombinedMax($value, $formattedValue)
      */
     public function testInvalidValuesCombinedMin($value, $formattedValue)
     {
-        $constraint = new Range(array(
+        $constraint = new Range([
             'min' => 10,
             'max' => 20,
             'minMessage' => 'myMinMessage',
             'maxMessage' => 'myMaxMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -183,15 +183,15 @@ public function getTenthToTwentiethMarch2014()
         // the default timezone
         $this->setDefaultTimezone('UTC');
 
-        $tests = array(
-            array(new \DateTime('March 10, 2014')),
-            array(new \DateTime('March 15, 2014')),
-            array(new \DateTime('March 20, 2014')),
-        );
+        $tests = [
+            [new \DateTime('March 10, 2014')],
+            [new \DateTime('March 15, 2014')],
+            [new \DateTime('March 20, 2014')],
+        ];
 
-        $tests[] = array(new \DateTimeImmutable('March 10, 2014'));
-        $tests[] = array(new \DateTimeImmutable('March 15, 2014'));
-        $tests[] = array(new \DateTimeImmutable('March 20, 2014'));
+        $tests[] = [new \DateTimeImmutable('March 10, 2014')];
+        $tests[] = [new \DateTimeImmutable('March 15, 2014')];
+        $tests[] = [new \DateTimeImmutable('March 20, 2014')];
 
         $this->restoreDefaultTimezone();
 
@@ -204,13 +204,13 @@ public function getSoonerThanTenthMarch2014()
         // the default timezone
         $this->setDefaultTimezone('UTC');
 
-        $tests = array(
-            array(new \DateTime('March 20, 2013'), 'Mar 20, 2013, 12:00 AM'),
-            array(new \DateTime('March 9, 2014'), 'Mar 9, 2014, 12:00 AM'),
-        );
+        $tests = [
+            [new \DateTime('March 20, 2013'), 'Mar 20, 2013, 12:00 AM'],
+            [new \DateTime('March 9, 2014'), 'Mar 9, 2014, 12:00 AM'],
+        ];
 
-        $tests[] = array(new \DateTimeImmutable('March 20, 2013'), 'Mar 20, 2013, 12:00 AM');
-        $tests[] = array(new \DateTimeImmutable('March 9, 2014'), 'Mar 9, 2014, 12:00 AM');
+        $tests[] = [new \DateTimeImmutable('March 20, 2013'), 'Mar 20, 2013, 12:00 AM'];
+        $tests[] = [new \DateTimeImmutable('March 9, 2014'), 'Mar 9, 2014, 12:00 AM'];
 
         $this->restoreDefaultTimezone();
 
@@ -223,13 +223,13 @@ public function getLaterThanTwentiethMarch2014()
         // the default timezone
         $this->setDefaultTimezone('UTC');
 
-        $tests = array(
-            array(new \DateTime('March 21, 2014'), 'Mar 21, 2014, 12:00 AM'),
-            array(new \DateTime('March 9, 2015'), 'Mar 9, 2015, 12:00 AM'),
-        );
+        $tests = [
+            [new \DateTime('March 21, 2014'), 'Mar 21, 2014, 12:00 AM'],
+            [new \DateTime('March 9, 2015'), 'Mar 9, 2015, 12:00 AM'],
+        ];
 
-        $tests[] = array(new \DateTimeImmutable('March 21, 2014'), 'Mar 21, 2014, 12:00 AM');
-        $tests[] = array(new \DateTimeImmutable('March 9, 2015'), 'Mar 9, 2015, 12:00 AM');
+        $tests[] = [new \DateTimeImmutable('March 21, 2014'), 'Mar 21, 2014, 12:00 AM'];
+        $tests[] = [new \DateTimeImmutable('March 9, 2015'), 'Mar 9, 2015, 12:00 AM'];
 
         $this->restoreDefaultTimezone();
 
@@ -241,7 +241,7 @@ public function getLaterThanTwentiethMarch2014()
      */
     public function testValidDatesMin($value)
     {
-        $constraint = new Range(array('min' => 'March 10, 2014'));
+        $constraint = new Range(['min' => 'March 10, 2014']);
         $this->validator->validate($value, $constraint);
 
         $this->assertNoViolation();
@@ -252,7 +252,7 @@ public function testValidDatesMin($value)
      */
     public function testValidDatesMax($value)
     {
-        $constraint = new Range(array('max' => 'March 20, 2014'));
+        $constraint = new Range(['max' => 'March 20, 2014']);
         $this->validator->validate($value, $constraint);
 
         $this->assertNoViolation();
@@ -263,7 +263,7 @@ public function testValidDatesMax($value)
      */
     public function testValidDatesMinMax($value)
     {
-        $constraint = new Range(array('min' => 'March 10, 2014', 'max' => 'March 20, 2014'));
+        $constraint = new Range(['min' => 'March 10, 2014', 'max' => 'March 20, 2014']);
         $this->validator->validate($value, $constraint);
 
         $this->assertNoViolation();
@@ -278,10 +278,10 @@ public function testInvalidDatesMin($value, $dateTimeAsString)
         // Make sure we have the correct version loaded
         IntlTestHelper::requireIntl($this, '57.1');
 
-        $constraint = new Range(array(
+        $constraint = new Range([
             'min' => 'March 10, 2014',
             'minMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -301,10 +301,10 @@ public function testInvalidDatesMax($value, $dateTimeAsString)
         // Make sure we have the correct version loaded
         IntlTestHelper::requireIntl($this, '57.1');
 
-        $constraint = new Range(array(
+        $constraint = new Range([
             'max' => 'March 20, 2014',
             'maxMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -324,12 +324,12 @@ public function testInvalidDatesCombinedMax($value, $dateTimeAsString)
         // Make sure we have the correct version loaded
         IntlTestHelper::requireIntl($this, '57.1');
 
-        $constraint = new Range(array(
+        $constraint = new Range([
             'min' => 'March 10, 2014',
             'max' => 'March 20, 2014',
             'minMessage' => 'myMinMessage',
             'maxMessage' => 'myMaxMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -349,12 +349,12 @@ public function testInvalidDatesCombinedMin($value, $dateTimeAsString)
         // Make sure we have the correct version loaded
         IntlTestHelper::requireIntl($this, '57.1');
 
-        $constraint = new Range(array(
+        $constraint = new Range([
             'min' => 'March 10, 2014',
             'max' => 'March 20, 2014',
             'minMessage' => 'myMinMessage',
             'maxMessage' => 'myMaxMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -367,22 +367,22 @@ public function testInvalidDatesCombinedMin($value, $dateTimeAsString)
 
     public function getInvalidValues()
     {
-        return array(
-            array(9.999999),
-            array(20.000001),
-            array('9.999999'),
-            array('20.000001'),
-            array(new \stdClass()),
-        );
+        return [
+            [9.999999],
+            [20.000001],
+            ['9.999999'],
+            ['20.000001'],
+            [new \stdClass()],
+        ];
     }
 
     public function testNonNumeric()
     {
-        $this->validator->validate('abcd', new Range(array(
+        $this->validator->validate('abcd', new Range([
             'min' => 10,
             'max' => 20,
             'invalidMessage' => 'myMessage',
-        )));
+        ]));
 
         $this->buildViolation('myMessage')
             ->setParameter('{{ value }}', '"abcd"')
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/RegexTest.php b/src/Symfony/Component/Validator/Tests/Constraints/RegexTest.php
index 26ef1b27361ad..8dc1e4af7dea8 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/RegexTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/RegexTest.php
@@ -28,37 +28,37 @@ public function testConstraintGetDefaultOption()
 
     public function provideHtmlPatterns()
     {
-        return array(
+        return [
             // HTML5 wraps the pattern in ^(?:pattern)$
-            array('/^[0-9]+$/', '[0-9]+'),
-            array('/[0-9]+$/', '.*[0-9]+'),
-            array('/^[0-9]+/', '[0-9]+.*'),
-            array('/[0-9]+/', '.*[0-9]+.*'),
+            ['/^[0-9]+$/', '[0-9]+'],
+            ['/[0-9]+$/', '.*[0-9]+'],
+            ['/^[0-9]+/', '[0-9]+.*'],
+            ['/[0-9]+/', '.*[0-9]+.*'],
             // We need a smart way to allow matching of patterns that contain
             // ^ and $ at various sub-clauses of an or-clause
             // .*(pattern).* seems to work correctly
-            array('/[0-9]$|[a-z]+/', '.*([0-9]$|[a-z]+).*'),
-            array('/[0-9]$|^[a-z]+/', '.*([0-9]$|^[a-z]+).*'),
-            array('/^[0-9]|[a-z]+$/', '.*(^[0-9]|[a-z]+$).*'),
+            ['/[0-9]$|[a-z]+/', '.*([0-9]$|[a-z]+).*'],
+            ['/[0-9]$|^[a-z]+/', '.*([0-9]$|^[a-z]+).*'],
+            ['/^[0-9]|[a-z]+$/', '.*(^[0-9]|[a-z]+$).*'],
             // Unescape escaped delimiters
-            array('/^[0-9]+\/$/', '[0-9]+/'),
-            array('#^[0-9]+\#$#', '[0-9]+#'),
+            ['/^[0-9]+\/$/', '[0-9]+/'],
+            ['#^[0-9]+\#$#', '[0-9]+#'],
             // Cannot be converted
-            array('/^[0-9]+$/i', null),
+            ['/^[0-9]+$/i', null],
 
             // Inverse matches are simple, just wrap in
             // ((?!pattern).)*
-            array('/^[0-9]+$/', '((?!^[0-9]+$).)*', false),
-            array('/[0-9]+$/', '((?![0-9]+$).)*', false),
-            array('/^[0-9]+/', '((?!^[0-9]+).)*', false),
-            array('/[0-9]+/', '((?![0-9]+).)*', false),
-            array('/[0-9]$|[a-z]+/', '((?![0-9]$|[a-z]+).)*', false),
-            array('/[0-9]$|^[a-z]+/', '((?![0-9]$|^[a-z]+).)*', false),
-            array('/^[0-9]|[a-z]+$/', '((?!^[0-9]|[a-z]+$).)*', false),
-            array('/^[0-9]+\/$/', '((?!^[0-9]+/$).)*', false),
-            array('#^[0-9]+\#$#', '((?!^[0-9]+#$).)*', false),
-            array('/^[0-9]+$/i', null, false),
-        );
+            ['/^[0-9]+$/', '((?!^[0-9]+$).)*', false],
+            ['/[0-9]+$/', '((?![0-9]+$).)*', false],
+            ['/^[0-9]+/', '((?!^[0-9]+).)*', false],
+            ['/[0-9]+/', '((?![0-9]+).)*', false],
+            ['/[0-9]$|[a-z]+/', '((?![0-9]$|[a-z]+).)*', false],
+            ['/[0-9]$|^[a-z]+/', '((?![0-9]$|^[a-z]+).)*', false],
+            ['/^[0-9]|[a-z]+$/', '((?!^[0-9]|[a-z]+$).)*', false],
+            ['/^[0-9]+\/$/', '((?!^[0-9]+/$).)*', false],
+            ['#^[0-9]+\#$#', '((?!^[0-9]+#$).)*', false],
+            ['/^[0-9]+$/i', null, false],
+        ];
     }
 
     /**
@@ -66,10 +66,10 @@ public function provideHtmlPatterns()
      */
     public function testGetHtmlPattern($pattern, $htmlPattern, $match = true)
     {
-        $constraint = new Regex(array(
+        $constraint = new Regex([
             'pattern' => $pattern,
             'match' => $match,
-        ));
+        ]);
 
         $this->assertSame($pattern, $constraint->pattern);
         $this->assertSame($htmlPattern, $constraint->getHtmlPattern());
@@ -77,10 +77,10 @@ public function testGetHtmlPattern($pattern, $htmlPattern, $match = true)
 
     public function testGetCustomHtmlPattern()
     {
-        $constraint = new Regex(array(
+        $constraint = new Regex([
             'pattern' => '((?![0-9]$|[a-z]+).)*',
             'htmlPattern' => 'foobar',
-        ));
+        ]);
 
         $this->assertSame('((?![0-9]$|[a-z]+).)*', $constraint->pattern);
         $this->assertSame('foobar', $constraint->getHtmlPattern());
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php
index 5194b0816ea39..55e739b036884 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php
@@ -24,14 +24,14 @@ protected function createValidator()
 
     public function testNullIsValid()
     {
-        $this->validator->validate(null, new Regex(array('pattern' => '/^[0-9]+$/')));
+        $this->validator->validate(null, new Regex(['pattern' => '/^[0-9]+$/']));
 
         $this->assertNoViolation();
     }
 
     public function testEmptyStringIsValid()
     {
-        $this->validator->validate('', new Regex(array('pattern' => '/^[0-9]+$/')));
+        $this->validator->validate('', new Regex(['pattern' => '/^[0-9]+$/']));
 
         $this->assertNoViolation();
     }
@@ -41,7 +41,7 @@ public function testEmptyStringIsValid()
      */
     public function testExpectsStringCompatibleType()
     {
-        $this->validator->validate(new \stdClass(), new Regex(array('pattern' => '/^[0-9]+$/')));
+        $this->validator->validate(new \stdClass(), new Regex(['pattern' => '/^[0-9]+$/']));
     }
 
     /**
@@ -49,7 +49,7 @@ public function testExpectsStringCompatibleType()
      */
     public function testValidValues($value)
     {
-        $constraint = new Regex(array('pattern' => '/^[0-9]+$/'));
+        $constraint = new Regex(['pattern' => '/^[0-9]+$/']);
         $this->validator->validate($value, $constraint);
 
         $this->assertNoViolation();
@@ -57,12 +57,12 @@ public function testValidValues($value)
 
     public function getValidValues()
     {
-        return array(
-            array(0),
-            array('0'),
-            array('090909'),
-            array(90909),
-        );
+        return [
+            [0],
+            ['0'],
+            ['090909'],
+            [90909],
+        ];
     }
 
     /**
@@ -70,10 +70,10 @@ public function getValidValues()
      */
     public function testInvalidValues($value)
     {
-        $constraint = new Regex(array(
+        $constraint = new Regex([
             'pattern' => '/^[0-9]+$/',
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -85,9 +85,9 @@ public function testInvalidValues($value)
 
     public function getInvalidValues()
     {
-        return array(
-            array('abcd'),
-            array('090foo'),
-        );
+        return [
+            ['abcd'],
+            ['090foo'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php
index a22251d0ee3c5..fe22e9673b7ca 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php
@@ -63,11 +63,11 @@ public function testValidTimes($time)
 
     public function getValidTimes()
     {
-        return array(
-            array('01:02:03'),
-            array('00:00:00'),
-            array('23:59:59'),
-        );
+        return [
+            ['01:02:03'],
+            ['00:00:00'],
+            ['23:59:59'],
+        ];
     }
 
     /**
@@ -75,9 +75,9 @@ public function getValidTimes()
      */
     public function testInvalidTimes($time, $code)
     {
-        $constraint = new Time(array(
+        $constraint = new Time([
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($time, $constraint);
 
@@ -89,15 +89,15 @@ public function testInvalidTimes($time, $code)
 
     public function getInvalidTimes()
     {
-        return array(
-            array('foobar', Time::INVALID_FORMAT_ERROR),
-            array('foobar 12:34:56', Time::INVALID_FORMAT_ERROR),
-            array('12:34:56 foobar', Time::INVALID_FORMAT_ERROR),
-            array('00:00', Time::INVALID_FORMAT_ERROR),
-            array('24:00:00', Time::INVALID_TIME_ERROR),
-            array('00:60:00', Time::INVALID_TIME_ERROR),
-            array('00:00:60', Time::INVALID_TIME_ERROR),
-        );
+        return [
+            ['foobar', Time::INVALID_FORMAT_ERROR],
+            ['foobar 12:34:56', Time::INVALID_FORMAT_ERROR],
+            ['12:34:56 foobar', Time::INVALID_FORMAT_ERROR],
+            ['00:00', Time::INVALID_FORMAT_ERROR],
+            ['24:00:00', Time::INVALID_TIME_ERROR],
+            ['00:60:00', Time::INVALID_TIME_ERROR],
+            ['00:00:60', Time::INVALID_TIME_ERROR],
+        ];
     }
 
     public function testDateTimeImmutableIsValid()
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/TypeValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/TypeValidatorTest.php
index 86ce972a466b0..17334bea7925a 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/TypeValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/TypeValidatorTest.php
@@ -26,7 +26,7 @@ protected function createValidator()
 
     public function testNullIsValid()
     {
-        $constraint = new Type(array('type' => 'integer'));
+        $constraint = new Type(['type' => 'integer']);
 
         $this->validator->validate(null, $constraint);
 
@@ -35,7 +35,7 @@ public function testNullIsValid()
 
     public function testEmptyIsValidIfString()
     {
-        $constraint = new Type(array('type' => 'string'));
+        $constraint = new Type(['type' => 'string']);
 
         $this->validator->validate('', $constraint);
 
@@ -44,10 +44,10 @@ public function testEmptyIsValidIfString()
 
     public function testEmptyIsInvalidIfNoString()
     {
-        $constraint = new Type(array(
+        $constraint = new Type([
             'type' => 'integer',
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate('', $constraint);
 
@@ -63,7 +63,7 @@ public function testEmptyIsInvalidIfNoString()
      */
     public function testValidValues($value, $type)
     {
-        $constraint = new Type(array('type' => $type));
+        $constraint = new Type(['type' => $type]);
 
         $this->validator->validate($value, $constraint);
 
@@ -75,36 +75,36 @@ public function getValidValues()
         $object = new \stdClass();
         $file = $this->createFile();
 
-        return array(
-            array(true, 'Boolean'),
-            array(false, 'Boolean'),
-            array(true, 'boolean'),
-            array(false, 'boolean'),
-            array(true, 'bool'),
-            array(false, 'bool'),
-            array(0, 'numeric'),
-            array('0', 'numeric'),
-            array(1.5, 'numeric'),
-            array('1.5', 'numeric'),
-            array(0, 'integer'),
-            array(1.5, 'float'),
-            array('12345', 'string'),
-            array(array(), 'array'),
-            array($object, 'object'),
-            array($object, 'stdClass'),
-            array($file, 'resource'),
-            array('12345', 'digit'),
-            array('12a34', 'alnum'),
-            array('abcde', 'alpha'),
-            array("\n\r\t", 'cntrl'),
-            array('arf12', 'graph'),
-            array('abcde', 'lower'),
-            array('ABCDE', 'upper'),
-            array('arf12', 'print'),
-            array('*&$()', 'punct'),
-            array("\n\r\t", 'space'),
-            array('AB10BC99', 'xdigit'),
-        );
+        return [
+            [true, 'Boolean'],
+            [false, 'Boolean'],
+            [true, 'boolean'],
+            [false, 'boolean'],
+            [true, 'bool'],
+            [false, 'bool'],
+            [0, 'numeric'],
+            ['0', 'numeric'],
+            [1.5, 'numeric'],
+            ['1.5', 'numeric'],
+            [0, 'integer'],
+            [1.5, 'float'],
+            ['12345', 'string'],
+            [[], 'array'],
+            [$object, 'object'],
+            [$object, 'stdClass'],
+            [$file, 'resource'],
+            ['12345', 'digit'],
+            ['12a34', 'alnum'],
+            ['abcde', 'alpha'],
+            ["\n\r\t", 'cntrl'],
+            ['arf12', 'graph'],
+            ['abcde', 'lower'],
+            ['ABCDE', 'upper'],
+            ['arf12', 'print'],
+            ['*&$()', 'punct'],
+            ["\n\r\t", 'space'],
+            ['AB10BC99', 'xdigit'],
+        ];
     }
 
     /**
@@ -112,10 +112,10 @@ public function getValidValues()
      */
     public function testInvalidValues($value, $type, $valueAsString)
     {
-        $constraint = new Type(array(
+        $constraint = new Type([
             'type' => $type,
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($value, $constraint);
 
@@ -131,36 +131,36 @@ public function getInvalidValues()
         $object = new \stdClass();
         $file = $this->createFile();
 
-        return array(
-            array('foobar', 'numeric', '"foobar"'),
-            array('foobar', 'boolean', '"foobar"'),
-            array('0', 'integer', '"0"'),
-            array('1.5', 'float', '"1.5"'),
-            array(12345, 'string', '12345'),
-            array($object, 'boolean', 'object'),
-            array($object, 'numeric', 'object'),
-            array($object, 'integer', 'object'),
-            array($object, 'float', 'object'),
-            array($object, 'string', 'object'),
-            array($object, 'resource', 'object'),
-            array($file, 'boolean', 'resource'),
-            array($file, 'numeric', 'resource'),
-            array($file, 'integer', 'resource'),
-            array($file, 'float', 'resource'),
-            array($file, 'string', 'resource'),
-            array($file, 'object', 'resource'),
-            array('12a34', 'digit', '"12a34"'),
-            array('1a#23', 'alnum', '"1a#23"'),
-            array('abcd1', 'alpha', '"abcd1"'),
-            array("\nabc", 'cntrl', "\"\nabc\""),
-            array("abc\n", 'graph', "\"abc\n\""),
-            array('abCDE', 'lower', '"abCDE"'),
-            array('ABcde', 'upper', '"ABcde"'),
-            array("\nabc", 'print', "\"\nabc\""),
-            array('abc&$!', 'punct', '"abc&$!"'),
-            array("\nabc", 'space', "\"\nabc\""),
-            array('AR1012', 'xdigit', '"AR1012"'),
-        );
+        return [
+            ['foobar', 'numeric', '"foobar"'],
+            ['foobar', 'boolean', '"foobar"'],
+            ['0', 'integer', '"0"'],
+            ['1.5', 'float', '"1.5"'],
+            [12345, 'string', '12345'],
+            [$object, 'boolean', 'object'],
+            [$object, 'numeric', 'object'],
+            [$object, 'integer', 'object'],
+            [$object, 'float', 'object'],
+            [$object, 'string', 'object'],
+            [$object, 'resource', 'object'],
+            [$file, 'boolean', 'resource'],
+            [$file, 'numeric', 'resource'],
+            [$file, 'integer', 'resource'],
+            [$file, 'float', 'resource'],
+            [$file, 'string', 'resource'],
+            [$file, 'object', 'resource'],
+            ['12a34', 'digit', '"12a34"'],
+            ['1a#23', 'alnum', '"1a#23"'],
+            ['abcd1', 'alpha', '"abcd1"'],
+            ["\nabc", 'cntrl', "\"\nabc\""],
+            ["abc\n", 'graph', "\"abc\n\""],
+            ['abCDE', 'lower', '"abCDE"'],
+            ['ABcde', 'upper', '"ABcde"'],
+            ["\nabc", 'print', "\"\nabc\""],
+            ['abc&$!', 'punct', '"abc&$!"'],
+            ["\nabc", 'space', "\"\nabc\""],
+            ['AR1012', 'xdigit', '"AR1012"'],
+        ];
     }
 
     protected function createFile()
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
index 13cacb0f3ba56..7800b36f49b67 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
@@ -67,67 +67,67 @@ public function testValidUrls($url)
 
     public function getValidUrls()
     {
-        return array(
-            array('http://a.pl'),
-            array('http://www.google.com'),
-            array('http://www.google.com.'),
-            array('http://www.google.museum'),
-            array('https://google.com/'),
-            array('https://google.com:80/'),
-            array('http://www.example.coop/'),
-            array('http://www.test-example.com/'),
-            array('http://www.symfony.com/'),
-            array('http://symfony.fake/blog/'),
-            array('http://symfony.com/?'),
-            array('http://symfony.com/search?type=&q=url+validator'),
-            array('http://symfony.com/#'),
-            array('http://symfony.com/#?'),
-            array('http://www.symfony.com/doc/current/book/validation.html#supported-constraints'),
-            array('http://very.long.domain.name.com/'),
-            array('http://localhost/'),
-            array('http://myhost123/'),
-            array('http://127.0.0.1/'),
-            array('http://127.0.0.1:80/'),
-            array('http://[::1]/'),
-            array('http://[::1]:80/'),
-            array('http://[1:2:3::4:5:6:7]/'),
-            array('http://sãopaulo.com/'),
-            array('http://xn--sopaulo-xwa.com/'),
-            array('http://sãopaulo.com.br/'),
-            array('http://xn--sopaulo-xwa.com.br/'),
-            array('http://пример.испытание/'),
-            array('http://xn--e1afmkfd.xn--80akhbyknj4f/'),
-            array('http://مثال.إختبار/'),
-            array('http://xn--mgbh0fb.xn--kgbechtv/'),
-            array('http://例子.测试/'),
-            array('http://xn--fsqu00a.xn--0zwm56d/'),
-            array('http://例子.測試/'),
-            array('http://xn--fsqu00a.xn--g6w251d/'),
-            array('http://例え.テスト/'),
-            array('http://xn--r8jz45g.xn--zckzah/'),
-            array('http://مثال.آزمایشی/'),
-            array('http://xn--mgbh0fb.xn--hgbk6aj7f53bba/'),
-            array('http://실례.테스트/'),
-            array('http://xn--9n2bp8q.xn--9t4b11yi5a/'),
-            array('http://العربية.idn.icann.org/'),
-            array('http://xn--ogb.idn.icann.org/'),
-            array('http://xn--e1afmkfd.xn--80akhbyknj4f.xn--e1afmkfd/'),
-            array('http://xn--espaa-rta.xn--ca-ol-fsay5a/'),
-            array('http://xn--d1abbgf6aiiy.xn--p1ai/'),
-            array('http://☎.com/'),
-            array('http://username:password@symfony.com'),
-            array('http://user.name:password@symfony.com'),
-            array('http://username:pass.word@symfony.com'),
-            array('http://user.name:pass.word@symfony.com'),
-            array('http://user-name@symfony.com'),
-            array('http://symfony.com?'),
-            array('http://symfony.com?query=1'),
-            array('http://symfony.com/?query=1'),
-            array('http://symfony.com#'),
-            array('http://symfony.com#fragment'),
-            array('http://symfony.com/#fragment'),
-            array('http://symfony.com/#one_more%20test'),
-        );
+        return [
+            ['http://a.pl'],
+            ['http://www.google.com'],
+            ['http://www.google.com.'],
+            ['http://www.google.museum'],
+            ['https://google.com/'],
+            ['https://google.com:80/'],
+            ['http://www.example.coop/'],
+            ['http://www.test-example.com/'],
+            ['http://www.symfony.com/'],
+            ['http://symfony.fake/blog/'],
+            ['http://symfony.com/?'],
+            ['http://symfony.com/search?type=&q=url+validator'],
+            ['http://symfony.com/#'],
+            ['http://symfony.com/#?'],
+            ['http://www.symfony.com/doc/current/book/validation.html#supported-constraints'],
+            ['http://very.long.domain.name.com/'],
+            ['http://localhost/'],
+            ['http://myhost123/'],
+            ['http://127.0.0.1/'],
+            ['http://127.0.0.1:80/'],
+            ['http://[::1]/'],
+            ['http://[::1]:80/'],
+            ['http://[1:2:3::4:5:6:7]/'],
+            ['http://sãopaulo.com/'],
+            ['http://xn--sopaulo-xwa.com/'],
+            ['http://sãopaulo.com.br/'],
+            ['http://xn--sopaulo-xwa.com.br/'],
+            ['http://пример.испытание/'],
+            ['http://xn--e1afmkfd.xn--80akhbyknj4f/'],
+            ['http://مثال.إختبار/'],
+            ['http://xn--mgbh0fb.xn--kgbechtv/'],
+            ['http://例子.测试/'],
+            ['http://xn--fsqu00a.xn--0zwm56d/'],
+            ['http://例子.測試/'],
+            ['http://xn--fsqu00a.xn--g6w251d/'],
+            ['http://例え.テスト/'],
+            ['http://xn--r8jz45g.xn--zckzah/'],
+            ['http://مثال.آزمایشی/'],
+            ['http://xn--mgbh0fb.xn--hgbk6aj7f53bba/'],
+            ['http://실례.테스트/'],
+            ['http://xn--9n2bp8q.xn--9t4b11yi5a/'],
+            ['http://العربية.idn.icann.org/'],
+            ['http://xn--ogb.idn.icann.org/'],
+            ['http://xn--e1afmkfd.xn--80akhbyknj4f.xn--e1afmkfd/'],
+            ['http://xn--espaa-rta.xn--ca-ol-fsay5a/'],
+            ['http://xn--d1abbgf6aiiy.xn--p1ai/'],
+            ['http://☎.com/'],
+            ['http://username:password@symfony.com'],
+            ['http://user.name:password@symfony.com'],
+            ['http://username:pass.word@symfony.com'],
+            ['http://user.name:pass.word@symfony.com'],
+            ['http://user-name@symfony.com'],
+            ['http://symfony.com?'],
+            ['http://symfony.com?query=1'],
+            ['http://symfony.com/?query=1'],
+            ['http://symfony.com#'],
+            ['http://symfony.com#fragment'],
+            ['http://symfony.com/#fragment'],
+            ['http://symfony.com/#one_more%20test'],
+        ];
     }
 
     /**
@@ -149,29 +149,29 @@ public function testInvalidUrls($url)
 
     public function getInvalidUrls()
     {
-        return array(
-            array('google.com'),
-            array('://google.com'),
-            array('http ://google.com'),
-            array('http:/google.com'),
-            array('http://goog_le.com'),
-            array('http://google.com::aa'),
-            array('http://google.com:aa'),
-            array('ftp://google.fr'),
-            array('faked://google.fr'),
-            array('http://127.0.0.1:aa/'),
-            array('ftp://[::1]/'),
-            array('http://[::1'),
-            array('http://hello.☎/'),
-            array('http://:password@symfony.com'),
-            array('http://:password@@symfony.com'),
-            array('http://username:passwordsymfony.com'),
-            array('http://usern@me:password@symfony.com'),
-            array('http://example.com/exploit.html?<script>alert(1);</script>'),
-            array('http://example.com/exploit.html?hel lo'),
-            array('http://example.com/exploit.html?not_a%hex'),
-            array('http://'),
-        );
+        return [
+            ['google.com'],
+            ['://google.com'],
+            ['http ://google.com'],
+            ['http:/google.com'],
+            ['http://goog_le.com'],
+            ['http://google.com::aa'],
+            ['http://google.com:aa'],
+            ['ftp://google.fr'],
+            ['faked://google.fr'],
+            ['http://127.0.0.1:aa/'],
+            ['ftp://[::1]/'],
+            ['http://[::1'],
+            ['http://hello.☎/'],
+            ['http://:password@symfony.com'],
+            ['http://:password@@symfony.com'],
+            ['http://username:passwordsymfony.com'],
+            ['http://usern@me:password@symfony.com'],
+            ['http://example.com/exploit.html?<script>alert(1);</script>'],
+            ['http://example.com/exploit.html?hel lo'],
+            ['http://example.com/exploit.html?not_a%hex'],
+            ['http://'],
+        ];
     }
 
     /**
@@ -179,9 +179,9 @@ public function getInvalidUrls()
      */
     public function testCustomProtocolIsValid($url)
     {
-        $constraint = new Url(array(
-            'protocols' => array('ftp', 'file', 'git'),
-        ));
+        $constraint = new Url([
+            'protocols' => ['ftp', 'file', 'git'],
+        ]);
 
         $this->validator->validate($url, $constraint);
 
@@ -190,11 +190,11 @@ public function testCustomProtocolIsValid($url)
 
     public function getValidCustomUrls()
     {
-        return array(
-            array('ftp://google.com'),
-            array('file://127.0.0.1'),
-            array('git://[::1]/'),
-        );
+        return [
+            ['ftp://google.com'],
+            ['file://127.0.0.1'],
+            ['git://[::1]/'],
+        ];
     }
 
     /**
@@ -205,10 +205,10 @@ public function testCheckDns($violation)
     {
         DnsMock::withMockedHosts(array('example.com' => array(array('type' => $violation ? '' : 'A'))));
 
-        $constraint = new Url(array(
+        $constraint = new Url([
             'checkDNS' => 'ANY',
             'dnsMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate('http://example.com', $constraint);
 
@@ -224,7 +224,7 @@ public function testCheckDns($violation)
 
     public function getCheckDns()
     {
-        return array(array(true), array(false));
+        return [[true], [false]];
     }
 
     /**
@@ -235,10 +235,10 @@ public function testCheckDnsByType($type)
     {
         DnsMock::withMockedHosts(array('example.com' => array(array('type' => $type))));
 
-        $constraint = new Url(array(
+        $constraint = new Url([
             'checkDNS' => $type,
             'dnsMessage' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate('http://example.com', $constraint);
 
@@ -248,17 +248,17 @@ public function testCheckDnsByType($type)
     public function getCheckDnsTypes()
     {
         return array(
-            array('ANY'),
-            array('A'),
-            array('A6'),
-            array('AAAA'),
-            array('CNAME'),
-            array('MX'),
-            array('NAPTR'),
-            array('NS'),
-            array('PTR'),
-            array('SOA'),
-            array('SRV'),
+            ['ANY'],
+            ['A'],
+            ['A6'],
+            ['AAAA'],
+            ['CNAME'],
+            ['MX'],
+            ['NAPTR'],
+            ['NS'],
+            ['PTR'],
+            ['SOA'],
+            ['SRV'],
             array('TXT'),
         );
     }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php
index a39ec93d6cdf6..6c379b9430fb9 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php
@@ -75,14 +75,14 @@ public function testValidStrictUuids($uuid, $versions = null)
 
     public function getValidStrictUuids()
     {
-        return array(
-            array('216fff40-98d9-11e3-a5e2-0800200c9a66'), // Version 1 UUID in lowercase
-            array('216fff40-98d9-11e3-a5e2-0800200c9a66', array(Uuid::V1_MAC)),
-            array('216FFF40-98D9-11E3-A5E2-0800200C9A66'), // Version 1 UUID in UPPERCASE
-            array('456daefb-5aa6-41b5-8dbc-068b05a8b201'), // Version 4 UUID in lowercase
-            array('456daEFb-5AA6-41B5-8DBC-068B05A8B201'), // Version 4 UUID in mixed case
-            array('456daEFb-5AA6-41B5-8DBC-068B05A8B201', array(Uuid::V4_RANDOM)),
-        );
+        return [
+            ['216fff40-98d9-11e3-a5e2-0800200c9a66'], // Version 1 UUID in lowercase
+            ['216fff40-98d9-11e3-a5e2-0800200c9a66', [Uuid::V1_MAC]],
+            ['216FFF40-98D9-11E3-A5E2-0800200C9A66'], // Version 1 UUID in UPPERCASE
+            ['456daefb-5aa6-41b5-8dbc-068b05a8b201'], // Version 4 UUID in lowercase
+            ['456daEFb-5AA6-41B5-8DBC-068B05A8B201'], // Version 4 UUID in mixed case
+            ['456daEFb-5AA6-41B5-8DBC-068B05A8B201', [Uuid::V4_RANDOM]],
+        ];
     }
 
     /**
@@ -90,9 +90,9 @@ public function getValidStrictUuids()
      */
     public function testInvalidStrictUuids($uuid, $code, $versions = null)
     {
-        $constraint = new Uuid(array(
+        $constraint = new Uuid([
             'message' => 'testMessage',
-        ));
+        ]);
 
         if (null !== $versions) {
             $constraint->versions = $versions;
@@ -108,48 +108,48 @@ public function testInvalidStrictUuids($uuid, $code, $versions = null)
 
     public function getInvalidStrictUuids()
     {
-        return array(
-            array('216fff40-98d9-11e3-a5e2_0800200c9a66', Uuid::INVALID_CHARACTERS_ERROR),
-            array('216gff40-98d9-11e3-a5e2-0800200c9a66', Uuid::INVALID_CHARACTERS_ERROR),
-            array('216Gff40-98d9-11e3-a5e2-0800200c9a66', Uuid::INVALID_CHARACTERS_ERROR),
-            array('216fff40-98d9-11e3-a5e-20800200c9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR),
-            array('216f-ff40-98d9-11e3-a5e2-0800200c9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR),
-            array('216fff40-98d9-11e3-a5e2-0800-200c9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR),
-            array('216fff40-98d9-11e3-a5e2-0800200c-9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR),
-            array('216fff40-98d9-11e3-a5e20800200c9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR),
-            array('216fff4098d911e3a5e20800200c9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR),
-            array('216fff40-98d9-11e3-a5e2-0800200c9a6', Uuid::TOO_SHORT_ERROR),
-            array('216fff40-98d9-11e3-a5e2-0800200c9a666', Uuid::TOO_LONG_ERROR),
-            array('216fff40-98d9-01e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
-            array('216fff40-98d9-61e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
-            array('216fff40-98d9-71e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
-            array('216fff40-98d9-81e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
-            array('216fff40-98d9-91e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
-            array('216fff40-98d9-a1e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
-            array('216fff40-98d9-b1e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
-            array('216fff40-98d9-c1e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
-            array('216fff40-98d9-d1e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
-            array('216fff40-98d9-e1e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
-            array('216fff40-98d9-f1e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR),
-            array('216fff40-98d9-11e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR, array(Uuid::V2_DCE, Uuid::V3_MD5, Uuid::V4_RANDOM, Uuid::V5_SHA1)),
-            array('216fff40-98d9-21e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR, array(Uuid::V1_MAC, Uuid::V3_MD5, Uuid::V4_RANDOM, Uuid::V5_SHA1)),
-            array('216fff40-98d9-11e3-05e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
-            array('216fff40-98d9-11e3-15e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
-            array('216fff40-98d9-11e3-25e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
-            array('216fff40-98d9-11e3-35e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
-            array('216fff40-98d9-11e3-45e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
-            array('216fff40-98d9-11e3-55e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
-            array('216fff40-98d9-11e3-65e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
-            array('216fff40-98d9-11e3-75e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
-            array('216fff40-98d9-11e3-c5e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
-            array('216fff40-98d9-11e3-d5e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
-            array('216fff40-98d9-11e3-e5e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
-            array('216fff40-98d9-11e3-f5e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR),
+        return [
+            ['216fff40-98d9-11e3-a5e2_0800200c9a66', Uuid::INVALID_CHARACTERS_ERROR],
+            ['216gff40-98d9-11e3-a5e2-0800200c9a66', Uuid::INVALID_CHARACTERS_ERROR],
+            ['216Gff40-98d9-11e3-a5e2-0800200c9a66', Uuid::INVALID_CHARACTERS_ERROR],
+            ['216fff40-98d9-11e3-a5e-20800200c9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR],
+            ['216f-ff40-98d9-11e3-a5e2-0800200c9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR],
+            ['216fff40-98d9-11e3-a5e2-0800-200c9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR],
+            ['216fff40-98d9-11e3-a5e2-0800200c-9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR],
+            ['216fff40-98d9-11e3-a5e20800200c9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR],
+            ['216fff4098d911e3a5e20800200c9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR],
+            ['216fff40-98d9-11e3-a5e2-0800200c9a6', Uuid::TOO_SHORT_ERROR],
+            ['216fff40-98d9-11e3-a5e2-0800200c9a666', Uuid::TOO_LONG_ERROR],
+            ['216fff40-98d9-01e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR],
+            ['216fff40-98d9-61e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR],
+            ['216fff40-98d9-71e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR],
+            ['216fff40-98d9-81e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR],
+            ['216fff40-98d9-91e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR],
+            ['216fff40-98d9-a1e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR],
+            ['216fff40-98d9-b1e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR],
+            ['216fff40-98d9-c1e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR],
+            ['216fff40-98d9-d1e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR],
+            ['216fff40-98d9-e1e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR],
+            ['216fff40-98d9-f1e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR],
+            ['216fff40-98d9-11e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR, [Uuid::V2_DCE, Uuid::V3_MD5, Uuid::V4_RANDOM, Uuid::V5_SHA1]],
+            ['216fff40-98d9-21e3-a5e2-0800200c9a66', Uuid::INVALID_VERSION_ERROR, [Uuid::V1_MAC, Uuid::V3_MD5, Uuid::V4_RANDOM, Uuid::V5_SHA1]],
+            ['216fff40-98d9-11e3-05e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR],
+            ['216fff40-98d9-11e3-15e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR],
+            ['216fff40-98d9-11e3-25e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR],
+            ['216fff40-98d9-11e3-35e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR],
+            ['216fff40-98d9-11e3-45e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR],
+            ['216fff40-98d9-11e3-55e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR],
+            ['216fff40-98d9-11e3-65e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR],
+            ['216fff40-98d9-11e3-75e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR],
+            ['216fff40-98d9-11e3-c5e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR],
+            ['216fff40-98d9-11e3-d5e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR],
+            ['216fff40-98d9-11e3-e5e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR],
+            ['216fff40-98d9-11e3-f5e2-0800200c9a66', Uuid::INVALID_VARIANT_ERROR],
 
             // Non-standard UUID allowed by some other systems
-            array('{216fff40-98d9-11e3-a5e2-0800200c9a66}', Uuid::INVALID_CHARACTERS_ERROR),
-            array('[216fff40-98d9-11e3-a5e2-0800200c9a66]', Uuid::INVALID_CHARACTERS_ERROR),
-        );
+            ['{216fff40-98d9-11e3-a5e2-0800200c9a66}', Uuid::INVALID_CHARACTERS_ERROR],
+            ['[216fff40-98d9-11e3-a5e2-0800200c9a66]', Uuid::INVALID_CHARACTERS_ERROR],
+        ];
     }
 
     /**
@@ -157,9 +157,9 @@ public function getInvalidStrictUuids()
      */
     public function testValidNonStrictUuids($uuid)
     {
-        $constraint = new Uuid(array(
+        $constraint = new Uuid([
             'strict' => false,
-        ));
+        ]);
 
         $this->validator->validate($uuid, $constraint);
 
@@ -168,19 +168,19 @@ public function testValidNonStrictUuids($uuid)
 
     public function getValidNonStrictUuids()
     {
-        return array(
-            array('216fff40-98d9-11e3-a5e2-0800200c9a66'),    // Version 1 UUID in lowercase
-            array('216FFF40-98D9-11E3-A5E2-0800200C9A66'),    // Version 1 UUID in UPPERCASE
-            array('456daefb-5aa6-41b5-8dbc-068b05a8b201'),    // Version 4 UUID in lowercase
-            array('456DAEFb-5AA6-41B5-8DBC-068b05a8B201'),    // Version 4 UUID in mixed case
+        return [
+            ['216fff40-98d9-11e3-a5e2-0800200c9a66'],    // Version 1 UUID in lowercase
+            ['216FFF40-98D9-11E3-A5E2-0800200C9A66'],    // Version 1 UUID in UPPERCASE
+            ['456daefb-5aa6-41b5-8dbc-068b05a8b201'],    // Version 4 UUID in lowercase
+            ['456DAEFb-5AA6-41B5-8DBC-068b05a8B201'],    // Version 4 UUID in mixed case
 
             // Non-standard UUIDs allowed by some other systems
-            array('216f-ff40-98d9-11e3-a5e2-0800-200c-9a66'), // Non-standard dash positions (every 4 chars)
-            array('216fff40-98d911e3-a5e20800-200c9a66'),     // Non-standard dash positions (every 8 chars)
-            array('216fff4098d911e3a5e20800200c9a66'),        // No dashes at all
-            array('{216fff40-98d9-11e3-a5e2-0800200c9a66}'),  // Wrapped with curly braces
-            array('[216fff40-98d9-11e3-a5e2-0800200c9a66]'),  // Wrapped with squared braces
-        );
+            ['216f-ff40-98d9-11e3-a5e2-0800-200c-9a66'], // Non-standard dash positions (every 4 chars)
+            ['216fff40-98d911e3-a5e20800-200c9a66'],     // Non-standard dash positions (every 8 chars)
+            ['216fff4098d911e3a5e20800200c9a66'],        // No dashes at all
+            ['{216fff40-98d9-11e3-a5e2-0800200c9a66}'],  // Wrapped with curly braces
+            ['[216fff40-98d9-11e3-a5e2-0800200c9a66]'],  // Wrapped with squared braces
+        ];
     }
 
     /**
@@ -188,10 +188,10 @@ public function getValidNonStrictUuids()
      */
     public function testInvalidNonStrictUuids($uuid, $code)
     {
-        $constraint = new Uuid(array(
+        $constraint = new Uuid([
             'strict' => false,
             'message' => 'myMessage',
-        ));
+        ]);
 
         $this->validator->validate($uuid, $constraint);
 
@@ -203,14 +203,14 @@ public function testInvalidNonStrictUuids($uuid, $code)
 
     public function getInvalidNonStrictUuids()
     {
-        return array(
-            array('216fff40-98d9-11e3-a5e2_0800200c9a66', Uuid::INVALID_CHARACTERS_ERROR),
-            array('216gff40-98d9-11e3-a5e2-0800200c9a66', Uuid::INVALID_CHARACTERS_ERROR),
-            array('216Gff40-98d9-11e3-a5e2-0800200c9a66', Uuid::INVALID_CHARACTERS_ERROR),
-            array('216fff40-98d9-11e3-a5e2_0800200c9a6', Uuid::INVALID_CHARACTERS_ERROR),
-            array('216fff40-98d9-11e3-a5e-20800200c9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR),
-            array('216fff40-98d9-11e3-a5e2-0800200c9a6', Uuid::TOO_SHORT_ERROR),
-            array('216fff40-98d9-11e3-a5e2-0800200c9a666', Uuid::TOO_LONG_ERROR),
-        );
+        return [
+            ['216fff40-98d9-11e3-a5e2_0800200c9a66', Uuid::INVALID_CHARACTERS_ERROR],
+            ['216gff40-98d9-11e3-a5e2-0800200c9a66', Uuid::INVALID_CHARACTERS_ERROR],
+            ['216Gff40-98d9-11e3-a5e2-0800200c9a66', Uuid::INVALID_CHARACTERS_ERROR],
+            ['216fff40-98d9-11e3-a5e2_0800200c9a6', Uuid::INVALID_CHARACTERS_ERROR],
+            ['216fff40-98d9-11e3-a5e-20800200c9a66', Uuid::INVALID_HYPHEN_PLACEMENT_ERROR],
+            ['216fff40-98d9-11e3-a5e2-0800200c9a6', Uuid::TOO_SHORT_ERROR],
+            ['216fff40-98d9-11e3-a5e2-0800200c9a666', Uuid::TOO_LONG_ERROR],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ValidTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ValidTest.php
index 9928bd82d0225..7245dc90adeda 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/ValidTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/ValidTest.php
@@ -21,9 +21,9 @@ class ValidTest extends TestCase
 {
     public function testGroupsCanBeSet()
     {
-        $constraint = new Valid(array('groups' => 'foo'));
+        $constraint = new Valid(['groups' => 'foo']);
 
-        $this->assertSame(array('foo'), $constraint->groups);
+        $this->assertSame(['foo'], $constraint->groups);
     }
 
     public function testGroupsAreNullByDefault()
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ValidValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ValidValidatorTest.php
index c4ccf1551f2a0..0ec1d421378ea 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/ValidValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/ValidValidatorTest.php
@@ -14,7 +14,7 @@ public function testPropertyPathsArePassedToNestedContexts()
         $validatorBuilder = new ValidatorBuilder();
         $validator = $validatorBuilder->enableAnnotationMapping()->getValidator();
 
-        $violations = $validator->validate(new Foo(), null, array('nested'));
+        $violations = $validator->validate(new Foo(), null, ['nested']);
 
         $this->assertCount(1, $violations);
         $this->assertSame('fooBar.fooBarBaz.foo', $violations->get(0)->getPropertyPath());
@@ -27,7 +27,7 @@ public function testNullValues()
 
         $foo = new Foo();
         $foo->fooBar = null;
-        $violations = $validator->validate($foo, null, array('nested'));
+        $violations = $validator->validate($foo, null, ['nested']);
 
         $this->assertCount(0, $violations);
     }
diff --git a/src/Symfony/Component/Validator/Tests/DataCollector/ValidatorDataCollectorTest.php b/src/Symfony/Component/Validator/Tests/DataCollector/ValidatorDataCollectorTest.php
index b28650c30e1da..f32acf228bcc3 100644
--- a/src/Symfony/Component/Validator/Tests/DataCollector/ValidatorDataCollectorTest.php
+++ b/src/Symfony/Component/Validator/Tests/DataCollector/ValidatorDataCollectorTest.php
@@ -27,10 +27,10 @@ public function testCollectsValidatorCalls()
 
         $collector = new ValidatorDataCollector($validator);
 
-        $violations = new ConstraintViolationList(array(
+        $violations = new ConstraintViolationList([
             $this->createMock(ConstraintViolation::class),
             $this->createMock(ConstraintViolation::class),
-        ));
+        ]);
         $originalValidator->method('validate')->willReturn($violations);
 
         $validator->validate(new \stdClass());
@@ -57,10 +57,10 @@ public function testReset()
 
         $collector = new ValidatorDataCollector($validator);
 
-        $violations = new ConstraintViolationList(array(
+        $violations = new ConstraintViolationList([
             $this->createMock(ConstraintViolation::class),
             $this->createMock(ConstraintViolation::class),
-        ));
+        ]);
         $originalValidator->method('validate')->willReturn($violations);
 
         $validator->validate(new \stdClass());
diff --git a/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php b/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php
index c47cbcc94da9e..c3224840bb2da 100644
--- a/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php
+++ b/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php
@@ -25,21 +25,21 @@ public function testThatConstraintValidatorServicesAreProcessed()
     {
         $container = new ContainerBuilder();
         $validatorFactory = $container->register('validator.validator_factory')
-            ->addArgument(array());
+            ->addArgument([]);
 
         $container->register('my_constraint_validator_service1', Validator1::class)
-            ->addTag('validator.constraint_validator', array('alias' => 'my_constraint_validator_alias1'));
+            ->addTag('validator.constraint_validator', ['alias' => 'my_constraint_validator_alias1']);
         $container->register('my_constraint_validator_service2', Validator2::class)
             ->addTag('validator.constraint_validator');
 
         $addConstraintValidatorsPass = new AddConstraintValidatorsPass();
         $addConstraintValidatorsPass->process($container);
 
-        $expected = (new Definition(ServiceLocator::class, array(array(
+        $expected = (new Definition(ServiceLocator::class, [[
             Validator1::class => new ServiceClosureArgument(new Reference('my_constraint_validator_service1')),
             'my_constraint_validator_alias1' => new ServiceClosureArgument(new Reference('my_constraint_validator_service1')),
             Validator2::class => new ServiceClosureArgument(new Reference('my_constraint_validator_service2')),
-        ))))->addTag('container.service_locator')->setPublic(false);
+        ]]))->addTag('container.service_locator')->setPublic(false);
         $this->assertEquals($expected, $container->getDefinition((string) $validatorFactory->getArgument(0)));
     }
 
@@ -51,7 +51,7 @@ public function testAbstractConstraintValidator()
     {
         $container = new ContainerBuilder();
         $container->register('validator.validator_factory')
-            ->addArgument(array());
+            ->addArgument([]);
 
         $container->register('my_abstract_constraint_validator')
             ->setAbstract(true)
diff --git a/src/Symfony/Component/Validator/Tests/DependencyInjection/AddValidatorInitializersPassTest.php b/src/Symfony/Component/Validator/Tests/DependencyInjection/AddValidatorInitializersPassTest.php
index 61c13d25e75d9..8d87b635ea0b9 100644
--- a/src/Symfony/Component/Validator/Tests/DependencyInjection/AddValidatorInitializersPassTest.php
+++ b/src/Symfony/Component/Validator/Tests/DependencyInjection/AddValidatorInitializersPassTest.php
@@ -31,13 +31,13 @@ public function testProcess()
         ;
         $container
             ->register('validator.builder')
-            ->addArgument(array())
+            ->addArgument([])
         ;
 
         (new AddValidatorInitializersPass())->process($container);
 
         $this->assertEquals(
-            array(array('addObjectInitializers', array(array(new Reference('initializer1'), new Reference('initializer2'))))),
+            [['addObjectInitializers', [[new Reference('initializer1'), new Reference('initializer2')]]]],
             $container->getDefinition('validator.builder')->getMethodCalls()
         );
     }
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintA.php b/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintA.php
index 8a196dcc914ec..17ba03673d5d6 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintA.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintA.php
@@ -26,6 +26,6 @@ public function getDefaultOption()
 
     public function getTargets()
     {
-        return array(self::PROPERTY_CONSTRAINT, self::CLASS_CONSTRAINT);
+        return [self::PROPERTY_CONSTRAINT, self::CLASS_CONSTRAINT];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintAValidator.php b/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintAValidator.php
index 867b024c27672..8b0d30f571421 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintAValidator.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintAValidator.php
@@ -29,7 +29,7 @@ public function initialize(ExecutionContextInterface $context)
     public function validate($value, Constraint $constraint)
     {
         if ('VALID' != $value) {
-            $this->context->addViolation('message', array('param' => 'value'));
+            $this->context->addViolation('message', ['param' => 'value']);
 
             return;
         }
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintB.php b/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintB.php
index 6258923372ed8..99d1951e5d0ce 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintB.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintB.php
@@ -18,6 +18,6 @@ class ConstraintB extends Constraint
 {
     public function getTargets()
     {
-        return array(self::PROPERTY_CONSTRAINT, self::CLASS_CONSTRAINT);
+        return [self::PROPERTY_CONSTRAINT, self::CLASS_CONSTRAINT];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintC.php b/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintC.php
index b0418b8718695..675066ef020f8 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintC.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintC.php
@@ -20,11 +20,11 @@ class ConstraintC extends Constraint
 
     public function getRequiredOptions()
     {
-        return array('option1');
+        return ['option1'];
     }
 
     public function getTargets()
     {
-        return array(self::PROPERTY_CONSTRAINT, self::CLASS_CONSTRAINT);
+        return [self::PROPERTY_CONSTRAINT, self::CLASS_CONSTRAINT];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintWithValue.php b/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintWithValue.php
index 4ebd981eef924..b3fbd7083cfda 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintWithValue.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintWithValue.php
@@ -26,6 +26,6 @@ public function getDefaultOption()
 
     public function getTargets()
     {
-        return array(self::PROPERTY_CONSTRAINT, self::CLASS_CONSTRAINT);
+        return [self::PROPERTY_CONSTRAINT, self::CLASS_CONSTRAINT];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintWithValueAsDefault.php b/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintWithValueAsDefault.php
index a975e0787fc97..618cca74df04e 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintWithValueAsDefault.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintWithValueAsDefault.php
@@ -26,6 +26,6 @@ public function getDefaultOption()
 
     public function getTargets()
     {
-        return array(self::PROPERTY_CONSTRAINT, self::CLASS_CONSTRAINT);
+        return [self::PROPERTY_CONSTRAINT, self::CLASS_CONSTRAINT];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/CustomArrayObject.php b/src/Symfony/Component/Validator/Tests/Fixtures/CustomArrayObject.php
index feb25318eb5e5..ac48a512c6292 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/CustomArrayObject.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/CustomArrayObject.php
@@ -21,7 +21,7 @@ class CustomArrayObject implements \ArrayAccess, \IteratorAggregate, \Countable,
 
     public function __construct(array $array = null)
     {
-        $this->array = $array ?: array();
+        $this->array = $array ?: [];
     }
 
     public function offsetExists($offset)
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/EntityStaticCar.php b/src/Symfony/Component/Validator/Tests/Fixtures/EntityStaticCar.php
index 0b384872db597..af90ddc7473ad 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/EntityStaticCar.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/EntityStaticCar.php
@@ -18,6 +18,6 @@ class EntityStaticCar extends EntityStaticVehicle
 {
     public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
-        $metadata->addPropertyConstraint('wheels', new Length(array('max' => 99)));
+        $metadata->addPropertyConstraint('wheels', new Length(['max' => 99]));
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/EntityStaticCarTurbo.php b/src/Symfony/Component/Validator/Tests/Fixtures/EntityStaticCarTurbo.php
index abf1edbdd132d..d559074db6458 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/EntityStaticCarTurbo.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/EntityStaticCarTurbo.php
@@ -18,6 +18,6 @@ class EntityStaticCarTurbo extends EntityStaticCar
 {
     public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
-        $metadata->addPropertyConstraint('wheels', new Length(array('max' => 99)));
+        $metadata->addPropertyConstraint('wheels', new Length(['max' => 99]));
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/EntityStaticVehicle.php b/src/Symfony/Component/Validator/Tests/Fixtures/EntityStaticVehicle.php
index 9ce72935de514..1190318fa555e 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/EntityStaticVehicle.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/EntityStaticVehicle.php
@@ -20,6 +20,6 @@ class EntityStaticVehicle
 
     public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
-        $metadata->addPropertyConstraint('wheels', new Length(array('max' => 99)));
+        $metadata->addPropertyConstraint('wheels', new Length(['max' => 99]));
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/FailingConstraint.php b/src/Symfony/Component/Validator/Tests/Fixtures/FailingConstraint.php
index 03019fc37ca38..4ea07f7436343 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/FailingConstraint.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/FailingConstraint.php
@@ -19,6 +19,6 @@ class FailingConstraint extends Constraint
 
     public function getTargets()
     {
-        return array(self::PROPERTY_CONSTRAINT, self::CLASS_CONSTRAINT);
+        return [self::PROPERTY_CONSTRAINT, self::CLASS_CONSTRAINT];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/FailingConstraintValidator.php b/src/Symfony/Component/Validator/Tests/Fixtures/FailingConstraintValidator.php
index a019dd6f836c2..1224643851117 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/FailingConstraintValidator.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/FailingConstraintValidator.php
@@ -18,6 +18,6 @@ class FailingConstraintValidator extends ConstraintValidator
 {
     public function validate($value, Constraint $constraint)
     {
-        $this->context->addViolation($constraint->message, array());
+        $this->context->addViolation($constraint->message, []);
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/FakeClassMetadata.php b/src/Symfony/Component/Validator/Tests/Fixtures/FakeClassMetadata.php
index 8c76a21598c0a..39f54777795cd 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/FakeClassMetadata.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/FakeClassMetadata.php
@@ -18,7 +18,7 @@ class FakeClassMetadata extends ClassMetadata
     public function addCustomPropertyMetadata($propertyName, $metadata)
     {
         if (!isset($this->members[$propertyName])) {
-            $this->members[$propertyName] = array();
+            $this->members[$propertyName] = [];
         }
 
         $this->members[$propertyName][] = $metadata;
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/FakeMetadataFactory.php b/src/Symfony/Component/Validator/Tests/Fixtures/FakeMetadataFactory.php
index 1b5a704d46800..5e34929be35e6 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/FakeMetadataFactory.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/FakeMetadataFactory.php
@@ -17,7 +17,7 @@
 
 class FakeMetadataFactory implements MetadataFactoryInterface
 {
-    protected $metadatas = array();
+    protected $metadatas = [];
 
     public function getMetadataFor($class)
     {
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/GroupSequenceProviderEntity.php b/src/Symfony/Component/Validator/Tests/Fixtures/GroupSequenceProviderEntity.php
index 2b0beaf9adf98..77b3bf2f7b455 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/GroupSequenceProviderEntity.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/GroupSequenceProviderEntity.php
@@ -22,7 +22,7 @@ class GroupSequenceProviderEntity implements GroupSequenceProviderInterface
     public $firstName;
     public $lastName;
 
-    protected $sequence = array();
+    protected $sequence = [];
 
     public function __construct($sequence)
     {
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Cache/AbstractCacheTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Cache/AbstractCacheTest.php
index 6083f65e28b6a..4d0363fd717b4 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Cache/AbstractCacheTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/Cache/AbstractCacheTest.php
@@ -26,7 +26,7 @@ public function testWrite()
     {
         $meta = $this->getMockBuilder(ClassMetadata::class)
             ->disableOriginalConstructor()
-            ->setMethods(array('getClassName'))
+            ->setMethods(['getClassName'])
             ->getMock();
 
         $meta->expects($this->once())
@@ -46,7 +46,7 @@ public function testHas()
     {
         $meta = $this->getMockBuilder(ClassMetadata::class)
             ->disableOriginalConstructor()
-            ->setMethods(array('getClassName'))
+            ->setMethods(['getClassName'])
             ->getMock();
 
         $meta->expects($this->once())
@@ -63,7 +63,7 @@ public function testRead()
     {
         $meta = $this->getMockBuilder(ClassMetadata::class)
             ->disableOriginalConstructor()
-            ->setMethods(array('getClassName'))
+            ->setMethods(['getClassName'])
             ->getMock();
 
         $meta->expects($this->once())
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php b/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
index a3f8a8c1ec8a3..d33342c42557c 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
@@ -57,17 +57,17 @@ public function testAddPropertyConstraints()
         $this->metadata->addPropertyConstraint('firstName', new ConstraintA());
         $this->metadata->addPropertyConstraint('lastName', new ConstraintB());
 
-        $this->assertEquals(array('firstName', 'lastName'), $this->metadata->getConstrainedProperties());
+        $this->assertEquals(['firstName', 'lastName'], $this->metadata->getConstrainedProperties());
     }
 
     public function testAddMultiplePropertyConstraints()
     {
-        $this->metadata->addPropertyConstraints('lastName', array(new ConstraintA(), new ConstraintB()));
+        $this->metadata->addPropertyConstraints('lastName', [new ConstraintA(), new ConstraintB()]);
 
-        $constraints = array(
-            new ConstraintA(array('groups' => array('Default', 'Entity'))),
-            new ConstraintB(array('groups' => array('Default', 'Entity'))),
-        );
+        $constraints = [
+            new ConstraintA(['groups' => ['Default', 'Entity']]),
+            new ConstraintB(['groups' => ['Default', 'Entity']]),
+        ];
 
         $properties = $this->metadata->getPropertyMetadata('lastName');
 
@@ -81,10 +81,10 @@ public function testAddGetterConstraints()
         $this->metadata->addGetterConstraint('lastName', new ConstraintA());
         $this->metadata->addGetterConstraint('lastName', new ConstraintB());
 
-        $constraints = array(
-            new ConstraintA(array('groups' => array('Default', 'Entity'))),
-            new ConstraintB(array('groups' => array('Default', 'Entity'))),
-        );
+        $constraints = [
+            new ConstraintA(['groups' => ['Default', 'Entity']]),
+            new ConstraintB(['groups' => ['Default', 'Entity']]),
+        ];
 
         $properties = $this->metadata->getPropertyMetadata('lastName');
 
@@ -95,12 +95,12 @@ public function testAddGetterConstraints()
 
     public function testAddMultipleGetterConstraints()
     {
-        $this->metadata->addGetterConstraints('lastName', array(new ConstraintA(), new ConstraintB()));
+        $this->metadata->addGetterConstraints('lastName', [new ConstraintA(), new ConstraintB()]);
 
-        $constraints = array(
-            new ConstraintA(array('groups' => array('Default', 'Entity'))),
-            new ConstraintB(array('groups' => array('Default', 'Entity'))),
-        );
+        $constraints = [
+            new ConstraintA(['groups' => ['Default', 'Entity']]),
+            new ConstraintB(['groups' => ['Default', 'Entity']]),
+        ];
 
         $properties = $this->metadata->getPropertyMetadata('lastName');
 
@@ -117,17 +117,17 @@ public function testMergeConstraintsMergesClassConstraints()
         $this->metadata->mergeConstraints($parent);
         $this->metadata->addConstraint(new ConstraintA());
 
-        $constraints = array(
-            new ConstraintA(array('groups' => array(
+        $constraints = [
+            new ConstraintA(['groups' => [
                 'Default',
                 'EntityParent',
                 'Entity',
-            ))),
-            new ConstraintA(array('groups' => array(
+            ]]),
+            new ConstraintA(['groups' => [
                 'Default',
                 'Entity',
-            ))),
-        );
+            ]]),
+        ];
 
         $this->assertEquals($constraints, $this->metadata->getConstraints());
     }
@@ -136,46 +136,46 @@ public function testMergeConstraintsMergesMemberConstraints()
     {
         $parent = new ClassMetadata(self::PARENTCLASS);
         $parent->addPropertyConstraint('firstName', new ConstraintA());
-        $parent->addPropertyConstraint('firstName', new ConstraintB(array('groups' => 'foo')));
+        $parent->addPropertyConstraint('firstName', new ConstraintB(['groups' => 'foo']));
 
         $this->metadata->mergeConstraints($parent);
         $this->metadata->addPropertyConstraint('firstName', new ConstraintA());
 
-        $constraintA1 = new ConstraintA(array('groups' => array(
+        $constraintA1 = new ConstraintA(['groups' => [
             'Default',
             'EntityParent',
             'Entity',
-        )));
-        $constraintA2 = new ConstraintA(array('groups' => array(
+        ]]);
+        $constraintA2 = new ConstraintA(['groups' => [
             'Default',
             'Entity',
-        )));
-        $constraintB = new ConstraintB(array(
-            'groups' => array('foo'),
-        ));
+        ]]);
+        $constraintB = new ConstraintB([
+            'groups' => ['foo'],
+        ]);
 
-        $constraints = array(
+        $constraints = [
             $constraintA1,
             $constraintB,
             $constraintA2,
-        );
+        ];
 
-        $constraintsByGroup = array(
-            'Default' => array(
+        $constraintsByGroup = [
+            'Default' => [
                 $constraintA1,
                 $constraintA2,
-            ),
-            'EntityParent' => array(
+            ],
+            'EntityParent' => [
                 $constraintA1,
-            ),
-            'Entity' => array(
+            ],
+            'Entity' => [
                 $constraintA1,
                 $constraintA2,
-            ),
-            'foo' => array(
+            ],
+            'foo' => [
                 $constraintB,
-            ),
-        );
+            ],
+        ];
 
         $members = $this->metadata->getPropertyMetadata('firstName');
 
@@ -201,19 +201,19 @@ public function testMergeConstraintsKeepsPrivateMembersSeparate()
         $this->metadata->mergeConstraints($parent);
         $this->metadata->addPropertyConstraint('internal', new ConstraintA());
 
-        $parentConstraints = array(
-            new ConstraintA(array('groups' => array(
+        $parentConstraints = [
+            new ConstraintA(['groups' => [
                 'Default',
                 'EntityParent',
                 'Entity',
-            ))),
-        );
-        $constraints = array(
-            new ConstraintA(array('groups' => array(
+            ]]),
+        ];
+        $constraints = [
+            new ConstraintA(['groups' => [
                 'Default',
                 'Entity',
-            ))),
-        );
+            ]]),
+        ];
 
         $members = $this->metadata->getPropertyMetadata('internal');
 
@@ -233,8 +233,8 @@ public function testGetReflectionClass()
 
     public function testSerialize()
     {
-        $this->metadata->addConstraint(new ConstraintA(array('property1' => 'A')));
-        $this->metadata->addConstraint(new ConstraintB(array('groups' => 'TestGroup')));
+        $this->metadata->addConstraint(new ConstraintA(['property1' => 'A']));
+        $this->metadata->addConstraint(new ConstraintB(['groups' => 'TestGroup']));
         $this->metadata->addPropertyConstraint('firstName', new ConstraintA());
         $this->metadata->addGetterConstraint('lastName', new ConstraintB());
 
@@ -245,7 +245,7 @@ public function testSerialize()
 
     public function testGroupSequencesWorkIfContainingDefaultGroup()
     {
-        $this->metadata->setGroupSequence(array('Foo', $this->metadata->getDefaultGroup()));
+        $this->metadata->setGroupSequence(['Foo', $this->metadata->getDefaultGroup()]);
 
         $this->assertInstanceOf('Symfony\Component\Validator\Constraints\GroupSequence', $this->metadata->getGroupSequence());
     }
@@ -255,7 +255,7 @@ public function testGroupSequencesWorkIfContainingDefaultGroup()
      */
     public function testGroupSequencesFailIfNotContainingDefaultGroup()
     {
-        $this->metadata->setGroupSequence(array('Foo', 'Bar'));
+        $this->metadata->setGroupSequence(['Foo', 'Bar']);
     }
 
     /**
@@ -263,7 +263,7 @@ public function testGroupSequencesFailIfNotContainingDefaultGroup()
      */
     public function testGroupSequencesFailIfContainingDefault()
     {
-        $this->metadata->setGroupSequence(array('Foo', $this->metadata->getDefaultGroup(), Constraint::DEFAULT_GROUP));
+        $this->metadata->setGroupSequence(['Foo', $this->metadata->getDefaultGroup(), Constraint::DEFAULT_GROUP]);
     }
 
     /**
@@ -273,7 +273,7 @@ public function testGroupSequenceFailsIfGroupSequenceProviderIsSet()
     {
         $metadata = new ClassMetadata(self::PROVIDERCLASS);
         $metadata->setGroupSequenceProvider(true);
-        $metadata->setGroupSequence(array('GroupSequenceProviderEntity', 'Foo'));
+        $metadata->setGroupSequence(['GroupSequenceProviderEntity', 'Foo']);
     }
 
     /**
@@ -282,7 +282,7 @@ public function testGroupSequenceFailsIfGroupSequenceProviderIsSet()
     public function testGroupSequenceProviderFailsIfGroupSequenceIsSet()
     {
         $metadata = new ClassMetadata(self::PROVIDERCLASS);
-        $metadata->setGroupSequence(array('GroupSequenceProviderEntity', 'Foo'));
+        $metadata->setGroupSequence(['GroupSequenceProviderEntity', 'Foo']);
         $metadata->setGroupSequenceProvider(true);
     }
 
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
index de6852271e17f..a7876d7f9168f 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
@@ -31,10 +31,10 @@ public function testLoadClassMetadataWithInterface()
         $factory = new LazyLoadingMetadataFactory(new TestLoader());
         $metadata = $factory->getMetadataFor(self::PARENT_CLASS);
 
-        $constraints = array(
-            new ConstraintA(array('groups' => array('Default', 'EntityParent'))),
-            new ConstraintA(array('groups' => array('Default', 'EntityInterfaceA', 'EntityParent'))),
-        );
+        $constraints = [
+            new ConstraintA(['groups' => ['Default', 'EntityParent']]),
+            new ConstraintA(['groups' => ['Default', 'EntityInterfaceA', 'EntityParent']]),
+        ];
 
         $this->assertEquals($constraints, $metadata->getConstraints());
     }
@@ -44,34 +44,34 @@ public function testMergeParentConstraints()
         $factory = new LazyLoadingMetadataFactory(new TestLoader());
         $metadata = $factory->getMetadataFor(self::CLASS_NAME);
 
-        $constraints = array(
-            new ConstraintA(array('groups' => array(
+        $constraints = [
+            new ConstraintA(['groups' => [
                 'Default',
                 'Entity',
-            ))),
-            new ConstraintA(array('groups' => array(
+            ]]),
+            new ConstraintA(['groups' => [
                 'Default',
                 'EntityParent',
                 'Entity',
-            ))),
-            new ConstraintA(array('groups' => array(
+            ]]),
+            new ConstraintA(['groups' => [
                 'Default',
                 'EntityInterfaceA',
                 'EntityParent',
                 'Entity',
-            ))),
-            new ConstraintA(array('groups' => array(
+            ]]),
+            new ConstraintA(['groups' => [
                 'Default',
                 'EntityInterfaceB',
                 'Entity',
-            ))),
-            new ConstraintA(array('groups' => array(
+            ]]),
+            new ConstraintA(['groups' => [
                 'Default',
                 'EntityParentInterface',
                 'EntityInterfaceB',
                 'Entity',
-            ))),
-        );
+            ]]),
+        ];
 
         $this->assertEquals($constraints, $metadata->getConstraints());
     }
@@ -81,21 +81,21 @@ public function testWriteMetadataToCache()
         $cache = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Cache\CacheInterface')->getMock();
         $factory = new LazyLoadingMetadataFactory(new TestLoader(), $cache);
 
-        $parentClassConstraints = array(
-            new ConstraintA(array('groups' => array('Default', 'EntityParent'))),
-            new ConstraintA(array('groups' => array('Default', 'EntityInterfaceA', 'EntityParent'))),
-        );
-        $interfaceAConstraints = array(
-            new ConstraintA(array('groups' => array('Default', 'EntityInterfaceA'))),
-        );
+        $parentClassConstraints = [
+            new ConstraintA(['groups' => ['Default', 'EntityParent']]),
+            new ConstraintA(['groups' => ['Default', 'EntityInterfaceA', 'EntityParent']]),
+        ];
+        $interfaceAConstraints = [
+            new ConstraintA(['groups' => ['Default', 'EntityInterfaceA']]),
+        ];
 
         $cache->expects($this->never())
               ->method('has');
         $cache->expects($this->exactly(2))
               ->method('read')
               ->withConsecutive(
-                  array($this->equalTo(self::PARENT_CLASS)),
-                  array($this->equalTo(self::INTERFACE_A_CLASS))
+                  [$this->equalTo(self::PARENT_CLASS)],
+                  [$this->equalTo(self::INTERFACE_A_CLASS)]
               )
               ->will($this->returnValue(false));
         $cache->expects($this->exactly(2))
@@ -135,8 +135,8 @@ public function testReadMetadataFromCache()
         $cache->expects($this->exactly(2))
               ->method('read')
               ->withConsecutive(
-                  array(self::PARENT_CLASS),
-                  array(self::INTERFACE_A_CLASS)
+                  [self::PARENT_CLASS],
+                  [self::INTERFACE_A_CLASS]
               )
               ->willReturnCallback(function ($name) use ($metadata, $parentClass, $interfaceClass) {
                   if ($parentClass == $name) {
@@ -194,7 +194,7 @@ public function testGroupsFromParent()
         $reader = new \Symfony\Component\Validator\Mapping\Loader\StaticMethodLoader();
         $factory = new LazyLoadingMetadataFactory($reader);
         $metadata = $factory->getMetadataFor('Symfony\Component\Validator\Tests\Fixtures\EntityStaticCarTurbo');
-        $groups = array();
+        $groups = [];
 
         foreach ($metadata->getPropertyMetadata('wheels') as $propertyMetadata) {
             $constraints = $propertyMetadata->getConstraints();
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/AnnotationLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/AnnotationLoaderTest.php
index 783e9b27d850c..e5009624296e8 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Loader/AnnotationLoaderTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/Loader/AnnotationLoaderTest.php
@@ -52,23 +52,23 @@ public function testLoadClassMetadata()
         $loader->loadClassMetadata($metadata);
 
         $expected = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');
-        $expected->setGroupSequence(array('Foo', 'Entity'));
+        $expected->setGroupSequence(['Foo', 'Entity']);
         $expected->addConstraint(new ConstraintA());
-        $expected->addConstraint(new Callback(array('Symfony\Component\Validator\Tests\Fixtures\CallbackClass', 'callback')));
-        $expected->addConstraint(new Callback(array('callback' => 'validateMe', 'payload' => 'foo')));
+        $expected->addConstraint(new Callback(['Symfony\Component\Validator\Tests\Fixtures\CallbackClass', 'callback']));
+        $expected->addConstraint(new Callback(['callback' => 'validateMe', 'payload' => 'foo']));
         $expected->addConstraint(new Callback('validateMeStatic'));
         $expected->addPropertyConstraint('firstName', new NotNull());
-        $expected->addPropertyConstraint('firstName', new Range(array('min' => 3)));
-        $expected->addPropertyConstraint('firstName', new All(array(new NotNull(), new Range(array('min' => 3)))));
-        $expected->addPropertyConstraint('firstName', new All(array('constraints' => array(new NotNull(), new Range(array('min' => 3))))));
-        $expected->addPropertyConstraint('firstName', new Collection(array('fields' => array(
-            'foo' => array(new NotNull(), new Range(array('min' => 3))),
-            'bar' => new Range(array('min' => 5)),
-        ))));
-        $expected->addPropertyConstraint('firstName', new Choice(array(
+        $expected->addPropertyConstraint('firstName', new Range(['min' => 3]));
+        $expected->addPropertyConstraint('firstName', new All([new NotNull(), new Range(['min' => 3])]));
+        $expected->addPropertyConstraint('firstName', new All(['constraints' => [new NotNull(), new Range(['min' => 3])]]));
+        $expected->addPropertyConstraint('firstName', new Collection(['fields' => [
+            'foo' => [new NotNull(), new Range(['min' => 3])],
+            'bar' => new Range(['min' => 5]),
+        ]]));
+        $expected->addPropertyConstraint('firstName', new Choice([
             'message' => 'Must be one of %choices%',
-            'choices' => array('A', 'B'),
-        )));
+            'choices' => ['A', 'B'],
+        ]));
         $expected->addPropertyConstraint('childA', new Valid());
         $expected->addPropertyConstraint('childB', new Valid());
         $expected->addGetterConstraint('lastName', new NotNull());
@@ -124,23 +124,23 @@ public function testLoadClassMetadataAndMerge()
         $expected = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');
         $expected->mergeConstraints($expected_parent);
 
-        $expected->setGroupSequence(array('Foo', 'Entity'));
+        $expected->setGroupSequence(['Foo', 'Entity']);
         $expected->addConstraint(new ConstraintA());
-        $expected->addConstraint(new Callback(array('Symfony\Component\Validator\Tests\Fixtures\CallbackClass', 'callback')));
-        $expected->addConstraint(new Callback(array('callback' => 'validateMe', 'payload' => 'foo')));
+        $expected->addConstraint(new Callback(['Symfony\Component\Validator\Tests\Fixtures\CallbackClass', 'callback']));
+        $expected->addConstraint(new Callback(['callback' => 'validateMe', 'payload' => 'foo']));
         $expected->addConstraint(new Callback('validateMeStatic'));
         $expected->addPropertyConstraint('firstName', new NotNull());
-        $expected->addPropertyConstraint('firstName', new Range(array('min' => 3)));
-        $expected->addPropertyConstraint('firstName', new All(array(new NotNull(), new Range(array('min' => 3)))));
-        $expected->addPropertyConstraint('firstName', new All(array('constraints' => array(new NotNull(), new Range(array('min' => 3))))));
-        $expected->addPropertyConstraint('firstName', new Collection(array('fields' => array(
-            'foo' => array(new NotNull(), new Range(array('min' => 3))),
-            'bar' => new Range(array('min' => 5)),
-        ))));
-        $expected->addPropertyConstraint('firstName', new Choice(array(
+        $expected->addPropertyConstraint('firstName', new Range(['min' => 3]));
+        $expected->addPropertyConstraint('firstName', new All([new NotNull(), new Range(['min' => 3])]));
+        $expected->addPropertyConstraint('firstName', new All(['constraints' => [new NotNull(), new Range(['min' => 3])]]));
+        $expected->addPropertyConstraint('firstName', new Collection(['fields' => [
+            'foo' => [new NotNull(), new Range(['min' => 3])],
+            'bar' => new Range(['min' => 5]),
+        ]]));
+        $expected->addPropertyConstraint('firstName', new Choice([
             'message' => 'Must be one of %choices%',
-            'choices' => array('A', 'B'),
-        )));
+            'choices' => ['A', 'B'],
+        ]));
         $expected->addPropertyConstraint('childA', new Valid());
         $expected->addPropertyConstraint('childB', new Valid());
         $expected->addGetterConstraint('lastName', new NotNull());
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php
index 6fee7b6ff5407..2cf009fc08371 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php
@@ -34,12 +34,12 @@ public function testCallsActualFileLoaderForMetadata()
 
     public function getFilesLoader(LoaderInterface $loader)
     {
-        return $this->getMockForAbstractClass('Symfony\Component\Validator\Tests\Fixtures\FilesLoader', array(array(
+        return $this->getMockForAbstractClass('Symfony\Component\Validator\Tests\Fixtures\FilesLoader', [[
             __DIR__.'/constraint-mapping.xml',
             __DIR__.'/constraint-mapping.yaml',
             __DIR__.'/constraint-mapping.test',
             __DIR__.'/constraint-mapping.txt',
-        ), $loader));
+        ], $loader]);
     }
 
     public function getFileLoader()
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/LoaderChainTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/LoaderChainTest.php
index 0d28b0a399e48..f9905386c9601 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Loader/LoaderChainTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/Loader/LoaderChainTest.php
@@ -31,10 +31,10 @@ public function testAllLoadersAreCalled()
             ->method('loadClassMetadata')
             ->with($this->equalTo($metadata));
 
-        $chain = new LoaderChain(array(
+        $chain = new LoaderChain([
             $loader1,
             $loader2,
-        ));
+        ]);
 
         $chain->loadClassMetadata($metadata);
     }
@@ -53,10 +53,10 @@ public function testReturnsTrueIfAnyLoaderReturnedTrue()
             ->method('loadClassMetadata')
             ->will($this->returnValue(false));
 
-        $chain = new LoaderChain(array(
+        $chain = new LoaderChain([
             $loader1,
             $loader2,
-        ));
+        ]);
 
         $this->assertTrue($chain->loadClassMetadata($metadata));
     }
@@ -75,10 +75,10 @@ public function testReturnsFalseIfNoLoaderReturnedTrue()
             ->method('loadClassMetadata')
             ->will($this->returnValue(false));
 
-        $chain = new LoaderChain(array(
+        $chain = new LoaderChain([
             $loader1,
             $loader2,
-        ));
+        ]);
 
         $this->assertFalse($chain->loadClassMetadata($metadata));
     }
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php
index 100e4fa062fc1..d6b20a0c8dcb9 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php
@@ -53,26 +53,26 @@ public function testLoadClassMetadata()
         $loader->loadClassMetadata($metadata);
 
         $expected = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');
-        $expected->setGroupSequence(array('Foo', 'Entity'));
+        $expected->setGroupSequence(['Foo', 'Entity']);
         $expected->addConstraint(new ConstraintA());
         $expected->addConstraint(new ConstraintB());
         $expected->addConstraint(new Callback('validateMe'));
         $expected->addConstraint(new Callback('validateMeStatic'));
-        $expected->addConstraint(new Callback(array('Symfony\Component\Validator\Tests\Fixtures\CallbackClass', 'callback')));
+        $expected->addConstraint(new Callback(['Symfony\Component\Validator\Tests\Fixtures\CallbackClass', 'callback']));
         $expected->addConstraint(new Traverse(false));
         $expected->addPropertyConstraint('firstName', new NotNull());
-        $expected->addPropertyConstraint('firstName', new Range(array('min' => 3)));
-        $expected->addPropertyConstraint('firstName', new Choice(array('A', 'B')));
-        $expected->addPropertyConstraint('firstName', new All(array(new NotNull(), new Range(array('min' => 3)))));
-        $expected->addPropertyConstraint('firstName', new All(array('constraints' => array(new NotNull(), new Range(array('min' => 3))))));
-        $expected->addPropertyConstraint('firstName', new Collection(array('fields' => array(
-            'foo' => array(new NotNull(), new Range(array('min' => 3))),
-            'bar' => array(new Range(array('min' => 5))),
-        ))));
-        $expected->addPropertyConstraint('firstName', new Choice(array(
+        $expected->addPropertyConstraint('firstName', new Range(['min' => 3]));
+        $expected->addPropertyConstraint('firstName', new Choice(['A', 'B']));
+        $expected->addPropertyConstraint('firstName', new All([new NotNull(), new Range(['min' => 3])]));
+        $expected->addPropertyConstraint('firstName', new All(['constraints' => [new NotNull(), new Range(['min' => 3])]]));
+        $expected->addPropertyConstraint('firstName', new Collection(['fields' => [
+            'foo' => [new NotNull(), new Range(['min' => 3])],
+            'bar' => [new Range(['min' => 5])],
+        ]]));
+        $expected->addPropertyConstraint('firstName', new Choice([
             'message' => 'Must be one of %choices%',
-            'choices' => array('A', 'B'),
-        )));
+            'choices' => ['A', 'B'],
+        ]));
         $expected->addGetterConstraint('lastName', new NotNull());
         $expected->addGetterConstraint('valid', new IsTrue());
         $expected->addGetterConstraint('permissions', new IsTrue());
@@ -88,7 +88,7 @@ public function testLoadClassMetadataWithNonStrings()
         $loader->loadClassMetadata($metadata);
 
         $expected = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');
-        $expected->addPropertyConstraint('firstName', new Regex(array('pattern' => '/^1/', 'match' => false)));
+        $expected->addPropertyConstraint('firstName', new Regex(['pattern' => '/^1/', 'match' => false]));
 
         $properties = $metadata->getPropertyMetadata('firstName');
         $constraints = $properties[0]->getConstraints();
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php
index 9920fb0737ae9..afa50cbee6485 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php
@@ -35,7 +35,7 @@ public function testLoadClassMetadataReturnsFalseIfEmpty()
 
         $r = new \ReflectionProperty($loader, 'classes');
         $r->setAccessible(true);
-        $this->assertSame(array(), $r->getValue($loader));
+        $this->assertSame([], $r->getValue($loader));
     }
 
     /**
@@ -52,10 +52,10 @@ public function testInvalidYamlFiles($path)
 
     public function provideInvalidYamlFiles()
     {
-        return array(
-            array('nonvalid-mapping.yml'),
-            array('bad-format.yml'),
-        );
+        return [
+            ['nonvalid-mapping.yml'],
+            ['bad-format.yml'],
+        ];
     }
 
     /**
@@ -98,25 +98,25 @@ public function testLoadClassMetadata()
         $loader->loadClassMetadata($metadata);
 
         $expected = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');
-        $expected->setGroupSequence(array('Foo', 'Entity'));
+        $expected->setGroupSequence(['Foo', 'Entity']);
         $expected->addConstraint(new ConstraintA());
         $expected->addConstraint(new ConstraintB());
         $expected->addConstraint(new Callback('validateMe'));
         $expected->addConstraint(new Callback('validateMeStatic'));
-        $expected->addConstraint(new Callback(array('Symfony\Component\Validator\Tests\Fixtures\CallbackClass', 'callback')));
+        $expected->addConstraint(new Callback(['Symfony\Component\Validator\Tests\Fixtures\CallbackClass', 'callback']));
         $expected->addPropertyConstraint('firstName', new NotNull());
-        $expected->addPropertyConstraint('firstName', new Range(array('min' => 3)));
-        $expected->addPropertyConstraint('firstName', new Choice(array('A', 'B')));
-        $expected->addPropertyConstraint('firstName', new All(array(new NotNull(), new Range(array('min' => 3)))));
-        $expected->addPropertyConstraint('firstName', new All(array('constraints' => array(new NotNull(), new Range(array('min' => 3))))));
-        $expected->addPropertyConstraint('firstName', new Collection(array('fields' => array(
-            'foo' => array(new NotNull(), new Range(array('min' => 3))),
-            'bar' => array(new Range(array('min' => 5))),
-        ))));
-        $expected->addPropertyConstraint('firstName', new Choice(array(
+        $expected->addPropertyConstraint('firstName', new Range(['min' => 3]));
+        $expected->addPropertyConstraint('firstName', new Choice(['A', 'B']));
+        $expected->addPropertyConstraint('firstName', new All([new NotNull(), new Range(['min' => 3])]));
+        $expected->addPropertyConstraint('firstName', new All(['constraints' => [new NotNull(), new Range(['min' => 3])]]));
+        $expected->addPropertyConstraint('firstName', new Collection(['fields' => [
+            'foo' => [new NotNull(), new Range(['min' => 3])],
+            'bar' => [new Range(['min' => 5])],
+        ]]));
+        $expected->addPropertyConstraint('firstName', new Choice([
             'message' => 'Must be one of %choices%',
-            'choices' => array('A', 'B'),
-        )));
+            'choices' => ['A', 'B'],
+        ]));
         $expected->addGetterConstraint('lastName', new NotNull());
         $expected->addGetterConstraint('valid', new IsTrue());
         $expected->addGetterConstraint('permissions', new IsTrue());
@@ -132,7 +132,7 @@ public function testLoadClassMetadataWithConstants()
         $loader->loadClassMetadata($metadata);
 
         $expected = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');
-        $expected->addPropertyConstraint('firstName', new Range(array('max' => PHP_INT_MAX)));
+        $expected->addPropertyConstraint('firstName', new Range(['max' => PHP_INT_MAX]));
 
         $this->assertEquals($expected, $metadata);
     }
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/MemberMetadataTest.php b/src/Symfony/Component/Validator/Tests/Mapping/MemberMetadataTest.php
index 593f90faa66b6..b6983f75b5715 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/MemberMetadataTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/MemberMetadataTest.php
@@ -45,8 +45,8 @@ public function testAddConstraintRequiresClassConstraints()
 
     public function testSerialize()
     {
-        $this->metadata->addConstraint(new ConstraintA(array('property1' => 'A')));
-        $this->metadata->addConstraint(new ConstraintB(array('groups' => 'TestGroup')));
+        $this->metadata->addConstraint(new ConstraintA(['property1' => 'A']));
+        $this->metadata->addConstraint(new ConstraintB(['groups' => 'TestGroup']));
 
         $metadata = unserialize(serialize($this->metadata));
 
@@ -55,7 +55,7 @@ public function testSerialize()
 
     public function testSerializeCollectionCascaded()
     {
-        $this->metadata->addConstraint(new Valid(array('traverse' => true)));
+        $this->metadata->addConstraint(new Valid(['traverse' => true]));
 
         $metadata = unserialize(serialize($this->metadata));
 
@@ -64,7 +64,7 @@ public function testSerializeCollectionCascaded()
 
     public function testSerializeCollectionNotCascaded()
     {
-        $this->metadata->addConstraint(new Valid(array('traverse' => false)));
+        $this->metadata->addConstraint(new Valid(['traverse' => false]));
 
         $metadata = unserialize(serialize($this->metadata));
 
diff --git a/src/Symfony/Component/Validator/Tests/Util/PropertyPathTest.php b/src/Symfony/Component/Validator/Tests/Util/PropertyPathTest.php
index 235e1780d9078..f796463bbc320 100644
--- a/src/Symfony/Component/Validator/Tests/Util/PropertyPathTest.php
+++ b/src/Symfony/Component/Validator/Tests/Util/PropertyPathTest.php
@@ -26,12 +26,12 @@ public function testAppend($basePath, $subPath, $expectedPath, $message)
 
     public function provideAppendPaths()
     {
-        return array(
-            array('foo', '', 'foo', 'It returns the basePath if subPath is empty'),
-            array('', 'bar', 'bar', 'It returns the subPath if basePath is empty'),
-            array('foo', 'bar', 'foo.bar', 'It append the subPath to the basePath'),
-            array('foo', '[bar]', 'foo[bar]', 'It does not include the dot separator if subPath uses the array notation'),
-            array('0', 'bar', '0.bar', 'Leading zeros are kept.'),
-        );
+        return [
+            ['foo', '', 'foo', 'It returns the basePath if subPath is empty'],
+            ['', 'bar', 'bar', 'It returns the subPath if basePath is empty'],
+            ['foo', 'bar', 'foo.bar', 'It append the subPath to the basePath'],
+            ['foo', '[bar]', 'foo[bar]', 'It does not include the dot separator if subPath uses the array notation'],
+            ['0', 'bar', '0.bar', 'Leading zeros are kept.'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php b/src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php
index 6587dae139550..1df64de4d99c6 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php
@@ -41,7 +41,7 @@ abstract class AbstractTest extends AbstractValidatorTest
     /**
      * @return ValidatorInterface
      */
-    abstract protected function createValidator(MetadataFactoryInterface $metadataFactory, array $objectInitializers = array());
+    abstract protected function createValidator(MetadataFactoryInterface $metadataFactory, array $objectInitializers = []);
 
     protected function setUp()
     {
@@ -74,7 +74,7 @@ public function testValidateConstraintWithoutGroup()
 
     public function testValidateWithEmptyArrayAsConstraint()
     {
-        $violations = $this->validator->validate('value', array());
+        $violations = $this->validator->validate('value', []);
         $this->assertCount(0, $violations);
     }
 
@@ -89,20 +89,20 @@ public function testGroupSequenceAbortsAfterFailedGroup()
             $context->addViolation('Message 2');
         };
 
-        $this->metadata->addConstraint(new Callback(array(
+        $this->metadata->addConstraint(new Callback([
             'callback' => function () {},
             'groups' => 'Group 1',
-        )));
-        $this->metadata->addConstraint(new Callback(array(
+        ]));
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback1,
             'groups' => 'Group 2',
-        )));
-        $this->metadata->addConstraint(new Callback(array(
+        ]));
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback2,
             'groups' => 'Group 3',
-        )));
+        ]));
 
-        $sequence = new GroupSequence(array('Group 1', 'Group 2', 'Group 3'));
+        $sequence = new GroupSequence(['Group 1', 'Group 2', 'Group 3']);
         $violations = $this->validator->validate($entity, new Valid(), $sequence);
 
         /* @var ConstraintViolationInterface[] $violations */
@@ -123,16 +123,16 @@ public function testGroupSequenceIncludesReferences()
         };
 
         $this->metadata->addPropertyConstraint('reference', new Valid());
-        $this->referenceMetadata->addConstraint(new Callback(array(
+        $this->referenceMetadata->addConstraint(new Callback([
             'callback' => $callback1,
             'groups' => 'Group 1',
-        )));
-        $this->referenceMetadata->addConstraint(new Callback(array(
+        ]));
+        $this->referenceMetadata->addConstraint(new Callback([
             'callback' => $callback2,
             'groups' => 'Group 2',
-        )));
+        ]));
 
-        $sequence = new GroupSequence(array('Group 1', 'Entity'));
+        $sequence = new GroupSequence(['Group 1', 'Entity']);
         $violations = $this->validator->validate($entity, new Valid(), $sequence);
 
         /* @var ConstraintViolationInterface[] $violations */
@@ -157,7 +157,7 @@ public function testValidateInSeparateContext()
             $this->assertCount(1, $violations);
             $this->assertSame('Message value', $violations[0]->getMessage());
             $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-            $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+            $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
             $this->assertSame('', $violations[0]->getPropertyPath());
 
             // The root is different as we're in a new context
@@ -180,17 +180,17 @@ public function testValidateInSeparateContext()
             $this->assertSame($entity->reference, $context->getValue());
             $this->assertSame($entity->reference, $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
-        $this->metadata->addConstraint(new Callback(array(
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback1,
             'groups' => 'Group',
-        )));
-        $this->referenceMetadata->addConstraint(new Callback(array(
+        ]));
+        $this->referenceMetadata->addConstraint(new Callback([
             'callback' => $callback2,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validator->validate($entity, new Valid(), 'Group');
 
@@ -236,17 +236,17 @@ public function testValidateInContext()
             $this->assertSame($entity->reference, $context->getValue());
             $this->assertSame($entity->reference, $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
-        $this->metadata->addConstraint(new Callback(array(
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback1,
             'groups' => 'Group',
-        )));
-        $this->referenceMetadata->addConstraint(new Callback(array(
+        ]));
+        $this->referenceMetadata->addConstraint(new Callback([
             'callback' => $callback2,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validator->validate($entity, new Valid(), 'Group');
 
@@ -254,7 +254,7 @@ public function testValidateInContext()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('subpath', $violations[0]->getPropertyPath());
         $this->assertSame($entity, $violations[0]->getRoot());
         $this->assertSame($entity->reference, $violations[0]->getInvalidValue());
@@ -278,7 +278,7 @@ public function testValidateArrayInContext()
                 ->getValidator()
                 ->inContext($context)
                 ->atPath('subpath')
-                ->validate(array('key' => $value->reference))
+                ->validate(['key' => $value->reference])
             ;
 
             // context changes shouldn't leak out of the validate() call
@@ -299,17 +299,17 @@ public function testValidateArrayInContext()
             $this->assertSame($entity->reference, $context->getValue());
             $this->assertSame($entity->reference, $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
-        $this->metadata->addConstraint(new Callback(array(
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback1,
             'groups' => 'Group',
-        )));
-        $this->referenceMetadata->addConstraint(new Callback(array(
+        ]));
+        $this->referenceMetadata->addConstraint(new Callback([
             'callback' => $callback2,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validator->validate($entity, new Valid(), 'Group');
 
@@ -317,7 +317,7 @@ public function testValidateArrayInContext()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('subpath[key]', $violations[0]->getPropertyPath());
         $this->assertSame($entity, $violations[0]->getRoot());
         $this->assertSame($entity->reference, $violations[0]->getInvalidValue());
@@ -328,7 +328,7 @@ public function testValidateArrayInContext()
     public function testTraverseTraversableByDefault()
     {
         $entity = new Entity();
-        $traversable = new \ArrayIterator(array('key' => $entity));
+        $traversable = new \ArrayIterator(['key' => $entity]);
 
         $callback = function ($value, ExecutionContextInterface $context) use ($entity, $traversable) {
             $this->assertSame($this::ENTITY_CLASS, $context->getClassName());
@@ -340,14 +340,14 @@ public function testTraverseTraversableByDefault()
             $this->assertSame($entity, $context->getValue());
             $this->assertSame($entity, $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
         $this->metadataFactory->addMetadata(new ClassMetadata('ArrayIterator'));
-        $this->metadata->addConstraint(new Callback(array(
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validate($traversable, new Valid(), 'Group');
 
@@ -355,7 +355,7 @@ public function testTraverseTraversableByDefault()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('[key]', $violations[0]->getPropertyPath());
         $this->assertSame($traversable, $violations[0]->getRoot());
         $this->assertSame($entity, $violations[0]->getInvalidValue());
@@ -366,7 +366,7 @@ public function testTraverseTraversableByDefault()
     public function testTraversalEnabledOnClass()
     {
         $entity = new Entity();
-        $traversable = new \ArrayIterator(array('key' => $entity));
+        $traversable = new \ArrayIterator(['key' => $entity]);
 
         $callback = function ($value, ExecutionContextInterface $context) {
             $context->addViolation('Message');
@@ -376,10 +376,10 @@ public function testTraversalEnabledOnClass()
         $traversableMetadata->addConstraint(new Traverse(true));
 
         $this->metadataFactory->addMetadata($traversableMetadata);
-        $this->metadata->addConstraint(new Callback(array(
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validate($traversable, new Valid(), 'Group');
 
@@ -390,7 +390,7 @@ public function testTraversalEnabledOnClass()
     public function testTraversalDisabledOnClass()
     {
         $entity = new Entity();
-        $traversable = new \ArrayIterator(array('key' => $entity));
+        $traversable = new \ArrayIterator(['key' => $entity]);
 
         $callback = function ($value, ExecutionContextInterface $context) {
             $this->fail('Should not be called');
@@ -400,10 +400,10 @@ public function testTraversalDisabledOnClass()
         $traversableMetadata->addConstraint(new Traverse(false));
 
         $this->metadataFactory->addMetadata($traversableMetadata);
-        $this->metadata->addConstraint(new Callback(array(
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validate($traversable, new Valid(), 'Group');
 
@@ -426,7 +426,7 @@ public function testExpectTraversableIfTraversalEnabledOnClass()
     public function testReferenceTraversalDisabledOnClass()
     {
         $entity = new Entity();
-        $entity->reference = new \ArrayIterator(array('key' => new Reference()));
+        $entity->reference = new \ArrayIterator(['key' => new Reference()]);
 
         $callback = function ($value, ExecutionContextInterface $context) {
             $this->fail('Should not be called');
@@ -436,10 +436,10 @@ public function testReferenceTraversalDisabledOnClass()
         $traversableMetadata->addConstraint(new Traverse(false));
 
         $this->metadataFactory->addMetadata($traversableMetadata);
-        $this->referenceMetadata->addConstraint(new Callback(array(
+        $this->referenceMetadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
+        ]));
         $this->metadata->addPropertyConstraint('reference', new Valid());
 
         $violations = $this->validate($entity, new Valid(), 'Group');
@@ -451,7 +451,7 @@ public function testReferenceTraversalDisabledOnClass()
     public function testReferenceTraversalEnabledOnReferenceDisabledOnClass()
     {
         $entity = new Entity();
-        $entity->reference = new \ArrayIterator(array('key' => new Reference()));
+        $entity->reference = new \ArrayIterator(['key' => new Reference()]);
 
         $callback = function ($value, ExecutionContextInterface $context) {
             $this->fail('Should not be called');
@@ -461,13 +461,13 @@ public function testReferenceTraversalEnabledOnReferenceDisabledOnClass()
         $traversableMetadata->addConstraint(new Traverse(false));
 
         $this->metadataFactory->addMetadata($traversableMetadata);
-        $this->referenceMetadata->addConstraint(new Callback(array(
+        $this->referenceMetadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
-        $this->metadata->addPropertyConstraint('reference', new Valid(array(
+        ]));
+        $this->metadata->addPropertyConstraint('reference', new Valid([
             'traverse' => true,
-        )));
+        ]));
 
         $violations = $this->validate($entity, new Valid(), 'Group');
 
@@ -478,7 +478,7 @@ public function testReferenceTraversalEnabledOnReferenceDisabledOnClass()
     public function testReferenceTraversalDisabledOnReferenceEnabledOnClass()
     {
         $entity = new Entity();
-        $entity->reference = new \ArrayIterator(array('key' => new Reference()));
+        $entity->reference = new \ArrayIterator(['key' => new Reference()]);
 
         $callback = function ($value, ExecutionContextInterface $context) {
             $this->fail('Should not be called');
@@ -488,13 +488,13 @@ public function testReferenceTraversalDisabledOnReferenceEnabledOnClass()
         $traversableMetadata->addConstraint(new Traverse(true));
 
         $this->metadataFactory->addMetadata($traversableMetadata);
-        $this->referenceMetadata->addConstraint(new Callback(array(
+        $this->referenceMetadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
-        $this->metadata->addPropertyConstraint('reference', new Valid(array(
+        ]));
+        $this->metadata->addPropertyConstraint('reference', new Valid([
             'traverse' => false,
-        )));
+        ]));
 
         $violations = $this->validate($entity, new Valid(), 'Group');
 
@@ -523,7 +523,7 @@ public function testAddCustomizedViolation()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('', $violations[0]->getPropertyPath());
         $this->assertSame($entity, $violations[0]->getRoot());
         $this->assertSame('Invalid value', $violations[0]->getInvalidValue());
@@ -539,12 +539,12 @@ public function testNoDuplicateValidationIfClassConstraintInMultipleGroups()
             $context->addViolation('Message');
         };
 
-        $this->metadata->addConstraint(new Callback(array(
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback,
-            'groups' => array('Group 1', 'Group 2'),
-        )));
+            'groups' => ['Group 1', 'Group 2'],
+        ]));
 
-        $violations = $this->validator->validate($entity, new Valid(), array('Group 1', 'Group 2'));
+        $violations = $this->validator->validate($entity, new Valid(), ['Group 1', 'Group 2']);
 
         /* @var ConstraintViolationInterface[] $violations */
         $this->assertCount(1, $violations);
@@ -558,12 +558,12 @@ public function testNoDuplicateValidationIfPropertyConstraintInMultipleGroups()
             $context->addViolation('Message');
         };
 
-        $this->metadata->addPropertyConstraint('firstName', new Callback(array(
+        $this->metadata->addPropertyConstraint('firstName', new Callback([
             'callback' => $callback,
-            'groups' => array('Group 1', 'Group 2'),
-        )));
+            'groups' => ['Group 1', 'Group 2'],
+        ]));
 
-        $violations = $this->validator->validate($entity, new Valid(), array('Group 1', 'Group 2'));
+        $violations = $this->validator->validate($entity, new Valid(), ['Group 1', 'Group 2']);
 
         /* @var ConstraintViolationInterface[] $violations */
         $this->assertCount(1, $violations);
@@ -582,7 +582,7 @@ public function testAccessCurrentObject()
         $called = false;
         $entity = new Entity();
         $entity->firstName = 'Bernhard';
-        $entity->data = array('firstName' => 'Bernhard');
+        $entity->data = ['firstName' => 'Bernhard'];
 
         $callback = function ($value, ExecutionContextInterface $context) use ($entity, &$called) {
             $called = true;
@@ -591,7 +591,7 @@ public function testAccessCurrentObject()
 
         $this->metadata->addConstraint(new Callback($callback));
         $this->metadata->addPropertyConstraint('firstName', new Callback($callback));
-        $this->metadata->addPropertyConstraint('data', new Collection(array('firstName' => new Expression('value == this.firstName'))));
+        $this->metadata->addPropertyConstraint('data', new Collection(['firstName' => new Expression('value == this.firstName')]));
 
         $this->validator->validate($entity);
 
@@ -618,10 +618,10 @@ public function testInitializeObjectsOnFirstValidation()
             ->method('initialize')
             ->with($entity);
 
-        $this->validator = $this->createValidator($this->metadataFactory, array(
+        $this->validator = $this->createValidator($this->metadataFactory, [
             $initializer1,
             $initializer2,
-        ));
+        ]);
 
         // prepare constraint which
         // * checks that "initialized" is set to true
@@ -656,15 +656,15 @@ public function testPassConstraintToViolation()
 
     public function testCollectionConstraitViolationHasCorrectContext()
     {
-        $data = array(
+        $data = [
             'foo' => 'fooValue',
-        );
+        ];
 
         // Missing field must not be the first in the collection validation
-        $constraint = new Collection(array(
+        $constraint = new Collection([
             'foo' => new NotNull(),
             'bar' => new NotNull(),
-        ));
+        ]);
 
         $violations = $this->validate($data, $constraint);
 
@@ -680,11 +680,11 @@ public function testNestedObjectIsNotValidatedIfGroupInValidConstraintIsNotValid
         $reference->value = '';
         $entity->childA = $reference;
 
-        $this->metadata->addPropertyConstraint('firstName', new NotBlank(array('groups' => 'group1')));
-        $this->metadata->addPropertyConstraint('childA', new Valid(array('groups' => 'group1')));
+        $this->metadata->addPropertyConstraint('firstName', new NotBlank(['groups' => 'group1']));
+        $this->metadata->addPropertyConstraint('childA', new Valid(['groups' => 'group1']));
         $this->referenceMetadata->addPropertyConstraint('value', new NotBlank());
 
-        $violations = $this->validator->validate($entity, null, array());
+        $violations = $this->validator->validate($entity, null, []);
 
         $this->assertCount(0, $violations);
     }
@@ -697,11 +697,11 @@ public function testNestedObjectIsValidatedIfGroupInValidConstraintIsValidated()
         $reference->value = '';
         $entity->childA = $reference;
 
-        $this->metadata->addPropertyConstraint('firstName', new NotBlank(array('groups' => 'group1')));
-        $this->metadata->addPropertyConstraint('childA', new Valid(array('groups' => 'group1')));
-        $this->referenceMetadata->addPropertyConstraint('value', new NotBlank(array('groups' => 'group1')));
+        $this->metadata->addPropertyConstraint('firstName', new NotBlank(['groups' => 'group1']));
+        $this->metadata->addPropertyConstraint('childA', new Valid(['groups' => 'group1']));
+        $this->referenceMetadata->addPropertyConstraint('value', new NotBlank(['groups' => 'group1']));
 
-        $violations = $this->validator->validate($entity, null, array('Default', 'group1'));
+        $violations = $this->validator->validate($entity, null, ['Default', 'group1']);
 
         $this->assertCount(2, $violations);
     }
diff --git a/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php b/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php
index 7d303ce8a5435..ecfc10feb643a 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php
@@ -80,13 +80,13 @@ public function testValidate()
             $this->assertSame('Bernhard', $context->getValue());
             $this->assertSame('Bernhard', $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
-        $constraint = new Callback(array(
+        $constraint = new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        ));
+        ]);
 
         $violations = $this->validate('Bernhard', $constraint, 'Group');
 
@@ -94,7 +94,7 @@ public function testValidate()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('', $violations[0]->getPropertyPath());
         $this->assertSame('Bernhard', $violations[0]->getRoot());
         $this->assertSame('Bernhard', $violations[0]->getInvalidValue());
@@ -116,13 +116,13 @@ public function testClassConstraint()
             $this->assertSame($entity, $context->getValue());
             $this->assertSame($entity, $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
-        $this->metadata->addConstraint(new Callback(array(
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validate($entity, null, 'Group');
 
@@ -130,7 +130,7 @@ public function testClassConstraint()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('', $violations[0]->getPropertyPath());
         $this->assertSame($entity, $violations[0]->getRoot());
         $this->assertSame($entity, $violations[0]->getInvalidValue());
@@ -155,13 +155,13 @@ public function testPropertyConstraint()
             $this->assertSame('Bernhard', $context->getValue());
             $this->assertSame('Bernhard', $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
-        $this->metadata->addPropertyConstraint('firstName', new Callback(array(
+        $this->metadata->addPropertyConstraint('firstName', new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validate($entity, null, 'Group');
 
@@ -169,7 +169,7 @@ public function testPropertyConstraint()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('firstName', $violations[0]->getPropertyPath());
         $this->assertSame($entity, $violations[0]->getRoot());
         $this->assertSame('Bernhard', $violations[0]->getInvalidValue());
@@ -194,13 +194,13 @@ public function testGetterConstraint()
             $this->assertSame('Schussek', $context->getValue());
             $this->assertSame('Schussek', $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
-        $this->metadata->addGetterConstraint('lastName', new Callback(array(
+        $this->metadata->addGetterConstraint('lastName', new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validate($entity, null, 'Group');
 
@@ -208,7 +208,7 @@ public function testGetterConstraint()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('lastName', $violations[0]->getPropertyPath());
         $this->assertSame($entity, $violations[0]->getRoot());
         $this->assertSame('Schussek', $violations[0]->getInvalidValue());
@@ -219,7 +219,7 @@ public function testGetterConstraint()
     public function testArray()
     {
         $entity = new Entity();
-        $array = array('key' => $entity);
+        $array = ['key' => $entity];
 
         $callback = function ($value, ExecutionContextInterface $context) use ($entity, $array) {
             $this->assertSame($this::ENTITY_CLASS, $context->getClassName());
@@ -231,13 +231,13 @@ public function testArray()
             $this->assertSame($entity, $context->getValue());
             $this->assertSame($entity, $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
-        $this->metadata->addConstraint(new Callback(array(
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validate($array, null, 'Group');
 
@@ -245,7 +245,7 @@ public function testArray()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('[key]', $violations[0]->getPropertyPath());
         $this->assertSame($array, $violations[0]->getRoot());
         $this->assertSame($entity, $violations[0]->getInvalidValue());
@@ -256,7 +256,7 @@ public function testArray()
     public function testRecursiveArray()
     {
         $entity = new Entity();
-        $array = array(2 => array('key' => $entity));
+        $array = [2 => ['key' => $entity]];
 
         $callback = function ($value, ExecutionContextInterface $context) use ($entity, $array) {
             $this->assertSame($this::ENTITY_CLASS, $context->getClassName());
@@ -268,13 +268,13 @@ public function testRecursiveArray()
             $this->assertSame($entity, $context->getValue());
             $this->assertSame($entity, $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
-        $this->metadata->addConstraint(new Callback(array(
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validate($array, null, 'Group');
 
@@ -282,7 +282,7 @@ public function testRecursiveArray()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('[2][key]', $violations[0]->getPropertyPath());
         $this->assertSame($array, $violations[0]->getRoot());
         $this->assertSame($entity, $violations[0]->getInvalidValue());
@@ -293,7 +293,7 @@ public function testRecursiveArray()
     public function testTraversable()
     {
         $entity = new Entity();
-        $traversable = new \ArrayIterator(array('key' => $entity));
+        $traversable = new \ArrayIterator(['key' => $entity]);
 
         $callback = function ($value, ExecutionContextInterface $context) use ($entity, $traversable) {
             $this->assertSame($this::ENTITY_CLASS, $context->getClassName());
@@ -305,13 +305,13 @@ public function testTraversable()
             $this->assertSame($entity, $context->getValue());
             $this->assertSame($entity, $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
-        $this->metadata->addConstraint(new Callback(array(
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validate($traversable, null, 'Group');
 
@@ -319,7 +319,7 @@ public function testTraversable()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('[key]', $violations[0]->getPropertyPath());
         $this->assertSame($traversable, $violations[0]->getRoot());
         $this->assertSame($entity, $violations[0]->getInvalidValue());
@@ -330,9 +330,9 @@ public function testTraversable()
     public function testRecursiveTraversable()
     {
         $entity = new Entity();
-        $traversable = new \ArrayIterator(array(
-            2 => new \ArrayIterator(array('key' => $entity)),
-        ));
+        $traversable = new \ArrayIterator([
+            2 => new \ArrayIterator(['key' => $entity]),
+        ]);
 
         $callback = function ($value, ExecutionContextInterface $context) use ($entity, $traversable) {
             $this->assertSame($this::ENTITY_CLASS, $context->getClassName());
@@ -344,13 +344,13 @@ public function testRecursiveTraversable()
             $this->assertSame($entity, $context->getValue());
             $this->assertSame($entity, $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
-        $this->metadata->addConstraint(new Callback(array(
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validate($traversable, null, 'Group');
 
@@ -358,7 +358,7 @@ public function testRecursiveTraversable()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('[2][key]', $violations[0]->getPropertyPath());
         $this->assertSame($traversable, $violations[0]->getRoot());
         $this->assertSame($entity, $violations[0]->getInvalidValue());
@@ -381,14 +381,14 @@ public function testReferenceClassConstraint()
             $this->assertSame($entity->reference, $context->getValue());
             $this->assertSame($entity->reference, $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
         $this->metadata->addPropertyConstraint('reference', new Valid());
-        $this->referenceMetadata->addConstraint(new Callback(array(
+        $this->referenceMetadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validate($entity, null, 'Group');
 
@@ -396,7 +396,7 @@ public function testReferenceClassConstraint()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('reference', $violations[0]->getPropertyPath());
         $this->assertSame($entity, $violations[0]->getRoot());
         $this->assertSame($entity->reference, $violations[0]->getInvalidValue());
@@ -422,14 +422,14 @@ public function testReferencePropertyConstraint()
             $this->assertSame('Foobar', $context->getValue());
             $this->assertSame('Foobar', $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
         $this->metadata->addPropertyConstraint('reference', new Valid());
-        $this->referenceMetadata->addPropertyConstraint('value', new Callback(array(
+        $this->referenceMetadata->addPropertyConstraint('value', new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validate($entity, null, 'Group');
 
@@ -437,7 +437,7 @@ public function testReferencePropertyConstraint()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('reference.value', $violations[0]->getPropertyPath());
         $this->assertSame($entity, $violations[0]->getRoot());
         $this->assertSame('Foobar', $violations[0]->getInvalidValue());
@@ -463,14 +463,14 @@ public function testReferenceGetterConstraint()
             $this->assertSame('Bamboo', $context->getValue());
             $this->assertSame('Bamboo', $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
         $this->metadata->addPropertyConstraint('reference', new Valid());
-        $this->referenceMetadata->addPropertyConstraint('privateValue', new Callback(array(
+        $this->referenceMetadata->addPropertyConstraint('privateValue', new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validate($entity, null, 'Group');
 
@@ -478,7 +478,7 @@ public function testReferenceGetterConstraint()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('reference.privateValue', $violations[0]->getPropertyPath());
         $this->assertSame($entity, $violations[0]->getRoot());
         $this->assertSame('Bamboo', $violations[0]->getInvalidValue());
@@ -515,7 +515,7 @@ public function testFailOnScalarReferences()
     public function testArrayReference()
     {
         $entity = new Entity();
-        $entity->reference = array('key' => new Reference());
+        $entity->reference = ['key' => new Reference()];
 
         $callback = function ($value, ExecutionContextInterface $context) use ($entity) {
             $this->assertSame($this::REFERENCE_CLASS, $context->getClassName());
@@ -527,14 +527,14 @@ public function testArrayReference()
             $this->assertSame($entity->reference['key'], $context->getValue());
             $this->assertSame($entity->reference['key'], $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
         $this->metadata->addPropertyConstraint('reference', new Valid());
-        $this->referenceMetadata->addConstraint(new Callback(array(
+        $this->referenceMetadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validate($entity, null, 'Group');
 
@@ -542,7 +542,7 @@ public function testArrayReference()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('reference[key]', $violations[0]->getPropertyPath());
         $this->assertSame($entity, $violations[0]->getRoot());
         $this->assertSame($entity->reference['key'], $violations[0]->getInvalidValue());
@@ -554,7 +554,7 @@ public function testArrayReference()
     public function testRecursiveArrayReference()
     {
         $entity = new Entity();
-        $entity->reference = array(2 => array('key' => new Reference()));
+        $entity->reference = [2 => ['key' => new Reference()]];
 
         $callback = function ($value, ExecutionContextInterface $context) use ($entity) {
             $this->assertSame($this::REFERENCE_CLASS, $context->getClassName());
@@ -566,14 +566,14 @@ public function testRecursiveArrayReference()
             $this->assertSame($entity->reference[2]['key'], $context->getValue());
             $this->assertSame($entity->reference[2]['key'], $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
         $this->metadata->addPropertyConstraint('reference', new Valid());
-        $this->referenceMetadata->addConstraint(new Callback(array(
+        $this->referenceMetadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validate($entity, null, 'Group');
 
@@ -581,7 +581,7 @@ public function testRecursiveArrayReference()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('reference[2][key]', $violations[0]->getPropertyPath());
         $this->assertSame($entity, $violations[0]->getRoot());
         $this->assertSame($entity->reference[2]['key'], $violations[0]->getInvalidValue());
@@ -592,15 +592,15 @@ public function testRecursiveArrayReference()
     public function testArrayTraversalCannotBeDisabled()
     {
         $entity = new Entity();
-        $entity->reference = array('key' => new Reference());
+        $entity->reference = ['key' => new Reference()];
 
         $callback = function ($value, ExecutionContextInterface $context) {
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
-        $this->metadata->addPropertyConstraint('reference', new Valid(array(
+        $this->metadata->addPropertyConstraint('reference', new Valid([
             'traverse' => false,
-        )));
+        ]));
         $this->referenceMetadata->addConstraint(new Callback($callback));
 
         $violations = $this->validate($entity);
@@ -612,15 +612,15 @@ public function testArrayTraversalCannotBeDisabled()
     public function testRecursiveArrayTraversalCannotBeDisabled()
     {
         $entity = new Entity();
-        $entity->reference = array(2 => array('key' => new Reference()));
+        $entity->reference = [2 => ['key' => new Reference()]];
 
         $callback = function ($value, ExecutionContextInterface $context) {
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
-        $this->metadata->addPropertyConstraint('reference', new Valid(array(
+        $this->metadata->addPropertyConstraint('reference', new Valid([
             'traverse' => false,
-        )));
+        ]));
         $this->referenceMetadata->addConstraint(new Callback($callback));
 
         $violations = $this->validate($entity);
@@ -632,7 +632,7 @@ public function testRecursiveArrayTraversalCannotBeDisabled()
     public function testIgnoreScalarsDuringArrayTraversal()
     {
         $entity = new Entity();
-        $entity->reference = array('string', 1234);
+        $entity->reference = ['string', 1234];
 
         $this->metadata->addPropertyConstraint('reference', new Valid());
 
@@ -645,7 +645,7 @@ public function testIgnoreScalarsDuringArrayTraversal()
     public function testIgnoreNullDuringArrayTraversal()
     {
         $entity = new Entity();
-        $entity->reference = array(null);
+        $entity->reference = [null];
 
         $this->metadata->addPropertyConstraint('reference', new Valid());
 
@@ -658,7 +658,7 @@ public function testIgnoreNullDuringArrayTraversal()
     public function testTraversableReference()
     {
         $entity = new Entity();
-        $entity->reference = new \ArrayIterator(array('key' => new Reference()));
+        $entity->reference = new \ArrayIterator(['key' => new Reference()]);
 
         $callback = function ($value, ExecutionContextInterface $context) use ($entity) {
             $this->assertSame($this::REFERENCE_CLASS, $context->getClassName());
@@ -670,14 +670,14 @@ public function testTraversableReference()
             $this->assertSame($entity->reference['key'], $context->getValue());
             $this->assertSame($entity->reference['key'], $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
         $this->metadata->addPropertyConstraint('reference', new Valid());
-        $this->referenceMetadata->addConstraint(new Callback(array(
+        $this->referenceMetadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validate($entity, null, 'Group');
 
@@ -685,7 +685,7 @@ public function testTraversableReference()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('reference[key]', $violations[0]->getPropertyPath());
         $this->assertSame($entity, $violations[0]->getRoot());
         $this->assertSame($entity->reference['key'], $violations[0]->getInvalidValue());
@@ -696,16 +696,16 @@ public function testTraversableReference()
     public function testDisableTraversableTraversal()
     {
         $entity = new Entity();
-        $entity->reference = new \ArrayIterator(array('key' => new Reference()));
+        $entity->reference = new \ArrayIterator(['key' => new Reference()]);
 
         $callback = function ($value, ExecutionContextInterface $context) {
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
         $this->metadataFactory->addMetadata(new ClassMetadata('ArrayIterator'));
-        $this->metadata->addPropertyConstraint('reference', new Valid(array(
+        $this->metadata->addPropertyConstraint('reference', new Valid([
             'traverse' => false,
-        )));
+        ]));
         $this->referenceMetadata->addConstraint(new Callback($callback));
 
         $violations = $this->validate($entity);
@@ -722,9 +722,9 @@ public function testMetadataMustExistIfTraversalIsDisabled()
         $entity = new Entity();
         $entity->reference = new \ArrayIterator();
 
-        $this->metadata->addPropertyConstraint('reference', new Valid(array(
+        $this->metadata->addPropertyConstraint('reference', new Valid([
             'traverse' => false,
-        )));
+        ]));
 
         $this->validate($entity);
     }
@@ -732,9 +732,9 @@ public function testMetadataMustExistIfTraversalIsDisabled()
     public function testEnableRecursiveTraversableTraversal()
     {
         $entity = new Entity();
-        $entity->reference = new \ArrayIterator(array(
-            2 => new \ArrayIterator(array('key' => new Reference())),
-        ));
+        $entity->reference = new \ArrayIterator([
+            2 => new \ArrayIterator(['key' => new Reference()]),
+        ]);
 
         $callback = function ($value, ExecutionContextInterface $context) use ($entity) {
             $this->assertSame($this::REFERENCE_CLASS, $context->getClassName());
@@ -746,16 +746,16 @@ public function testEnableRecursiveTraversableTraversal()
             $this->assertSame($entity->reference[2]['key'], $context->getValue());
             $this->assertSame($entity->reference[2]['key'], $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
-        $this->metadata->addPropertyConstraint('reference', new Valid(array(
+        $this->metadata->addPropertyConstraint('reference', new Valid([
             'traverse' => true,
-        )));
-        $this->referenceMetadata->addConstraint(new Callback(array(
+        ]));
+        $this->referenceMetadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validate($entity, null, 'Group');
 
@@ -763,7 +763,7 @@ public function testEnableRecursiveTraversableTraversal()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('reference[2][key]', $violations[0]->getPropertyPath());
         $this->assertSame($entity, $violations[0]->getRoot());
         $this->assertSame($entity->reference[2]['key'], $violations[0]->getInvalidValue());
@@ -789,21 +789,21 @@ public function testValidateProperty()
             $this->assertSame('Bernhard', $context->getValue());
             $this->assertSame('Bernhard', $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
         $callback2 = function ($value, ExecutionContextInterface $context) {
             $context->addViolation('Other violation');
         };
 
-        $this->metadata->addPropertyConstraint('firstName', new Callback(array(
+        $this->metadata->addPropertyConstraint('firstName', new Callback([
             'callback' => $callback1,
             'groups' => 'Group',
-        )));
-        $this->metadata->addPropertyConstraint('lastName', new Callback(array(
+        ]));
+        $this->metadata->addPropertyConstraint('lastName', new Callback([
             'callback' => $callback2,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validateProperty($entity, 'firstName', 'Group');
 
@@ -811,7 +811,7 @@ public function testValidateProperty()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('firstName', $violations[0]->getPropertyPath());
         $this->assertSame($entity, $violations[0]->getRoot());
         $this->assertSame('Bernhard', $violations[0]->getInvalidValue());
@@ -847,21 +847,21 @@ public function testValidatePropertyValue()
             $this->assertSame('Bernhard', $context->getValue());
             $this->assertSame('Bernhard', $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
         $callback2 = function ($value, ExecutionContextInterface $context) {
             $context->addViolation('Other violation');
         };
 
-        $this->metadata->addPropertyConstraint('firstName', new Callback(array(
+        $this->metadata->addPropertyConstraint('firstName', new Callback([
             'callback' => $callback1,
             'groups' => 'Group',
-        )));
-        $this->metadata->addPropertyConstraint('lastName', new Callback(array(
+        ]));
+        $this->metadata->addPropertyConstraint('lastName', new Callback([
             'callback' => $callback2,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validatePropertyValue(
             $entity,
@@ -874,7 +874,7 @@ public function testValidatePropertyValue()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('firstName', $violations[0]->getPropertyPath());
         $this->assertSame($entity, $violations[0]->getRoot());
         $this->assertSame('Bernhard', $violations[0]->getInvalidValue());
@@ -896,21 +896,21 @@ public function testValidatePropertyValueWithClassName()
             $this->assertSame('Bernhard', $context->getValue());
             $this->assertSame('Bernhard', $value);
 
-            $context->addViolation('Message %param%', array('%param%' => 'value'));
+            $context->addViolation('Message %param%', ['%param%' => 'value']);
         };
 
         $callback2 = function ($value, ExecutionContextInterface $context) {
             $context->addViolation('Other violation');
         };
 
-        $this->metadata->addPropertyConstraint('firstName', new Callback(array(
+        $this->metadata->addPropertyConstraint('firstName', new Callback([
             'callback' => $callback1,
             'groups' => 'Group',
-        )));
-        $this->metadata->addPropertyConstraint('lastName', new Callback(array(
+        ]));
+        $this->metadata->addPropertyConstraint('lastName', new Callback([
             'callback' => $callback2,
             'groups' => 'Group',
-        )));
+        ]));
 
         $violations = $this->validatePropertyValue(
             self::ENTITY_CLASS,
@@ -923,7 +923,7 @@ public function testValidatePropertyValueWithClassName()
         $this->assertCount(1, $violations);
         $this->assertSame('Message value', $violations[0]->getMessage());
         $this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
-        $this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
+        $this->assertSame(['%param%' => 'value'], $violations[0]->getParameters());
         $this->assertSame('', $violations[0]->getPropertyPath());
         $this->assertSame('Bernhard', $violations[0]->getRoot());
         $this->assertSame('Bernhard', $violations[0]->getInvalidValue());
@@ -990,14 +990,14 @@ public function testValidateSingleGroup()
             $context->addViolation('Message');
         };
 
-        $this->metadata->addConstraint(new Callback(array(
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group 1',
-        )));
-        $this->metadata->addConstraint(new Callback(array(
+        ]));
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group 2',
-        )));
+        ]));
 
         $violations = $this->validate($entity, null, 'Group 2');
 
@@ -1013,16 +1013,16 @@ public function testValidateMultipleGroups()
             $context->addViolation('Message');
         };
 
-        $this->metadata->addConstraint(new Callback(array(
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group 1',
-        )));
-        $this->metadata->addConstraint(new Callback(array(
+        ]));
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback,
             'groups' => 'Group 2',
-        )));
+        ]));
 
-        $violations = $this->validate($entity, null, array('Group 1', 'Group 2'));
+        $violations = $this->validate($entity, null, ['Group 1', 'Group 2']);
 
         /* @var ConstraintViolationInterface[] $violations */
         $this->assertCount(2, $violations);
@@ -1039,20 +1039,20 @@ public function testReplaceDefaultGroupByGroupSequenceObject()
             $context->addViolation('Violation in Group 3');
         };
 
-        $this->metadata->addConstraint(new Callback(array(
+        $this->metadata->addConstraint(new Callback([
             'callback' => function () {},
             'groups' => 'Group 1',
-        )));
-        $this->metadata->addConstraint(new Callback(array(
+        ]));
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback1,
             'groups' => 'Group 2',
-        )));
-        $this->metadata->addConstraint(new Callback(array(
+        ]));
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback2,
             'groups' => 'Group 3',
-        )));
+        ]));
 
-        $sequence = new GroupSequence(array('Group 1', 'Group 2', 'Group 3', 'Entity'));
+        $sequence = new GroupSequence(['Group 1', 'Group 2', 'Group 3', 'Entity']);
         $this->metadata->setGroupSequence($sequence);
 
         $violations = $this->validate($entity, null, 'Default');
@@ -1073,20 +1073,20 @@ public function testReplaceDefaultGroupByGroupSequenceArray()
             $context->addViolation('Violation in Group 3');
         };
 
-        $this->metadata->addConstraint(new Callback(array(
+        $this->metadata->addConstraint(new Callback([
             'callback' => function () {},
             'groups' => 'Group 1',
-        )));
-        $this->metadata->addConstraint(new Callback(array(
+        ]));
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback1,
             'groups' => 'Group 2',
-        )));
-        $this->metadata->addConstraint(new Callback(array(
+        ]));
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback2,
             'groups' => 'Group 3',
-        )));
+        ]));
 
-        $sequence = array('Group 1', 'Group 2', 'Group 3', 'Entity');
+        $sequence = ['Group 1', 'Group 2', 'Group 3', 'Entity'];
         $this->metadata->setGroupSequence($sequence);
 
         $violations = $this->validate($entity, null, 'Default');
@@ -1109,16 +1109,16 @@ public function testPropagateDefaultGroupToReferenceWhenReplacingDefaultGroup()
         };
 
         $this->metadata->addPropertyConstraint('reference', new Valid());
-        $this->referenceMetadata->addConstraint(new Callback(array(
+        $this->referenceMetadata->addConstraint(new Callback([
             'callback' => $callback1,
             'groups' => 'Default',
-        )));
-        $this->referenceMetadata->addConstraint(new Callback(array(
+        ]));
+        $this->referenceMetadata->addConstraint(new Callback([
             'callback' => $callback2,
             'groups' => 'Group 1',
-        )));
+        ]));
 
-        $sequence = new GroupSequence(array('Group 1', 'Entity'));
+        $sequence = new GroupSequence(['Group 1', 'Entity']);
         $this->metadata->setGroupSequence($sequence);
 
         $violations = $this->validate($entity, null, 'Default');
@@ -1139,16 +1139,16 @@ public function testValidateCustomGroupWhenDefaultGroupWasReplaced()
             $context->addViolation('Violation in group sequence');
         };
 
-        $this->metadata->addConstraint(new Callback(array(
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback1,
             'groups' => 'Other Group',
-        )));
-        $this->metadata->addConstraint(new Callback(array(
+        ]));
+        $this->metadata->addConstraint(new Callback([
             'callback' => $callback2,
             'groups' => 'Group 1',
-        )));
+        ]));
 
-        $sequence = new GroupSequence(array('Group 1', 'Entity'));
+        $sequence = new GroupSequence(['Group 1', 'Entity']);
         $this->metadata->setGroupSequence($sequence);
 
         $violations = $this->validate($entity, null, 'Other Group');
@@ -1173,18 +1173,18 @@ public function testReplaceDefaultGroup($sequence, array $assertViolations)
         };
 
         $metadata = new ClassMetadata(\get_class($entity));
-        $metadata->addConstraint(new Callback(array(
+        $metadata->addConstraint(new Callback([
             'callback' => function () {},
             'groups' => 'Group 1',
-        )));
-        $metadata->addConstraint(new Callback(array(
+        ]));
+        $metadata->addConstraint(new Callback([
             'callback' => $callback1,
             'groups' => 'Group 2',
-        )));
-        $metadata->addConstraint(new Callback(array(
+        ]));
+        $metadata->addConstraint(new Callback([
             'callback' => $callback2,
             'groups' => 'Group 3',
-        )));
+        ]));
         $metadata->setGroupSequenceProvider(true);
 
         $this->metadataFactory->addMetadata($metadata);
@@ -1200,33 +1200,33 @@ public function testReplaceDefaultGroup($sequence, array $assertViolations)
 
     public function getTestReplaceDefaultGroup()
     {
-        return array(
-            array(
-                'sequence' => new GroupSequence(array('Group 1', 'Group 2', 'Group 3', 'Entity')),
-                'assertViolations' => array(
+        return [
+            [
+                'sequence' => new GroupSequence(['Group 1', 'Group 2', 'Group 3', 'Entity']),
+                'assertViolations' => [
                     'Violation in Group 2',
-                ),
-            ),
-            array(
-                'sequence' => array('Group 1', 'Group 2', 'Group 3', 'Entity'),
-                'assertViolations' => array(
+                ],
+            ],
+            [
+                'sequence' => ['Group 1', 'Group 2', 'Group 3', 'Entity'],
+                'assertViolations' => [
                     'Violation in Group 2',
-                ),
-            ),
-            array(
-                'sequence' => new GroupSequence(array('Group 1', array('Group 2', 'Group 3'), 'Entity')),
-                'assertViolations' => array(
+                ],
+            ],
+            [
+                'sequence' => new GroupSequence(['Group 1', ['Group 2', 'Group 3'], 'Entity']),
+                'assertViolations' => [
                     'Violation in Group 2',
                     'Violation in Group 3',
-                ),
-            ),
-            array(
-                'sequence' => array('Group 1', array('Group 2', 'Group 3'), 'Entity'),
-                'assertViolations' => array(
+                ],
+            ],
+            [
+                'sequence' => ['Group 1', ['Group 2', 'Group 3'], 'Entity'],
+                'assertViolations' => [
                     'Violation in Group 2',
                     'Violation in Group 3',
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php b/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
index 49ebef0c7c013..8109b6b9bfd4d 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
@@ -26,7 +26,7 @@
 
 class RecursiveValidatorTest extends AbstractTest
 {
-    protected function createValidator(MetadataFactoryInterface $metadataFactory, array $objectInitializers = array())
+    protected function createValidator(MetadataFactoryInterface $metadataFactory, array $objectInitializers = [])
     {
         $translator = new IdentityTranslator();
         $translator->setLocale('en');
@@ -44,26 +44,26 @@ public function testEmptyGroupsArrayDoesNotTriggerDeprecation()
         $childB = new ChildB();
         $childA->name = false;
         $childB->name = 'fake';
-        $entity->childA = array($childA);
-        $entity->childB = array($childB);
+        $entity->childA = [$childA];
+        $entity->childB = [$childB];
         $validatorContext = $this->getMockBuilder('Symfony\Component\Validator\Validator\ContextualValidatorInterface')->getMock();
         $validatorContext
             ->expects($this->once())
             ->method('validate')
-            ->with($entity, null, array())
+            ->with($entity, null, [])
             ->willReturnSelf();
 
         $validator = $this
             ->getMockBuilder('Symfony\Component\Validator\Validator\RecursiveValidator')
             ->disableOriginalConstructor()
-            ->setMethods(array('startContext'))
+            ->setMethods(['startContext'])
             ->getMock();
         $validator
             ->expects($this->once())
             ->method('startContext')
             ->willReturn($validatorContext);
 
-        $validator->validate($entity, null, array());
+        $validator->validate($entity, null, []);
     }
 
     public function testRelationBetweenChildAAndChildB()
@@ -77,40 +77,40 @@ public function testRelationBetweenChildAAndChildB()
 
         $childA->name = false;
         $childB->name = 'fake';
-        $entity->childA = array($childA);
-        $entity->childB = array($childB);
+        $entity->childA = [$childA];
+        $entity->childB = [$childB];
 
         $validatorContext = $this->getMockBuilder('Symfony\Component\Validator\Validator\ContextualValidatorInterface')->getMock();
         $validatorContext
             ->expects($this->once())
             ->method('validate')
-            ->with($entity, null, array())
+            ->with($entity, null, [])
             ->willReturnSelf();
 
         $validator = $this
             ->getMockBuilder('Symfony\Component\Validator\Validator\RecursiveValidator')
             ->disableOriginalConstructor()
-            ->setMethods(array('startContext'))
+            ->setMethods(['startContext'])
             ->getMock();
         $validator
             ->expects($this->once())
             ->method('startContext')
             ->willReturn($validatorContext);
 
-        $validator->validate($entity, null, array());
+        $validator->validate($entity, null, []);
     }
 
     public function testCollectionConstraintValidateAllGroupsForNestedConstraints()
     {
-        $this->metadata->addPropertyConstraint('data', new Collection(array('fields' => array(
-            'one' => array(new NotBlank(array('groups' => 'one')), new Length(array('min' => 2, 'groups' => 'two'))),
-            'two' => array(new NotBlank(array('groups' => 'two'))),
-        ))));
+        $this->metadata->addPropertyConstraint('data', new Collection(['fields' => [
+            'one' => [new NotBlank(['groups' => 'one']), new Length(['min' => 2, 'groups' => 'two'])],
+            'two' => [new NotBlank(['groups' => 'two'])],
+        ]]));
 
         $entity = new Entity();
-        $entity->data = array('one' => 't', 'two' => '');
+        $entity->data = ['one' => 't', 'two' => ''];
 
-        $violations = $this->validator->validate($entity, null, array('one', 'two'));
+        $violations = $this->validator->validate($entity, null, ['one', 'two']);
 
         $this->assertCount(2, $violations);
         $this->assertInstanceOf(Length::class, $violations->get(0)->getConstraint());
@@ -119,15 +119,15 @@ public function testCollectionConstraintValidateAllGroupsForNestedConstraints()
 
     public function testAllConstraintValidateAllGroupsForNestedConstraints()
     {
-        $this->metadata->addPropertyConstraint('data', new All(array('constraints' => array(
-            new NotBlank(array('groups' => 'one')),
-            new Length(array('min' => 2, 'groups' => 'two')),
-        ))));
+        $this->metadata->addPropertyConstraint('data', new All(['constraints' => [
+            new NotBlank(['groups' => 'one']),
+            new Length(['min' => 2, 'groups' => 'two']),
+        ]]));
 
         $entity = new Entity();
-        $entity->data = array('one' => 't', 'two' => '');
+        $entity->data = ['one' => 't', 'two' => ''];
 
-        $violations = $this->validator->validate($entity, null, array('one', 'two'));
+        $violations = $this->validator->validate($entity, null, ['one', 'two']);
 
         $this->assertCount(2, $violations);
         $this->assertInstanceOf(NotBlank::class, $violations->get(0)->getConstraint());
diff --git a/src/Symfony/Component/Validator/Tests/Validator/TraceableValidatorTest.php b/src/Symfony/Component/Validator/Tests/Validator/TraceableValidatorTest.php
index b2eef769ecf3c..3d89f4e142382 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/TraceableValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/TraceableValidatorTest.php
@@ -27,17 +27,17 @@ class TraceableValidatorTest extends TestCase
     public function testValidate()
     {
         $originalValidator = $this->createMock(ValidatorInterface::class);
-        $violations = new ConstraintViolationList(array(
+        $violations = new ConstraintViolationList([
             $this->createMock(ConstraintViolation::class),
             $this->createMock(ConstraintViolation::class),
-        ));
+        ]);
         $originalValidator->expects($this->exactly(2))->method('validate')->willReturn($violations);
 
         $validator = new TraceableValidator($originalValidator);
 
         $object = new \stdClass();
-        $constraints = array($this->createMock(Constraint::class));
-        $groups = array('Default', 'Create');
+        $constraints = [$this->createMock(Constraint::class)];
+        $groups = ['Default', 'Create'];
 
         $validator->validate($object, $constraints, $groups);
         $line = __LINE__ - 1;
@@ -50,17 +50,17 @@ public function testValidate()
 
         $this->assertSame(iterator_to_array($violations), $callData['violations']);
 
-        $this->assertSame(array(
+        $this->assertSame([
             'value' => $object,
             'constraints' => $constraints,
             'groups' => $groups,
-        ), $callData['context']);
+        ], $callData['context']);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'name' => 'TraceableValidatorTest.php',
             'file' => __FILE__,
             'line' => $line,
-        ), $callData['caller']);
+        ], $callData['caller']);
 
         $validator->validate($object, $constraints, $groups);
         $collectedData = $validator->getCollectedData();
diff --git a/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php b/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
index 77d586412b76b..16d81697e6585 100644
--- a/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
+++ b/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
@@ -41,7 +41,7 @@ public function testAddObjectInitializer()
 
     public function testAddObjectInitializers()
     {
-        $this->assertSame($this->builder, $this->builder->addObjectInitializers(array()));
+        $this->assertSame($this->builder, $this->builder->addObjectInitializers([]));
     }
 
     public function testAddXmlMapping()
@@ -51,7 +51,7 @@ public function testAddXmlMapping()
 
     public function testAddXmlMappings()
     {
-        $this->assertSame($this->builder, $this->builder->addXmlMappings(array()));
+        $this->assertSame($this->builder, $this->builder->addXmlMappings([]));
     }
 
     public function testAddYamlMapping()
@@ -61,7 +61,7 @@ public function testAddYamlMapping()
 
     public function testAddYamlMappings()
     {
-        $this->assertSame($this->builder, $this->builder->addYamlMappings(array()));
+        $this->assertSame($this->builder, $this->builder->addYamlMappings([]));
     }
 
     public function testAddMethodMapping()
@@ -71,7 +71,7 @@ public function testAddMethodMapping()
 
     public function testAddMethodMappings()
     {
-        $this->assertSame($this->builder, $this->builder->addMethodMappings(array()));
+        $this->assertSame($this->builder, $this->builder->addMethodMappings([]));
     }
 
     public function testEnableAnnotationMapping()
diff --git a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
index 2301618367b86..50253c50e1bb4 100644
--- a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
+++ b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
@@ -57,11 +57,11 @@ class RecursiveContextualValidator implements ContextualValidatorInterface
      *                                                                constraint validators
      * @param ObjectInitializerInterface[]        $objectInitializers The object initializers
      */
-    public function __construct(ExecutionContextInterface $context, MetadataFactoryInterface $metadataFactory, ConstraintValidatorFactoryInterface $validatorFactory, array $objectInitializers = array())
+    public function __construct(ExecutionContextInterface $context, MetadataFactoryInterface $metadataFactory, ConstraintValidatorFactoryInterface $validatorFactory, array $objectInitializers = [])
     {
         $this->context = $context;
         $this->defaultPropertyPath = $context->getPropertyPath();
-        $this->defaultGroups = array($context->getGroup() ?: Constraint::DEFAULT_GROUP);
+        $this->defaultGroups = [$context->getGroup() ?: Constraint::DEFAULT_GROUP];
         $this->metadataFactory = $metadataFactory;
         $this->validatorFactory = $validatorFactory;
         $this->objectInitializers = $objectInitializers;
@@ -101,7 +101,7 @@ public function validate($value, $constraints = null, $groups = null)
             // You can pass a single constraint or an array of constraints
             // Make sure to deal with an array in the rest of the code
             if (!\is_array($constraints)) {
-                $constraints = array($constraints);
+                $constraints = [$constraints];
             }
 
             $metadata = new GenericMetadata();
@@ -283,7 +283,7 @@ protected function normalizeGroups($groups)
             return $groups;
         }
 
-        return array($groups);
+        return [$groups];
     }
 
     /**
@@ -731,7 +731,7 @@ private function validateGenericNode($value, $object, $cacheKey, MetadataInterfa
     private function stepThroughGroupSequence($value, $object, $cacheKey, MetadataInterface $metadata = null, $propertyPath, $traversalStrategy, GroupSequence $groupSequence, $cascadedGroup, ExecutionContextInterface $context)
     {
         $violationCount = \count($context->getViolations());
-        $cascadedGroups = $cascadedGroup ? array($cascadedGroup) : null;
+        $cascadedGroups = $cascadedGroup ? [$cascadedGroup] : null;
 
         foreach ($groupSequence->groups as $groupInSequence) {
             $groups = (array) $groupInSequence;
diff --git a/src/Symfony/Component/Validator/Validator/RecursiveValidator.php b/src/Symfony/Component/Validator/Validator/RecursiveValidator.php
index 33c2ec9e4798f..a258fd4a77d71 100644
--- a/src/Symfony/Component/Validator/Validator/RecursiveValidator.php
+++ b/src/Symfony/Component/Validator/Validator/RecursiveValidator.php
@@ -41,7 +41,7 @@ class RecursiveValidator implements ValidatorInterface
      *                                                                constraint validators
      * @param ObjectInitializerInterface[]        $objectInitializers The object initializers
      */
-    public function __construct(ExecutionContextFactoryInterface $contextFactory, MetadataFactoryInterface $metadataFactory, ConstraintValidatorFactoryInterface $validatorFactory, array $objectInitializers = array())
+    public function __construct(ExecutionContextFactoryInterface $contextFactory, MetadataFactoryInterface $metadataFactory, ConstraintValidatorFactoryInterface $validatorFactory, array $objectInitializers = [])
     {
         $this->contextFactory = $contextFactory;
         $this->metadataFactory = $metadataFactory;
diff --git a/src/Symfony/Component/Validator/Validator/TraceableValidator.php b/src/Symfony/Component/Validator/Validator/TraceableValidator.php
index 96134e2767468..f1b514d61f07a 100644
--- a/src/Symfony/Component/Validator/Validator/TraceableValidator.php
+++ b/src/Symfony/Component/Validator/Validator/TraceableValidator.php
@@ -21,7 +21,7 @@
 class TraceableValidator implements ValidatorInterface
 {
     private $validator;
-    private $collectedData = array();
+    private $collectedData = [];
 
     public function __construct(ValidatorInterface $validator)
     {
@@ -38,7 +38,7 @@ public function getCollectedData()
 
     public function reset()
     {
-        $this->collectedData = array();
+        $this->collectedData = [];
     }
 
     /**
@@ -92,11 +92,11 @@ public function validate($value, $constraints = null, $groups = null)
         $name = str_replace('\\', '/', $file);
         $name = substr($name, strrpos($name, '/') + 1);
 
-        $this->collectedData[] = array(
+        $this->collectedData[] = [
             'caller' => compact('name', 'file', 'line'),
             'context' => compact('value', 'constraints', 'groups'),
             'violations' => iterator_to_array($violations),
-        );
+        ];
 
         return $violations;
     }
diff --git a/src/Symfony/Component/Validator/ValidatorBuilder.php b/src/Symfony/Component/Validator/ValidatorBuilder.php
index 3562b945922af..a302cf0cf9c76 100644
--- a/src/Symfony/Component/Validator/ValidatorBuilder.php
+++ b/src/Symfony/Component/Validator/ValidatorBuilder.php
@@ -271,7 +271,7 @@ public function setTranslationDomain($translationDomain)
      */
     public function getLoaders()
     {
-        $loaders = array();
+        $loaders = [];
 
         foreach ($this->xmlMappings as $xmlMapping) {
             $loaders[] = new XmlFileLoader($xmlMapping);
diff --git a/src/Symfony/Component/VarDumper/Caster/AmqpCaster.php b/src/Symfony/Component/VarDumper/Caster/AmqpCaster.php
index 655262f4065ec..19bdc29525eab 100644
--- a/src/Symfony/Component/VarDumper/Caster/AmqpCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/AmqpCaster.php
@@ -20,7 +20,7 @@
  */
 class AmqpCaster
 {
-    private static $flags = array(
+    private static $flags = [
         AMQP_DURABLE => 'AMQP_DURABLE',
         AMQP_PASSIVE => 'AMQP_PASSIVE',
         AMQP_EXCLUSIVE => 'AMQP_EXCLUSIVE',
@@ -35,22 +35,22 @@ class AmqpCaster
         AMQP_MULTIPLE => 'AMQP_MULTIPLE',
         AMQP_NOWAIT => 'AMQP_NOWAIT',
         AMQP_REQUEUE => 'AMQP_REQUEUE',
-    );
+    ];
 
-    private static $exchangeTypes = array(
+    private static $exchangeTypes = [
         AMQP_EX_TYPE_DIRECT => 'AMQP_EX_TYPE_DIRECT',
         AMQP_EX_TYPE_FANOUT => 'AMQP_EX_TYPE_FANOUT',
         AMQP_EX_TYPE_TOPIC => 'AMQP_EX_TYPE_TOPIC',
         AMQP_EX_TYPE_HEADERS => 'AMQP_EX_TYPE_HEADERS',
-    );
+    ];
 
     public static function castConnection(\AMQPConnection $c, array $a, Stub $stub, $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 
-        $a += array(
+        $a += [
             $prefix.'is_connected' => $c->isConnected(),
-        );
+        ];
 
         // Recent version of the extension already expose private properties
         if (isset($a["\x00AMQPConnection\x00login"])) {
@@ -64,7 +64,7 @@ public static function castConnection(\AMQPConnection $c, array $a, Stub $stub,
             $timeout = $c->getTimeout();
         }
 
-        $a += array(
+        $a += [
             $prefix.'is_connected' => $c->isConnected(),
             $prefix.'login' => $c->getLogin(),
             $prefix.'password' => $c->getPassword(),
@@ -72,7 +72,7 @@ public static function castConnection(\AMQPConnection $c, array $a, Stub $stub,
             $prefix.'vhost' => $c->getVhost(),
             $prefix.'port' => $c->getPort(),
             $prefix.'read_timeout' => $timeout,
-        );
+        ];
 
         return $a;
     }
@@ -81,21 +81,21 @@ public static function castChannel(\AMQPChannel $c, array $a, Stub $stub, $isNes
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 
-        $a += array(
+        $a += [
             $prefix.'is_connected' => $c->isConnected(),
             $prefix.'channel_id' => $c->getChannelId(),
-        );
+        ];
 
         // Recent version of the extension already expose private properties
         if (isset($a["\x00AMQPChannel\x00connection"])) {
             return $a;
         }
 
-        $a += array(
+        $a += [
             $prefix.'connection' => $c->getConnection(),
             $prefix.'prefetch_size' => $c->getPrefetchSize(),
             $prefix.'prefetch_count' => $c->getPrefetchCount(),
-        );
+        ];
 
         return $a;
     }
@@ -104,21 +104,21 @@ public static function castQueue(\AMQPQueue $c, array $a, Stub $stub, $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 
-        $a += array(
+        $a += [
             $prefix.'flags' => self::extractFlags($c->getFlags()),
-        );
+        ];
 
         // Recent version of the extension already expose private properties
         if (isset($a["\x00AMQPQueue\x00name"])) {
             return $a;
         }
 
-        $a += array(
+        $a += [
             $prefix.'connection' => $c->getConnection(),
             $prefix.'channel' => $c->getChannel(),
             $prefix.'name' => $c->getName(),
             $prefix.'arguments' => $c->getArguments(),
-        );
+        ];
 
         return $a;
     }
@@ -127,9 +127,9 @@ public static function castExchange(\AMQPExchange $c, array $a, Stub $stub, $isN
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 
-        $a += array(
+        $a += [
             $prefix.'flags' => self::extractFlags($c->getFlags()),
-        );
+        ];
 
         $type = isset(self::$exchangeTypes[$c->getType()]) ? new ConstStub(self::$exchangeTypes[$c->getType()], $c->getType()) : $c->getType();
 
@@ -140,13 +140,13 @@ public static function castExchange(\AMQPExchange $c, array $a, Stub $stub, $isN
             return $a;
         }
 
-        $a += array(
+        $a += [
             $prefix.'connection' => $c->getConnection(),
             $prefix.'channel' => $c->getChannel(),
             $prefix.'name' => $c->getName(),
             $prefix.'type' => $type,
             $prefix.'arguments' => $c->getArguments(),
-        );
+        ];
 
         return $a;
     }
@@ -165,10 +165,10 @@ public static function castEnvelope(\AMQPEnvelope $c, array $a, Stub $stub, $isN
         }
 
         if (!($filter & Caster::EXCLUDE_VERBOSE)) {
-            $a += array($prefix.'body' => $c->getBody());
+            $a += [$prefix.'body' => $c->getBody()];
         }
 
-        $a += array(
+        $a += [
             $prefix.'delivery_tag' => $c->getDeliveryTag(),
             $prefix.'is_redelivery' => $c->isRedelivery(),
             $prefix.'exchange_name' => $c->getExchangeName(),
@@ -186,14 +186,14 @@ public static function castEnvelope(\AMQPEnvelope $c, array $a, Stub $stub, $isN
             $prefix.'type' => $c->getType(),
             $prefix.'user_id' => $c->getUserId(),
             $prefix.'app_id' => $c->getAppId(),
-        );
+        ];
 
         return $a;
     }
 
     private static function extractFlags($flags)
     {
-        $flagsArray = array();
+        $flagsArray = [];
 
         foreach (self::$flags as $value => $name) {
             if ($flags & $value) {
@@ -202,7 +202,7 @@ private static function extractFlags($flags)
         }
 
         if (!$flagsArray) {
-            $flagsArray = array('AMQP_NOPARAM');
+            $flagsArray = ['AMQP_NOPARAM'];
         }
 
         return new ConstStub(implode('|', $flagsArray), $flags);
diff --git a/src/Symfony/Component/VarDumper/Caster/ArgsStub.php b/src/Symfony/Component/VarDumper/Caster/ArgsStub.php
index 7cd759a550b3f..cb52769bacab8 100644
--- a/src/Symfony/Component/VarDumper/Caster/ArgsStub.php
+++ b/src/Symfony/Component/VarDumper/Caster/ArgsStub.php
@@ -41,7 +41,7 @@ public function __construct(array $args, $function, $class)
             $values[] = new EnumStub(array_splice($values, \count($params)), false);
             $params[] = $variadic;
         }
-        if (array('...') === $params) {
+        if (['...'] === $params) {
             $this->dumpKeys = false;
             $this->value = $values[0]->value;
         } else {
@@ -58,11 +58,11 @@ private static function getParameters($function, $class)
         try {
             $r = null !== $class ? new \ReflectionMethod($class, $function) : new \ReflectionFunction($function);
         } catch (\ReflectionException $e) {
-            return array(null, null);
+            return [null, null];
         }
 
         $variadic = '...';
-        $params = array();
+        $params = [];
         foreach ($r->getParameters() as $v) {
             $k = '$'.$v->name;
             if ($v->isPassedByReference()) {
@@ -75,6 +75,6 @@ private static function getParameters($function, $class)
             }
         }
 
-        return self::$parameters[$k] = array($variadic, $params);
+        return self::$parameters[$k] = [$variadic, $params];
     }
 }
diff --git a/src/Symfony/Component/VarDumper/Caster/Caster.php b/src/Symfony/Component/VarDumper/Caster/Caster.php
index 30cb9fc0d6dff..93d0ce2b41b73 100644
--- a/src/Symfony/Component/VarDumper/Caster/Caster.php
+++ b/src/Symfony/Component/VarDumper/Caster/Caster.php
@@ -56,7 +56,7 @@ public static function castObject($obj, $class, $hasDebugInfo = false)
         if ($hasDebugInfo) {
             $a = $obj->__debugInfo();
         } elseif ($obj instanceof \Closure) {
-            $a = array();
+            $a = [];
         } else {
             $a = (array) $obj;
         }
@@ -65,10 +65,10 @@ public static function castObject($obj, $class, $hasDebugInfo = false)
         }
 
         if ($a) {
-            static $publicProperties = array();
+            static $publicProperties = [];
 
             $i = 0;
-            $prefixedKeys = array();
+            $prefixedKeys = [];
             foreach ($a as $k => $v) {
                 if (isset($k[0]) ? "\0" !== $k[0] : \PHP_VERSION_ID >= 70200) {
                     if (!isset($publicProperties[$class])) {
@@ -109,7 +109,7 @@ public static function castObject($obj, $class, $hasDebugInfo = false)
      *
      * @return array The filtered array
      */
-    public static function filter(array $a, $filter, array $listedProperties = array(), &$count = 0)
+    public static function filter(array $a, $filter, array $listedProperties = [], &$count = 0)
     {
         $count = 0;
 
@@ -119,7 +119,7 @@ public static function filter(array $a, $filter, array $listedProperties = array
             if (null === $v) {
                 $type |= self::EXCLUDE_NULL & $filter;
                 $type |= self::EXCLUDE_EMPTY & $filter;
-            } elseif (false === $v || '' === $v || '0' === $v || 0 === $v || 0.0 === $v || array() === $v) {
+            } elseif (false === $v || '' === $v || '0' === $v || 0 === $v || 0.0 === $v || [] === $v) {
                 $type |= self::EXCLUDE_EMPTY & $filter;
             }
             if ((self::EXCLUDE_NOT_IMPORTANT & $filter) && !\in_array($k, $listedProperties, true)) {
diff --git a/src/Symfony/Component/VarDumper/Caster/ClassStub.php b/src/Symfony/Component/VarDumper/Caster/ClassStub.php
index 859c1ec4555eb..1a85098e1581b 100644
--- a/src/Symfony/Component/VarDumper/Caster/ClassStub.php
+++ b/src/Symfony/Component/VarDumper/Caster/ClassStub.php
@@ -37,16 +37,16 @@ public function __construct($identifier, $callable = null)
                 if ($callable instanceof \Closure) {
                     $r = new \ReflectionFunction($callable);
                 } elseif (\is_object($callable)) {
-                    $r = array($callable, '__invoke');
+                    $r = [$callable, '__invoke'];
                 } elseif (\is_array($callable)) {
                     $r = $callable;
                 } elseif (false !== $i = strpos($callable, '::')) {
-                    $r = array(substr($callable, 0, $i), substr($callable, 2 + $i));
+                    $r = [substr($callable, 0, $i), substr($callable, 2 + $i)];
                 } else {
                     $r = new \ReflectionFunction($callable);
                 }
             } elseif (0 < $i = strpos($identifier, '::') ?: strpos($identifier, '->')) {
-                $r = array(substr($identifier, 0, $i), substr($identifier, 2 + $i));
+                $r = [substr($identifier, 0, $i), substr($identifier, 2 + $i)];
             } else {
                 $r = new \ReflectionClass($identifier);
             }
diff --git a/src/Symfony/Component/VarDumper/Caster/DOMCaster.php b/src/Symfony/Component/VarDumper/Caster/DOMCaster.php
index 3a99865370ca2..65151b4f4ff74 100644
--- a/src/Symfony/Component/VarDumper/Caster/DOMCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/DOMCaster.php
@@ -20,7 +20,7 @@
  */
 class DOMCaster
 {
-    private static $errorCodes = array(
+    private static $errorCodes = [
         DOM_PHP_ERR => 'DOM_PHP_ERR',
         DOM_INDEX_SIZE_ERR => 'DOM_INDEX_SIZE_ERR',
         DOMSTRING_SIZE_ERR => 'DOMSTRING_SIZE_ERR',
@@ -38,9 +38,9 @@ class DOMCaster
         DOM_NAMESPACE_ERR => 'DOM_NAMESPACE_ERR',
         DOM_INVALID_ACCESS_ERR => 'DOM_INVALID_ACCESS_ERR',
         DOM_VALIDATION_ERR => 'DOM_VALIDATION_ERR',
-    );
+    ];
 
-    private static $nodeTypes = array(
+    private static $nodeTypes = [
         XML_ELEMENT_NODE => 'XML_ELEMENT_NODE',
         XML_ATTRIBUTE_NODE => 'XML_ATTRIBUTE_NODE',
         XML_TEXT_NODE => 'XML_TEXT_NODE',
@@ -59,7 +59,7 @@ class DOMCaster
         XML_ATTRIBUTE_DECL_NODE => 'XML_ATTRIBUTE_DECL_NODE',
         XML_ENTITY_DECL_NODE => 'XML_ENTITY_DECL_NODE',
         XML_NAMESPACE_DECL_NODE => 'XML_NAMESPACE_DECL_NODE',
-    );
+    ];
 
     public static function castException(\DOMException $e, array $a, Stub $stub, $isNested)
     {
@@ -73,26 +73,26 @@ public static function castException(\DOMException $e, array $a, Stub $stub, $is
 
     public static function castLength($dom, array $a, Stub $stub, $isNested)
     {
-        $a += array(
+        $a += [
             'length' => $dom->length,
-        );
+        ];
 
         return $a;
     }
 
     public static function castImplementation($dom, array $a, Stub $stub, $isNested)
     {
-        $a += array(
+        $a += [
             Caster::PREFIX_VIRTUAL.'Core' => '1.0',
             Caster::PREFIX_VIRTUAL.'XML' => '2.0',
-        );
+        ];
 
         return $a;
     }
 
     public static function castNode(\DOMNode $dom, array $a, Stub $stub, $isNested)
     {
-        $a += array(
+        $a += [
             'nodeName' => $dom->nodeName,
             'nodeValue' => new CutStub($dom->nodeValue),
             'nodeType' => new ConstStub(self::$nodeTypes[$dom->nodeType], $dom->nodeType),
@@ -109,14 +109,14 @@ public static function castNode(\DOMNode $dom, array $a, Stub $stub, $isNested)
             'localName' => $dom->localName,
             'baseURI' => $dom->baseURI ? new LinkStub($dom->baseURI) : $dom->baseURI,
             'textContent' => new CutStub($dom->textContent),
-        );
+        ];
 
         return $a;
     }
 
     public static function castNameSpaceNode(\DOMNameSpaceNode $dom, array $a, Stub $stub, $isNested)
     {
-        $a += array(
+        $a += [
             'nodeName' => $dom->nodeName,
             'nodeValue' => new CutStub($dom->nodeValue),
             'nodeType' => new ConstStub(self::$nodeTypes[$dom->nodeType], $dom->nodeType),
@@ -125,14 +125,14 @@ public static function castNameSpaceNode(\DOMNameSpaceNode $dom, array $a, Stub
             'namespaceURI' => $dom->namespaceURI,
             'ownerDocument' => new CutStub($dom->ownerDocument),
             'parentNode' => new CutStub($dom->parentNode),
-        );
+        ];
 
         return $a;
     }
 
     public static function castDocument(\DOMDocument $dom, array $a, Stub $stub, $isNested, $filter = 0)
     {
-        $a += array(
+        $a += [
             'doctype' => $dom->doctype,
             'implementation' => $dom->implementation,
             'documentElement' => new CutStub($dom->documentElement),
@@ -152,12 +152,12 @@ public static function castDocument(\DOMDocument $dom, array $a, Stub $stub, $is
             'preserveWhiteSpace' => $dom->preserveWhiteSpace,
             'recover' => $dom->recover,
             'substituteEntities' => $dom->substituteEntities,
-        );
+        ];
 
         if (!($filter & Caster::EXCLUDE_VERBOSE)) {
             $formatOutput = $dom->formatOutput;
             $dom->formatOutput = true;
-            $a += array(Caster::PREFIX_VIRTUAL.'xml' => $dom->saveXML());
+            $a += [Caster::PREFIX_VIRTUAL.'xml' => $dom->saveXML()];
             $dom->formatOutput = $formatOutput;
         }
 
@@ -166,136 +166,136 @@ public static function castDocument(\DOMDocument $dom, array $a, Stub $stub, $is
 
     public static function castCharacterData(\DOMCharacterData $dom, array $a, Stub $stub, $isNested)
     {
-        $a += array(
+        $a += [
             'data' => $dom->data,
             'length' => $dom->length,
-        );
+        ];
 
         return $a;
     }
 
     public static function castAttr(\DOMAttr $dom, array $a, Stub $stub, $isNested)
     {
-        $a += array(
+        $a += [
             'name' => $dom->name,
             'specified' => $dom->specified,
             'value' => $dom->value,
             'ownerElement' => $dom->ownerElement,
             'schemaTypeInfo' => $dom->schemaTypeInfo,
-        );
+        ];
 
         return $a;
     }
 
     public static function castElement(\DOMElement $dom, array $a, Stub $stub, $isNested)
     {
-        $a += array(
+        $a += [
             'tagName' => $dom->tagName,
             'schemaTypeInfo' => $dom->schemaTypeInfo,
-        );
+        ];
 
         return $a;
     }
 
     public static function castText(\DOMText $dom, array $a, Stub $stub, $isNested)
     {
-        $a += array(
+        $a += [
             'wholeText' => $dom->wholeText,
-        );
+        ];
 
         return $a;
     }
 
     public static function castTypeinfo(\DOMTypeinfo $dom, array $a, Stub $stub, $isNested)
     {
-        $a += array(
+        $a += [
             'typeName' => $dom->typeName,
             'typeNamespace' => $dom->typeNamespace,
-        );
+        ];
 
         return $a;
     }
 
     public static function castDomError(\DOMDomError $dom, array $a, Stub $stub, $isNested)
     {
-        $a += array(
+        $a += [
             'severity' => $dom->severity,
             'message' => $dom->message,
             'type' => $dom->type,
             'relatedException' => $dom->relatedException,
             'related_data' => $dom->related_data,
             'location' => $dom->location,
-        );
+        ];
 
         return $a;
     }
 
     public static function castLocator(\DOMLocator $dom, array $a, Stub $stub, $isNested)
     {
-        $a += array(
+        $a += [
             'lineNumber' => $dom->lineNumber,
             'columnNumber' => $dom->columnNumber,
             'offset' => $dom->offset,
             'relatedNode' => $dom->relatedNode,
             'uri' => $dom->uri ? new LinkStub($dom->uri, $dom->lineNumber) : $dom->uri,
-        );
+        ];
 
         return $a;
     }
 
     public static function castDocumentType(\DOMDocumentType $dom, array $a, Stub $stub, $isNested)
     {
-        $a += array(
+        $a += [
             'name' => $dom->name,
             'entities' => $dom->entities,
             'notations' => $dom->notations,
             'publicId' => $dom->publicId,
             'systemId' => $dom->systemId,
             'internalSubset' => $dom->internalSubset,
-        );
+        ];
 
         return $a;
     }
 
     public static function castNotation(\DOMNotation $dom, array $a, Stub $stub, $isNested)
     {
-        $a += array(
+        $a += [
             'publicId' => $dom->publicId,
             'systemId' => $dom->systemId,
-        );
+        ];
 
         return $a;
     }
 
     public static function castEntity(\DOMEntity $dom, array $a, Stub $stub, $isNested)
     {
-        $a += array(
+        $a += [
             'publicId' => $dom->publicId,
             'systemId' => $dom->systemId,
             'notationName' => $dom->notationName,
             'actualEncoding' => $dom->actualEncoding,
             'encoding' => $dom->encoding,
             'version' => $dom->version,
-        );
+        ];
 
         return $a;
     }
 
     public static function castProcessingInstruction(\DOMProcessingInstruction $dom, array $a, Stub $stub, $isNested)
     {
-        $a += array(
+        $a += [
             'target' => $dom->target,
             'data' => $dom->data,
-        );
+        ];
 
         return $a;
     }
 
     public static function castXPath(\DOMXPath $dom, array $a, Stub $stub, $isNested)
     {
-        $a += array(
+        $a += [
             'document' => $dom->document,
-        );
+        ];
 
         return $a;
     }
diff --git a/src/Symfony/Component/VarDumper/Caster/DateCaster.php b/src/Symfony/Component/VarDumper/Caster/DateCaster.php
index 175d98655f249..1b03f3706d4aa 100644
--- a/src/Symfony/Component/VarDumper/Caster/DateCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/DateCaster.php
@@ -31,7 +31,7 @@ public static function castDateTime(\DateTimeInterface $d, array $a, Stub $stub,
             .($location ? ($d->format('I') ? "\nDST On" : "\nDST Off") : '')
         ;
 
-        $a = array();
+        $a = [];
         $a[$prefix.'date'] = new ConstStub(self::formatDateTime($d, $location ? ' e (P)' : ' P'), $title);
 
         $stub->class .= $d->format(' @U');
@@ -45,7 +45,7 @@ public static function castInterval(\DateInterval $interval, array $a, Stub $stu
         $numberOfSeconds = $now->add($interval)->getTimestamp() - $now->getTimestamp();
         $title = number_format($numberOfSeconds, 0, '.', ' ').'s';
 
-        $i = array(Caster::PREFIX_VIRTUAL.'interval' => new ConstStub(self::formatInterval($interval), $title));
+        $i = [Caster::PREFIX_VIRTUAL.'interval' => new ConstStub(self::formatInterval($interval), $title)];
 
         return $filter & Caster::EXCLUDE_VERBOSE ? $i : $i + $a;
     }
@@ -78,7 +78,7 @@ public static function castTimeZone(\DateTimeZone $timeZone, array $a, Stub $stu
         $formatted = (new \DateTime('now', $timeZone))->format($location ? 'e (P)' : 'P');
         $title = $location && \extension_loaded('intl') ? \Locale::getDisplayRegion('-'.$location['country_code'], \Locale::getDefault()) : '';
 
-        $z = array(Caster::PREFIX_VIRTUAL.'timezone' => new ConstStub($formatted, $title));
+        $z = [Caster::PREFIX_VIRTUAL.'timezone' => new ConstStub($formatted, $title)];
 
         return $filter & Caster::EXCLUDE_VERBOSE ? $z : $z + $a;
     }
@@ -112,7 +112,7 @@ public static function castPeriod(\DatePeriod $p, array $a, Stub $stub, $isNeste
             ($end = $p->getEndDate()) ? 'to '.self::formatDateTime($end) : 'recurring '.$p->recurrences.' time/s'
         );
 
-        $p = array(Caster::PREFIX_VIRTUAL.'period' => new ConstStub($period, implode("\n", $dates)));
+        $p = [Caster::PREFIX_VIRTUAL.'period' => new ConstStub($period, implode("\n", $dates))];
 
         return $filter & Caster::EXCLUDE_VERBOSE ? $p : $p + $a;
     }
diff --git a/src/Symfony/Component/VarDumper/Caster/DoctrineCaster.php b/src/Symfony/Component/VarDumper/Caster/DoctrineCaster.php
index 785d0270d7b05..6adf9dd837623 100644
--- a/src/Symfony/Component/VarDumper/Caster/DoctrineCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/DoctrineCaster.php
@@ -25,7 +25,7 @@ class DoctrineCaster
 {
     public static function castCommonProxy(CommonProxy $proxy, array $a, Stub $stub, $isNested)
     {
-        foreach (array('__cloner__', '__initializer__') as $k) {
+        foreach (['__cloner__', '__initializer__'] as $k) {
             if (array_key_exists($k, $a)) {
                 unset($a[$k]);
                 ++$stub->cut;
@@ -37,7 +37,7 @@ public static function castCommonProxy(CommonProxy $proxy, array $a, Stub $stub,
 
     public static function castOrmProxy(OrmProxy $proxy, array $a, Stub $stub, $isNested)
     {
-        foreach (array('_entityPersister', '_identifier') as $k) {
+        foreach (['_entityPersister', '_identifier'] as $k) {
             if (array_key_exists($k = "\0Doctrine\\ORM\\Proxy\\Proxy\0".$k, $a)) {
                 unset($a[$k]);
                 ++$stub->cut;
@@ -49,7 +49,7 @@ public static function castOrmProxy(OrmProxy $proxy, array $a, Stub $stub, $isNe
 
     public static function castPersistentCollection(PersistentCollection $coll, array $a, Stub $stub, $isNested)
     {
-        foreach (array('snapshot', 'association', 'typeClass') as $k) {
+        foreach (['snapshot', 'association', 'typeClass'] as $k) {
             if (array_key_exists($k = "\0Doctrine\\ORM\\PersistentCollection\0".$k, $a)) {
                 $a[$k] = new CutStub($a[$k]);
             }
diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
index 49df71da7e31b..e0acbe39dfe9b 100644
--- a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
@@ -24,7 +24,7 @@ class ExceptionCaster
 {
     public static $srcContext = 1;
     public static $traceArgs = true;
-    public static $errorTypes = array(
+    public static $errorTypes = [
         E_DEPRECATED => 'E_DEPRECATED',
         E_USER_DEPRECATED => 'E_USER_DEPRECATED',
         E_RECOVERABLE_ERROR => 'E_RECOVERABLE_ERROR',
@@ -40,9 +40,9 @@ class ExceptionCaster
         E_USER_WARNING => 'E_USER_WARNING',
         E_USER_NOTICE => 'E_USER_NOTICE',
         E_STRICT => 'E_STRICT',
-    );
+    ];
 
-    private static $framesCache = array();
+    private static $framesCache = [];
 
     public static function castError(\Error $e, array $a, Stub $stub, $isNested, $filter = 0)
     {
@@ -92,10 +92,10 @@ public static function castSilencedErrorContext(SilencedErrorContext $e, array $
             $a[$s] = new ConstStub(self::$errorTypes[$a[$s]], $a[$s]);
         }
 
-        $trace = array(array(
+        $trace = [[
             'file' => $a[$sPrefix.'file'],
             'line' => $a[$sPrefix.'line'],
-        ));
+        ]];
 
         if (isset($a[$sPrefix.'trace'])) {
             $trace = array_merge($trace, $a[$sPrefix.'trace']);
@@ -117,16 +117,16 @@ public static function castTraceStub(TraceStub $trace, array $a, Stub $stub, $is
         $frames = $trace->value;
         $prefix = Caster::PREFIX_VIRTUAL;
 
-        $a = array();
+        $a = [];
         $j = \count($frames);
         if (0 > $i = $trace->sliceOffset) {
             $i = max(0, $j + $i);
         }
         if (!isset($trace->value[$i])) {
-            return array();
+            return [];
         }
         $lastCall = isset($frames[$i]['function']) ? (isset($frames[$i]['class']) ? $frames[0]['class'].$frames[$i]['type'] : '').$frames[$i]['function'].'()' : '';
-        $frames[] = array('function' => '');
+        $frames[] = ['function' => ''];
         $collapse = false;
 
         for ($j += $trace->numberingOffset - $i++; isset($frames[$i]); ++$i, --$j) {
@@ -134,16 +134,16 @@ public static function castTraceStub(TraceStub $trace, array $a, Stub $stub, $is
             $call = isset($f['function']) ? (isset($f['class']) ? $f['class'].$f['type'] : '').$f['function'] : '???';
 
             $frame = new FrameStub(
-                array(
+                [
                     'object' => isset($f['object']) ? $f['object'] : null,
                     'class' => isset($f['class']) ? $f['class'] : null,
                     'type' => isset($f['type']) ? $f['type'] : null,
                     'function' => isset($f['function']) ? $f['function'] : null,
-                ) + $frames[$i - 1],
+                ] + $frames[$i - 1],
                 false,
                 true
             );
-            $f = self::castFrameStub($frame, array(), $frame, true);
+            $f = self::castFrameStub($frame, [], $frame, true);
             if (isset($f[$prefix.'src'])) {
                 foreach ($f[$prefix.'src']->value as $label => $frame) {
                     if (0 === strpos($label, "\0~collapse=0")) {
@@ -239,7 +239,7 @@ public static function castFrameStub(FrameStub $frame, array $a, Stub $stub, $is
                     $srcAttr .= '&separator=:';
                 }
                 $srcAttr .= $ellipsis ? '&ellipsis-type=path&ellipsis='.$ellipsis.'&ellipsis-tail='.$ellipsisTail : '';
-                self::$framesCache[$cacheKey] = $a[$prefix.'src'] = new EnumStub(array("\0~$srcAttr\0$srcKey" => $src));
+                self::$framesCache[$cacheKey] = $a[$prefix.'src'] = new EnumStub(["\0~$srcAttr\0$srcKey" => $src]);
             }
         }
 
@@ -265,7 +265,7 @@ private static function filterExceptionArray($xClass, array $a, $xPrefix, $filte
             $trace = $a[$xPrefix.'trace'];
             unset($a[$xPrefix.'trace']); // Ensures the trace is always last
         } else {
-            $trace = array();
+            $trace = [];
         }
 
         if (!($filter & Caster::EXCLUDE_VERBOSE) && $trace) {
@@ -291,23 +291,23 @@ private static function traceUnshift(&$trace, $class, $file, $line)
         if (isset($trace[0]['file'], $trace[0]['line']) && $trace[0]['file'] === $file && $trace[0]['line'] === $line) {
             return;
         }
-        array_unshift($trace, array(
+        array_unshift($trace, [
             'function' => $class ? 'new '.$class : null,
             'file' => $file,
             'line' => $line,
-        ));
+        ]);
     }
 
     private static function extractSource($srcLines, $line, $srcContext, $title, $lang, $file = null)
     {
         $srcLines = explode("\n", $srcLines);
-        $src = array();
+        $src = [];
 
         for ($i = $line - 1 - $srcContext; $i <= $line - 1 + $srcContext; ++$i) {
             $src[] = (isset($srcLines[$i]) ? $srcLines[$i] : '')."\n";
         }
 
-        $srcLines = array();
+        $srcLines = [];
         $ltrim = 0;
         do {
             $pad = null;
diff --git a/src/Symfony/Component/VarDumper/Caster/LinkStub.php b/src/Symfony/Component/VarDumper/Caster/LinkStub.php
index f32f3420a9c51..b589b502d4cef 100644
--- a/src/Symfony/Component/VarDumper/Caster/LinkStub.php
+++ b/src/Symfony/Component/VarDumper/Caster/LinkStub.php
@@ -66,7 +66,7 @@ public function __construct($label, $line = 0, $href = null)
     private function getComposerRoot($file, &$inVendor)
     {
         if (null === self::$vendorRoots) {
-            self::$vendorRoots = array();
+            self::$vendorRoots = [];
 
             foreach (get_declared_classes() as $class) {
                 if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
diff --git a/src/Symfony/Component/VarDumper/Caster/PdoCaster.php b/src/Symfony/Component/VarDumper/Caster/PdoCaster.php
index 83a001d960802..8af51829a93fb 100644
--- a/src/Symfony/Component/VarDumper/Caster/PdoCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/PdoCaster.php
@@ -20,53 +20,53 @@
  */
 class PdoCaster
 {
-    private static $pdoAttributes = array(
-        'CASE' => array(
+    private static $pdoAttributes = [
+        'CASE' => [
             \PDO::CASE_LOWER => 'LOWER',
             \PDO::CASE_NATURAL => 'NATURAL',
             \PDO::CASE_UPPER => 'UPPER',
-        ),
-        'ERRMODE' => array(
+        ],
+        'ERRMODE' => [
             \PDO::ERRMODE_SILENT => 'SILENT',
             \PDO::ERRMODE_WARNING => 'WARNING',
             \PDO::ERRMODE_EXCEPTION => 'EXCEPTION',
-        ),
+        ],
         'TIMEOUT',
         'PREFETCH',
         'AUTOCOMMIT',
         'PERSISTENT',
         'DRIVER_NAME',
         'SERVER_INFO',
-        'ORACLE_NULLS' => array(
+        'ORACLE_NULLS' => [
             \PDO::NULL_NATURAL => 'NATURAL',
             \PDO::NULL_EMPTY_STRING => 'EMPTY_STRING',
             \PDO::NULL_TO_STRING => 'TO_STRING',
-        ),
+        ],
         'CLIENT_VERSION',
         'SERVER_VERSION',
         'STATEMENT_CLASS',
         'EMULATE_PREPARES',
         'CONNECTION_STATUS',
         'STRINGIFY_FETCHES',
-        'DEFAULT_FETCH_MODE' => array(
+        'DEFAULT_FETCH_MODE' => [
             \PDO::FETCH_ASSOC => 'ASSOC',
             \PDO::FETCH_BOTH => 'BOTH',
             \PDO::FETCH_LAZY => 'LAZY',
             \PDO::FETCH_NUM => 'NUM',
             \PDO::FETCH_OBJ => 'OBJ',
-        ),
-    );
+        ],
+    ];
 
     public static function castPdo(\PDO $c, array $a, Stub $stub, $isNested)
     {
-        $attr = array();
+        $attr = [];
         $errmode = $c->getAttribute(\PDO::ATTR_ERRMODE);
         $c->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
 
         foreach (self::$pdoAttributes as $k => $v) {
             if (!isset($k[0])) {
                 $k = $v;
-                $v = array();
+                $v = [];
             }
 
             try {
@@ -85,11 +85,11 @@ public static function castPdo(\PDO $c, array $a, Stub $stub, $isNested)
         }
 
         $prefix = Caster::PREFIX_VIRTUAL;
-        $a += array(
+        $a += [
             $prefix.'inTransaction' => method_exists($c, 'inTransaction'),
             $prefix.'errorInfo' => $c->errorInfo(),
             $prefix.'attributes' => new EnumStub($attr),
-        );
+        ];
 
         if ($a[$prefix.'inTransaction']) {
             $a[$prefix.'inTransaction'] = $c->inTransaction();
diff --git a/src/Symfony/Component/VarDumper/Caster/PgSqlCaster.php b/src/Symfony/Component/VarDumper/Caster/PgSqlCaster.php
index 88414e4ccff26..cd6bf5b5fe666 100644
--- a/src/Symfony/Component/VarDumper/Caster/PgSqlCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/PgSqlCaster.php
@@ -20,7 +20,7 @@
  */
 class PgSqlCaster
 {
-    private static $paramCodes = array(
+    private static $paramCodes = [
         'server_encoding',
         'client_encoding',
         'is_superuser',
@@ -31,17 +31,17 @@ class PgSqlCaster
         'integer_datetimes',
         'application_name',
         'standard_conforming_strings',
-    );
+    ];
 
-    private static $transactionStatus = array(
+    private static $transactionStatus = [
         PGSQL_TRANSACTION_IDLE => 'PGSQL_TRANSACTION_IDLE',
         PGSQL_TRANSACTION_ACTIVE => 'PGSQL_TRANSACTION_ACTIVE',
         PGSQL_TRANSACTION_INTRANS => 'PGSQL_TRANSACTION_INTRANS',
         PGSQL_TRANSACTION_INERROR => 'PGSQL_TRANSACTION_INERROR',
         PGSQL_TRANSACTION_UNKNOWN => 'PGSQL_TRANSACTION_UNKNOWN',
-    );
+    ];
 
-    private static $resultStatus = array(
+    private static $resultStatus = [
         PGSQL_EMPTY_QUERY => 'PGSQL_EMPTY_QUERY',
         PGSQL_COMMAND_OK => 'PGSQL_COMMAND_OK',
         PGSQL_TUPLES_OK => 'PGSQL_TUPLES_OK',
@@ -50,9 +50,9 @@ class PgSqlCaster
         PGSQL_BAD_RESPONSE => 'PGSQL_BAD_RESPONSE',
         PGSQL_NONFATAL_ERROR => 'PGSQL_NONFATAL_ERROR',
         PGSQL_FATAL_ERROR => 'PGSQL_FATAL_ERROR',
-    );
+    ];
 
-    private static $diagCodes = array(
+    private static $diagCodes = [
         'severity' => PGSQL_DIAG_SEVERITY,
         'sqlstate' => PGSQL_DIAG_SQLSTATE,
         'message' => PGSQL_DIAG_MESSAGE_PRIMARY,
@@ -65,7 +65,7 @@ class PgSqlCaster
         'file' => PGSQL_DIAG_SOURCE_FILE,
         'line' => PGSQL_DIAG_SOURCE_LINE,
         'function' => PGSQL_DIAG_SOURCE_FUNCTION,
-    );
+    ];
 
     public static function castLargeObject($lo, array $a, Stub $stub, $isNested)
     {
@@ -127,14 +127,14 @@ public static function castResult($result, array $a, Stub $stub, $isNested)
         $fields = pg_num_fields($result);
 
         for ($i = 0; $i < $fields; ++$i) {
-            $field = array(
+            $field = [
                 'name' => pg_field_name($result, $i),
                 'table' => sprintf('%s (OID: %s)', pg_field_table($result, $i), pg_field_table($result, $i, true)),
                 'type' => sprintf('%s (OID: %s)', pg_field_type($result, $i), pg_field_type_oid($result, $i)),
                 'nullable' => (bool) pg_field_is_null($result, $i),
                 'storage' => pg_field_size($result, $i).' bytes',
                 'display' => pg_field_prtlen($result, $i).' chars',
-            );
+            ];
             if (' (OID: )' === $field['table']) {
                 $field['table'] = null;
             }
diff --git a/src/Symfony/Component/VarDumper/Caster/RedisCaster.php b/src/Symfony/Component/VarDumper/Caster/RedisCaster.php
index 409a0d48a1428..d3104a138329c 100644
--- a/src/Symfony/Component/VarDumper/Caster/RedisCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/RedisCaster.php
@@ -20,11 +20,11 @@
  */
 class RedisCaster
 {
-    private static $serializer = array(
+    private static $serializer = [
         \Redis::SERIALIZER_NONE => 'NONE',
         \Redis::SERIALIZER_PHP => 'PHP',
         2 => 'IGBINARY', // Optional Redis::SERIALIZER_IGBINARY
-    );
+    ];
 
     public static function castRedis(\Redis $c, array $a, Stub $stub, $isNested)
     {
diff --git a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
index 9bfef06983d3a..3f94e59ee12ff 100644
--- a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
@@ -20,7 +20,7 @@
  */
 class ReflectionCaster
 {
-    private static $extraMap = array(
+    private static $extraMap = [
         'docComment' => 'getDocComment',
         'extension' => 'getExtensionName',
         'isDisabled' => 'isDisabled',
@@ -29,7 +29,7 @@ class ReflectionCaster
         'isUserDefined' => 'isUserDefined',
         'isGenerator' => 'isGenerator',
         'isVariadic' => 'isVariadic',
-    );
+    ];
 
     public static function castClosure(\Closure $c, array $a, Stub $stub, $isNested, $filter = 0)
     {
@@ -107,28 +107,28 @@ public static function castReflectionGenerator(\ReflectionGenerator $c, array $a
             $a[$prefix.'this'] = new CutStub($c->getThis());
         }
         $function = $c->getFunction();
-        $frame = array(
+        $frame = [
             'class' => isset($function->class) ? $function->class : null,
             'type' => isset($function->class) ? ($function->isStatic() ? '::' : '->') : null,
             'function' => $function->name,
             'file' => $c->getExecutingFile(),
             'line' => $c->getExecutingLine(),
-        );
+        ];
         if ($trace = $c->getTrace(DEBUG_BACKTRACE_IGNORE_ARGS)) {
             $function = new \ReflectionGenerator($c->getExecutingGenerator());
-            array_unshift($trace, array(
+            array_unshift($trace, [
                 'function' => 'yield',
                 'file' => $function->getExecutingFile(),
                 'line' => $function->getExecutingLine() - 1,
-            ));
+            ]);
             $trace[] = $frame;
             $a[$prefix.'trace'] = new TraceStub($trace, false, 0, -1, -1);
         } else {
             $function = new FrameStub($frame, false, true);
-            $function = ExceptionCaster::castFrameStub($function, array(), $function, true);
-            $a[$prefix.'executing'] = new EnumStub(array(
+            $function = ExceptionCaster::castFrameStub($function, [], $function, true);
+            $a[$prefix.'executing'] = new EnumStub([
                 "\0~separator= \0".$frame['class'].$frame['type'].$frame['function'].'()' => $function[$prefix.'src'],
-            ));
+            ]);
         }
 
         $a[Caster::PREFIX_VIRTUAL.'closed'] = false;
@@ -144,11 +144,11 @@ public static function castClass(\ReflectionClass $c, array $a, Stub $stub, $isN
             $a[$prefix.'modifiers'] = implode(' ', $n);
         }
 
-        self::addMap($a, $c, array(
+        self::addMap($a, $c, [
             'extends' => 'getParentClass',
             'implements' => 'getInterfaceNames',
             'constants' => 'getConstants',
-        ));
+        ]);
 
         foreach ($c->getProperties() as $n) {
             $a[$prefix.'properties'][$n->name] = $n;
diff --git a/src/Symfony/Component/VarDumper/Caster/SplCaster.php b/src/Symfony/Component/VarDumper/Caster/SplCaster.php
index 0780c0a371489..a223adb7f2cae 100644
--- a/src/Symfony/Component/VarDumper/Caster/SplCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/SplCaster.php
@@ -20,12 +20,12 @@
  */
 class SplCaster
 {
-    private static $splFileObjectFlags = array(
+    private static $splFileObjectFlags = [
         \SplFileObject::DROP_NEW_LINE => 'DROP_NEW_LINE',
         \SplFileObject::READ_AHEAD => 'READ_AHEAD',
         \SplFileObject::SKIP_EMPTY => 'SKIP_EMPTY',
         \SplFileObject::READ_CSV => 'READ_CSV',
-    );
+    ];
 
     public static function castArrayObject(\ArrayObject $c, array $a, Stub $stub, $isNested)
     {
@@ -39,9 +39,9 @@ public static function castArrayIterator(\ArrayIterator $c, array $a, Stub $stub
 
     public static function castHeap(\Iterator $c, array $a, Stub $stub, $isNested)
     {
-        $a += array(
+        $a += [
             Caster::PREFIX_VIRTUAL.'heap' => iterator_to_array(clone $c),
-        );
+        ];
 
         return $a;
     }
@@ -52,10 +52,10 @@ public static function castDoublyLinkedList(\SplDoublyLinkedList $c, array $a, S
         $mode = $c->getIteratorMode();
         $c->setIteratorMode(\SplDoublyLinkedList::IT_MODE_KEEP | $mode & ~\SplDoublyLinkedList::IT_MODE_DELETE);
 
-        $a += array(
+        $a += [
             $prefix.'mode' => new ConstStub((($mode & \SplDoublyLinkedList::IT_MODE_LIFO) ? 'IT_MODE_LIFO' : 'IT_MODE_FIFO').' | '.(($mode & \SplDoublyLinkedList::IT_MODE_DELETE) ? 'IT_MODE_DELETE' : 'IT_MODE_KEEP'), $mode),
             $prefix.'dllist' => iterator_to_array($c),
-        );
+        ];
         $c->setIteratorMode($mode);
 
         return $a;
@@ -63,7 +63,7 @@ public static function castDoublyLinkedList(\SplDoublyLinkedList $c, array $a, S
 
     public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, $isNested)
     {
-        static $map = array(
+        static $map = [
             'path' => 'getPath',
             'filename' => 'getFilename',
             'basename' => 'getBasename',
@@ -86,7 +86,7 @@ public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, $isNe
             'dir' => 'isDir',
             'link' => 'isLink',
             'linkTarget' => 'getLinkTarget',
-        );
+        ];
 
         $prefix = Caster::PREFIX_VIRTUAL;
 
@@ -105,7 +105,7 @@ public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, $isNe
             $a[$prefix.'perms'] = new ConstStub(sprintf('0%o', $a[$prefix.'perms']), $a[$prefix.'perms']);
         }
 
-        static $mapDate = array('aTime', 'mTime', 'cTime');
+        static $mapDate = ['aTime', 'mTime', 'cTime'];
         foreach ($mapDate as $key) {
             if (isset($a[$prefix.$key])) {
                 $a[$prefix.$key] = new ConstStub(date('Y-m-d H:i:s', $a[$prefix.$key]), $a[$prefix.$key]);
@@ -117,14 +117,14 @@ public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, $isNe
 
     public static function castFileObject(\SplFileObject $c, array $a, Stub $stub, $isNested)
     {
-        static $map = array(
+        static $map = [
             'csvControl' => 'getCsvControl',
             'flags' => 'getFlags',
             'maxLineLen' => 'getMaxLineLen',
             'fstat' => 'fstat',
             'eof' => 'eof',
             'key' => 'key',
-        );
+        ];
 
         $prefix = Caster::PREFIX_VIRTUAL;
 
@@ -136,7 +136,7 @@ public static function castFileObject(\SplFileObject $c, array $a, Stub $stub, $
         }
 
         if (isset($a[$prefix.'flags'])) {
-            $flagsArray = array();
+            $flagsArray = [];
             foreach (self::$splFileObjectFlags as $value => $name) {
                 if ($a[$prefix.'flags'] & $value) {
                     $flagsArray[] = $name;
@@ -146,7 +146,7 @@ public static function castFileObject(\SplFileObject $c, array $a, Stub $stub, $
         }
 
         if (isset($a[$prefix.'fstat'])) {
-            $a[$prefix.'fstat'] = new CutArrayStub($a[$prefix.'fstat'], array('dev', 'ino', 'nlink', 'rdev', 'blksize', 'blocks'));
+            $a[$prefix.'fstat'] = new CutArrayStub($a[$prefix.'fstat'], ['dev', 'ino', 'nlink', 'rdev', 'blksize', 'blocks']);
         }
 
         return $a;
@@ -154,29 +154,29 @@ public static function castFileObject(\SplFileObject $c, array $a, Stub $stub, $
 
     public static function castFixedArray(\SplFixedArray $c, array $a, Stub $stub, $isNested)
     {
-        $a += array(
+        $a += [
             Caster::PREFIX_VIRTUAL.'storage' => $c->toArray(),
-        );
+        ];
 
         return $a;
     }
 
     public static function castObjectStorage(\SplObjectStorage $c, array $a, Stub $stub, $isNested)
     {
-        $storage = array();
+        $storage = [];
         unset($a[Caster::PREFIX_DYNAMIC."\0gcdata"]); // Don't hit https://bugs.php.net/65967
 
         $clone = clone $c;
         foreach ($clone as $obj) {
-            $storage[] = array(
+            $storage[] = [
                 'object' => $obj,
                 'info' => $clone->getInfo(),
-             );
+             ];
         }
 
-        $a += array(
+        $a += [
             Caster::PREFIX_VIRTUAL.'storage' => $storage,
-        );
+        ];
 
         return $a;
     }
@@ -199,10 +199,10 @@ private static function castSplArray($c, array $a, Stub $stub, $isNested)
             $a = Caster::castObject($c, $class);
             $c->setFlags($flags);
         }
-        $a += array(
+        $a += [
             $prefix.'flag::STD_PROP_LIST' => (bool) ($flags & \ArrayObject::STD_PROP_LIST),
             $prefix.'flag::ARRAY_AS_PROPS' => (bool) ($flags & \ArrayObject::ARRAY_AS_PROPS),
-        );
+        ];
         if ($c instanceof \ArrayObject) {
             $a[$prefix.'iteratorClass'] = new ClassStub($c->getIteratorClass());
         }
diff --git a/src/Symfony/Component/VarDumper/Caster/StubCaster.php b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
index b0bf5dc80d641..9927d42610c18 100644
--- a/src/Symfony/Component/VarDumper/Caster/StubCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
@@ -35,7 +35,7 @@ public static function castStub(Stub $c, array $a, Stub $stub, $isNested)
                 $stub->class = Stub::STRING_BINARY;
             }
 
-            $a = array();
+            $a = [];
         }
 
         return $a;
@@ -51,7 +51,7 @@ public static function cutInternals($obj, array $a, Stub $stub, $isNested)
         if ($isNested) {
             $stub->cut += \count($a);
 
-            return array();
+            return [];
         }
 
         return $a;
@@ -66,7 +66,7 @@ public static function castEnum(EnumStub $c, array $a, Stub $stub, $isNested)
             $stub->cut = $c->cut;
             $stub->attr = $c->attr;
 
-            $a = array();
+            $a = [];
 
             if ($c->value) {
                 foreach (array_keys($c->value) as $k) {
diff --git a/src/Symfony/Component/VarDumper/Caster/SymfonyCaster.php b/src/Symfony/Component/VarDumper/Caster/SymfonyCaster.php
index 5d9decb67aeb3..ae7134f55b2a1 100644
--- a/src/Symfony/Component/VarDumper/Caster/SymfonyCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/SymfonyCaster.php
@@ -16,14 +16,14 @@
 
 class SymfonyCaster
 {
-    private static $requestGetters = array(
+    private static $requestGetters = [
         'pathInfo' => 'getPathInfo',
         'requestUri' => 'getRequestUri',
         'baseUrl' => 'getBaseUrl',
         'basePath' => 'getBasePath',
         'method' => 'getMethod',
         'format' => 'getRequestFormat',
-    );
+    ];
 
     public static function castRequest(Request $request, array $a, Stub $stub, $isNested)
     {
diff --git a/src/Symfony/Component/VarDumper/Caster/XmlReaderCaster.php b/src/Symfony/Component/VarDumper/Caster/XmlReaderCaster.php
index 19b26e69c6a9a..3ae9ec0ba19a0 100644
--- a/src/Symfony/Component/VarDumper/Caster/XmlReaderCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/XmlReaderCaster.php
@@ -19,7 +19,7 @@
  */
 class XmlReaderCaster
 {
-    private static $nodeTypes = array(
+    private static $nodeTypes = [
         \XMLReader::NONE => 'NONE',
         \XMLReader::ELEMENT => 'ELEMENT',
         \XMLReader::ATTRIBUTE => 'ATTRIBUTE',
@@ -38,12 +38,12 @@ class XmlReaderCaster
         \XMLReader::END_ELEMENT => 'END_ELEMENT',
         \XMLReader::END_ENTITY => 'END_ENTITY',
         \XMLReader::XML_DECLARATION => 'XML_DECLARATION',
-    );
+    ];
 
     public static function castXmlReader(\XMLReader $reader, array $a, Stub $stub, $isNested)
     {
         $props = Caster::PREFIX_VIRTUAL.'parserProperties';
-        $info = array(
+        $info = [
             'localName' => $reader->localName,
             'prefix' => $reader->prefix,
             'nodeType' => new ConstStub(self::$nodeTypes[$reader->nodeType], $reader->nodeType),
@@ -55,20 +55,20 @@ public static function castXmlReader(\XMLReader $reader, array $a, Stub $stub, $
             'value' => $reader->value,
             'namespaceURI' => $reader->namespaceURI,
             'baseURI' => $reader->baseURI ? new LinkStub($reader->baseURI) : $reader->baseURI,
-            $props => array(
+            $props => [
                 'LOADDTD' => $reader->getParserProperty(\XMLReader::LOADDTD),
                 'DEFAULTATTRS' => $reader->getParserProperty(\XMLReader::DEFAULTATTRS),
                 'VALIDATE' => $reader->getParserProperty(\XMLReader::VALIDATE),
                 'SUBST_ENTITIES' => $reader->getParserProperty(\XMLReader::SUBST_ENTITIES),
-            ),
-        );
+            ],
+        ];
 
-        if ($info[$props] = Caster::filter($info[$props], Caster::EXCLUDE_EMPTY, array(), $count)) {
+        if ($info[$props] = Caster::filter($info[$props], Caster::EXCLUDE_EMPTY, [], $count)) {
             $info[$props] = new EnumStub($info[$props]);
             $info[$props]->cut = $count;
         }
 
-        $info = Caster::filter($info, Caster::EXCLUDE_EMPTY, array(), $count);
+        $info = Caster::filter($info, Caster::EXCLUDE_EMPTY, [], $count);
         // +2 because hasValue and hasAttributes are always filtered
         $stub->cut += $count + 2;
 
diff --git a/src/Symfony/Component/VarDumper/Caster/XmlResourceCaster.php b/src/Symfony/Component/VarDumper/Caster/XmlResourceCaster.php
index 5d0207ee81dac..117138c7848c0 100644
--- a/src/Symfony/Component/VarDumper/Caster/XmlResourceCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/XmlResourceCaster.php
@@ -20,7 +20,7 @@
  */
 class XmlResourceCaster
 {
-    private static $xmlErrors = array(
+    private static $xmlErrors = [
         XML_ERROR_NONE => 'XML_ERROR_NONE',
         XML_ERROR_NO_MEMORY => 'XML_ERROR_NO_MEMORY',
         XML_ERROR_SYNTAX => 'XML_ERROR_SYNTAX',
@@ -43,7 +43,7 @@ class XmlResourceCaster
         XML_ERROR_INCORRECT_ENCODING => 'XML_ERROR_INCORRECT_ENCODING',
         XML_ERROR_UNCLOSED_CDATA_SECTION => 'XML_ERROR_UNCLOSED_CDATA_SECTION',
         XML_ERROR_EXTERNAL_ENTITY_HANDLING => 'XML_ERROR_EXTERNAL_ENTITY_HANDLING',
-    );
+    ];
 
     public static function castXml($h, array $a, Stub $stub, $isNested)
     {
diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
index 5501fc6983cbe..640c6a858ac4e 100644
--- a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
+++ b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
@@ -213,7 +213,7 @@ public function setMinDepth($minDepth)
      */
     public function cloneVar($var, $filter = 0)
     {
-        $this->prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = array()) {
+        $this->prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) {
             if (E_RECOVERABLE_ERROR === $type || E_USER_ERROR === $type) {
                 // Cloner never dies
                 throw new \ErrorException($msg, 0, $type, $file, $line);
@@ -270,7 +270,7 @@ protected function castObject(Stub $stub, $isNested)
             list($i, $parents, $hasDebugInfo) = $this->classInfo[$class];
         } else {
             $i = 2;
-            $parents = array(strtolower($class));
+            $parents = [strtolower($class)];
             $hasDebugInfo = method_exists($class, '__debugInfo');
 
             foreach (class_parents($class) as $p) {
@@ -283,7 +283,7 @@ protected function castObject(Stub $stub, $isNested)
             }
             $parents[] = '*';
 
-            $this->classInfo[$class] = array($i, $parents, $hasDebugInfo);
+            $this->classInfo[$class] = [$i, $parents, $hasDebugInfo];
         }
 
         $a = Caster::castObject($obj, $class, $hasDebugInfo);
@@ -297,7 +297,7 @@ protected function castObject(Stub $stub, $isNested)
                 }
             }
         } catch (\Exception $e) {
-            $a = array((Stub::TYPE_OBJECT === $stub->type ? Caster::PREFIX_VIRTUAL : '').'⚠' => new ThrowingCasterException($e)) + $a;
+            $a = [(Stub::TYPE_OBJECT === $stub->type ? Caster::PREFIX_VIRTUAL : '').'⚠' => new ThrowingCasterException($e)] + $a;
         }
 
         return $a;
@@ -313,7 +313,7 @@ protected function castObject(Stub $stub, $isNested)
      */
     protected function castResource(Stub $stub, $isNested)
     {
-        $a = array();
+        $a = [];
         $res = $stub->value;
         $type = $stub->class;
 
@@ -324,7 +324,7 @@ protected function castResource(Stub $stub, $isNested)
                 }
             }
         } catch (\Exception $e) {
-            $a = array((Stub::TYPE_OBJECT === $stub->type ? Caster::PREFIX_VIRTUAL : '').'⚠' => new ThrowingCasterException($e)) + $a;
+            $a = [(Stub::TYPE_OBJECT === $stub->type ? Caster::PREFIX_VIRTUAL : '').'⚠' => new ThrowingCasterException($e)] + $a;
         }
 
         return $a;
diff --git a/src/Symfony/Component/VarDumper/Cloner/Cursor.php b/src/Symfony/Component/VarDumper/Cloner/Cursor.php
index 888f4f2be33b9..5b0542f6c20ce 100644
--- a/src/Symfony/Component/VarDumper/Cloner/Cursor.php
+++ b/src/Symfony/Component/VarDumper/Cloner/Cursor.php
@@ -38,6 +38,6 @@ class Cursor
     public $hashLength = 0;
     public $hashCut = 0;
     public $stop = false;
-    public $attr = array();
+    public $attr = [];
     public $skipChildren = false;
 }
diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php
index 8e4700d84b729..025aee359b976 100644
--- a/src/Symfony/Component/VarDumper/Cloner/Data.php
+++ b/src/Symfony/Component/VarDumper/Cloner/Data.php
@@ -79,7 +79,7 @@ public function getValue($recursive = false)
             return $item->value;
         }
 
-        $children = $item->position ? $this->data[$item->position] : array();
+        $children = $item->position ? $this->data[$item->position] : [];
 
         foreach ($children as $k => $v) {
             if ($recursive && !($v = $this->getStub($v)) instanceof Stub) {
@@ -125,7 +125,7 @@ public function __get($key)
         if (null !== $data = $this->seek($key)) {
             $item = $this->getStub($data->data[$data->position][$data->key]);
 
-            return $item instanceof Stub || array() === $item ? $data : $item;
+            return $item instanceof Stub || [] === $item ? $data : $item;
         }
     }
 
@@ -239,7 +239,7 @@ public function seek($key)
         if (!($item = $this->getStub($item)) instanceof Stub || !$item->position) {
             return;
         }
-        $keys = array($key);
+        $keys = [$key];
 
         switch ($item->type) {
             case Stub::TYPE_OBJECT:
@@ -275,7 +275,7 @@ public function seek($key)
      */
     public function dump(DumperInterface $dumper)
     {
-        $refs = array(0);
+        $refs = [0];
         $this->dumpItem($dumper, new Cursor(), $refs, $this->data[$this->position][$this->key]);
     }
 
@@ -295,7 +295,7 @@ private function dumpItem($dumper, $cursor, &$refs, $item)
         $firstSeen = true;
 
         if (!$item instanceof Stub) {
-            $cursor->attr = array();
+            $cursor->attr = [];
             $type = \gettype($item);
             if ($item && 'array' === $type) {
                 $item = $this->getStub($item);
@@ -336,10 +336,10 @@ private function dumpItem($dumper, $cursor, &$refs, $item)
                     if ($cut >= 0) {
                         $cut += \count($children);
                     }
-                    $children = array();
+                    $children = [];
                 }
             } else {
-                $children = array();
+                $children = [];
             }
             switch ($item->type) {
                 case Stub::TYPE_STRING:
diff --git a/src/Symfony/Component/VarDumper/Cloner/Stub.php b/src/Symfony/Component/VarDumper/Cloner/Stub.php
index 3b8e60d90ee6e..09e2c76467f7f 100644
--- a/src/Symfony/Component/VarDumper/Cloner/Stub.php
+++ b/src/Symfony/Component/VarDumper/Cloner/Stub.php
@@ -37,14 +37,14 @@ class Stub implements \Serializable
     public $handle = 0;
     public $refCount = 0;
     public $position = 0;
-    public $attr = array();
+    public $attr = [];
 
     /**
      * @internal
      */
     public function serialize()
     {
-        return \serialize(array($this->class, $this->position, $this->cut, $this->type, $this->value, $this->handle, $this->refCount, $this->attr));
+        return \serialize([$this->class, $this->position, $this->cut, $this->type, $this->value, $this->handle, $this->refCount, $this->attr]);
     }
 
     /**
diff --git a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
index 7a3816cf604e3..fbbe5a3aa896a 100644
--- a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
+++ b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
@@ -74,7 +74,7 @@ protected function doClone($var)
                     if (\is_int($k)) {
                         continue;
                     }
-                    foreach (array($k => true) as $gk => $gv) {
+                    foreach ([$k => true] as $gk => $gv) {
                     }
                     if ($gk !== $k) {
                         $fromObjCast = true;
@@ -163,7 +163,7 @@ protected function doClone($var)
                             // Happens with copies of $GLOBALS
                             if (isset($v[$gid])) {
                                 unset($v[$gid]);
-                                $a = array();
+                                $a = [];
                                 foreach ($v as $gk => &$gv) {
                                     $a[$gk] = &$gv;
                                 }
@@ -254,12 +254,12 @@ protected function doClone($var)
 
                 if ($arrayStub === $stub) {
                     if ($arrayStub->cut) {
-                        $stub = array($arrayStub->cut, $arrayStub->class => $arrayStub->position);
+                        $stub = [$arrayStub->cut, $arrayStub->class => $arrayStub->position];
                         $arrayStub->cut = 0;
                     } elseif (isset(self::$arrayCache[$arrayStub->class][$arrayStub->position])) {
                         $stub = self::$arrayCache[$arrayStub->class][$arrayStub->position];
                     } else {
-                        self::$arrayCache[$arrayStub->class][$arrayStub->position] = $stub = array($arrayStub->class => $arrayStub->position);
+                        self::$arrayCache[$arrayStub->class][$arrayStub->position] = $stub = [$arrayStub->class => $arrayStub->position];
                     }
                 }
 
@@ -273,10 +273,10 @@ protected function doClone($var)
             if ($fromObjCast) {
                 $fromObjCast = false;
                 $refs = $vals;
-                $vals = array();
+                $vals = [];
                 $j = -1;
                 foreach ($queue[$i] as $k => $v) {
-                    foreach (array($k => true) as $gk => $gv) {
+                    foreach ([$k => true] as $gk => $gv) {
                     }
                     if ($gk !== $k) {
                         $vals = (object) $vals;
diff --git a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
index 228f8f2e54331..72c8258a62ae9 100644
--- a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
@@ -73,7 +73,7 @@ public function setOutput($output)
                 $output = fopen($output, 'wb');
             }
             $this->outputStream = $output;
-            $this->lineDumper = array($this, 'echoLine');
+            $this->lineDumper = [$this, 'echoLine'];
         }
 
         return $prev;
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
index 419cfeb4962b8..2bd347d96a53e 100644
--- a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -26,7 +26,7 @@ class CliDumper extends AbstractDumper
 
     protected $colors;
     protected $maxStringWidth = 0;
-    protected $styles = array(
+    protected $styles = [
         // See http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
         'default' => '38;5;208',
         'num' => '1;38;5;38',
@@ -40,17 +40,17 @@ class CliDumper extends AbstractDumper
         'meta' => '38;5;170',
         'key' => '38;5;113',
         'index' => '38;5;38',
-    );
+    ];
 
     protected static $controlCharsRx = '/[\x00-\x1F\x7F]+/';
-    protected static $controlCharsMap = array(
+    protected static $controlCharsMap = [
         "\t" => '\t',
         "\n" => '\n',
         "\v" => '\v',
         "\f" => '\f',
         "\r" => '\r',
         "\033" => '\e',
-    );
+    ];
 
     protected $collapseNextHash = false;
     protected $expandNextHash = false;
@@ -64,7 +64,7 @@ public function __construct($output = null, $charset = null, $flags = 0)
 
         if ('\\' === \DIRECTORY_SEPARATOR && !$this->isWindowsTrueColor()) {
             // Use only the base 16 xterm colors when using ANSICON or standard Windows 10 CLI
-            $this->setStyles(array(
+            $this->setStyles([
                 'default' => '31',
                 'num' => '1;34',
                 'const' => '1;31',
@@ -74,7 +74,7 @@ public function __construct($output = null, $charset = null, $flags = 0)
                 'meta' => '35',
                 'key' => '32',
                 'index' => '34',
-            ));
+            ]);
         }
     }
 
@@ -152,7 +152,7 @@ public function dumpScalar(Cursor $cursor, $type, $value)
                 break;
 
             default:
-                $attr += array('value' => $this->utf8Encode($value));
+                $attr += ['value' => $this->utf8Encode($value)];
                 $value = $this->utf8Encode($type);
                 break;
         }
@@ -177,10 +177,10 @@ public function dumpString(Cursor $cursor, $str, $bin, $cut)
             $this->line .= '""';
             $this->endValue($cursor);
         } else {
-            $attr += array(
+            $attr += [
                 'length' => 0 <= $cut ? mb_strlen($str, 'UTF-8') + $cut : 0,
                 'binary' => $bin,
-            );
+            ];
             $str = explode("\n", $str);
             if (isset($str[1]) && !isset($str[2]) && !isset($str[1][0])) {
                 unset($str[1]);
@@ -272,9 +272,9 @@ public function enterHash(Cursor $cursor, $type, $class, $hasChild)
         }
 
         if ($cursor->softRefCount || 0 < $cursor->softRefHandle) {
-            $prefix .= $this->style('ref', (Cursor::HASH_RESOURCE === $type ? '@' : '#').(0 < $cursor->softRefHandle ? $cursor->softRefHandle : $cursor->softRefTo), array('count' => $cursor->softRefCount));
+            $prefix .= $this->style('ref', (Cursor::HASH_RESOURCE === $type ? '@' : '#').(0 < $cursor->softRefHandle ? $cursor->softRefHandle : $cursor->softRefTo), ['count' => $cursor->softRefCount]);
         } elseif ($cursor->hardRefTo && !$cursor->refIndex && $class) {
-            $prefix .= $this->style('ref', '&'.$cursor->hardRefTo, array('count' => $cursor->hardRefCount));
+            $prefix .= $this->style('ref', '&'.$cursor->hardRefTo, ['count' => $cursor->hardRefCount]);
         } elseif (!$hasChild && Cursor::HASH_RESOURCE === $type) {
             $prefix = substr($prefix, 0, -1);
         }
@@ -327,7 +327,7 @@ protected function dumpKey(Cursor $cursor)
             if ($cursor->hashKeyIsBinary) {
                 $key = $this->utf8Encode($key);
             }
-            $attr = array('binary' => $cursor->hashKeyIsBinary);
+            $attr = ['binary' => $cursor->hashKeyIsBinary];
             $bin = $cursor->hashKeyIsBinary ? 'b' : '';
             $style = 'key';
             switch ($cursor->hashType) {
@@ -364,7 +364,7 @@ protected function dumpKey(Cursor $cursor)
                                 $style = 'meta';
                                 if (isset($key[0][1])) {
                                     parse_str(substr($key[0], 1), $attr);
-                                    $attr += array('binary' => $cursor->hashKeyIsBinary);
+                                    $attr += ['binary' => $cursor->hashKeyIsBinary];
                                 }
                                 break;
                             case '*':
@@ -389,13 +389,13 @@ protected function dumpKey(Cursor $cursor)
                         $this->line .= $bin.$this->style($style, $key[1], $attr).(isset($attr['separator']) ? $attr['separator'] : ': ');
                     } else {
                         // This case should not happen
-                        $this->line .= '-'.$bin.'"'.$this->style('private', $key, array('class' => '')).'": ';
+                        $this->line .= '-'.$bin.'"'.$this->style('private', $key, ['class' => '']).'": ';
                     }
                     break;
             }
 
             if ($cursor->hardRefTo) {
-                $this->line .= $this->style('ref', '&'.($cursor->hardRefCount ? $cursor->hardRefTo : ''), array('count' => $cursor->hardRefCount)).' ';
+                $this->line .= $this->style('ref', '&'.($cursor->hardRefCount ? $cursor->hardRefTo : ''), ['count' => $cursor->hardRefCount]).' ';
             }
         }
     }
@@ -409,7 +409,7 @@ protected function dumpKey(Cursor $cursor)
      *
      * @return string The value with style decoration
      */
-    protected function style($style, $value, $attr = array())
+    protected function style($style, $value, $attr = [])
     {
         if (null === $this->colors) {
             $this->colors = $this->supportsColors();
@@ -495,7 +495,7 @@ protected function supportsColors()
             }
         }
 
-        $h = stream_get_meta_data($this->outputStream) + array('wrapper_type' => null);
+        $h = stream_get_meta_data($this->outputStream) + ['wrapper_type' => null];
         $h = 'Output' === $h['stream_type'] && 'PHP' === $h['wrapper_type'] ? fopen('php://stdout', 'wb') : $this->outputStream;
 
         return static::$defaultColors = $this->hasColorSupport($h);
diff --git a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
index d498e12f838fe..3113a6f38619d 100644
--- a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
@@ -108,7 +108,7 @@ public function setDumpBoundaries($prefix, $suffix)
     /**
      * {@inheritdoc}
      */
-    public function dump(Data $data, $output = null, array $extraDisplayOptions = array())
+    public function dump(Data $data, $output = null, array $extraDisplayOptions = [])
     {
         $this->extraDisplayOptions = $extraDisplayOptions;
         $result = parent::dump($data, $output);
@@ -785,7 +785,7 @@ public function leaveHash(Cursor $cursor, $type, $class, $hasChild, $cut)
     /**
      * {@inheritdoc}
      */
-    protected function style($style, $value, $attr = array())
+    protected function style($style, $value, $attr = [])
     {
         if ('' === $value) {
             return '';
@@ -873,7 +873,7 @@ protected function dumpLine($depth, $endOfValue = false)
         }
 
         if (-1 === $depth) {
-            $args = array('"'.$this->dumpId.'"');
+            $args = ['"'.$this->dumpId.'"'];
             if ($this->extraDisplayOptions) {
                 $args[] = json_encode($this->extraDisplayOptions, JSON_FORCE_OBJECT);
             }
@@ -895,7 +895,7 @@ private function getSourceLink($file, $line)
         $options = $this->extraDisplayOptions + $this->displayOptions;
 
         if ($fmt = $options['fileLinkFormat']) {
-            return \is_string($fmt) ? strtr($fmt, array('%f' => $file, '%l' => $line)) : $fmt->format($file, $line);
+            return \is_string($fmt) ? strtr($fmt, ['%f' => $file, '%l' => $line]) : $fmt->format($file, $line);
         }
 
         return false;
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/CasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/CasterTest.php
index 105d5638ee1bc..728697b413c4d 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/CasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/CasterTest.php
@@ -22,7 +22,7 @@ class CasterTest extends TestCase
 {
     use VarDumperTestTrait;
 
-    private $referenceArray = array(
+    private $referenceArray = [
         'null' => null,
         'empty' => false,
         'public' => 'pub',
@@ -30,7 +30,7 @@ class CasterTest extends TestCase
         "\0+\0dynamic" => 'dyn',
         "\0*\0protected" => 'prot',
         "\0Foo\0private" => 'priv',
-    );
+    ];
 
     /**
      * @dataProvider provideFilter
@@ -48,107 +48,107 @@ public function testFilter($filter, $expectedDiff, $listedProperties = null)
 
     public function provideFilter()
     {
-        return array(
-            array(
+        return [
+            [
                 0,
-                array(),
-            ),
-            array(
+                [],
+            ],
+            [
                 Caster::EXCLUDE_PUBLIC,
-                array(
+                [
                     'null' => null,
                     'empty' => false,
                     'public' => 'pub',
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 Caster::EXCLUDE_NULL,
-                array(
+                [
                     'null' => null,
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 Caster::EXCLUDE_EMPTY,
-                array(
+                [
                     'null' => null,
                     'empty' => false,
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 Caster::EXCLUDE_VIRTUAL,
-                array(
+                [
                     "\0~\0virtual" => 'virt',
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 Caster::EXCLUDE_DYNAMIC,
-                array(
+                [
                     "\0+\0dynamic" => 'dyn',
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 Caster::EXCLUDE_PROTECTED,
-                array(
+                [
                     "\0*\0protected" => 'prot',
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 Caster::EXCLUDE_PRIVATE,
-                array(
+                [
                     "\0Foo\0private" => 'priv',
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 Caster::EXCLUDE_VERBOSE,
-                array(
+                [
                     'public' => 'pub',
                     "\0*\0protected" => 'prot',
-                ),
-                array('public', "\0*\0protected"),
-            ),
-            array(
+                ],
+                ['public', "\0*\0protected"],
+            ],
+            [
                 Caster::EXCLUDE_NOT_IMPORTANT,
-                array(
+                [
                     'null' => null,
                     'empty' => false,
                     "\0~\0virtual" => 'virt',
                     "\0+\0dynamic" => 'dyn',
                     "\0Foo\0private" => 'priv',
-                ),
-                array('public', "\0*\0protected"),
-            ),
-            array(
+                ],
+                ['public', "\0*\0protected"],
+            ],
+            [
                 Caster::EXCLUDE_VIRTUAL | Caster::EXCLUDE_DYNAMIC,
-                array(
+                [
                     "\0~\0virtual" => 'virt',
                     "\0+\0dynamic" => 'dyn',
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 Caster::EXCLUDE_NOT_IMPORTANT | Caster::EXCLUDE_VERBOSE,
                 $this->referenceArray,
-                array('public', "\0*\0protected"),
-            ),
-            array(
+                ['public', "\0*\0protected"],
+            ],
+            [
                 Caster::EXCLUDE_NOT_IMPORTANT | Caster::EXCLUDE_EMPTY,
-                array(
+                [
                     'null' => null,
                     'empty' => false,
                     "\0~\0virtual" => 'virt',
                     "\0+\0dynamic" => 'dyn',
                     "\0*\0protected" => 'prot',
                     "\0Foo\0private" => 'priv',
-                ),
-                array('public', 'empty'),
-            ),
-            array(
+                ],
+                ['public', 'empty'],
+            ],
+            [
                 Caster::EXCLUDE_VERBOSE | Caster::EXCLUDE_EMPTY | Caster::EXCLUDE_STRICT,
-                array(
+                [
                     'empty' => false,
-                ),
-                array('public', 'empty'),
-            ),
-        );
+                ],
+                ['public', 'empty'],
+            ],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php
index dafa16cddd1ba..6d30d9a24d256 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php
@@ -55,7 +55,7 @@ public function testCastDateTime($time, $timezone, $xDate, $xTimestamp, $xInfos)
 
         $stub = new Stub();
         $date = new \DateTime($time, new \DateTimeZone($timezone));
-        $cast = DateCaster::castDateTime($date, array('foo' => 'bar'), $stub, false, 0);
+        $cast = DateCaster::castDateTime($date, ['foo' => 'bar'], $stub, false, 0);
 
         $xDump = <<<EODUMP
 array:1 [
@@ -83,18 +83,18 @@ public function testCastDateTime($time, $timezone, $xDate, $xTimestamp, $xInfos)
 
     public function provideDateTimes()
     {
-        return array(
-            array('2017-04-30 00:00:00.000000', 'Europe/Zurich', '2017-04-30 00:00:00.0 Europe/Zurich (+02:00)', 1493503200, 'Sunday, April 30, 2017%Afrom now%ADST On'),
-            array('2017-12-31 00:00:00.000000', 'Europe/Zurich', '2017-12-31 00:00:00.0 Europe/Zurich (+01:00)', 1514674800, 'Sunday, December 31, 2017%Afrom now%ADST Off'),
-            array('2017-04-30 00:00:00.000000', '+02:00', '2017-04-30 00:00:00.0 +02:00', 1493503200, 'Sunday, April 30, 2017%Afrom now'),
-
-            array('2017-04-30 00:00:00.100000', '+00:00', '2017-04-30 00:00:00.100 +00:00', 1493510400, 'Sunday, April 30, 2017%Afrom now'),
-            array('2017-04-30 00:00:00.120000', '+00:00', '2017-04-30 00:00:00.120 +00:00', 1493510400, 'Sunday, April 30, 2017%Afrom now'),
-            array('2017-04-30 00:00:00.123000', '+00:00', '2017-04-30 00:00:00.123 +00:00', 1493510400, 'Sunday, April 30, 2017%Afrom now'),
-            array('2017-04-30 00:00:00.123400', '+00:00', '2017-04-30 00:00:00.123400 +00:00', 1493510400, 'Sunday, April 30, 2017%Afrom now'),
-            array('2017-04-30 00:00:00.123450', '+00:00', '2017-04-30 00:00:00.123450 +00:00', 1493510400, 'Sunday, April 30, 2017%Afrom now'),
-            array('2017-04-30 00:00:00.123456', '+00:00', '2017-04-30 00:00:00.123456 +00:00', 1493510400, 'Sunday, April 30, 2017%Afrom now'),
-        );
+        return [
+            ['2017-04-30 00:00:00.000000', 'Europe/Zurich', '2017-04-30 00:00:00.0 Europe/Zurich (+02:00)', 1493503200, 'Sunday, April 30, 2017%Afrom now%ADST On'],
+            ['2017-12-31 00:00:00.000000', 'Europe/Zurich', '2017-12-31 00:00:00.0 Europe/Zurich (+01:00)', 1514674800, 'Sunday, December 31, 2017%Afrom now%ADST Off'],
+            ['2017-04-30 00:00:00.000000', '+02:00', '2017-04-30 00:00:00.0 +02:00', 1493503200, 'Sunday, April 30, 2017%Afrom now'],
+
+            ['2017-04-30 00:00:00.100000', '+00:00', '2017-04-30 00:00:00.100 +00:00', 1493510400, 'Sunday, April 30, 2017%Afrom now'],
+            ['2017-04-30 00:00:00.120000', '+00:00', '2017-04-30 00:00:00.120 +00:00', 1493510400, 'Sunday, April 30, 2017%Afrom now'],
+            ['2017-04-30 00:00:00.123000', '+00:00', '2017-04-30 00:00:00.123 +00:00', 1493510400, 'Sunday, April 30, 2017%Afrom now'],
+            ['2017-04-30 00:00:00.123400', '+00:00', '2017-04-30 00:00:00.123400 +00:00', 1493510400, 'Sunday, April 30, 2017%Afrom now'],
+            ['2017-04-30 00:00:00.123450', '+00:00', '2017-04-30 00:00:00.123450 +00:00', 1493510400, 'Sunday, April 30, 2017%Afrom now'],
+            ['2017-04-30 00:00:00.123456', '+00:00', '2017-04-30 00:00:00.123456 +00:00', 1493510400, 'Sunday, April 30, 2017%Afrom now'],
+        ];
     }
 
     /**
@@ -149,7 +149,7 @@ public function testCastInterval($intervalSpec, $ms, $invert, $xInterval, $xSeco
         $interval = $this->createInterval($intervalSpec, $ms, $invert);
         $stub = new Stub();
 
-        $cast = DateCaster::castInterval($interval, array('foo' => 'bar'), $stub, false, Caster::EXCLUDE_VERBOSE);
+        $cast = DateCaster::castInterval($interval, ['foo' => 'bar'], $stub, false, Caster::EXCLUDE_VERBOSE);
 
         $xDump = <<<EODUMP
 array:1 [
@@ -267,7 +267,7 @@ public function testCastTimeZone($timezone, $xTimezone, $xRegion)
         $timezone = new \DateTimeZone($timezone);
         $stub = new Stub();
 
-        $cast = DateCaster::castTimeZone($timezone, array('foo' => 'bar'), $stub, false, Caster::EXCLUDE_VERBOSE);
+        $cast = DateCaster::castTimeZone($timezone, ['foo' => 'bar'], $stub, false, Caster::EXCLUDE_VERBOSE);
 
         $xDump = <<<EODUMP
 array:1 [
@@ -297,27 +297,27 @@ public function provideTimeZones()
     {
         $xRegion = \extension_loaded('intl') ? '%s' : '';
 
-        return array(
+        return [
             // type 1 (UTC offset)
-            array('-12:00', '-12:00', ''),
-            array('+00:00', '+00:00', ''),
-            array('+14:00', '+14:00', ''),
+            ['-12:00', '-12:00', ''],
+            ['+00:00', '+00:00', ''],
+            ['+14:00', '+14:00', ''],
 
             // type 2 (timezone abbreviation)
-            array('GMT', '+00:00', ''),
-            array('a', '+01:00', ''),
-            array('b', '+02:00', ''),
-            array('z', '+00:00', ''),
+            ['GMT', '+00:00', ''],
+            ['a', '+01:00', ''],
+            ['b', '+02:00', ''],
+            ['z', '+00:00', ''],
 
             // type 3 (timezone identifier)
-            array('Africa/Tunis', 'Africa/Tunis (%s:00)', $xRegion),
-            array('America/Panama', 'America/Panama (%s:00)', $xRegion),
-            array('Asia/Jerusalem', 'Asia/Jerusalem (%s:00)', $xRegion),
-            array('Atlantic/Canary', 'Atlantic/Canary (%s:00)', $xRegion),
-            array('Australia/Perth', 'Australia/Perth (%s:00)', $xRegion),
-            array('Europe/Zurich', 'Europe/Zurich (%s:00)', $xRegion),
-            array('Pacific/Tahiti', 'Pacific/Tahiti (%s:00)', $xRegion),
-        );
+            ['Africa/Tunis', 'Africa/Tunis (%s:00)', $xRegion],
+            ['America/Panama', 'America/Panama (%s:00)', $xRegion],
+            ['Asia/Jerusalem', 'Asia/Jerusalem (%s:00)', $xRegion],
+            ['Atlantic/Canary', 'Atlantic/Canary (%s:00)', $xRegion],
+            ['Australia/Perth', 'Australia/Perth (%s:00)', $xRegion],
+            ['Europe/Zurich', 'Europe/Zurich (%s:00)', $xRegion],
+            ['Pacific/Tahiti', 'Pacific/Tahiti (%s:00)', $xRegion],
+        ];
     }
 
     /**
@@ -352,7 +352,7 @@ public function testCastPeriod($start, $interval, $end, $options, $xPeriod, $xDa
         $p = new \DatePeriod(new \DateTime($start), new \DateInterval($interval), \is_int($end) ? $end : new \DateTime($end), $options);
         $stub = new Stub();
 
-        $cast = DateCaster::castPeriod($p, array(), $stub, false, 0);
+        $cast = DateCaster::castPeriod($p, [], $stub, false, 0);
 
         $xDump = <<<EODUMP
 array:1 [
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
index 4f9b538a0a0ed..ea83e77163d19 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
@@ -36,7 +36,7 @@ protected function tearDown()
 
     public function testDefaultSettings()
     {
-        $ref = array('foo');
+        $ref = ['foo'];
         $e = $this->getTestException('foo', $ref);
 
         $expectedDump = <<<'EODUMP'
@@ -57,7 +57,7 @@ public function testDefaultSettings()
 EODUMP;
 
         $this->assertDumpMatchesFormat($expectedDump, $e);
-        $this->assertSame(array('foo'), $ref);
+        $this->assertSame(['foo'], $ref);
     }
 
     public function testSeek()
@@ -166,19 +166,19 @@ public function testFrameWithTwig()
     {
         require_once \dirname(__DIR__).'/Fixtures/Twig.php';
 
-        $f = array(
-            new FrameStub(array(
+        $f = [
+            new FrameStub([
                 'file' => \dirname(__DIR__).'/Fixtures/Twig.php',
                 'line' => 20,
                 'class' => '__TwigTemplate_VarDumperFixture_u75a09',
-            )),
-            new FrameStub(array(
+            ]),
+            new FrameStub([
                 'file' => \dirname(__DIR__).'/Fixtures/Twig.php',
                 'line' => 21,
                 'class' => '__TwigTemplate_VarDumperFixture_u75a09',
                 'object' => new \__TwigTemplate_VarDumperFixture_u75a09(null, __FILE__),
-            )),
-        );
+            ]),
+        ];
 
         $expectedDump = <<<'EODUMP'
 array:2 [
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/PdoCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/PdoCasterTest.php
index 000e5feeb125a..19bbe0f80c43b 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/PdoCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/PdoCasterTest.php
@@ -29,9 +29,9 @@ class PdoCasterTest extends TestCase
     public function testCastPdo()
     {
         $pdo = new \PDO('sqlite::memory:');
-        $pdo->setAttribute(\PDO::ATTR_STATEMENT_CLASS, array('PDOStatement', array($pdo)));
+        $pdo->setAttribute(\PDO::ATTR_STATEMENT_CLASS, ['PDOStatement', [$pdo]]);
 
-        $cast = PdoCaster::castPdo($pdo, array(), new Stub(), false);
+        $cast = PdoCaster::castPdo($pdo, [], new Stub(), false);
 
         $this->assertInstanceOf('Symfony\Component\VarDumper\Caster\EnumStub', $cast["\0~\0attributes"]);
 
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php
index 4e6759155426f..96cb80ebe6e50 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php
@@ -90,10 +90,10 @@ public function testFromCallableClosureCaster()
         if (\defined('HHVM_VERSION_ID')) {
             $this->markTestSkipped('Not for HHVM.');
         }
-        $var = array(
+        $var = [
             (new \ReflectionMethod($this, __FUNCTION__))->getClosure($this),
             (new \ReflectionMethod(__CLASS__, 'tearDownAfterClass'))->getClosure(),
-        );
+        ];
 
         $this->assertDumpMatchesFormat(
             <<<EOTXT
@@ -251,7 +251,7 @@ public function testGenerator()
 EODUMP;
 
         $r = new \ReflectionGenerator($generator);
-        $this->assertDumpMatchesFormat($expectedDump, array($r, $r->getExecutingGenerator()));
+        $this->assertDumpMatchesFormat($expectedDump, [$r, $r->getExecutingGenerator()]);
 
         foreach ($generator as $v) {
         }
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
index 1aa84612684a6..b9379e7bbdd0b 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
@@ -23,8 +23,8 @@ class SplCasterTest extends TestCase
 
     public function getCastFileInfoTests()
     {
-        return array(
-            array(__FILE__, <<<'EOTXT'
+        return [
+            [__FILE__, <<<'EOTXT'
 SplFileInfo {
 %Apath: "%sCaster"
   filename: "SplCasterTest.php"
@@ -49,8 +49,8 @@ public function getCastFileInfoTests()
   link: false
 %A}
 EOTXT
-            ),
-            array('https://google.com/about', <<<'EOTXT'
+            ],
+            ['https://google.com/about', <<<'EOTXT'
 SplFileInfo {
 %Apath: "https://google.com"
   filename: "about"
@@ -60,8 +60,8 @@ public function getCastFileInfoTests()
   realPath: false
 %A}
 EOTXT
-            ),
-        );
+            ],
+        ];
     }
 
     /** @dataProvider getCastFileInfoTests */
@@ -137,12 +137,12 @@ public function testCastSplDoublyLinkedList($modeValue, $modeDump)
 
     public function provideCastSplDoublyLinkedList()
     {
-        return array(
-            array(\SplDoublyLinkedList::IT_MODE_FIFO, 'IT_MODE_FIFO | IT_MODE_KEEP'),
-            array(\SplDoublyLinkedList::IT_MODE_LIFO, 'IT_MODE_LIFO | IT_MODE_KEEP'),
-            array(\SplDoublyLinkedList::IT_MODE_FIFO | \SplDoublyLinkedList::IT_MODE_DELETE, 'IT_MODE_FIFO | IT_MODE_DELETE'),
-            array(\SplDoublyLinkedList::IT_MODE_LIFO | \SplDoublyLinkedList::IT_MODE_DELETE, 'IT_MODE_LIFO | IT_MODE_DELETE'),
-        );
+        return [
+            [\SplDoublyLinkedList::IT_MODE_FIFO, 'IT_MODE_FIFO | IT_MODE_KEEP'],
+            [\SplDoublyLinkedList::IT_MODE_LIFO, 'IT_MODE_LIFO | IT_MODE_KEEP'],
+            [\SplDoublyLinkedList::IT_MODE_FIFO | \SplDoublyLinkedList::IT_MODE_DELETE, 'IT_MODE_FIFO | IT_MODE_DELETE'],
+            [\SplDoublyLinkedList::IT_MODE_LIFO | \SplDoublyLinkedList::IT_MODE_DELETE, 'IT_MODE_LIFO | IT_MODE_DELETE'],
+        ];
     }
 
     public function testCastObjectStorageIsntModified()
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/StubCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/StubCasterTest.php
index 36603c51cc012..945833ebca683 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/StubCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/StubCasterTest.php
@@ -26,7 +26,7 @@ class StubCasterTest extends TestCase
 
     public function testArgsStubWithDefaults($foo = 234, $bar = 456)
     {
-        $args = array(new ArgsStub(array(123), __FUNCTION__, __CLASS__));
+        $args = [new ArgsStub([123], __FUNCTION__, __CLASS__)];
 
         $expectedDump = <<<'EODUMP'
 array:1 [
@@ -41,7 +41,7 @@ public function testArgsStubWithDefaults($foo = 234, $bar = 456)
 
     public function testArgsStubWithExtraArgs($foo = 234)
     {
-        $args = array(new ArgsStub(array(123, 456), __FUNCTION__, __CLASS__));
+        $args = [new ArgsStub([123, 456], __FUNCTION__, __CLASS__)];
 
         $expectedDump = <<<'EODUMP'
 array:1 [
@@ -59,7 +59,7 @@ public function testArgsStubWithExtraArgs($foo = 234)
 
     public function testArgsStubNoParamWithExtraArgs()
     {
-        $args = array(new ArgsStub(array(123), __FUNCTION__, __CLASS__));
+        $args = [new ArgsStub([123], __FUNCTION__, __CLASS__)];
 
         $expectedDump = <<<'EODUMP'
 array:1 [
@@ -74,7 +74,7 @@ public function testArgsStubNoParamWithExtraArgs()
 
     public function testArgsStubWithClosure()
     {
-        $args = array(new ArgsStub(array(123), '{closure}', null));
+        $args = [new ArgsStub([123], '{closure}', null)];
 
         $expectedDump = <<<'EODUMP'
 array:1 [
@@ -89,13 +89,13 @@ public function testArgsStubWithClosure()
 
     public function testLinkStub()
     {
-        $var = array(new LinkStub(__CLASS__, 0, __FILE__));
+        $var = [new LinkStub(__CLASS__, 0, __FILE__)];
 
         $cloner = new VarCloner();
         $dumper = new HtmlDumper();
         $dumper->setDumpHeader('<foo></foo>');
         $dumper->setDumpBoundaries('<bar>', '</bar>');
-        $dumper->setDisplayOptions(array('fileLinkFormat' => '%f:%l'));
+        $dumper->setDisplayOptions(['fileLinkFormat' => '%f:%l']);
         $dump = $dumper->dump($cloner->cloneVar($var), true);
 
         $expectedDump = <<<'EODUMP'
@@ -110,13 +110,13 @@ public function testLinkStub()
 
     public function testLinkStubWithNoFileLink()
     {
-        $var = array(new LinkStub('example.com', 0, 'http://example.com'));
+        $var = [new LinkStub('example.com', 0, 'http://example.com')];
 
         $cloner = new VarCloner();
         $dumper = new HtmlDumper();
         $dumper->setDumpHeader('<foo></foo>');
         $dumper->setDumpBoundaries('<bar>', '</bar>');
-        $dumper->setDisplayOptions(array('fileLinkFormat' => '%f:%l'));
+        $dumper->setDisplayOptions(['fileLinkFormat' => '%f:%l']);
         $dump = $dumper->dump($cloner->cloneVar($var), true);
 
         $expectedDump = <<<'EODUMP'
@@ -131,13 +131,13 @@ public function testLinkStubWithNoFileLink()
 
     public function testClassStub()
     {
-        $var = array(new ClassStub('hello', array(FooInterface::class, 'foo')));
+        $var = [new ClassStub('hello', [FooInterface::class, 'foo'])];
 
         $cloner = new VarCloner();
         $dumper = new HtmlDumper();
         $dumper->setDumpHeader('<foo></foo>');
         $dumper->setDumpBoundaries('<bar>', '</bar>');
-        $dump = $dumper->dump($cloner->cloneVar($var), true, array('fileLinkFormat' => '%f:%l'));
+        $dump = $dumper->dump($cloner->cloneVar($var), true, ['fileLinkFormat' => '%f:%l']);
 
         $expectedDump = <<<'EODUMP'
 <foo></foo><bar><span class=sf-dump-note>array:1</span> [<samp>
@@ -151,7 +151,7 @@ public function testClassStub()
 
     public function testClassStubWithNotExistingClass()
     {
-        $var = array(new ClassStub(NotExisting::class));
+        $var = [new ClassStub(NotExisting::class)];
 
         $cloner = new VarCloner();
         $dumper = new HtmlDumper();
@@ -172,13 +172,13 @@ public function testClassStubWithNotExistingClass()
 
     public function testClassStubWithNotExistingMethod()
     {
-        $var = array(new ClassStub('hello', array(FooInterface::class, 'missing')));
+        $var = [new ClassStub('hello', [FooInterface::class, 'missing'])];
 
         $cloner = new VarCloner();
         $dumper = new HtmlDumper();
         $dumper->setDumpHeader('<foo></foo>');
         $dumper->setDumpBoundaries('<bar>', '</bar>');
-        $dump = $dumper->dump($cloner->cloneVar($var), true, array('fileLinkFormat' => '%f:%l'));
+        $dump = $dumper->dump($cloner->cloneVar($var), true, ['fileLinkFormat' => '%f:%l']);
 
         $expectedDump = <<<'EODUMP'
 <foo></foo><bar><span class=sf-dump-note>array:1</span> [<samp>
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/XmlReaderCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/XmlReaderCasterTest.php
index 374d298af1637..1d7b3f62787a2 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/XmlReaderCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/XmlReaderCasterTest.php
@@ -66,15 +66,15 @@ public function testNodes($seek, $expectedDump)
 
     public function provideNodes()
     {
-        return array(
-            array(0, <<<'EODUMP'
+        return [
+            [0, <<<'EODUMP'
 XMLReader {
   +nodeType: NONE
    …13
 }
 EODUMP
-            ),
-            array(1, <<<'EODUMP'
+            ],
+            [1, <<<'EODUMP'
 XMLReader {
   +localName: "foo"
   +nodeType: ELEMENT
@@ -82,8 +82,8 @@ public function provideNodes()
    …11
 }
 EODUMP
-            ),
-            array(2, <<<'EODUMP'
+            ],
+            [2, <<<'EODUMP'
 XMLReader {
   +localName: "#text"
   +nodeType: SIGNIFICANT_WHITESPACE
@@ -96,8 +96,8 @@ public function provideNodes()
    …9
 }
 EODUMP
-            ),
-            array(3, <<<'EODUMP'
+            ],
+            [3, <<<'EODUMP'
 XMLReader {
   +localName: "bar"
   +nodeType: ELEMENT
@@ -106,8 +106,8 @@ public function provideNodes()
    …10
 }
 EODUMP
-            ),
-            array(4, <<<'EODUMP'
+            ],
+            [4, <<<'EODUMP'
 XMLReader {
   +localName: "bar"
   +nodeType: END_ELEMENT
@@ -116,8 +116,8 @@ public function provideNodes()
    …10
 }
 EODUMP
-            ),
-            array(6, <<<'EODUMP'
+            ],
+            [6, <<<'EODUMP'
 XMLReader {
   +localName: "bar"
   +nodeType: ELEMENT
@@ -127,8 +127,8 @@ public function provideNodes()
    …9
 }
 EODUMP
-            ),
-            array(9, <<<'EODUMP'
+            ],
+            [9, <<<'EODUMP'
 XMLReader {
   +localName: "#text"
   +nodeType: TEXT
@@ -138,8 +138,8 @@ public function provideNodes()
    …9
 }
 EODUMP
-            ),
-            array(12, <<<'EODUMP'
+            ],
+            [12, <<<'EODUMP'
 XMLReader {
   +localName: "bar"
   +nodeType: ELEMENT
@@ -149,8 +149,8 @@ public function provideNodes()
    …9
 }
 EODUMP
-            ),
-            array(13, <<<'EODUMP'
+            ],
+            [13, <<<'EODUMP'
 XMLReader {
   +localName: "bar"
   +nodeType: END_ELEMENT
@@ -159,8 +159,8 @@ public function provideNodes()
    …10
 }
 EODUMP
-            ),
-            array(15, <<<'EODUMP'
+            ],
+            [15, <<<'EODUMP'
 XMLReader {
   +localName: "bar"
   +nodeType: ELEMENT
@@ -170,8 +170,8 @@ public function provideNodes()
    …9
 }
 EODUMP
-            ),
-            array(16, <<<'EODUMP'
+            ],
+            [16, <<<'EODUMP'
 XMLReader {
   +localName: "#text"
   +nodeType: SIGNIFICANT_WHITESPACE
@@ -184,8 +184,8 @@ public function provideNodes()
    …9
 }
 EODUMP
-            ),
-            array(17, <<<'EODUMP'
+            ],
+            [17, <<<'EODUMP'
 XMLReader {
   +localName: "baz"
   +prefix: "baz"
@@ -196,8 +196,8 @@ public function provideNodes()
    …8
 }
 EODUMP
-            ),
-            array(18, <<<'EODUMP'
+            ],
+            [18, <<<'EODUMP'
 XMLReader {
   +localName: "baz"
   +prefix: "baz"
@@ -208,8 +208,8 @@ public function provideNodes()
    …8
 }
 EODUMP
-            ),
-            array(19, <<<'EODUMP'
+            ],
+            [19, <<<'EODUMP'
 XMLReader {
   +localName: "#text"
   +nodeType: SIGNIFICANT_WHITESPACE
@@ -222,8 +222,8 @@ public function provideNodes()
    …9
 }
 EODUMP
-            ),
-            array(21, <<<'EODUMP'
+            ],
+            [21, <<<'EODUMP'
 XMLReader {
   +localName: "#text"
   +nodeType: SIGNIFICANT_WHITESPACE
@@ -233,8 +233,8 @@ public function provideNodes()
    …9
 }
 EODUMP
-            ),
-            array(22, <<<'EODUMP'
+            ],
+            [22, <<<'EODUMP'
 XMLReader {
   +localName: "foo"
   +nodeType: END_ELEMENT
@@ -242,7 +242,7 @@ public function provideNodes()
    …11
 }
 EODUMP
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/src/Symfony/Component/VarDumper/Tests/Cloner/DataTest.php b/src/Symfony/Component/VarDumper/Tests/Cloner/DataTest.php
index d10951be93de1..7d20bced35a4f 100644
--- a/src/Symfony/Component/VarDumper/Tests/Cloner/DataTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Cloner/DataTest.php
@@ -21,9 +21,9 @@ class DataTest extends TestCase
 {
     public function testBasicData()
     {
-        $values = array(1 => 123, 4.5, 'abc', null, false);
+        $values = [1 => 123, 4.5, 'abc', null, false];
         $data = $this->cloneVar($values);
-        $clonedValues = array();
+        $clonedValues = [];
 
         $this->assertInstanceOf(Data::class, $data);
         $this->assertCount(\count($values), $data);
@@ -62,7 +62,7 @@ public function testObject()
 
     public function testArray()
     {
-        $values = array(array(), array(123));
+        $values = [[], [123]];
         $data = $this->cloneVar($values);
 
         $this->assertSame($values, $data->getValue(true));
@@ -83,7 +83,7 @@ public function testArray()
 
     public function testStub()
     {
-        $data = $this->cloneVar(array(new ClassStub('stdClass')));
+        $data = $this->cloneVar([new ClassStub('stdClass')]);
         $data = $data[0];
 
         $this->assertSame('string', $data->getType());
@@ -93,15 +93,15 @@ public function testStub()
 
     public function testHardRefs()
     {
-        $values = array(array());
+        $values = [[]];
         $values[1] = &$values[0];
         $values[2][0] = &$values[2];
 
         $data = $this->cloneVar($values);
 
-        $this->assertSame(array(), $data[0]->getValue());
-        $this->assertSame(array(), $data[1]->getValue());
-        $this->assertEquals(array($data[2]->getValue()), $data[2]->getValue(true));
+        $this->assertSame([], $data[0]->getValue());
+        $this->assertSame([], $data[1]->getValue());
+        $this->assertEquals([$data[2]->getValue()], $data[2]->getValue(true));
 
         $this->assertSame('array (count=3)', (string) $data);
     }
diff --git a/src/Symfony/Component/VarDumper/Tests/Cloner/VarClonerTest.php b/src/Symfony/Component/VarDumper/Tests/Cloner/VarClonerTest.php
index 12fabcf08cb09..3b180af49810d 100644
--- a/src/Symfony/Component/VarDumper/Tests/Cloner/VarClonerTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Cloner/VarClonerTest.php
@@ -21,7 +21,7 @@ class VarClonerTest extends TestCase
 {
     public function testMaxIntBoundary()
     {
-        $data = array(PHP_INT_MAX => 123);
+        $data = [PHP_INT_MAX => 123];
 
         $cloner = new VarCloner();
         $clone = $cloner->cloneVar($data);
@@ -149,42 +149,42 @@ public function testClone()
     public function testLimits()
     {
         // Level 0:
-        $data = array(
+        $data = [
             // Level 1:
-            array(
+            [
                 // Level 2:
-                array(
+                [
                     // Level 3:
                     'Level 3 Item 0',
                     'Level 3 Item 1',
                     'Level 3 Item 2',
                     'Level 3 Item 3',
-                ),
-                array(
+                ],
+                [
                     'Level 3 Item 4',
                     'Level 3 Item 5',
                     'Level 3 Item 6',
-                ),
-                array(
+                ],
+                [
                     'Level 3 Item 7',
-                ),
-            ),
-            array(
-                array(
+                ],
+            ],
+            [
+                [
                     'Level 3 Item 8',
-                ),
+                ],
                 'Level 2 Item 0',
-            ),
-            array(
+            ],
+            [
                 'Level 2 Item 1',
-            ),
+            ],
             'Level 1 Item 0',
-            array(
+            [
                 // Test setMaxString:
                 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
                 'SHORT',
-            ),
-        );
+            ],
+        ];
 
         $cloner = new VarCloner();
         $cloner->setMinDepth(2);
@@ -381,16 +381,16 @@ public function testJsonCast()
 
     public function testCaster()
     {
-        $cloner = new VarCloner(array(
+        $cloner = new VarCloner([
             '*' => function ($obj, $array) {
-                return array('foo' => 123);
+                return ['foo' => 123];
             },
             __CLASS__ => function ($obj, $array) {
                 ++$array['foo'];
 
                 return $array;
             },
-        ));
+        ]);
         $clone = $cloner->cloneVar($this);
 
         $expected = <<<EOTXT
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
index 298c33e6293d6..16c1968f25a76 100644
--- a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
@@ -32,13 +32,13 @@ public function testGet()
         $dumper = new CliDumper('php://output');
         $dumper->setColors(false);
         $cloner = new VarCloner();
-        $cloner->addCasters(array(
+        $cloner->addCasters([
             ':stream' => function ($res, $a) {
                 unset($a['uri'], $a['wrapper_data']);
 
                 return $a;
             },
-        ));
+        ]);
         $data = $cloner->cloneVar($var);
 
         ob_start();
@@ -119,11 +119,11 @@ public function testDumpWithCommaFlag($expected, $flags)
         $dumper->setColors(false);
         $cloner = new VarCloner();
 
-        $var = array(
-            'array' => array('a', 'b'),
+        $var = [
+            'array' => ['a', 'b'],
             'string' => 'hello',
             'multiline string' => "this\nis\na\multiline\nstring",
-        );
+        ];
 
         $dump = $dumper->dump($cloner->cloneVar($var), true);
 
@@ -179,7 +179,7 @@ public function provideDumpWithCommaFlagTests()
 
 EOTXT;
 
-        yield array($expected, CliDumper::DUMP_COMMA_SEPARATOR);
+        yield [$expected, CliDumper::DUMP_COMMA_SEPARATOR];
 
         $expected = <<<'EOTXT'
 array:3 [
@@ -198,7 +198,7 @@ public function provideDumpWithCommaFlagTests()
 
 EOTXT;
 
-        yield array($expected, CliDumper::DUMP_TRAILING_COMMA);
+        yield [$expected, CliDumper::DUMP_TRAILING_COMMA];
     }
 
     /**
@@ -261,7 +261,7 @@ public function testJsonCast()
 
     public function testObjectCast()
     {
-        $var = (object) array(1 => 1);
+        $var = (object) [1 => 1];
         $var->{1} = 2;
 
         if (\PHP_VERSION_ID >= 70200) {
@@ -322,10 +322,10 @@ public function testFlags()
         putenv('DUMP_LIGHT_ARRAY=1');
         putenv('DUMP_STRING_LENGTH=1');
 
-        $var = array(
+        $var = [
             range(1, 3),
-            array('foo', 2 => 'bar'),
-        );
+            ['foo', 2 => 'bar'],
+        ];
 
         $this->assertDumpEquals(
             <<<EOTXT
@@ -362,14 +362,14 @@ public function testThrowingCaster()
         $dumper = new CliDumper();
         $dumper->setColors(false);
         $cloner = new VarCloner();
-        $cloner->addCasters(array(
+        $cloner->addCasters([
             ':stream' => function ($res, $a) {
                 unset($a['wrapper_data']);
 
                 return $a;
             },
-        ));
-        $cloner->addCasters(array(
+        ]);
+        $cloner->addCasters([
             ':stream' => eval('return function () use ($twig) {
                 try {
                     $twig->render(array());
@@ -377,7 +377,7 @@ public function testThrowingCaster()
                     throw $e->getPrevious();
                 }
             };'),
-        ));
+        ]);
         $ref = (int) $out;
 
         $data = $cloner->cloneVar($out);
@@ -419,7 +419,7 @@ public function testThrowingCaster()
 
     public function testRefsInProperties()
     {
-        $var = (object) array('foo' => 'foo');
+        $var = (object) ['foo' => 'foo'];
         $var->bar = &$var->foo;
 
         $dumper = new CliDumper();
@@ -580,12 +580,12 @@ private function getSpecialVars()
         }
 
         $var = function &() {
-            $var = array();
+            $var = [];
             $var[] = &$var;
 
             return $var;
         };
 
-        return array($var(), $GLOBALS, &$GLOBALS);
+        return [$var(), $GLOBALS, &$GLOBALS];
     }
 }
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/FunctionsTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/FunctionsTest.php
index 81ecdddc56823..0bd596c2adc44 100644
--- a/src/Symfony/Component/VarDumper/Tests/Dumper/FunctionsTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/FunctionsTest.php
@@ -43,7 +43,7 @@ public function testDumpReturnsAllArgsInArray()
         $return = dump($var1, $var2, $var3);
         $out = ob_get_clean();
 
-        $this->assertEquals(array($var1, $var2, $var3), $return);
+        $this->assertEquals([$var1, $var2, $var3], $return);
     }
 
     protected function setupVarDumper()
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php
index 98ca471ac1c20..8a7e68ebf0c0e 100644
--- a/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php
@@ -32,13 +32,13 @@ public function testGet()
         $dumper->setDumpHeader('<foo></foo>');
         $dumper->setDumpBoundaries('<bar>', '</bar>');
         $cloner = new VarCloner();
-        $cloner->addCasters(array(
+        $cloner->addCasters([
             ':stream' => function ($res, $a) {
                 unset($a['uri'], $a['wrapper_data']);
 
                 return $a;
             },
-        ));
+        ]);
         $data = $cloner->cloneVar($var);
 
         ob_start();
diff --git a/src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php b/src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php
index fe2542929b100..8b84d820fcf7c 100644
--- a/src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php
+++ b/src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php
@@ -11,11 +11,11 @@ public function __construct(Twig\Environment $env = null, $path = null)
             parent::__construct($env);
         }
         $this->parent = false;
-        $this->blocks = array();
+        $this->blocks = [];
         $this->path = $path;
     }
 
-    protected function doDisplay(array $context, array $blocks = array())
+    protected function doDisplay(array $context, array $blocks = [])
     {
         // line 2
         throw new \Exception('Foobar');
@@ -28,7 +28,7 @@ public function getTemplateName()
 
     public function getDebugInfo()
     {
-        return array(20 => 1, 21 => 2);
+        return [20 => 1, 21 => 2];
     }
 
     public function getSourceContext()
diff --git a/src/Symfony/Component/VarDumper/Tests/Test/VarDumperTestTraitTest.php b/src/Symfony/Component/VarDumper/Tests/Test/VarDumperTestTraitTest.php
index 464d67f6cec03..18042fb3bf594 100644
--- a/src/Symfony/Component/VarDumper/Tests/Test/VarDumperTestTraitTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Test/VarDumperTestTraitTest.php
@@ -21,7 +21,7 @@ class VarDumperTestTraitTest extends TestCase
     public function testItComparesLargeData()
     {
         $howMany = 700;
-        $data = array_fill_keys(range(0, $howMany), array('a', 'b', 'c', 'd'));
+        $data = array_fill_keys(range(0, $howMany), ['a', 'b', 'c', 'd']);
 
         $expected = sprintf("array:%d [\n", $howMany + 1);
         for ($i = 0; $i <= $howMany; ++$i) {
diff --git a/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php b/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php
index ef2fdee79d661..3d04f9a13fb20 100644
--- a/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php
+++ b/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php
@@ -52,6 +52,6 @@ public function onKernelResponse(FilterResponseEvent $event)
      */
     public static function getSubscribedEvents()
     {
-        return array(KernelEvents::RESPONSE => 'onKernelResponse');
+        return [KernelEvents::RESPONSE => 'onKernelResponse'];
     }
 }
diff --git a/src/Symfony/Component/WebLink/HttpHeaderSerializer.php b/src/Symfony/Component/WebLink/HttpHeaderSerializer.php
index e2ef3d2f17b5c..b329fd373d59f 100644
--- a/src/Symfony/Component/WebLink/HttpHeaderSerializer.php
+++ b/src/Symfony/Component/WebLink/HttpHeaderSerializer.php
@@ -31,13 +31,13 @@ final class HttpHeaderSerializer
      */
     public function serialize($links)
     {
-        $elements = array();
+        $elements = [];
         foreach ($links as $link) {
             if ($link->isTemplated()) {
                 continue;
             }
 
-            $attributesParts = array('', sprintf('rel="%s"', implode(' ', $link->getRels())));
+            $attributesParts = ['', sprintf('rel="%s"', implode(' ', $link->getRels()))];
             foreach ($link->getAttributes() as $key => $value) {
                 if (\is_array($value)) {
                     foreach ($value as $v) {
diff --git a/src/Symfony/Component/WebLink/Tests/EventListener/AddLinkHeaderListenerTest.php b/src/Symfony/Component/WebLink/Tests/EventListener/AddLinkHeaderListenerTest.php
index c592eb231c94a..5a714715789fb 100644
--- a/src/Symfony/Component/WebLink/Tests/EventListener/AddLinkHeaderListenerTest.php
+++ b/src/Symfony/Component/WebLink/Tests/EventListener/AddLinkHeaderListenerTest.php
@@ -28,8 +28,8 @@ class AddLinkHeaderListenerTest extends TestCase
 {
     public function testOnKernelResponse()
     {
-        $request = new Request(array(), array(), array('_links' => new GenericLinkProvider(array(new Link('preload', '/foo')))));
-        $response = new Response('', 200, array('Link' => '<https://demo.api-platform.com/docs.jsonld>; rel="http://www.w3.org/ns/hydra/core#apiDocumentation"'));
+        $request = new Request([], [], ['_links' => new GenericLinkProvider([new Link('preload', '/foo')])]);
+        $response = new Response('', 200, ['Link' => '<https://demo.api-platform.com/docs.jsonld>; rel="http://www.w3.org/ns/hydra/core#apiDocumentation"']);
 
         $subscriber = new AddLinkHeaderListener();
 
@@ -42,16 +42,16 @@ public function testOnKernelResponse()
 
         $this->assertInstanceOf(EventSubscriberInterface::class, $subscriber);
 
-        $expected = array(
+        $expected = [
             '<https://demo.api-platform.com/docs.jsonld>; rel="http://www.w3.org/ns/hydra/core#apiDocumentation"',
             '</foo>; rel="preload"',
-        );
+        ];
 
         $this->assertEquals($expected, $response->headers->get('Link', null, false));
     }
 
     public function testSubscribedEvents()
     {
-        $this->assertEquals(array(KernelEvents::RESPONSE => 'onKernelResponse'), AddLinkHeaderListener::getSubscribedEvents());
+        $this->assertEquals([KernelEvents::RESPONSE => 'onKernelResponse'], AddLinkHeaderListener::getSubscribedEvents());
     }
 }
diff --git a/src/Symfony/Component/WebLink/Tests/HttpHeaderSerializerTest.php b/src/Symfony/Component/WebLink/Tests/HttpHeaderSerializerTest.php
index 553371fbb414e..fb4bbd96f2107 100644
--- a/src/Symfony/Component/WebLink/Tests/HttpHeaderSerializerTest.php
+++ b/src/Symfony/Component/WebLink/Tests/HttpHeaderSerializerTest.php
@@ -29,19 +29,19 @@ protected function setUp()
 
     public function testSerialize()
     {
-        $links = array(
+        $links = [
             new Link('prerender', '/1'),
             (new Link('dns-prefetch', '/2'))->withAttribute('pr', 0.7),
             (new Link('preload', '/3'))->withAttribute('as', 'script')->withAttribute('nopush', false),
             (new Link('preload', '/4'))->withAttribute('as', 'image')->withAttribute('nopush', true),
-            (new Link('alternate', '/5'))->withRel('next')->withAttribute('hreflang', array('fr', 'de'))->withAttribute('title', 'Hello'),
-        );
+            (new Link('alternate', '/5'))->withRel('next')->withAttribute('hreflang', ['fr', 'de'])->withAttribute('title', 'Hello'),
+        ];
 
         $this->assertEquals('</1>; rel="prerender",</2>; rel="dns-prefetch"; pr="0.7",</3>; rel="preload"; as="script",</4>; rel="preload"; as="image"; nopush,</5>; rel="alternate next"; hreflang="fr"; hreflang="de"; title="Hello"', $this->serializer->serialize($links));
     }
 
     public function testSerializeEmpty()
     {
-        $this->assertNull($this->serializer->serialize(array()));
+        $this->assertNull($this->serializer->serialize([]));
     }
 }
diff --git a/src/Symfony/Component/Workflow/Definition.php b/src/Symfony/Component/Workflow/Definition.php
index ec0a0150116c2..e6d23a2f07a61 100644
--- a/src/Symfony/Component/Workflow/Definition.php
+++ b/src/Symfony/Component/Workflow/Definition.php
@@ -21,8 +21,8 @@
  */
 final class Definition
 {
-    private $places = array();
-    private $transitions = array();
+    private $places = [];
+    private $transitions = [];
     private $initialPlace;
 
     /**
diff --git a/src/Symfony/Component/Workflow/DefinitionBuilder.php b/src/Symfony/Component/Workflow/DefinitionBuilder.php
index 16d66286efb4c..5950748b75190 100644
--- a/src/Symfony/Component/Workflow/DefinitionBuilder.php
+++ b/src/Symfony/Component/Workflow/DefinitionBuilder.php
@@ -51,8 +51,8 @@ public function build()
      */
     public function reset()
     {
-        $this->places = array();
-        $this->transitions = array();
+        $this->places = [];
+        $this->transitions = [];
         $this->initialPlace = null;
 
         return $this;
diff --git a/src/Symfony/Component/Workflow/Dumper/DumperInterface.php b/src/Symfony/Component/Workflow/Dumper/DumperInterface.php
index b0eebd34f1952..797c63e32b594 100644
--- a/src/Symfony/Component/Workflow/Dumper/DumperInterface.php
+++ b/src/Symfony/Component/Workflow/Dumper/DumperInterface.php
@@ -31,5 +31,5 @@ interface DumperInterface
      *
      * @return string The representation of the workflow
      */
-    public function dump(Definition $definition, Marking $marking = null, array $options = array());
+    public function dump(Definition $definition, Marking $marking = null, array $options = []);
 }
diff --git a/src/Symfony/Component/Workflow/Dumper/GraphvizDumper.php b/src/Symfony/Component/Workflow/Dumper/GraphvizDumper.php
index 3681b6f1391a8..e9d6231168a94 100644
--- a/src/Symfony/Component/Workflow/Dumper/GraphvizDumper.php
+++ b/src/Symfony/Component/Workflow/Dumper/GraphvizDumper.php
@@ -43,7 +43,7 @@ class GraphvizDumper implements DumperInterface
      *  * node: The default options for nodes (places + transitions)
      *  * edge: The default options for edges
      */
-    public function dump(Definition $definition, Marking $marking = null, array $options = array())
+    public function dump(Definition $definition, Marking $marking = null, array $options = [])
     {
         $places = $this->findPlaces($definition, $marking);
         $transitions = $this->findTransitions($definition);
@@ -63,10 +63,10 @@ public function dump(Definition $definition, Marking $marking = null, array $opt
      */
     protected function findPlaces(Definition $definition, Marking $marking = null)
     {
-        $places = array();
+        $places = [];
 
         foreach ($definition->getPlaces() as $place) {
-            $attributes = array();
+            $attributes = [];
             if ($place === $definition->getInitialPlace()) {
                 $attributes['style'] = 'filled';
             }
@@ -74,9 +74,9 @@ protected function findPlaces(Definition $definition, Marking $marking = null)
                 $attributes['color'] = '#FF0000';
                 $attributes['shape'] = 'doublecircle';
             }
-            $places[$place] = array(
+            $places[$place] = [
                 'attributes' => $attributes,
-            );
+            ];
         }
 
         return $places;
@@ -87,13 +87,13 @@ protected function findPlaces(Definition $definition, Marking $marking = null)
      */
     protected function findTransitions(Definition $definition)
     {
-        $transitions = array();
+        $transitions = [];
 
         foreach ($definition->getTransitions() as $transition) {
-            $transitions[] = array(
-                'attributes' => array('shape' => 'box', 'regular' => true),
+            $transitions[] = [
+                'attributes' => ['shape' => 'box', 'regular' => true],
                 'name' => $transition->getName(),
-            );
+            ];
         }
 
         return $transitions;
@@ -132,22 +132,22 @@ protected function addTransitions(array $transitions)
      */
     protected function findEdges(Definition $definition)
     {
-        $dotEdges = array();
+        $dotEdges = [];
 
         foreach ($definition->getTransitions() as $transition) {
             foreach ($transition->getFroms() as $from) {
-                $dotEdges[] = array(
+                $dotEdges[] = [
                     'from' => $from,
                     'to' => $transition->getName(),
                     'direction' => 'from',
-                );
+                ];
             }
             foreach ($transition->getTos() as $to) {
-                $dotEdges[] = array(
+                $dotEdges[] = [
                     'from' => $transition->getName(),
                     'to' => $to,
                     'direction' => 'to',
-                );
+                ];
             }
         }
 
@@ -203,7 +203,7 @@ protected function dotize($id)
 
     private function addAttributes(array $attributes)
     {
-        $code = array();
+        $code = [];
 
         foreach ($attributes as $k => $v) {
             $code[] = sprintf('%s="%s"', $k, $v);
@@ -214,7 +214,7 @@ private function addAttributes(array $attributes)
 
     private function addOptions(array $options)
     {
-        $code = array();
+        $code = [];
 
         foreach ($options as $k => $v) {
             $code[] = sprintf('%s="%s"', $k, $v);
diff --git a/src/Symfony/Component/Workflow/Dumper/StateMachineGraphvizDumper.php b/src/Symfony/Component/Workflow/Dumper/StateMachineGraphvizDumper.php
index 9f68e1daf72f3..7c35dc0efc3d4 100644
--- a/src/Symfony/Component/Workflow/Dumper/StateMachineGraphvizDumper.php
+++ b/src/Symfony/Component/Workflow/Dumper/StateMachineGraphvizDumper.php
@@ -27,7 +27,7 @@ class StateMachineGraphvizDumper extends GraphvizDumper
      *  * node: The default options for nodes (places)
      *  * edge: The default options for edges
      */
-    public function dump(Definition $definition, Marking $marking = null, array $options = array())
+    public function dump(Definition $definition, Marking $marking = null, array $options = [])
     {
         $places = $this->findPlaces($definition, $marking);
         $edges = $this->findEdges($definition);
@@ -46,15 +46,15 @@ public function dump(Definition $definition, Marking $marking = null, array $opt
      */
     protected function findEdges(Definition $definition)
     {
-        $edges = array();
+        $edges = [];
 
         foreach ($definition->getTransitions() as $transition) {
             foreach ($transition->getFroms() as $from) {
                 foreach ($transition->getTos() as $to) {
-                    $edges[$from][] = array(
+                    $edges[$from][] = [
                         'name' => $transition->getName(),
                         'to' => $to,
-                    );
+                    ];
                 }
             }
         }
diff --git a/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php b/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php
index ba56b586016ef..95a9590cef4b2 100644
--- a/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php
+++ b/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php
@@ -48,10 +48,10 @@ public function onEnter(Event $event)
 
     public static function getSubscribedEvents()
     {
-        return array(
-            'workflow.leave' => array('onLeave'),
-            'workflow.transition' => array('onTransition'),
-            'workflow.enter' => array('onEnter'),
-        );
+        return [
+            'workflow.leave' => ['onLeave'],
+            'workflow.transition' => ['onTransition'],
+            'workflow.enter' => ['onEnter'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Workflow/EventListener/GuardListener.php b/src/Symfony/Component/Workflow/EventListener/GuardListener.php
index b2e6b8c7b334d..c8f00d9e11d6a 100644
--- a/src/Symfony/Component/Workflow/EventListener/GuardListener.php
+++ b/src/Symfony/Component/Workflow/EventListener/GuardListener.php
@@ -84,7 +84,7 @@ private function getVariables(GuardEvent $event)
             $roles = $token->getRoles();
         }
 
-        $variables = array(
+        $variables = [
             'token' => $token,
             'user' => $token->getUser(),
             'subject' => $event->getSubject(),
@@ -97,7 +97,7 @@ private function getVariables(GuardEvent $event)
             'trust_resolver' => $this->trustResolver,
             // needed for the is_valid expression function
             'validator' => $this->validator,
-        );
+        ];
 
         return $variables;
     }
diff --git a/src/Symfony/Component/Workflow/Marking.php b/src/Symfony/Component/Workflow/Marking.php
index d44ae9fb0863d..8cb2dbedb8fac 100644
--- a/src/Symfony/Component/Workflow/Marking.php
+++ b/src/Symfony/Component/Workflow/Marking.php
@@ -18,12 +18,12 @@
  */
 class Marking
 {
-    private $places = array();
+    private $places = [];
 
     /**
      * @param int[] $representation Keys are the place name and values should be 1
      */
-    public function __construct(array $representation = array())
+    public function __construct(array $representation = [])
     {
         foreach ($representation as $place => $nbToken) {
             $this->mark($place);
diff --git a/src/Symfony/Component/Workflow/MarkingStore/MultipleStateMarkingStore.php b/src/Symfony/Component/Workflow/MarkingStore/MultipleStateMarkingStore.php
index 6d2d0884893dc..926f96fa85ec4 100644
--- a/src/Symfony/Component/Workflow/MarkingStore/MultipleStateMarkingStore.php
+++ b/src/Symfony/Component/Workflow/MarkingStore/MultipleStateMarkingStore.php
@@ -44,7 +44,7 @@ public function __construct($property = 'marking', PropertyAccessorInterface $pr
      */
     public function getMarking($subject)
     {
-        return new Marking($this->propertyAccessor->getValue($subject, $this->property) ?: array());
+        return new Marking($this->propertyAccessor->getValue($subject, $this->property) ?: []);
     }
 
     /**
diff --git a/src/Symfony/Component/Workflow/MarkingStore/SingleStateMarkingStore.php b/src/Symfony/Component/Workflow/MarkingStore/SingleStateMarkingStore.php
index d6afc6aeeb764..82ddb9cd1a8c4 100644
--- a/src/Symfony/Component/Workflow/MarkingStore/SingleStateMarkingStore.php
+++ b/src/Symfony/Component/Workflow/MarkingStore/SingleStateMarkingStore.php
@@ -49,7 +49,7 @@ public function getMarking($subject)
             return new Marking();
         }
 
-        return new Marking(array($placeName => 1));
+        return new Marking([$placeName => 1]);
     }
 
     /**
diff --git a/src/Symfony/Component/Workflow/Registry.php b/src/Symfony/Component/Workflow/Registry.php
index 4c41312edd363..3996a3938763e 100644
--- a/src/Symfony/Component/Workflow/Registry.php
+++ b/src/Symfony/Component/Workflow/Registry.php
@@ -21,7 +21,7 @@
  */
 class Registry
 {
-    private $workflows = array();
+    private $workflows = [];
 
     /**
      * @param Workflow                        $workflow
diff --git a/src/Symfony/Component/Workflow/Tests/DefinitionBuilderTest.php b/src/Symfony/Component/Workflow/Tests/DefinitionBuilderTest.php
index 20eb1c8feeed4..5f1648cfb4cdc 100644
--- a/src/Symfony/Component/Workflow/Tests/DefinitionBuilderTest.php
+++ b/src/Symfony/Component/Workflow/Tests/DefinitionBuilderTest.php
@@ -31,7 +31,7 @@ public function testAddTransition()
 
         $transition0 = new Transition('name0', $places[0], $places[1]);
         $transition1 = new Transition('name1', $places[0], $places[1]);
-        $builder = new DefinitionBuilder($places, array($transition0));
+        $builder = new DefinitionBuilder($places, [$transition0]);
         $builder->addTransition($transition1);
 
         $definition = $builder->build();
@@ -43,7 +43,7 @@ public function testAddTransition()
 
     public function testAddPlace()
     {
-        $builder = new DefinitionBuilder(array('a'), array());
+        $builder = new DefinitionBuilder(['a'], []);
         $builder->addPlace('b');
 
         $definition = $builder->build();
diff --git a/src/Symfony/Component/Workflow/Tests/DefinitionTest.php b/src/Symfony/Component/Workflow/Tests/DefinitionTest.php
index 8eb1b6e4cf0fc..f4d70c3dd6bad 100644
--- a/src/Symfony/Component/Workflow/Tests/DefinitionTest.php
+++ b/src/Symfony/Component/Workflow/Tests/DefinitionTest.php
@@ -11,7 +11,7 @@ class DefinitionTest extends TestCase
     public function testAddPlaces()
     {
         $places = range('a', 'e');
-        $definition = new Definition($places, array());
+        $definition = new Definition($places, []);
 
         $this->assertCount(5, $definition->getPlaces());
 
@@ -41,7 +41,7 @@ public function testSetInitialPlace()
      */
     public function testSetInitialPlaceAndPlaceIsNotDefined()
     {
-        $definition = new Definition(array(), array(), 'd');
+        $definition = new Definition([], [], 'd');
     }
 
     public function testAddTransition()
@@ -49,7 +49,7 @@ public function testAddTransition()
         $places = range('a', 'b');
 
         $transition = new Transition('name', $places[0], $places[1]);
-        $definition = new Definition($places, array($transition));
+        $definition = new Definition($places, [$transition]);
 
         $this->assertCount(1, $definition->getTransitions());
         $this->assertSame($transition, $definition->getTransitions()[0]);
@@ -63,7 +63,7 @@ public function testAddTransitionAndFromPlaceIsNotDefined()
     {
         $places = range('a', 'b');
 
-        new Definition($places, array(new Transition('name', 'c', $places[1])));
+        new Definition($places, [new Transition('name', 'c', $places[1])]);
     }
 
     /**
@@ -74,6 +74,6 @@ public function testAddTransitionAndToPlaceIsNotDefined()
     {
         $places = range('a', 'b');
 
-        new Definition($places, array(new Transition('name', $places[0], 'c')));
+        new Definition($places, [new Transition('name', $places[0], 'c')]);
     }
 }
diff --git a/src/Symfony/Component/Workflow/Tests/DependencyInjection/ValidateWorkflowsPassTest.php b/src/Symfony/Component/Workflow/Tests/DependencyInjection/ValidateWorkflowsPassTest.php
index 1a38588f27cdb..c9cb84024970a 100644
--- a/src/Symfony/Component/Workflow/Tests/DependencyInjection/ValidateWorkflowsPassTest.php
+++ b/src/Symfony/Component/Workflow/Tests/DependencyInjection/ValidateWorkflowsPassTest.php
@@ -15,18 +15,18 @@ public function testProcess()
     {
         $container = new ContainerBuilder();
         $container->register('definition1', WorkflowDefinition::class)
-            ->addArgument(array('a', 'b', 'c'))
-            ->addArgument(array(
-                new Definition(Transition::class, array('t1', 'a', 'b')),
-                new Definition(Transition::class, array('t2', 'a', 'c')),
-            ))
-            ->addTag('workflow.definition', array('name' => 'wf1', 'type' => 'state_machine', 'marking_store' => 'foo'));
+            ->addArgument(['a', 'b', 'c'])
+            ->addArgument([
+                new Definition(Transition::class, ['t1', 'a', 'b']),
+                new Definition(Transition::class, ['t2', 'a', 'c']),
+            ])
+            ->addTag('workflow.definition', ['name' => 'wf1', 'type' => 'state_machine', 'marking_store' => 'foo']);
 
         (new ValidateWorkflowsPass())->process($container);
 
         $workflowDefinition = $container->get('definition1');
 
-        $this->assertSame(array('a' => 'a', 'b' => 'b', 'c' => 'c'), $workflowDefinition->getPlaces());
-        $this->assertEquals(array(new Transition('t1', 'a', 'b'), new Transition('t2', 'a', 'c')), $workflowDefinition->getTransitions());
+        $this->assertSame(['a' => 'a', 'b' => 'b', 'c' => 'c'], $workflowDefinition->getPlaces());
+        $this->assertEquals([new Transition('t1', 'a', 'b'), new Transition('t2', 'a', 'c')], $workflowDefinition->getTransitions());
     }
 }
diff --git a/src/Symfony/Component/Workflow/Tests/Dumper/GraphvizDumperTest.php b/src/Symfony/Component/Workflow/Tests/Dumper/GraphvizDumperTest.php
index 067cb9d41534a..a5d9087ff533e 100644
--- a/src/Symfony/Component/Workflow/Tests/Dumper/GraphvizDumperTest.php
+++ b/src/Symfony/Component/Workflow/Tests/Dumper/GraphvizDumperTest.php
@@ -40,23 +40,23 @@ public function testDumpWithMarking($definition, $marking, $expected)
 
     public function provideWorkflowDefinitionWithMarking()
     {
-        yield array(
+        yield [
             $this->createComplexWorkflowDefinition(),
-            new Marking(array('b' => 1)),
+            new Marking(['b' => 1]),
             $this->createComplexWorkflowDefinitionDumpWithMarking(),
-        );
+        ];
 
-        yield array(
+        yield [
             $this->createSimpleWorkflowDefinition(),
-            new Marking(array('c' => 1, 'd' => 1)),
+            new Marking(['c' => 1, 'd' => 1]),
             $this->createSimpleWorkflowDumpWithMarking(),
-        );
+        ];
     }
 
     public function provideWorkflowDefinitionWithoutMarking()
     {
-        yield array($this->createComplexWorkflowDefinition(), $this->provideComplexWorkflowDumpWithoutMarking());
-        yield array($this->createSimpleWorkflowDefinition(), $this->provideSimpleWorkflowDumpWithoutMarking());
+        yield [$this->createComplexWorkflowDefinition(), $this->provideComplexWorkflowDumpWithoutMarking()];
+        yield [$this->createSimpleWorkflowDefinition(), $this->provideSimpleWorkflowDumpWithoutMarking()];
     }
 
     public function createComplexWorkflowDefinitionDumpWithMarking()
diff --git a/src/Symfony/Component/Workflow/Tests/Dumper/StateMachineGraphvizDumperTest.php b/src/Symfony/Component/Workflow/Tests/Dumper/StateMachineGraphvizDumperTest.php
index 7277b1c65b838..473d31ecf5895 100644
--- a/src/Symfony/Component/Workflow/Tests/Dumper/StateMachineGraphvizDumperTest.php
+++ b/src/Symfony/Component/Workflow/Tests/Dumper/StateMachineGraphvizDumperTest.php
@@ -48,7 +48,7 @@ public function testDumpWithoutMarking()
     public function testDumpWithMarking()
     {
         $definition = $this->createComplexStateMachineDefinition();
-        $marking = new Marking(array('b' => 1));
+        $marking = new Marking(['b' => 1]);
 
         $expected = <<<'EOGRAPH'
 digraph workflow {
diff --git a/src/Symfony/Component/Workflow/Tests/EventListener/AuditTrailListenerTest.php b/src/Symfony/Component/Workflow/Tests/EventListener/AuditTrailListenerTest.php
index beee3664cdb3e..8fab0e9ec7175 100644
--- a/src/Symfony/Component/Workflow/Tests/EventListener/AuditTrailListenerTest.php
+++ b/src/Symfony/Component/Workflow/Tests/EventListener/AuditTrailListenerTest.php
@@ -30,11 +30,11 @@ public function testItWorks()
 
         $workflow->apply($object, 't1');
 
-        $expected = array(
+        $expected = [
             'Leaving "a" for subject of class "stdClass" in workflow "unnamed".',
             'Transition "t1" for subject of class "stdClass" in workflow "unnamed".',
             'Entering "b" for subject of class "stdClass" in workflow "unnamed".',
-        );
+        ];
 
         $this->assertSame($expected, $logger->logs);
     }
@@ -42,9 +42,9 @@ public function testItWorks()
 
 class Logger extends AbstractLogger
 {
-    public $logs = array();
+    public $logs = [];
 
-    public function log($level, $message, array $context = array())
+    public function log($level, $message, array $context = [])
     {
         $this->logs[] = $message;
     }
diff --git a/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php b/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php
index 8686d74cf6ca9..d27c63e5275c7 100644
--- a/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php
+++ b/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php
@@ -25,17 +25,17 @@ class GuardListenerTest extends TestCase
 
     protected function setUp()
     {
-        $this->configuration = array(
+        $this->configuration = [
             'test_is_granted' => 'is_granted("something")',
             'test_is_valid' => 'is_valid(subject)',
-            'test_expression' => array(
+            'test_expression' => [
                 new GuardExpression(new Transition('name', 'from', 'to'), '!is_valid(subject)'),
                 new GuardExpression(new Transition('name', 'from', 'to'), 'is_valid(subject)'),
-            ),
-        );
+            ],
+        ];
         $expressionLanguage = new ExpressionLanguage();
         $token = $this->getMockBuilder(TokenInterface::class)->getMock();
-        $token->expects($this->any())->method('getRoles')->willReturn(array(new Role('ROLE_USER')));
+        $token->expects($this->any())->method('getRoles')->willReturn([new Role('ROLE_USER')]);
         $tokenStorage = $this->getMockBuilder(TokenStorageInterface::class)->getMock();
         $tokenStorage->expects($this->any())->method('getToken')->willReturn($token);
         $this->authenticationChecker = $this->getMockBuilder(AuthorizationCheckerInterface::class)->getMock();
@@ -170,7 +170,7 @@ private function configureValidator($isUsed, $valid = true)
         $this->validator
             ->expects($this->once())
             ->method('validate')
-            ->willReturn($valid ? array() : array('a violation'))
+            ->willReturn($valid ? [] : ['a violation'])
         ;
     }
 }
diff --git a/src/Symfony/Component/Workflow/Tests/MarkingStore/MultipleStateMarkingStoreTest.php b/src/Symfony/Component/Workflow/Tests/MarkingStore/MultipleStateMarkingStoreTest.php
index a0504af4b2716..647ae42b4b11b 100644
--- a/src/Symfony/Component/Workflow/Tests/MarkingStore/MultipleStateMarkingStoreTest.php
+++ b/src/Symfony/Component/Workflow/Tests/MarkingStore/MultipleStateMarkingStoreTest.php
@@ -24,7 +24,7 @@ public function testGetSetMarking()
 
         $markingStore->setMarking($subject, $marking);
 
-        $this->assertSame(array('first_place' => 1), $subject->myMarks);
+        $this->assertSame(['first_place' => 1], $subject->myMarks);
 
         $marking2 = $markingStore->getMarking($subject);
 
diff --git a/src/Symfony/Component/Workflow/Tests/MarkingTest.php b/src/Symfony/Component/Workflow/Tests/MarkingTest.php
index 98f031e94b966..9ed6df041c3b7 100644
--- a/src/Symfony/Component/Workflow/Tests/MarkingTest.php
+++ b/src/Symfony/Component/Workflow/Tests/MarkingTest.php
@@ -9,28 +9,28 @@ class MarkingTest extends TestCase
 {
     public function testMarking()
     {
-        $marking = new Marking(array('a' => 1));
+        $marking = new Marking(['a' => 1]);
 
         $this->assertTrue($marking->has('a'));
         $this->assertFalse($marking->has('b'));
-        $this->assertSame(array('a' => 1), $marking->getPlaces());
+        $this->assertSame(['a' => 1], $marking->getPlaces());
 
         $marking->mark('b');
 
         $this->assertTrue($marking->has('a'));
         $this->assertTrue($marking->has('b'));
-        $this->assertSame(array('a' => 1, 'b' => 1), $marking->getPlaces());
+        $this->assertSame(['a' => 1, 'b' => 1], $marking->getPlaces());
 
         $marking->unmark('a');
 
         $this->assertFalse($marking->has('a'));
         $this->assertTrue($marking->has('b'));
-        $this->assertSame(array('b' => 1), $marking->getPlaces());
+        $this->assertSame(['b' => 1], $marking->getPlaces());
 
         $marking->unmark('b');
 
         $this->assertFalse($marking->has('a'));
         $this->assertFalse($marking->has('b'));
-        $this->assertSame(array(), $marking->getPlaces());
+        $this->assertSame([], $marking->getPlaces());
     }
 }
diff --git a/src/Symfony/Component/Workflow/Tests/TransitionTest.php b/src/Symfony/Component/Workflow/Tests/TransitionTest.php
index 74bab16f71166..2f500ff5e5c70 100644
--- a/src/Symfony/Component/Workflow/Tests/TransitionTest.php
+++ b/src/Symfony/Component/Workflow/Tests/TransitionTest.php
@@ -21,7 +21,7 @@ public function testConstructor()
         $transition = new Transition('name', 'a', 'b');
 
         $this->assertSame('name', $transition->getName());
-        $this->assertSame(array('a'), $transition->getFroms());
-        $this->assertSame(array('b'), $transition->getTos());
+        $this->assertSame(['a'], $transition->getFroms());
+        $this->assertSame(['b'], $transition->getTos());
     }
 }
diff --git a/src/Symfony/Component/Workflow/Tests/Validator/StateMachineValidatorTest.php b/src/Symfony/Component/Workflow/Tests/Validator/StateMachineValidatorTest.php
index dccbf383049ad..c43292899b893 100644
--- a/src/Symfony/Component/Workflow/Tests/Validator/StateMachineValidatorTest.php
+++ b/src/Symfony/Component/Workflow/Tests/Validator/StateMachineValidatorTest.php
@@ -15,7 +15,7 @@ class StateMachineValidatorTest extends TestCase
      */
     public function testWithMultipleTransitionWithSameNameShareInput()
     {
-        $places = array('a', 'b', 'c');
+        $places = ['a', 'b', 'c'];
         $transitions[] = new Transition('t1', 'a', 'b');
         $transitions[] = new Transition('t1', 'a', 'c');
         $definition = new Definition($places, $transitions);
@@ -41,8 +41,8 @@ public function testWithMultipleTransitionWithSameNameShareInput()
      */
     public function testWithMultipleTos()
     {
-        $places = array('a', 'b', 'c');
-        $transitions[] = new Transition('t1', 'a', array('b', 'c'));
+        $places = ['a', 'b', 'c'];
+        $transitions[] = new Transition('t1', 'a', ['b', 'c']);
         $definition = new Definition($places, $transitions);
 
         (new StateMachineValidator())->validate($definition, 'foo');
@@ -66,8 +66,8 @@ public function testWithMultipleTos()
      */
     public function testWithMultipleFroms()
     {
-        $places = array('a', 'b', 'c');
-        $transitions[] = new Transition('t1', array('a', 'b'), 'c');
+        $places = ['a', 'b', 'c'];
+        $transitions[] = new Transition('t1', ['a', 'b'], 'c');
         $definition = new Definition($places, $transitions);
 
         (new StateMachineValidator())->validate($definition, 'foo');
@@ -87,7 +87,7 @@ public function testWithMultipleFroms()
 
     public function testValid()
     {
-        $places = array('a', 'b', 'c');
+        $places = ['a', 'b', 'c'];
         $transitions[] = new Transition('t1', 'a', 'b');
         $transitions[] = new Transition('t2', 'a', 'c');
         $definition = new Definition($places, $transitions);
diff --git a/src/Symfony/Component/Workflow/Tests/Validator/WorkflowValidatorTest.php b/src/Symfony/Component/Workflow/Tests/Validator/WorkflowValidatorTest.php
index 245617b682f54..cdf10ecdaba93 100644
--- a/src/Symfony/Component/Workflow/Tests/Validator/WorkflowValidatorTest.php
+++ b/src/Symfony/Component/Workflow/Tests/Validator/WorkflowValidatorTest.php
@@ -41,7 +41,7 @@ public function testWorkflowWithInvalidNames()
     {
         $places = range('a', 'c');
 
-        $transitions = array();
+        $transitions = [];
         $transitions[] = new Transition('t0', 'c', 'b');
         $transitions[] = new Transition('t1', 'a', 'b');
         $transitions[] = new Transition('t1', 'a', 'c');
@@ -55,7 +55,7 @@ public function testSameTransitionNameButNotSamePlace()
     {
         $places = range('a', 'd');
 
-        $transitions = array();
+        $transitions = [];
         $transitions[] = new Transition('t1', 'a', 'b');
         $transitions[] = new Transition('t1', 'b', 'c');
         $transitions[] = new Transition('t1', 'd', 'c');
diff --git a/src/Symfony/Component/Workflow/Tests/WorkflowBuilderTrait.php b/src/Symfony/Component/Workflow/Tests/WorkflowBuilderTrait.php
index 3084be5749b7f..b9d58e46701ee 100644
--- a/src/Symfony/Component/Workflow/Tests/WorkflowBuilderTrait.php
+++ b/src/Symfony/Component/Workflow/Tests/WorkflowBuilderTrait.php
@@ -11,9 +11,9 @@ private function createComplexWorkflowDefinition()
     {
         $places = range('a', 'g');
 
-        $transitions = array();
-        $transitions[] = new Transition('t1', 'a', array('b', 'c'));
-        $transitions[] = new Transition('t2', array('b', 'c'), 'd');
+        $transitions = [];
+        $transitions[] = new Transition('t1', 'a', ['b', 'c']);
+        $transitions[] = new Transition('t2', ['b', 'c'], 'd');
         $transitions[] = new Transition('t3', 'd', 'e');
         $transitions[] = new Transition('t4', 'd', 'f');
         $transitions[] = new Transition('t5', 'e', 'g');
@@ -37,7 +37,7 @@ private function createSimpleWorkflowDefinition()
     {
         $places = range('a', 'c');
 
-        $transitions = array();
+        $transitions = [];
         $transitions[] = new Transition('t1', 'a', 'b');
         $transitions[] = new Transition('t2', 'b', 'c');
 
@@ -53,8 +53,8 @@ private function createWorkflowWithSameNameTransition()
     {
         $places = range('a', 'c');
 
-        $transitions = array();
-        $transitions[] = new Transition('a_to_bc', 'a', array('b', 'c'));
+        $transitions = [];
+        $transitions[] = new Transition('a_to_bc', 'a', ['b', 'c']);
         $transitions[] = new Transition('b_to_c', 'b', 'c');
         $transitions[] = new Transition('to_a', 'b', 'a');
         $transitions[] = new Transition('to_a', 'c', 'a');
@@ -79,7 +79,7 @@ private function createWorkflowWithSameNameTransition()
 
     private function createComplexStateMachineDefinition()
     {
-        $places = array('a', 'b', 'c', 'd');
+        $places = ['a', 'b', 'c', 'd'];
 
         $transitions[] = new Transition('t1', 'a', 'b');
         $transitions[] = new Transition('t1', 'd', 'b');
diff --git a/src/Symfony/Component/Workflow/Tests/WorkflowTest.php b/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
index 547fb03e82cfe..8623091d46a68 100644
--- a/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
+++ b/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
@@ -25,7 +25,7 @@ public function testGetMarkingWithInvalidStoreReturn()
     {
         $subject = new \stdClass();
         $subject->marking = null;
-        $workflow = new Workflow(new Definition(array(), array()), $this->getMockBuilder(MarkingStoreInterface::class)->getMock());
+        $workflow = new Workflow(new Definition([], []), $this->getMockBuilder(MarkingStoreInterface::class)->getMock());
 
         $workflow->getMarking($subject);
     }
@@ -38,7 +38,7 @@ public function testGetMarkingWithEmptyDefinition()
     {
         $subject = new \stdClass();
         $subject->marking = null;
-        $workflow = new Workflow(new Definition(array(), array()), new MultipleStateMarkingStore());
+        $workflow = new Workflow(new Definition([], []), new MultipleStateMarkingStore());
 
         $workflow->getMarking($subject);
     }
@@ -50,8 +50,8 @@ public function testGetMarkingWithEmptyDefinition()
     public function testGetMarkingWithImpossiblePlace()
     {
         $subject = new \stdClass();
-        $subject->marking = array('nope' => 1);
-        $workflow = new Workflow(new Definition(array(), array()), new MultipleStateMarkingStore());
+        $subject->marking = ['nope' => 1];
+        $workflow = new Workflow(new Definition([], []), new MultipleStateMarkingStore());
 
         $workflow->getMarking($subject);
     }
@@ -67,7 +67,7 @@ public function testGetMarkingWithEmptyInitialMarking()
 
         $this->assertInstanceOf(Marking::class, $marking);
         $this->assertTrue($marking->has('a'));
-        $this->assertSame(array('a' => 1), $subject->marking);
+        $this->assertSame(['a' => 1], $subject->marking);
     }
 
     public function testGetMarkingWithExistingMarking()
@@ -75,7 +75,7 @@ public function testGetMarkingWithExistingMarking()
         $definition = $this->createComplexWorkflowDefinition();
         $subject = new \stdClass();
         $subject->marking = null;
-        $subject->marking = array('b' => 1, 'c' => 1);
+        $subject->marking = ['b' => 1, 'c' => 1];
         $workflow = new Workflow($definition, new MultipleStateMarkingStore());
 
         $marking = $workflow->getMarking($subject);
@@ -105,19 +105,19 @@ public function testCan()
         $this->assertTrue($workflow->can($subject, 't1'));
         $this->assertFalse($workflow->can($subject, 't2'));
 
-        $subject->marking = array('b' => 1);
+        $subject->marking = ['b' => 1];
 
         $this->assertFalse($workflow->can($subject, 't1'));
         // In a workflow net, all "from" places should contain a token to enable
         // the transition.
         $this->assertFalse($workflow->can($subject, 't2'));
 
-        $subject->marking = array('b' => 1, 'c' => 1);
+        $subject->marking = ['b' => 1, 'c' => 1];
 
         $this->assertFalse($workflow->can($subject, 't1'));
         $this->assertTrue($workflow->can($subject, 't2'));
 
-        $subject->marking = array('f' => 1);
+        $subject->marking = ['f' => 1];
 
         $this->assertFalse($workflow->can($subject, 't5'));
         $this->assertTrue($workflow->can($subject, 't6'));
@@ -143,7 +143,7 @@ public function testCanDoesNotTriggerGuardEventsForNotEnabledTransitions()
         $subject = new \stdClass();
         $subject->marking = null;
 
-        $dispatchedEvents = array();
+        $dispatchedEvents = [];
         $eventDispatcher = new EventDispatcher();
 
         $workflow = new Workflow($definition, new MultipleStateMarkingStore(), $eventDispatcher, 'workflow_name');
@@ -244,10 +244,10 @@ public function testApplyWithSameNameTransition()
     public function testApplyWithSameNameTransition2()
     {
         $subject = new \stdClass();
-        $subject->marking = array('a' => 1, 'b' => 1);
+        $subject->marking = ['a' => 1, 'b' => 1];
 
         $places = range('a', 'd');
-        $transitions = array();
+        $transitions = [];
         $transitions[] = new Transition('t', 'a', 'c');
         $transitions[] = new Transition('t', 'b', 'd');
         $definition = new Definition($places, $transitions);
@@ -317,14 +317,14 @@ public function testEventName()
             $this->assertEquals($name, $event->getWorkflowName());
         };
 
-        $eventNames = array(
+        $eventNames = [
             'workflow.guard',
             'workflow.leave',
             'workflow.transition',
             'workflow.enter',
             'workflow.entered',
             'workflow.announce',
-        );
+        ];
 
         foreach ($eventNames as $eventName) {
             $dispatcher->addListener($eventName, $assertWorkflowName);
@@ -335,20 +335,20 @@ public function testEventName()
 
     public function testMarkingStateOnApplyWithEventDispatcher()
     {
-        $definition = new Definition(range('a', 'f'), array(new Transition('t', range('a', 'c'), range('d', 'f'))));
+        $definition = new Definition(range('a', 'f'), [new Transition('t', range('a', 'c'), range('d', 'f'))]);
 
         $subject = new \stdClass();
-        $subject->marking = array('a' => 1, 'b' => 1, 'c' => 1);
+        $subject->marking = ['a' => 1, 'b' => 1, 'c' => 1];
 
         $dispatcher = new EventDispatcher();
 
         $workflow = new Workflow($definition, new MultipleStateMarkingStore(), $dispatcher, 'test');
 
         $assertInitialState = function (Event $event) {
-            $this->assertEquals(new Marking(array('a' => 1, 'b' => 1, 'c' => 1)), $event->getMarking());
+            $this->assertEquals(new Marking(['a' => 1, 'b' => 1, 'c' => 1]), $event->getMarking());
         };
         $assertTransitionState = function (Event $event) {
-            $this->assertEquals(new Marking(array()), $event->getMarking());
+            $this->assertEquals(new Marking([]), $event->getMarking());
         };
 
         $dispatcher->addListener('workflow.leave', $assertInitialState);
@@ -381,13 +381,13 @@ public function testGetEnabledTransitions()
 
         $this->assertEmpty($workflow->getEnabledTransitions($subject));
 
-        $subject->marking = array('d' => 1);
+        $subject->marking = ['d' => 1];
         $transitions = $workflow->getEnabledTransitions($subject);
         $this->assertCount(2, $transitions);
         $this->assertSame('t3', $transitions[0]->getName());
         $this->assertSame('t4', $transitions[1]->getName());
 
-        $subject->marking = array('c' => 1, 'e' => 1);
+        $subject->marking = ['c' => 1, 'e' => 1];
         $transitions = $workflow->getEnabledTransitions($subject);
         $this->assertCount(1, $transitions);
         $this->assertSame('t5', $transitions[0]->getName());
@@ -404,7 +404,7 @@ public function testGetEnabledTransitionsWithSameNameTransition()
         $this->assertCount(1, $transitions);
         $this->assertSame('a_to_bc', $transitions[0]->getName());
 
-        $subject->marking = array('b' => 1, 'c' => 1);
+        $subject->marking = ['b' => 1, 'c' => 1];
         $transitions = $workflow->getEnabledTransitions($subject);
         $this->assertCount(3, $transitions);
         $this->assertSame('b_to_c', $transitions[0]->getName());
@@ -415,7 +415,7 @@ public function testGetEnabledTransitionsWithSameNameTransition()
 
 class EventDispatcherMock implements \Symfony\Component\EventDispatcher\EventDispatcherInterface
 {
-    public $dispatchedEvents = array();
+    public $dispatchedEvents = [];
 
     public function dispatch($eventName, \Symfony\Component\EventDispatcher\Event $event = null)
     {
diff --git a/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php b/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php
index 4f32ae51205a0..7dbe694940518 100644
--- a/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php
+++ b/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php
@@ -21,7 +21,7 @@ class StateMachineValidator implements DefinitionValidatorInterface
 {
     public function validate(Definition $definition, $name)
     {
-        $transitionFromNames = array();
+        $transitionFromNames = [];
         foreach ($definition->getTransitions() as $transition) {
             // Make sure that each transition has exactly one TO
             if (1 !== \count($transition->getTos())) {
diff --git a/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php b/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php
index d271b0dec273c..92534dd8a2fa5 100644
--- a/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php
+++ b/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php
@@ -32,7 +32,7 @@ public function __construct($singlePlace = false)
     public function validate(Definition $definition, $name)
     {
         // Make sure all transitions for one place has unique name.
-        $places = array_fill_keys($definition->getPlaces(), array());
+        $places = array_fill_keys($definition->getPlaces(), []);
         foreach ($definition->getTransitions() as $transition) {
             foreach ($transition->getFroms() as $from) {
                 if (\in_array($transition->getName(), $places[$from])) {
diff --git a/src/Symfony/Component/Yaml/Command/LintCommand.php b/src/Symfony/Component/Yaml/Command/LintCommand.php
index 36e7e8b97ce18..60e27421794a2 100644
--- a/src/Symfony/Component/Yaml/Command/LintCommand.php
+++ b/src/Symfony/Component/Yaml/Command/LintCommand.php
@@ -119,12 +119,12 @@ private function validate($content, $flags, $file = null)
         try {
             $this->getParser()->parse($content, Yaml::PARSE_CONSTANT | $flags);
         } catch (ParseException $e) {
-            return array('file' => $file, 'line' => $e->getParsedLine(), 'valid' => false, 'message' => $e->getMessage());
+            return ['file' => $file, 'line' => $e->getParsedLine(), 'valid' => false, 'message' => $e->getMessage()];
         } finally {
             restore_error_handler();
         }
 
-        return array('file' => $file, 'valid' => true);
+        return ['file' => $file, 'valid' => true];
     }
 
     private function display(SymfonyStyle $io, array $files)
@@ -188,7 +188,7 @@ private function getFiles($fileOrDirectory)
         }
 
         foreach ($this->getDirectoryIterator($fileOrDirectory) as $file) {
-            if (!\in_array($file->getExtension(), array('yml', 'yaml'))) {
+            if (!\in_array($file->getExtension(), ['yml', 'yaml'])) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/Yaml/Escaper.php b/src/Symfony/Component/Yaml/Escaper.php
index 2b1321f64cb2c..4d3ce244c2ada 100644
--- a/src/Symfony/Component/Yaml/Escaper.php
+++ b/src/Symfony/Component/Yaml/Escaper.php
@@ -28,20 +28,20 @@ class Escaper
     // first to ensure proper escaping because str_replace operates iteratively
     // on the input arrays. This ordering of the characters avoids the use of strtr,
     // which performs more slowly.
-    private static $escapees = array('\\', '\\\\', '\\"', '"',
+    private static $escapees = ['\\', '\\\\', '\\"', '"',
                                      "\x00",  "\x01",  "\x02",  "\x03",  "\x04",  "\x05",  "\x06",  "\x07",
                                      "\x08",  "\x09",  "\x0a",  "\x0b",  "\x0c",  "\x0d",  "\x0e",  "\x0f",
                                      "\x10",  "\x11",  "\x12",  "\x13",  "\x14",  "\x15",  "\x16",  "\x17",
                                      "\x18",  "\x19",  "\x1a",  "\x1b",  "\x1c",  "\x1d",  "\x1e",  "\x1f",
                                      "\xc2\x85", "\xc2\xa0", "\xe2\x80\xa8", "\xe2\x80\xa9",
-                               );
-    private static $escaped = array('\\\\', '\\"', '\\\\', '\\"',
+                               ];
+    private static $escaped = ['\\\\', '\\"', '\\\\', '\\"',
                                      '\\0',   '\\x01', '\\x02', '\\x03', '\\x04', '\\x05', '\\x06', '\\a',
                                      '\\b',   '\\t',   '\\n',   '\\v',   '\\f',   '\\r',   '\\x0e', '\\x0f',
                                      '\\x10', '\\x11', '\\x12', '\\x13', '\\x14', '\\x15', '\\x16', '\\x17',
                                      '\\x18', '\\x19', '\\x1a', '\\e',   '\\x1c', '\\x1d', '\\x1e', '\\x1f',
                                      '\\N', '\\_', '\\L', '\\P',
-                              );
+                              ];
 
     /**
      * Determines if a PHP value would require double quoting in YAML.
@@ -78,7 +78,7 @@ public static function requiresSingleQuoting($value)
     {
         // Determines if a PHP value is entirely composed of a value that would
         // require single quoting in YAML.
-        if (\in_array(strtolower($value), array('null', '~', 'true', 'false', 'y', 'n', 'yes', 'no', 'on', 'off'))) {
+        if (\in_array(strtolower($value), ['null', '~', 'true', 'false', 'y', 'n', 'yes', 'no', 'on', 'off'])) {
             return true;
         }
 
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
index 42b6cb10e7b13..3ed669b98f78d 100644
--- a/src/Symfony/Component/Yaml/Inline.php
+++ b/src/Symfony/Component/Yaml/Inline.php
@@ -285,7 +285,7 @@ private static function dumpArray($value, $flags)
     {
         // array
         if (($value || Yaml::DUMP_EMPTY_ARRAY_AS_SEQUENCE & $flags) && !self::isHash($value)) {
-            $output = array();
+            $output = [];
             foreach ($value as $val) {
                 $output[] = self::dump($val, $flags);
             }
@@ -294,7 +294,7 @@ private static function dumpArray($value, $flags)
         }
 
         // hash
-        $output = array();
+        $output = [];
         foreach ($value as $key => $val) {
             $output[] = sprintf('%s: %s', self::dump($key, $flags), self::dump($val, $flags));
         }
@@ -437,8 +437,8 @@ private static function parseSequence($sequence, $flags, &$i = 0, $references =
                     $value = self::parseMapping($sequence, $flags, $i, $references);
                     break;
                 default:
-                    $isQuoted = \in_array($sequence[$i], array('"', "'"));
-                    $value = self::parseScalar($sequence, $flags, array(',', ']'), $i, null === $tag, $references);
+                    $isQuoted = \in_array($sequence[$i], ['"', "'"]);
+                    $value = self::parseScalar($sequence, $flags, [',', ']'], $i, null === $tag, $references);
 
                     // the value can be an array if a reference has been resolved to an array var
                     if (\is_string($value) && !$isQuoted && false !== strpos($value, ': ')) {
@@ -578,7 +578,7 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
                         }
                         break;
                     default:
-                        $value = self::parseScalar($mapping, $flags, array(',', '}'), $i, null === $tag, $references);
+                        $value = self::parseScalar($mapping, $flags, [',', '}'], $i, null === $tag, $references);
                         // Spec: Keys MUST be unique; first one wins.
                         // Parser cannot abort this mapping earlier, since lines
                         // are processed sequentially.
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index 36c9f1d913702..4ddd36a2ad2fd 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -29,12 +29,12 @@ class Parser
     private $filename;
     private $offset = 0;
     private $totalNumberOfLines;
-    private $lines = array();
+    private $lines = [];
     private $currentLineNb = -1;
     private $currentLine = '';
-    private $refs = array();
-    private $skippedLineNumbers = array();
-    private $locallySkippedLineNumbers = array();
+    private $refs = [];
+    private $skippedLineNumbers = [];
+    private $locallySkippedLineNumbers = [];
 
     public function __construct()
     {
@@ -126,7 +126,7 @@ public function parse($value, $flags = 0)
             throw new ParseException('The YAML value does not appear to be valid UTF-8.', -1, null, $this->filename);
         }
 
-        $this->refs = array();
+        $this->refs = [];
 
         $mbEncoding = null;
         $e = null;
@@ -166,7 +166,7 @@ private function doParse($value, $flags)
         $this->currentLine = '';
         $value = $this->cleanup($value);
         $this->lines = explode("\n", $value);
-        $this->locallySkippedLineNumbers = array();
+        $this->locallySkippedLineNumbers = [];
 
         if (null === $this->totalNumberOfLines) {
             $this->totalNumberOfLines = \count($this->lines);
@@ -176,7 +176,7 @@ private function doParse($value, $flags)
             return null;
         }
 
-        $data = array();
+        $data = [];
         $context = null;
         $allowOverwrite = false;
 
@@ -247,7 +247,7 @@ private function doParse($value, $flags)
                 }
             } elseif (
                 self::preg_match('#^(?P<key>(?:![^\s]++\s++)?(?:'.Inline::REGEX_QUOTED_STRING.'|(?:!?!php/const:)?[^ \'"\[\{!].*?)) *\:(\s++(?P<value>.+))?$#u', rtrim($this->currentLine), $values)
-                && (false === strpos($values['key'], ' #') || \in_array($values['key'][0], array('"', "'")))
+                && (false === strpos($values['key'], ' #') || \in_array($values['key'][0], ['"', "'"]))
             ) {
                 if ($context && 'sequence' == $context) {
                     throw new ParseException('You cannot define a mapping item when in a sequence', $this->currentLineNb + 1, $this->currentLine, $this->filename);
@@ -586,7 +586,7 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)
             $newIndent = $indentation;
         }
 
-        $data = array();
+        $data = [];
         if ($this->getCurrentLineIndentation() >= $newIndent) {
             $data[] = substr($this->currentLine, $newIndent);
         } elseif ($this->isCurrentLineEmpty() || $this->isCurrentLineComment()) {
@@ -721,7 +721,7 @@ private function parseValue($value, $flags, $context)
                 return Inline::parse($value, $flags, $this->refs);
             }
 
-            $lines = array();
+            $lines = [];
 
             while ($this->moveToNextLine()) {
                 // unquoted strings end before the first unindented line
@@ -786,7 +786,7 @@ private function parseBlockScalar($style, $chomping = '', $indentation = 0)
         }
 
         $isCurrentLineBlank = $this->isCurrentLineBlank();
-        $blockLines = array();
+        $blockLines = [];
 
         // leading blank lines are consumed before determining indentation
         while ($notEOF && $isCurrentLineBlank) {
@@ -958,7 +958,7 @@ private function isCurrentLineLastLineInDocument()
      */
     private function cleanup($value)
     {
-        $value = str_replace(array("\r\n", "\r"), "\n", $value);
+        $value = str_replace(["\r\n", "\r"], "\n", $value);
 
         // strip YAML header
         $count = 0;
diff --git a/src/Symfony/Component/Yaml/Tests/Command/LintCommandTest.php b/src/Symfony/Component/Yaml/Tests/Command/LintCommandTest.php
index a5baf234ef3df..2bf0286b6e38b 100644
--- a/src/Symfony/Component/Yaml/Tests/Command/LintCommandTest.php
+++ b/src/Symfony/Component/Yaml/Tests/Command/LintCommandTest.php
@@ -31,7 +31,7 @@ public function testLintCorrectFile()
         $tester = $this->createCommandTester();
         $filename = $this->createFile('foo: bar');
 
-        $ret = $tester->execute(array('filename' => $filename), array('verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false));
+        $ret = $tester->execute(['filename' => $filename], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false]);
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
         $this->assertRegExp('/^\/\/ OK in /', trim($tester->getDisplay()));
@@ -45,7 +45,7 @@ public function testLintIncorrectFile()
         $tester = $this->createCommandTester();
         $filename = $this->createFile($incorrectContent);
 
-        $ret = $tester->execute(array('filename' => $filename), array('decorated' => false));
+        $ret = $tester->execute(['filename' => $filename], ['decorated' => false]);
 
         $this->assertEquals(1, $ret, 'Returns 1 in case of error');
         $this->assertContains('Unable to parse at line 3 (near "bar").', trim($tester->getDisplay()));
@@ -56,7 +56,7 @@ public function testConstantAsKey()
         $yaml = <<<YAML
 !php/const 'Symfony\Component\Yaml\Tests\Command\Foo::TEST': bar
 YAML;
-        $ret = $this->createCommandTester()->execute(array('filename' => $this->createFile($yaml)), array('verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false));
+        $ret = $this->createCommandTester()->execute(['filename' => $this->createFile($yaml)], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false]);
         $this->assertSame(0, $ret, 'lint:yaml exits with code 0 in case of success');
     }
 
@@ -65,7 +65,7 @@ public function testCustomTags()
         $yaml = <<<YAML
 foo: !my_tag {foo: bar}
 YAML;
-        $ret = $this->createCommandTester()->execute(array('filename' => $this->createFile($yaml), '--parse-tags' => true), array('verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false));
+        $ret = $this->createCommandTester()->execute(['filename' => $this->createFile($yaml), '--parse-tags' => true], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false]);
         $this->assertSame(0, $ret, 'lint:yaml exits with code 0 in case of success');
     }
 
@@ -74,7 +74,7 @@ public function testCustomTagsError()
         $yaml = <<<YAML
 foo: !my_tag {foo: bar}
 YAML;
-        $ret = $this->createCommandTester()->execute(array('filename' => $this->createFile($yaml)), array('verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false));
+        $ret = $this->createCommandTester()->execute(['filename' => $this->createFile($yaml)], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false]);
         $this->assertSame(1, $ret, 'lint:yaml exits with code 1 in case of error');
     }
 
@@ -87,7 +87,7 @@ public function testLintFileNotReadable()
         $filename = $this->createFile('');
         unlink($filename);
 
-        $ret = $tester->execute(array('filename' => $filename), array('decorated' => false));
+        $ret = $tester->execute(['filename' => $filename], ['decorated' => false]);
     }
 
     /**
@@ -117,7 +117,7 @@ protected function createCommandTester()
 
     protected function setUp()
     {
-        $this->files = array();
+        $this->files = [];
         @mkdir(sys_get_temp_dir().'/framework-yml-lint-test');
     }
 
diff --git a/src/Symfony/Component/Yaml/Tests/DumperTest.php b/src/Symfony/Component/Yaml/Tests/DumperTest.php
index d84a14089be7f..57ee475e4520b 100644
--- a/src/Symfony/Component/Yaml/Tests/DumperTest.php
+++ b/src/Symfony/Component/Yaml/Tests/DumperTest.php
@@ -22,20 +22,20 @@ class DumperTest extends TestCase
     protected $dumper;
     protected $path;
 
-    protected $array = array(
+    protected $array = [
         '' => 'bar',
         'foo' => '#bar',
-        'foo\'bar' => array(),
-        'bar' => array(1, 'foo'),
-        'foobar' => array(
+        'foo\'bar' => [],
+        'bar' => [1, 'foo'],
+        'foobar' => [
             'foo' => 'bar',
-            'bar' => array(1, 'foo'),
-            'foobar' => array(
+            'bar' => [1, 'foo'],
+            'foobar' => [
                 'foo' => 'bar',
-                'bar' => array(1, 'foo'),
-            ),
-        ),
-    );
+                'bar' => [1, 'foo'],
+            ],
+        ],
+    ];
 
     protected function setUp()
     {
@@ -208,7 +208,7 @@ public function testInlineLevel()
 
     public function testObjectSupportEnabled()
     {
-        $dump = $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, 0, Yaml::DUMP_OBJECT);
+        $dump = $this->dumper->dump(['foo' => new A(), 'bar' => 1], 0, 0, Yaml::DUMP_OBJECT);
 
         $this->assertEquals('{ foo: !php/object \'O:30:"Symfony\Component\Yaml\Tests\A":1:{s:1:"a";s:3:"foo";}\', bar: 1 }', $dump, '->dump() is able to dump objects');
     }
@@ -235,7 +235,7 @@ public function testObjectSupportDisabledButNoExceptions()
      */
     public function testObjectSupportDisabledWithExceptions()
     {
-        $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, 0, Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE);
+        $this->dumper->dump(['foo' => new A(), 'bar' => 1], 0, 0, Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE);
     }
 
     /**
@@ -275,27 +275,27 @@ public function testEscapedEscapeSequencesInQuotedScalar($input, $expected)
 
     public function getEscapeSequences()
     {
-        return array(
-            'empty string' => array('', "''"),
-            'null' => array("\x0", '"\\0"'),
-            'bell' => array("\x7", '"\\a"'),
-            'backspace' => array("\x8", '"\\b"'),
-            'horizontal-tab' => array("\t", '"\\t"'),
-            'line-feed' => array("\n", '"\\n"'),
-            'vertical-tab' => array("\v", '"\\v"'),
-            'form-feed' => array("\xC", '"\\f"'),
-            'carriage-return' => array("\r", '"\\r"'),
-            'escape' => array("\x1B", '"\\e"'),
-            'space' => array(' ', "' '"),
-            'double-quote' => array('"', "'\"'"),
-            'slash' => array('/', '/'),
-            'backslash' => array('\\', '\\'),
-            'next-line' => array("\xC2\x85", '"\\N"'),
-            'non-breaking-space' => array("\xc2\xa0", '"\\_"'),
-            'line-separator' => array("\xE2\x80\xA8", '"\\L"'),
-            'paragraph-separator' => array("\xE2\x80\xA9", '"\\P"'),
-            'colon' => array(':', "':'"),
-        );
+        return [
+            'empty string' => ['', "''"],
+            'null' => ["\x0", '"\\0"'],
+            'bell' => ["\x7", '"\\a"'],
+            'backspace' => ["\x8", '"\\b"'],
+            'horizontal-tab' => ["\t", '"\\t"'],
+            'line-feed' => ["\n", '"\\n"'],
+            'vertical-tab' => ["\v", '"\\v"'],
+            'form-feed' => ["\xC", '"\\f"'],
+            'carriage-return' => ["\r", '"\\r"'],
+            'escape' => ["\x1B", '"\\e"'],
+            'space' => [' ', "' '"],
+            'double-quote' => ['"', "'\"'"],
+            'slash' => ['/', '/'],
+            'backslash' => ['\\', '\\'],
+            'next-line' => ["\xC2\x85", '"\\N"'],
+            'non-breaking-space' => ["\xc2\xa0", '"\\_"'],
+            'line-separator' => ["\xE2\x80\xA8", '"\\L"'],
+            'paragraph-separator' => ["\xE2\x80\xA9", '"\\P"'],
+            'colon' => [':', "':'"],
+        ];
     }
 
     public function testBinaryDataIsDumpedBase64Encoded()
@@ -303,7 +303,7 @@ public function testBinaryDataIsDumpedBase64Encoded()
         $binaryData = file_get_contents(__DIR__.'/Fixtures/arrow.gif');
         $expected = '{ data: !!binary '.base64_encode($binaryData).' }';
 
-        $this->assertSame($expected, $this->dumper->dump(array('data' => $binaryData)));
+        $this->assertSame($expected, $this->dumper->dump(['data' => $binaryData]));
     }
 
     public function testNonUtf8DataIsDumpedBase64Encoded()
@@ -324,18 +324,18 @@ public function testDumpObjectAsMap($object, $expected)
 
     public function objectAsMapProvider()
     {
-        $tests = array();
+        $tests = [];
 
         $bar = new \stdClass();
         $bar->class = 'classBar';
-        $bar->args = array('bar');
+        $bar->args = ['bar'];
         $zar = new \stdClass();
         $foo = new \stdClass();
         $foo->bar = $bar;
         $foo->zar = $zar;
         $object = new \stdClass();
         $object->foo = $foo;
-        $tests['stdClass'] = array($object, $object);
+        $tests['stdClass'] = [$object, $object];
 
         $arrayObject = new \ArrayObject();
         $arrayObject['foo'] = 'bar';
@@ -343,19 +343,19 @@ public function objectAsMapProvider()
         $parsedArrayObject = new \stdClass();
         $parsedArrayObject->foo = 'bar';
         $parsedArrayObject->baz = 'foobar';
-        $tests['ArrayObject'] = array($arrayObject, $parsedArrayObject);
+        $tests['ArrayObject'] = [$arrayObject, $parsedArrayObject];
 
         $a = new A();
-        $tests['arbitrary-object'] = array($a, null);
+        $tests['arbitrary-object'] = [$a, null];
 
         return $tests;
     }
 
     public function testDumpingArrayObjectInstancesRespectsInlineLevel()
     {
-        $deep = new \ArrayObject(array('deep1' => 'd', 'deep2' => 'e'));
-        $inner = new \ArrayObject(array('inner1' => 'b', 'inner2' => 'c', 'inner3' => $deep));
-        $outer = new \ArrayObject(array('outer1' => 'a', 'outer2' => $inner));
+        $deep = new \ArrayObject(['deep1' => 'd', 'deep2' => 'e']);
+        $inner = new \ArrayObject(['inner1' => 'b', 'inner2' => 'c', 'inner3' => $deep]);
+        $outer = new \ArrayObject(['outer1' => 'a', 'outer2' => $inner]);
 
         $yaml = $this->dumper->dump($outer, 2, 0, Yaml::DUMP_OBJECT_AS_MAP);
 
@@ -372,9 +372,9 @@ public function testDumpingArrayObjectInstancesRespectsInlineLevel()
 
     public function testDumpingArrayObjectInstancesWithNumericKeysInlined()
     {
-        $deep = new \ArrayObject(array('d', 'e'));
-        $inner = new \ArrayObject(array('b', 'c', $deep));
-        $outer = new \ArrayObject(array('a', $inner));
+        $deep = new \ArrayObject(['d', 'e']);
+        $inner = new \ArrayObject(['b', 'c', $deep]);
+        $outer = new \ArrayObject(['a', $inner]);
 
         $yaml = $this->dumper->dump($outer, 0, 0, Yaml::DUMP_OBJECT_AS_MAP);
         $expected = <<<YAML
@@ -385,9 +385,9 @@ public function testDumpingArrayObjectInstancesWithNumericKeysInlined()
 
     public function testDumpingArrayObjectInstancesWithNumericKeysRespectsInlineLevel()
     {
-        $deep = new \ArrayObject(array('d', 'e'));
-        $inner = new \ArrayObject(array('b', 'c', $deep));
-        $outer = new \ArrayObject(array('a', $inner));
+        $deep = new \ArrayObject(['d', 'e']);
+        $inner = new \ArrayObject(['b', 'c', $deep]);
+        $outer = new \ArrayObject(['a', $inner]);
         $yaml = $this->dumper->dump($outer, 2, 0, Yaml::DUMP_OBJECT_AS_MAP);
         $expected = <<<YAML
 0: a
@@ -440,34 +440,34 @@ public function testDumpingStdClassInstancesRespectsInlineLevel()
 
     public function testDumpMultiLineStringAsScalarBlock()
     {
-        $data = array(
-            'data' => array(
+        $data = [
+            'data' => [
                 'single_line' => 'foo bar baz',
                 'multi_line' => "foo\nline with trailing spaces:\n  \nbar\ninteger like line:\n123456789\nempty line:\n\nbaz",
                 'multi_line_with_carriage_return' => "foo\nbar\r\nbaz",
-                'nested_inlined_multi_line_string' => array(
+                'nested_inlined_multi_line_string' => [
                     'inlined_multi_line' => "foo\nbar\r\nempty line:\n\nbaz",
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
 
         $this->assertSame(file_get_contents(__DIR__.'/Fixtures/multiple_lines_as_literal_block.yml'), $this->dumper->dump($data, 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
     }
 
     public function testDumpMultiLineStringAsScalarBlockWhenFirstLineHasLeadingSpace()
     {
-        $data = array(
-            'data' => array(
+        $data = [
+            'data' => [
                 'multi_line' => "    the first line has leading spaces\nThe second line does not.",
-            ),
-        );
+            ],
+        ];
 
         $this->assertSame(file_get_contents(__DIR__.'/Fixtures/multiple_lines_as_literal_block_leading_space_in_first_line.yml'), $this->dumper->dump($data, 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
     }
 
     public function testCarriageReturnIsMaintainedWhenDumpingAsMultiLineLiteralBlock()
     {
-        $this->assertSame("- \"a\\r\\nb\\nc\"\n", $this->dumper->dump(array("a\r\nb\nc"), 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
+        $this->assertSame("- \"a\\r\\nb\\nc\"\n", $this->dumper->dump(["a\r\nb\nc"], 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
     }
 
     /**
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
index f2c4ab6084702..5cdc62f4e89cc 100644
--- a/src/Symfony/Component/Yaml/Tests/InlineTest.php
+++ b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -53,13 +53,13 @@ public function testParsePhpConstants($yaml, $value)
 
     public function getTestsForParsePhpConstants()
     {
-        return array(
-            array('!php/const Symfony\Component\Yaml\Yaml::PARSE_CONSTANT', Yaml::PARSE_CONSTANT),
-            array('!php/const PHP_INT_MAX', PHP_INT_MAX),
-            array('[!php/const PHP_INT_MAX]', array(PHP_INT_MAX)),
-            array('{ foo: !php/const PHP_INT_MAX }', array('foo' => PHP_INT_MAX)),
-            array('!php/const NULL', null),
-        );
+        return [
+            ['!php/const Symfony\Component\Yaml\Yaml::PARSE_CONSTANT', Yaml::PARSE_CONSTANT],
+            ['!php/const PHP_INT_MAX', PHP_INT_MAX],
+            ['[!php/const PHP_INT_MAX]', [PHP_INT_MAX]],
+            ['{ foo: !php/const PHP_INT_MAX }', ['foo' => PHP_INT_MAX]],
+            ['!php/const NULL', null],
+        ];
     }
 
     /**
@@ -130,7 +130,7 @@ public function testDumpNumericValueWithLocale()
         }
 
         try {
-            $requiredLocales = array('fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8', 'French_France.1252');
+            $requiredLocales = ['fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8', 'French_France.1252'];
             if (false === setlocale(LC_NUMERIC, $requiredLocales)) {
                 $this->markTestSkipped('Could not set any of required locales: '.implode(', ', $requiredLocales));
             }
@@ -232,7 +232,7 @@ public function testParseScalarWithCorrectlyQuotedStringShouldReturnString()
      */
     public function testParseReferences($yaml, $expected)
     {
-        $this->assertSame($expected, Inline::parse($yaml, 0, array('var' => 'var-value')));
+        $this->assertSame($expected, Inline::parse($yaml, 0, ['var' => 'var-value']));
     }
 
     /**
@@ -316,7 +316,7 @@ public function testParseUnquotedScalarStartingWithReservedIndicator($indicator)
 
     public function getReservedIndicators()
     {
-        return array(array('@'), array('`'));
+        return [['@'], ['`']];
     }
 
     /**
@@ -359,240 +359,240 @@ public function testIsHash($array, $expected)
 
     public function getDataForIsHash()
     {
-        return array(
-            array(array(), false),
-            array(array(1, 2, 3), false),
-            array(array(2 => 1, 1 => 2, 0 => 3), true),
-            array(array('foo' => 1, 'bar' => 2), true),
-        );
+        return [
+            [[], false],
+            [[1, 2, 3], false],
+            [[2 => 1, 1 => 2, 0 => 3], true],
+            [['foo' => 1, 'bar' => 2], true],
+        ];
     }
 
     public function getTestsForParse()
     {
-        return array(
-            array('', ''),
-            array('null', null),
-            array('false', false),
-            array('true', true),
-            array('12', 12),
-            array('-12', -12),
-            array('1_2', 12),
-            array('_12', '_12'),
-            array('12_', 12),
-            array('"quoted string"', 'quoted string'),
-            array("'quoted string'", 'quoted string'),
-            array('12.30e+02', 12.30e+02),
-            array('123.45_67', 123.4567),
-            array('0x4D2', 0x4D2),
-            array('0x_4_D_2_', 0x4D2),
-            array('02333', 02333),
-            array('0_2_3_3_3', 02333),
-            array('.Inf', -log(0)),
-            array('-.Inf', log(0)),
-            array("'686e444'", '686e444'),
-            array('686e444', 646e444),
-            array('123456789123456789123456789123456789', '123456789123456789123456789123456789'),
-            array('"foo\r\nbar"', "foo\r\nbar"),
-            array("'foo#bar'", 'foo#bar'),
-            array("'foo # bar'", 'foo # bar'),
-            array("'#cfcfcf'", '#cfcfcf'),
-            array('::form_base.html.twig', '::form_base.html.twig'),
+        return [
+            ['', ''],
+            ['null', null],
+            ['false', false],
+            ['true', true],
+            ['12', 12],
+            ['-12', -12],
+            ['1_2', 12],
+            ['_12', '_12'],
+            ['12_', 12],
+            ['"quoted string"', 'quoted string'],
+            ["'quoted string'", 'quoted string'],
+            ['12.30e+02', 12.30e+02],
+            ['123.45_67', 123.4567],
+            ['0x4D2', 0x4D2],
+            ['0x_4_D_2_', 0x4D2],
+            ['02333', 02333],
+            ['0_2_3_3_3', 02333],
+            ['.Inf', -log(0)],
+            ['-.Inf', log(0)],
+            ["'686e444'", '686e444'],
+            ['686e444', 646e444],
+            ['123456789123456789123456789123456789', '123456789123456789123456789123456789'],
+            ['"foo\r\nbar"', "foo\r\nbar"],
+            ["'foo#bar'", 'foo#bar'],
+            ["'foo # bar'", 'foo # bar'],
+            ["'#cfcfcf'", '#cfcfcf'],
+            ['::form_base.html.twig', '::form_base.html.twig'],
 
             // Pre-YAML-1.2 booleans
-            array("'y'", 'y'),
-            array("'n'", 'n'),
-            array("'yes'", 'yes'),
-            array("'no'", 'no'),
-            array("'on'", 'on'),
-            array("'off'", 'off'),
-
-            array('2007-10-30', gmmktime(0, 0, 0, 10, 30, 2007)),
-            array('2007-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 2007)),
-            array('2007-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 2007)),
-            array('1960-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 1960)),
-            array('1730-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 1730)),
-
-            array('"a \\"string\\" with \'quoted strings inside\'"', 'a "string" with \'quoted strings inside\''),
-            array("'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''),
+            ["'y'", 'y'],
+            ["'n'", 'n'],
+            ["'yes'", 'yes'],
+            ["'no'", 'no'],
+            ["'on'", 'on'],
+            ["'off'", 'off'],
+
+            ['2007-10-30', gmmktime(0, 0, 0, 10, 30, 2007)],
+            ['2007-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 2007)],
+            ['2007-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 2007)],
+            ['1960-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 1960)],
+            ['1730-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 1730)],
+
+            ['"a \\"string\\" with \'quoted strings inside\'"', 'a "string" with \'quoted strings inside\''],
+            ["'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''],
 
             // sequences
             // urls are no key value mapping. see #3609. Valid yaml "key: value" mappings require a space after the colon
-            array('[foo, http://urls.are/no/mappings, false, null, 12]', array('foo', 'http://urls.are/no/mappings', false, null, 12)),
-            array('[  foo  ,   bar , false  ,  null     ,  12  ]', array('foo', 'bar', false, null, 12)),
-            array('[\'foo,bar\', \'foo bar\']', array('foo,bar', 'foo bar')),
+            ['[foo, http://urls.are/no/mappings, false, null, 12]', ['foo', 'http://urls.are/no/mappings', false, null, 12]],
+            ['[  foo  ,   bar , false  ,  null     ,  12  ]', ['foo', 'bar', false, null, 12]],
+            ['[\'foo,bar\', \'foo bar\']', ['foo,bar', 'foo bar']],
 
             // mappings
-            array('{foo: bar,bar: foo,"false": false, "null": null,integer: 12}', array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
-            array('{ foo  : bar, bar : foo, "false"  :   false,  "null"  :   null,  integer :  12  }', array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
-            array('{foo: \'bar\', bar: \'foo: bar\'}', array('foo' => 'bar', 'bar' => 'foo: bar')),
-            array('{\'foo\': \'bar\', "bar": \'foo: bar\'}', array('foo' => 'bar', 'bar' => 'foo: bar')),
-            array('{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}', array('foo\'' => 'bar', 'bar"' => 'foo: bar')),
-            array('{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}', array('foo: ' => 'bar', 'bar: ' => 'foo: bar')),
-            array('{"foo:bar": "baz"}', array('foo:bar' => 'baz')),
-            array('{"foo":"bar"}', array('foo' => 'bar')),
+            ['{foo: bar,bar: foo,"false": false, "null": null,integer: 12}', ['foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12]],
+            ['{ foo  : bar, bar : foo, "false"  :   false,  "null"  :   null,  integer :  12  }', ['foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12]],
+            ['{foo: \'bar\', bar: \'foo: bar\'}', ['foo' => 'bar', 'bar' => 'foo: bar']],
+            ['{\'foo\': \'bar\', "bar": \'foo: bar\'}', ['foo' => 'bar', 'bar' => 'foo: bar']],
+            ['{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}', ['foo\'' => 'bar', 'bar"' => 'foo: bar']],
+            ['{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}', ['foo: ' => 'bar', 'bar: ' => 'foo: bar']],
+            ['{"foo:bar": "baz"}', ['foo:bar' => 'baz']],
+            ['{"foo":"bar"}', ['foo' => 'bar']],
 
             // nested sequences and mappings
-            array('[foo, [bar, foo]]', array('foo', array('bar', 'foo'))),
-            array('[foo, {bar: foo}]', array('foo', array('bar' => 'foo'))),
-            array('{ foo: {bar: foo} }', array('foo' => array('bar' => 'foo'))),
-            array('{ foo: [bar, foo] }', array('foo' => array('bar', 'foo'))),
-            array('{ foo:{bar: foo} }', array('foo' => array('bar' => 'foo'))),
-            array('{ foo:[bar, foo] }', array('foo' => array('bar', 'foo'))),
+            ['[foo, [bar, foo]]', ['foo', ['bar', 'foo']]],
+            ['[foo, {bar: foo}]', ['foo', ['bar' => 'foo']]],
+            ['{ foo: {bar: foo} }', ['foo' => ['bar' => 'foo']]],
+            ['{ foo: [bar, foo] }', ['foo' => ['bar', 'foo']]],
+            ['{ foo:{bar: foo} }', ['foo' => ['bar' => 'foo']]],
+            ['{ foo:[bar, foo] }', ['foo' => ['bar', 'foo']]],
 
-            array('[  foo, [  bar, foo  ]  ]', array('foo', array('bar', 'foo'))),
+            ['[  foo, [  bar, foo  ]  ]', ['foo', ['bar', 'foo']]],
 
-            array('[{ foo: {bar: foo} }]', array(array('foo' => array('bar' => 'foo')))),
+            ['[{ foo: {bar: foo} }]', [['foo' => ['bar' => 'foo']]]],
 
-            array('[foo, [bar, [foo, [bar, foo]], foo]]', array('foo', array('bar', array('foo', array('bar', 'foo')), 'foo'))),
+            ['[foo, [bar, [foo, [bar, foo]], foo]]', ['foo', ['bar', ['foo', ['bar', 'foo']], 'foo']]],
 
-            array('[foo, {bar: foo, foo: [foo, {bar: foo}]}, [foo, {bar: foo}]]', array('foo', array('bar' => 'foo', 'foo' => array('foo', array('bar' => 'foo'))), array('foo', array('bar' => 'foo')))),
+            ['[foo, {bar: foo, foo: [foo, {bar: foo}]}, [foo, {bar: foo}]]', ['foo', ['bar' => 'foo', 'foo' => ['foo', ['bar' => 'foo']]], ['foo', ['bar' => 'foo']]]],
 
-            array('[foo, bar: { foo: bar }]', array('foo', '1' => array('bar' => array('foo' => 'bar')))),
-            array('[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', array('foo', '@foo.baz', array('%foo%' => 'foo is %foo%', 'bar' => '%foo%'), true, '@service_container')),
-        );
+            ['[foo, bar: { foo: bar }]', ['foo', '1' => ['bar' => ['foo' => 'bar']]]],
+            ['[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', ['foo', '@foo.baz', ['%foo%' => 'foo is %foo%', 'bar' => '%foo%'], true, '@service_container']],
+        ];
     }
 
     public function getTestsForParseWithMapObjects()
     {
-        return array(
-            array('', ''),
-            array('null', null),
-            array('false', false),
-            array('true', true),
-            array('12', 12),
-            array('-12', -12),
-            array('"quoted string"', 'quoted string'),
-            array("'quoted string'", 'quoted string'),
-            array('12.30e+02', 12.30e+02),
-            array('0x4D2', 0x4D2),
-            array('02333', 02333),
-            array('.Inf', -log(0)),
-            array('-.Inf', log(0)),
-            array("'686e444'", '686e444'),
-            array('686e444', 646e444),
-            array('123456789123456789123456789123456789', '123456789123456789123456789123456789'),
-            array('"foo\r\nbar"', "foo\r\nbar"),
-            array("'foo#bar'", 'foo#bar'),
-            array("'foo # bar'", 'foo # bar'),
-            array("'#cfcfcf'", '#cfcfcf'),
-            array('::form_base.html.twig', '::form_base.html.twig'),
-
-            array('2007-10-30', gmmktime(0, 0, 0, 10, 30, 2007)),
-            array('2007-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 2007)),
-            array('2007-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 2007)),
-            array('1960-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 1960)),
-            array('1730-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 1730)),
-
-            array('"a \\"string\\" with \'quoted strings inside\'"', 'a "string" with \'quoted strings inside\''),
-            array("'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''),
+        return [
+            ['', ''],
+            ['null', null],
+            ['false', false],
+            ['true', true],
+            ['12', 12],
+            ['-12', -12],
+            ['"quoted string"', 'quoted string'],
+            ["'quoted string'", 'quoted string'],
+            ['12.30e+02', 12.30e+02],
+            ['0x4D2', 0x4D2],
+            ['02333', 02333],
+            ['.Inf', -log(0)],
+            ['-.Inf', log(0)],
+            ["'686e444'", '686e444'],
+            ['686e444', 646e444],
+            ['123456789123456789123456789123456789', '123456789123456789123456789123456789'],
+            ['"foo\r\nbar"', "foo\r\nbar"],
+            ["'foo#bar'", 'foo#bar'],
+            ["'foo # bar'", 'foo # bar'],
+            ["'#cfcfcf'", '#cfcfcf'],
+            ['::form_base.html.twig', '::form_base.html.twig'],
+
+            ['2007-10-30', gmmktime(0, 0, 0, 10, 30, 2007)],
+            ['2007-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 2007)],
+            ['2007-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 2007)],
+            ['1960-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 1960)],
+            ['1730-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 1730)],
+
+            ['"a \\"string\\" with \'quoted strings inside\'"', 'a "string" with \'quoted strings inside\''],
+            ["'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''],
 
             // sequences
             // urls are no key value mapping. see #3609. Valid yaml "key: value" mappings require a space after the colon
-            array('[foo, http://urls.are/no/mappings, false, null, 12]', array('foo', 'http://urls.are/no/mappings', false, null, 12)),
-            array('[  foo  ,   bar , false  ,  null     ,  12  ]', array('foo', 'bar', false, null, 12)),
-            array('[\'foo,bar\', \'foo bar\']', array('foo,bar', 'foo bar')),
+            ['[foo, http://urls.are/no/mappings, false, null, 12]', ['foo', 'http://urls.are/no/mappings', false, null, 12]],
+            ['[  foo  ,   bar , false  ,  null     ,  12  ]', ['foo', 'bar', false, null, 12]],
+            ['[\'foo,bar\', \'foo bar\']', ['foo,bar', 'foo bar']],
 
             // mappings
-            array('{foo: bar,bar: foo,"false": false,"null": null,integer: 12}', (object) array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12), Yaml::PARSE_OBJECT_FOR_MAP),
-            array('{ foo  : bar, bar : foo,  "false"  :   false,  "null"  :   null,  integer :  12  }', (object) array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12), Yaml::PARSE_OBJECT_FOR_MAP),
-            array('{foo: \'bar\', bar: \'foo: bar\'}', (object) array('foo' => 'bar', 'bar' => 'foo: bar')),
-            array('{\'foo\': \'bar\', "bar": \'foo: bar\'}', (object) array('foo' => 'bar', 'bar' => 'foo: bar')),
-            array('{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}', (object) array('foo\'' => 'bar', 'bar"' => 'foo: bar')),
-            array('{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}', (object) array('foo: ' => 'bar', 'bar: ' => 'foo: bar')),
-            array('{"foo:bar": "baz"}', (object) array('foo:bar' => 'baz')),
-            array('{"foo":"bar"}', (object) array('foo' => 'bar')),
+            ['{foo: bar,bar: foo,"false": false,"null": null,integer: 12}', (object) ['foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12], Yaml::PARSE_OBJECT_FOR_MAP],
+            ['{ foo  : bar, bar : foo,  "false"  :   false,  "null"  :   null,  integer :  12  }', (object) ['foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12], Yaml::PARSE_OBJECT_FOR_MAP],
+            ['{foo: \'bar\', bar: \'foo: bar\'}', (object) ['foo' => 'bar', 'bar' => 'foo: bar']],
+            ['{\'foo\': \'bar\', "bar": \'foo: bar\'}', (object) ['foo' => 'bar', 'bar' => 'foo: bar']],
+            ['{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}', (object) ['foo\'' => 'bar', 'bar"' => 'foo: bar']],
+            ['{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}', (object) ['foo: ' => 'bar', 'bar: ' => 'foo: bar']],
+            ['{"foo:bar": "baz"}', (object) ['foo:bar' => 'baz']],
+            ['{"foo":"bar"}', (object) ['foo' => 'bar']],
 
             // nested sequences and mappings
-            array('[foo, [bar, foo]]', array('foo', array('bar', 'foo'))),
-            array('[foo, {bar: foo}]', array('foo', (object) array('bar' => 'foo'))),
-            array('{ foo: {bar: foo} }', (object) array('foo' => (object) array('bar' => 'foo'))),
-            array('{ foo: [bar, foo] }', (object) array('foo' => array('bar', 'foo'))),
+            ['[foo, [bar, foo]]', ['foo', ['bar', 'foo']]],
+            ['[foo, {bar: foo}]', ['foo', (object) ['bar' => 'foo']]],
+            ['{ foo: {bar: foo} }', (object) ['foo' => (object) ['bar' => 'foo']]],
+            ['{ foo: [bar, foo] }', (object) ['foo' => ['bar', 'foo']]],
 
-            array('[  foo, [  bar, foo  ]  ]', array('foo', array('bar', 'foo'))),
+            ['[  foo, [  bar, foo  ]  ]', ['foo', ['bar', 'foo']]],
 
-            array('[{ foo: {bar: foo} }]', array((object) array('foo' => (object) array('bar' => 'foo')))),
+            ['[{ foo: {bar: foo} }]', [(object) ['foo' => (object) ['bar' => 'foo']]]],
 
-            array('[foo, [bar, [foo, [bar, foo]], foo]]', array('foo', array('bar', array('foo', array('bar', 'foo')), 'foo'))),
+            ['[foo, [bar, [foo, [bar, foo]], foo]]', ['foo', ['bar', ['foo', ['bar', 'foo']], 'foo']]],
 
-            array('[foo, {bar: foo, foo: [foo, {bar: foo}]}, [foo, {bar: foo}]]', array('foo', (object) array('bar' => 'foo', 'foo' => array('foo', (object) array('bar' => 'foo'))), array('foo', (object) array('bar' => 'foo')))),
+            ['[foo, {bar: foo, foo: [foo, {bar: foo}]}, [foo, {bar: foo}]]', ['foo', (object) ['bar' => 'foo', 'foo' => ['foo', (object) ['bar' => 'foo']]], ['foo', (object) ['bar' => 'foo']]]],
 
-            array('[foo, bar: { foo: bar }]', array('foo', '1' => (object) array('bar' => (object) array('foo' => 'bar')))),
-            array('[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', array('foo', '@foo.baz', (object) array('%foo%' => 'foo is %foo%', 'bar' => '%foo%'), true, '@service_container')),
+            ['[foo, bar: { foo: bar }]', ['foo', '1' => (object) ['bar' => (object) ['foo' => 'bar']]]],
+            ['[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', ['foo', '@foo.baz', (object) ['%foo%' => 'foo is %foo%', 'bar' => '%foo%'], true, '@service_container']],
 
-            array('{}', new \stdClass()),
-            array('{ foo  : bar, bar : {}  }', (object) array('foo' => 'bar', 'bar' => new \stdClass())),
-            array('{ foo  : [], bar : {}  }', (object) array('foo' => array(), 'bar' => new \stdClass())),
-            array('{foo: \'bar\', bar: {} }', (object) array('foo' => 'bar', 'bar' => new \stdClass())),
-            array('{\'foo\': \'bar\', "bar": {}}', (object) array('foo' => 'bar', 'bar' => new \stdClass())),
-            array('{\'foo\': \'bar\', "bar": \'{}\'}', (object) array('foo' => 'bar', 'bar' => '{}')),
+            ['{}', new \stdClass()],
+            ['{ foo  : bar, bar : {}  }', (object) ['foo' => 'bar', 'bar' => new \stdClass()]],
+            ['{ foo  : [], bar : {}  }', (object) ['foo' => [], 'bar' => new \stdClass()]],
+            ['{foo: \'bar\', bar: {} }', (object) ['foo' => 'bar', 'bar' => new \stdClass()]],
+            ['{\'foo\': \'bar\', "bar": {}}', (object) ['foo' => 'bar', 'bar' => new \stdClass()]],
+            ['{\'foo\': \'bar\', "bar": \'{}\'}', (object) ['foo' => 'bar', 'bar' => '{}']],
 
-            array('[foo, [{}, {}]]', array('foo', array(new \stdClass(), new \stdClass()))),
-            array('[foo, [[], {}]]', array('foo', array(array(), new \stdClass()))),
-            array('[foo, [[{}, {}], {}]]', array('foo', array(array(new \stdClass(), new \stdClass()), new \stdClass()))),
-            array('[foo, {bar: {}}]', array('foo', '1' => (object) array('bar' => new \stdClass()))),
-        );
+            ['[foo, [{}, {}]]', ['foo', [new \stdClass(), new \stdClass()]]],
+            ['[foo, [[], {}]]', ['foo', [[], new \stdClass()]]],
+            ['[foo, [[{}, {}], {}]]', ['foo', [[new \stdClass(), new \stdClass()], new \stdClass()]]],
+            ['[foo, {bar: {}}]', ['foo', '1' => (object) ['bar' => new \stdClass()]]],
+        ];
     }
 
     public function getTestsForDump()
     {
-        return array(
-            array('null', null),
-            array('false', false),
-            array('true', true),
-            array('12', 12),
-            array("'1_2'", '1_2'),
-            array('_12', '_12'),
-            array("'12_'", '12_'),
-            array("'quoted string'", 'quoted string'),
-            array('!!float 1230', 12.30e+02),
-            array('1234', 0x4D2),
-            array('1243', 02333),
-            array("'0x_4_D_2_'", '0x_4_D_2_'),
-            array("'0_2_3_3_3'", '0_2_3_3_3'),
-            array('.Inf', -log(0)),
-            array('-.Inf', log(0)),
-            array("'686e444'", '686e444'),
-            array('"foo\r\nbar"', "foo\r\nbar"),
-            array("'foo#bar'", 'foo#bar'),
-            array("'foo # bar'", 'foo # bar'),
-            array("'#cfcfcf'", '#cfcfcf'),
-
-            array("'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''),
-
-            array("'-dash'", '-dash'),
-            array("'-'", '-'),
+        return [
+            ['null', null],
+            ['false', false],
+            ['true', true],
+            ['12', 12],
+            ["'1_2'", '1_2'],
+            ['_12', '_12'],
+            ["'12_'", '12_'],
+            ["'quoted string'", 'quoted string'],
+            ['!!float 1230', 12.30e+02],
+            ['1234', 0x4D2],
+            ['1243', 02333],
+            ["'0x_4_D_2_'", '0x_4_D_2_'],
+            ["'0_2_3_3_3'", '0_2_3_3_3'],
+            ['.Inf', -log(0)],
+            ['-.Inf', log(0)],
+            ["'686e444'", '686e444'],
+            ['"foo\r\nbar"', "foo\r\nbar"],
+            ["'foo#bar'", 'foo#bar'],
+            ["'foo # bar'", 'foo # bar'],
+            ["'#cfcfcf'", '#cfcfcf'],
+
+            ["'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''],
+
+            ["'-dash'", '-dash'],
+            ["'-'", '-'],
 
             // Pre-YAML-1.2 booleans
-            array("'y'", 'y'),
-            array("'n'", 'n'),
-            array("'yes'", 'yes'),
-            array("'no'", 'no'),
-            array("'on'", 'on'),
-            array("'off'", 'off'),
+            ["'y'", 'y'],
+            ["'n'", 'n'],
+            ["'yes'", 'yes'],
+            ["'no'", 'no'],
+            ["'on'", 'on'],
+            ["'off'", 'off'],
 
             // sequences
-            array('[foo, bar, false, null, 12]', array('foo', 'bar', false, null, 12)),
-            array('[\'foo,bar\', \'foo bar\']', array('foo,bar', 'foo bar')),
+            ['[foo, bar, false, null, 12]', ['foo', 'bar', false, null, 12]],
+            ['[\'foo,bar\', \'foo bar\']', ['foo,bar', 'foo bar']],
 
             // mappings
-            array('{ foo: bar, bar: foo, \'false\': false, \'null\': null, integer: 12 }', array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
-            array('{ foo: bar, bar: \'foo: bar\' }', array('foo' => 'bar', 'bar' => 'foo: bar')),
+            ['{ foo: bar, bar: foo, \'false\': false, \'null\': null, integer: 12 }', ['foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12]],
+            ['{ foo: bar, bar: \'foo: bar\' }', ['foo' => 'bar', 'bar' => 'foo: bar']],
 
             // nested sequences and mappings
-            array('[foo, [bar, foo]]', array('foo', array('bar', 'foo'))),
+            ['[foo, [bar, foo]]', ['foo', ['bar', 'foo']]],
 
-            array('[foo, [bar, [foo, [bar, foo]], foo]]', array('foo', array('bar', array('foo', array('bar', 'foo')), 'foo'))),
+            ['[foo, [bar, [foo, [bar, foo]], foo]]', ['foo', ['bar', ['foo', ['bar', 'foo']], 'foo']]],
 
-            array('{ foo: { bar: foo } }', array('foo' => array('bar' => 'foo'))),
+            ['{ foo: { bar: foo } }', ['foo' => ['bar' => 'foo']]],
 
-            array('[foo, { bar: foo }]', array('foo', array('bar' => 'foo'))),
+            ['[foo, { bar: foo }]', ['foo', ['bar' => 'foo']]],
 
-            array('[foo, { bar: foo, foo: [foo, { bar: foo }] }, [foo, { bar: foo }]]', array('foo', array('bar' => 'foo', 'foo' => array('foo', array('bar' => 'foo'))), array('foo', array('bar' => 'foo')))),
+            ['[foo, { bar: foo, foo: [foo, { bar: foo }] }, [foo, { bar: foo }]]', ['foo', ['bar' => 'foo', 'foo' => ['foo', ['bar' => 'foo']]], ['foo', ['bar' => 'foo']]]],
 
-            array('[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', array('foo', '@foo.baz', array('%foo%' => 'foo is %foo%', 'bar' => '%foo%'), true, '@service_container')),
+            ['[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', ['foo', '@foo.baz', ['%foo%' => 'foo is %foo%', 'bar' => '%foo%'], true, '@service_container']],
 
-            array('{ foo: { bar: { 1: 2, baz: 3 } } }', array('foo' => array('bar' => array(1 => 2, 'baz' => 3)))),
-        );
+            ['{ foo: { bar: { 1: 2, baz: 3 } } }', ['foo' => ['bar' => [1 => 2, 'baz' => 3]]]],
+        ];
     }
 
     /**
@@ -625,12 +625,12 @@ public function testParseTimestampAsDateTimeObject($yaml, $year, $month, $day, $
 
     public function getTimestampTests()
     {
-        return array(
-            'canonical' => array('2001-12-15T02:59:43.1Z', 2001, 12, 15, 2, 59, 43.1, '+0000'),
-            'ISO-8601' => array('2001-12-15t21:59:43.10-05:00', 2001, 12, 16, 2, 59, 43.1, '-0500'),
-            'spaced' => array('2001-12-15 21:59:43.10 -5', 2001, 12, 16, 2, 59, 43.1, '-0500'),
-            'date' => array('2001-12-15', 2001, 12, 15, 0, 0, 0, '+0000'),
-        );
+        return [
+            'canonical' => ['2001-12-15T02:59:43.1Z', 2001, 12, 15, 2, 59, 43.1, '+0000'],
+            'ISO-8601' => ['2001-12-15t21:59:43.10-05:00', 2001, 12, 16, 2, 59, 43.1, '-0500'],
+            'spaced' => ['2001-12-15 21:59:43.10 -5', 2001, 12, 16, 2, 59, 43.1, '-0500'],
+            'date' => ['2001-12-15', 2001, 12, 15, 0, 0, 0, '+0000'],
+        ];
     }
 
     /**
@@ -647,7 +647,7 @@ public function testParseNestedTimestampListAsDateTimeObject($yaml, $year, $mont
             $expected->setTime($hour, $minute, $second);
         }
 
-        $expectedNested = array('nested' => array($expected));
+        $expectedNested = ['nested' => [$expected]];
         $yamlNested = "{nested: [$yaml]}";
 
         $this->assertEquals($expectedNested, Inline::parse($yamlNested, Yaml::PARSE_DATETIME));
@@ -663,13 +663,13 @@ public function testDumpDateTime($dateTime, $expected)
 
     public function getDateTimeDumpTests()
     {
-        $tests = array();
+        $tests = [];
 
         $dateTime = new \DateTime('2001-12-15 21:59:43', new \DateTimeZone('UTC'));
-        $tests['date-time-utc'] = array($dateTime, '2001-12-15T21:59:43+00:00');
+        $tests['date-time-utc'] = [$dateTime, '2001-12-15T21:59:43+00:00'];
 
         $dateTime = new \DateTimeImmutable('2001-07-15 21:59:43', new \DateTimeZone('Europe/Berlin'));
-        $tests['immutable-date-time-europe-berlin'] = array($dateTime, '2001-07-15T21:59:43+02:00');
+        $tests['immutable-date-time-europe-berlin'] = [$dateTime, '2001-07-15T21:59:43+02:00'];
 
         return $tests;
     }
@@ -684,11 +684,11 @@ public function testParseBinaryData($data)
 
     public function getBinaryData()
     {
-        return array(
-            'enclosed with double quotes' => array('!!binary "SGVsbG8gd29ybGQ="'),
-            'enclosed with single quotes' => array("!!binary 'SGVsbG8gd29ybGQ='"),
-            'containing spaces' => array('!!binary  "SGVs bG8gd 29ybGQ="'),
-        );
+        return [
+            'enclosed with double quotes' => ['!!binary "SGVsbG8gd29ybGQ="'],
+            'enclosed with single quotes' => ["!!binary 'SGVsbG8gd29ybGQ='"],
+            'containing spaces' => ['!!binary  "SGVs bG8gd 29ybGQ="'],
+        ];
     }
 
     /**
@@ -708,12 +708,12 @@ public function testParseInvalidBinaryData($data, $expectedMessage)
 
     public function getInvalidBinaryData()
     {
-        return array(
-            'length not a multiple of four' => array('!!binary "SGVsbG8d29ybGQ="', '/The normalized base64 encoded data \(data without whitespace characters\) length must be a multiple of four \(\d+ bytes given\)/'),
-            'invalid characters' => array('!!binary "SGVsbG8#d29ybGQ="', '/The base64 encoded data \(.*\) contains invalid characters/'),
-            'too many equals characters' => array('!!binary "SGVsbG8gd29yb==="', '/The base64 encoded data \(.*\) contains invalid characters/'),
-            'misplaced equals character' => array('!!binary "SGVsbG8gd29ybG=Q"', '/The base64 encoded data \(.*\) contains invalid characters/'),
-        );
+        return [
+            'length not a multiple of four' => ['!!binary "SGVsbG8d29ybGQ="', '/The normalized base64 encoded data \(data without whitespace characters\) length must be a multiple of four \(\d+ bytes given\)/'],
+            'invalid characters' => ['!!binary "SGVsbG8#d29ybGQ="', '/The base64 encoded data \(.*\) contains invalid characters/'],
+            'too many equals characters' => ['!!binary "SGVsbG8gd29yb==="', '/The base64 encoded data \(.*\) contains invalid characters/'],
+            'misplaced equals character' => ['!!binary "SGVsbG8gd29ybG=Q"', '/The base64 encoded data \(.*\) contains invalid characters/'],
+        ];
     }
 
     /**
@@ -729,7 +729,7 @@ public function testVeryLongQuotedStrings()
     {
         $longStringWithQuotes = str_repeat("x\r\n\\\"x\"x", 1000);
 
-        $yamlString = Inline::dump(array('longStringWithQuotes' => $longStringWithQuotes));
+        $yamlString = Inline::dump(['longStringWithQuotes' => $longStringWithQuotes]);
         $arrayFromYaml = Inline::parse($yamlString);
 
         $this->assertEquals($longStringWithQuotes, $arrayFromYaml['longStringWithQuotes']);
@@ -754,15 +754,15 @@ public function testParseMissingMappingValueAsNull($yaml, $expected)
 
     public function getTestsForNullValues()
     {
-        return array(
-            'null before closing curly brace' => array('{foo:}', array('foo' => null)),
-            'null before comma' => array('{foo:, bar: baz}', array('foo' => null, 'bar' => 'baz')),
-        );
+        return [
+            'null before closing curly brace' => ['{foo:}', ['foo' => null]],
+            'null before comma' => ['{foo:, bar: baz}', ['foo' => null, 'bar' => 'baz']],
+        ];
     }
 
     public function testTheEmptyStringIsAValidMappingKey()
     {
-        $this->assertSame(array('' => 'foo'), Inline::parse('{ "": foo }'));
+        $this->assertSame(['' => 'foo'], Inline::parse('{ "": foo }'));
     }
 
     /**
@@ -788,12 +788,12 @@ public function testExplicitStringCastingOfMappingKeys($yaml, $expected)
 
     public function getNotPhpCompatibleMappingKeyData()
     {
-        return array(
-            'boolean-true' => array('{true: "foo"}', array('true' => 'foo')),
-            'boolean-false' => array('{false: "foo"}', array('false' => 'foo')),
-            'null' => array('{null: "foo"}', array('null' => 'foo')),
-            'float' => array('{0.25: "foo"}', array('0.25' => 'foo')),
-        );
+        return [
+            'boolean-true' => ['{true: "foo"}', ['true' => 'foo']],
+            'boolean-false' => ['{false: "foo"}', ['false' => 'foo']],
+            'null' => ['{null: "foo"}', ['null' => 'foo']],
+            'float' => ['{0.25: "foo"}', ['0.25' => 'foo']],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index 6372fe45eef89..d371de7b9e244 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -104,12 +104,12 @@ public function getLegacyNonStringMappingKeysData()
     public function testTabsInYaml()
     {
         // test tabs in YAML
-        $yamls = array(
+        $yamls = [
             "foo:\n	bar",
             "foo:\n 	bar",
             "foo:\n	 bar",
             "foo:\n 	 bar",
-        );
+        ];
 
         foreach ($yamls as $yaml) {
             try {
@@ -136,7 +136,7 @@ public function testEndOfTheDocumentMarker()
 
     public function getBlockChompingTests()
     {
-        $tests = array();
+        $tests = [];
 
         $yaml = <<<'EOF'
 foo: |-
@@ -147,11 +147,11 @@ public function getBlockChompingTests()
     two
 
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => "one\ntwo",
             'bar' => "one\ntwo",
-        );
-        $tests['Literal block chomping strip with single trailing newline'] = array($expected, $yaml);
+        ];
+        $tests['Literal block chomping strip with single trailing newline'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 foo: |-
@@ -164,19 +164,19 @@ public function getBlockChompingTests()
 
 
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => "one\ntwo",
             'bar' => "one\ntwo",
-        );
-        $tests['Literal block chomping strip with multiple trailing newlines'] = array($expected, $yaml);
+        ];
+        $tests['Literal block chomping strip with multiple trailing newlines'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 {}
 
 
 EOF;
-        $expected = array();
-        $tests['Literal block chomping strip with multiple trailing newlines after a 1-liner'] = array($expected, $yaml);
+        $expected = [];
+        $tests['Literal block chomping strip with multiple trailing newlines after a 1-liner'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 foo: |-
@@ -186,11 +186,11 @@ public function getBlockChompingTests()
     one
     two
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => "one\ntwo",
             'bar' => "one\ntwo",
-        );
-        $tests['Literal block chomping strip without trailing newline'] = array($expected, $yaml);
+        ];
+        $tests['Literal block chomping strip without trailing newline'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 foo: |
@@ -201,11 +201,11 @@ public function getBlockChompingTests()
     two
 
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => "one\ntwo\n",
             'bar' => "one\ntwo\n",
-        );
-        $tests['Literal block chomping clip with single trailing newline'] = array($expected, $yaml);
+        ];
+        $tests['Literal block chomping clip with single trailing newline'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 foo: |
@@ -218,11 +218,11 @@ public function getBlockChompingTests()
 
 
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => "one\ntwo\n",
             'bar' => "one\ntwo\n",
-        );
-        $tests['Literal block chomping clip with multiple trailing newlines'] = array($expected, $yaml);
+        ];
+        $tests['Literal block chomping clip with multiple trailing newlines'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 foo:
@@ -231,14 +231,14 @@ public function getBlockChompingTests()
 
     two
 EOF;
-        $expected = array(
-            'foo' => array(
-                array(
+        $expected = [
+            'foo' => [
+                [
                     'bar' => "one\n\ntwo",
-                ),
-            ),
-        );
-        $tests['Literal block chomping clip with embedded blank line inside unindented collection'] = array($expected, $yaml);
+                ],
+            ],
+        ];
+        $tests['Literal block chomping clip with embedded blank line inside unindented collection'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 foo: |
@@ -248,11 +248,11 @@ public function getBlockChompingTests()
     one
     two
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => "one\ntwo\n",
             'bar' => "one\ntwo",
-        );
-        $tests['Literal block chomping clip without trailing newline'] = array($expected, $yaml);
+        ];
+        $tests['Literal block chomping clip without trailing newline'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 foo: |+
@@ -263,11 +263,11 @@ public function getBlockChompingTests()
     two
 
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => "one\ntwo\n",
             'bar' => "one\ntwo\n",
-        );
-        $tests['Literal block chomping keep with single trailing newline'] = array($expected, $yaml);
+        ];
+        $tests['Literal block chomping keep with single trailing newline'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 foo: |+
@@ -280,11 +280,11 @@ public function getBlockChompingTests()
 
 
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => "one\ntwo\n\n",
             'bar' => "one\ntwo\n\n",
-        );
-        $tests['Literal block chomping keep with multiple trailing newlines'] = array($expected, $yaml);
+        ];
+        $tests['Literal block chomping keep with multiple trailing newlines'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 foo: |+
@@ -294,11 +294,11 @@ public function getBlockChompingTests()
     one
     two
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => "one\ntwo\n",
             'bar' => "one\ntwo",
-        );
-        $tests['Literal block chomping keep without trailing newline'] = array($expected, $yaml);
+        ];
+        $tests['Literal block chomping keep without trailing newline'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 foo: >-
@@ -309,11 +309,11 @@ public function getBlockChompingTests()
     two
 
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => 'one two',
             'bar' => 'one two',
-        );
-        $tests['Folded block chomping strip with single trailing newline'] = array($expected, $yaml);
+        ];
+        $tests['Folded block chomping strip with single trailing newline'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 foo: >-
@@ -326,11 +326,11 @@ public function getBlockChompingTests()
 
 
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => 'one two',
             'bar' => 'one two',
-        );
-        $tests['Folded block chomping strip with multiple trailing newlines'] = array($expected, $yaml);
+        ];
+        $tests['Folded block chomping strip with multiple trailing newlines'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 foo: >-
@@ -340,11 +340,11 @@ public function getBlockChompingTests()
     one
     two
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => 'one two',
             'bar' => 'one two',
-        );
-        $tests['Folded block chomping strip without trailing newline'] = array($expected, $yaml);
+        ];
+        $tests['Folded block chomping strip without trailing newline'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 foo: >
@@ -355,11 +355,11 @@ public function getBlockChompingTests()
     two
 
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => "one two\n",
             'bar' => "one two\n",
-        );
-        $tests['Folded block chomping clip with single trailing newline'] = array($expected, $yaml);
+        ];
+        $tests['Folded block chomping clip with single trailing newline'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 foo: >
@@ -372,11 +372,11 @@ public function getBlockChompingTests()
 
 
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => "one two\n",
             'bar' => "one two\n",
-        );
-        $tests['Folded block chomping clip with multiple trailing newlines'] = array($expected, $yaml);
+        ];
+        $tests['Folded block chomping clip with multiple trailing newlines'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 foo: >
@@ -386,11 +386,11 @@ public function getBlockChompingTests()
     one
     two
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => "one two\n",
             'bar' => 'one two',
-        );
-        $tests['Folded block chomping clip without trailing newline'] = array($expected, $yaml);
+        ];
+        $tests['Folded block chomping clip without trailing newline'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 foo: >+
@@ -401,11 +401,11 @@ public function getBlockChompingTests()
     two
 
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => "one two\n",
             'bar' => "one two\n",
-        );
-        $tests['Folded block chomping keep with single trailing newline'] = array($expected, $yaml);
+        ];
+        $tests['Folded block chomping keep with single trailing newline'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 foo: >+
@@ -418,11 +418,11 @@ public function getBlockChompingTests()
 
 
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => "one two\n\n",
             'bar' => "one two\n\n",
-        );
-        $tests['Folded block chomping keep with multiple trailing newlines'] = array($expected, $yaml);
+        ];
+        $tests['Folded block chomping keep with multiple trailing newlines'] = [$expected, $yaml];
 
         $yaml = <<<'EOF'
 foo: >+
@@ -432,11 +432,11 @@ public function getBlockChompingTests()
     one
     two
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => "one two\n",
             'bar' => 'one two',
-        );
-        $tests['Folded block chomping keep without trailing newline'] = array($expected, $yaml);
+        ];
+        $tests['Folded block chomping keep without trailing newline'] = [$expected, $yaml];
 
         return $tests;
     }
@@ -463,9 +463,9 @@ public function testBlockLiteralWithLeadingNewlines()
     bar
 
 EOF;
-        $expected = array(
+        $expected = [
             'foo' => "\n\nbar",
-        );
+        ];
 
         $this->assertSame($expected, $this->parser->parse($yaml));
     }
@@ -476,7 +476,7 @@ public function testObjectSupportEnabled()
 foo: !php/object O:30:"Symfony\Component\Yaml\Tests\B":1:{s:1:"b";s:3:"foo";}
 bar: 1
 EOF;
-        $this->assertEquals(array('foo' => new B(), 'bar' => 1), $this->parser->parse($input, Yaml::PARSE_OBJECT), '->parse() is able to parse objects');
+        $this->assertEquals(['foo' => new B(), 'bar' => 1], $this->parser->parse($input, Yaml::PARSE_OBJECT), '->parse() is able to parse objects');
     }
 
     /**
@@ -547,7 +547,7 @@ public function testObjectForMapEnabledWithMappingUsingBooleanToggles($yaml, $ex
 
     public function getObjectForMapTests()
     {
-        $tests = array();
+        $tests = [];
 
         $yaml = <<<'EOF'
 foo:
@@ -555,20 +555,20 @@ public function getObjectForMapTests()
 EOF;
         $expected = new \stdClass();
         $expected->foo = new \stdClass();
-        $expected->foo->fiz = array('cat');
-        $tests['mapping'] = array($yaml, $expected);
+        $expected->foo->fiz = ['cat'];
+        $tests['mapping'] = [$yaml, $expected];
 
         $yaml = '{ "foo": "bar", "fiz": "cat" }';
         $expected = new \stdClass();
         $expected->foo = 'bar';
         $expected->fiz = 'cat';
-        $tests['inline-mapping'] = array($yaml, $expected);
+        $tests['inline-mapping'] = [$yaml, $expected];
 
         $yaml = "foo: bar\nbaz: foobar";
         $expected = new \stdClass();
         $expected->foo = 'bar';
         $expected->baz = 'foobar';
-        $tests['object-for-map-is-applied-after-parsing'] = array($yaml, $expected);
+        $tests['object-for-map-is-applied-after-parsing'] = [$yaml, $expected];
 
         $yaml = <<<'EOT'
 array:
@@ -576,12 +576,12 @@ public function getObjectForMapTests()
   - key: two
 EOT;
         $expected = new \stdClass();
-        $expected->array = array();
+        $expected->array = [];
         $expected->array[0] = new \stdClass();
         $expected->array[0]->key = 'one';
         $expected->array[1] = new \stdClass();
         $expected->array[1]->key = 'two';
-        $tests['nest-map-and-sequence'] = array($yaml, $expected);
+        $tests['nest-map-and-sequence'] = [$yaml, $expected];
 
         $yaml = <<<'YAML'
 map:
@@ -592,7 +592,7 @@ public function getObjectForMapTests()
         $expected->map = new \stdClass();
         $expected->map->{1} = 'one';
         $expected->map->{2} = 'two';
-        $tests['numeric-keys'] = array($yaml, $expected);
+        $tests['numeric-keys'] = [$yaml, $expected];
 
         $yaml = <<<'YAML'
 map:
@@ -603,7 +603,7 @@ public function getObjectForMapTests()
         $expected->map = new \stdClass();
         $expected->map->{0} = 'one';
         $expected->map->{1} = 'two';
-        $tests['zero-indexed-numeric-keys'] = array($yaml, $expected);
+        $tests['zero-indexed-numeric-keys'] = [$yaml, $expected];
 
         return $tests;
     }
@@ -621,9 +621,9 @@ public function testCanParseContentWithTrailingSpaces()
     {
         $yaml = "items:  \n  foo: bar";
 
-        $expected = array(
-            'items' => array('foo' => 'bar'),
-        );
+        $expected = [
+            'items' => ['foo' => 'bar'],
+        ];
 
         $this->assertSame($expected, $this->parser->parse($yaml));
     }
@@ -660,11 +660,11 @@ public function invalidDumpedObjectProvider()
      */
     public function testNonUtf8Exception()
     {
-        $yamls = array(
+        $yamls = [
             iconv('UTF-8', 'ISO-8859-1', "foo: 'äöüß'"),
             iconv('UTF-8', 'ISO-8859-15', "euro: '€'"),
             iconv('UTF-8', 'CP1252', "cp1252: '©ÉÇáñ'"),
-        );
+        ];
 
         foreach ($yamls as $yaml) {
             try {
@@ -755,19 +755,19 @@ public function testSequenceInMappingStartedBySingleDashLine()
 - foo
 d: e
 EOT;
-        $expected = array(
-            'a' => array(
-                array(
-                    'b' => array(
-                        array(
+        $expected = [
+            'a' => [
+                [
+                    'b' => [
+                        [
                             'bar' => 'baz',
-                        ),
-                    ),
-                ),
+                        ],
+                    ],
+                ],
                 'foo',
-            ),
+            ],
             'd' => 'e',
-        );
+        ];
 
         $this->assertSame($expected, $this->parser->parse($yaml));
     }
@@ -781,12 +781,12 @@ public function testSequenceFollowedByCommentEmbeddedInMapping()
 # comment
     d: e
 EOT;
-        $expected = array(
-            'a' => array(
-                'b' => array('c'),
+        $expected = [
+            'a' => [
+                'b' => ['c'],
                 'd' => 'e',
-            ),
-        );
+            ],
+        ];
 
         $this->assertSame($expected, $this->parser->parse($yaml));
     }
@@ -802,25 +802,25 @@ public function testNonStringFollowedByCommentEmbeddedInMapping()
         1.1
 # another comment
 EOT;
-        $expected = array(
-            'a' => array(
-                'b' => array(),
+        $expected = [
+            'a' => [
+                'b' => [],
                 'd' => 1.1,
-            ),
-        );
+            ],
+        ];
 
         $this->assertSame($expected, $this->parser->parse($yaml));
     }
 
     public function getParseExceptionNotAffectedMultiLineStringLastResortParsing()
     {
-        $tests = array();
+        $tests = [];
 
         $yaml = <<<'EOT'
 a
     b:
 EOT;
-        $tests['parse error on first line'] = array($yaml);
+        $tests['parse error on first line'] = [$yaml];
 
         $yaml = <<<'EOT'
 a
@@ -828,12 +828,12 @@ public function getParseExceptionNotAffectedMultiLineStringLastResortParsing()
 b
     c:
 EOT;
-        $tests['parse error due to inconsistent indentation'] = array($yaml);
+        $tests['parse error due to inconsistent indentation'] = [$yaml];
 
         $yaml = <<<'EOT'
  &  *  !  |  >  '  "  %  @  ` #, { asd a;sdasd }-@^qw3
 EOT;
-        $tests['symfony/symfony/issues/22967#issuecomment-322067742'] = array($yaml);
+        $tests['symfony/symfony/issues/22967#issuecomment-322067742'] = [$yaml];
 
         return $tests;
     }
@@ -855,9 +855,9 @@ public function testMultiLineStringLastResortParsing()
   true
   yes you can
 EOT;
-        $expected = array(
+        $expected = [
             'test' => 'You can have things that don\'t look like strings here true yes you can',
-        );
+        ];
 
         $this->assertSame($expected, $this->parser->parse($yaml));
 
@@ -866,9 +866,9 @@ public function testMultiLineStringLastResortParsing()
     b
        c
 EOT;
-        $expected = array(
+        $expected = [
             'a' => 'b c',
-        );
+        ];
 
         $this->assertSame($expected, $this->parser->parse($yaml));
     }
@@ -922,11 +922,11 @@ public function testMappingDuplicateKeyBlock()
     child: duplicate
     child: duplicate
 EOD;
-        $expected = array(
-            'parent' => array(
+        $expected = [
+            'parent' => [
                 'child' => 'first',
-            ),
-        );
+            ],
+        ];
         $this->assertSame($expected, Yaml::parse($input));
     }
 
@@ -939,11 +939,11 @@ public function testMappingDuplicateKeyFlow()
 parent: { child: first, child: duplicate }
 parent: { child: duplicate, child: duplicate }
 EOD;
-        $expected = array(
-            'parent' => array(
+        $expected = [
+            'parent' => [
                 'child' => 'first',
-            ),
-        );
+            ],
+        ];
         $this->assertSame($expected, Yaml::parse($input));
     }
 
@@ -960,30 +960,30 @@ public function testParseExceptionOnDuplicate($input, $duplicateKey, $lineNumber
 
     public function getParseExceptionOnDuplicateData()
     {
-        $tests = array();
+        $tests = [];
 
         $yaml = <<<EOD
 parent: { child: first, child: duplicate }
 EOD;
-        $tests[] = array($yaml, 'child', 1);
+        $tests[] = [$yaml, 'child', 1];
 
         $yaml = <<<EOD
 parent:
   child: first,
   child: duplicate
 EOD;
-        $tests[] = array($yaml, 'child', 3);
+        $tests[] = [$yaml, 'child', 3];
 
         $yaml = <<<EOD
 parent: { child: foo }
 parent: { child: bar }
 EOD;
-        $tests[] = array($yaml, 'parent', 2);
+        $tests[] = [$yaml, 'parent', 2];
 
         $yaml = <<<EOD
 parent: { child_mapping: { value: bar},  child_mapping: { value: bar} }
 EOD;
-        $tests[] = array($yaml, 'child_mapping', 1);
+        $tests[] = [$yaml, 'child_mapping', 1];
 
         $yaml = <<<EOD
 parent:
@@ -992,12 +992,12 @@ public function getParseExceptionOnDuplicateData()
   child_mapping:
     value: bar
 EOD;
-        $tests[] = array($yaml, 'child_mapping', 4);
+        $tests[] = [$yaml, 'child_mapping', 4];
 
         $yaml = <<<EOD
 parent: { child_sequence: ['key1', 'key2', 'key3'],  child_sequence: ['key1', 'key2', 'key3'] }
 EOD;
-        $tests[] = array($yaml, 'child_sequence', 1);
+        $tests[] = [$yaml, 'child_sequence', 1];
 
         $yaml = <<<EOD
 parent:
@@ -1010,7 +1010,7 @@ public function getParseExceptionOnDuplicateData()
     - key2
     - key3
 EOD;
-        $tests[] = array($yaml, 'child_sequence', 6);
+        $tests[] = [$yaml, 'child_sequence', 6];
 
         return $tests;
     }
@@ -1021,21 +1021,21 @@ public function testEmptyValue()
 hash:
 EOF;
 
-        $this->assertEquals(array('hash' => null), Yaml::parse($input));
+        $this->assertEquals(['hash' => null], Yaml::parse($input));
     }
 
     public function testCommentAtTheRootIndent()
     {
-        $this->assertEquals(array(
-            'services' => array(
-                'app.foo_service' => array(
+        $this->assertEquals([
+            'services' => [
+                'app.foo_service' => [
                     'class' => 'Foo',
-                ),
-                'app/bar_service' => array(
+                ],
+                'app/bar_service' => [
                     'class' => 'Bar',
-                ),
-            ),
-        ), Yaml::parse(<<<'EOF'
+                ],
+            ],
+        ], Yaml::parse(<<<'EOF'
 # comment 1
 services:
 # comment 2
@@ -1052,7 +1052,7 @@ class: Bar
 
     public function testStringBlockWithComments()
     {
-        $this->assertEquals(array('content' => <<<'EOT'
+        $this->assertEquals(['content' => <<<'EOT'
 # comment 1
 header
 
@@ -1063,7 +1063,7 @@ public function testStringBlockWithComments()
 
 footer # comment3
 EOT
-        ), Yaml::parse(<<<'EOF'
+        ], Yaml::parse(<<<'EOF'
 content: |
     # comment 1
     header
@@ -1080,7 +1080,7 @@ public function testStringBlockWithComments()
 
     public function testFoldedStringBlockWithComments()
     {
-        $this->assertEquals(array(array('content' => <<<'EOT'
+        $this->assertEquals([['content' => <<<'EOT'
 # comment 1
 header
 
@@ -1091,7 +1091,7 @@ public function testFoldedStringBlockWithComments()
 
 footer # comment3
 EOT
-        )), Yaml::parse(<<<'EOF'
+        ]], Yaml::parse(<<<'EOF'
 -
     content: |
         # comment 1
@@ -1109,7 +1109,7 @@ public function testFoldedStringBlockWithComments()
 
     public function testNestedFoldedStringBlockWithComments()
     {
-        $this->assertEquals(array(array(
+        $this->assertEquals([[
             'title' => 'some title',
             'content' => <<<'EOT'
 # comment 1
@@ -1122,7 +1122,7 @@ public function testNestedFoldedStringBlockWithComments()
 
 footer # comment3
 EOT
-        )), Yaml::parse(<<<'EOF'
+        ]], Yaml::parse(<<<'EOF'
 -
     title: some title
     content: |
@@ -1141,17 +1141,17 @@ public function testNestedFoldedStringBlockWithComments()
 
     public function testReferenceResolvingInInlineStrings()
     {
-        $this->assertEquals(array(
+        $this->assertEquals([
             'var' => 'var-value',
             'scalar' => 'var-value',
-            'list' => array('var-value'),
-            'list_in_list' => array(array('var-value')),
-            'map_in_list' => array(array('key' => 'var-value')),
-            'embedded_mapping' => array(array('key' => 'var-value')),
-            'map' => array('key' => 'var-value'),
-            'list_in_map' => array('key' => array('var-value')),
-            'map_in_map' => array('foo' => array('bar' => 'var-value')),
-        ), Yaml::parse(<<<'EOF'
+            'list' => ['var-value'],
+            'list_in_list' => [['var-value']],
+            'map_in_list' => [['key' => 'var-value']],
+            'embedded_mapping' => [['key' => 'var-value']],
+            'map' => ['key' => 'var-value'],
+            'list_in_map' => ['key' => ['var-value']],
+            'map_in_map' => ['foo' => ['bar' => 'var-value']],
+        ], Yaml::parse(<<<'EOF'
 var:  &var var-value
 scalar: *var
 list: [ *var ]
@@ -1173,7 +1173,7 @@ public function testYamlDirective()
 foo: 1
 bar: 2
 EOF;
-        $this->assertEquals(array('foo' => 1, 'bar' => 2), $this->parser->parse($yaml));
+        $this->assertEquals(['foo' => 1, 'bar' => 2], $this->parser->parse($yaml));
     }
 
     /**
@@ -1230,14 +1230,14 @@ public function testExplicitStringCasting()
 '~': 'null'
 EOF;
 
-        $expected = array(
+        $expected = [
             '1.2' => 'bar',
             '1.3' => 'baz',
             'true' => 'foo',
             'false' => 'bar',
             'null' => 'null',
             '~' => 'null',
-        );
+        ];
 
         $this->assertEquals($expected, $this->parser->parse($yaml));
     }
@@ -1262,7 +1262,7 @@ public function testColonInMappingValueExceptionNotTriggeredByColonInComment()
     bar: foobar # Note: a comment after a colon
 EOT;
 
-        $this->assertSame(array('foo' => array('bar' => 'foobar')), $this->parser->parse($yaml));
+        $this->assertSame(['foo' => ['bar' => 'foobar']], $this->parser->parse($yaml));
     }
 
     /**
@@ -1275,7 +1275,7 @@ public function testCommentLikeStringsAreNotStrippedInBlockScalars($yaml, $expec
 
     public function getCommentLikeStringInScalarBlockData()
     {
-        $tests = array();
+        $tests = [];
 
         $yaml = <<<'EOT'
 pages:
@@ -1292,9 +1292,9 @@ public function getCommentLikeStringInScalarBlockData()
 
             footer # comment3
 EOT;
-        $expected = array(
-            'pages' => array(
-                array(
+        $expected = [
+            'pages' => [
+                [
                     'title' => 'some title',
                     'content' => <<<'EOT'
 # comment 1
@@ -1308,10 +1308,10 @@ public function getCommentLikeStringInScalarBlockData()
 footer # comment3
 EOT
                     ,
-                ),
-            ),
-        );
-        $tests[] = array($yaml, $expected);
+                ],
+            ],
+        ];
+        $tests[] = [$yaml, $expected];
 
         $yaml = <<<'EOT'
 test: |
@@ -1328,7 +1328,7 @@ public function getCommentLikeStringInScalarBlockData()
         # bar
         baz
 EOT;
-        $expected = array(
+        $expected = [
             'test' => <<<'EOT'
 foo
 # bar
@@ -1336,8 +1336,8 @@ public function getCommentLikeStringInScalarBlockData()
 
 EOT
             ,
-            'collection' => array(
-                array(
+            'collection' => [
+                [
                     'one' => <<<'EOT'
 foo
 # bar
@@ -1345,18 +1345,18 @@ public function getCommentLikeStringInScalarBlockData()
 
 EOT
                     ,
-                ),
-                array(
+                ],
+                [
                     'two' => <<<'EOT'
 foo
 # bar
 baz
 EOT
                     ,
-                ),
-            ),
-        );
-        $tests[] = array($yaml, $expected);
+                ],
+            ],
+        ];
+        $tests[] = [$yaml, $expected];
 
         $yaml = <<<'EOT'
 foo:
@@ -1368,17 +1368,17 @@ public function getCommentLikeStringInScalarBlockData()
 # comment
     foobar: ~
 EOT;
-        $expected = array(
-            'foo' => array(
-                'bar' => array(
+        $expected = [
+            'foo' => [
+                'bar' => [
                     'scalar-block' => "line1 line2>\n",
-                ),
-                'baz' => array(
+                ],
+                'baz' => [
                     'foobar' => null,
-                ),
-            ),
-        );
-        $tests[] = array($yaml, $expected);
+                ],
+            ],
+        ];
+        $tests[] = [$yaml, $expected];
 
         $yaml = <<<'EOT'
 a:
@@ -1388,13 +1388,13 @@ public function getCommentLikeStringInScalarBlockData()
 #        second row
     d: hello
 EOT;
-        $expected = array(
-            'a' => array(
+        $expected = [
+            'a' => [
                 'b' => 'hello',
                 'd' => 'hello',
-            ),
-        );
-        $tests[] = array($yaml, $expected);
+            ],
+        ];
+        $tests[] = [$yaml, $expected];
 
         return $tests;
     }
@@ -1412,13 +1412,13 @@ public function testBlankLinesAreParsedAsNewLinesInFoldedBlocks()
 EOT;
 
         $this->assertSame(
-            array(
+            [
                 'test' => <<<'EOT'
 <h2>A heading</h2>
 <ul> <li>a list</li> <li>may be a good example</li> </ul>
 EOT
                 ,
-            ),
+            ],
             $this->parser->parse($yaml)
         );
     }
@@ -1436,7 +1436,7 @@ public function testAdditionallyIndentedLinesAreParsedAsNewLinesInFoldedBlocks()
 EOT;
 
         $this->assertSame(
-            array(
+            [
                 'test' => <<<'EOT'
 <h2>A heading</h2>
 <ul>
@@ -1445,7 +1445,7 @@ public function testAdditionallyIndentedLinesAreParsedAsNewLinesInFoldedBlocks()
 </ul>
 EOT
                 ,
-            ),
+            ],
             $this->parser->parse($yaml)
         );
     }
@@ -1455,28 +1455,28 @@ public function testAdditionallyIndentedLinesAreParsedAsNewLinesInFoldedBlocks()
      */
     public function testParseBinaryData($data)
     {
-        $this->assertSame(array('data' => 'Hello world'), $this->parser->parse($data));
+        $this->assertSame(['data' => 'Hello world'], $this->parser->parse($data));
     }
 
     public function getBinaryData()
     {
-        return array(
-            'enclosed with double quotes' => array('data: !!binary "SGVsbG8gd29ybGQ="'),
-            'enclosed with single quotes' => array("data: !!binary 'SGVsbG8gd29ybGQ='"),
-            'containing spaces' => array('data: !!binary  "SGVs bG8gd 29ybGQ="'),
-            'in block scalar' => array(
+        return [
+            'enclosed with double quotes' => ['data: !!binary "SGVsbG8gd29ybGQ="'],
+            'enclosed with single quotes' => ["data: !!binary 'SGVsbG8gd29ybGQ='"],
+            'containing spaces' => ['data: !!binary  "SGVs bG8gd 29ybGQ="'],
+            'in block scalar' => [
                 <<<'EOT'
 data: !!binary |
     SGVsbG8gd29ybGQ=
 EOT
-    ),
-            'containing spaces in block scalar' => array(
+    ],
+            'containing spaces in block scalar' => [
                 <<<'EOT'
 data: !!binary |
     SGVs bG8gd 29ybGQ=
 EOT
-    ),
-        );
+    ],
+        ];
     }
 
     /**
@@ -1496,44 +1496,44 @@ public function testParseInvalidBinaryData($data, $expectedMessage)
 
     public function getInvalidBinaryData()
     {
-        return array(
-            'length not a multiple of four' => array('data: !!binary "SGVsbG8d29ybGQ="', '/The normalized base64 encoded data \(data without whitespace characters\) length must be a multiple of four \(\d+ bytes given\)/'),
-            'invalid characters' => array('!!binary "SGVsbG8#d29ybGQ="', '/The base64 encoded data \(.*\) contains invalid characters/'),
-            'too many equals characters' => array('data: !!binary "SGVsbG8gd29yb==="', '/The base64 encoded data \(.*\) contains invalid characters/'),
-            'misplaced equals character' => array('data: !!binary "SGVsbG8gd29ybG=Q"', '/The base64 encoded data \(.*\) contains invalid characters/'),
-            'length not a multiple of four in block scalar' => array(
+        return [
+            'length not a multiple of four' => ['data: !!binary "SGVsbG8d29ybGQ="', '/The normalized base64 encoded data \(data without whitespace characters\) length must be a multiple of four \(\d+ bytes given\)/'],
+            'invalid characters' => ['!!binary "SGVsbG8#d29ybGQ="', '/The base64 encoded data \(.*\) contains invalid characters/'],
+            'too many equals characters' => ['data: !!binary "SGVsbG8gd29yb==="', '/The base64 encoded data \(.*\) contains invalid characters/'],
+            'misplaced equals character' => ['data: !!binary "SGVsbG8gd29ybG=Q"', '/The base64 encoded data \(.*\) contains invalid characters/'],
+            'length not a multiple of four in block scalar' => [
                 <<<'EOT'
 data: !!binary |
     SGVsbG8d29ybGQ=
 EOT
                 ,
                 '/The normalized base64 encoded data \(data without whitespace characters\) length must be a multiple of four \(\d+ bytes given\)/',
-            ),
-            'invalid characters in block scalar' => array(
+            ],
+            'invalid characters in block scalar' => [
                 <<<'EOT'
 data: !!binary |
     SGVsbG8#d29ybGQ=
 EOT
                 ,
                 '/The base64 encoded data \(.*\) contains invalid characters/',
-            ),
-            'too many equals characters in block scalar' => array(
+            ],
+            'too many equals characters in block scalar' => [
                 <<<'EOT'
 data: !!binary |
     SGVsbG8gd29yb===
 EOT
                 ,
                 '/The base64 encoded data \(.*\) contains invalid characters/',
-            ),
-            'misplaced equals character in block scalar' => array(
+            ],
+            'misplaced equals character in block scalar' => [
                 <<<'EOT'
 data: !!binary |
     SGVsbG8gd29ybG=Q
 EOT
                 ,
                 '/The base64 encoded data \(.*\) contains invalid characters/',
-            ),
-        );
+            ],
+        ];
     }
 
     public function testParseDateAsMappingValue()
@@ -1546,7 +1546,7 @@ public function testParseDateAsMappingValue()
         $expectedDate->setDate(2002, 12, 14);
         $expectedDate->setTime(0, 0, 0);
 
-        $this->assertEquals(array('date' => $expectedDate), $this->parser->parse($yaml, Yaml::PARSE_DATETIME));
+        $this->assertEquals(['date' => $expectedDate], $this->parser->parse($yaml, Yaml::PARSE_DATETIME));
     }
 
     /**
@@ -1568,8 +1568,8 @@ public function testParserThrowsExceptionWithCorrectLineNumber($lineNumber, $yam
 
     public function parserThrowsExceptionWithCorrectLineNumberProvider()
     {
-        return array(
-            array(
+        return [
+            [
                 4,
                 <<<'YAML'
 foo:
@@ -1577,8 +1577,8 @@ public function parserThrowsExceptionWithCorrectLineNumberProvider()
         # bar
         bar: "123",
 YAML
-            ),
-            array(
+            ],
+            [
                 5,
                 <<<'YAML'
 foo:
@@ -1587,8 +1587,8 @@ public function parserThrowsExceptionWithCorrectLineNumberProvider()
         # bar
         bar: "123",
 YAML
-            ),
-            array(
+            ],
+            [
                 8,
                 <<<'YAML'
 foo:
@@ -1600,8 +1600,8 @@ public function parserThrowsExceptionWithCorrectLineNumberProvider()
         # bar
         bar: "123",
 YAML
-            ),
-            array(
+            ],
+            [
                 10,
                 <<<'YAML'
 foo:
@@ -1615,8 +1615,8 @@ public function parserThrowsExceptionWithCorrectLineNumberProvider()
         # bar
         bar: "123",
 YAML
-            ),
-        );
+            ],
+        ];
     }
 
     public function testParseMultiLineQuotedString()
@@ -1629,7 +1629,7 @@ public function testParseMultiLineQuotedString()
 bar: baz
 EOT;
 
-        $this->assertSame(array('foo' => 'bar baz foobar foo', 'bar' => 'baz'), $this->parser->parse($yaml));
+        $this->assertSame(['foo' => 'bar baz foobar foo', 'bar' => 'baz'], $this->parser->parse($yaml));
     }
 
     public function testMultiLineQuotedStringWithTrailingBackslash()
@@ -1640,7 +1640,7 @@ public function testMultiLineQuotedStringWithTrailingBackslash()
     bar"
 YAML;
 
-        $this->assertSame(array('foobar' => 'foobar'), $this->parser->parse($yaml));
+        $this->assertSame(['foobar' => 'foobar'], $this->parser->parse($yaml));
     }
 
     public function testCommentCharactersInMultiLineQuotedStrings()
@@ -1651,12 +1651,12 @@ public function testCommentCharactersInMultiLineQuotedStrings()
       #bar'
     bar: baz
 YAML;
-        $expected = array(
-            'foo' => array(
+        $expected = [
+            'foo' => [
                 'foobar' => 'foo #bar',
                 'bar' => 'baz',
-            ),
-        );
+            ],
+        ];
 
         $this->assertSame($expected, $this->parser->parse($yaml));
     }
@@ -1668,9 +1668,9 @@ public function testBlankLinesInQuotedMultiLineString()
 
     bar'
 YAML;
-        $expected = array(
+        $expected = [
             'foobar' => "foo\nbar",
-        );
+        ];
 
         $this->assertSame($expected, $this->parser->parse($yaml));
     }
@@ -1685,7 +1685,7 @@ public function testParseMultiLineUnquotedString()
 bar: baz
 EOT;
 
-        $this->assertSame(array('foo' => 'bar baz foobar foo', 'bar' => 'baz'), $this->parser->parse($yaml));
+        $this->assertSame(['foo' => 'bar baz foobar foo', 'bar' => 'baz'], $this->parser->parse($yaml));
     }
 
     public function testParseMultiLineString()
@@ -1703,7 +1703,7 @@ public function testParseMultiLineMappingValue($yaml, $expected, $parseError)
 
     public function multiLineDataProvider()
     {
-        $tests = array();
+        $tests = [];
 
         $yaml = <<<'EOF'
 foo:
@@ -1713,15 +1713,15 @@ public function multiLineDataProvider()
     two
     three
 EOF;
-        $expected = array(
-            'foo' => array(
-                array(
+        $expected = [
+            'foo' => [
+                [
                     'bar' => "one\ntwo three",
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
 
-        $tests[] = array($yaml, $expected, false);
+        $tests[] = [$yaml, $expected, false];
 
         $yaml = <<<'EOF'
 bar
@@ -1729,7 +1729,7 @@ public function multiLineDataProvider()
 EOF;
         $expected = 'bar "foo"';
 
-        $tests[] = array($yaml, $expected, false);
+        $tests[] = [$yaml, $expected, false];
 
         $yaml = <<<'EOF'
 bar
@@ -1737,7 +1737,7 @@ public function multiLineDataProvider()
 EOF;
         $expected = 'bar "foo';
 
-        $tests[] = array($yaml, $expected, false);
+        $tests[] = [$yaml, $expected, false];
 
         $yaml = <<<'EOF'
 bar
@@ -1746,7 +1746,7 @@ public function multiLineDataProvider()
 EOF;
         $expected = "bar\n'foo'";
 
-        $tests[] = array($yaml, $expected, false);
+        $tests[] = [$yaml, $expected, false];
 
         $yaml = <<<'EOF'
 bar
@@ -1755,14 +1755,14 @@ public function multiLineDataProvider()
 EOF;
         $expected = "bar\nfoo'";
 
-        $tests[] = array($yaml, $expected, false);
+        $tests[] = [$yaml, $expected, false];
 
         return $tests;
     }
 
     public function testTaggedInlineMapping()
     {
-        $this->assertEquals(new TaggedValue('foo', array('foo' => 'bar')), $this->parser->parse('!foo {foo: bar}', Yaml::PARSE_CUSTOM_TAGS));
+        $this->assertEquals(new TaggedValue('foo', ['foo' => 'bar']), $this->parser->parse('!foo {foo: bar}', Yaml::PARSE_CUSTOM_TAGS));
     }
 
     /**
@@ -1895,7 +1895,7 @@ private function loadTestsFromFixtureFiles($testsFile)
     {
         $parser = new Parser();
 
-        $tests = array();
+        $tests = [];
         $files = $parser->parseFile(__DIR__.'/Fixtures/'.$testsFile);
         foreach ($files as $file) {
             $yamls = file_get_contents(__DIR__.'/Fixtures/'.$file.'.yml');
@@ -1923,7 +1923,7 @@ private function loadTestsFromFixtureFiles($testsFile)
     public function testCanParseVeryLongValue()
     {
         $longStringWithSpaces = str_repeat('xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ', 20000);
-        $trickyVal = array('x' => $longStringWithSpaces);
+        $trickyVal = ['x' => $longStringWithSpaces];
 
         $yamlString = Yaml::dump($trickyVal);
         $arrayFromYaml = $this->parser->parse($yamlString);
@@ -1961,16 +1961,16 @@ public function testPhpConstantTagMappingKey()
             - !php/const 'Symfony\Component\Yaml\Tests\B::BAR'
         to: !php/const 'Symfony\Component\Yaml\Tests\B::BAZ'
 YAML;
-        $expected = array(
-            'transitions' => array(
-                'foo' => array(
-                    'from' => array(
+        $expected = [
+            'transitions' => [
+                'foo' => [
+                    'from' => [
                         'bar',
-                    ),
+                    ],
                     'to' => 'baz',
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
 
         $this->assertSame($expected, $this->parser->parse($yaml, Yaml::PARSE_CONSTANT));
     }
@@ -2047,23 +2047,23 @@ public function testMergeKeysWhenMappingsAreParsedAsObjects()
     bar: ~
     <<: [*FOO, *BAR]
 YAML;
-        $expected = (object) array(
-            'foo' => (object) array(
+        $expected = (object) [
+            'foo' => (object) [
                 'bar' => 1,
-            ),
-            'bar' => (object) array(
+            ],
+            'bar' => (object) [
                 'baz' => 2,
                 'bar' => 1,
-            ),
-            'baz' => (object) array(
+            ],
+            'baz' => (object) [
                 'baz_foo' => 3,
                 'baz_bar' => 4,
-            ),
-            'foobar' => (object) array(
+            ],
+            'foobar' => (object) [
                 'bar' => null,
                 'baz' => 2,
-            ),
-        );
+            ],
+        ];
 
         $this->assertEquals($expected, $this->parser->parse($yaml, Yaml::PARSE_OBJECT_FOR_MAP));
     }
@@ -2121,18 +2121,18 @@ public function testParseReferencesOnMergeKeys()
     d: quux
     <<: *quux
 YAML;
-        $expected = array(
-            'mergekeyrefdef' => array(
+        $expected = [
+            'mergekeyrefdef' => [
                 'a' => 'foo',
                 'b' => 'bar',
                 'c' => 'baz',
-            ),
-            'mergekeyderef' => array(
+            ],
+            'mergekeyderef' => [
                 'd' => 'quux',
                 'b' => 'bar',
                 'c' => 'baz',
-            ),
-        );
+            ],
+        ];
 
         $this->assertSame($expected, $this->parser->parse($yaml));
     }
@@ -2149,18 +2149,18 @@ public function testParseReferencesOnMergeKeysWithMappingsParsedAsObjects()
     d: quux
     <<: *quux
 YAML;
-        $expected = (object) array(
-            'mergekeyrefdef' => (object) array(
+        $expected = (object) [
+            'mergekeyrefdef' => (object) [
                 'a' => 'foo',
                 'b' => 'bar',
                 'c' => 'baz',
-            ),
-            'mergekeyderef' => (object) array(
+            ],
+            'mergekeyderef' => (object) [
                 'd' => 'quux',
                 'b' => 'bar',
                 'c' => 'baz',
-            ),
-        );
+            ],
+        ];
 
         $this->assertEquals($expected, $this->parser->parse($yaml, Yaml::PARSE_OBJECT_FOR_MAP));
     }
@@ -2187,7 +2187,7 @@ public function testParseIndentedMappings($yaml, $expected)
 
     public function indentedMappingData()
     {
-        $tests = array();
+        $tests = [];
 
         $yaml = <<<YAML
 foo:
@@ -2195,15 +2195,15 @@ public function indentedMappingData()
     # A comment
     baz: "foobaz"
 YAML;
-        $expected = array(
-            'foo' => array(
-                array(
+        $expected = [
+            'foo' => [
+                [
                     'bar' => 'foobar',
                     'baz' => 'foobaz',
-                ),
-            ),
-        );
-        $tests['comment line is first line in indented block'] = array($yaml, $expected);
+                ],
+            ],
+        ];
+        $tests['comment line is first line in indented block'] = [$yaml, $expected];
 
         $yaml = <<<YAML
 foo:
@@ -2211,42 +2211,42 @@ public function indentedMappingData()
         # comment
         baz: [1, 2, 3]
 YAML;
-        $expected = array(
-            'foo' => array(
-                array(
-                    'bar' => array(
-                        'baz' => array(1, 2, 3),
-                    ),
-                ),
-            ),
-        );
-        $tests['mapping value on new line starting with a comment line'] = array($yaml, $expected);
+        $expected = [
+            'foo' => [
+                [
+                    'bar' => [
+                        'baz' => [1, 2, 3],
+                    ],
+                ],
+            ],
+        ];
+        $tests['mapping value on new line starting with a comment line'] = [$yaml, $expected];
 
         $yaml = <<<YAML
 foo:
   -
     bar: foobar
 YAML;
-        $expected = array(
-            'foo' => array(
-                array(
+        $expected = [
+            'foo' => [
+                [
                     'bar' => 'foobar',
-                ),
-            ),
-        );
-        $tests['mapping in sequence starting on a new line'] = array($yaml, $expected);
+                ],
+            ],
+        ];
+        $tests['mapping in sequence starting on a new line'] = [$yaml, $expected];
 
         $yaml = <<<YAML
 foo:
 
     bar: baz
 YAML;
-        $expected = array(
-            'foo' => array(
+        $expected = [
+            'foo' => [
                 'bar' => 'baz',
-            ),
-        );
-        $tests['blank line at the beginning of an indented mapping value'] = array($yaml, $expected);
+            ],
+        ];
+        $tests['blank line at the beginning of an indented mapping value'] = [$yaml, $expected];
 
         return $tests;
     }
diff --git a/src/Symfony/Component/Yaml/Tests/YamlTest.php b/src/Symfony/Component/Yaml/Tests/YamlTest.php
index 3f6c2525f755c..5a792c51160a1 100644
--- a/src/Symfony/Component/Yaml/Tests/YamlTest.php
+++ b/src/Symfony/Component/Yaml/Tests/YamlTest.php
@@ -18,7 +18,7 @@ class YamlTest extends TestCase
 {
     public function testParseAndDump()
     {
-        $data = array('lorem' => 'ipsum', 'dolor' => 'sit');
+        $data = ['lorem' => 'ipsum', 'dolor' => 'sit'];
         $yml = Yaml::dump($data);
         $parsed = Yaml::parse($yml);
         $this->assertEquals($data, $parsed);
@@ -30,7 +30,7 @@ public function testParseAndDump()
      */
     public function testZeroIndentationThrowsException()
     {
-        Yaml::dump(array('lorem' => 'ipsum', 'dolor' => 'sit'), 2, 0);
+        Yaml::dump(['lorem' => 'ipsum', 'dolor' => 'sit'], 2, 0);
     }
 
     /**
@@ -39,6 +39,6 @@ public function testZeroIndentationThrowsException()
      */
     public function testNegativeIndentationThrowsException()
     {
-        Yaml::dump(array('lorem' => 'ipsum', 'dolor' => 'sit'), 2, -4);
+        Yaml::dump(['lorem' => 'ipsum', 'dolor' => 'sit'], 2, -4);
     }
 }