Skip to content

Commit 52b9ef1

Browse files
quickappsquickapps
committed
update, notEmpty is now notBlank
1 parent 92a6403 commit 52b9ef1

File tree

12 files changed

+33
-33
lines changed

12 files changed

+33
-33
lines changed

‎plugins/Block/src/Model/Table/BlocksTable.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ public function validationWidget(Validator $validator)
200200
return $validator
201201
->requirePresence('title')
202202
->add('title', [
203-
'notEmpty' => [
204-
'rule' => 'notEmpty',
203+
'notBlank' => [
204+
'rule' => 'notBlank',
205205
'message' => __d('block', 'You need to provide a title.'),
206206
],
207207
'length' => [
@@ -211,8 +211,8 @@ public function validationWidget(Validator $validator)
211211
])
212212
->requirePresence('description')
213213
->add('description', [
214-
'notEmpty' => [
215-
'rule' => 'notEmpty',
214+
'notBlank' => [
215+
'rule' => 'notBlank',
216216
'message' => __d('block', 'You need to provide a description.'),
217217
],
218218
'length' => [
@@ -238,7 +238,7 @@ public function validationWidget(Validator $validator)
238238
])
239239
->requirePresence('handler', 'create', __d('block', 'This field is required.'))
240240
->add('handler', 'validHandler', [
241-
'rule' => 'notEmpty',
241+
'rule' => 'notBlank',
242242
'on' => 'create',
243243
'message' => __d('block', 'Invalid block handler'),
244244
]);
@@ -259,8 +259,8 @@ public function validationCustom(Validator $validator)
259259
return $this->validationWidget($validator)
260260
->requirePresence('body')
261261
->add('body', [
262-
'notEmpty' => [
263-
'rule' => 'notEmpty',
262+
'notBlank' => [
263+
'rule' => 'notBlank',
264264
'message' => __d('block', "You need to provide a content for block's body."),
265265
],
266266
'length' => [

‎plugins/Comment/src/Model/Table/CommentsTable.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public function validationDefault(Validator $validator)
5252
{
5353
$validator
5454
->add('subject', [
55-
'notEmpty' => [
56-
'rule' => 'notEmpty',
55+
'notBlank' => [
56+
'rule' => 'notBlank',
5757
'message' => __d('comment', 'You need to provide a comment subject.'),
5858
],
5959
'length' => [
@@ -62,8 +62,8 @@ public function validationDefault(Validator $validator)
6262
]
6363
])
6464
->add('body', [
65-
'notEmpty' => [
66-
'rule' => 'notEmpty',
65+
'notBlank' => [
66+
'rule' => 'notBlank',
6767
'message' => __d('comment', 'Your comment message cannot be empty')
6868
],
6969
'length' => [

‎plugins/Eav/src/Model/Table/EavAttributesTable.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ public function validationDefault(Validator $validator)
6262
{
6363
$validator
6464
->add('name', [
65-
'notEmpty' => [
66-
'rule' => 'notEmpty',
65+
'notBlank' => [
66+
'rule' => 'notBlank',
6767
'message' => __d('eav', 'You need to provide a machine name.'),
6868
],
6969
'length' => [

‎plugins/Field/src/Event/TextField.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function entityValidate(Event $event, Field $field, Validator $validator)
6262
if ($field->metadata->required) {
6363
$validator
6464
->requirePresence($field->name, __d('field', 'This field required.'))
65-
->add($field->name, 'notEmpty', [
65+
->add($field->name, 'notBlank', [
6666
'rule' => function ($value, $context) use ($field) {
6767
if ($field->metadata->settings['type'] === 'textarea') {
6868
$clean = html_entity_decode(trim(strip_tags($value)));

‎plugins/Field/src/Model/Table/FieldInstancesTable.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ public function validationDefault(Validator $validator)
115115
$validator
116116
->notEmpty('handler', __d('field', 'Invalid field type.'))
117117
->add('label', [
118-
'notEmpty' => [
119-
'rule' => 'notEmpty',
118+
'notBlank' => [
119+
'rule' => 'notBlank',
120120
'message' => __d('field', 'You need to provide a label.'),
121121
],
122122
'length' => [

‎plugins/Locale/src/Model/Table/LanguagesTable.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ public function validationDefault(Validator $validator)
4747
{
4848
$validator
4949
->add('name', [
50-
'notEmpty' => [
51-
'rule' => 'notEmpty',
50+
'notBlank' => [
51+
'rule' => 'notBlank',
5252
'message' => __d('locale', 'You need to provide a language name.'),
5353
],
5454
'length' => [

‎plugins/Menu/src/Model/Table/MenuLinksTable.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ public function validationDefault(Validator $validator)
6969
])
7070
->requirePresence('title')
7171
->add('title', [
72-
'notEmpty' => [
73-
'rule' => 'notEmpty',
72+
'notBlank' => [
73+
'rule' => 'notBlank',
7474
'message' => __d('menu', 'You need to provide a title.'),
7575
],
7676
'length' => [

‎plugins/Menu/src/Model/Table/MenusTable.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public function validationDefault(Validator $validator)
5555
{
5656
$validator
5757
->add('title', [
58-
'notEmpty' => [
59-
'rule' => 'notEmpty',
58+
'notBlank' => [
59+
'rule' => 'notBlank',
6060
'message' => __d('menu', 'You need to provide a title.'),
6161
],
6262
'length' => [
@@ -66,7 +66,7 @@ public function validationDefault(Validator $validator)
6666
])
6767
->requirePresence('handler', 'create')
6868
->add('handler', 'validHandler', [
69-
'rule' => 'notEmpty',
69+
'rule' => 'notBlank',
7070
'on' => 'create',
7171
'message' => __d('menu', 'Invalid menu handler'),
7272
]);

‎plugins/Node/src/Model/Table/NodeTypesTable.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ public function validationDefault(Validator $validator)
5454
$validator
5555
->requirePresence('name')
5656
->add('name', [
57-
'notEmpty' => [
58-
'rule' => 'notEmpty',
57+
'notBlank' => [
58+
'rule' => 'notBlank',
5959
'message' => __d('node', 'You need to provide a content type name.'),
6060
],
6161
'length' => [
@@ -73,8 +73,8 @@ public function validationDefault(Validator $validator)
7373
])
7474
->requirePresence('title_label')
7575
->add('title_label', [
76-
'notEmpty' => [
77-
'rule' => 'notEmpty',
76+
'notBlank' => [
77+
'rule' => 'notBlank',
7878
'message' => __d('node', 'You need to provide a "Title Label".'),
7979
],
8080
'length' => [

‎plugins/Node/src/Model/Table/NodesTable.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ public function validationDefault(Validator $validator)
173173
{
174174
$validator
175175
->add('title', [
176-
'notEmpty' => [
177-
'rule' => 'notEmpty',
176+
'notBlank' => [
177+
'rule' => 'notBlank',
178178
'message' => __d('node', 'You need to provide a title.'),
179179
],
180180
'length' => [

‎plugins/Taxonomy/src/Model/Table/TermsTable.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ public function validationDefault(Validator $validator)
5353
$validator
5454
->requirePresence('name')
5555
->add('name', [
56-
'notEmpty' => [
57-
'rule' => 'notEmpty',
56+
'notBlank' => [
57+
'rule' => 'notBlank',
5858
'message' => __d('taxonomy', 'You need to provide a name.'),
5959
],
6060
'length' => [

‎plugins/User/src/Model/Table/RolesTable.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ public function validationDefault(Validator $validator)
4343
$validator
4444
->requirePresence('name')
4545
->add('name', [
46-
'notEmpty' => [
47-
'rule' => 'notEmpty',
46+
'notBlank' => [
47+
'rule' => 'notBlank',
4848
'message' => __d('user', 'You need to provide a role name.'),
4949
],
5050
'length' => [

0 commit comments

Comments
 (0)