Merge pull request #6485 from doctrine/3.8.x

Merge 3.8.x up into 3.9.x
doctrine · Aug 7, 2024 · 613798a · 613798a
2 parents 1874323 + 2093d67
commit 613798a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -489,7 +489,7 @@ jobs:
           MSSQL_COLLATION: "${{ matrix.collation }}"
 
         options: >-
-          --health-cmd "echo quit | /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -l 1 -U sa -P Doctrine2018"
+          --health-cmd "echo quit | /opt/mssql-tools18/bin/sqlcmd -C -S 127.0.0.1 -l 1 -U sa -P Doctrine2018"
 
         ports:
           - "1433:1433"

diff --git a/src/Schema/AbstractSchemaManager.php b/src/Schema/AbstractSchemaManager.php
@@ -1740,6 +1740,10 @@ public function getSchemaSearchPaths()
      */
     public function extractDoctrineTypeFromComment($comment, $currentType)
     {
+        if ($this->_conn->getConfiguration()->getDisableTypeComments()) {
+            return $currentType;
+        }
+
         if ($comment !== null && preg_match('(\(DC2Type:(((?!\)).)+)\))', $comment, $match) === 1) {
             return $match[1];
         }
@@ -1757,6 +1761,10 @@ public function extractDoctrineTypeFromComment($comment, $currentType)
      */
     public function removeDoctrineTypeFromComment($comment, $type)
     {
+        if ($this->_conn->getConfiguration()->getDisableTypeComments()) {
+            return $comment;
+        }
+
         if ($comment === null) {
             return null;
         }

diff --git a/tests/Functional/Ticket/DBAL461Test.php b/tests/Functional/Ticket/DBAL461Test.php
@@ -2,6 +2,7 @@
 
 namespace Doctrine\DBAL\Tests\Functional\Ticket;
 
+use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Platforms\SQLServer2012Platform;
 use Doctrine\DBAL\Schema\SQLServerSchemaManager;
@@ -14,7 +15,12 @@ class DBAL461Test extends TestCase
 {
     public function testIssue(): void
     {
-        $conn     = $this->createMock(Connection::class);
+        $configuration = $this->createStub(Configuration::class);
+        $configuration->method('getDisableTypeComments')->willReturn(false);
+
+        $conn = $this->createMock(Connection::class);
+        $conn->method('getConfiguration')->willReturn($configuration);
+
         $platform = new SQLServer2012Platform();
         $platform->registerDoctrineTypeMapping('numeric', Types::DECIMAL);