Exclude deprecated validators from bake.

Don't include deprecated validators in bake. Refs #6581
cakephp · May 23, 2015 · 9626f0e · 9626f0e
1 parent 138adf0
commit 9626f0e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/Cake/Console/Command/Task/ModelTask.php b/lib/Cake/Console/Command/Task/ModelTask.php
@@ -383,7 +383,7 @@ public function initValidations() {
 		if (class_exists('Validation')) {
 			$options = get_class_methods('Validation');
 		}
-		$deprecatedOptions = array('notEmpty');
+		$deprecatedOptions = array('notEmpty', 'between', 'ssn');
 		$options = array_diff($options, $deprecatedOptions);
 		sort($options);
 		$default = 1;

diff --git a/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
@@ -315,7 +315,7 @@ public function testInteractiveFieldValidation() {
 		$this->Task->initValidations();
 		$this->Task->interactive = true;
 		$this->Task->expects($this->any())->method('in')
-			->will($this->onConsecutiveCalls('25', 'y', '19', 'n'));
+			->will($this->onConsecutiveCalls('24', 'y', '18', 'n'));
 
 		$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
 		$expected = array('notBlank' => 'notBlank', 'maxLength' => 'maxLength');
@@ -333,7 +333,7 @@ public function testInteractiveFieldValidationWithBogusResponse() {
 		$this->Task->interactive = true;
 
 		$this->Task->expects($this->any())->method('in')
-			->will($this->onConsecutiveCalls('999999', '25', 'n'));
+			->will($this->onConsecutiveCalls('999999', '24', 'n'));
 
 		$this->Task->expects($this->at(10))->method('out')
 			->with($this->stringContains('make a valid'));
@@ -368,7 +368,7 @@ public function testSkippingChoiceInteractiveFieldValidation() {
 		$this->Task->initValidations();
 		$this->Task->interactive = true;
 		$this->Task->expects($this->any())->method('in')
-			->will($this->onConsecutiveCalls('25', 'y', 's'));
+			->will($this->onConsecutiveCalls('24', 'y', 's'));
 
 		$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
 		$expected = array('notBlank' => 'notBlank', '_skipFields' => true);
@@ -384,7 +384,7 @@ public function testSkippingAnotherInteractiveFieldValidation() {
 		$this->Task->initValidations();
 		$this->Task->interactive = true;
 		$this->Task->expects($this->any())->method('in')
-			->will($this->onConsecutiveCalls('25', 's'));
+			->will($this->onConsecutiveCalls('24', 's'));
 
 		$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
 		$expected = array('notBlank' => 'notBlank', '_skipFields' => true);
@@ -400,7 +400,7 @@ public function testSkippingAnotherInteractiveFieldValidation() {
 	public function testInteractiveDoValidationWithSkipping() {
 		$this->Task->expects($this->any())
 			->method('in')
-			->will($this->onConsecutiveCalls('36', '25', 'n', '11', 's'));
+			->will($this->onConsecutiveCalls('34', '24', 'n', '10', 's'));
 		$this->Task->interactive = true;
 		$Model = $this->getMock('Model');
 		$Model->primaryKey = 'id';