Skip to content

Commit c70bae9

Browse files
committed
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)
2 parents d9109cd + e5db00e commit c70bae9

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

.github/workflows/continuous-integration.yml

+2
Original file line numberDiff line numberDiff line change
@@ -280,13 +280,15 @@ jobs:
280280
php-version:
281281
- "8.1"
282282
mariadb-version:
283+
# keep in sync with https://mariadb.org/about/#maintenance-policy
283284
- "10.4" # Oldest version supported by DBAL, LTS (Jun 2024)
284285
- "10.5" # LTS (Jun 2025)
285286
- "10.6" # LTS (Jul 2026)
286287
- "10.11" # LTS (Feb 2028)
287288
- "11.0" # STS (Jun 2024)
288289
- "11.1" # STS (Aug 2024)
289290
- "11.2" # STS (Nov 2024)
291+
- "11.3" # STS (Feb 2025)
290292
extension:
291293
- "mysqli"
292294
- "pdo_mysql"

src/Query/QueryBuilder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1454,7 +1454,7 @@ public function __clone()
14541454

14551455
/**
14561456
* Enables caching of the results of this query, for given amount of seconds
1457-
* and optionally specified witch key to use for the cache entry.
1457+
* and optionally specified which key to use for the cache entry.
14581458
*
14591459
* @return $this
14601460
*/

src/Schema/SQLiteSchemaManager.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ protected function selectForeignKeyColumns(string $databaseName, ?string $tableN
574574
p.*
575575
FROM sqlite_master t
576576
JOIN pragma_foreign_key_list(t.name) p
577-
ON p."seq" != "-1"
577+
ON p."seq" != '-1'
578578
SQL;
579579

580580
$conditions = [

0 commit comments

Comments
 (0)