Merge branch '3.4' into 4.2

javiereguiluz · javiereguiluz · commit 543b18494560 · 2019-04-30T15:33:32.000+02:00
* 3.4:
  fix indention
diff --git a/cache.rst b/cache.rst
@@ -230,11 +230,11 @@ You can also create more customized pools:
 
             <framework:config>
                 <framework:cache default_memcached_provider="memcached://localhost">
-                  <framework:pool name="custom_thing.cache" adapter="cache.app"/>
-                  <framework:pool name="my_cache_pool" adapter="cache.adapter.array"/>
-                  <framework:pool name="acme.cache" adapter="cache.adapter.memcached"/>
-                  <framework:pool name="foobar.cache" adapter="cache.adapter.memcached" provider="memcached://user:password@example.com"/>
-                  <framework:pool name="short_cache" adapter="foobar.cache" default_lifetime="60"/>
+                    <framework:pool name="custom_thing.cache" adapter="cache.app"/>
+                    <framework:pool name="my_cache_pool" adapter="cache.adapter.array"/>
+                    <framework:pool name="acme.cache" adapter="cache.adapter.memcached"/>
+                    <framework:pool name="foobar.cache" adapter="cache.adapter.memcached" provider="memcached://user:password@example.com"/>
+                    <framework:pool name="short_cache" adapter="foobar.cache" default_lifetime="60"/>
                 </framework:cache>
             </framework:config>
         </container>
@@ -335,7 +335,7 @@ and use that when configuring the pool.
 
             <framework:config>
                 <framework:cache>
-                  <framework:pool name="cache.my_redis" adapter="cache.adapter.redis" provider="app.my_custom_redis_provider"/>
+                    <framework:pool name="cache.my_redis" adapter="cache.adapter.redis" provider="app.my_custom_redis_provider"/>
                 </framework:cache>
             </framework:config>
 
@@ -413,8 +413,8 @@ case the value needs to be recalculated.
 
             <framework:config>
                 <framework:cache>
-                  <framework:pool name="my_cache_pool" adapter="app.my_cache_chain_adapter"/>
-                  <framework:pool name="cache.my_redis" adapter="cache.adapter.redis" provider="redis://user:password@example.com"/>
+                    <framework:pool name="my_cache_pool" adapter="app.my_cache_chain_adapter"/>
+                    <framework:pool name="cache.my_redis" adapter="cache.adapter.redis" provider="redis://user:password@example.com"/>
                 </framework:cache>
             </framework:config>
 
diff --git a/components/cache/adapters/proxy_adapter.rst b/components/cache/adapters/proxy_adapter.rst
@@ -18,8 +18,8 @@ and optionally a namespace and default cache lifetime as its second and third pa
     use Psr\Cache\CacheItemPoolInterface;
     use Symfony\Component\Cache\Adapter\ProxyAdapter;
 
-    \\ create your own cache pool instance that implements the PSR-6
-    \\ interface `CacheItemPoolInterface`
+    // create your own cache pool instance that implements
+    // the PSR-6 CacheItemPoolInterface
     $psr6CachePool = ...
 
     $cache = new ProxyAdapter(
diff --git a/components/dom_crawler.rst b/components/dom_crawler.rst
@@ -333,31 +333,31 @@ 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]');
     // A Symfony\Component\DomCrawler\Crawler instance
diff --git a/components/translation/usage.rst b/components/translation/usage.rst
@@ -434,19 +434,19 @@ loaded/dumped when using this component inside a Symfony application:
     <?xml version="1.0" encoding="UTF-8"?>
     <xliff xmlns="urn:oasis:names:tc:xliff:document:2.0" version="2.0"
            srcLang="fr-FR" trgLang="en-US">
-      <file id="messages.en_US">
-        <unit id="LCa0a2j" name="original-content">
-          <notes>
-            <note category="state">new</note>
-            <note category="approved">true</note>
-            <note category="section" priority="1">user login</note>
-          </notes>
-          <segment>
-            <source>original-content</source>
-            <target>translated-content</target>
-          </segment>
-        </unit>
-      </file>
+        <file id="messages.en_US">
+            <unit id="LCa0a2j" name="original-content">
+                <notes>
+                    <note category="state">new</note>
+                    <note category="approved">true</note>
+                    <note category="section" priority="1">user login</note>
+                </notes>
+                <segment>
+                    <source>original-content</source>
+                    <target>translated-content</target>
+                </segment>
+            </unit>
+        </file>
     </xliff>
 
 When using the standalone Translation component, call the ``setMetadata()``
diff --git a/console/command_in_controller.rst b/console/command_in_controller.rst
@@ -42,11 +42,11 @@ Run this command from inside your controller via::
             $application->setAutoExit(false);
 
             $input = new ArrayInput([
-               'command' => 'swiftmailer:spool:send',
-               // (optional) define the value of command arguments
-               'fooArgument' => 'barValue',
-               // (optional) pass options to the command
-               '--message-limit' => $messages,
+                'command' => 'swiftmailer:spool:send',
+                // (optional) define the value of command arguments
+                'fooArgument' => 'barValue',
+                // (optional) pass options to the command
+                '--message-limit' => $messages,
             ]);
 
             // You can use NullOutput() if you don't need the output
diff --git a/event_dispatcher.rst b/event_dispatcher.rst
@@ -160,11 +160,11 @@ listen to the same ``kernel.exception`` event::
         {
             // return the subscribed events, their methods and priorities
             return [
-               KernelEvents::EXCEPTION => [
-                   ['processException', 10],
-                   ['logException', 0],
-                   ['notifyException', -10],
-               ]
+                KernelEvents::EXCEPTION => [
+                    ['processException', 10],
+                    ['logException', 0],
+                    ['notifyException', -10],
+                ],
             ];
         }
 
diff --git a/form/dynamic_form_modification.rst b/form/dynamic_form_modification.rst
@@ -10,7 +10,7 @@ how to customize your form based on three common use-cases:
 1) :ref:`form-events-underlying-data`
 
    Example: you have a "Product" form and need to modify/add/remove a field
-    based on the data on the underlying Product being edited.
+   based on the data on the underlying Product being edited.
 
 2) :ref:`form-events-user-data`
 
diff --git a/form/without_class.rst b/form/without_class.rst
@@ -87,15 +87,15 @@ but here's a short example::
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-           ->add('firstName', TextType::class, [
-               'constraints' => new Length(['min' => 3]),
-           ])
-           ->add('lastName', TextType::class, [
-               'constraints' => [
-                   new NotBlank(),
-                   new Length(['min' => 3]),
-               ],
-           ])
+            ->add('firstName', TextType::class, [
+                'constraints' => new Length(['min' => 3]),
+            ])
+            ->add('lastName', TextType::class, [
+                'constraints' => [
+                    new NotBlank(),
+                    new Length(['min' => 3]),
+                ],
+            ])
         ;
     }
 
diff --git a/introduction/http_fundamentals.rst b/introduction/http_fundamentals.rst
@@ -121,7 +121,7 @@ like this:
     Content-Type: text/html
 
     <html>
-      <!-- ... HTML for the xkcd comic -->
+        <!-- ... HTML for the xkcd comic -->
     </html>
 
 The HTTP response contains the requested resource (the HTML content in this
diff --git a/security/custom_authentication_provider.rst b/security/custom_authentication_provider.rst
@@ -547,10 +547,10 @@ the ``addConfiguration()`` method::
 
         public function addConfiguration(NodeDefinition $node)
         {
-          $node
-            ->children()
-                ->scalarNode('lifetime')->defaultValue(300)
-            ->end();
+            $node
+                ->children()
+                    ->scalarNode('lifetime')->defaultValue(300)
+                ->end();
         }
     }
 
diff --git a/security/multiple_guard_authenticators.rst b/security/multiple_guard_authenticators.rst
@@ -24,7 +24,7 @@ This is how your security configuration can look in action:
 
         # config/packages/security.yaml
         security:
-             # ...
+            # ...
             firewalls:
                 default:
                     anonymous: ~
diff --git a/service_container/3.3-di-changes.rst b/service_container/3.3-di-changes.rst
@@ -629,10 +629,10 @@ Now you're ready to default all services to be private:
     # ...
 
     services:
-         _defaults:
-             autowire: true
-             autoconfigure: true
-    +          public: false
+        _defaults:
+            autowire: true
+            autoconfigure: true
+    +       public: false
 
 Thanks to this, any services created in this file cannot be fetched directly from
 the container. But, since the old service id's are aliases in a separate file (``legacy_aliases.yaml``),
diff --git a/service_container/autowiring.rst b/service_container/autowiring.rst
@@ -279,7 +279,7 @@ Now that you have an interface, you should use this as your type-hint::
     {
         public function __construct(TransformerInterface $transformer)
         {
-             // ...
+            // ...
         }
 
         // ...
diff --git a/service_container/injection_types.rst b/service_container/injection_types.rst
@@ -124,7 +124,7 @@ that accepts the dependency::
     .. code-block:: yaml
 
         # config/services.yaml
-       services:
+        services:
             # ...
 
             app.newsletter_manager:
@@ -199,7 +199,7 @@ Another possibility is setting public fields of the class directly::
     .. code-block:: yaml
 
         # config/services.yaml
-       services:
+        services:
             # ...
 
             app.newsletter_manager:
diff --git a/templating/PHP.rst b/templating/PHP.rst
@@ -448,9 +448,9 @@ form is rendered.
                         'App:Form',
                     ],
                 ],
-             ],
+            ],
 
-             // ...
+            // ...
         ]);
 
 By default, the PHP engine uses a *div* layout when rendering forms. Some people,
diff --git a/templating/global_variables.rst b/templating/global_variables.rst
@@ -39,10 +39,10 @@ This is possible inside your ``config/packages/twig.yaml`` file:
 
         // config/packages/twig.php
         $container->loadFromExtension('twig', [
-             // ...
-             'globals' => [
-                 'ga_tracking' => 'UA-xxxxx-x',
-             ],
+            // ...
+            'globals' => [
+                'ga_tracking' => 'UA-xxxxx-x',
+            ],
         ]);
 
 Now, the variable ``ga_tracking`` is available in all Twig templates:
@@ -95,9 +95,9 @@ system, which lets you isolate or reuse the value:
 
         // config/packages/twig.php
         $container->loadFromExtension('twig', [
-             'globals' => [
-                 'ga_tracking' => '%ga_tracking%',
-             ],
+            'globals' => [
+                'ga_tracking' => '%ga_tracking%',
+            ],
         ]);
 
 The same variable is available exactly as before.
@@ -151,8 +151,8 @@ This should feel familiar, as it's the same syntax you use in service configurat
 
         // config/packages/twig.php
         $container->loadFromExtension('twig', [
-             // ...
-             'globals' => [
-                 'user_management' => '@App\Service\UserManagement',
-             ],
+            // ...
+            'globals' => [
+                'user_management' => '@App\Service\UserManagement',
+            ],
         ]);
diff --git a/testing/http_authentication.rst b/testing/http_authentication.rst
@@ -40,8 +40,8 @@ firewall, but only in the configuration file used by tests:
         <security:config>
             <!-- replace 'main' by the name of your own firewall -->
             <security:firewall name="main">
-              <security:http-basic/>
-           </security:firewall>
+                <security:http-basic/>
+            </security:firewall>
         </security:config>
 
     .. code-block:: php

Original file line number	Diff line number	Diff line change
@@ -547,10 +547,10 @@ the ``addConfiguration()`` method::
`547`	`547`
`548`	`548`	`public function addConfiguration(NodeDefinition $node)`
`549`	`549`	`{`
`550`		`- $node`
`551`		`- ->children()`
`552`		`- ->scalarNode('lifetime')->defaultValue(300)`
`553`		`- ->end();`
	`550`	`+ $node`
	`551`	`+ ->children()`
	`552`	`+ ->scalarNode('lifetime')->defaultValue(300)`
	`553`	`+ ->end();`
`554`	`554`	`}`
`555`	`555`	`}`
`556`	`556`