Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,8 @@
"symfony/doctrine-bridge": "4.4.16",
"symfony/polyfill-mbstring": "^1.22.0",
"symfony/property-info": "4.4.22 || 5.2.7",
"symfony/serializer": "4.4.19 || 5.2.2"
"symfony/serializer": "4.4.19 || 5.2.2",
"liip/imagine-bundle": "^2.7"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a note to CONFLICT.md about it?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a particular reason the conflict note was never added? I'm actually slightly curious what the "issue" is after the bugs reported in 2.7.0 were fixed in 2.7.1.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mbabker there was an issue with always resolving the image cache as webp, checking only if the browser supports webp and not if webp is enabled in configuration as well.

Related PR: https://github.com/liip/LiipImagineBundle/pull/1410/files

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm aware of that issue, it's fixed in 2.7.1. So why is the conflict the equivalent of >=2.7.0, <3.0.0?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mbabker Here is PR to relax the rule: #13288

},
"require-dev": {
"ext-json": "*",
Expand Down