Replace Validator::notEmpty with Validator::notBlank

COmanage · Sep 21, 2021 · a9c5086 · a9c5086
1 parent 682a45c
commit a9c5086
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git 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
@@ -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; 
   }

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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',