Skip to content

Commit 642e776

Browse files
committed
bug #3544 Fix build errors (xabbuh)
This PR was merged into the master branch. Discussion ---------- Fix build errors | Q | A | ------------- | --- | Doc fix? | yes | New docs? | no | Applies to | 2.5 | Fixed tickets | Commits ------- 46e0b52 remove empty_data from the list of inherited options, it's documented in the overriden options section 7e3c0e3 readd configuration block 64602c8 fix referenced documents names
2 parents bdc6c3f + 46e0b52 commit 642e776

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

book/security.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1437,7 +1437,7 @@ is available by calling the PHP function :phpfunction:`hash_algos`.
14371437
.. tip::
14381438

14391439
It's also possible to use different hashing algorithms on a user-by-user
1440-
basis. See :doc:`/cookbook/security/named-encoders` for more details.
1440+
basis. See :doc:`/cookbook/security/named_encoders` for more details.
14411441

14421442
Determining the Hashed Password
14431443
...............................

cookbook/security/named_encoders.rst

+5-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ How to Choose the Password Encoder Algorithm Dynamically
1010
Usually, the same password encoder is used for all users by configuring it
1111
to apply to all instances of a specific class:
1212

13+
.. configuration-block::
14+
15+
.. code-block:: yaml
16+
1317
# app/config/security.yml
1418
security:
1519
# ...
@@ -117,7 +121,7 @@ the name of the encoder to use::
117121
if ($this->isAdmin()) {
118122
return 'harsh';
119123
}
120-
124+
121125
return null; // use the default encoder
122126
}
123127
}

reference/forms/types/checkbox.rst

-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ These options inherit from the :doc:`form </reference/forms/types/form>` type:
6060

6161
.. include:: /reference/forms/types/options/data.rst.inc
6262

63-
.. include:: /reference/forms/types/options/empty_data.rst.inc
64-
6563
.. include:: /reference/forms/types/options/required.rst.inc
6664

6765
.. include:: /reference/forms/types/options/label.rst.inc

reference/forms/types/collection.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -379,4 +379,4 @@ error_bubbling
379379

380380
.. include:: /reference/forms/types/options/mapped.rst.inc
381381

382-
.. include:: /reference/forms/type/options/cascade_validation.rst.inc
382+
.. include:: /reference/forms/types/options/cascade_validation.rst.inc

reference/forms/types/options/checkbox_empty_data.rst.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ empty_data
66
This option determines what value the field will return when the ``empty_value``
77
choice is selected.
88
In checkbox, the value of ``empty_data`` is overriden by the value returned by
9-
the data transformer (see :doc:`/cookbook/form/data_transformers.rst`).
9+
the data transformer (see :doc:`/cookbook/form/data_transformers`).

0 commit comments

Comments
 (0)