diff --git a/src/ORM/Table.php b/src/ORM/Table.php index 880fae39ed9..2f83a2ded6c 100644 --- a/src/ORM/Table.php +++ b/src/ORM/Table.php @@ -1020,7 +1020,7 @@ public function updateAll($fields, $conditions) { * return $validator * ->add('email', 'valid-email', ['rule' => 'email']) * ->add('password', 'valid', ['rule' => 'notEmpty']) - * ->validatePresence('username'); + * ->requirePresence('username'); * } * }}} * diff --git a/src/Template/Bake/default/classes/table.ctp b/src/Template/Bake/default/classes/table.ctp index 3734863b721..a805060c648 100644 --- a/src/Template/Bake/default/classes/table.ctp +++ b/src/Template/Bake/default/classes/table.ctp @@ -115,7 +115,7 @@ foreach ($validation as $field => $rules): ); else: $validationMethods[] = sprintf( - "->validatePresence('%s', 'create')", + "->requirePresence('%s', 'create')", $field ); $validationMethods[] = sprintf( diff --git a/src/Validation/README.md b/src/Validation/README.md index 9b24e3f7b6f..12d27504267 100644 --- a/src/Validation/README.md +++ b/src/Validation/README.md @@ -13,14 +13,14 @@ use Cake\Validation\Validator; $validator = new Validator(); $validator - ->validatePresence('email') + ->requirePresence('email') ->add('email', 'validFormat', [ 'rule' => 'email', 'message' => 'E-mail must be valid' ]) - ->validatePresence('name') + ->requirePresence('name') ->notEmpty('name', 'We need your name.') - ->validatePresence('comment') + ->requirePresence('comment') ->notEmpty('comment', 'You need to give a comment.'); $errors = $validator->errors($_POST); diff --git a/src/Validation/Validator.php b/src/Validation/Validator.php index 5a35236d6e3..598f5962c27 100644 --- a/src/Validation/Validator.php +++ b/src/Validation/Validator.php @@ -323,7 +323,7 @@ public function remove($field, $rule = null) { * is required. * @return Validator this instance */ - public function validatePresence($field, $mode = true, $message = null) { + public function requirePresence($field, $mode = true, $message = null) { $this->field($field)->isPresenceRequired($mode); if ($message) { $this->_presenceMessages[$field] = $message; @@ -331,6 +331,22 @@ public function validatePresence($field, $mode = true, $message = null) { return $this; } +/** + * Sets whether a field is required to be present in data array. + * + * Alias for requirePresence(). + * + * @param string $field the name of the field + * @param bool|string $mode Valid values are true, false, 'create', 'update' + * @param string $message The validation message to show if the field presence + * is required. + * @return Validator this instance + * @deprecated 3.0.0 Will be removed in 3.0.0. + */ + public function validatePresence($field, $mode = true, $message = null) { + return $this->requirePresence($field, $mode, $message); + } + /** * Allows a field to be empty. *