Skip to content

Commit 0097c05

Browse files
committed
minor #11179 use same order for all configuration-blocks (OskarStark)
This PR was merged into the 3.4 branch. Discussion ---------- use same order for all configuration-blocks ensure the following order of code-blocks in a `.. configuration-block::` directive: 1. `php-annotations` 2. `yaml` 3. `xml` 4. `php` Commits ------- 7cfa0d7 use same order for all configuration-blocks
2 parents d07b542 + 7cfa0d7 commit 0097c05

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

components/translation/usage.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,16 @@ is done just as before:
6767
</file>
6868
</xliff>
6969
70+
.. code-block:: yaml
71+
72+
'Hello %name%': Bonjour %name%
73+
7074
.. code-block:: php
7175
7276
return [
7377
'Hello %name%' => 'Bonjour %name%',
7478
];
7579
76-
.. code-block:: yaml
77-
78-
'Hello %name%': Bonjour %name%
79-
8080
.. note::
8181

8282
The placeholders can take on any form as the full message is reconstructed

reference/constraints/Uuid.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,6 @@ Basic Usage
2525

2626
.. configuration-block::
2727

28-
.. code-block:: yaml
29-
30-
# src/AppBundle/Resources/config/validation.yml
31-
AppBundle\Entity\File:
32-
properties:
33-
identifier:
34-
- Uuid: ~
35-
3628
.. code-block:: php-annotations
3729
3830
// src/AppBundle/Entity/File.php
@@ -48,6 +40,14 @@ Basic Usage
4840
protected $identifier;
4941
}
5042
43+
.. code-block:: yaml
44+
45+
# src/AppBundle/Resources/config/validation.yml
46+
AppBundle\Entity\File:
47+
properties:
48+
identifier:
49+
- Uuid: ~
50+
5151
.. code-block:: xml
5252
5353
<!-- src/AppBundle/Resources/config/validation.xml -->

0 commit comments

Comments
 (0)