Skip to content
Jump to bottom

CO-2218_notEmptyFor_is_not_a_function #10

Merged
merged 2 commits into from
Sep 21, 2021
Merged

CO-2218_notEmptyFor_is_not_a_function #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9c5086
Replace Validator::notEmpty with Validator::notBlank
Sep 21, 2021
105715a
Validator::EMPTY_NULL is not a valid flag for allowEmptyFor
Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/Model/Table/ApiUsersTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,14 +188,14 @@ public function validationDefault(Validator $validator) {
'content',
[ 'rule' => 'isInteger' ]
);
$validator->allowEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
$validator->allowEmpty('matchgrid_id');

$validator->add(
'system_of_record_id',
'content',
[ 'rule' => 'isInteger' ]
);
$validator->allowEmptyFor('system_of_record_id', Validator::EMPTY_NULL);
$validator->allowEmpty('system_of_record_id');

return $validator;
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/Model/Table/AttributeGroupsTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public function validationDefault(Validator $validator) {
'content',
[ 'rule' => 'isInteger' ]
);
$validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
$validator->notBlank('matchgrid_id');

return $validator;
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/Model/Table/AttributeMappingsTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,14 @@ public function validationDefault(Validator $validator) {
[ 'rule' => [ 'maxLength', 80 ],
'message' => __('match.er.val.length', [80]) ]
);
$validator->notEmptyrString('description');
$validator->notEmptyString('description');

$validator->add(
'attribute_map_id',
'content',
[ 'rule' => 'isInteger' ]
);
$validator->notEmptyFor('attribute_map_id', Validator::EMPTY_NULL);
$validator->notBlank('attribute_map_id');

return $validator;
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/Model/Table/AttributeMapsTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function validationDefault(Validator $validator) {
'content',
[ 'rule' => 'isInteger' ]
);
$validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
$validator->notBlank('matchgrid_id');

return $validator;
}
Expand Down
18 changes: 9 additions & 9 deletions app/src/Model/Table/AttributesTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public function validationDefault(Validator $validator) {
'content',
[ 'rule' => 'isInteger' ]
);
$validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
$validator->notBlank('matchgrid_id');

$validator->add(
'description',
Expand All @@ -129,42 +129,42 @@ public function validationDefault(Validator $validator) {
'toggle',
[ 'rule' => [ 'boolean' ] ]
);
$validator->notEmptyFor('index_display', Validator::EMPTY_NULL);
$validator->notBlank('index_display');

$validator->add(
'attribute_group_id',
'content',
[ 'rule' => 'isInteger' ]
);
$validator->allowEmptyFor('attribute_group_id', Validator::EMPTY_NULL);
$validator->allowEmpty('attribute_group_id');

$validator->add(
'alphanumeric',
'toggle',
[ 'rule' => [ 'boolean' ] ]
);
$validator->notEmptyFor('alphanumeric', Validator::EMPTY_NULL);
$validator->notBlank('alphanumeric');

$validator->add(
'case_sensitive',
'toggle',
[ 'rule' => [ 'boolean' ] ]
);
$validator->notEmptyFor('case_sensitive', Validator::EMPTY_NULL);
$validator->notBlank('case_sensitive');

$validator->add(
'invalidates',
'toggle',
[ 'rule' => [ 'boolean' ] ]
);
$validator->notEmptyFor('invalidates', Validator::EMPTY_NULL);
$validator->notBlank('invalidates');

$validator->add(
'null_equivalents',
'toggle',
[ 'rule' => [ 'boolean' ] ]
);
$validator->notEmptyFor('null_equivalents', Validator::EMPTY_NULL);
$validator->notBlank('null_equivalents');

$validator->add(
'search_distance',
Expand All @@ -179,7 +179,7 @@ public function validationDefault(Validator $validator) {
'toggle',
[ 'rule' => [ 'boolean' ] ]
);
$validator->notEmptyFor('search_exact', Validator::EMPTY_NULL);
$validator->notBlank('search_exact');

$validator->add(
'search_substr_from',
Expand All @@ -202,7 +202,7 @@ public function validationDefault(Validator $validator) {
'content',
[ 'rule' => 'isInteger' ]
);
$validator->allowEmptyFor('attribute_map_id', Validator::EMPTY_NULL);
$validator->allowEmpty('attribute_map_id');

return $validator;
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/Model/Table/MatchgridSettingsTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public function validationDefault(Validator $validator) {
'content',
[ 'rule' => 'isInteger' ]
);
$validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
$validator->notBlank('matchgrid_id');

$validator->add(
'referenceid_method',
Expand All @@ -201,7 +201,7 @@ public function validationDefault(Validator $validator) {
'content',
[ 'rule' => [ 'range', 1, null ] ]
);
$validator->allowEmptyFor('referenceid_start', Validator::EMPTY_NULL);
$validator->allowEmpty('referenceid_start');

$validator->add(
'referenceid_prefix',
Expand Down
2 changes: 1 addition & 1 deletion app/src/Model/Table/PermissionsTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public function validationDefault(Validator $validator) {
'content',
[ 'rule' => 'isInteger' ]
);
$validator->allowEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
$validator->allowEmpty('matchgrid_id');

$validator->add(
'permission',
Expand Down
10 changes: 5 additions & 5 deletions app/src/Model/Table/RuleAttributesTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,21 +98,21 @@ public function validationDefault(Validator $validator) {
'content',
[ 'rule' => 'isInteger' ]
);
$validator->notEmptyFor('rule_id', Validator::EMPTY_NULL);
$validator->notBlank('rule_id');

$validator->add(
'attribute_id',
'content',
[ 'rule' => 'isInteger' ]
);
$validator->notEmptyFor('attribute_id', Validator::EMPTY_NULL);
$validator->notBlank('attribute_id');

$validator->add(
'crosscheck_attribute_id',
'content',
[ 'rule' => 'isInteger' ]
);
$validator->allowEmptyFor('crosscheck_attribute_id', Validator::EMPTY_NULL);
$validator->allowEmpty('crosscheck_attribute_id');

$validator->add(
'search_type',
Expand All @@ -132,14 +132,14 @@ public function validationDefault(Validator $validator) {
'toggle',
[ 'rule' => [ 'boolean' ] ]
);
$validator->allowEmptyFor('required', Validator::EMPTY_NULL);
$validator->allowEmpty('required');

$validator->add(
'match_empty',
'toggle',
[ 'rule' => [ 'boolean' ] ]
);
$validator->allowEmptyFor('match_empty', Validator::EMPTY_NULL);
$validator->allowEmpty('match_empty');

return $validator;
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/Model/Table/RulesTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public function validationDefault(Validator $validator) {
'content',
[ 'rule' => 'isInteger' ]
);
$validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
$validator->notBlank('matchgrid_id');

$validator->add(
'description',
Expand Down
2 changes: 1 addition & 1 deletion app/src/Model/Table/SystemsOfRecordTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public function validationDefault(Validator $validator) {
'content',
[ 'rule' => 'isInteger' ]
);
$validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
$validator->notBlank('matchgrid_id');

$validator->add(
'resolution_mode',
Expand Down