Merge pull request #135 from tsukasa-mixer/master

fix: DateTime getValue -> AutoNow|AutoNowAdd
MindyPHP · Jul 1, 2016 · 3a70341 · 3a70341
2 parents b8d733e + deb50f8
commit 3a70341
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/Mindy/Orm/Fields/DateField.php b/src/Mindy/Orm/Fields/DateField.php
@@ -42,15 +42,13 @@ public function onBeforeUpdate()
     public function getValue()
     {
         $db = ConnectionManager::getDb()->getQueryBuilder();
-        if (
-            is_numeric($this->value) ||
-            $this->autoNowAdd && $this->getModel()->getIsNewRecord() ||
-            $this->autoNow
-        ) {
+        if ($this->autoNowAdd && $this->getModel()->getIsNewRecord() || $this->autoNow) {
+            return $db->convertToDate();
+        }
+        if ( is_numeric($this->value) ) {
             return $db->convertToDate($this->value);
-        } else {
-            return $this->value;
         }
+        return $this->value;
     }
 
     public function toArray()