Merge branch '3.4' into 4.2

* 3.4:
  missing brackets

Author: wouterj

components/console/helpers/formatterhelper.rst

@@ -108,6 +108,6 @@ If you don't want to use suffix at all, pass an empty string::
 
     $truncatedMessage = $formatter->truncate($message, 7, '!!'); // result: This is!!
     $truncatedMessage = $formatter->truncate($message, 7, '');   // result: This is
-    $truncatedMessage = $formatter->truncate('test', 10));
+    $truncatedMessage = $formatter->truncate('test', 10);
     /* result: test
        because length of the "test..." string is shorter than 10 */

components/console/helpers/table.rst

@@ -305,7 +305,7 @@ This results in:
         $table->setHeaders([
             [new TableCell('Main table title', ['colspan' => 3])],
             ['ISBN', 'Title', 'Author'],
-        ))
+        ])
         // ...
 
     This generates:

components/css_selector.rst

@@ -97,7 +97,7 @@ Several pseudo-classes are not yet supported:
 
 * ``*:first-of-type``, ``*:last-of-type``, ``*:nth-of-type``,
   ``*:nth-last-of-type``, ``*:only-of-type``. (These work with an element
-  name (e.g. ``li:first-of-type``) but not with ``*``.
+  name (e.g. ``li:first-of-type``) but not with ``*``).
 
 .. _Packagist: https://packagist.org/packages/symfony/css-selector
 

components/translation/usage.rst

@@ -194,7 +194,7 @@ recommended format. These files are parsed by one of the loader classes.
                     'has' => [
                         'bundles' => 'Symfony has bundles',
                     ],
-                ),
+                ],
                 'user' => [
                     'login' => 'Login',
                 ],

logging.rst

@@ -241,7 +241,7 @@ one of the messages reaches an ``action_level``. Take this example:
                     'type'  => 'syslog',
                     'level' => 'error',
                 ],
-            ),
+            ],
         ]);
 
 Now, if even one log entry has an ``error`` level or higher, then *all* log entries

logging/monolog_email.rst

@@ -180,7 +180,9 @@ You can adjust the time period using the ``time`` option:
                     // the time in seconds during which duplicate entries are discarded (default: 60)
                     'time' => 10,
                     'handler' => 'swift',
-                ]
+                ],
+            ],
+        ]);
 
 The messages are then passed to the ``swift`` handler. This is the handler that
 actually deals with emailing you the error. The settings for this are

security/ldap.rst

@@ -509,7 +509,7 @@ Configuration example for form login and query_string
                     ],
                 ],
             ]
-        ];
+        ]);
 
 .. _`LDAP PHP extension`: http://www.php.net/manual/en/intro.ldap.php
 .. _`RFC4515`: http://www.faqs.org/rfcs/rfc4515.html

validation.rst

@@ -498,7 +498,7 @@ of the form fields::
             ->add('myField', TextType::class, [
                 'required' => true,
                 'constraints' => [new Length(['min' => 3])]
-            ))
+            ])
         ;
     }