Merge pull request #532 from Ali1/master

Stop baking requirePresence validation when db default set
cakephp · Apr 24, 2019 · 96651b0 · 96651b0
2 parents 4bd0b7b + 89650c1
commit 96651b0
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 36 deletions.
diff --git a/src/Shell/Task/ModelTask.php b/src/Shell/Task/ModelTask.php
@@ -768,10 +768,12 @@ public function fieldValidation($schema, $fieldName, array $metaData, $primaryKe
                 'args' => [],
             ];
         } else {
-            $validation['requirePresence'] = [
-                'rule' => 'requirePresence',
-                'args' => ["'create'"],
-            ];
+            if ($metaData['default'] === null || $metaData['default'] === false) {
+                $validation['requirePresence'] = [
+                    'rule' => 'requirePresence',
+                    'args' => ["'create'"],
+                ];
+            }
             $validation['allowEmpty'] = [
                 'rule' => $this->getAllowEmptyMethod($fieldName, $metaData),
                 'args' => ['false'],

diff --git a/tests/TestCase/Shell/Task/ModelTaskTest.php b/tests/TestCase/Shell/Task/ModelTaskTest.php
@@ -848,6 +848,10 @@ public function testGetValidation()
         $model = TableRegistry::getTableLocator()->get('BakeArticles');
         $result = $this->Task->getValidation($model);
         $expected = [
+            'id' => [
+                'integer' => ['rule' => 'integer', 'args' => []],
+                'allowEmpty' => ['rule' => 'allowEmptyString', 'args' => ["'create'"]]
+            ],
             'bake_user_id' => [
                 'integer' => ['rule' => 'integer', 'args' => []],
                 'requirePresence' => ['rule' => 'requirePresence', 'args' => ["'create'"]],
@@ -871,7 +875,6 @@ public function testGetValidation()
             ],
             'rating' => [
                 'numeric' => ['rule' => 'numeric', 'args' => []],
-                'requirePresence' => ['rule' => 'requirePresence', 'args' => ["'create'"]],
                 'greaterThanOrEqual' => [
                     'rule' => 'greaterThanOrEqual',
                     'args' => [
@@ -885,7 +888,6 @@ public function testGetValidation()
             ],
             'score' => [
                 'decimal' => ['rule' => 'decimal', 'args' => []],
-                'requirePresence' => ['rule' => 'requirePresence', 'args' => ["'create'"]],
                 'greaterThanOrEqual' => [
                     'rule' => 'greaterThanOrEqual',
                     'args' => [
@@ -899,18 +901,10 @@ public function testGetValidation()
             ],
             'published' => [
                 'boolean' => ['rule' => 'boolean', 'args' => []],
-                'requirePresence' => [
-                    'rule' => 'requirePresence',
-                    'args' => ["'create'" ],
-                ],
                 'allowEmpty' => [
                     'rule' => 'allowEmptyString',
                     'args' => ['false'],
                 ],
-            ],
-            'id' => [
-                'integer' => ['rule' => 'integer', 'args' => []],
-                'allowEmpty' => ['rule' => 'allowEmptyString', 'args' => ["'create'"]]
             ]
         ];
         $this->assertEquals($expected, $result);
@@ -982,18 +976,15 @@ public function testGetValidationSigned()
             ],
             'rating' => [
                 'numeric' => ['rule' => 'numeric', 'args' => []],
-                'requirePresence' => ['rule' => 'requirePresence', 'args' => ["'create'"]],
                 'allowEmpty' => ['rule' => 'allowEmptyString', 'args' => ['false']],
             ],
             'score' => [
                 'decimal' => ['rule' => 'decimal', 'args' => []],
-                'requirePresence' => ['rule' => 'requirePresence', 'args' => ["'create'"]],
                 'allowEmpty' => ['rule' => 'allowEmptyString', 'args' => ['false']]
             ],
             'published' => [
                 'boolean' => ['rule' => 'boolean', 'args' => []],
                 'allowEmpty' => ['rule' => 'allowEmptyString', 'args' => ['false']],
-                'requirePresence' => ['rule' => 'requirePresence', 'args' => ["'create'"]],
             ],
             'id' => [
                 'integer' => ['rule' => 'integer', 'args' => []],
@@ -1053,9 +1044,9 @@ public function testGetValidationUniqueDateField()
             'dateTime' => ['rule' => 'dateTime', 'args' => []],
             'requirePresence' => ['rule' => 'requirePresence', 'args' => ["'create'"]],
             'allowEmpty' => [
-                    'rule' => 'allowEmptyDateTime',
-                    'args' => ['false'],
-                ],
+                'rule' => 'allowEmptyDateTime',
+                'args' => ['false'],
+            ],
         ];
         $this->assertEquals($expected, $result['release_date']);
     }
@@ -1182,8 +1173,7 @@ public function testGetValidationExcludeForeignKeys()
                 'allowEmpty' => [
                     'rule' => 'allowEmptyString',
                     'args' => ['false'],
-                ],
-                'requirePresence' => ['rule' => 'requirePresence', 'args' => ["'create'"]],
+                ]
             ],
             'score' => [
                 'decimal' => ['rule' => 'decimal', 'args' => []],
@@ -1193,7 +1183,6 @@ public function testGetValidationExcludeForeignKeys()
                         0,
                     ],
                 ],
-                'requirePresence' => ['rule' => 'requirePresence', 'args' => ["'create'"]],
                 'allowEmpty' => [
                     'rule' => 'allowEmptyString',
                     'args' => ['false'],
@@ -1204,10 +1193,6 @@ public function testGetValidationExcludeForeignKeys()
                     'rule' => 'boolean',
                     'args' => [],
                 ],
-                'requirePresence' => [
-                    'rule' => 'requirePresence',
-                    'args' => ["'create'" ],
-                ],
                 'allowEmpty' => [
                     'rule' => 'allowEmptyString',
                     'args' => ['false'],
@@ -1249,7 +1234,6 @@ public function testGetValidationExcludeForeignKeysSigned()
             'published' => [
                 'boolean' => ['rule' => 'boolean', 'args' => []],
                 'allowEmpty' => ['rule' => 'allowEmptyString', 'args' => ['false']],
-                'requirePresence' => ['rule' => 'requirePresence', 'args' => ["'create'"]],
             ],
             'id' => [
                 'integer' => ['rule' => 'integer', 'args' => []],
@@ -1258,12 +1242,10 @@ public function testGetValidationExcludeForeignKeysSigned()
             'rating' => [
                 'numeric' => ['rule' => 'numeric', 'args' => []],
                 'allowEmpty' => ['rule' => 'allowEmptyString', 'args' => ['false']],
-                'requirePresence' => ['rule' => 'requirePresence', 'args' => ["'create'"]],
             ],
             'score' => [
                 'decimal' => ['rule' => 'decimal', 'args' => []],
                 'allowEmpty' => ['rule' => 'allowEmptyString', 'args' => ['false']],
-                'requirePresence' => ['rule' => 'requirePresence', 'args' => ["'create'"]],
             ]
         ];
         $this->assertEquals($expected, $result);

diff --git a/tests/comparisons/Model/testBakeAssociationDetectionCategoriesTable.php b/tests/comparisons/Model/testBakeAssociationDetectionCategoriesTable.php
@@ -62,7 +62,6 @@ public function validationDefault(Validator $validator)
         $validator
             ->scalar('name')
             ->maxLength('name', 100)
-            ->requirePresence('name', 'create')
             ->allowEmptyString('name', false);
 
         return $validator;

diff --git a/tests/comparisons/Model/testBakeAssociationDetectionCategoriesTableSigned.php b/tests/comparisons/Model/testBakeAssociationDetectionCategoriesTableSigned.php
@@ -62,7 +62,6 @@ public function validationDefault(Validator $validator)
         $validator
             ->scalar('name')
             ->maxLength('name', 100)
-            ->requirePresence('name', 'create')
             ->allowEmptyString('name', false);
 
         return $validator;

diff --git a/tests/comparisons/Model/testBakeAssociationDetectionOldProductsTable.php b/tests/comparisons/Model/testBakeAssociationDetectionOldProductsTable.php
@@ -54,7 +54,6 @@ public function validationDefault(Validator $validator)
         $validator
             ->scalar('name')
             ->maxLength('name', 100)
-            ->requirePresence('name', 'create')
             ->allowEmptyString('name', false);
 
         return $validator;

diff --git a/tests/comparisons/Model/testBakeAssociationDetectionOldProductsTableSigned.php b/tests/comparisons/Model/testBakeAssociationDetectionOldProductsTableSigned.php
@@ -54,7 +54,6 @@ public function validationDefault(Validator $validator)
         $validator
             ->scalar('name')
             ->maxLength('name', 100)
-            ->requirePresence('name', 'create')
             ->allowEmptyString('name', false);
 
         return $validator;

diff --git a/tests/comparisons/Model/testBakeAssociationDetectionProductsTable.php b/tests/comparisons/Model/testBakeAssociationDetectionProductsTable.php
@@ -66,7 +66,6 @@ public function validationDefault(Validator $validator)
         $validator
             ->scalar('name')
             ->maxLength('name', 100)
-            ->requirePresence('name', 'create')
             ->allowEmptyString('name', false);
 
         return $validator;

diff --git a/tests/comparisons/Model/testBakeAssociationDetectionProductsTableSigned.php b/tests/comparisons/Model/testBakeAssociationDetectionProductsTableSigned.php
@@ -66,7 +66,6 @@ public function validationDefault(Validator $validator)
         $validator
             ->scalar('name')
             ->maxLength('name', 100)
-            ->requirePresence('name', 'create')
             ->allowEmptyString('name', false);
 
         return $validator;