Skip to content

Commit 49b0696

Browse files
committed
minor #11240 more consistency for master (OskarStark)
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
2 parents 76b9f73 + 8c4b4c0 commit 49b0696

File tree

13 files changed

+43
-53
lines changed

13 files changed

+43
-53
lines changed

configuration/environment_variables.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ Symfony provides the following env var processors:
642642
http://symfony.com/schema/dic/services/services-1.0.xsd">
643643
644644
<mongodb:config>
645-
<mongodb:client name="default" connectTimeoutMS="%env(int:key:timeout:query_string:MONGODB_URL)%" />
645+
<mongodb:client name="default" connectTimeoutMS="%env(int:key:timeout:query_string:MONGODB_URL)%"/>
646646
</mongodb:config>
647647
</container>
648648

console/coloring.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ Displaying Clickable Links
7878
~~~~~~~~~~~~~~~~~~~~~~~~~~
7979

8080
.. versionadded:: 4.3
81+
8182
The feature to display clickable links was introduced in Symfony 4.3.
8283

8384
Commands can use the special ``<href>`` tag to display links similar to the

form/form_themes.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,9 @@ field without having to :doc:`create a custom form type </form/create_custom_fie
289289

290290
public function buildForm(FormBuilderInterface $builder, array $options)
291291
{
292-
$builder->add('name', TextType::class, array(
292+
$builder->add('name', TextType::class, [
293293
'block_prefix' => 'wrapped_text',
294-
));
294+
]);
295295
}
296296

297297
.. versionadded:: 4.3

reference/constraints/Json.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ The ``Json`` constraint can be applied to a property or a "getter" method:
7878
7979
public static function loadValidatorMetadata(ClassMetadata $metadata)
8080
{
81-
$metadata->addPropertyConstraint('chapters', new Assert\Json(array(
81+
$metadata->addPropertyConstraint('chapters', new Assert\Json([
8282
'message' => 'You\'ve entered an invalid Json.',
83-
)));
83+
]));
8484
}
8585
}
8686

reference/forms/types/button.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,10 @@ Given this translation message:
7171

7272
.. code-block:: yaml
7373
74-
# translations/messages.en.yml
74+
# translations/messages.en.yaml
7575
form.order.submit_to_company: 'Send an order to %company%'
7676
77-
You can specify the placeholder values as follows:
78-
79-
.. code-block:: php
77+
You can specify the placeholder values as follows::
8078

8179
use Symfony\Component\Form\Extension\Core\Type\ButtonType;
8280
// ...

reference/forms/types/date.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ values for the year, month and day fields::
171171

172172
.. include:: /reference/forms/types/options/date_format.rst.inc
173173

174-
.. versionadded:: 4.3
174+
.. deprecated:: 4.3
175175

176176
Using the ``format`` option when the ``html5`` option is enabled is deprecated
177177
since Symfony 4.3.

reference/forms/types/options/attr_translation_parameters.rst.inc

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,21 @@ Given this translation message:
1616

1717
.. code-block:: yaml
1818

19-
# translations/messages.en.yml
19+
# translations/messages.en.yaml
2020
form.order.id.placeholder: 'Enter unique identifier of the order to %company%'
2121
form.order.id.title: 'This will be the reference in communications with %company%'
2222

23-
You can specify the placeholder values as follows:
23+
You can specify the placeholder values as follows::
2424

25-
.. code-block:: php
26-
27-
$builder->add('id', null, array(
28-
'attr' => array(
25+
$builder->add('id', null, [
26+
'attr' => [
2927
'placeholder' => 'form.order.id.placeholder',
3028
'title' => 'form.order.id.title',
31-
),
29+
],
3230
'attr_translation_parameters' => [
33-
'%company%' => 'ACME Inc.'
34-
]
35-
));
31+
'%company%' => 'ACME Inc.',
32+
],
33+
]);
3634

3735
The ``attr_translation_parameters`` option of children fields is merged with the
3836
same option of their parents, so children can reuse and/or override any of the

reference/forms/types/options/help_translation_parameters.rst.inc

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,17 @@ Given this translation message:
1515

1616
.. code-block:: yaml
1717

18-
# translations/messages.en.yml
18+
# translations/messages.en.yaml
1919
form.order.id.help: 'This will be the reference in communications with %company%'
2020

21-
You can specify the placeholder values as follows:
21+
You can specify the placeholder values as follows::
2222

23-
.. code-block:: php
24-
25-
$builder->add('id', null, array(
23+
$builder->add('id', null, [
2624
'help' => 'form.order.id.help',
2725
'help_translation_parameters' => [
28-
'%company%' => 'ACME Inc.'
29-
]
30-
));
26+
'%company%' => 'ACME Inc.',
27+
],
28+
]);
3129

3230
The ``help_translation_parameters`` option of children fields is merged with the
3331
same option of their parents, so children can reuse and/or override any of the

reference/forms/types/options/label_translation_parameters.rst.inc

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,17 @@ Given this translation message:
1515

1616
.. code-block:: yaml
1717

18-
# translations/messages.en.yml
18+
# translations/messages.en.yaml
1919
form.order.id: 'Identifier of the order to %company%'
2020

21-
You can specify the placeholder values as follows:
21+
You can specify the placeholder values as follows::
2222

23-
.. code-block:: php
24-
25-
$builder->add('id', null, array(
23+
$builder->add('id', null, [
2624
'label' => 'form.order.id',
2725
'label_translation_parameters' => [
28-
'%company%' => 'ACME Inc.'
29-
]
30-
));
26+
'%company%' => 'ACME Inc.',
27+
],
28+
]);
3129

3230
The ``label_translation_parameters`` option of children fields is merged with
3331
the same option of their parents, so children can reuse and/or override any of

reference/forms/types/reset.rst

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,20 @@ Given this translation message:
6161

6262
.. code-block:: yaml
6363
64-
# translations/messages.en.yml
64+
# translations/messages.en.yaml
6565
form.order.reset: 'Reset an order to %company%'
6666
67-
You can specify the placeholder values as follows:
68-
69-
.. code-block:: php
67+
You can specify the placeholder values as follows::
7068

7169
use Symfony\Component\Form\Extension\Core\Type\ResetType;
7270
// ...
7371

74-
$builder->add('send', ResetType::class, array(
72+
$builder->add('send', ResetType::class, [
7573
'label' => 'form.order.reset',
76-
'label_translation_parameters' => array(
74+
'label_translation_parameters' => [
7775
'%company%' => 'ACME Inc.',
78-
),
79-
));
76+
],
77+
]);
8078

8179
The ``label_translation_parameters`` option of buttons is merged with the same
8280
option of its parents, so buttons can reuse and/or override any of the parent

reference/forms/types/submit.rst

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,20 @@ Given this translation message:
7474

7575
.. code-block:: yaml
7676
77-
# translations/messages.en.yml
77+
# translations/messages.en.yaml
7878
form.order.submit_to_company: 'Send an order to %company%'
7979
80-
You can specify the placeholder values as follows:
81-
82-
.. code-block:: php
80+
You can specify the placeholder values as follows::
8381

8482
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
8583
// ...
8684

87-
$builder->add('send', SubmitType::class, array(
85+
$builder->add('send', SubmitType::class, [
8886
'label' => 'form.order.submit_to_company',
89-
'label_translation_parameters' => array(
87+
'label_translation_parameters' => [
9088
'%company%' => 'ACME Inc.',
91-
),
92-
));
89+
],
90+
]);
9391

9492
The ``label_translation_parameters`` option of buttons is merged with the same
9593
option of its parents, so buttons can reuse and/or override any of the parent

routing.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,7 @@ example to force the generation of ``/blog/1`` instead of ``/blog`` in the
529529
previous example) add the ``!`` character before the placeholder name: ``/blog/{!page}``
530530

531531
.. versionadded:: 4.3
532+
532533
The feature to force the inclusion of default values in generated URLs was
533534
introduced in Symfony 4.3.
534535

service_container/alias_private.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ or you decided not to maintain it anymore), you can deprecate its definition:
175175
<services>
176176
<service id="app.mailer" alias="App\Mail\PhpMailer">
177177
<!-- this will display a generic deprecation message... -->
178-
<deprecated />
178+
<deprecated/>
179179
180180
<!-- ...but you can also define a custom deprecation message -->
181181
<deprecated>The "%alias_id%" service alias is deprecated. Don't use it anymore.</deprecated>

0 commit comments

Comments
 (0)