minor #11240 more consistency for master (OskarStark)

OskarStark · OskarStark · commit 49b06967f4ac · 2019-04-01T21:12:46.000+02:00
This PR was squashed before being merged into the master branch (closes #11240). Discussion ---------- more consistency for master Its much easier to review commit by commit Todo before merging this PR: - [x] Merge #11243 - [x] Upmerge to `master` - [x] Rebase this PR Commits ------- 8c4b4c0 more consistency for master
diff --git a/configuration/environment_variables.rst b/configuration/environment_variables.rst
@@ -642,7 +642,7 @@ Symfony provides the following env var processors:
                     http://symfony.com/schema/dic/services/services-1.0.xsd">
 
                 <mongodb:config>
-                    <mongodb:client name="default" connectTimeoutMS="%env(int:key:timeout:query_string:MONGODB_URL)%" />
+                    <mongodb:client name="default" connectTimeoutMS="%env(int:key:timeout:query_string:MONGODB_URL)%"/>
                 </mongodb:config>
             </container>
 
diff --git a/console/coloring.rst b/console/coloring.rst
@@ -78,6 +78,7 @@ Displaying Clickable Links
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 4.3
+
     The feature to display clickable links was introduced in Symfony 4.3.
 
 Commands can use the special ``<href>`` tag to display links similar to the
diff --git a/form/form_themes.rst b/form/form_themes.rst
@@ -289,9 +289,9 @@ field without having to :doc:`create a custom form type </form/create_custom_fie
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('name', TextType::class, array(
+        $builder->add('name', TextType::class, [
             'block_prefix' => 'wrapped_text',
-        ));
+        ]);
     }
 
 .. versionadded:: 4.3
diff --git a/reference/constraints/Json.rst b/reference/constraints/Json.rst
@@ -78,9 +78,9 @@ The ``Json`` constraint can be applied to a property or a "getter" method:
 
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
-                $metadata->addPropertyConstraint('chapters', new Assert\Json(array(
+                $metadata->addPropertyConstraint('chapters', new Assert\Json([
                     'message' => 'You\'ve entered an invalid Json.',
-                )));
+                ]));
             }
         }
 
diff --git a/reference/forms/types/button.rst b/reference/forms/types/button.rst
@@ -71,12 +71,10 @@ Given this translation message:
 
 .. code-block:: yaml
 
-    # translations/messages.en.yml
+    # translations/messages.en.yaml
     form.order.submit_to_company: 'Send an order to %company%'
 
-You can specify the placeholder values as follows:
-
-.. code-block:: php
+You can specify the placeholder values as follows::
 
     use Symfony\Component\Form\Extension\Core\Type\ButtonType;
     // ...
diff --git a/reference/forms/types/date.rst b/reference/forms/types/date.rst
@@ -171,7 +171,7 @@ values for the year, month and day fields::
 
 .. include:: /reference/forms/types/options/date_format.rst.inc
 
-.. versionadded:: 4.3
+.. deprecated:: 4.3
 
     Using the ``format`` option when the ``html5`` option is enabled is deprecated
     since Symfony 4.3.
diff --git a/reference/forms/types/options/attr_translation_parameters.rst.inc b/reference/forms/types/options/attr_translation_parameters.rst.inc
@@ -16,23 +16,21 @@ Given this translation message:
 
 .. code-block:: yaml
 
-    # translations/messages.en.yml
+    # translations/messages.en.yaml
     form.order.id.placeholder: 'Enter unique identifier of the order to %company%'
     form.order.id.title: 'This will be the reference in communications with %company%'
 
-You can specify the placeholder values as follows:
+You can specify the placeholder values as follows::
 
-.. code-block:: php
-
-    $builder->add('id', null, array(
-        'attr' => array(
+    $builder->add('id', null, [
+        'attr' => [
             'placeholder' => 'form.order.id.placeholder',
             'title' => 'form.order.id.title',
-        ),
+        ],
         'attr_translation_parameters' => [
-            '%company%' => 'ACME Inc.'
-        ]
-    ));
+            '%company%' => 'ACME Inc.',
+        ],
+    ]);
 
 The ``attr_translation_parameters`` option of children fields is merged with the
 same option of their parents, so children can reuse and/or override any of the
diff --git a/reference/forms/types/options/help_translation_parameters.rst.inc b/reference/forms/types/options/help_translation_parameters.rst.inc
@@ -15,19 +15,17 @@ Given this translation message:
 
 .. code-block:: yaml
 
-    # translations/messages.en.yml
+    # translations/messages.en.yaml
     form.order.id.help: 'This will be the reference in communications with %company%'
 
-You can specify the placeholder values as follows:
+You can specify the placeholder values as follows::
 
-.. code-block:: php
-
-    $builder->add('id', null, array(
+    $builder->add('id', null, [
         'help' => 'form.order.id.help',
         'help_translation_parameters' => [
-            '%company%' => 'ACME Inc.'
-        ]
-    ));
+            '%company%' => 'ACME Inc.',
+        ],
+    ]);
 
 The ``help_translation_parameters`` option of children fields is merged with the
 same option of their parents, so children can reuse and/or override any of the
diff --git a/reference/forms/types/options/label_translation_parameters.rst.inc b/reference/forms/types/options/label_translation_parameters.rst.inc
@@ -15,19 +15,17 @@ Given this translation message:
 
 .. code-block:: yaml
 
-    # translations/messages.en.yml
+    # translations/messages.en.yaml
     form.order.id: 'Identifier of the order to %company%'
 
-You can specify the placeholder values as follows:
+You can specify the placeholder values as follows::
 
-.. code-block:: php
-
-    $builder->add('id', null, array(
+    $builder->add('id', null, [
         'label' => 'form.order.id',
         'label_translation_parameters' => [
-            '%company%' => 'ACME Inc.'
-        ]
-    ));
+            '%company%' => 'ACME Inc.',
+        ],
+    ]);
 
 The ``label_translation_parameters`` option of children fields is merged with
 the same option of their parents, so children can reuse and/or override any of
diff --git a/reference/forms/types/reset.rst b/reference/forms/types/reset.rst
@@ -61,22 +61,20 @@ Given this translation message:
 
 .. code-block:: yaml
 
-    # translations/messages.en.yml
+    # translations/messages.en.yaml
     form.order.reset: 'Reset an order to %company%'
 
-You can specify the placeholder values as follows:
-
-.. code-block:: php
+You can specify the placeholder values as follows::
 
     use Symfony\Component\Form\Extension\Core\Type\ResetType;
     // ...
 
-    $builder->add('send', ResetType::class, array(
+    $builder->add('send', ResetType::class, [
         'label' => 'form.order.reset',
-        'label_translation_parameters' => array(
+        'label_translation_parameters' => [
             '%company%' => 'ACME Inc.',
-        ),
-    ));
+        ],
+    ]);
 
 The ``label_translation_parameters`` option of buttons is merged with the same
 option of its parents, so buttons can reuse and/or override any of the parent
diff --git a/reference/forms/types/submit.rst b/reference/forms/types/submit.rst
@@ -74,22 +74,20 @@ Given this translation message:
 
 .. code-block:: yaml
 
-    # translations/messages.en.yml
+    # translations/messages.en.yaml
     form.order.submit_to_company: 'Send an order to %company%'
 
-You can specify the placeholder values as follows:
-
-.. code-block:: php
+You can specify the placeholder values as follows::
 
     use Symfony\Component\Form\Extension\Core\Type\SubmitType;
     // ...
 
-    $builder->add('send', SubmitType::class, array(
+    $builder->add('send', SubmitType::class, [
         'label' => 'form.order.submit_to_company',
-        'label_translation_parameters' => array(
+        'label_translation_parameters' => [
             '%company%' => 'ACME Inc.',
-        ),
-    ));
+        ],
+    ]);
 
 The ``label_translation_parameters`` option of buttons is merged with the same
 option of its parents, so buttons can reuse and/or override any of the parent
diff --git a/routing.rst b/routing.rst
@@ -529,6 +529,7 @@ example to force the generation of ``/blog/1`` instead of ``/blog`` in the
 previous example) add the ``!`` character before the placeholder name: ``/blog/{!page}``
 
 .. versionadded:: 4.3
+
     The feature to force the inclusion of default values in generated URLs was
     introduced in Symfony 4.3.
 
diff --git a/service_container/alias_private.rst b/service_container/alias_private.rst
@@ -175,7 +175,7 @@ or you decided not to maintain it anymore), you can deprecate its definition:
             <services>
                 <service id="app.mailer" alias="App\Mail\PhpMailer">
                     <!-- this will display a generic deprecation message... -->
-                    <deprecated />
+                    <deprecated/>
 
                     <!-- ...but you can also define a custom deprecation message -->
                     <deprecated>The "%alias_id%" service alias is deprecated. Don't use it anymore.</deprecated>

Original file line number	Diff line number	Diff line change
@@ -289,9 +289,9 @@ field without having to :doc:`create a custom form type </form/create_custom_fie
`289`	`289`
`290`	`290`	`public function buildForm(FormBuilderInterface $builder, array $options)`
`291`	`291`	`{`
`292`		`- $builder->add('name', TextType::class, array(`
	`292`	`+ $builder->add('name', TextType::class, [`
`293`	`293`	`'block_prefix' => 'wrapped_text',`
`294`		`- ));`
	`294`	`+ ]);`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`.. versionadded:: 4.3`
Original file line number	Diff line number	Diff line change
@@ -78,9 +78,9 @@ The ``Json`` constraint can be applied to a property or a "getter" method:
`78`	`78`
`79`	`79`	`public static function loadValidatorMetadata(ClassMetadata $metadata)`
`80`	`80`	`{`
`81`		`- $metadata->addPropertyConstraint('chapters', new Assert\Json(array(`
	`81`	`+ $metadata->addPropertyConstraint('chapters', new Assert\Json([`
`82`	`82`	`'message' => 'You\'ve entered an invalid Json.',`
`83`		`- )));`
	`83`	`+ ]));`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`