Deprecate validation methods.

Validation::blank() would be rarely needed if at all. Validation::userDefined() is no longer needed as now you can directly set a callable as a validaton rule.
cakephp · Apr 6, 2015 · 1e2cd55 · 1e2cd55
1 parent 6dd2962
commit 1e2cd55
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 64 deletions.
diff --git a/src/Validation/Validation.php b/src/Validation/Validation.php
@@ -130,9 +130,11 @@ public static function lengthBetween($check, $min, $max)
      *
      * @param string|array $check Value to check
      * @return bool Success
+     * @deprecated 3.0.2
      */
     public static function blank($check)
     {
+        trigger_error('Validation::blank() is deprecated.');
         if (is_array($check)) {
             extract(static::_defaults($check));
         }
@@ -783,9 +785,14 @@ public static function inList($check, array $list, $caseInsensitive = false)
      * @param string $method class method name for validation to run
      * @param array|null $args arguments to send to method
      * @return mixed user-defined class class method returns
+     * @deprecated 3.0.2 You can just set a callable for `rule` key when adding validators.
      */
     public static function userDefined($check, $object, $method, $args = null)
     {
+        trigger_error(
+            'Validation::userDefined() is deprecated. Just set a callable for `rule` key when adding validators instead.',
+            E_USER_DEPRECATED
+        );
         return call_user_func_array([$object, $method], [$check, $args]);
     }
 

diff --git a/tests/TestCase/Validation/ValidationTest.php b/tests/TestCase/Validation/ValidationTest.php
@@ -22,25 +22,6 @@
 use Cake\Validation\Validation;
 use Locale;
 
-/**
- * CustomValidator class
- *
- */
-class CustomValidator
-{
-
-    /**
-     * Makes sure that a given $email address is valid and unique
-     *
-     * @param string $check
-     * @return bool
-     */
-    public static function customValidate($check)
-    {
-        return (bool)preg_match('/^[0-9]{3}$/', $check);
-    }
-}
-
 /**
  * Test Case for Validation Class
  *
@@ -171,38 +152,6 @@ public function testLengthBetween()
         $this->assertFalse(Validation::lengthBetween('ÆΔΩЖÇ', 1, 3));
     }
 
-    /**
-     * testBlank method
-     *
-     * @return void
-     */
-    public function testBlank()
-    {
-        $this->assertTrue(Validation::blank(''));
-        $this->assertTrue(Validation::blank(' '));
-        $this->assertTrue(Validation::blank("\n"));
-        $this->assertTrue(Validation::blank("\t"));
-        $this->assertTrue(Validation::blank("\r"));
-        $this->assertFalse(Validation::blank('    Blank'));
-        $this->assertFalse(Validation::blank('Blank'));
-    }
-
-    /**
-     * testBlankAsArray method
-     *
-     * @return void
-     */
-    public function testBlankAsArray()
-    {
-        $this->assertTrue(Validation::blank(['check' => '']));
-        $this->assertTrue(Validation::blank(['check' => ' ']));
-        $this->assertTrue(Validation::blank(['check' => "\n"]));
-        $this->assertTrue(Validation::blank(['check' => "\t"]));
-        $this->assertTrue(Validation::blank(['check' => "\r"]));
-        $this->assertFalse(Validation::blank(['check' => '    Blank']));
-        $this->assertFalse(Validation::blank(['check' => 'Blank']));
-    }
-
     /**
      * testcc method
      *
@@ -2265,19 +2214,6 @@ public function testNaturalNumber()
         $this->assertTrue(Validation::naturalNumber(0, true));
     }
 
-    /**
-     * testUserDefined method
-     *
-     * @return void
-     */
-    public function testUserDefined()
-    {
-        $validator = new CustomValidator;
-        $this->assertFalse(Validation::userDefined('33', $validator, 'customValidate'));
-        $this->assertFalse(Validation::userDefined('3333', $validator, 'customValidate'));
-        $this->assertTrue(Validation::userDefined('333', $validator, 'customValidate'));
-    }
-
     /**
      * testDatetime method
      *