Skip to content

Commit a56167e

Browse files
committed
Merge branch '4.4' into 5.2
* 4.4: [Validator] Mention IsNull in Basic Constraints Show example how to set xdebug.file_link_format
2 parents 40deb21 + 3ff1ecf commit a56167e

File tree

5 files changed

+19
-1
lines changed

5 files changed

+19
-1
lines changed

reference/configuration/framework.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,13 @@ Since every developer uses a different IDE, the recommended way to enable this
462462
feature is to configure it on a system level. This can be done by setting the
463463
``xdebug.file_link_format`` option in your ``php.ini`` configuration file. The
464464
format to use is the same as for the ``framework.ide`` option, but without the
465-
need to escape the percent signs (``%``) by doubling them.
465+
need to escape the percent signs (``%``) by doubling them::
466+
467+
// example for PhpStorm
468+
xdebug.file_link_format="phpstorm://open?file=%f&line=%l"
469+
470+
// example for Sublime
471+
xdebug.file_link_format="subl://open?url=file://%f&line=%l"
466472

467473
.. note::
468474

reference/constraints/IsFalse.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ method returns **false**:
125125
// ...
126126
}
127127
128+
.. include:: /reference/constraints/_null-values-are-valid.rst.inc
129+
128130
Options
129131
-------
130132

reference/constraints/IsTrue.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ Then you can validate this method with ``IsTrue`` as follows:
129129
130130
If the ``isTokenValid()`` returns false, the validation will fail.
131131

132+
.. include:: /reference/constraints/_null-values-are-valid.rst.inc
133+
132134
Options
133135
-------
134136

reference/constraints/Type.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ This will check if ``emailAddress`` is an instance of ``Symfony\Component\Mime\A
169169
}
170170
}
171171
172+
.. include:: /reference/constraints/_null-values-are-valid.rst.inc
173+
172174
Options
173175
-------
174176

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.. note::
2+
3+
As with most of the other constraints, ``null`` is
4+
considered a valid value. This is to allow the use of optional values.
5+
If the value is mandatory, a common solution is to combine this constraint
6+
with :doc:`NotNull </reference/constraints/NotNull>`.

0 commit comments

Comments
 (0)