Fix allowEmpty calculation.

I had the logic backwards.
cakephp · Mar 18, 2014 · a29aec1 · a29aec1
1 parent 3b0a9fc
commit a29aec1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Console/Command/Task/ModelTask.php b/src/Console/Command/Task/ModelTask.php
@@ -437,7 +437,7 @@ public function fieldValidation($fieldName, $metaData, $primaryKey) {
 		}
 
 		$allowEmpty = false;
-		if ($rule !== 'notEmpty' && $metaData['null'] === false) {
+		if ($rule !== 'notEmpty' && $metaData['null'] === true) {
 			$allowEmpty = true;
 		}
 

diff --git a/tests/TestCase/Console/Command/Task/ModelTaskTest.php b/tests/TestCase/Console/Command/Task/ModelTaskTest.php
@@ -371,11 +371,11 @@ public function testGetValidation() {
 		$model = TableRegistry::get('BakeArticles');
 		$result = $this->Task->getValidation($model);
 		$expected = [
-			'id' => ['rule' => 'numeric', 'allowEmpty' => true],
-			'bake_user_id' => ['rule' => 'numeric', 'allowEmpty' => true],
+			'id' => ['rule' => 'numeric', 'allowEmpty' => false],
+			'bake_user_id' => ['rule' => 'numeric', 'allowEmpty' => false],
 			'title' => ['rule' => 'notEmpty', 'allowEmpty' => false],
 			'body' => ['rule' => 'notEmpty', 'allowEmpty' => false],
-			'published' => ['rule' => 'boolean', 'allowEmpty' => false],
+			'published' => ['rule' => 'boolean', 'allowEmpty' => true],
 		];
 		$this->assertEquals($expected, $result);
 	}