Skip to content

Commit 888bfe8

Browse files
committed
Merge branch '5.1' into 5.x
* 5.1: add a note about npm commands equivalent to yarn's Fix: DOCtor-RST Enhancement: New rules for DOCtor-RST. [symfony#14421] Merged the new description into the current sentence Adding more information about default translation domain 'messages'
2 parents d0abaf0 + d33b779 commit 888bfe8

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

.doctor-rst.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ rules:
2525
no_namespace_after_use_statements: ~
2626
no_php_open_tag_in_code_block_php_directive: ~
2727
no_space_before_self_xml_closing_tag: ~
28+
only_backslashes_in_namespace_in_php_code_block: ~
29+
only_backslashes_in_use_statements_in_php_code_block: ~
2830
ordered_use_statements: ~
2931
php_prefix_before_bin_console: ~
3032
replace_code_block_types: ~

frontend/encore/simple-example.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,18 @@ To build the assets, run:
6363
6464
# compile assets once
6565
$ yarn encore dev
66+
# if you prefer npm, run:
67+
$ npm run dev
6668
6769
# or, recompile assets automatically when files change
6870
$ yarn encore dev --watch
71+
# if you prefer npm, run:
72+
$ npm run watch
6973
7074
# on deploy, create a production build
7175
$ yarn encore production
76+
# if you prefer npm, run:
77+
$ npm run build
7278
7379
.. note::
7480

service_container/tags.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ tags, is to implement the static ``getDefaultPriority()`` method on the
643643
service itself::
644644

645645
// src/Handler/One.php
646-
namespace App/Handler;
646+
namespace App\Handler;
647647

648648
class One
649649
{

translation.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,9 +408,10 @@ priority message files.
408408
The filename of the translation files is also important: each message file
409409
must be named according to the following path: ``domain.locale.loader``:
410410

411-
* **domain**: An optional way to organize messages into groups. Unless
411+
* **domain**: Domains are a way to organize messages into groups. Unless
412412
parts of the application are explicitly separated from each other, it is
413-
recommended to only use default ``messages`` domain;
413+
recommended to only use the default ``messages`` domain (e.g.
414+
``messages.en.yaml``).
414415

415416
* **locale**: The locale that the translations are for (e.g. ``en_GB``, ``en``, etc);
416417

0 commit comments

Comments
 (0)