Merge branch '4.3.x' into 4.4.x

derrabus · derrabus · commit 95bda94132f1 · 2025-07-26T10:40:23.000+02:00
* 4.3.x: feat: add more pdo jobs with stringify fetches (doctrine#7052) Fix case sensitivity in SQLite column types (doctrine#7050) Fix length type in `MySQLSchemaManager` with `ATTR_STRINGIFY_FETCHES` enabled (doctrine#7028) Fix Symfony 8 compatibility issues (doctrine#7009) Quote MySQL constraint names for foreign keys
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -35,6 +35,7 @@ jobs:
       php-version: ${{ matrix.php-version }}
       extension: ${{ matrix.extension }}
       dependency-versions: ${{ matrix.dependency-versions }}
+      config-file-suffix: ${{ matrix.config-file-suffix }}
 
     strategy:
       matrix:
@@ -57,6 +58,11 @@ jobs:
             php-version: "8.4"
             dependency-versions: "highest"
             extension: "sqlite3"
+          - os: "ubuntu-22.04"
+            php-version: "8.2"
+            dependency-versions: "highest"
+            extension: "pdo_sqlite"
+            config-file-suffix: "-stringify_fetches"
 
   phpunit-oracle:
     name: "PHPUnit with Oracle"
@@ -95,6 +101,7 @@ jobs:
       postgres-version: ${{ matrix.postgres-version }}
       extension: ${{ matrix.extension }}
       postgres-locale-provider: ${{ matrix.postgres-locale-provider }}
+      config-file-suffix: ${{ matrix.config-file-suffix }}
 
     strategy:
       matrix:
@@ -121,6 +128,10 @@ jobs:
             postgres-version: "15"
             extension: "pdo_pgsql"
             postgres-locale-provider: "icu"
+          - php-version: "8.2"
+            postgres-version: "17"
+            extension: "pdo_pgsql"
+            config-file-suffix: "-stringify_fetches"
 
   phpunit-mariadb:
     name: "PHPUnit with MariaDB"
@@ -130,6 +141,7 @@ jobs:
       php-version: ${{ matrix.php-version }}
       mariadb-version: ${{ matrix.mariadb-version }}
       extension: ${{ matrix.extension }}
+      config-file-suffix: ${{ matrix.config-file-suffix }}
 
     strategy:
       matrix:
@@ -154,6 +166,10 @@ jobs:
           - php-version: "8.2"
             mariadb-version: "11.4"
             extension: "pdo_mysql"
+          - config-file-suffix: "-stringify_fetches"
+            php-version: "8.2"
+            mariadb-version: "11.4"
+            extension: "pdo_mysql"
 
   phpunit-mysql:
     name: "PHPUnit with MySQL"
@@ -182,6 +198,10 @@ jobs:
             php-version: "8.2"
             mysql-version: "9.1"
             extension: "mysqli"
+          - config-file-suffix: "-stringify_fetches"
+            php-version: "8.2"
+            mysql-version: "9.1"
+            extension: "pdo_mysql"
           - php-version: "8.2"
             mysql-version: "9.1"
             extension: "mysqli"
@@ -235,7 +255,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.3"
+          - "8.4"
 
     steps:
       - name: "Checkout"
@@ -249,7 +269,9 @@ jobs:
           fail-fast: true
 
       - name: "Lower minimum stability"
-        run: "composer config minimum-stability dev"
+        run: | 
+          composer config minimum-stability dev
+          composer require --no-update --dev symfony/console:^8 symfony/cache:^8
 
       - name: "Install development dependencies with Composer"
         uses: "ramsey/composer-install@v3"
diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml
@@ -12,6 +12,10 @@ on:
       extension:
         required: true
         type: string
+      config-file-suffix:
+        required: false
+        type: string
+        default: ''
 
 jobs:
   phpunit-mariadb:
@@ -53,5 +57,5 @@ jobs:
       - name: Upload coverage file
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ github.job }}-${{ inputs.mariadb-version }}-php-${{ inputs.php-version }}-${{ inputs.extension }}.coverage
+          name: ${{ github.job }}-${{ inputs.mariadb-version }}-php-${{ inputs.php-version }}-${{ inputs.extension }}${{ inputs.config-file-suffix }}.coverage
           path: coverage.xml
diff --git a/.github/workflows/phpunit-postgres.yml b/.github/workflows/phpunit-postgres.yml
@@ -15,6 +15,10 @@ on:
       postgres-locale-provider:
         required: true
         type: string
+      config-file-suffix:
+        required: false
+        type: string
+        default: ''
 
 jobs:
   phpunit-postgres:
@@ -51,10 +55,10 @@ jobs:
           composer-options: '--ignore-platform-req=php+'
 
       - name: Run PHPUnit
-        run: vendor/bin/phpunit -c ci/github/phpunit/${{ inputs.extension }}.xml --coverage-clover=coverage.xml
+        run: vendor/bin/phpunit -c ci/github/phpunit/${{ inputs.extension }}${{ inputs.config-file-suffix }}.xml --coverage-clover=coverage.xml
 
       - name: Upload coverage file
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ github.job }}-${{ inputs.postgres-version }}-php-${{ inputs.php-version }}-${{ inputs.extension }}.coverage
+          name: ${{ github.job }}-${{ inputs.postgres-version }}-php-${{ inputs.php-version }}-${{ inputs.extension }}${{ inputs.config-file-suffix }}.coverage
           path: coverage.xml
diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
@@ -15,6 +15,10 @@ on:
       dependency-versions:
         required: true
         type: string
+      config-file-suffix:
+        required: false
+        type: string
+        default: ''
 
 jobs:
   phpunit-sqlite:
@@ -50,10 +54,10 @@ jobs:
         if: ${{ inputs.extension == 'sqlite3' }}
 
       - name: Run PHPUnit
-        run: vendor/bin/phpunit -c ci/github/phpunit/${{ inputs.extension }}.xml --coverage-clover=coverage.xml
+        run: vendor/bin/phpunit -c ci/github/phpunit/${{ inputs.extension }}${{ inputs.config-file-suffix }}.xml --coverage-clover=coverage.xml
 
       - name: Upload coverage file
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ github.job }}-php-${{ inputs.php-version }}-${{ inputs.extension }}-${{ inputs.dependency-versions }}.coverage
+          name: ${{ github.job }}-php-${{ inputs.php-version }}-${{ inputs.extension }}${{ inputs.config-file-suffix }}-${{ inputs.dependency-versions }}.coverage
           path: coverage.xml
diff --git a/ci/github/phpunit/pdo_mysql-stringify_fetches.xml b/ci/github/phpunit/pdo_mysql-stringify_fetches.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true"
+         beStrictAboutOutputDuringTests="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         failOnNotice="true"
+         failOnPhpunitDeprecation="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+
+        <var name="db_driver" value="pdo_mysql"/>
+        <!-- see \PDO::ATTR_STRINGIFY_FETCHES-->
+        <var name="db_driver_option_17" value="true"/>
+        <var name="db_host" value="127.0.0.1" />
+        <var name="db_port" value="3306"/>
+        <var name="db_user" value="root" />
+        <var name="db_dbname" value="doctrine_tests" />
+        <var name="db_charset" value="utf8mb4" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Doctrine DBAL Test Suite">
+            <directory>../../../tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <source>
+        <include>
+            <directory>../../../src</directory>
+        </include>
+    </source>
+</phpunit>
diff --git a/ci/github/phpunit/pdo_pgsql-stringify_fetches.xml b/ci/github/phpunit/pdo_pgsql-stringify_fetches.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true"
+         beStrictAboutOutputDuringTests="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         failOnNotice="true"
+         failOnPhpunitDeprecation="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+
+        <var name="db_driver" value="pdo_pgsql"/>
+        <!-- see \PDO::ATTR_STRINGIFY_FETCHES-->
+        <var name="db_driver_option_17" value="true"/>
+        <var name="db_host" value="localhost" />
+        <var name="db_user" value="postgres" />
+        <var name="db_password" value="postgres" />
+        <var name="db_dbname" value="doctrine_tests" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Doctrine DBAL Test Suite">
+            <directory>../../../tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <source>
+        <include>
+            <directory>../../../src</directory>
+        </include>
+    </source>
+</phpunit>
diff --git a/ci/github/phpunit/pdo_sqlite-stringify_fetches.xml b/ci/github/phpunit/pdo_sqlite-stringify_fetches.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true"
+         beStrictAboutOutputDuringTests="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         failOnNotice="true"
+         failOnPhpunitDeprecation="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+
+        <var name="db_driver" value="pdo_sqlite"/>
+        <!-- see \PDO::ATTR_STRINGIFY_FETCHES-->
+        <var name="db_driver_option_17" value="true"/>
+        <var name="db_memory" value="true"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="Doctrine DBAL Test Suite">
+            <directory>../../../tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <source>
+        <include>
+            <directory>../../../src</directory>
+        </include>
+    </source>
+</phpunit>
diff --git a/src/Schema/MySQLSchemaManager.php b/src/Schema/MySQLSchemaManager.php
@@ -130,12 +130,12 @@ protected function _getPortableTableColumnDefinition(array $tableColumn): Column
         switch ($dbType) {
             case 'char':
             case 'varchar':
-                $length = $tableColumn['character_maximum_length'];
+                $length = (int) $tableColumn['character_maximum_length'];
                 break;
 
             case 'binary':
             case 'varbinary':
-                $length = $tableColumn['character_octet_length'];
+                $length = (int) $tableColumn['character_octet_length'];
                 break;
 
             case 'tinytext':
@@ -167,10 +167,10 @@ protected function _getPortableTableColumnDefinition(array $tableColumn): Column
             case 'real':
             case 'numeric':
             case 'decimal':
-                $precision = $tableColumn['numeric_precision'];
+                $precision = (int) $tableColumn['numeric_precision'];
 
                 if (isset($tableColumn['numeric_scale'])) {
-                    $scale = $tableColumn['numeric_scale'];
+                    $scale = (int) $tableColumn['numeric_scale'];
                 }
 
                 break;
@@ -280,7 +280,7 @@ protected function _getPortableTableForeignKeysList(array $rows): array
                 }
 
                 $list[$row['constraint_name']] = [
-                    'name' => $row['constraint_name'],
+                    'name' => $this->getQuotedIdentifierName($row['constraint_name']),
                     'local' => [],
                     'foreign' => [],
                     'foreignTable' => $row['referenced_table_name'],
@@ -524,4 +524,14 @@ private function getDefaultTableOptions(): DefaultTableOptions
 
         return $this->defaultTableOptions;
     }
+
+    /** Returns the quoted representation of the given identifier name. */
+    private function getQuotedIdentifierName(?string $identifier): ?string
+    {
+        if ($identifier === null) {
+            return null;
+        }
+
+        return $this->platform->quoteSingleIdentifier($identifier);
+    }
 }
diff --git a/src/Schema/PostgreSQLSchemaManager.php b/src/Schema/PostgreSQLSchemaManager.php
@@ -128,8 +128,8 @@ protected function _getPortableTableForeignKeyDefinition(array $tableForeignKey)
             [
                 'onUpdate' => $onUpdate,
                 'onDelete' => $onDelete,
-                'deferrable' => $tableForeignKey['condeferrable'],
-                'deferred' => $tableForeignKey['condeferred'],
+                'deferrable' => (bool) $tableForeignKey['condeferrable'],
+                'deferred' => (bool) $tableForeignKey['condeferred'],
             ],
         );
     }
@@ -170,7 +170,7 @@ static function (array $row): array {
                 return [
                     'key_name' => $row['relname'],
                     'non_unique' => ! $row['indisunique'],
-                    'primary' => $row['indisprimary'],
+                    'primary' => (bool) $row['indisprimary'],
                     'where' => $row['where'],
                     'column_name' => $row['attname'],
                 ];
diff --git a/src/Schema/SQLiteSchemaManager.php b/src/Schema/SQLiteSchemaManager.php
@@ -73,7 +73,7 @@ protected function _getPortableTableDefinition(array $table): string
      */
     protected function _getPortableTableColumnDefinition(array $tableColumn): Column
     {
-        $matchResult = preg_match('/^([A-Z\s]+?)(?:\s*\((\d+)(?:,\s*(\d+))?\))?$/', $tableColumn['type'], $matches);
+        $matchResult = preg_match('/^([A-Z\s]+?)(?:\s*\((\d+)(?:,\s*(\d+))?\))?$/i', $tableColumn['type'], $matches);
         assert($matchResult === 1);
 
         $dbType = strtolower($matches[1]);
diff --git a/tests/Functional/Driver/DBAL6044Test.php b/tests/Functional/Driver/DBAL6044Test.php
@@ -16,7 +16,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if (TestUtil::isDriverOneOf('pdo_pgsql', 'pgsql')) {
+        if (TestUtil::isDriverOneOf('pdo_pgsql', 'pgsql') && ! TestUtil::isPdoStringifyFetchesEnabled()) {
             return;
         }
 
diff --git a/tests/Functional/FetchBooleanTest.php b/tests/Functional/FetchBooleanTest.php
@@ -6,17 +6,23 @@
 
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Tests\TestUtil;
 use PHPUnit\Framework\Attributes\DataProvider;
 
 class FetchBooleanTest extends FunctionalTestCase
 {
     protected function setUp(): void
     {
-        if ($this->connection->getDatabasePlatform() instanceof PostgreSQLPlatform) {
+        if (
+            $this->connection->getDatabasePlatform() instanceof PostgreSQLPlatform
+            && ! TestUtil::isPdoStringifyFetchesEnabled()
+        ) {
             return;
         }
 
-        self::markTestSkipped('Only PostgreSQL supports boolean values natively');
+        self::markTestSkipped(
+            'Only PostgreSQL supports boolean values natively, as long as PDO does not stringify them.',
+        );
     }
 
     #[DataProvider('booleanLiteralProvider')]
diff --git a/tests/Functional/Query/QueryBuilderTest.php b/tests/Functional/Query/QueryBuilderTest.php
diff --git a/tests/Functional/SQL/ParserTest.php b/tests/Functional/SQL/ParserTest.php
diff --git a/tests/Functional/Schema/MySQLSchemaManagerTest.php b/tests/Functional/Schema/MySQLSchemaManagerTest.php
diff --git a/tests/Functional/Schema/SQLiteSchemaManagerTest.php b/tests/Functional/Schema/SQLiteSchemaManagerTest.php
diff --git a/tests/TestUtil.php b/tests/TestUtil.php
diff --git a/tests/Tools/Console/RunSqlCommandTest.php b/tests/Tools/Console/RunSqlCommandTest.php

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ protected function _getPortableTableDefinition(array $table): string`
`73`	`73`	`*/`
`74`	`74`	`protected function _getPortableTableColumnDefinition(array $tableColumn): Column`
`75`	`75`	`{`
`76`		`- $matchResult = preg_match('/^([A-Z\s]+?)(?:\s\((\d+)(?:,\s(\d+))?\))?$/', $tableColumn['type'], $matches);`
	`76`	`+ $matchResult = preg_match('/^([A-Z\s]+?)(?:\s\((\d+)(?:,\s(\d+))?\))?$/i', $tableColumn['type'], $matches);`
`77`	`77`	`assert($matchResult === 1);`
`78`	`78`
`79`	`79`	`$dbType = strtolower($matches[1]);`