Browse Source

rename validatePresence to requirePresence.

euromark 11 years ago
parent
commit
85beeb2dd9

+ 1 - 1
src/ORM/Table.php

@@ -1020,7 +1020,7 @@ class Table implements RepositoryInterface, EventListenerInterface {
  *	return $validator
  *	->add('email', 'valid-email', ['rule' => 'email'])
  *	->add('password', 'valid', ['rule' => 'notEmpty'])
- *	->validatePresence('username');
+ *	->requirePresence('username');
  * }
  * }}}
  *

+ 1 - 1
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(

+ 3 - 3
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);

+ 17 - 1
src/Validation/Validator.php

@@ -323,7 +323,7 @@ class Validator implements \ArrayAccess, \IteratorAggregate, \Countable {
  * 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;
@@ -332,6 +332,22 @@ class Validator implements \ArrayAccess, \IteratorAggregate, \Countable {
 	}
 
 /**
+ * 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.
  *
  * This is the opposite of notEmpty() which requires a field to not be empty.