Skip to content

Commit aacc1c2

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: Fix choice_label fix tilde not rendered in filesystem doc
2 parents 02b8e28 + 6f773fa commit aacc1c2

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

components/filesystem.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ following rules iteratively until no further processing can be done:
343343
- root paths ("/" and "C:/") always terminate with a slash;
344344
- non-root paths never terminate with a slash;
345345
- schemes (such as "phar://") are kept;
346-
- replace "~" with the user's home directory.
346+
- replace ``~`` with the user's home directory.
347347

348348
You can canonicalize a path with :method:`Symfony\\Component\\Filesystem\\Path::canonicalize`::
349349

reference/forms/types/enum.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ dots or spaces). If you need more flexibility for these labels, use the
5959

6060
->add('textAlign', EnumType::class, [
6161
'class' => TextAlign::class,
62-
'choice_label' => match ($choice) {
62+
'choice_label' => fn ($choice) => match ($choice) {
6363
TextAlign::Left => 'text_align.left.label',
6464
TextAlign::Center => 'text_align.center.label',
6565
TextAlign::Right => 'text_align.right.label',

0 commit comments

Comments
 (0)