Merge branch '3.8.x' into 4.0.x

* 3.8.x: Add MariaDB 11.3 to the test matrix (#6342) Spell which properly Fix double quote used wrongly for literal value in SqliteSchemaManager (#6325)
doctrine · Mar 21, 2024 · c70bae9 · c70bae9
2 parents d9109cd + e5db00e
commit c70bae9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -280,13 +280,15 @@ jobs:
         php-version:
           - "8.1"
         mariadb-version:
+          # keep in sync with https://mariadb.org/about/#maintenance-policy
           - "10.4"  # Oldest version supported by DBAL, LTS (Jun 2024)
           - "10.5"  # LTS (Jun 2025)
           - "10.6"  # LTS (Jul 2026)
           - "10.11" # LTS (Feb 2028)
           - "11.0"  # STS (Jun 2024)
           - "11.1"  # STS (Aug 2024)
           - "11.2"  # STS (Nov 2024)
+          - "11.3"  # STS (Feb 2025)
         extension:
           - "mysqli"
           - "pdo_mysql"

diff --git a/src/Query/QueryBuilder.php b/src/Query/QueryBuilder.php
@@ -1454,7 +1454,7 @@ public function __clone()
 
     /**
      * Enables caching of the results of this query, for given amount of seconds
-     * and optionally specified witch key to use for the cache entry.
+     * and optionally specified which key to use for the cache entry.
      *
      * @return $this
      */

diff --git a/src/Schema/SQLiteSchemaManager.php b/src/Schema/SQLiteSchemaManager.php
@@ -574,7 +574,7 @@ protected function selectForeignKeyColumns(string $databaseName, ?string $tableN
                    p.*
               FROM sqlite_master t
               JOIN pragma_foreign_key_list(t.name) p
-                ON p."seq" != "-1"
+                ON p."seq" != '-1'
 SQL;
 
         $conditions = [