Skip to content

Commit

Permalink
Merge branch 'develop' of github.internet2.edu:COmanage/match into de…
Browse files Browse the repository at this point in the history 
…velop
  • Loading branch information
Benn Oshrin committed Sep 19, 2021
2 parents a2bacab + 682a45c commit 2ca73e5
Show file tree
Hide file tree
Showing 4,958 changed files with 172,156 additions and 154,589 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion app/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"require": {
"php": ">=5.6",
"adodb/adodb-php": "^5.20",
"cakephp/cakephp": "3.8.*",
"cakephp/cakephp": "3.10.*",
"cakephp/migrations": "^1.0",
"cakephp/plugin-installer": "^1.0",
"doctrine/dbal": "^2.9",
Expand Down
1,958 changes: 1,388 additions & 570 deletions app/composer.lock
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions app/src/Model/Table/ApiUsersTable.php
View file
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->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;
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/Model/Table/AttributeGroupsTable.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/Model/Table/AttributeMappingsTable.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/Model/Table/AttributeMapsTable.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
30 changes: 15 additions & 15 deletions app/src/Model/Table/AttributesTable.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
10 changes: 5 additions & 5 deletions app/src/Model/Table/MatchgridSettingsTable.php
View file
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->notEmpty('matchgrid_id');
$validator->notEmptyFor('matchgrid_id', Validator::EMPTY_NULL);

$validator->add(
'referenceid_method',
Expand All @@ -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',
Expand All @@ -220,7 +220,7 @@ public function validationDefault(Validator $validator) {
'content',
[ 'rule' => 'email' ]
);
$validator->allowEmpty('notification_email');
$validator->allowEmptyString('notification_email');

return $validator;
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/Model/Table/MatchgridsTable.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -196,7 +196,7 @@ public function validationDefault(Validator $validator) {
StatusEnum::Suspended
] ] ]
);
$validator->notEmpty('status');
$validator->notEmptyString('status');

return $validator;
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/Model/Table/MetaTable.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public function validationDefault(Validator $validator) {
'length',
[ 'rule' => [ 'maxLength', 16 ] ]
);
$validator->notEmpty('upgrade_version');
$validator->notEmptyString('upgrade_version');

return $validator;
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/Model/Table/PermissionsTable.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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;
}
Expand Down
14 changes: 7 additions & 7 deletions app/src/Model/Table/RuleAttributesTable.php
View file
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->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',
Expand All @@ -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;
}
}
Loading

0 comments on commit 2ca73e5

Please sign in to comment.