Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pelago/emogrifier and friendsofphp/php-cs-fixer updated #31772

Merged
merged 18 commits into from
Jan 29, 2021
Merged

pelago/emogrifier and friendsofphp/php-cs-fixer updated #31772

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8baf259
pelago/emogrifier and friendsofphp/php-cs-fixer updated
konarshankar07 Jan 20, 2021
3750a84
Compatibility with Pelago\Emogrifier updates
konarshankar07 Jan 21, 2021
8ec4878
Fixed unit test
konarshankar07 Jan 22, 2021
6e51158
Feedback changes for preserving the existing interface of framework c…
konarshankar07 Jan 23, 2021
e259c61
Feeback changes for changing the optional parameters
konarshankar07 Jan 23, 2021
6ab99af
composer lock file regenerated using 1.10.19 version
konarshankar07 Jan 23, 2021
cd0dad1
friendsofphp/php-cs-fixer upgraded to 2.18.1
konarshankar07 Jan 23, 2021
6f19a4e
Fixed static tests
konarshankar07 Jan 23, 2021
5cdb807
Fixed unit test
konarshankar07 Jan 23, 2021
780d166
Fixed Integration tests
konarshankar07 Jan 25, 2021
6a2ec97
magento/magento2#31342: Updated CssInliner in a backward compatible way
sivaschenko Jan 26, 2021
78c6f55
Merge branch 'php8-develop' of github.com:magento/magento2 into php8-…
sivaschenko Jan 26, 2021
48c61c8
magento/magento2#31342: Added default values for CssInliner properties
sivaschenko Jan 26, 2021
2d621ef
Fixed unit test
konarshankar07 Jan 27, 2021
e992a93
Updates for refactoring
konarshankar07 Jan 28, 2021
7f21ad7
Fixed Merge conflict
konarshankar07 Jan 28, 2021
1668e90
magento/magento2#31342: Handled ContentProcessorException in backward…
sivaschenko Jan 29, 2021
ce09f9f
Updated composer.lock
sivaschenko Jan 29, 2021
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
2 changes: 2 additions & 0 deletions app/code/Magento/Email/Model/Template/Filter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,6 +1046,8 @@ public function applyInlineCss($html)
try {
// Don't try to compile CSS that has compilation errors
if (strpos($cssToInline, ContentProcessorInterface::ERROR_MESSAGE_PREFIX)
!== false ||
strpos($cssToInline, 'undefined')
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@sivaschenko .. I have added this commit to fix the integration test for

magento2/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php

Line 423 in 2b21388

'Developer mode - File with compilation error results in error message' => [

Can you please review this? I feel we need to handle this in different way
Thanks

Copy link
Member

Choose a reason for hiding this comment

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

@konarshankar07 Looks like emogrifier is no longer actually working with CSS string containing the error message.

I think the best way to handle the CSS parsing error is to throw an exception in \Magento\Email\Model\Template\Filter::getCssFilesContent and handle it in client code.
Instead of returning an exception message as the result css and then parsing the result for error messages.

Thank you!

!== false
) {
throw new MailException(
Expand Down