Skip to content

Commit

Permalink
minor #16131 Revert conflict to twig/intl-extra (GSadee)
Browse files Browse the repository at this point in the history
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<!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | |
| License         | MIT                                                          |

I would like to remove the added conflict to `twig/intl-extra` as the newest [v3.9.1 tag](https://github.com/twigphp/Twig/releases/tag/v3.9.1) of `twig/twig` seems to resolve this problem.

<!--
 - Bug fixes must be submitted against the 1.12 branch
 - Features and deprecations must be submitted against the 1.13 branch
 - Make sure that the correct base branch is set

 To be sure you are not breaking any Backward Compatibilities, check the documentation:
 https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->


Commits
-------
  Revert conflict to twig/intl-extra
  • Loading branch information
NoResponseMate committed Apr 18, 2024
2 parents 71c8b98 + 5eacd99 commit 211a85d
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 12 deletions.
6 changes: 0 additions & 6 deletions CONFLICTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ references related issues.
- https://github.com/stof/StofDoctrineExtensionsBundle/issues/455
- https://github.com/doctrine-extensions/DoctrineExtensions/issues/2600


- `api-platform/core:2.7.17`:

This version introduced class aliases, which lead to a fatal error:
Expand All @@ -79,8 +78,3 @@ 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").`

- `twig/intl-extra:3.9.0`:

This version call function `dateConverter` which is only available in `twig/twig:3.9.0`, that leads to a fatal error:
`An exception has been thrown during the rendering of a template ("Call to undefined method Twig\Extension\CoreExtension::dateConverter()").`
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,7 @@
"symfony/framework-bundle": "5.4.5 || 6.2.8",
"symfony/validator": "5.4.25 || 6.2.12 || 6.3.1",
"liip/imagine-bundle": "2.7.0",
"twig/twig": "3.9.0",
"twig/intl-extra": "3.9.0"
"twig/twig": "3.9.0"
},
"require-dev": {
"behat/behat": "^3.6.1",
Expand Down
3 changes: 1 addition & 2 deletions src/Sylius/Bundle/AdminBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@
"php-http/message-factory": "^1.0"
},
"conflict": {
"twig/twig": "3.9.0",
"twig/intl-extra": "3.9.0"
"twig/twig": "3.9.0"
},
"config": {
"allow-plugins": {
Expand Down
3 changes: 1 addition & 2 deletions src/Sylius/Bundle/ShopBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@
"symfony/dependency-injection": "^5.4 || ^6.0"
},
"conflict": {
"twig/twig": "3.9.0",
"twig/intl-extra": "3.9.0"
"twig/twig": "3.9.0"
},
"config": {
"allow-plugins": {
Expand Down

0 comments on commit 211a85d

Please sign in to comment.