Skip to content

remove some comments #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 9, 2019
Merged

remove some comments #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccbde4d
Update ErrorMessageTrait.php
inhere Jan 9, 2019
d59cb6e
Update UserAndContextValidatorsTrait.php
inhere Jan 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/Utils/ErrorMessageTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

/**
* trait ErrorMessageTrait
* @author inhere
* @package Inhere\Validate\Utils
*/
trait ErrorMessageTrait
Expand Down Expand Up @@ -304,7 +305,6 @@ public function firstError($onlyMsg = true)

/**
* 得到最后一个错误信息
* @author inhere
* @param bool $onlyMsg
* @return array|string
*/
Expand Down Expand Up @@ -383,8 +383,6 @@ public function setMessages(array $messages): self

/**
* 各个验证器的提示消息
* @author inhere
* @date 2015-09-27
* @param string|\Closure $validator 验证器
* @param string $field
* @param array $args
Expand Down
13 changes: 6 additions & 7 deletions src/Utils/UserAndContextValidatorsTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,7 @@ public function required(string $field, $value = null): bool
}

/**
* 如果指定的另一个字段（ anotherField ）值等于任何一个 value 时，此字段为 必填
* @from laravel
* 如果指定的另一个字段（ anotherField ）值等于任何一个 value 时，此字段为 必填 (refer laravel)
* @param string $field
* @param mixed $fieldVal
* @param string $anotherField
Expand All @@ -182,7 +181,7 @@ public function requiredIf(string $field, $fieldVal, string $anotherField, $valu
}

/**
* 如果指定的另一个字段（ anotherField ）值等于任何一个 value 时，此字段为 不必填
* 如果指定的另一个字段（ anotherField ）值等于任何一个 value 时，此字段为 不必填(refer laravel)
* @param string $field
* @param mixed $fieldVal
* @param string $anotherField
Expand All @@ -203,7 +202,7 @@ public function requiredUnless(string $field, $fieldVal, string $anotherField, $
}

/**
* 如果指定的其他字段中的 任意一个 有值且不为空，则此字段为 必填
* 如果指定的其他字段中的 任意一个 有值且不为空，则此字段为 必填(refer laravel)
* @param string $field
* @param mixed $fieldVal
* @param array|string $fields
Expand All @@ -221,7 +220,7 @@ public function requiredWith(string $field, $fieldVal, $fields)
}

/**
* 如果指定的 所有字段 都有值且不为空，则此字段为 必填
* 如果指定的 所有字段 都有值且不为空，则此字段为 必填(refer laravel)
* @param string $field
* @param mixed $fieldVal
* @param array|string $fields
Expand All @@ -242,7 +241,7 @@ public function requiredWithAll(string $field, $fieldVal, $fields)
}

/**
* 如果缺少 任意一个 指定的字段值，则此字段为 必填
* 如果缺少 任意一个 指定的字段值，则此字段为 必填(refer laravel)
* @param string $field
* @param mixed $fieldVal
* @param array|string $fields
Expand All @@ -263,7 +262,7 @@ public function requiredWithout(string $field, $fieldVal, $fields)
}

/**
* 如果所有指定的字段 都没有 值，则此字段为 必填
* 如果所有指定的字段 都没有 值，则此字段为 必填(refer laravel)
* @from laravel
* @param string $field
* @param mixed $fieldVal
Expand Down