Move allowEmpty to allowEmptyString and notEmpty to notEmptyString

app/src/Model/Table/ApiUsersTable.php

@@ -188,14 +188,14 @@ public function validationDefault(Validator $validator) {
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->allowEmpty('matchgrid_id');
+    $validator->allowEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
 
     $validator->add(
       'system_of_record_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->allowEmpty('system_of_record_id');
+    $validator->allowEmptyFor('system_of_record_id', Validator::EMPTY_NULL);
 
     return $validator; 
   }

app/src/Model/Table/AttributeGroupsTable.php

@@ -69,14 +69,14 @@ public function validationDefault(Validator $validator) {
       'length',
       [ 'rule' => [ 'maxLength', 32 ] ]
     );
-    $validator->notEmpty('name');
+    $validator->notEmptyString('name');
 
     $validator->add(
       'matchgrid_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->notEmpty('matchgrid_id');
+    $validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
 
     return $validator; 
   }

app/src/Model/Table/AttributeMappingsTable.php

@@ -136,22 +136,22 @@ public function validationDefault(Validator $validator) {
       [ 'rule' => [ 'maxLength', 80 ],
         'message' => __('match.er.val.length', [80]) ]
     );
-    $validator->notEmpty('name');
+    $validator->notEmptyString('name');
 
     $validator->add(
       'value',
       'length',
       [ 'rule' => [ 'maxLength', 80 ],
         'message' => __('match.er.val.length', [80]) ]
     );
-    $validator->notEmpty('description');
+    $validator->notEmptyrString('description');
 
     $validator->add(
       'attribute_map_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->notEmpty('attribute_map_id');
+    $validator->notEmptyFor('attribute_map_id', Validator::EMPTY_NULL);
 
     return $validator; 
   }

app/src/Model/Table/AttributeMapsTable.php

@@ -76,22 +76,22 @@ public function validationDefault(Validator $validator) {
       [ 'rule' => [ 'maxLength', 64 ],
         'message' => __('match.er.val.length', [64]) ]
     );
-    $validator->notEmpty('name');
+    $validator->notEmptyString('name');
 
     $validator->add(
       'description',
       'length',
       [ 'rule' => [ 'maxLength', 128 ],
         'message' => __('match.er.val.length', [128]) ]
     );
-    $validator->allowEmpty('description');
+    $validator->allowEmptyString('description');
 
     $validator->add(
       'matchgrid_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->notEmpty('matchgrid_id');
+    $validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
 
     return $validator; 
   }

app/src/Model/Table/AttributesTable.php

@@ -99,110 +99,110 @@ public function validationDefault(Validator $validator) {
       [ 'rule'     => [ 'validateSqlIdentifier' ],
         'provider' => 'table' ]
     );
-    $validator->notEmpty('name');
+    $validator->notEmptyString('name');
 
     $validator->add(
       'matchgrid_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->notEmpty('matchgrid_id');
+    $validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
 
     $validator->add(
       'description',
       'length',
       [ 'rule' => [ 'maxLength', 128 ],
         'message' => __('match.er.val.length', [128]) ]
     );
-    $validator->allowEmpty('description');
+    $validator->allowEmptyString('description');
 
     $validator->add(
       'api_name',
       'length',
       [ 'rule' => [ 'maxLength', 128 ],
         'message' => __('match.er.val.length', [128]) ]
     );
-    $validator->notEmpty('api_name');
+    $validator->notEmptyString('api_name');
 
     $validator->add(
       'index_display',
       'toggle',
       [ 'rule' => [ 'boolean' ] ]
     );
-    $validator->notEmpty('index_display');
+    $validator->notEmptyFor('index_display', Validator::EMPTY_NULL);
 
     $validator->add(
       'attribute_group_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->allowEmpty('attribute_group_id');
+    $validator->allowEmptyFor('attribute_group_id', Validator::EMPTY_NULL);
 
     $validator->add(
       'alphanumeric',
       'toggle',
       [ 'rule' => [ 'boolean' ] ]
     );
-    $validator->notEmpty('alphanumeric');
+    $validator->notEmptyFor('alphanumeric', Validator::EMPTY_NULL);
 
     $validator->add(
       'case_sensitive',
       'toggle',
       [ 'rule' => [ 'boolean' ] ]
     );
-    $validator->notEmpty('case_sensitive');
+    $validator->notEmptyFor('case_sensitive', Validator::EMPTY_NULL);
 
     $validator->add(
       'invalidates',
       'toggle',
       [ 'rule' => [ 'boolean' ] ]
     );
-    $validator->notEmpty('invalidates');
+    $validator->notEmptyFor('invalidates', Validator::EMPTY_NULL);
 
     $validator->add(
       'null_equivalents',
       'toggle',
       [ 'rule' => [ 'boolean' ] ]
     );
-    $validator->notEmpty('null_equivalents');
+    $validator->notEmptyFor('null_equivalents', Validator::EMPTY_NULL);
 
     $validator->add(
       'search_distance',
       'content',
       [ 'rule' => [ 'range', 1, 9 ],
         'message' => __('match.er.val.range', [1, 9]) ]
     );
-    $validator->allowEmpty('search_distance');
+    $validator->allowEmptyString('search_distance');
 
     $validator->add(
       'search_exact',
       'toggle',
       [ 'rule' => [ 'boolean' ] ]
     );
-    $validator->notEmpty('search_exact');
+    $validator->notEmptyFor('search_exact', Validator::EMPTY_NULL);
 
     $validator->add(
       'search_substr_from',
       'content',
       [ 'rule' => [ 'range', 0, 128 ],
         'message' => __('match.er.val.range', [0, 128]) ]
     );
-    $validator->allowEmpty('search_substr_from');
+    $validator->allowEmptyString('search_substr_from');
 
     $validator->add(
       'search_substr_for',
       'content',
       [ 'rule' => [ 'range', 1, 128 ],
         'message' => __('match.er.val.range', [1, 128]) ]
     );
-    $validator->allowEmpty('search_substr_for');
+    $validator->allowEmptyString('search_substr_for');
 
     $validator->add(
       'attribute_map_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->allowEmpty('attribute_map_id');
+    $validator->allowEmptyFor('attribute_map_id', Validator::EMPTY_NULL);
 
     return $validator; 
   }

app/src/Model/Table/MatchgridSettingsTable.php

@@ -184,7 +184,7 @@ public function validationDefault(Validator $validator) {
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->notEmpty('matchgrid_id');
+    $validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
 
     $validator->add(
       'referenceid_method',
@@ -194,21 +194,21 @@ public function validationDefault(Validator $validator) {
         ReferenceIdEnum::UUID
       ] ] ]
     );
-    $validator->notEmpty('referenceid_method');
+    $validator->notEmptyString('referenceid_method');
 
     $validator->add(
       'referenceid_start',
       'content',
       [ 'rule' => [ 'range', 1, null ] ]
     );
-    $validator->allowEmpty('referenceid_start');
+    $validator->allowEmptyFor('referenceid_start', Validator::EMPTY_NULL);
 
     $validator->add(
       'referenceid_prefix',
       'content',
       [ 'rule' => [ 'maxLength', 32 ] ]
     );
-    $validator->allowEmpty('referenceid_prefix');
+    $validator->allowEmptyString('referenceid_prefix');
 
     $validator->add(
       'notification_email',
@@ -220,7 +220,7 @@ public function validationDefault(Validator $validator) {
       'content',
       [ 'rule' => 'email' ]
     );
-    $validator->allowEmpty('notification_email');
+    $validator->allowEmptyString('notification_email');
 
     return $validator; 
   }

app/src/Model/Table/MatchgridsTable.php

@@ -179,14 +179,14 @@ public function validationDefault(Validator $validator) {
       [ 'rule'     => [ 'validateSqlIdentifier' ],
         'provider' => 'table' ]
     );
-    $validator->notEmpty('table_name');
+    $validator->notEmptyString('table_name');
 
     $validator->add(
       'description',
       'length',
       [ 'rule' => [ 'maxLength', 128 ] ]
     );
-    $validator->allowEmpty('description');
+    $validator->allowEmptyString('description');
 
     $validator->add(
       'status',
@@ -196,7 +196,7 @@ public function validationDefault(Validator $validator) {
         StatusEnum::Suspended
       ] ] ]
     );
-    $validator->notEmpty('status');
+    $validator->notEmptyString('status');
 
     return $validator; 
   }

app/src/Model/Table/MetaTable.php

@@ -71,7 +71,7 @@ public function validationDefault(Validator $validator) {
       'length',
       [ 'rule' => [ 'maxLength', 16 ] ]
     );
-    $validator->notEmpty('upgrade_version');
+    $validator->notEmptyString('upgrade_version');
 
     return $validator; 
   }

app/src/Model/Table/PermissionsTable.php

@@ -97,14 +97,14 @@ public function validationDefault(Validator $validator) {
       'length',
       [ 'rule' => [ 'maxLength', 128 ] ]
     );
-    $validator->notEmpty('username');
+    $validator->notEmptyString('username');
 
     $validator->add(
       'matchgrid_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->allowEmpty('matchgrid_id');
+    $validator->allowEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
 
     $validator->add(
       'permission',
@@ -131,7 +131,7 @@ public function validationDefault(Validator $validator) {
       'require' => 'matchgrid_id',
       'label' => __('match.ct.matchgrids', [1])
     ]);
-    $validator->notEmpty('permission');
+    $validator->notEmptyString('permission');
 
     return $validator; 
   }

app/src/Model/Table/RuleAttributesTable.php

@@ -98,21 +98,21 @@ public function validationDefault(Validator $validator) {
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->notEmpty('rule_id');
+    $validator->notEmptyFor('rule_id', Validator::EMPTY_NULL);
 
     $validator->add(
       'attribute_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->notEmpty('attribute_id');
+    $validator->notEmptyFor('attribute_id', Validator::EMPTY_NULL);
 
     $validator->add(
       'crosscheck_attribute_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->allowEmpty('crosscheck_attribute_id');
+    $validator->allowEmptyFor('crosscheck_attribute_id', Validator::EMPTY_NULL);
 
     $validator->add(
       'search_type',
@@ -125,22 +125,22 @@ public function validationDefault(Validator $validator) {
         SearchTypeEnum::Substring
       ] ] ]
     );
-    $validator->notEmpty('search_type');
+    $validator->notEmptyString('search_type');
 
     $validator->add(
       'required',
       'toggle',
       [ 'rule' => [ 'boolean' ] ]
     );
-    $validator->allowEmpty('required');
+    $validator->allowEmptyFor('required', Validator::EMPTY_NULL);
 
     $validator->add(
       'match_empty',
       'toggle',
       [ 'rule' => [ 'boolean' ] ]
     );
-    $validator->allowEmpty('match_empty');
-    
+    $validator->allowEmptyFor('match_empty', Validator::EMPTY_NULL);
+
     return $validator; 
   }
 }

app/src/Model/Table/RulesTable.php

@@ -85,21 +85,21 @@ public function validationDefault(Validator $validator) {
       'length',
       [ 'rule' => [ 'maxLength', 32 ] ]
     );
-    $validator->notEmpty('name');
+    $validator->notEmptyString('name');
 
     $validator->add(
       'matchgrid_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->notEmpty('matchgrid_id');
+    $validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
 
     $validator->add(
       'description',
       'length',
       [ 'rule' => [ 'maxLength', 128 ] ]
     );
-    $validator->allowEmpty('description');
+    $validator->allowEmptyString('description');
 
     $validator->add(
       'confidence_mode',
@@ -110,7 +110,7 @@ public function validationDefault(Validator $validator) {
         ConfidenceModeEnum::Suspended
       ] ] ]
     );
-    $validator->notEmpty('confidence_mode');
+    $validator->notEmptyString('confidence_mode');
 
     $validator->add(
       'ordr',

app/src/Model/Table/SystemsOfRecordTable.php

@@ -81,14 +81,14 @@ public function validationDefault(Validator $validator) {
       'length',
       [ 'rule' => [ 'maxLength', 80 ] ]
     );
-    $validator->notEmpty('label');
+    $validator->notEmptyString('label');
 
     $validator->add(
       'matchgrid_id',
       'content',
       [ 'rule' => 'isInteger' ]
     );
-    $validator->notEmpty('matchgrid_id');
+    $validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);
 
     $validator->add(
       'resolution_mode',
@@ -98,7 +98,7 @@ public function validationDefault(Validator $validator) {
         ResolutionModeEnum::Interactive
       ] ] ]
     );
-    $validator->notEmpty('resolution_mode');
+    $validator->notEmptyString('resolution_mode');
 
     $validator->add(
       'notification_email',
@@ -110,7 +110,7 @@ public function validationDefault(Validator $validator) {
       'content',
       [ 'rule' => 'email' ]
     );
-    $validator->allowEmpty('notification_email');
+    $validator->allowEmptyString('notification_email');
 
     return $validator; 
   }