Resolve conflicts between 1.12 and 1.13

CONFLICTS.md

@@ -26,3 +26,13 @@ references related issues.
 
   This version introduced a bug, causing validation constraints to not work.
   References: https://github.com/symfony/symfony/issues/50780
+
+- `stof/doctrine-extensions-bundle:1.8.0`
+
+  This version introduced configuring the metadata cache for the extensions, what breaks the `Timestampable` behaviour.
+  This package is not exactly the root of the problem, but it started using a bugged feature of the `gedmo/doctrine-extensions` package.
+
+  References:
+
+    - https://github.com/stof/StofDoctrineExtensionsBundle/issues/455
+    - https://github.com/doctrine-extensions/DoctrineExtensions/issues/2600

composer.json

@@ -187,6 +187,7 @@
     "conflict": {
         "doctrine/orm": "2.15.2 || 2.15.3",
         "lexik/jwt-authentication-bundle": "^2.18",
+        "stof/doctrine-extensions-bundle": "1.8.0",
         "symfony/framework-bundle": "6.2.8",
         "symfony/validator": "5.4.25 || 6.2.12 || 6.3.1"
     },

src/Sylius/Bundle/AddressingBundle/composer.json

@@ -35,6 +35,7 @@
     },
     "conflict": {
         "doctrine/orm": "2.15.2",
+        "stof/doctrine-extensions-bundle": "1.8.0",
         "twig/twig": "^1.0 || ^3.0"
     },
     "require-dev": {

src/Sylius/Bundle/AttributeBundle/composer.json

@@ -43,7 +43,8 @@
         "symfony/form": "^5.4.21 || ^6.0"
     },
     "conflict": {
-        "doctrine/orm": "2.15.2"
+        "doctrine/orm": "2.15.2",
+        "stof/doctrine-extensions-bundle": "1.8.0"
     },
     "config": {
         "allow-plugins": {

src/Sylius/Bundle/OrderBundle/composer.json

@@ -38,6 +38,7 @@
     },
     "conflict": {
         "doctrine/orm": "2.15.2",
+        "stof/doctrine-extensions-bundle": "1.8.0",
         "twig/twig": "^1.0 || ^3.0"
     },
     "require-dev": {

src/Sylius/Bundle/ProductBundle/composer.json

@@ -45,7 +45,8 @@
         "symfony/validator": "^5.4.21 || ^6.0"
     },
     "conflict": {
-        "doctrine/orm": "2.15.2"
+        "doctrine/orm": "2.15.2",
+        "stof/doctrine-extensions-bundle": "1.8.0"
     },
     "config": {
         "allow-plugins": {

src/Sylius/Bundle/PromotionBundle/composer.json

@@ -38,6 +38,7 @@
     },
     "conflict": {
         "doctrine/orm": "2.15.2",
+        "stof/doctrine-extensions-bundle": "1.8.0",
         "twig/twig": "^3.0"
     },
     "require-dev": {

src/Sylius/Bundle/ReviewBundle/composer.json

@@ -47,6 +47,7 @@
         "symfony/framework-bundle": "^5.4.21 || ^6.0"
     },
     "conflict": {
+        "stof/doctrine-extensions-bundle": "1.8.0",
         "twig/twig": "^3.0"
     },
     "require-dev": {

src/Sylius/Bundle/ShippingBundle/composer.json

@@ -38,6 +38,7 @@
     },
     "conflict": {
         "doctrine/orm": "2.15.2",
+        "stof/doctrine-extensions-bundle": "1.8.0",
         "twig/twig": "^3.0"
     },
     "require-dev": {

src/Sylius/Bundle/TaxationBundle/composer.json

@@ -37,6 +37,7 @@
     },
     "conflict": {
         "doctrine/orm": "2.15.2",
+        "stof/doctrine-extensions-bundle": "1.8.0",
         "twig/twig": "^3.0"
     },
     "require-dev": {

src/Sylius/Bundle/TaxonomyBundle/composer.json

@@ -36,6 +36,7 @@
     },
     "conflict": {
         "doctrine/orm": "2.15.2",
+        "stof/doctrine-extensions-bundle": "1.8.0",
         "twig/twig": "^3.0"
     },
     "require-dev": {