Merge pull request #7245 from doctrine/4.4.x

Merge 4.4.x up into 4.5.x

Author: morozov

src/Connection.php

@@ -964,8 +964,11 @@ public function transactional(Closure $func): mixed
             $res = $func($this);
 
             $successful = true;
+        } catch (ConnectionLost $connectionLost) {
+            // Catching here only to be able to prevent a rollback attempt
+            throw $connectionLost;
         } finally {
-            if (! $successful) {
+            if (! isset($connectionLost) && ! $successful) {
                 $this->rollBack();
             }
         }
@@ -981,6 +984,7 @@ public function transactional(Closure $func): mixed
                 || $t instanceof UniqueConstraintViolationException
                 || $t instanceof ForeignKeyConstraintViolationException
                 || $t instanceof DeadlockException
+                || $t instanceof ConnectionLost
             );
 
             throw $t;

src/Schema/Column.php

@@ -35,6 +35,7 @@
  *     charset?: ?non-empty-string,
  *     collation?: ?non-empty-string,
  *     default_constraint_name?: non-empty-string,
+ *     enumType?: class-string,
  *     jsonb?: bool,
  *     version?: bool,
  * }
@@ -277,6 +278,16 @@ public function getMaximumValue(): mixed
         return $this->_platformOptions['max'] ?? null;
     }
 
+    /**
+     * Returns the enum type used by the column.
+     *
+     * @return ?class-string
+     */
+    public function getEnumType(): ?string
+    {
+        return $this->_platformOptions['enumType'] ?? null;
+    }
+
     /**
      * @internal Should be used only from within the {@see AbstractSchemaManager} class hierarchy.
      *
@@ -290,8 +301,8 @@ public function getDefaultConstraintName(): ?string
     }
 
     /**
-     * @deprecated Use {@see getCharset()}, {@see getCollation()}, {@see getMinimumValue()} or {@see getMaximumValue()}
-     *             instead.
+     * @deprecated Use {@see getCharset()}, {@see getCollation()}, {@see getMinimumValue()}, {@see getMaximumValue()}
+     *             or {@see getEnumType()} instead.
      *
      * @return PlatformOptions
      */
@@ -301,8 +312,8 @@ public function getPlatformOptions(): array
     }
 
     /**
-     * @deprecated Use {@see getCharset()}, {@see getCollation()}, {@see getMinimumValue()} or {@see getMaximumValue()}
-     *             instead.
+     * @deprecated Use {@see getCharset()}, {@see getCollation()}, {@see getMinimumValue()}, {@see getMaximumValue()}
+     *             or {@see getEnumType()} instead.
      *
      * @param key-of<PlatformOptions> $name
      */
@@ -312,8 +323,8 @@ public function hasPlatformOption(string $name): bool
     }
 
     /**
-     * @deprecated Use {@see getCharset()}, {@see getCollation()}, {@see getMinimumValue()} or {@see getMaximumValue()}
-     *             instead.
+     * @deprecated Use {@see getCharset()}, {@see getCollation()}, {@see getMinimumValue()}, {@see getMaximumValue()}
+     *             or {@see getEnumType()} instead.
      *
      * @param key-of<PlatformOptions> $name
      */
@@ -415,6 +426,7 @@ public function edit(): ColumnEditor
             ->setCollation($this->getCollation())
             ->setMinimumValue($this->getMinimumValue())
             ->setMaximumValue($this->getMaximumValue())
+            ->setEnumType($this->getEnumType())
             ->setDefaultConstraintName($this->getDefaultConstraintName());
     }
 }

src/Schema/ColumnEditor.php

@@ -34,6 +34,9 @@ final class ColumnEditor
 
     private mixed $maximumValue = null;
 
+    /** @var ?class-string  */
+    private ?string $enumType = null;
+
     private bool $autoincrement = false;
 
     private string $comment = '';
@@ -159,6 +162,14 @@ public function setMaximumValue(mixed $maximumValue): self
         return $this;
     }
 
+    /** @param ?class-string $enumType */
+    public function setEnumType(?string $enumType): self
+    {
+        $this->enumType = $enumType;
+
+        return $this;
+    }
+
     public function setAutoincrement(bool $flag): self
     {
         $this->autoincrement = $flag;
@@ -245,6 +256,10 @@ public function create(): Column
             $platformOptions['max'] = $this->maximumValue;
         }
 
+        if ($this->enumType !== null) {
+            $platformOptions['enumType'] = $this->enumType;
+        }
+
         if ($this->defaultConstraintName !== null) {
             $platformOptions[SQLServerPlatform::OPTION_DEFAULT_CONSTRAINT_NAME] = $this->defaultConstraintName;
         }

tests/Functional/TransactionTest.php

@@ -48,6 +48,27 @@ public function testRollbackFailure(): void
         });
     }
 
+    public function testTransactionalFailureDuringCallback(): void
+    {
+        $this->connection->transactional(
+            function (): void {
+                $this->expectConnectionLoss(static function (Connection $connection): void {
+                    $connection->executeQuery($connection->getDatabasePlatform()->getDummySelectSQL());
+                });
+            },
+        );
+    }
+
+    public function testTransactionalFailureDuringCommit(): void
+    {
+        $this->connection->transactional(
+            function (): void {
+                $this->expectConnectionLoss(static function (Connection $connection): void {
+                });
+            },
+        );
+    }
+
     private function expectConnectionLoss(callable $scenario): void
     {
         $this->killCurrentSession();

tests/Schema/ColumnTest.php

@@ -37,10 +37,12 @@ public function testGet(): void
         self::assertTrue($column->getFixed());
         self::assertEquals('baz', $column->getDefault());
 
-        self::assertEquals(['charset' => 'utf8'], $column->getPlatformOptions());
+        self::assertEquals(['charset' => 'utf8', 'enumType' => self::class], $column->getPlatformOptions());
         self::assertTrue($column->hasPlatformOption('charset'));
         self::assertEquals('utf8', $column->getPlatformOption('charset'));
         self::assertFalse($column->hasPlatformOption('collation'));
+        self::assertTrue($column->hasPlatformOption('enumType'));
+        self::assertEquals(self::class, $column->getPlatformOption('enumType'));
     }
 
     public function testToArray(): void
@@ -60,6 +62,7 @@ public function testToArray(): void
             'comment' => '',
             'values' => [],
             'charset' => 'utf8',
+            'enumType' => self::class,
         ];
 
         self::assertSame($expected, $this->createColumn()->toArray());
@@ -98,6 +101,7 @@ public function createColumn(): Column
             ->setFixed(true)
             ->setDefaultValue('baz')
             ->setCharset('utf8')
+            ->setEnumType(self::class)
             ->create();
     }