Merge branch '3.4' into 4.2

* 3.4:
  fix indention

Author: javiereguiluz

bundles/configuration.rst

@@ -71,11 +71,11 @@ can add some configuration that looks like this:
             xsi:schemaLocation="http://symfony.com/schema/dic/services
                 https://symfony.com/schema/dic/services/services-1.0.xsd">
 
-           <acme-social:config>
-               <acme-social:twitter client-id="123" client-secret="your_secret"/>
-           </acme-social:config>
+            <acme-social:config>
+                <acme-social:twitter client-id="123" client-secret="your_secret"/>
+            </acme-social:config>
 
-           <!-- ... -->
+            <!-- ... -->
         </container>
 
     .. code-block:: php

components/cache/adapters/proxy_adapter.rst

@@ -18,8 +18,9 @@ and optionally a namespace and default cache lifetime as its second and third pa
     use Psr\Cache\CacheItemPoolInterface;
     use Symfony\Component\Cache\Adapter\ProxyAdapter;
 
-    $psr6CachePool = \\ create your own cache pool instance that implements the PSR-6
-                     \\ interface `CacheItemPoolInterface`
+    \\ create your own cache pool instance that implements the PSR-6
+    \\ interface `CacheItemPoolInterface`
+    $psr6CachePool = ...
 
     $cache = new ProxyAdapter(
 

components/console/console_arguments.rst

@@ -39,7 +39,7 @@ Have a look at the following command that has three options::
 
         protected function execute(InputInterface $input, OutputInterface $output)
         {
-           // ...
+            // ...
         }
     }
 

components/console/single_command_tool.rst

@@ -8,44 +8,44 @@ When building a command line tool, you may not need to provide several commands.
 In such case, having to pass the command name each time is tedious. Fortunately,
 it is possible to remove this need by declaring a single command application::
 
-  #!/usr/bin/env php
-  <?php
-  require __DIR__.'/vendor/autoload.php';
-
-  use Symfony\Component\Console\Application;
-  use Symfony\Component\Console\Input\InputArgument;
-  use Symfony\Component\Console\Input\InputInterface;
-  use Symfony\Component\Console\Input\InputOption;
-  use Symfony\Component\Console\Output\OutputInterface;
-
-  (new Application('echo', '1.0.0'))
-    ->register('echo')
-        ->addArgument('foo', InputArgument::OPTIONAL, 'The directory')
-        ->addOption('bar', null, InputOption::VALUE_REQUIRED)
-        ->setCode(function(InputInterface $input, OutputInterface $output) {
-            // output arguments and options
-        })
-    ->getApplication()
-    ->setDefaultCommand('echo', true) // Single command application
-    ->run();
+    #!/usr/bin/env php
+    <?php
+    require __DIR__.'/vendor/autoload.php';
+
+    use Symfony\Component\Console\Application;
+    use Symfony\Component\Console\Input\InputArgument;
+    use Symfony\Component\Console\Input\InputInterface;
+    use Symfony\Component\Console\Input\InputOption;
+    use Symfony\Component\Console\Output\OutputInterface;
+
+    (new Application('echo', '1.0.0'))
+      ->register('echo')
+          ->addArgument('foo', InputArgument::OPTIONAL, 'The directory')
+          ->addOption('bar', null, InputOption::VALUE_REQUIRED)
+          ->setCode(function(InputInterface $input, OutputInterface $output) {
+              // output arguments and options
+          })
+      ->getApplication()
+      ->setDefaultCommand('echo', true) // Single command application
+      ->run();
 
 The method :method:`Symfony\\Component\\Console\\Application::setDefaultCommand`
 accepts a boolean as second parameter. If true, the command ``echo`` will then
 always be used, without having to pass its name.
 
 You can still register a command as usual::
 
-  #!/usr/bin/env php
-  <?php
-  require __DIR__.'/vendor/autoload.php';
+    #!/usr/bin/env php
+    <?php
+    require __DIR__.'/vendor/autoload.php';
 
-  use Acme\Command\DefaultCommand;
-  use Symfony\Component\Console\Application;
+    use Acme\Command\DefaultCommand;
+    use Symfony\Component\Console\Application;
 
-  $application = new Application('echo', '1.0.0');
-  $command = new DefaultCommand();
+    $application = new Application('echo', '1.0.0');
+    $command = new DefaultCommand();
 
-  $application->add($command);
+    $application->add($command);
 
-  $application->setDefaultCommand($command->getName(), true);
-  $application->run();
+    $application->setDefaultCommand($command->getName(), true);
+    $application->run();

components/dependency_injection/compilation.rst

@@ -325,7 +325,7 @@ compilation::
     {
         public function process(ContainerBuilder $container)
         {
-           // ... do something during the compilation
+            // ... do something during the compilation
         }
 
         // ...
@@ -379,7 +379,7 @@ class implementing the ``CompilerPassInterface``::
     {
         public function process(ContainerBuilder $container)
         {
-           // ... do something during the compilation
+            // ... do something during the compilation
         }
     }
 

components/dom_crawler.rst

@@ -239,7 +239,7 @@ context of the crawler::
         // DO THIS: specify the parent tag too
         $subCrawler = $parentCrawler->filterXPath('parent/sub-tag/sub-child-tag');
         $subCrawler = $parentCrawler->filterXPath('node()/sub-tag/sub-child-tag');
-  });
+    });
 
 Adding the Content
 ~~~~~~~~~~~~~~~~~~
@@ -333,30 +333,30 @@ This behavior is best illustrated with examples::
 
     $crawler->filterXPath('//span[contains(@id, "article-")]')->evaluate('substring-after(@id, "-")');
     /* array:3 [
-         0 => "100"
-         1 => "101"
-         2 => "102"
-       ]
+        0 => "100",
+        1 => "101",
+        2 => "102",
+    ]
      */
 
     $crawler->evaluate('substring-after(//span[contains(@id, "article-")]/@id, "-")');
     /* array:1 [
-         0 => "100"
-       ]
+        0 => "100",
+    ]
      */
 
     $crawler->filterXPath('//span[@class="article"]')->evaluate('count(@id)');
     /* array:3 [
-         0 => 1.0
-         1 => 1.0
-         2 => 1.0
-       ]
+        0 => 1.0,
+        1 => 1.0,
+        2 => 1.0,
+    ]
      */
 
     $crawler->evaluate('count(//span[@class="article"])');
     /* array:1 [
-         0 => 3.0
-       ]
+        0 => 3.0,
+    ]
      */
 
     $crawler->evaluate('//span[1]');

components/serializer.rst

@@ -1032,11 +1032,11 @@ because it is deeper than the configured maximum depth of 2::
     $result = [
         'foo' => 'level1',
         'child' => [
-                'foo' => 'level2',
-                'child' => [
-                        'child' => null,
-                    ],
+            'foo' => 'level2',
+            'child' => [
+                'child' => null,
             ],
+        ],
     ];
     */
 
@@ -1294,7 +1294,7 @@ parameter of the ``ObjectNormalizer``::
 
     $obj = $serializer->denormalize(
         ['inner' => ['foo' => 'foo', 'bar' => 'bar'], 'date' => '1988/01/21'],
-         'Acme\ObjectOuter'
+        'Acme\ObjectOuter'
     );
 
     dump($obj->getInner()->foo); // 'foo'

components/web_link.rst

@@ -22,16 +22,16 @@ Usage
 
 The following example shows the component in action::
 
-   use Fig\Link\GenericLinkProvider;
-   use Fig\Link\Link;
-   use Symfony\Component\WebLink\HttpHeaderSerializer;
+    use Fig\Link\GenericLinkProvider;
+    use Fig\Link\Link;
+    use Symfony\Component\WebLink\HttpHeaderSerializer;
 
-   $linkProvider = (new GenericLinkProvider())
-       ->withLink(new Link('preload', '/bootstrap.min.css'));
+    $linkProvider = (new GenericLinkProvider())
+        ->withLink(new Link('preload', '/bootstrap.min.css'));
 
-   header('Link: '.(new HttpHeaderSerializer())->serialize($linkProvider->getLinks()));
+    header('Link: '.(new HttpHeaderSerializer())->serialize($linkProvider->getLinks()));
 
-   echo 'Hello';
+    echo 'Hello';
 
 Read the full :doc:`WebLink documentation </web_link>` to learn about all the
 features of the component and its integration with the Symfony framework.

configuration/environment_variables.rst

@@ -90,7 +90,7 @@ whenever the corresponding environment variable is *not* found:
             <parameters>
                 <parameter key="env(DATABASE_HOST)">localhost</parameter>
             </parameters>
-         </container>
+        </container>
 
     .. code-block:: php
 

console/commands_as_services.rst

@@ -104,7 +104,7 @@ Or set the ``command`` attribute on the ``console.command`` tag in your service
 
             <services>
                 <service id="App\Command\SunshineCommand">
-                     <tag name="console.command" command="app:sunshine"/>
+                    <tag name="console.command" command="app:sunshine"/>
                 </service>
             </services>
         </container>

create_framework/routing.rst

@@ -95,25 +95,25 @@ The ``match()`` method takes a request path and returns an array of attributes
 
     print_r($matcher->match('/bye'));
     /* Gives:
-    array (
-      '_route' => 'bye',
-    );
+    [
+        '_route' => 'bye',
+    ];
     */
 
     print_r($matcher->match('/hello/Fabien'));
     /* Gives:
-    array (
-      'name' => 'Fabien',
-      '_route' => 'hello',
-    );
+    [
+        'name' => 'Fabien',
+        '_route' => 'hello',
+    ];
     */
 
     print_r($matcher->match('/hello'));
     /* Gives:
-    array (
-      'name' => 'World',
-      '_route' => 'hello',
-    );
+    [
+        'name' => 'World',
+        '_route' => 'hello',
+    ];
     */
 
 .. note::
@@ -165,23 +165,23 @@ There are a few new things in the code:
 
 * Request attributes are extracted to keep our templates simple::
 
-      <!-- example.com/src/pages/hello.php -->
-      Hello <?= htmlspecialchars($name, ENT_QUOTES, 'UTF-8') ?>
+    // example.com/src/pages/hello.php
+    Hello <?= htmlspecialchars($name, ENT_QUOTES, 'UTF-8') ?>
 
 * Route configuration has been moved to its own file::
 
-      // example.com/src/app.php
-      use Symfony\Component\Routing;
+    // example.com/src/app.php
+    use Symfony\Component\Routing;
 
-      $routes = new Routing\RouteCollection();
-      $routes->add('hello', new Routing\Route('/hello/{name}', ['name' => 'World']));
-      $routes->add('bye', new Routing\Route('/bye'));
+    $routes = new Routing\RouteCollection();
+    $routes->add('hello', new Routing\Route('/hello/{name}', ['name' => 'World']));
+    $routes->add('bye', new Routing\Route('/bye'));
 
-      return $routes;
+    return $routes;
 
-  We now have a clear separation between the configuration (everything
-  specific to our application in ``app.php``) and the framework (the generic
-  code that powers our application in ``front.php``).
+We now have a clear separation between the configuration (everything
+specific to our application in ``app.php``) and the framework (the generic
+code that powers our application in ``front.php``).
 
 With less than 30 lines of code, we have a new framework, more powerful and
 more flexible than the previous one. Enjoy!

doctrine/dbal.rst

@@ -127,8 +127,8 @@ mapping type:
         # config/packages/doctrine.yaml
         doctrine:
             dbal:
-               mapping_types:
-                  enum: string
+                mapping_types:
+                    enum: string
 
     .. code-block:: xml
 
@@ -143,7 +143,7 @@ mapping type:
 
             <doctrine:config>
                 <doctrine:dbal>
-                     <doctrine:mapping-type name="enum">string</doctrine:mapping-type>
+                    <doctrine:mapping-type name="enum">string</doctrine:mapping-type>
                 </doctrine:dbal>
             </doctrine:config>
         </container>
@@ -153,9 +153,9 @@ mapping type:
         // config/packages/doctrine.php
         $container->loadFromExtension('doctrine', [
             'dbal' => [
-               'mapping_types' => [
-                  'enum'  => 'string',
-               ],
+                'mapping_types' => [
+                    'enum'  => 'string',
+                ],
             ],
         ]);
 

email/dev_environment.rst

@@ -140,10 +140,10 @@ by adding the ``delivery_whitelist`` option:
         swiftmailer:
             delivery_addresses: ['[email protected]']
             delivery_whitelist:
-               # all email addresses matching these regexes will be delivered
-               # like normal, as well as being sent to [email protected]
-               - '/@specialdomain\.com$/'
-               - '/^admin@mydomain\.com$/'
+                # all email addresses matching these regexes will be delivered
+                # like normal, as well as being sent to [email protected]
+                - '/@specialdomain\.com$/'
+                - '/^admin@mydomain\.com$/'
 
     .. code-block:: xml
 

email/spool.rst

@@ -53,7 +53,7 @@ this spool, use the following configuration:
 
         // config/packages/swiftmailer.php
         $container->loadFromExtension('swiftmailer', [
-             // ...
+            // ...
             'spool' => ['type' => 'memory'],
         ]);
 
@@ -103,7 +103,7 @@ In order to use the spool with files, use the following configuration:
 
         // config/packages/swiftmailer.php
         $container->loadFromExtension('swiftmailer', [
-             // ...
+            // ...
 
             'spool' => [
                 'type' => 'file',

reference/configuration/doctrine.rst

@@ -194,7 +194,7 @@ can be placed directly under ``doctrine.orm`` config level.
         orm:
             # ...
             query_cache_driver:
-               # ...
+                # ...
             metadata_cache_driver:
                 # ...
             result_cache_driver: