Skip to content

Commit 2582a1e

Browse files
committed
Merge branch '5.4' into 6.2
* 5.4: Update environment processor page [Uid] Fix Uid config example Add Form is_empty_callback option
2 parents a8c5c53 + b79094b commit 2582a1e

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

components/uid.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ configure the behavior of the factory using configuration files::
100100
uid:
101101
default_uuid_version: 6
102102
name_based_uuid_version: 5
103-
name_based_uuid_namespace: ~
103+
name_based_uuid_namespace: 6ba7b810-9dad-11d1-80b4-00c04fd430c8
104104
time_based_uuid_version: 6
105-
time_based_uuid_node: ~
105+
time_based_uuid_node: 121212121212
106106
107107
.. code-block:: xml
108108
@@ -119,9 +119,9 @@ configure the behavior of the factory using configuration files::
119119
<framework:uid
120120
default_uuid_version="6"
121121
name_based_uuid_version="5"
122-
name_based_uuid_namespace=""
122+
name_based_uuid_namespace="6ba7b810-9dad-11d1-80b4-00c04fd430c8"
123123
time_based_uuid_version="6"
124-
time_based_uuid_node=""
124+
time_based_uuid_node="121212121212"
125125
/>
126126
</framework:config>
127127
</container>
@@ -141,9 +141,9 @@ configure the behavior of the factory using configuration files::
141141
'uid' => [
142142
'default_uuid_version' => 6,
143143
'name_based_uuid_version' => 5,
144-
'name_based_uuid_namespace' => '',
144+
'name_based_uuid_namespace' => '6ba7b810-9dad-11d1-80b4-00c04fd430c8',
145145
'time_based_uuid_version' => 6,
146-
'time_based_uuid_node' => '',
146+
'time_based_uuid_node' => 121212121212,
147147
],
148148
]);
149149
};

configuration/env_var_processors.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ Symfony provides the following env var processors:
441441
442442
# config/packages/framework.yaml
443443
parameters:
444-
env(AUTH_FILE): '../config/auth.json'
444+
env(AUTH_FILE): '%kernel.project_dir%/config/auth.json'
445445
google:
446446
auth: '%env(file:AUTH_FILE)%'
447447
@@ -482,7 +482,7 @@ Symfony provides the following env var processors:
482482
483483
# config/packages/framework.yaml
484484
parameters:
485-
env(PHP_FILE): '../config/.runtime-evaluated.php'
485+
env(PHP_FILE): '%kernel.project_dir%/config/.runtime-evaluated.php'
486486
app:
487487
auth: '%env(require:PHP_FILE)%'
488488
@@ -524,7 +524,7 @@ Symfony provides the following env var processors:
524524
525525
# config/packages/framework.yaml
526526
parameters:
527-
env(AUTH_FILE): '../config/auth.json'
527+
env(AUTH_FILE): '%kernel.project_dir%/config/auth.json'
528528
google:
529529
auth: '%env(trim:file:AUTH_FILE)%'
530530

reference/forms/types/form.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,13 @@ The actual default value of this option depends on other field options:
6464
* If ``data_class`` is not set and ``compound`` is ``false``, then ``''``
6565
(empty string).
6666

67+
``is_empty_callback``
68+
~~~~~~~~~~~~~~~~~~~~~
69+
70+
**type**: ``callable`` **default**: ``null``
71+
72+
This callable takes form data and returns whether value is considered empty.
73+
6774
.. include:: /reference/forms/types/options/empty_data_description.rst.inc
6875

6976
.. _reference-form-option-error-bubbling:

0 commit comments

Comments
 (0)