Skip to content

Commit 3ccc7a2

Browse files
authored
Merge pull request #7672 from kenjis/docs-validation-rules
docs: improve Validation
2 parents d692016 + ca4a6ba commit 3ccc7a2

18 files changed

Lines changed: 57 additions & 44 deletions

File tree

user_guide_src/source/installation/upgrade_435.rst

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,20 @@ Breaking Changes
1818
Validation Placeholders
1919
=======================
2020

21-
- To use :ref:`validation-placeholders` securely, please remember to create a validation rule for the field you will use as a placeholder.
21+
To use :ref:`validation-placeholders` securely, please remember to create a validation rule for the field you will use as a placeholder.
22+
23+
E.g., if you have the following code::
24+
25+
$validation->setRules([
26+
'email' => 'required|max_length[254]|valid_email|is_unique[users.email,id,{id}]',
27+
]);
28+
29+
You need to add the rules for ``{id}``::
30+
31+
$validation->setRules([
32+
'id' => 'max_length[19]|is_natural_no_zero', // Add this
33+
'email' => 'required|max_length[254]|valid_email|is_unique[users.email,id,{id}]',
34+
]);
2235

2336
Session::stop()
2437
===============

user_guide_src/source/libraries/validation/002.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
// ...
44

55
$rules = [
6-
'username' => 'required',
7-
'password' => 'required|min_length[10]',
8-
'passconf' => 'required|matches[password]',
9-
'email' => 'required|valid_email',
6+
'username' => 'required|max_length[30]',
7+
'password' => 'required|max_length[255]|min_length[10]',
8+
'passconf' => 'required|max_length[255]|matches[password]',
9+
'email' => 'required|max_length[254]|valid_email',
1010
];
1111

1212
// ...
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?php
22

3-
$validation->setRule('username', 'Username', 'required|min_length[3]');
4-
$validation->setRule('password', 'Password', ['required', 'min_length[8]', 'alpha_numeric_punct']);
3+
$validation->setRule('username', 'Username', 'required|max_length[30]|min_length[3]');
4+
$validation->setRule('password', 'Password', ['required', 'max_length[255]', 'min_length[8]', 'alpha_numeric_punct']);
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

33
$validation->setRules([
4-
'username' => 'required',
5-
'password' => 'required|min_length[10]',
4+
'username' => 'required|max_length[30]',
5+
'password' => 'required|max_length[255]|min_length[10]',
66
]);
77
// or
88
$validation->setRules([
9-
'username' => 'required',
10-
'password' => ['required', 'min_length[10]'],
9+
'username' => ['required', 'max_length[30]'],
10+
'password' => ['required', 'max_length[255]', 'min_length[10]'],
1111
]);
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

33
$validation->setRules([
4-
'username' => ['label' => 'Username', 'rules' => 'required'],
5-
'password' => ['label' => 'Password', 'rules' => 'required|min_length[10]'],
4+
'username' => ['label' => 'Username', 'rules' => 'required|max_length[30]'],
5+
'password' => ['label' => 'Password', 'rules' => 'required|max_length[255]|min_length[10]'],
66
]);
77
// or
88
$validation->setRules([
9-
'username' => ['label' => 'Username', 'rules' => 'required'],
10-
'password' => ['label' => 'Password', 'rules' => ['required', 'min_length[10]']],
9+
'username' => ['label' => 'Username', 'rules' => 'required|max_length[30]'],
10+
'password' => ['label' => 'Password', 'rules' => ['required', '|max_length[255]', 'min_length[10]']],
1111
]);

user_guide_src/source/libraries/validation/009.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
// Joe Smith
2121
$validation->setRules([
22-
'contacts.name' => 'required',
22+
'contacts.name' => 'required|max_length[60]',
2323
]);
2424

2525
// Fred Flintsone & Wilma
2626
$validation->setRules([
27-
'contacts.friends.name' => 'required',
27+
'contacts.friends.name' => 'required|max_length[60]',
2828
]);

user_guide_src/source/libraries/validation/010.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
// Fred Flintsone & Wilma
44
$validation->setRules([
5-
'contacts.*.name' => 'required',
5+
'contacts.*.name' => 'required|max_length[60]',
66
]);

user_guide_src/source/libraries/validation/011.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313

1414
// Rule
1515
$validation->setRules([
16-
'user_ids.*' => 'required',
16+
'user_ids.*' => 'required|max_length[19]',
1717
]);

user_guide_src/source/libraries/validation/013.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
class Validation
66
{
77
public $signup = [
8-
'username' => 'required',
9-
'password' => 'required',
10-
'pass_confirm' => 'required|matches[password]',
11-
'email' => 'required|valid_email',
8+
'username' => 'required|max_length[30]',
9+
'password' => 'required|max_length[255]',
10+
'pass_confirm' => 'required|max_length[255]|matches[password]',
11+
'email' => 'required|max_length[254]|valid_email',
1212
];
1313

1414
// ...

user_guide_src/source/libraries/validation/015.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
class Validation
66
{
77
public $signup = [
8-
'username' => 'required',
9-
'password' => 'required',
10-
'pass_confirm' => 'required|matches[password]',
11-
'email' => 'required|valid_email',
8+
'username' => 'required|max_length[30]',
9+
'password' => 'required|max_length[255]',
10+
'pass_confirm' => 'required|max_length[255]|matches[password]',
11+
'email' => 'required|max_length[254]|valid_email',
1212
];
1313

1414
public $signup_errors = [

0 commit comments

Comments
 (0)