Skip to content

more consistency for master #11240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configuration/environment_variables.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
1 change: 1 addition & 0 deletions console/coloring.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions form/form_themes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions reference/constraints/Json.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
)));
]));
}
}

Expand Down
6 changes: 2 additions & 4 deletions reference/forms/types/button.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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;
// ...
Expand Down
2 changes: 1 addition & 1 deletion reference/forms/types/date.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
18 changes: 8 additions & 10 deletions reference/forms/types/options/attr_translation_parameters.rst.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 6 additions & 8 deletions reference/forms/types/reset.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 6 additions & 8 deletions reference/forms/types/submit.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions routing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion service_container/alias_private.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down