Skip to content

Commit f094dca

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: clarify how to disable client-side validation using the Regex constraint example function param 1 requires string
2 parents f6f6eb9 + e75bb1e commit f094dca

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

components/var_dumper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ For example, to get a dump as a string in a variable, you can do::
623623

624624
$dumper->dump(
625625
$cloner->cloneVar($variable),
626-
function (int $line, int $depth) use (&$output): void {
626+
function (string $line, int $depth) use (&$output): void {
627627
// A negative depth means "end of dump"
628628
if ($depth >= 0) {
629629
// Adds a two spaces indentation to the line

reference/constraints/Regex.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ Options
163163
``htmlPattern``
164164
~~~~~~~~~~~~~~~
165165

166-
**type**: ``string|boolean`` **default**: ``null``
166+
**type**: ``string|null`` **default**: ``null``
167167

168168
This option specifies the pattern to use in the HTML5 ``pattern`` attribute.
169169
You usually don't need to specify this option because by default, the constraint
@@ -243,7 +243,7 @@ need to specify the HTML5 compatible pattern in the ``htmlPattern`` option:
243243
}
244244
}
245245
246-
Setting ``htmlPattern`` to false will disable client side validation.
246+
Setting ``htmlPattern`` to the empty string will disable client side validation.
247247

248248
``match``
249249
~~~~~~~~~

0 commit comments

Comments
 (0)