Fix autofill datetime field logic

Author: itosho

src/Model/Behavior/InsertBehavior.php

@@ -5,6 +5,7 @@
 use App\Model\Entity\ResourceFormatterTrait;
 use Cake\Database\Expression\QueryExpression;
 use Cake\Database\StatementInterface;
+use Cake\I18n\FrozenTime;
 use Cake\ORM\Behavior;
 use Cake\ORM\Entity;
 use Cake\ORM\Query;
@@ -67,16 +68,17 @@ public function insertOnce(Entity $entity, array $conditions = null)
     {
         if ($this->_config['event']['beforeSave']) {
             $this->_table->dispatchEvent('Model.beforeSave', compact('entity'));
-            if ($entity->created) {
-                $entity->created= $entity->created->toDateString();
-            }
-            if ($entity->modified) {
-                $entity->modified= $entity->modified->toDateString();
-            }
         }
 
         $entity->setVirtual([]);
         $insertData = $entity->toArray();
+        if (isset($insertData['created']) && !is_null($insertData['created'])) {
+            $insertData['created'] = FrozenTime::now()->toDateTimeString();
+        }
+        if (isset($insertData['modified']) && !is_null($insertData['modified'])) {
+            $insertData['modified'] = FrozenTime::now()->toDateTimeString();
+        }
+
         $escape = function ($content) {
             return is_null($content) ? 'NULL' : '\'' . addslashes($content) . '\'';
         };

tests/TestCase/Model/Behavior/InsertBehaviorTest.php

@@ -3,6 +3,7 @@
 namespace Itosho\EasyQuery\Test\TestCase\Model\Behavior;
 
 use Cake\Chronos\Chronos;
+use Cake\I18n\FrozenTime;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
@@ -187,7 +188,7 @@ public function testInsertOnceAddTimestampBehavior()
             'published' => 1
         ];
         $entity = $this->Articles->newEntity($newData);
-        $now = Chronos::now();
+        $now = FrozenTime::now();
 
         $this->Articles->insertOnce($entity);
 
@@ -240,7 +241,7 @@ public function testInsertOnceWhenIsNull()
 
         $actual = $this->Articles
             ->find()
-            ->where( [
+            ->where([
                 'title' => 'First Article',
                 'body IS' => null,
                 'published' => 1