Merge pull request #6895 from doctrine/4.2.x

Merge 4.2.x up into 4.3.x

Author: morozov

src/Platforms/SQLitePlatform.php

@@ -39,7 +39,6 @@
 use function strpos;
 use function strtolower;
 use function substr;
-use function trim;
 
 /**
  * The SQLitePlatform class describes the specifics and dialects of the SQLite
@@ -295,9 +294,7 @@ protected function _getCreateTableSQL(string $name, array $columns, array $optio
 
         $tableComment = '';
         if (isset($options['comment'])) {
-            $comment = trim($options['comment'], " '");
-
-            $tableComment = $this->getInlineTableCommentSQL($comment);
+            $tableComment = $this->getInlineTableCommentSQL($options['comment']);
         }
 
         $query = ['CREATE TABLE ' . $name . ' ' . $tableComment . '(' . $queryFields . ')'];

tests/Functional/Driver/PDO/SQLSrv/DriverTest.php

@@ -13,6 +13,7 @@
 use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 
 use function array_merge;
+use function array_replace;
 
 #[RequiresPhpExtension('pdo_sqlsrv')]
 class DriverTest extends AbstractDriverTestCase
@@ -44,7 +45,7 @@ private function getConnection(array $driverOptions): Connection
         $params = TestUtil::getConnectionParams();
 
         if (isset($params['driverOptions'])) {
-            $driverOptions = array_merge($params['driverOptions'], $driverOptions);
+            $driverOptions = array_replace($params['driverOptions'], $driverOptions);
         }
 
         return (new Driver())->connect(

tests/Functional/Schema/SchemaManagerFunctionalTestCase.php

@@ -1144,11 +1144,11 @@ public function testCommentInTable(): void
     {
         $table = new Table('table_with_comment');
         $table->addColumn('id', Types::INTEGER);
-        $table->setComment('Foo with control characters \'\\');
+        $table->setComment('\'\\ Foo with control characters \'\\');
         $this->dropAndCreateTable($table);
 
         $table = $this->schemaManager->introspectTable('table_with_comment');
-        self::assertSame('Foo with control characters \'\\', $table->getComment());
+        self::assertSame('\'\\ Foo with control characters \'\\', $table->getComment());
     }
 
     public function testIntrospectReservedKeywordTableViaListTableDetails(): void