Merge branch '4.2'

* 4.2:
  Consistency changes

Author: javiereguiluz

bundles/configuration.rst

@@ -197,7 +197,7 @@ The ``Configuration`` class to handle the sample configuration looks like::
         }
     }
 
-.. versionadded:: 4.2
+.. deprecated:: 4.2
 
     Not passing the root node name to ``TreeBuilder`` was deprecated in Symfony 4.2.
 

components/config/definition.rst

@@ -68,7 +68,7 @@ implements the :class:`Symfony\\Component\\Config\\Definition\\ConfigurationInte
         }
     }
 
-.. versionadded:: 4.2
+.. deprecated:: 4.2
 
     Not passing the root node name to ``TreeBuilder`` was deprecated in Symfony 4.2.
 

components/serializer.rst

@@ -762,7 +762,7 @@ The ``CsvEncoder`` encodes to and decodes from CSV.
 You can pass the context key ``as_collection`` in order to have the results
 always as a collection.
 
-.. versionadded:: 4.2
+.. deprecated:: 4.2
 
     Relying on the default value ``false`` is deprecated since Symfony 4.2.
 

components/var_dumper.rst

@@ -111,11 +111,11 @@ server, which outputs it to its own console or to an HTML file:
 .. code-block:: terminal
 
     # displays the dumped data in the console:
-    $ ./bin/console server:dump
+    $ php bin/console server:dump
       [OK] Server listening on tcp://0.0.0.0:9912
 
     # stores the dumped data in a file using the HTML format:
-    $ ./bin/console server:dump --format=html > dump.html
+    $ php bin/console server:dump --format=html > dump.html
 
 Inside a Symfony application, the output of the dump server is configured with
 the :ref:`dump_destination option <configuration-debug-dump_destination>` of the

controller.rst

@@ -298,6 +298,7 @@ use:
     $ php bin/console make:crud Product
 
 .. versionadded:: 1.2
+
     The ``make:crud`` command was introduced in MakerBundle 1.2.
 
 .. index::

controller/upload_file.rst

@@ -189,7 +189,7 @@ There are some important things to consider in the code of the above controller:
    use the :method:`Symfony\\Component\\HttpFoundation\\File\\UploadedFile::guessExtension`
    method to let Symfony guess the right extension according to the file MIME type;
 
-.. versionadded:: 4.1
+.. deprecated:: 4.1
 
     The :method:`Symfony\\Component\\HttpFoundation\\File\\UploadedFile::getClientSize`
     method was deprecated in Symfony 4.1 and will be removed in Symfony 5.0.

doctrine.rst

@@ -29,7 +29,7 @@ which will help generate some code:
 .. code-block:: terminal
 
     $ composer require symfony/orm-pack
-    $ composer require symfony/maker-bundle --dev
+    $ composer require --dev symfony/maker-bundle
 
 Configuring the Database
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -117,6 +117,7 @@ need. The command will ask you some questions - answer them like done below:
     (press enter again to finish)
 
 .. versionadded:: 1.3
+
     The interactive behavior of the ``make:entity`` command was introduced
     in MakerBundle 1.3.
 
@@ -332,9 +333,7 @@ to experiment:
     $ php bin/console make:controller ProductController
 
 Inside the controller, you can create a new ``Product`` object, set data on it,
-and save it!
-
-.. code-block:: php
+and save it::
 
     // src/Controller/ProductController.php
     namespace App\Controller;
@@ -731,7 +730,7 @@ data into your project (i.e. "fixture data"). Install it with:
 
 .. code-block:: terminal
 
-    $ composer require doctrine/doctrine-fixtures-bundle --dev
+    $ composer require --dev doctrine/doctrine-fixtures-bundle
 
 Then, use the ``make:fixtures`` command to generate an empty fixture class:
 

doctrine/registration_form.rst

@@ -21,7 +21,7 @@ Make sure MakerBundle is installed:
 
 .. code-block:: terminal
 
-    $ composer require symfony/maker-bundle --dev
+    $ composer require --dev symfony/maker-bundle
 
 If you need any other dependencies, MakerBundle will tell you when you run each
 command.
@@ -50,6 +50,7 @@ To easiest way to build your registration form is by using the ``make:registrati
 command:
 
 .. versionadded:: 1.11
+
     The ``make:registration-form`` was introduced in MakerBundle 1.11.0.
 
 .. code-block:: terminal

form/form_themes.rst

@@ -313,30 +313,30 @@ following complex example where a ``TaskManagerType`` has a collection of
 
     class TaskManagerType extends AbstractType
     {
-        public function buildForm(FormBuilderInterface $builder, array $options = array())
+        public function buildForm(FormBuilderInterface $builder, array $options = [])
         {
             // ...
-            $builder->add('taskLists', CollectionType::class, array(
+            $builder->add('taskLists', CollectionType::class, [
                 'entry_type' => TaskListType::class,
                 'block_name' => 'task_lists',
-            ));
+            ]);
         }
     }
 
     class TaskListType extends AbstractType
     {
-        public function buildForm(FormBuilderInterface $builder, array $options = array())
+        public function buildForm(FormBuilderInterface $builder, array $options = [])
         {
             // ...
-            $builder->add('tasks', CollectionType::class, array(
+            $builder->add('tasks', CollectionType::class, [
                 'entry_type' => TaskType::class,
-            ));
+            ]);
         }
     }
 
     class TaskType
     {
-        public function buildForm(FormBuilderInterface $builder, array $options = array())
+        public function buildForm(FormBuilderInterface $builder, array $options = [])
         {
             $builder->add('name');
             // ...

frontend/encore/reactjs.rst

@@ -5,7 +5,7 @@ Using React? First enable support for it in ``webpack.config.js``:
 
 .. code-block:: terminal
 
-    $ yarn add --dev @babel/preset-react
+    $ yarn add @babel/preset-react --dev
     $ yarn add react react-dom prop-types
 
 Enable react in your ``webpack.config.js``: