From 57a3f9ba2ea339d946cc6c5c84ea6545e8828dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pysiak?= Date: Mon, 7 Oct 2024 06:58:37 +0200 Subject: [PATCH 1/4] Add gedmo/doctrine-extensions conflict --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index a4ddfc4791..5daf899ac7 100644 --- a/composer.json +++ b/composer.json @@ -47,8 +47,7 @@ "enshrined/svg-sanitize": "^0.16", "fakerphp/faker": "^1.10", "friendsofphp/proxy-manager-lts": "^1.0.7", - "friendsofsymfony/rest-bundle": "^3.0", - "gedmo/doctrine-extensions": "^3.2", + "gedmo/doctrine-extensions": "^3.16", "guzzlehttp/guzzle": "^6.5 || ^7.0", "guzzlehttp/psr7": "^2.5", "jms/serializer-bundle": "^4.2", @@ -192,7 +191,8 @@ "lexik/jwt-authentication-bundle": "^2.18", "stof/doctrine-extensions-bundle": "1.8.0", "symfony/validator": "5.4.25", - "twig/twig": "3.9.0" + "twig/twig": "3.9.0", + "gedmo/doctrine-extensions": "^3.17.0" }, "require-dev": { "behat/behat": "^3.6.1", From 5f3f7ad4fba624006ec1bbb7faa712ac59ff4e49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pysiak?= Date: Mon, 7 Oct 2024 06:59:04 +0200 Subject: [PATCH 2/4] Add CONFLICTS.md note --- CONFLICTS.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CONFLICTS.md b/CONFLICTS.md index 3cee61618e..b7b620f919 100644 --- a/CONFLICTS.md +++ b/CONFLICTS.md @@ -37,3 +37,8 @@ references related issues. This version has a bug, which lead to a fatal error: `An exception has been thrown during the rendering of a template ("Warning: Undefined variable $blocks").` + +- `gedmo/doctrine-extensions:3.17.0`: + + This version has a bug, which on Symfony 6.4 lead to a fatal error: + `[Semantical Error] The annotation "@note" in property Gedmo\Loggable\Entity\MappedSuperclass\AbstractLogEntry::$data was never imported.` From 913e35e76dcdc5f5032625ebdf0efe71674ed95c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pysiak?= Date: Mon, 7 Oct 2024 07:01:18 +0200 Subject: [PATCH 3/4] Fix rebase --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5daf899ac7..2904b7f309 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,8 @@ "enshrined/svg-sanitize": "^0.16", "fakerphp/faker": "^1.10", "friendsofphp/proxy-manager-lts": "^1.0.7", - "gedmo/doctrine-extensions": "^3.16", + "friendsofsymfony/rest-bundle": "^3.0", + "gedmo/doctrine-extensions": "^3.2", "guzzlehttp/guzzle": "^6.5 || ^7.0", "guzzlehttp/psr7": "^2.5", "jms/serializer-bundle": "^4.2", From 8288159df836e8a683277ce70a377103f96cb803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pysiak?= Date: Mon, 7 Oct 2024 07:07:11 +0200 Subject: [PATCH 4/4] Fix note --- CONFLICTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONFLICTS.md b/CONFLICTS.md index b7b620f919..0058d70636 100644 --- a/CONFLICTS.md +++ b/CONFLICTS.md @@ -40,5 +40,5 @@ references related issues. - `gedmo/doctrine-extensions:3.17.0`: - This version has a bug, which on Symfony 6.4 lead to a fatal error: + This version has a bug, which on Symfony 6.4 leads to a fatal error: `[Semantical Error] The annotation "@note" in property Gedmo\Loggable\Entity\MappedSuperclass\AbstractLogEntry::$data was never imported.`