From e33f6637f1ff8f9adb1f19bcbf3ddcfdb7cacd5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Tue, 5 Mar 2024 10:18:14 +0100 Subject: [PATCH 1/7] Fix double quote used wrongly for literal value in SqliteSchemaManager (#6325) | Q | A |------------- | ----------- | Type | bug | Fixed issues | #### Summary It seems PHP SQLite drivers allows `"` to be used to escape literal values, but natively such syntax produces an sqlite parse error [1]. I have discovered this when analysing SQLite log, it is otherwise tested. I checked all other `"` in SQLite platform and manager and all of them seems correct otherwise. [1] https://dbfiddle.uk/KQAGp9Ea (notice the 2nd query is the same, but uses `"` instead of `'`) --- src/Schema/SqliteSchemaManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Schema/SqliteSchemaManager.php b/src/Schema/SqliteSchemaManager.php index 13f5c514763..84361ae8286 100644 --- a/src/Schema/SqliteSchemaManager.php +++ b/src/Schema/SqliteSchemaManager.php @@ -744,7 +744,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 = [ From 9c2b00a42eadd8348d4ebac46538de765d58dcdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 12 Mar 2024 13:53:18 +0100 Subject: [PATCH 2/7] Spell which properly --- src/Query/QueryBuilder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Query/QueryBuilder.php b/src/Query/QueryBuilder.php index f099e756bcb..4c5d6b8d40a 100644 --- a/src/Query/QueryBuilder.php +++ b/src/Query/QueryBuilder.php @@ -1734,7 +1734,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 */ From eef300f4dd32bede044c6e8c504c2c58974120ae Mon Sep 17 00:00:00 2001 From: Michael Dwyer Date: Tue, 12 Mar 2024 15:51:12 -0500 Subject: [PATCH 3/7] Update UPGRADE.md The list of reserved characters for cache key names was missing ':' --- UPGRADE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPGRADE.md b/UPGRADE.md index af7be3bcf5a..dda002c38f5 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1750,7 +1750,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. From bd7e79f473781ebbdd6af74740180618308304db Mon Sep 17 00:00:00 2001 From: Thomas Landauer Date: Tue, 19 Mar 2024 09:38:48 +0100 Subject: [PATCH 4/7] [Documentation] Adding "versionadded" (#6336) | Q | A |------------- | ----------- | Type | improvement | Fixed issues | none #### Summary Page: https://www.doctrine-project.org/projects/doctrine-dbal/en/4.0/reference/types.html#bigint The `int`-mapping needs to be added at https://www.doctrine-project.org/projects/doctrine-orm/en/3.1/reference/basic-mapping.html#doctrine-mapping-types too! What is the right version information? Is it only working if you have DBAL 4 **and** ORM 3? --- docs/en/reference/types.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/en/reference/types.rst b/docs/en/reference/types.rst index 32b12d5184b..b06c0efdf7e 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 From aec34a9e8183f33843a4cf85e13124df3e5c0592 Mon Sep 17 00:00:00 2001 From: Claudio Zizza Date: Tue, 19 Mar 2024 20:58:35 +0100 Subject: [PATCH 5/7] Remove older versions from the docs To reduce Algolia operations and indexes older versions get removed --- .doctrine-project.json | 45 ------------------------------------------ 1 file changed, 45 deletions(-) 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 } ] } From e0219f82916f53891c2ff8a9bf1bcc61a4172677 Mon Sep 17 00:00:00 2001 From: Thomas Landauer Date: Wed, 20 Mar 2024 15:38:32 +0100 Subject: [PATCH 6/7] [Documentation] Fixing markup (#6340) --- docs/en/reference/types.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/reference/types.rst b/docs/en/reference/types.rst index b06c0efdf7e..716b0d50ec1 100644 --- a/docs/en/reference/types.rst +++ b/docs/en/reference/types.rst @@ -93,7 +93,7 @@ Otherwise, returns ``null`` if no data is present. .. versionadded:: 4.0 -The mapping to PHP `int` was added in version 4.0 +The mapping to PHP ``int`` was added in version 4.0 .. note:: From e5db00eb7b59782eddb72dbb62fe67a4208c0f4c Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Thu, 21 Mar 2024 14:52:33 +0100 Subject: [PATCH 7/7] Add MariaDB 11.3 to the test matrix (#6342) --- .github/workflows/continuous-integration.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 6c2c2b35342..dbea005ae82 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -296,6 +296,7 @@ jobs: php-version: - "7.4" mariadb-version: + # keep in sync with https://mariadb.org/about/#maintenance-policy - "10.0" # Oldest version supported by DBAL - "10.4" # LTS (Jun 2024) - "10.5" # LTS (Jun 2025) @@ -304,6 +305,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"