AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some code duplication (validation rules)

Browse Source
This commit is contained in:
Frédéric Guillot
2014-09-12 15:57:05 +02:00
parent 15e1ed6148
commit c3a0cf4343
6 changed files with 162 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/Model/Comment.php
View File

@@ -155,13 +155,12 @@ class Comment extends Base
*/
public function validateCreation(array $values)
{
$v = new Validator($values, array(
new Validators\Required('task_id', t('This value is required')),
new Validators\Integer('task_id', t('This value must be an integer')),
$rules = array(
new Validators\Required('user_id', t('This value is required')),
new Validators\Integer('user_id', t('This value must be an integer')),
new Validators\Required('comment', t('Comment is required'))
));
new Validators\Required('task_id', t('This value is required')),
);
$v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
return array(
$v->execute(),
@@ -178,15 +177,31 @@ class Comment extends Base
*/
public function validateModification(array $values)
{
$v = new Validator($values, array(
$rules = array(
new Validators\Required('id', t('This value is required')),
new Validators\Integer('id', t('This value must be an integer')),
new Validators\Required('comment', t('Comment is required'))
));
);
$v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
return array(
$v->execute(),
$v->getErrors()
);
}
/**
* Common validation rules
*
* @access private
* @return array
*/
private function commonValidationRules()
{
return array(
new Validators\Integer('id', t('This value must be an integer')),
new Validators\Integer('task_id', t('This value must be an integer')),
new Validators\Integer('user_id', t('This value must be an integer')),
new Validators\Required('comment', t('Comment is required'))
);
}
}