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

konarshankar07 · 2021-01-20T12:55:47Z

Description (*)

Following packages upgraded

pelago/emogrifier
friendsofphp/php-cs-fixer

Related Pull Requests

https://github.com/magento/partners-magento2ee/pull/464

Fixed Issues (if relevant)

Questions or comments

Contribution checklist (*)

Pull request has a meaningful description of its purpose
All commits are accompanied by meaningful commit messages
All new or changed code is covered with unit/integration tests (if applicable)
All automated tests passed successfully (all builds are green)

m2-assistant · 2021-01-20T12:55:49Z

Hi @konarshankar07. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

@magento give me test instance - deploy test instance based on PR changes
@magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

@magento run all tests - run or re-run all required tests against the PR changes
@magento run <test-build(s)> - run or re-run specific test build(s)
For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

Database Compare
Functional Tests CE
Functional Tests EE,
Functional Tests B2B
Integration Tests
Magento Health Index
Sample Data Tests CE
Sample Data Tests EE
Sample Data Tests B2B
Static Tests
Unit Tests
WebAPI Tests
Semantic Version Checker

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, please join the Community Contributions Triage session to discuss the appropriate ticket.

🎥 You can find the recording of the previous Community Contributions Triage on the Magento Youtube Channel

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

konarshankar07 · 2021-01-20T12:56:15Z

@magento run all tests

hostep · 2021-01-20T17:51:39Z

@konarshankar07: could you update your composer version to at least 1.10.19 and regenerate the composer.lock file by running composer update --lock? There are a lot of changes in the composer.lock file you submitted which makes it much harder to see what changed in there. I suspect you are running a pretty old composer version.

Thanks!

konarshankar07 · 2021-01-21T12:57:47Z

@magento run all tests

konarshankar07 · 2021-01-21T15:54:58Z

@magento run all tests

konarshankar07 · 2021-01-22T06:32:23Z

@magento run all tests

sivaschenko

Thanks for the pull request @konarshankar07 ! Please see my review comments

app/code/Magento/Email/Model/Template/Filter.php

lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php

…lasses

konarshankar07 · 2021-01-23T06:23:34Z

@magento run all tests

konarshankar07 · 2021-01-23T07:14:01Z

@magento run all tests

konarshankar07 · 2021-01-23T10:23:22Z

@magento run all tests

konarshankar07 · 2021-01-23T10:34:56Z

@magento run Static Tests, Unit Tests, Integration Tests

konarshankar07 · 2021-01-23T13:27:14Z

@magento run Functional Tests CE

konarshankar07 · 2021-01-25T07:34:14Z

@magento run Static Tests, Unit Tests, Integration Tests, Functional Tests CE

sivaschenko

Thanks for updates @konarshankar07 ! Please see my comment

lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php

…miscellaneous-dependency

sivaschenko · 2021-01-26T21:46:42Z

@konarshankar07 I have applied the review suggestions, updated the branch and switched the PR to php8-develop branch

@magento run all tests

konarshankar07 · 2021-01-27T04:57:37Z

Thanks @sivaschenko for the update and I have fixed unit test
@magento run Unit Tests

konarshankar07 · 2021-01-27T05:13:11Z

app/code/Magento/Email/Model/Template/Filter.php

+                    !== false ||
+                    strpos($cssToInline, 'undefined')


@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

@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!

konarshankar07 · 2021-01-28T06:10:03Z

@magento run all tests

konarshankar07 · 2021-01-28T06:17:00Z

@magento run all tests

…le way

sivaschenko · 2021-01-29T13:23:02Z

@magento run all tests

m2-assistant · 2021-01-29T18:00:18Z

Hi @konarshankar07, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

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

8baf259

magento-engcom-team added the Release Line: 2.4 label Jan 20, 2021

m2-community-project bot added the Progress: pending review label Jan 20, 2021

sivaschenko added the Project: PHP8 label Jan 20, 2021

Compatibility with Pelago\Emogrifier updates

3750a84

Fixed unit test

8ec4878

sivaschenko requested changes Jan 22, 2021

View reviewed changes

app/code/Magento/Email/Model/Template/Filter.php Outdated Show resolved Hide resolved

lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php Show resolved Hide resolved

m2-community-project bot assigned sivaschenko Jan 22, 2021

m2-community-project bot added Progress: needs update and removed Progress: pending review labels Jan 22, 2021

Feedback changes for preserving the existing interface of framework c…

6e51158

…lasses

konarshankar07 added 3 commits January 23, 2021 12:31

Feeback changes for changing the optional parameters

e259c61

composer lock file regenerated using 1.10.19 version

6ab99af

friendsofphp/php-cs-fixer upgraded to 2.18.1

cd0dad1

Fixed static tests

6f19a4e

Fixed unit test

5cdb807

Fixed Integration tests

780d166

sivaschenko requested changes Jan 25, 2021

View reviewed changes

lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php Outdated Show resolved Hide resolved

sivaschenko added 2 commits January 26, 2021 21:40

magento#31342: Updated CssInliner in a backward compatible way

6a2ec97

Merge branch 'php8-develop' of github.com:magento/magento2 into php8-…

78c6f55

…miscellaneous-dependency

sivaschenko changed the base branch from 2.4-develop to php8-develop January 26, 2021 21:42

magento#31342: Added default values for CssInliner properties

48c61c8

Fixed unit test

2d621ef

konarshankar07 commented Jan 27, 2021

View reviewed changes

m2-community-project bot added Progress: review and removed Progress: needs update labels Jan 27, 2021

Updates for refactoring

e992a93

Fixed Merge conflict

7f21ad7

sivaschenko added 2 commits January 29, 2021 12:42

magento#31342: Handled ContentProcessorException in backward compatib…

1668e90

…le way

Updated composer.lock

ce09f9f

sivaschenko added the Award: complex label Jan 29, 2021

sivaschenko approved these changes Jan 29, 2021

View reviewed changes

m2-community-project bot added Progress: ready for testing and removed Progress: review labels Jan 29, 2021

sivaschenko merged commit 4523b3a into magento:php8-develop Jan 29, 2021

hostep mentioned this pull request Jan 23, 2022

Allow filter directive processors to be used with the Widget template filter #28723

Closed

5 tasks

makzef mentioned this pull request Feb 8, 2022

[Issue] Allow filter directive processors to be used with the Widget template filter #29764

Closed

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

konarshankar07 commented Jan 20, 2021 •

edited by sivaschenko

Loading

m2-assistant bot commented Jan 20, 2021

konarshankar07 commented Jan 20, 2021

hostep commented Jan 20, 2021 •

edited

Loading

konarshankar07 commented Jan 21, 2021

konarshankar07 commented Jan 21, 2021

konarshankar07 commented Jan 22, 2021

sivaschenko left a comment

konarshankar07 commented Jan 23, 2021

konarshankar07 commented Jan 23, 2021

konarshankar07 commented Jan 23, 2021

konarshankar07 commented Jan 23, 2021

konarshankar07 commented Jan 23, 2021

konarshankar07 commented Jan 25, 2021

sivaschenko left a comment

sivaschenko commented Jan 26, 2021

konarshankar07 commented Jan 27, 2021

konarshankar07 Jan 27, 2021

sivaschenko Jan 27, 2021

konarshankar07 commented Jan 28, 2021

konarshankar07 commented Jan 28, 2021

sivaschenko commented Jan 29, 2021

m2-assistant bot commented Jan 29, 2021

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

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

Conversation

konarshankar07 commented Jan 20, 2021 • edited by sivaschenko Loading

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

Questions or comments

Contribution checklist (*)

m2-assistant bot commented Jan 20, 2021

konarshankar07 commented Jan 20, 2021

hostep commented Jan 20, 2021 • edited Loading

konarshankar07 commented Jan 21, 2021

konarshankar07 commented Jan 21, 2021

konarshankar07 commented Jan 22, 2021

sivaschenko left a comment

Choose a reason for hiding this comment

konarshankar07 commented Jan 23, 2021

konarshankar07 commented Jan 23, 2021

konarshankar07 commented Jan 23, 2021

konarshankar07 commented Jan 23, 2021

konarshankar07 commented Jan 23, 2021

konarshankar07 commented Jan 25, 2021

sivaschenko left a comment

Choose a reason for hiding this comment

sivaschenko commented Jan 26, 2021

konarshankar07 commented Jan 27, 2021

konarshankar07 Jan 27, 2021

Choose a reason for hiding this comment

sivaschenko Jan 27, 2021

Choose a reason for hiding this comment

konarshankar07 commented Jan 28, 2021

konarshankar07 commented Jan 28, 2021

sivaschenko commented Jan 29, 2021

m2-assistant bot commented Jan 29, 2021

konarshankar07 commented Jan 20, 2021 •

edited by sivaschenko

Loading

hostep commented Jan 20, 2021 •

edited

Loading