Skip to content

Commit

Permalink
bug #15154 Add a conflict for "stof/doctrine-extensions-bundle": "1.8…
Browse files Browse the repository at this point in the history
….0" (jakubtobiasz)

This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | 
| License         | MIT


Commits
-------

210754f Add a conflict for "stof/doctrine-extensions-bundle": "1.8.0"
  • Loading branch information
TheMilek committed Jul 11, 2023
2 parents b764442 + 210754f commit 4111c10
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 2 deletions.
10 changes: 10 additions & 0 deletions CONFLICTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,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
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@
"doctrine/orm": "2.15.2 || 2.15.3",
"jms/serializer-bundle": "4.1.0",
"lexik/jwt-authentication-bundle": "^2.18",
"stof/doctrine-extensions-bundle": "1.8.0",
"symfony/dependency-injection": "5.4.5",
"symfony/framework-bundle": "5.4.5 || 6.2.8",
"symfony/validator": "5.4.25 || 6.2.12 || 6.3.1",
Expand Down
1 change: 1 addition & 0 deletions src/Sylius/Bundle/AddressingBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/AttributeBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
"symfony/form": "^5.4 || ^6.0"
},
"conflict": {
"doctrine/orm": "2.15.2"
"doctrine/orm": "2.15.2",
"stof/doctrine-extensions-bundle": "1.8.0"
},
"config": {
"allow-plugins": {
Expand Down
1 change: 1 addition & 0 deletions src/Sylius/Bundle/OrderBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/ProductBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
"symfony/validator": "^5.4 || ^6.0"
},
"conflict": {
"doctrine/orm": "2.15.2"
"doctrine/orm": "2.15.2",
"stof/doctrine-extensions-bundle": "1.8.0"
},
"config": {
"allow-plugins": {
Expand Down
1 change: 1 addition & 0 deletions src/Sylius/Bundle/PromotionBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
},
"conflict": {
"doctrine/orm": "2.15.2",
"stof/doctrine-extensions-bundle": "1.8.0",
"twig/twig": "^3.0"
},
"require-dev": {
Expand Down
1 change: 1 addition & 0 deletions src/Sylius/Bundle/ReviewBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"symfony/framework-bundle": "^5.4 || ^6.0"
},
"conflict": {
"stof/doctrine-extensions-bundle": "1.8.0",
"twig/twig": "^3.0"
},
"require-dev": {
Expand Down
1 change: 1 addition & 0 deletions src/Sylius/Bundle/ShippingBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
},
"conflict": {
"doctrine/orm": "2.15.2",
"stof/doctrine-extensions-bundle": "1.8.0",
"twig/twig": "^3.0"
},
"require-dev": {
Expand Down
1 change: 1 addition & 0 deletions src/Sylius/Bundle/TaxationBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
},
"conflict": {
"doctrine/orm": "2.15.2",
"stof/doctrine-extensions-bundle": "1.8.0",
"twig/twig": "^3.0"
},
"require-dev": {
Expand Down
1 change: 1 addition & 0 deletions src/Sylius/Bundle/TaxonomyBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
},
"conflict": {
"doctrine/orm": "2.15.2",
"stof/doctrine-extensions-bundle": "1.8.0",
"twig/twig": "^3.0"
},
"require-dev": {
Expand Down

0 comments on commit 4111c10

Please sign in to comment.