Merge pull request #12264 from doctrine/3.5.x-merge-up-into-3.6.x_9GolPzTd

Merge release 3.5.5 into 3.6.x

Author: greg0ire

src/Tools/SchemaTool.php

@@ -9,6 +9,10 @@
 use Doctrine\DBAL\Schema\AbstractAsset;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\ComparatorConfig;
+use Doctrine\DBAL\Schema\DefaultExpression;
+use Doctrine\DBAL\Schema\DefaultExpression\CurrentDate;
+use Doctrine\DBAL\Schema\DefaultExpression\CurrentTime;
+use Doctrine\DBAL\Schema\DefaultExpression\CurrentTimestamp;
 use Doctrine\DBAL\Schema\ForeignKeyConstraintEditor;
 use Doctrine\DBAL\Schema\Index;
 use Doctrine\DBAL\Schema\Index\IndexedColumn;
@@ -18,6 +22,7 @@
 use Doctrine\DBAL\Schema\PrimaryKeyConstraint;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\AssociationMapping;
 use Doctrine\ORM\Mapping\ClassMetadata;
@@ -46,6 +51,7 @@
 use function current;
 use function implode;
 use function in_array;
+use function interface_exists;
 use function is_numeric;
 use function method_exists;
 use function preg_match;
@@ -489,6 +495,37 @@ private function gatherColumn(
         // the 'default' option can be overwritten here
         $options = $this->gatherColumnOptions($mapping) + $options;
 
+        if (isset($options['default']) && interface_exists(DefaultExpression::class)) {
+            if (
+                in_array($mapping->type, [
+                    Types::DATETIME_MUTABLE,
+                    Types::DATETIME_IMMUTABLE,
+                    Types::DATETIMETZ_MUTABLE,
+                    Types::DATETIMETZ_IMMUTABLE,
+                ], true)
+                && $options['default'] === $this->platform->getCurrentTimestampSQL()
+            ) {
+                /** @phpstan-ignore class.notFound (if DefaultExpression exists, CurrentTimestamp exists as well) */
+                $options['default'] = new CurrentTimestamp();
+            }
+
+            if (
+                in_array($mapping->type, [Types::TIME_MUTABLE, Types::TIME_IMMUTABLE], true)
+                && $options['default'] === $this->platform->getCurrentTimeSQL()
+            ) {
+                /** @phpstan-ignore class.notFound (if DefaultExpression exists, CurrentTime exists as well) */
+                $options['default'] = new CurrentTime();
+            }
+
+            if (
+                in_array($mapping->type, [Types::DATE_MUTABLE, Types::DATE_IMMUTABLE], true)
+                && $options['default'] === $this->platform->getCurrentDateSQL()
+            ) {
+                /** @phpstan-ignore class.notFound (if DefaultExpression exists, CurrentDate exists as well) */
+                $options['default'] = new CurrentDate();
+            }
+        }
+
         if ($class->isIdGeneratorIdentity() && $class->getIdentifierFieldNames() === [$mapping->fieldName]) {
             $options['autoincrement'] = true;
         }

tests/Tests/ORM/Functional/DefaultTimeExpressionTest.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\ORM\Functional;
+
+use DateTime;
+use DateTimeImmutable;
+use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
+use Doctrine\ORM\Mapping as ORM;
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+class DefaultTimeExpressionTest extends OrmFunctionalTestCase
+{
+    use VerifyDeprecations;
+
+    public function testUsingTimeRelatedDefaultExpressionCausesNoDbalDeprecation(): void
+    {
+        $this->expectNoDeprecationWithIdentifier('https://github.com/doctrine/dbal/pull/7195');
+
+        $this->createSchemaForModels(TimeEntity::class);
+    }
+}
+
+#[ORM\Entity]
+class TimeEntity
+{
+    #[ORM\Id]
+    #[ORM\Column]
+    public int $id;
+
+    #[ORM\Column(options: ['default' => 'CURRENT_TIMESTAMP'])]
+    public DateTime $createdAt;
+
+    #[ORM\Column(options: ['default' => 'CURRENT_TIMESTAMP'])]
+    public DateTimeImmutable $createdAtImmutable;
+
+    #[ORM\Column(options: ['default' => 'CURRENT_TIME'])]
+    public DateTime $createdTime;
+
+    #[ORM\Column(options: ['default' => 'CURRENT_DATE'])]
+    public DateTime $createdDate;
+}