Rename Validation::notEmpty() to Validation::notBlank().

This avoids confusion for new users with Validator::notEmpty().

Refs #6284, #5856.

src/Validation/Validation.php

@@ -46,6 +46,20 @@ class Validation
     public static $errors = [];
 
     /**
+     * Backwards compatibility wrapper for Validation::notBlank().
+     *
+     * @param string|array $check Value to check.
+     * @return bool Success.
+     * @deprecated 3.0.2 Use Validation::notBlank() instead.
+     * @see Validation::notBlank()
+     */
+    public function notEmpty($check)
+    {
+        trigger_error('Validation::notEmpty() is deprecated. Use Validation::notBlank() instead.', E_USER_DEPRECATED);
+        return static::notBlank($check);
+    }
+
+    /**
      * Checks that a string contains something other than whitespace
      *
      * Returns true if string contains something other than whitespace
@@ -53,14 +67,10 @@ class Validation
      * $check can be passed as an array:
      * ['check' => 'valueToCheck'];
      *
-     * It is recommended to *not* use this method, and instead use Validator::allowEmpty()
-     * & Validator::notEmpty() instead. This method is only provided for
-     * backwards compatibility.
-     *
      * @param string|array $check Value to check
      * @return bool Success
      */
-    public static function notEmpty($check)
+    public static function notBlank($check)
     {
         if (is_array($check)) {
             extract(static::_defaults($check));

tests/TestCase/Validation/ValidationTest.php

@@ -80,15 +80,15 @@ class ValidationTest extends TestCase
      */
     public function testNotEmpty()
     {
-        $this->assertTrue(Validation::notEmpty('abcdefg'));
-        $this->assertTrue(Validation::notEmpty('fasdf '));
-        $this->assertTrue(Validation::notEmpty('fooo' . chr(243) . 'blabla'));
-        $this->assertTrue(Validation::notEmpty('abçďĕʑʘπй'));
-        $this->assertTrue(Validation::notEmpty('José'));
-        $this->assertTrue(Validation::notEmpty('é'));
-        $this->assertTrue(Validation::notEmpty('π'));
-        $this->assertFalse(Validation::notEmpty("\t "));
-        $this->assertFalse(Validation::notEmpty(""));
+        $this->assertTrue(Validation::notBlank('abcdefg'));
+        $this->assertTrue(Validation::notBlank('fasdf '));
+        $this->assertTrue(Validation::notBlank('fooo' . chr(243) . 'blabla'));
+        $this->assertTrue(Validation::notBlank('abçďĕʑʘπй'));
+        $this->assertTrue(Validation::notBlank('José'));
+        $this->assertTrue(Validation::notBlank('é'));
+        $this->assertTrue(Validation::notBlank('π'));
+        $this->assertFalse(Validation::notBlank("\t "));
+        $this->assertFalse(Validation::notBlank(""));
     }
 
     /**
@@ -99,14 +99,14 @@ class ValidationTest extends TestCase
     public function testNotEmptyISO88591AppEncoding()
     {
         Configure::write('App.encoding', 'ISO-8859-1');
-        $this->assertTrue(Validation::notEmpty('abcdefg'));
-        $this->assertTrue(Validation::notEmpty('fasdf '));
-        $this->assertTrue(Validation::notEmpty('fooo' . chr(243) . 'blabla'));
-        $this->assertTrue(Validation::notEmpty('abçďĕʑʘπй'));
-        $this->assertTrue(Validation::notEmpty('José'));
-        $this->assertTrue(Validation::notEmpty(utf8_decode('José')));
-        $this->assertFalse(Validation::notEmpty("\t "));
-        $this->assertFalse(Validation::notEmpty(""));
+        $this->assertTrue(Validation::notBlank('abcdefg'));
+        $this->assertTrue(Validation::notBlank('fasdf '));
+        $this->assertTrue(Validation::notBlank('fooo' . chr(243) . 'blabla'));
+        $this->assertTrue(Validation::notBlank('abçďĕʑʘπй'));
+        $this->assertTrue(Validation::notBlank('José'));
+        $this->assertTrue(Validation::notBlank(utf8_decode('José')));
+        $this->assertFalse(Validation::notBlank("\t "));
+        $this->assertFalse(Validation::notBlank(""));
     }
 
     /**

tests/TestCase/Validation/ValidatorTest.php

@@ -513,7 +513,7 @@ class ValidatorTest extends TestCase
         $validator = new Validator;
         $validator
             ->add('email', 'alpha', ['rule' => 'alphanumeric'])
-            ->add('email', 'notEmpty', ['rule' => 'notEmpty'])
+            ->add('email', 'notBlank', ['rule' => 'notBlank'])
             ->add('email', 'email', ['rule' => 'email', 'message' => 'Y u no write email?']);
         $errors = $validator->errors(['email' => 'not an email!']);
         $expected = [