Add fix for Date/DateTime seeding.

Author: dereuromark

src/Db/Adapter/AbstractAdapter.php

@@ -17,6 +17,8 @@
 use Cake\Database\Query\SelectQuery;
 use Cake\Database\Query\UpdateQuery;
 use Cake\Database\Schema\SchemaDialect;
+use Cake\I18n\Date;
+use Cake\I18n\DateTime;
 use Exception;
 use InvalidArgumentException;
 use Migrations\Config\Config;
@@ -723,7 +725,11 @@ public function bulkinsert(TableMetadata $table, array $rows): void
                         $placeholder = (string)$v;
                     }
                     if ($placeholder == '?') {
-                        if (is_bool($v)) {
+                        if ($v instanceof DateTime) {
+                            $vals[] = $v->toDateTimeString();
+                        } elseif ($v instanceof Date) {
+                            $vals[] = $v->toDateString();
+                        } elseif (is_bool($v)) {
                             $vals[] = $this->castToBool($v);
                         } else {
                             $vals[] = $v;

src/Db/Adapter/PostgresAdapter.php

@@ -9,6 +9,8 @@
 namespace Migrations\Db\Adapter;
 
 use Cake\Database\Connection;
+use Cake\I18n\Date;
+use Cake\I18n\DateTime;
 use InvalidArgumentException;
 use Migrations\Db\AlterInstructions;
 use Migrations\Db\Literal;
@@ -1526,7 +1528,11 @@ public function bulkinsert(Table $table, array $rows): void
                     }
                     $values[] = $placeholder;
                     if ($placeholder == '?') {
-                        if (is_bool($v)) {
+                        if ($v instanceof DateTime) {
+                            $vals[] = $v->toDateTimeString();
+                        } elseif ($v instanceof Date) {
+                            $vals[] = $v->toDateString();
+                        } elseif (is_bool($v)) {
                             $vals[] = $this->castToBool($v);
                         } else {
                             $vals[] = $v;

src/Db/Adapter/SqlserverAdapter.php

@@ -9,6 +9,8 @@
 namespace Migrations\Db\Adapter;
 
 use BadMethodCallException;
+use Cake\I18n\Date;
+use Cake\I18n\DateTime;
 use InvalidArgumentException;
 use Migrations\Db\AlterInstructions;
 use Migrations\Db\Literal;
@@ -1361,7 +1363,11 @@ public function bulkinsert(TableMetadata $table, array $rows): void
                         $placeholder = (string)$v;
                     }
                     if ($placeholder == '?') {
-                        if (is_bool($v)) {
+                        if ($v instanceof DateTime) {
+                            $vals[] = $v->toDateTimeString();
+                        } elseif ($v instanceof Date) {
+                            $vals[] = $v->toDateString();
+                        } elseif (is_bool($v)) {
                             $vals[] = $this->castToBool($v);
                         } else {
                             $vals[] = $v;

tests/TestCase/Command/Phinx/SeedTest.php

@@ -21,7 +21,6 @@
 use Migrations\Test\CommandTester;
 use Migrations\Test\TestCase\DriverConnectionTrait;
 use PDO;
-use Phinx\Config\FeatureFlags;
 use Phinx\Db\Adapter\WrapperInterface;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\StreamOutput;
@@ -91,8 +90,6 @@ public function tearDown(): void
         $this->connection->execute('DROP TABLE IF EXISTS numbers');
         $this->connection->execute('DROP TABLE IF EXISTS letters');
         $this->connection->execute('DROP TABLE IF EXISTS stores');
-
-        FeatureFlags::$addTimestampsUseDateTime = false;
     }
 
     /**

tests/TestCase/Command/SeedCommandTest.php

@@ -12,6 +12,7 @@
 use Cake\TestSuite\TestCase;
 use InvalidArgumentException;
 use Phinx\Config\FeatureFlags;
+use ReflectionClass;
 use ReflectionProperty;
 
 class SeedCommandTest extends TestCase
@@ -39,6 +40,13 @@ public function tearDown(): void
         $connection->execute('DROP TABLE IF EXISTS numbers');
         $connection->execute('DROP TABLE IF EXISTS letters');
         $connection->execute('DROP TABLE IF EXISTS stores');
+
+        if (class_exists(FeatureFlags::class)) {
+            $reflection = new ReflectionClass(FeatureFlags::class);
+            if ($reflection->hasProperty('addTimestampsUseDateTime')) {
+                FeatureFlags::$addTimestampsUseDateTime = false;
+            }
+        }
     }
 
     protected function resetOutput(): void
@@ -194,9 +202,14 @@ public function testSeederSourceNotFound(): void
         $this->exec('migrations seed -c test --source NotThere --seed LettersSeed');
     }
 
-    public function testSeederWithDateTimeFields(): void
+    public function testSeederWithTimestampFields(): void
     {
-        FeatureFlags::$addTimestampsUseDateTime = true;
+        if (class_exists(FeatureFlags::class)) {
+            $reflection = new ReflectionClass(FeatureFlags::class);
+            if ($reflection->hasProperty('addTimestampsUseDateTime')) {
+                FeatureFlags::$addTimestampsUseDateTime = false;
+            }
+        }
 
         $this->createTables();
         $this->exec('migrations seed -c test --seed StoresSeed');
@@ -221,9 +234,14 @@ public function testSeederWithDateTimeFields(): void
         $this->assertNotEmpty($store['modified']);
     }
 
-    public function testSeederWithTimestampFields(): void
+    public function testSeederWithDateTimeFields(): void
     {
-        FeatureFlags::$addTimestampsUseDateTime = false;
+        $this->skipIf(!class_exists(FeatureFlags::class));
+
+        $reflection = new ReflectionClass(FeatureFlags::class);
+        $this->skipIf(!$reflection->hasProperty('addTimestampsUseDateTime'));
+
+        FeatureFlags::$addTimestampsUseDateTime = true;
 
         $this->createTables();
         $this->exec('migrations seed -c test --seed StoresSeed');