Fixes yiisoft#5108: Cleaning timestampAttribute when skipOnEmpty is s…

…et to false
gonimar · Dec 15, 2016 · f569061 · f569061
1 parent b623497
commit f569061
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/framework/validators/DateValidator.php b/framework/validators/DateValidator.php
@@ -266,12 +266,6 @@ public function init()
     public function validateAttribute($model, $attribute)
     {
         $value = $model->$attribute;
-
-        if ($this->skipOnEmpty === false && empty($value) && $this->timestampAttribute !== null) {
-            $model->{$this->timestampAttribute} = null;
-            return;
-        }
-
         $timestamp = $this->parseDateValue($value);
         if ($timestamp === false) {
             if ($this->timestampAttribute === $attribute) {
@@ -285,6 +279,11 @@ public function validateAttribute($model, $attribute)
                     }
                 }
             }
+            // skipOnEmpty is false, clear the timestamp attribute
+            if (empty($value) && $this->timestampAttribute !== null) {
+                $model->{$this->timestampAttribute} = null;
+                return;
+            }
             $this->addError($model, $attribute, $this->message, []);
         } elseif ($this->min !== null && $timestamp < $this->min) {
             $this->addError($model, $attribute, $this->tooSmall, ['min' => $this->minString]);

diff --git a/tests/framework/validators/DateValidatorTest.php b/tests/framework/validators/DateValidatorTest.php
@@ -616,5 +616,28 @@ public function testTimestampAttributeEmptyValueValidation()
         $this->assertFalse($model->hasErrors('attr_date'));
         $this->assertFalse($model->hasErrors('attr_timestamp'));
         $this->assertNull($model->attr_timestamp);
+
+        $val = new DateValidator(['format' => 'php:Y-m-d', 'timestampAttribute' => 'attr_timestamp', 'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm:ss', 'skipOnEmpty' => false]);
+        $model = new FakedValidationModel;
+        $model->attr_date = '';
+        $model->attr_timestamp = 1379030400;
+        $val->validateAttribute($model, 'attr_date');
+        $this->assertFalse($model->hasErrors('attr_date'));
+        $this->assertFalse($model->hasErrors('attr_timestamp'));
+        $this->assertNull($model->attr_timestamp);
+
+        $val = new DateValidator(['format' => 'php:Y/m/d', 'timestampAttribute' => 'attr_date', 'skipOnEmpty' => false]);
+        $model = new FakedValidationModel();
+        $model->attr_date = '';
+        $val->validateAttribute($model, 'attr_date');
+        $this->assertFalse($model->hasErrors('attr_date'));
+        $this->assertNull($model->attr_date);
+
+        $val = new DateValidator(['format' => 'php:Y/m/d', 'timestampAttribute' => 'attr_date', 'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm:ss', 'skipOnEmpty' => false]);
+        $model = new FakedValidationModel();
+        $model->attr_date = '';
+        $val->validateAttribute($model, 'attr_date');
+        $this->assertFalse($model->hasErrors('attr_date'));
+        $this->assertNull($model->attr_date);
     }
 }