Merge branch '3.4' into 4.1

* 3.4: Use the short array syntax notation in all examples
hhamon · Jan 15, 2019 · f2e6e1a · f2e6e1a
2 parents f29fc98 + a0d0c83
commit f2e6e1a
Show file tree

Hide file tree

Showing 307 changed files with 2,579 additions and 2,476 deletions.
diff --git a/best_practices/business-logic.rst b/best_practices/business-logic.rst
@@ -232,7 +232,6 @@ Then, this bundle is enabled automatically, but only for the ``dev`` and
 ``test`` environments::
 
     // config/bundles.php
-
     return [
         // ...
         Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],

diff --git a/bundles/best_practices.rst b/bundles/best_practices.rst
@@ -317,10 +317,10 @@ following standardized instructions in your ``README.md`` file.
         {
             public function registerBundles()
             {
-                $bundles = array(
+                $bundles = [
                     // ...
                     new <vendor>\<bundle-name>\<bundle-long-name>(),
-                );
+                ];
 
                 // ...
             }
@@ -375,11 +375,11 @@ following standardized instructions in your ``README.md`` file.
             {
                 public function registerBundles()
                 {
-                    $bundles = array(
+                    $bundles = [
                         // ...
 
                         new <vendor>\<bundle-name>\<bundle-long-name>(),
-                    );
+                    ];
 
                     // ...
                 }

diff --git a/bundles/configuration.rst b/bundles/configuration.rst
@@ -40,9 +40,9 @@ as integration of other related components:
 
     .. code-block:: php
 
-        $container->loadFromExtension('framework', array(
+        $container->loadFromExtension('framework', [
             'form' => true,
-        ));
+        ]);
 
 Using the Bundle Extension
 --------------------------
@@ -81,10 +81,10 @@ allow users to configure it with some configuration that looks like this:
     .. code-block:: php
 
         // config/packages/acme_social.php
-        $container->loadFromExtension('acme_social', array(
+        $container->loadFromExtension('acme_social', [
             'client_id'     => 123,
             'client_secret' => 'your_secret',
-        ));
+        ]);
 
 The basic idea is that instead of having the user override individual
 parameters, you let the user configure just a few, specifically created,
@@ -129,36 +129,36 @@ automatically converts XML and YAML to an array).
 For the configuration example in the previous section, the array passed to your
 ``load()`` method will look like this::
 
-    array(
-        array(
-            'twitter' => array(
+    [
+        [
+            'twitter' => [
                 'client_id' => 123,
                 'client_secret' => 'your_secret',
-            ),
-        ),
-    )
+            ],
+        ],
+    ]
 
 Notice that this is an *array of arrays*, not just a single flat array of the
 configuration values. This is intentional, as it allows Symfony to parse several
 configuration resources. For example, if ``acme_social`` appears in another
 configuration file - say ``config/packages/dev/acme_social.yaml`` - with
 different values beneath it, the incoming array might look like this::
 
-    array(
+    [
         // values from config/packages/acme_social.yaml
-        array(
-            'twitter' => array(
+        [
+            'twitter' => [
                 'client_id' => 123,
                 'client_secret' => 'your_secret',
-            ),
-        ),
+            ],
+        ],
         // values from config/packages/dev/acme_social.yaml
-        array(
-            'twitter' => array(
+        [
+            'twitter' => [
                 'client_id' => 456,
-            ),
-        ),
-    )
+            ],
+        ],
+    ]
 
 The order of the two arrays depends on which one is set first.
 
@@ -304,7 +304,7 @@ In your extension, you can load this and dynamically set its arguments::
 
         public function load(array $configs, ContainerBuilder $container)
         {
-            $config = array();
+            $config = [];
             // let resources override the previous set value
             foreach ($configs as $subConfig) {
                 $config = array_merge($config, $subConfig);

diff --git a/bundles/extension.rst b/bundles/extension.rst
@@ -126,14 +126,14 @@ performance. Define the list of annotated classes to compile in the
     {
         // ...
 
-        $this->addAnnotatedClassesToCompile(array(
+        $this->addAnnotatedClassesToCompile([
             // you can define the fully qualified class names...
             'App\\Controller\\DefaultController',
             // ... but glob patterns are also supported:
             '**Bundle\\Controller\\',
 
             // ...
-        ));
+        ]);
     }
 
 .. note::

diff --git a/bundles/prepend_extension.rst b/bundles/prepend_extension.rst
@@ -63,7 +63,7 @@ in case a specific other bundle is not registered::
         // determine if AcmeGoodbyeBundle is registered
         if (!isset($bundles['AcmeGoodbyeBundle'])) {
             // disable AcmeGoodbyeBundle in bundles
-            $config = array('use_acme_goodbye' => false);
+            $config = ['use_acme_goodbye' => false];
             foreach ($container->getExtensions() as $name => $extension) {
                 switch ($name) {
                     case 'acme_something':
@@ -89,7 +89,7 @@ in case a specific other bundle is not registered::
         // check if entity_manager_name is set in the "acme_hello" configuration
         if (isset($config['entity_manager_name'])) {
             // prepend the acme_something settings with the entity_manager_name
-            $config = array('entity_manager_name' => $config['entity_manager_name']);
+            $config = ['entity_manager_name' => $config['entity_manager_name']];
             $container->prependExtensionConfig('acme_something', $config);
         }
     }
@@ -135,15 +135,15 @@ registered and the ``entity_manager_name`` setting for ``acme_hello`` is set to
     .. code-block:: php
 
         // config/packages/acme_something.php
-        $container->loadFromExtension('acme_something', array(
+        $container->loadFromExtension('acme_something', [
             // ...
             'use_acme_goodbye' => false,
             'entity_manager_name' => 'non_default',
-        ));
-        $container->loadFromExtension('acme_other', array(
+        ]);
+        $container->loadFromExtension('acme_other', [
             // ...
             'use_acme_goodbye' => false,
-        ));
+        ]);
 
 More than one Bundle using PrependExtensionInterface
 ----------------------------------------------------

diff --git a/components/asset.rst b/components/asset.rst
@@ -292,10 +292,10 @@ constructor::
     use Symfony\Component\Asset\UrlPackage;
     // ...
 
-    $urls = array(
+    $urls = [
         '//static1.example.com/images/',
         '//static2.example.com/images/',
-    );
+    ];
     $urlPackage = new UrlPackage($urls, new StaticVersionStrategy('v1'));
 
     echo $urlPackage->getUrl('/logo.png');
@@ -320,7 +320,7 @@ protocol-relative URLs for HTTPs requests, any base URL for HTTP requests)::
     // ...
 
     $urlPackage = new UrlPackage(
-        array('http://example.com/', 'https://example.com/'),
+        ['http://example.com/', 'https://example.com/'],
         new StaticVersionStrategy('v1'),
         new RequestStackContext($requestStack)
     );
@@ -350,10 +350,10 @@ they all have different base paths::
 
     $defaultPackage = new Package($versionStrategy);
 
-    $namedPackages = array(
+    $namedPackages = [
         'img' => new UrlPackage('http://img.example.com/', $versionStrategy),
         'doc' => new PathPackage('/somewhere/deep/for/documents', $versionStrategy),
-    );
+    ];
 
     $packages = new Packages($defaultPackage, $namedPackages);
 

diff --git a/components/browser_kit.rst b/components/browser_kit.rst
@@ -220,7 +220,7 @@ into the client constructor::
     $cookieJar->set($cookie);
 
     // create a client and set the cookies
-    $client = new Client(array(), null, $cookieJar);
+    $client = new Client([], null, $cookieJar);
     // ...
 
 History

diff --git a/components/cache.rst b/components/cache.rst
@@ -85,20 +85,20 @@ Now you can create, retrieve, update and delete items using this object::
 
 You can also work with multiple items at once::
 
-    $cache->setMultiple(array(
+    $cache->setMultiple([
         'stats.products_count' => 4711,
         'stats.users_count' => 1356,
-    ));
+    ]);
 
-    $stats = $cache->getMultiple(array(
+    $stats = $cache->getMultiple([
         'stats.products_count',
         'stats.users_count',
-    ));
+    ]);
 
-    $cache->deleteMultiple(array(
+    $cache->deleteMultiple([
         'stats.products_count',
         'stats.users_count',
-    ));
+    ]);
 
 Available Simple Cache (PSR-16) Classes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/components/cache/adapters/chain_adapter.rst b/components/cache/adapters/chain_adapter.rst
@@ -17,14 +17,14 @@ lifetime as its constructor arguments::
 
     use Symfony\Component\Cache\Adapter\ApcuAdapter;
 
-    $cache = new ChainAdapter(array(
+    $cache = new ChainAdapter([
 
         // The ordered list of adapters used to fetch cached items
         array $adapters,
 
         // The max lifetime of items propagated from lower adapters to upper ones
         $maxLifetime = 0
-    ));
+    ]);
 
 .. note::
 
@@ -40,10 +40,10 @@ slowest storage engines, :class:`Symfony\\Component\\Cache\\Adapter\\ApcuAdapter
     use Symfony\Component\Cache\Adapter\ChainAdapter;
     use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 
-    $cache = new ChainAdapter(array(
+    $cache = new ChainAdapter([
         new ApcuAdapter(),
         new FilesystemAdapter(),
-    ));
+    ]);
 
 When calling this adapter's :method:`Symfony\\Component\\Cache\\ChainAdapter::prune` method,
 the call is delegated to all its compatible cache adapters. It is safe to mix both adapters
@@ -54,10 +54,10 @@ incompatible adapters are silently ignored::
     use Symfony\Component\Cache\Adapter\ChainAdapter;
     use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 
-    $cache = new ChainAdapter(array(
+    $cache = new ChainAdapter([
         new ApcuAdapter(),        // does NOT implement PruneableInterface
         new FilesystemAdapter(),  // DOES implement PruneableInterface
-    ));
+    ]);
 
     // prune will proxy the call to FilesystemAdapter while silently skipping ApcuAdapter
     $cache->prune();

diff --git a/components/cache/adapters/memcached_adapter.rst b/components/cache/adapters/memcached_adapter.rst
@@ -57,12 +57,12 @@ helper method allows creating and configuring a `Memcached`_ class instance usin
     );
 
     // pass an array of DSN strings to register multiple servers with the client
-    $client = MemcachedAdapter::createConnection(array(
+    $client = MemcachedAdapter::createConnection([
         'memcached://10.0.0.100',
         'memcached://10.0.0.101',
         'memcached://10.0.0.102',
         // etc...
-    ));
+    ]);
 
 The `Data Source Name (DSN)`_ for this adapter must use the following format:
 
@@ -81,7 +81,7 @@ Below are common examples of valid DSNs showing a combination of available value
 
     use Symfony\Component\Cache\Adapter\MemcachedAdapter;
 
-    $client = MemcachedAdapter::createConnection(array(
+    $client = MemcachedAdapter::createConnection([
         // hostname + port
         'memcached://my.server.com:11211'
 
@@ -96,7 +96,7 @@ Below are common examples of valid DSNs showing a combination of available value
 
         // socket instead of hostname/IP + weight
         'memcached:///var/run/memcached.sock?weight=20'
-    ));
+    ]);
 
 Configure the Options
 ---------------------
@@ -110,14 +110,14 @@ option names and their respective values::
 
     $client = MemcachedAdapter::createConnection(
         // a DSN string or an array of DSN strings
-        array(),
+        [],
 
         // associative array of configuration options
-        array(
+        [
             'compression' => true,
             'libketama_compatible' => true,
             'serializer' => 'igbinary',
-         )
+        ]
     );
 
 Available Options

diff --git a/components/cache/adapters/pdo_doctrine_dbal_adapter.rst b/components/cache/adapters/pdo_doctrine_dbal_adapter.rst
@@ -28,7 +28,7 @@ third, and forth parameters::
         $defaultLifetime = 0,
 
         // an array of options for configuring the database table and connection
-        $options = array()
+        $options = []
     );
 
 .. tip::

diff --git a/components/cache/adapters/php_array_cache_adapter.rst b/components/cache/adapters/php_array_cache_adapter.rst
@@ -14,10 +14,10 @@ that is optimized and preloaded into OPcache memory storage::
     // somehow, decide it's time to warm up the cache!
     if ($needsWarmup) {
         // some static values
-        $values = array(
+        $values = [
             'stats.products_count' => 4711,
             'stats.users_count' => 1356,
-        );
+        ];
 
         $cache = new PhpArrayAdapter(
             // single file where values are cached

diff --git a/components/cache/adapters/php_files_adapter.rst b/components/cache/adapters/php_files_adapter.rst
@@ -10,22 +10,22 @@ Php Files Cache Adapter
 Similarly to :ref:`Filesystem Adapter <component-cache-filesystem-adapter>`, this cache
 implementation writes cache entries out to disk, but unlike the Filesystem cache adapter,
 the PHP Files cache adapter writes and reads back these cache files *as native PHP code*.
-For example, caching the value ``array('my', 'cached', 'array')`` will write out a cache
+For example, caching the value ``['my', 'cached', 'array']`` will write out a cache
 file similar to the following::
 
-    <?php return array(
+    <?php return [
 
         // the cache item expiration
         0 => 9223372036854775807,
 
         // the cache item contents
-        1 => array (
+        1 => [
             0 => 'my',
             1 => 'cached',
             2 => 'array',
-        ),
+        ],
 
-    );
+    ];
 
 .. note::