diff --git a/.doctrine-project.json b/.doctrine-project.json index 686066b4a4d..80bb45ddc4f 100644 --- a/.doctrine-project.json +++ b/.doctrine-project.json @@ -82,51 +82,6 @@ "branchName": "3.0.x", "slug": "3.0", "maintained": false - }, - { - "name": "2.13", - "slug": "2.13", - "maintained": false - }, - { - "name": "2.12", - "slug": "2.12", - "maintained": false - }, - { - "name": "2.11", - "slug": "2.11", - "maintained": false - }, - { - "name": "2.10", - "slug": "2.10", - "maintained": false - }, - { - "name": "2.9", - "slug": "2.9", - "maintained": false - }, - { - "name": "2.8", - "slug": "2.8", - "maintained": false - }, - { - "name": "2.7", - "slug": "2.7", - "maintained": false - }, - { - "name": "2.6", - "slug": "2.6", - "maintained": false - }, - { - "name": "2.5", - "slug": "2.5", - "maintained": false } ] } diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 1cfda1b1111..acea9af5961 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -280,6 +280,7 @@ 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) @@ -287,6 +288,7 @@ jobs: - "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/UPGRADE.md b/UPGRADE.md index 4a69145c655..7759a91fd4d 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1757,7 +1757,7 @@ We have been working on phasing out `doctrine/cache`, and 3.2.0 allows to use `psr/cache` instead. To help calling our own internal APIs in a unified way, we also wrap `doctrine/cache` implementations with a `psr/cache` adapter. Using cache keys containing characters reserved by `psr/cache` will result in -an exception. The characters are the following: `{}()/\@`. +an exception. The characters are the following: `{}()/\@:`. ## Deprecated `SQLLogger` and its implementations. diff --git a/docs/en/reference/types.rst b/docs/en/reference/types.rst index 32b12d5184b..716b0d50ec1 100644 --- a/docs/en/reference/types.rst +++ b/docs/en/reference/types.rst @@ -91,6 +91,10 @@ Values retrieved from the database are always converted to PHP's ``integer`` typ if they are within PHP's integer range or ``string`` if they aren't. Otherwise, returns ``null`` if no data is present. +.. versionadded:: 4.0 + +The mapping to PHP ``int`` was added in version 4.0 + .. note:: Due to architectural differences, 32-bit PHP systems have a smaller diff --git a/src/Query/QueryBuilder.php b/src/Query/QueryBuilder.php index 52fc06d88f4..1127c6b9e4a 100644 --- 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 index 20dc4fd257d..fc2014b4cb1 100644 --- 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 = [