Merge branch 'master' into 2.5

cakephp · Mar 26, 2014 · 381b3fc · 381b3fc
2 parents 21d91b1 + de9a5a5
commit 381b3fc
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php
@@ -874,6 +874,7 @@ public function setAction($action) {
  * Returns number of errors in a submitted FORM.
  *
  * @return integer Number of errors
+ * @deprecated This method will be removed in 3.0
  */
 	public function validate() {
 		$args = func_get_args();
@@ -892,6 +893,7 @@ public function validate() {
  *
  * @param mixed A list of models as a variable argument
  * @return array Validation errors, or false if none
+ * @deprecated This method will be removed in 3.0
  */
 	public function validateErrors() {
 		$objects = func_get_args();