From 57063f6dedcbd4f7344a020f8c06e5625fc56a97 Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Tue, 21 Sep 2021 22:18:08 +0300 Subject: [PATCH] Replace Validator::notEmpty with Validator::notBlank --- app/src/Model/Table/AttributeGroupsTable.php | 2 +- app/src/Model/Table/AttributeMappingsTable.php | 2 +- app/src/Model/Table/AttributeMapsTable.php | 2 +- app/src/Model/Table/AttributesTable.php | 14 +++++++------- app/src/Model/Table/MatchgridSettingsTable.php | 2 +- app/src/Model/Table/RuleAttributesTable.php | 4 ++-- app/src/Model/Table/RulesTable.php | 2 +- app/src/Model/Table/SystemsOfRecordTable.php | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/Model/Table/AttributeGroupsTable.php b/app/src/Model/Table/AttributeGroupsTable.php index 27b31fae6..f54bd1ed1 100644 --- a/app/src/Model/Table/AttributeGroupsTable.php +++ b/app/src/Model/Table/AttributeGroupsTable.php @@ -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; } diff --git a/app/src/Model/Table/AttributeMappingsTable.php b/app/src/Model/Table/AttributeMappingsTable.php index 33b560c6b..ff1206e9e 100644 --- a/app/src/Model/Table/AttributeMappingsTable.php +++ b/app/src/Model/Table/AttributeMappingsTable.php @@ -151,7 +151,7 @@ public function validationDefault(Validator $validator) { 'content', [ 'rule' => 'isInteger' ] ); - $validator->notEmptyFor('attribute_map_id', Validator::EMPTY_NULL); + $validator->notBlank('attribute_map_id'); return $validator; } diff --git a/app/src/Model/Table/AttributeMapsTable.php b/app/src/Model/Table/AttributeMapsTable.php index 3df136888..1b7aca330 100644 --- a/app/src/Model/Table/AttributeMapsTable.php +++ b/app/src/Model/Table/AttributeMapsTable.php @@ -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; } diff --git a/app/src/Model/Table/AttributesTable.php b/app/src/Model/Table/AttributesTable.php index 96b1e4b01..67c1e0662 100644 --- a/app/src/Model/Table/AttributesTable.php +++ b/app/src/Model/Table/AttributesTable.php @@ -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', @@ -129,7 +129,7 @@ public function validationDefault(Validator $validator) { 'toggle', [ 'rule' => [ 'boolean' ] ] ); - $validator->notEmptyFor('index_display', Validator::EMPTY_NULL); + $validator->notBlank('index_display'); $validator->add( 'attribute_group_id', @@ -143,28 +143,28 @@ public function validationDefault(Validator $validator) { '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', @@ -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', diff --git a/app/src/Model/Table/MatchgridSettingsTable.php b/app/src/Model/Table/MatchgridSettingsTable.php index a3f3f93d8..de9ad8bb4 100644 --- a/app/src/Model/Table/MatchgridSettingsTable.php +++ b/app/src/Model/Table/MatchgridSettingsTable.php @@ -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', diff --git a/app/src/Model/Table/RuleAttributesTable.php b/app/src/Model/Table/RuleAttributesTable.php index 11e977a52..246987192 100644 --- a/app/src/Model/Table/RuleAttributesTable.php +++ b/app/src/Model/Table/RuleAttributesTable.php @@ -98,14 +98,14 @@ 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', diff --git a/app/src/Model/Table/RulesTable.php b/app/src/Model/Table/RulesTable.php index f1c0fff6d..9d34caaba 100644 --- a/app/src/Model/Table/RulesTable.php +++ b/app/src/Model/Table/RulesTable.php @@ -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', diff --git a/app/src/Model/Table/SystemsOfRecordTable.php b/app/src/Model/Table/SystemsOfRecordTable.php index 9d63f80b5..864c8658f 100644 --- a/app/src/Model/Table/SystemsOfRecordTable.php +++ b/app/src/Model/Table/SystemsOfRecordTable.php @@ -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',