tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6264 from dhensby/pulls/3.4/validation-docblock-fix

Browse Source 
DOCS Docblock fixes for ValidationResult
This commit is contained in:
Damian Mooyman 2016-11-01 10:38:33 +13:00 committed by GitHub
commit 2a9138aa14
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
model/ValidationResult.php
View File

@ -8,19 +8,21 @@
*/
class ValidationResult extends Object {
/**
* Boolean - is the result valid or not
* @var bool - is the result valid or not
*/
protected $isValid;
/**
* Array of errors
* @var array of errors
*/
protected $errorList = array();
/**
* Create a new ValidationResult.
* By default, it is a successful result. Call $this->error() to record errors.
* @param bool $valid
* @param string|null $message
*/
public function __construct($valid = true, $message = null) {
$this->isValid = $valid;
@ -30,8 +32,8 @@ class ValidationResult extends Object {
/**
* Record an error against this validation result,
* @param $message The validation error message
* @param $code An optional error code string, that can be accessed with {@link $this->codeList()}.
* @param string $message The validation error message
* @param string $code An optional error code string, that can be accessed with {@link $this->codeList()}.
* @return ValidationResult this
*/
public function error($message, $code = null) {
@ -99,7 +101,7 @@ class ValidationResult extends Object {
* It will be valid if both this and the other result are valid.
* This object will be modified to contain the new validation information.
*
* @param ValidationResult the validation result object to combine
* @param ValidationResult $other the validation result object to combine
* @return ValidationResult this
*/
public function combineAnd(ValidationResult $other) {