From 8baf259e8567f96d02769eeded99861120e3bfaf Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Wed, 20 Jan 2021 18:23:35 +0530
Subject: [PATCH 01/16] pelago/emogrifier and friendsofphp/php-cs-fixer updated

---
 composer.json |  12 +-
 composer.lock | 766 ++------------------------------------------------
 2 files changed, 32 insertions(+), 746 deletions(-)

diff --git a/composer.json b/composer.json
index 6aa9355cec7b1..c5fefc909a44a 100644
--- a/composer.json
+++ b/composer.json
@@ -64,12 +64,15 @@
         "laminas/laminas-uri": "^2.5.1",
         "laminas/laminas-validator": "^2.6.0",
         "laminas/laminas-view": "~2.11.2",
+        "league/flysystem": "^1.0",
+        "league/flysystem-aws-s3-v3": "^1.0",
+        "league/flysystem-cached-adapter": "^1.0",
         "magento/composer": "1.6.0",
         "magento/magento-composer-installer": ">=0.1.11",
         "magento/zendframework1": "~1.14.2",
         "monolog/monolog": "^1.17",
         "paragonie/sodium_compat": "^1.6",
-        "pelago/emogrifier": "^3.1.0",
+        "pelago/emogrifier": "^5.0.0",
         "php-amqplib/php-amqplib": "~2.10.0",
         "phpseclib/mcrypt_compat": "1.0.8",
         "phpseclib/phpseclib": "2.0.*",
@@ -80,15 +83,12 @@
         "tedivm/jshrink": "~1.3.0",
         "tubalmartin/cssmin": "4.1.1",
         "webonyx/graphql-php": "^0.13.8",
-        "wikimedia/less.php": "~1.8.0",
-        "league/flysystem": "^1.0",
-        "league/flysystem-aws-s3-v3": "^1.0",
-        "league/flysystem-cached-adapter": "^1.0"
+        "wikimedia/less.php": "~1.8.0"
     },
     "require-dev": {
         "allure-framework/allure-phpunit": "~1.2.0",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
-        "friendsofphp/php-cs-fixer": "~2.16.0",
+        "friendsofphp/php-cs-fixer": "~2.17.0",
         "lusitanian/oauth": "~0.8.10",
         "magento/magento-coding-standard": "*",
         "magento/magento2-functional-testing-framework": "^3.0",
diff --git a/composer.lock b/composer.lock
index b0b15f4e13f6c..64ac873ca307c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ac6fc13ba98a815bce589d300d28012c",
+    "content-hash": "75dbcd621097ad659fe5f49b5ce60fff",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
@@ -291,20 +291,6 @@
                 "ssl",
                 "tls"
             ],
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-08-23T12:54:47+00:00"
         },
         {
@@ -385,20 +371,6 @@
                 "dependency",
                 "package"
             ],
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-30T21:31:58+00:00"
         },
         {
@@ -460,20 +432,6 @@
                 "validation",
                 "versioning"
             ],
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-09-27T13:13:07+00:00"
         },
         {
@@ -534,20 +492,6 @@
                 "spdx",
                 "validator"
             ],
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-07-15T15:35:07+00:00"
         },
         {
@@ -592,20 +536,6 @@
                 "Xdebug",
                 "performance"
             ],
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-24T12:39:10+00:00"
         },
         {
@@ -1692,12 +1622,6 @@
                 "events",
                 "laminas"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-08-25T11:10:44+00:00"
         },
         {
@@ -1765,12 +1689,6 @@
                 "feed",
                 "laminas"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-08-18T13:45:04+00:00"
         },
         {
@@ -1922,12 +1840,6 @@
                 "form",
                 "laminas"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-07-14T13:53:27+00:00"
         },
         {
@@ -1980,12 +1892,6 @@
                 "http client",
                 "laminas"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-08-18T17:11:58+00:00"
         },
         {
@@ -2121,12 +2027,6 @@
                 "i18n",
                 "laminas"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-10-24T13:14:32+00:00"
         },
         {
@@ -2432,12 +2332,6 @@
                 "laminas",
                 "mail"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-08-12T14:51:33+00:00"
         },
         {
@@ -2610,12 +2504,6 @@
                 "laminas",
                 "modulemanager"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-08-25T09:29:22+00:00"
         },
         {
@@ -3002,12 +2890,6 @@
                 "laminas",
                 "session"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-10-31T15:33:31+00:00"
         },
         {
@@ -3115,12 +2997,6 @@
                 "laminas",
                 "stdlib"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-08-25T09:08:16+00:00"
         },
         {
@@ -3218,12 +3094,6 @@
                 "laminas",
                 "uri"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-10-31T20:20:07+00:00"
         },
         {
@@ -3442,12 +3312,6 @@
                 "laminas",
                 "zf"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-09-14T14:23:00+00:00"
         },
         {
@@ -3533,12 +3397,6 @@
                 "sftp",
                 "storage"
             ],
-            "funding": [
-                {
-                    "url": "https://offset.earth/frankdejonge",
-                    "type": "other"
-                }
-            ],
             "time": "2020-08-23T07:39:11+00:00"
         },
         {
@@ -3674,16 +3532,6 @@
                 }
             ],
             "description": "Mime-type detection for Flysystem",
-            "funding": [
-                {
-                    "url": "https://github.com/frankdejonge",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/league/flysystem",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-18T11:50:25+00:00"
         },
         {
@@ -3921,16 +3769,6 @@
                 "logging",
                 "psr-3"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/Seldaek",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-07-23T08:35:51+00:00"
         },
         {
@@ -4119,39 +3957,38 @@
         },
         {
             "name": "pelago/emogrifier",
-            "version": "v3.1.0",
+            "version": "v5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MyIntervals/emogrifier.git",
-                "reference": "f6a5c7d44612d86c3901c93f1592f5440e6b2cd8"
+                "reference": "b43b650880d189b0ada61d95d0729c7424b1752d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/f6a5c7d44612d86c3901c93f1592f5440e6b2cd8",
-                "reference": "f6a5c7d44612d86c3901c93f1592f5440e6b2cd8",
+                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/b43b650880d189b0ada61d95d0729c7424b1752d",
+                "reference": "b43b650880d189b0ada61d95d0729c7424b1752d",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
-                "php": "^5.6 || ~7.0 || ~7.1 || ~7.2 || ~7.3 || ~7.4",
-                "symfony/css-selector": "^2.8 || ^3.0 || ^4.0 || ^5.0"
+                "php": "~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0",
+                "symfony/css-selector": "^3.4.32 || ^4.4 || ^5.1"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.15.3",
-                "phpmd/phpmd": "^2.7.0",
-                "phpunit/phpunit": "^5.7.27",
-                "squizlabs/php_codesniffer": "^3.5.0"
+                "php-parallel-lint/php-parallel-lint": "^1.2.0",
+                "slevomat/coding-standard": "^6.4.1",
+                "squizlabs/php_codesniffer": "^3.5.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0.x-dev"
+                    "dev-master": "5.0.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Pelago\\": "src/"
+                    "Pelago\\Emogrifier\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -4189,7 +4026,7 @@
                 "email",
                 "pre-processing"
             ],
-            "time": "2019-12-26T19:37:31+00:00"
+            "time": "2020-11-23T18:37:25+00:00"
         },
         {
             "name": "php-amqplib/php-amqplib",
@@ -4402,20 +4239,6 @@
                 "x.509",
                 "x509"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/terrafrost",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/phpseclib",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-09-08T04:24:43+00:00"
         },
         {
@@ -4825,16 +4648,6 @@
                 "parser",
                 "validator"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/Seldaek",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-08-25T06:56:57+00:00"
         },
         {
@@ -4951,20 +4764,6 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-24T11:50:19+00:00"
         },
         {
@@ -5013,20 +4812,6 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-24T12:01:57+00:00"
         },
         {
@@ -5093,20 +4878,6 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-24T11:50:19+00:00"
         },
         {
@@ -5169,20 +4940,6 @@
                 "interoperability",
                 "standards"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-07-06T13:19:58+00:00"
         },
         {
@@ -5228,20 +4985,6 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-24T12:01:57+00:00"
         },
         {
@@ -5286,20 +5029,6 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-24T12:01:57+00:00"
         },
         {
@@ -5362,20 +5091,6 @@
                 "polyfill",
                 "portable"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5446,20 +5161,6 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5527,20 +5228,6 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5604,20 +5291,6 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5677,20 +5350,6 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5753,20 +5412,6 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5833,20 +5478,6 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5891,20 +5522,6 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-24T11:50:19+00:00"
         },
         {
@@ -5967,20 +5584,6 @@
                 "interoperability",
                 "standards"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-09-07T11:33:47+00:00"
         },
         {
@@ -6175,12 +5778,6 @@
                 "safe writer",
                 "webimpress"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/michalbundyra",
-                    "type": "github"
-                }
-            ],
             "time": "2020-08-25T07:21:11+00:00"
         },
         {
@@ -6233,12 +5830,6 @@
                 "api",
                 "graphql"
             ],
-            "funding": [
-                {
-                    "url": "https://opencollective.com/webonyx-graphql-php",
-                    "type": "open_collective"
-                }
-            ],
             "time": "2020-07-02T05:49:25+00:00"
         },
         {
@@ -6755,12 +6346,6 @@
                 "functional testing",
                 "unit testing"
             ],
-            "funding": [
-                {
-                    "url": "https://opencollective.com/codeception",
-                    "type": "open_collective"
-                }
-            ],
             "time": "2020-11-03T17:34:51+00:00"
         },
         {
@@ -7335,20 +6920,6 @@
                 "redis",
                 "xcache"
             ],
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-07-07T18:54:01+00:00"
         },
         {
@@ -7472,20 +7043,6 @@
                 "constructor",
                 "instantiate"
             ],
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-29T17:27:14+00:00"
         },
         {
@@ -7552,16 +7109,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.16.7",
+            "version": "v2.17.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "4e35806a6d7d8510d6842ae932e8832363d22c87"
+                "reference": "8714455fb5095c21caff121eaf9a8f8c2d8f75b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/4e35806a6d7d8510d6842ae932e8832363d22c87",
-                "reference": "4e35806a6d7d8510d6842ae932e8832363d22c87",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/8714455fb5095c21caff121eaf9a8f8c2d8f75b0",
+                "reference": "8714455fb5095c21caff121eaf9a8f8c2d8f75b0",
                 "shasum": ""
             },
             "require": {
@@ -7570,7 +7127,7 @@
                 "doctrine/annotations": "^1.2",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": "^7.1",
+                "php": "^5.6 || ^7.0 || ^8.0",
                 "php-cs-fixer/diff": "^1.3",
                 "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0",
                 "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0",
@@ -7583,17 +7140,19 @@
                 "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0"
             },
             "require-dev": {
-                "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
                 "justinrainbow/json-schema": "^5.0",
                 "keradus/cli-executor": "^1.4",
                 "mikey179/vfsstream": "^1.6",
-                "php-coveralls/php-coveralls": "^2.4.1",
+                "php-coveralls/php-coveralls": "^2.4.2",
                 "php-cs-fixer/accessible-object": "^1.0",
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1",
+                "phpspec/prophecy-phpunit": "^1.1 || ^2.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.13 || ^9.5",
+                "phpunitgoodpractices/polyfill": "^1.5",
                 "phpunitgoodpractices/traits": "^1.9.1",
-                "symfony/phpunit-bridge": "^5.1",
+                "sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1",
+                "symfony/phpunit-bridge": "^5.2.1",
                 "symfony/yaml": "^3.0 || ^4.0 || ^5.0"
             },
             "suggest": {
@@ -7639,13 +7198,7 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "funding": [
-                {
-                    "url": "https://github.com/keradus",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-10-27T22:44:27+00:00"
+            "time": "2021-01-18T03:06:22+00:00"
         },
         {
             "name": "hoa/consistency",
@@ -8705,12 +8258,6 @@
                 "object",
                 "object graph"
             ],
-            "funding": [
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-06-29T13:22:24+00:00"
         },
         {
@@ -9362,12 +8909,6 @@
                 "phpmd",
                 "pmd"
             ],
-            "funding": [
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpmd/phpmd",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-09-23T22:06:32+00:00"
         },
         {
@@ -9423,16 +8964,6 @@
                 "php",
                 "type"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-07-20T17:29:33+00:00"
         },
         {
@@ -9602,12 +9133,6 @@
                 "testing",
                 "xunit"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-05-23T08:02:54+00:00"
         },
         {
@@ -9658,12 +9183,6 @@
                 "filesystem",
                 "iterator"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-09-28T05:57:25+00:00"
         },
         {
@@ -9717,12 +9236,6 @@
             "keywords": [
                 "process"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-09-28T05:58:55+00:00"
         },
         {
@@ -9772,12 +9285,6 @@
             "keywords": [
                 "template"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-10-26T05:33:50+00:00"
         },
         {
@@ -9876,12 +9383,6 @@
             "keywords": [
                 "tokenizer"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "abandoned": true,
             "time": "2020-08-04T08:28:15+00:00"
         },
@@ -10065,12 +9566,6 @@
             ],
             "description": "Collection of value objects that represent the PHP code units",
             "homepage": "https://github.com/sebastianbergmann/code-unit",
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-10-26T13:08:54+00:00"
         },
         {
@@ -10116,12 +9611,6 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-09-28T05:30:19+00:00"
         },
         {
@@ -10186,12 +9675,6 @@
                 "compare",
                 "equality"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-10-26T15:49:45+00:00"
         },
         {
@@ -10248,12 +9731,6 @@
                 "unidiff",
                 "unified diff"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-10-26T13:10:38+00:00"
         },
         {
@@ -10307,12 +9784,6 @@
                 "environment",
                 "hhvm"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-09-28T05:52:38+00:00"
         },
         {
@@ -10380,12 +9851,6 @@
                 "export",
                 "exporter"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-09-28T05:24:23+00:00"
         },
         {
@@ -10534,12 +9999,6 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-10-26T13:12:34+00:00"
         },
         {
@@ -10585,12 +10044,6 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-10-26T13:14:26+00:00"
         },
         {
@@ -10695,12 +10148,6 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-10-26T13:17:30+00:00"
         },
         {
@@ -10746,12 +10193,6 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-09-28T06:45:17+00:00"
         },
         {
@@ -10798,12 +10239,6 @@
             ],
             "description": "Collection of value objects that represent the types of the PHP type system",
             "homepage": "https://github.com/sebastianbergmann/type",
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-10-26T13:18:59+00:00"
         },
         {
@@ -10847,12 +10282,6 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-09-28T06:39:44+00:00"
         },
         {
@@ -11036,20 +10465,6 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-24T12:01:57+00:00"
         },
         {
@@ -11120,20 +10535,6 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-27T10:11:13+00:00"
         },
         {
@@ -11184,20 +10585,6 @@
             ],
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-09-07T11:33:47+00:00"
         },
         {
@@ -11254,20 +10641,6 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-24T12:01:57+00:00"
         },
         {
@@ -11326,20 +10699,6 @@
                 "mime",
                 "mime-type"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-24T12:01:57+00:00"
         },
         {
@@ -11391,20 +10750,6 @@
                 "configuration",
                 "options"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-24T12:01:57+00:00"
         },
         {
@@ -11456,20 +10801,6 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -11515,20 +10846,6 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-24T12:01:57+00:00"
         },
         {
@@ -11587,20 +10904,6 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-24T12:03:25+00:00"
         },
         {
@@ -11816,12 +11119,6 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "funding": [
-                {
-                    "url": "https://github.com/theseer",
-                    "type": "github"
-                }
-            ],
             "time": "2020-07-12T23:59:07+00:00"
         },
         {
@@ -11884,16 +11181,6 @@
                 "env",
                 "environment"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-07-14T17:54:18+00:00"
         },
         {
@@ -12007,6 +11294,5 @@
         "ext-zip": "*",
         "lib-libxml": "*"
     },
-    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "platform-dev": []
 }

From 3750a8453b3cc88ad155eb39a18d627ab91c496e Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Thu, 21 Jan 2021 18:26:45 +0530
Subject: [PATCH 02/16] Compatibility with Pelago\Emogrifier updates

---
 .../Magento/Email/Model/Template/Filter.php   | 14 ++---
 .../Test/Unit/Model/Template/FilterTest.php   |  6 +--
 .../Magento/Widget/Model/Template/Filter.php  |  4 +-
 .../PreProcessor/Adapter/CssInlinerTest.php   | 12 ++---
 .../Css/PreProcessor/Adapter/CssInliner.php   | 52 +++----------------
 5 files changed, 20 insertions(+), 68 deletions(-)

diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 648e4ab8fc380..1b75dff9b3b65 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -153,7 +153,7 @@ class Filter extends \Magento\Framework\Filter\Template
     protected $urlModel;
 
     /**
-     * @var \Pelago\Emogrifier
+     * @var \Pelago\Emogrifier\CssInliner
      * @deprecated 100.2.0
      */
     protected $emogrifier;
@@ -195,7 +195,7 @@ class Filter extends \Magento\Framework\Filter\Template
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\UrlInterface $urlModel
-     * @param \Pelago\Emogrifier $emogrifier
+     * @param \Pelago\Emogrifier\CssInliner $emogrifier
      * @param \Magento\Variable\Model\Source\Variables $configVariables
      * @param array $variables
      * @param \Magento\Framework\Css\PreProcessor\Adapter\CssInliner|null $cssInliner
@@ -217,7 +217,7 @@ public function __construct(
         \Magento\Framework\View\LayoutFactory $layoutFactory,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\UrlInterface $urlModel,
-        \Pelago\Emogrifier $emogrifier,
+        \Pelago\Emogrifier\CssInliner $emogrifier,
         \Magento\Variable\Model\Source\Variables $configVariables,
         $variables = [],
         \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner = null,
@@ -1040,15 +1040,9 @@ public function applyInlineCss($html)
                         __('<pre> %1 </pre>', PHP_EOL . $cssToInline . PHP_EOL)
                     );
                 }
-
-                $this->cssInliner->setHtml($html);
-
-                $this->cssInliner->setCss($cssToInline);
-
                 // Don't parse inline <style> tags, since existing tag is intentionally for non-inline styles
-                $this->cssInliner->disableStyleBlocksParsing();
+                $processedHtml = $this->cssInliner->setHtmlCss($html, $cssToInline)->disableStyleBlocksParsing()->render();
 
-                $processedHtml = $this->cssInliner->process();
             } catch (\Exception $e) {
                 if ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {
                     $processedHtml = __('CSS inlining error:') . PHP_EOL . $e->getMessage()
diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
index ac890dd3d4a73..5392f7db66de0 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
@@ -38,7 +38,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Variable\Model\Source\Variables;
 use Magento\Variable\Model\VariableFactory;
-use Pelago\Emogrifier;
+use Pelago\Emogrifier\CssInliner as EmogrifierCssInliner;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -115,7 +115,7 @@ class FilterTest extends TestCase
     private $configVariables;
 
     /**
-     * @var Emogrifier
+     * @var EmogrifierCssInliner
      */
     private $emogrifier;
 
@@ -195,7 +195,7 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
-        $this->emogrifier = $this->objectManager->getObject(Emogrifier::class);
+        $this->emogrifier = $this->objectManager->getObject(EmogrifierCssInliner::class);
 
         $this->configVariables = $this->getMockBuilder(Variables::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
index c79334f67a9c3..237b0f62aa472 100644
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -33,7 +33,7 @@ class Filter extends \Magento\Cms\Model\Template\Filter
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\UrlInterface $urlModel
-     * @param \Pelago\Emogrifier $emogrifier
+     * @param \Pelago\Emogrifier\CssInliner $emogrifier
      * @param \Magento\Variable\Model\Source\Variables $configVariables
      * @param \Magento\Widget\Model\ResourceModel\Widget $widgetResource
      * @param \Magento\Widget\Model\Widget $widget
@@ -51,7 +51,7 @@ public function __construct(
         \Magento\Framework\View\LayoutFactory $layoutFactory,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\UrlInterface $urlModel,
-        \Pelago\Emogrifier $emogrifier,
+        \Pelago\Emogrifier\CssInliner $emogrifier,
         \Magento\Variable\Model\Source\Variables $configVariables,
         \Magento\Widget\Model\ResourceModel\Widget $widgetResource,
         \Magento\Widget\Model\Widget $widget
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
index 5ee8e3de6e6e9..c00c184d54d2b 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\Css\PreProcessor\Adapter;
 
+use Pelago\Emogrifier\CssInliner as EmogrifierCssInliner;
+
 class CssInlinerTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -34,9 +36,7 @@ public function testGetFiles($htmlFilePath, $cssFilePath, $cssExpected)
     {
         $html = file_get_contents($htmlFilePath);
         $css = file_get_contents($cssFilePath);
-        $this->model->setCss($css);
-        $this->model->setHtml($html);
-        $result = $this->model->process();
+        $result = $this->model->setHtmlCss($html, $css)->render();
         $this->assertStringContainsString($cssExpected, $result);
     }
 
@@ -68,13 +68,9 @@ public function getFilesDataProvider()
      */
     public function testGetFilesEmogrifier($htmlFilePath, $cssFilePath, $cssExpected)
     {
-        $emogrifier = new \Pelago\Emogrifier;
-
         $html = file_get_contents($htmlFilePath);
         $css = file_get_contents($cssFilePath);
-        $emogrifier->setCss($css);
-        $emogrifier->setHtml($html);
-        $result = $emogrifier->emogrify();
+        $result = EmogrifierCssInliner::fromHtml($html)->inlineCss($css)->render();
 
         /**
          * This test was implemented for the issue which existed in the older version of Emogrifier.
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
index b54761698f16c..8f960ae127c6c 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
@@ -6,7 +6,7 @@
 namespace Magento\Framework\Css\PreProcessor\Adapter;
 
 use Magento\Framework\App\State;
-use Pelago\Emogrifier;
+use Pelago\Emogrifier\CssInliner as EmogrifierCssInliner;
 
 /**
  * This class will inline the css of an html to each tag to be used for applications such as a styled email.
@@ -14,59 +14,21 @@
 class CssInliner
 {
     /**
-     * @var Emogrifier
+     * @var State
      */
-    private $emogrifier;
+    private $appState;
 
     /**
      * @param State $appState
      */
     public function __construct(State $appState)
     {
-        $this->emogrifier = new Emogrifier();
-        $this->emogrifier->setDebug($appState->getMode() === State::MODE_DEVELOPER);
+        $this->appState = $appState;
     }
 
-    /**
-     * Sets the HTML to be used with the css. This method should be used with setCss.
-     *
-     * @param string $html
-     * @return void
-     */
-    public function setHtml($html)
-    {
-        $this->emogrifier->setHtml($html);
-    }
-
-    /**
-     * Sets the CSS to be merged with the HTML. This method should be used with setHtml.
-     *
-     * @param string $css
-     * @return void
-     */
-    public function setCss($css)
-    {
-        $this->emogrifier->setCss($css);
-    }
-
-    /**
-     * Disables the parsing of <style> blocks.
-     *
-     * @return void
-     */
-    public function disableStyleBlocksParsing()
-    {
-        $this->emogrifier->disableStyleBlocksParsing();
-    }
-
-    /**
-     * Processes the html by placing the css inline. Set first the css by using setCss and html by using setHtml.
-     *
-     * @return string
-     * @throws \BadMethodCallException
-     */
-    public function process()
+    public function setHtmlCss(string $html, string $css = '')
     {
-        return $this->emogrifier->emogrify();
+        return EmogrifierCssInliner::fromHtml($html)->inlineCss($css)
+            ->setDebug($this->appState->getMode() === State::MODE_DEVELOPER);
     }
 }

From 8ec4878e3132d0f47954f779a94ed0d444baee68 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Fri, 22 Jan 2021 12:01:21 +0530
Subject: [PATCH 03/16] Fixed unit test

---
 app/code/Magento/Email/Model/Template/Filter.php      | 11 +----------
 .../Email/Test/Unit/Model/Template/FilterTest.php     |  9 ---------
 app/code/Magento/Widget/Model/Template/Filter.php     |  2 --
 .../Framework/Css/PreProcessor/Adapter/CssInliner.php | 10 +++++++++-
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 1b75dff9b3b65..1951a529b1748 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -152,12 +152,6 @@ class Filter extends \Magento\Framework\Filter\Template
      */
     protected $urlModel;
 
-    /**
-     * @var \Pelago\Emogrifier\CssInliner
-     * @deprecated 100.2.0
-     */
-    protected $emogrifier;
-
     /**
      * @var \Magento\Framework\Css\PreProcessor\Adapter\CssInliner
      */
@@ -195,7 +189,6 @@ class Filter extends \Magento\Framework\Filter\Template
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\UrlInterface $urlModel
-     * @param \Pelago\Emogrifier\CssInliner $emogrifier
      * @param \Magento\Variable\Model\Source\Variables $configVariables
      * @param array $variables
      * @param \Magento\Framework\Css\PreProcessor\Adapter\CssInliner|null $cssInliner
@@ -217,7 +210,6 @@ public function __construct(
         \Magento\Framework\View\LayoutFactory $layoutFactory,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\UrlInterface $urlModel,
-        \Pelago\Emogrifier\CssInliner $emogrifier,
         \Magento\Variable\Model\Source\Variables $configVariables,
         $variables = [],
         \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner = null,
@@ -237,7 +229,6 @@ public function __construct(
         $this->_layoutFactory = $layoutFactory;
         $this->_appState = $appState;
         $this->urlModel = $urlModel;
-        $this->emogrifier = $emogrifier;
         $this->cssInliner = $cssInliner ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Css\PreProcessor\Adapter\CssInliner::class);
         $this->cssProcessor = $cssProcessor ?: ObjectManager::getInstance()
@@ -1041,7 +1032,7 @@ public function applyInlineCss($html)
                     );
                 }
                 // Don't parse inline <style> tags, since existing tag is intentionally for non-inline styles
-                $processedHtml = $this->cssInliner->setHtmlCss($html, $cssToInline)->disableStyleBlocksParsing()->render();
+                $processedHtml = $this->cssInliner->setHtmlCss($html, $cssToInline)->render();
 
             } catch (\Exception $e) {
                 if ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {
diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
index 5392f7db66de0..e5331a4293e56 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
@@ -38,7 +38,6 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Variable\Model\Source\Variables;
 use Magento\Variable\Model\VariableFactory;
-use Pelago\Emogrifier\CssInliner as EmogrifierCssInliner;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -114,11 +113,6 @@ class FilterTest extends TestCase
      */
     private $configVariables;
 
-    /**
-     * @var EmogrifierCssInliner
-     */
-    private $emogrifier;
-
     /**
      * @var CssInliner
      */
@@ -195,8 +189,6 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
-        $this->emogrifier = $this->objectManager->getObject(EmogrifierCssInliner::class);
-
         $this->configVariables = $this->getMockBuilder(Variables::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -257,7 +249,6 @@ protected function getModel($mockedMethods = null)
                     $this->layoutFactory,
                     $this->appState,
                     $this->backendUrlBuilder,
-                    $this->emogrifier,
                     $this->configVariables,
                     [],
                     $this->cssInliner,
diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
index 237b0f62aa472..42382c90a9ad0 100644
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -51,7 +51,6 @@ public function __construct(
         \Magento\Framework\View\LayoutFactory $layoutFactory,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\UrlInterface $urlModel,
-        \Pelago\Emogrifier\CssInliner $emogrifier,
         \Magento\Variable\Model\Source\Variables $configVariables,
         \Magento\Widget\Model\ResourceModel\Widget $widgetResource,
         \Magento\Widget\Model\Widget $widget
@@ -70,7 +69,6 @@ public function __construct(
             $layoutFactory,
             $appState,
             $urlModel,
-            $emogrifier,
             $configVariables
         );
     }
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
index 8f960ae127c6c..06c148d4c1e84 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\State;
 use Pelago\Emogrifier\CssInliner as EmogrifierCssInliner;
+use Symfony\Component\CssSelector\Exception\ParseException;
 
 /**
  * This class will inline the css of an html to each tag to be used for applications such as a styled email.
@@ -26,9 +27,16 @@ public function __construct(State $appState)
         $this->appState = $appState;
     }
 
+    /**
+     * @param string $html
+     * @param string $css
+     * @return EmogrifierCssInliner
+     * @throws ParseException
+     */
     public function setHtmlCss(string $html, string $css = '')
     {
-        return EmogrifierCssInliner::fromHtml($html)->inlineCss($css)
+        return EmogrifierCssInliner::fromHtml($html)->disableStyleBlocksParsing()
+            ->inlineCss($css)
             ->setDebug($this->appState->getMode() === State::MODE_DEVELOPER);
     }
 }

From 6e51158f7ce0e58362e775588802320a244ac36e Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Sat, 23 Jan 2021 11:52:03 +0530
Subject: [PATCH 04/16] Feedback changes for preserving the existing interface
 of framework classes

---
 .../Magento/Email/Model/Template/Filter.php   |  8 ++-
 .../PreProcessor/Adapter/CssInlinerTest.php   |  4 +-
 .../Css/PreProcessor/Adapter/CssInliner.php   | 49 ++++++++++++++++---
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 1951a529b1748..5f63a3eb21776 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -1031,8 +1031,14 @@ public function applyInlineCss($html)
                         __('<pre> %1 </pre>', PHP_EOL . $cssToInline . PHP_EOL)
                     );
                 }
+                $this->cssInliner->setHtml($html);
+
                 // Don't parse inline <style> tags, since existing tag is intentionally for non-inline styles
-                $processedHtml = $this->cssInliner->setHtmlCss($html, $cssToInline)->render();
+                $this->cssInliner->disableStyleBlocksParsing();
+
+                $this->cssInliner->setCss($cssToInline);
+
+                $processedHtml = $this->cssInliner->process();
 
             } catch (\Exception $e) {
                 if ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
index c00c184d54d2b..9e470a1e538c3 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
@@ -36,7 +36,9 @@ public function testGetFiles($htmlFilePath, $cssFilePath, $cssExpected)
     {
         $html = file_get_contents($htmlFilePath);
         $css = file_get_contents($cssFilePath);
-        $result = $this->model->setHtmlCss($html, $css)->render();
+        $this->model->setHtml($html);
+        $this->model->setCss($css);
+        $result = $this->model->process();
         $this->assertStringContainsString($cssExpected, $result);
     }
 
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
index 06c148d4c1e84..b3c9a4bba5983 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\State;
 use Pelago\Emogrifier\CssInliner as EmogrifierCssInliner;
-use Symfony\Component\CssSelector\Exception\ParseException;
 
 /**
  * This class will inline the css of an html to each tag to be used for applications such as a styled email.
@@ -19,6 +18,11 @@ class CssInliner
      */
     private $appState;
 
+    /**
+     * @var EmogrifierCssInliner
+     */
+    private $emogrifier;
+
     /**
      * @param State $appState
      */
@@ -28,15 +32,46 @@ public function __construct(State $appState)
     }
 
     /**
+     * Sets the HTML to be used with the css. This method should be used with setCss.
+     *
      * @param string $html
-     * @param string $css
-     * @return EmogrifierCssInliner
-     * @throws ParseException
+     * @return void
      */
-    public function setHtmlCss(string $html, string $css = '')
+    public function setHtml($html)
     {
-        return EmogrifierCssInliner::fromHtml($html)->disableStyleBlocksParsing()
-            ->inlineCss($css)
+        $this->emogrifier = EmogrifierCssInliner::fromHtml($html)
             ->setDebug($this->appState->getMode() === State::MODE_DEVELOPER);
     }
+
+    /**
+     * Sets the CSS to be merged with the HTML. This method should be used with setHtml.
+     *
+     * @param string $css
+     * @return void
+     */
+    public function setCss($css)
+    {
+        $this->emogrifier->inlineCss($css);
+    }
+
+    /**
+     * Disables the parsing of <style> blocks.
+     *
+     * @return void
+     */
+    public function disableStyleBlocksParsing()
+    {
+        $this->emogrifier->disableStyleBlocksParsing();
+    }
+
+    /**
+     * Processes the html by placing the css inline. Set first the css by using setCss and html by using setHtml.
+     *
+     * @return string
+     * @throws \BadMethodCallException
+     */
+    public function process()
+    {
+        return $this->emogrifier->render();
+    }
 }

From e259c6111ccbcf7665478fb6f4a440b7c8346bef Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Sat, 23 Jan 2021 12:31:30 +0530
Subject: [PATCH 05/16] Feeback changes for changing the optional parameters

---
 .../Magento/Email/Model/Template/Filter.php   | 175 ++++++++++--------
 .../Magento/Widget/Model/Template/Filter.php  | 100 ++++++----
 2 files changed, 166 insertions(+), 109 deletions(-)

diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 5f63a3eb21776..912da03cc3c74 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -5,13 +5,35 @@
  */
 namespace Magento\Email\Model\Template;
 
-use Magento\Framework\App\ObjectManager;
+use Exception;
+use Magento\Cms\Block\Block;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\State;
+use Magento\Framework\Css\PreProcessor\Adapter\CssInliner;
+use Magento\Framework\Escaper;
 use Magento\Framework\Exception\MailException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\Read;
+use Magento\Framework\Filter\Template;
+use Magento\Framework\Filter\Template\Tokenizer\Parameter;
 use Magento\Framework\Filter\VariableResolverInterface;
+use Magento\Framework\Stdlib\StringUtils;
+use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Asset\ContentProcessorException;
 use Magento\Framework\View\Asset\ContentProcessorInterface;
+use Magento\Framework\View\Asset\File\NotFoundException;
+use Magento\Framework\View\Asset\Repository;
+use Magento\Framework\View\Element\AbstractBlock;
+use Magento\Framework\View\LayoutFactory;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Variable\Model\Source\Variables;
+use Magento\Variable\Model\Variable;
+use Magento\Variable\Model\VariableFactory;
+use Psr\Log\LoggerInterface;
 
 /**
  * Core Email Template Filter Model
@@ -22,7 +44,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
-class Filter extends \Magento\Framework\Filter\Template
+class Filter extends Template
 {
     /**
      * The name used in the {{trans}} directive
@@ -89,17 +111,17 @@ class Filter extends \Magento\Framework\Filter\Template
     private $plainTemplateMode = false;
 
     /**
-     * @var \Magento\Framework\View\Asset\Repository
+     * @var Repository
      */
     protected $_assetRepo;
 
     /**
-     * @var \Psr\Log\LoggerInterface
+     * @var LoggerInterface
      */
     protected $_logger;
 
     /**
-     * @var \Magento\Framework\Escaper
+     * @var Escaper
      */
     protected $_escaper;
 
@@ -107,29 +129,29 @@ class Filter extends \Magento\Framework\Filter\Template
      * Core store config
      * Variable factory
      *
-     * @var \Magento\Variable\Model\VariableFactory
+     * @var VariableFactory
      */
     protected $_variableFactory;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * @var \Magento\Framework\View\LayoutInterface
+     * @var LayoutInterface
      */
     protected $_layout;
 
     /**
-     * @var \Magento\Framework\View\LayoutFactory
+     * @var LayoutFactory
      */
     protected $_layoutFactory;
 
     /**
      * Setup callbacks for filters
      *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var ScopeConfigInterface
      */
     protected $_scopeConfig;
 
@@ -143,22 +165,22 @@ class Filter extends \Magento\Framework\Filter\Template
     /**
      * App state
      *
-     * @var \Magento\Framework\App\State
+     * @var State
      */
     protected $_appState;
 
     /**
-     * @var \Magento\Framework\UrlInterface
+     * @var UrlInterface
      */
     protected $urlModel;
 
     /**
-     * @var \Magento\Framework\Css\PreProcessor\Adapter\CssInliner
+     * @var CssInliner
      */
     private $cssInliner;
 
     /**
-     * @var \Magento\Variable\Model\Source\Variables
+     * @var Variables
      */
     protected $configVariables;
 
@@ -173,50 +195,52 @@ class Filter extends \Magento\Framework\Filter\Template
     private $pubDirectory;
 
     /**
-     * @var \Magento\Framework\Filesystem\Directory\Read
+     * @var Read
      */
     private $pubDirectoryRead;
 
+
     /**
-     * @param \Magento\Framework\Stdlib\StringUtils $string
-     * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Framework\Escaper $escaper
-     * @param \Magento\Framework\View\Asset\Repository $assetRepo
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Variable\Model\VariableFactory $coreVariableFactory
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\View\LayoutInterface $layout
-     * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\UrlInterface $urlModel
-     * @param \Magento\Variable\Model\Source\Variables $configVariables
+     * Filter constructor.
+     * @param StringUtils $string
+     * @param LoggerInterface $logger
+     * @param Escaper $escaper
+     * @param Repository $assetRepo
+     * @param ScopeConfigInterface $scopeConfig
+     * @param VariableFactory $coreVariableFactory
+     * @param StoreManagerInterface $storeManager
+     * @param LayoutInterface $layout
+     * @param LayoutFactory $layoutFactory
+     * @param State $appState
+     * @param UrlInterface $urlModel
+     * @param Variables $configVariables
+     * @param VariableResolverInterface $variableResolver
+     * @param Css\Processor $cssProcessor
+     * @param Filesystem $pubDirectory
+     * @param CssInliner $cssInliner
      * @param array $variables
-     * @param \Magento\Framework\Css\PreProcessor\Adapter\CssInliner|null $cssInliner
      * @param array $directiveProcessors
-     * @param VariableResolverInterface|null $variableResolver
-     * @param Css\Processor|null $cssProcessor
-     * @param Filesystem|null $pubDirectory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\Stdlib\StringUtils $string,
-        \Psr\Log\LoggerInterface $logger,
-        \Magento\Framework\Escaper $escaper,
-        \Magento\Framework\View\Asset\Repository $assetRepo,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Variable\Model\VariableFactory $coreVariableFactory,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\View\LayoutInterface $layout,
-        \Magento\Framework\View\LayoutFactory $layoutFactory,
-        \Magento\Framework\App\State $appState,
-        \Magento\Framework\UrlInterface $urlModel,
-        \Magento\Variable\Model\Source\Variables $configVariables,
+        StringUtils $string,
+        LoggerInterface $logger,
+        Escaper $escaper,
+        Repository $assetRepo,
+        ScopeConfigInterface $scopeConfig,
+        VariableFactory $coreVariableFactory,
+        StoreManagerInterface $storeManager,
+        LayoutInterface $layout,
+        LayoutFactory $layoutFactory,
+        State $appState,
+        UrlInterface $urlModel,
+        Variables $configVariables,
+        VariableResolverInterface $variableResolver,
+        Css\Processor $cssProcessor,
+        Filesystem $pubDirectory,
+        CssInliner $cssInliner,
         $variables = [],
-        \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner = null,
-        array $directiveProcessors = [],
-        VariableResolverInterface $variableResolver = null,
-        Css\Processor $cssProcessor = null,
-        Filesystem $pubDirectory = null
+        array $directiveProcessors = []
     ) {
         $this->_escaper = $escaper;
         $this->_assetRepo = $assetRepo;
@@ -229,12 +253,9 @@ public function __construct(
         $this->_layoutFactory = $layoutFactory;
         $this->_appState = $appState;
         $this->urlModel = $urlModel;
-        $this->cssInliner = $cssInliner ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\Css\PreProcessor\Adapter\CssInliner::class);
-        $this->cssProcessor = $cssProcessor ?: ObjectManager::getInstance()
-            ->get(Css\Processor::class);
-        $this->pubDirectory = $pubDirectory ?: ObjectManager::getInstance()
-            ->get(Filesystem::class);
+        $this->cssInliner = $cssInliner;
+        $this->cssProcessor = $cssProcessor;
+        $this->pubDirectory = $pubDirectory;
         $this->configVariables = $configVariables;
         parent::__construct($string, $variables, $directiveProcessors, $variableResolver);
     }
@@ -386,7 +407,7 @@ public function blockDirective($construction)
         if (isset($blockParameters['class'])) {
             $block = $this->_layout->createBlock($blockParameters['class'], null, ['data' => $blockParameters]);
         } elseif (isset($blockParameters['id'])) {
-            $block = $this->_layout->createBlock(\Magento\Cms\Block\Block::class);
+            $block = $this->_layout->createBlock(Block::class);
             if ($block) {
                 $block->setBlockId($blockParameters['id']);
             }
@@ -427,7 +448,7 @@ public function layoutDirective($construction)
     {
         $this->_directiveParams = $this->getParameters($construction[2]);
         if (!isset($this->_directiveParams['area'])) {
-            $this->_directiveParams['area'] = \Magento\Framework\App\Area::AREA_FRONTEND;
+            $this->_directiveParams['area'] = Area::AREA_FRONTEND;
         }
         if ($this->_directiveParams['area'] != $this->_appState->getAreaCode()) {
             return $this->_appState->emulateAreaCode(
@@ -448,7 +469,7 @@ public function emulateAreaCallback()
     {
         $skipParams = ['handle', 'area'];
 
-        /** @var $layout \Magento\Framework\View\LayoutInterface */
+        /** @var $layout LayoutInterface */
         $layout = $this->_layoutFactory->create(['cacheable' => false]);
         $layout->getUpdate()->addHandle($this->_directiveParams['handle'])->load();
 
@@ -457,7 +478,7 @@ public function emulateAreaCallback()
 
         $rootBlock = false;
         foreach ($layout->getAllBlocks() as $block) {
-            /* @var $block \Magento\Framework\View\Element\AbstractBlock */
+            /* @var $block AbstractBlock */
             if (!$block->getParentBlock() && !$rootBlock) {
                 $rootBlock = $block;
             }
@@ -490,7 +511,7 @@ public function emulateAreaCallback()
      */
     protected function _getBlockParameters($value)
     {
-        $tokenizer = new \Magento\Framework\Filter\Template\Tokenizer\Parameter();
+        $tokenizer = new Parameter();
         $tokenizer->setString($value);
 
         return $tokenizer->tokenize();
@@ -520,7 +541,7 @@ public function mediaDirective($construction)
         // phpcs:disable Magento2.Functions.DiscouragedFunction
         $params = $this->getParameters(html_entity_decode($construction[2], ENT_QUOTES));
         return $this->_storeManager->getStore()
-            ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $params['url'];
+            ->getBaseUrl(UrlInterface::URL_TYPE_MEDIA) . $params['url'];
     }
 
     /**
@@ -564,10 +585,10 @@ public function storeDirective($construction)
     /**
      * Set current URL model, which will be used for URLs generation.
      *
-     * @param \Magento\Framework\UrlInterface $urlModel
+     * @param UrlInterface $urlModel
      * @return $this
      */
-    public function setUrlModel(\Magento\Framework\UrlInterface $urlModel)
+    public function setUrlModel(UrlInterface $urlModel)
     {
         $this->urlModel = $urlModel;
         return $this;
@@ -743,7 +764,7 @@ public function protocolDirective($construction)
         if (isset($params['store'])) {
             try {
                 $store = $this->_storeManager->getStore($params['store']);
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 throw new MailException(
                     __('Requested invalid store "%1"', $params['store'])
                 );
@@ -811,7 +832,7 @@ public function configDirective($construction)
         if (isset($params['path']) && $this->isAvailableConfigVariable($params['path'])) {
             $configValue = $this->_scopeConfig->getValue(
                 $params['path'],
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ScopeInterface::SCOPE_STORE,
                 $storeId
             );
         }
@@ -849,8 +870,8 @@ public function customvarDirective($construction)
                 $params['code']
             );
             $mode = $this->isPlainTemplateMode()
-                ? \Magento\Variable\Model\Variable::TYPE_TEXT
-                : \Magento\Variable\Model\Variable::TYPE_HTML;
+                ? Variable::TYPE_TEXT
+                : Variable::TYPE_HTML;
             $value = $variable->getValue($mode);
             if ($value) {
                 $customVarValue = $value;
@@ -913,7 +934,7 @@ public function cssDirective($construction)
      *
      * @param string[] $construction
      * @return string
-     * @throws \Magento\Framework\Exception\MailException
+     * @throws MailException
      */
     public function inlinecssDirective($construction)
     {
@@ -930,7 +951,7 @@ public function inlinecssDirective($construction)
 
         $params = $this->getParameters($construction[2]);
         if (!isset($params['file']) || !$params['file']) {
-            throw new \Magento\Framework\Exception\MailException(
+            throw new MailException(
                 __('"file" parameter must be specified and must not be empty')
             );
         }
@@ -969,7 +990,7 @@ protected function getInlineCssFiles()
      *
      * @param [] $files
      * @return string
-     * @throws \Magento\Framework\Exception\MailException
+     * @throws MailException
      */
     public function getCssFilesContent(array $files)
     {
@@ -978,7 +999,7 @@ public function getCssFilesContent(array $files)
 
         $designParams = $this->getDesignParams();
         if (!count($designParams)) {
-            throw new \Magento\Framework\Exception\MailException(
+            throw new MailException(
                 __('Design params must be set before calling this method')
             );
         }
@@ -995,7 +1016,7 @@ public function getCssFilesContent(array $files)
             }
         } catch (ContentProcessorException $exception) {
             $css = $exception->getMessage();
-        } catch (\Magento\Framework\View\Asset\File\NotFoundException $exception) {
+        } catch (NotFoundException $exception) {
             $css = '';
         }
 
@@ -1010,7 +1031,7 @@ public function getCssFilesContent(array $files)
      *
      * @param string $html
      * @return string
-     * @throws \Magento\Framework\Exception\MailException
+     * @throws MailException
      */
     public function applyInlineCss($html)
     {
@@ -1027,7 +1048,7 @@ public function applyInlineCss($html)
                 if (strpos($cssToInline, ContentProcessorInterface::ERROR_MESSAGE_PREFIX)
                     !== false
                 ) {
-                    throw new \Magento\Framework\Exception\MailException(
+                    throw new MailException(
                         __('<pre> %1 </pre>', PHP_EOL . $cssToInline . PHP_EOL)
                     );
                 }
@@ -1040,8 +1061,8 @@ public function applyInlineCss($html)
 
                 $processedHtml = $this->cssInliner->process();
 
-            } catch (\Exception $e) {
-                if ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {
+            } catch (Exception $e) {
+                if ($this->_appState->getMode() == State::MODE_DEVELOPER) {
                     $processedHtml = __('CSS inlining error:') . PHP_EOL . $e->getMessage()
                         . PHP_EOL
                         . $html;
@@ -1069,12 +1090,12 @@ public function filter($value)
     {
         try {
             $value = parent::filter($value);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             // Since a single instance of this class can be used to filter content multiple times, reset callbacks to
             // prevent callbacks running for unrelated content (e.g., email subject and email body)
             $this->resetAfterFilterCallbacks();
 
-            if ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {
+            if ($this->_appState->getMode() == State::MODE_DEVELOPER) {
                 $value = sprintf(__('Error filtering template: %s'), $e->getMessage());
             } else {
                 $value = __("We're sorry, an error has occurred while generating this content.");
diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
index 42382c90a9ad0..6b14f3701b6e7 100644
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -5,6 +5,25 @@
  */
 namespace Magento\Widget\Model\Template;
 
+use Magento\Email\Model\Template\Css;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\State;
+use Magento\Framework\Css\PreProcessor\Adapter\CssInliner;
+use Magento\Framework\Escaper;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filter\VariableResolverInterface;
+use Magento\Framework\Stdlib\StringUtils;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Asset\Repository;
+use Magento\Framework\View\LayoutFactory;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Variable\Model\Source\Variables;
+use Magento\Variable\Model\VariableFactory;
+use Magento\Widget\Block\BlockInterface;
+use Magento\Widget\Model\Widget;
+use Psr\Log\LoggerInterface;
+
 /**
  * Template Filter Model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -17,43 +36,54 @@ class Filter extends \Magento\Cms\Model\Template\Filter
     protected $_widgetResource;
 
     /**
-     * @var \Magento\Widget\Model\Widget
+     * @var Widget
      */
     protected $_widget;
 
     /**
-     * @param \Magento\Framework\Stdlib\StringUtils $string
-     * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Framework\Escaper $escaper
-     * @param \Magento\Framework\View\Asset\Repository $assetRepo
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Variable\Model\VariableFactory $coreVariableFactory
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\View\LayoutInterface $layout
-     * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\UrlInterface $urlModel
-     * @param \Pelago\Emogrifier\CssInliner $emogrifier
-     * @param \Magento\Variable\Model\Source\Variables $configVariables
+     * Filter constructor.
+     * @param StringUtils $string
+     * @param LoggerInterface $logger
+     * @param Escaper $escaper
+     * @param Repository $assetRepo
+     * @param ScopeConfigInterface $scopeConfig
+     * @param VariableFactory $coreVariableFactory
+     * @param StoreManagerInterface $storeManager
+     * @param LayoutInterface $layout
+     * @param LayoutFactory $layoutFactory
+     * @param State $appState
+     * @param UrlInterface $urlModel
+     * @param Variables $configVariables
+     * @param VariableResolverInterface $variableResolver
+     * @param Css\Processor $cssProcessor
+     * @param Filesystem $pubDirectory
      * @param \Magento\Widget\Model\ResourceModel\Widget $widgetResource
-     * @param \Magento\Widget\Model\Widget $widget
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @param Widget $widget
+     * @param CssInliner $cssInliner
+     * @param array $variables
+     * @param array $directiveProcessors
      */
     public function __construct(
-        \Magento\Framework\Stdlib\StringUtils $string,
-        \Psr\Log\LoggerInterface $logger,
-        \Magento\Framework\Escaper $escaper,
-        \Magento\Framework\View\Asset\Repository $assetRepo,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Variable\Model\VariableFactory $coreVariableFactory,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\View\LayoutInterface $layout,
-        \Magento\Framework\View\LayoutFactory $layoutFactory,
-        \Magento\Framework\App\State $appState,
-        \Magento\Framework\UrlInterface $urlModel,
-        \Magento\Variable\Model\Source\Variables $configVariables,
+        StringUtils $string,
+        LoggerInterface $logger,
+        Escaper $escaper,
+        Repository $assetRepo,
+        ScopeConfigInterface $scopeConfig,
+        VariableFactory $coreVariableFactory,
+        StoreManagerInterface $storeManager,
+        LayoutInterface $layout,
+        LayoutFactory $layoutFactory,
+        State $appState,
+        UrlInterface $urlModel,
+        Variables $configVariables,
+        VariableResolverInterface $variableResolver,
+        Css\Processor $cssProcessor,
+        Filesystem $pubDirectory,
         \Magento\Widget\Model\ResourceModel\Widget $widgetResource,
-        \Magento\Widget\Model\Widget $widget
+        Widget $widget,
+        CssInliner $cssInliner,
+        $variables = [],
+        array $directiveProcessors = []
     ) {
         $this->_widgetResource = $widgetResource;
         $this->_widget = $widget;
@@ -69,7 +99,13 @@ public function __construct(
             $layoutFactory,
             $appState,
             $urlModel,
-            $configVariables
+            $configVariables,
+            $variableResolver,
+            $cssProcessor,
+            $pubDirectory,
+            $cssInliner,
+            $variables,
+            $directiveProcessors
         );
     }
 
@@ -112,7 +148,7 @@ public function generateWidget($construction)
 
         // define widget block and check the type is instance of Widget Interface
         $widget = $this->_layout->createBlock($type, $name, ['data' => $params]);
-        if (!$widget instanceof \Magento\Widget\Block\BlockInterface) {
+        if (!$widget instanceof BlockInterface) {
             return '';
         }
 
@@ -140,6 +176,6 @@ public function mediaDirective($construction)
     {
         $params = $this->getParameters(html_entity_decode($construction[2], ENT_QUOTES));
         return $this->_storeManager->getStore()
-            ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $params['url'];
+            ->getBaseUrl(UrlInterface::URL_TYPE_MEDIA) . $params['url'];
     }
 }

From 6ab99afb37a85ff79b96f1d8eb5e0140f3f34f36 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Sat, 23 Jan 2021 12:37:14 +0530
Subject: [PATCH 06/16] composer lock file regenerated using 1.10.19 version

---
 composer.lock | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/composer.lock b/composer.lock
index 64ac873ca307c..3f719fb297e1c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -11188,12 +11188,12 @@
             "version": "1.9.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
+                "url": "https://github.com/webmozarts/assert.git",
                 "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
                 "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
                 "shasum": ""
             },
@@ -11294,5 +11294,6 @@
         "ext-zip": "*",
         "lib-libxml": "*"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }

From cd0dad13a5a67f2640954b143f43026298c41708 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Sat, 23 Jan 2021 12:42:03 +0530
Subject: [PATCH 07/16] friendsofphp/php-cs-fixer upgraded to 2.18.1

---
 composer.json |  2 +-
 composer.lock | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index c5fefc909a44a..ba4e7259e9bf6 100644
--- a/composer.json
+++ b/composer.json
@@ -88,7 +88,7 @@
     "require-dev": {
         "allure-framework/allure-phpunit": "~1.2.0",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
-        "friendsofphp/php-cs-fixer": "~2.17.0",
+        "friendsofphp/php-cs-fixer": "~2.18.1",
         "lusitanian/oauth": "~0.8.10",
         "magento/magento-coding-standard": "*",
         "magento/magento2-functional-testing-framework": "^3.0",
diff --git a/composer.lock b/composer.lock
index 3f719fb297e1c..0093a71e131c4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "75dbcd621097ad659fe5f49b5ce60fff",
+    "content-hash": "f6241267d1ae96341ac1fd72c6a80e3e",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
@@ -7109,16 +7109,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.17.4",
+            "version": "v2.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "8714455fb5095c21caff121eaf9a8f8c2d8f75b0"
+                "reference": "c68ff6231adb276857761e43b7ed082f164dce0b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/8714455fb5095c21caff121eaf9a8f8c2d8f75b0",
-                "reference": "8714455fb5095c21caff121eaf9a8f8c2d8f75b0",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/c68ff6231adb276857761e43b7ed082f164dce0b",
+                "reference": "c68ff6231adb276857761e43b7ed082f164dce0b",
                 "shasum": ""
             },
             "require": {
@@ -7198,7 +7198,13 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "time": "2021-01-18T03:06:22+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/keradus",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-01-21T18:50:42+00:00"
         },
         {
             "name": "hoa/consistency",

From 6f19a4eaf8d4c02002f722901cf7d740c4958d44 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Sat, 23 Jan 2021 15:52:23 +0530
Subject: [PATCH 08/16] Fixed static tests

---
 app/code/Magento/Widget/Model/Template/Filter.php | 6 ++++--
 app/code/Magento/Widget/composer.json             | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
index 6b14f3701b6e7..5f412018ba87a 100644
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -57,11 +57,12 @@ class Filter extends \Magento\Cms\Model\Template\Filter
      * @param VariableResolverInterface $variableResolver
      * @param Css\Processor $cssProcessor
      * @param Filesystem $pubDirectory
+     * @param CssInliner $cssInliner
      * @param \Magento\Widget\Model\ResourceModel\Widget $widgetResource
      * @param Widget $widget
-     * @param CssInliner $cssInliner
      * @param array $variables
      * @param array $directiveProcessors
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         StringUtils $string,
@@ -79,9 +80,9 @@ public function __construct(
         VariableResolverInterface $variableResolver,
         Css\Processor $cssProcessor,
         Filesystem $pubDirectory,
+        CssInliner $cssInliner,
         \Magento\Widget\Model\ResourceModel\Widget $widgetResource,
         Widget $widget,
-        CssInliner $cssInliner,
         $variables = [],
         array $directiveProcessors = []
     ) {
@@ -174,6 +175,7 @@ public function widgetDirective($construction)
      */
     public function mediaDirective($construction)
     {
+        // phpcs:disable Magento2.Functions.DiscouragedFunction
         $params = $this->getParameters(html_entity_decode($construction[2], ENT_QUOTES));
         return $this->_storeManager->getStore()
             ->getBaseUrl(UrlInterface::URL_TYPE_MEDIA) . $params['url'];
diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json
index 2cf8429095ce7..3014c99a35a14 100644
--- a/app/code/Magento/Widget/composer.json
+++ b/app/code/Magento/Widget/composer.json
@@ -10,6 +10,7 @@
         "magento/module-backend": "*",
         "magento/module-catalog": "*",
         "magento/module-cms": "*",
+        "magento/module-email": "*",
         "magento/module-store": "*",
         "magento/module-theme": "*",
         "magento/module-variable": "*",

From 5cdb807a60e20cff3129e86403c80c5de41dd2a9 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Sat, 23 Jan 2021 16:02:52 +0530
Subject: [PATCH 09/16] Fixed unit test

---
 .../Email/Test/Unit/Model/Template/FilterTest.php   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
index e5331a4293e56..6a0ec8765f885 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
@@ -138,6 +138,11 @@ class FilterTest extends TestCase
      */
     private $variableResolver;
 
+    /**
+     * @var MockObject|VariableResolverInterface
+     */
+    private $variableResolverInterface;
+
     /**
      * @var array
      */
@@ -250,12 +255,12 @@ protected function getModel($mockedMethods = null)
                     $this->appState,
                     $this->backendUrlBuilder,
                     $this->configVariables,
-                    [],
-                    $this->cssInliner,
-                    $this->directiveProcessors,
                     $this->variableResolver,
                     $this->cssProcessor,
-                    $this->pubDirectory
+                    $this->pubDirectory,
+                    $this->cssInliner,
+                    [],
+                    $this->directiveProcessors
                 ]
             )
             ->setMethods($mockedMethods)

From 780d166416f118f4ea4ef1e36d0c605a44623606 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Mon, 25 Jan 2021 13:03:15 +0530
Subject: [PATCH 10/16] Fixed Integration tests

---
 app/code/Magento/Email/Model/Template/Filter.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 912da03cc3c74..35eaabb91fe4f 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -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')
                     !== false
                 ) {
                     throw new MailException(

From 6a2ec9706d72a1698be856a3759a598467f6d616 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 26 Jan 2021 21:40:43 +0000
Subject: [PATCH 11/16] magento/magento2#31342: Updated CssInliner in a
 backward compatible way

---
 .../Magento/Email/Model/Template/Filter.php   |  5 ++-
 .../Css/PreProcessor/Adapter/CssInliner.php   | 31 ++++++++++++++-----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 35eaabb91fe4f..0e9554066638c 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -1056,13 +1056,12 @@ public function applyInlineCss($html)
                 }
                 $this->cssInliner->setHtml($html);
 
+                $this->cssInliner->setCss($cssToInline);
+
                 // Don't parse inline <style> tags, since existing tag is intentionally for non-inline styles
                 $this->cssInliner->disableStyleBlocksParsing();
 
-                $this->cssInliner->setCss($cssToInline);
-
                 $processedHtml = $this->cssInliner->process();
-
             } catch (Exception $e) {
                 if ($this->_appState->getMode() == State::MODE_DEVELOPER) {
                     $processedHtml = __('CSS inlining error:') . PHP_EOL . $e->getMessage()
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
index b3c9a4bba5983..0704fd0f54020 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
@@ -19,9 +19,19 @@ class CssInliner
     private $appState;
 
     /**
-     * @var EmogrifierCssInliner
+     * @var string
      */
-    private $emogrifier;
+    private $html;
+
+    /**
+     * @var string
+     */
+    private $css;
+
+    /**
+     * @var bool
+     */
+    private $disableStyleBlocksParsing = false;
 
     /**
      * @param State $appState
@@ -39,8 +49,7 @@ public function __construct(State $appState)
      */
     public function setHtml($html)
     {
-        $this->emogrifier = EmogrifierCssInliner::fromHtml($html)
-            ->setDebug($this->appState->getMode() === State::MODE_DEVELOPER);
+        $this->html = $html;
     }
 
     /**
@@ -51,7 +60,7 @@ public function setHtml($html)
      */
     public function setCss($css)
     {
-        $this->emogrifier->inlineCss($css);
+        $this->css = $css;
     }
 
     /**
@@ -61,7 +70,7 @@ public function setCss($css)
      */
     public function disableStyleBlocksParsing()
     {
-        $this->emogrifier->disableStyleBlocksParsing();
+        $this->disableStyleBlocksParsing = true;
     }
 
     /**
@@ -72,6 +81,14 @@ public function disableStyleBlocksParsing()
      */
     public function process()
     {
-        return $this->emogrifier->render();
+        $emogrifier = EmogrifierCssInliner::fromHtml($this->html)
+            ->inlineCss($this->css)
+            ->setDebug($this->appState->getMode() === State::MODE_DEVELOPER);
+
+        if ($this->disableStyleBlocksParsing) {
+            $emogrifier->disableStyleBlocksParsing();
+        }
+
+        return $emogrifier->render();
     }
 }

From 48c61c8cc20916e3483874d9f2008bd001709479 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 26 Jan 2021 21:45:21 +0000
Subject: [PATCH 12/16] magento/magento2#31342: Added default values for
 CssInliner properties

---
 .../Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
index 0704fd0f54020..32b26b9c4ec46 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
@@ -21,12 +21,12 @@ class CssInliner
     /**
      * @var string
      */
-    private $html;
+    private $html = '';
 
     /**
      * @var string
      */
-    private $css;
+    private $css = '';
 
     /**
      * @var bool

From 2d621ef97195090b251ff156aa8c73754a2ef19f Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Wed, 27 Jan 2021 10:25:35 +0530
Subject: [PATCH 13/16] Fixed unit test

---
 .../Framework/Css/PreProcessor/Adapter/CssInliner.php        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
index 32b26b9c4ec46..81f3608674752 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\State;
 use Pelago\Emogrifier\CssInliner as EmogrifierCssInliner;
+use Symfony\Component\CssSelector\Exception\ParseException;
 
 /**
  * This class will inline the css of an html to each tag to be used for applications such as a styled email.
@@ -78,17 +79,19 @@ public function disableStyleBlocksParsing()
      *
      * @return string
      * @throws \BadMethodCallException
+     * @throws ParseException
      */
     public function process()
     {
         $emogrifier = EmogrifierCssInliner::fromHtml($this->html)
-            ->inlineCss($this->css)
             ->setDebug($this->appState->getMode() === State::MODE_DEVELOPER);
 
         if ($this->disableStyleBlocksParsing) {
             $emogrifier->disableStyleBlocksParsing();
         }
 
+        $emogrifier->inlineCss($this->css);
+
         return $emogrifier->render();
     }
 }

From e992a9346e7c168d7c60916347fa4bb60f5e107e Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Thu, 28 Jan 2021 11:38:05 +0530
Subject: [PATCH 14/16] Updates for refactoring

---
 app/code/Magento/Email/Model/Template/Filter.php   | 14 ++++----------
 .../Magento/Email/Model/Template/FilterTest.php    |  6 +++---
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 0e9554066638c..a14c1cd523f37 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -1015,7 +1015,9 @@ public function getCssFilesContent(array $files)
                 }
             }
         } catch (ContentProcessorException $exception) {
-            $css = $exception->getMessage();
+            throw new MailException(
+                __($exception->getMessage())
+            );
         } catch (NotFoundException $exception) {
             $css = '';
         }
@@ -1046,8 +1048,6 @@ 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')
                     !== false
                 ) {
                     throw new MailException(
@@ -1063,13 +1063,7 @@ public function applyInlineCss($html)
 
                 $processedHtml = $this->cssInliner->process();
             } catch (Exception $e) {
-                if ($this->_appState->getMode() == State::MODE_DEVELOPER) {
-                    $processedHtml = __('CSS inlining error:') . PHP_EOL . $e->getMessage()
-                        . PHP_EOL
-                        . $html;
-                } else {
-                    $processedHtml = $html;
-                }
+                $processedHtml = $html;
                 $this->_logger->error($e);
             }
         } else {
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
index aa4d3f8c692f2..2c7a2331b3393 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
@@ -400,7 +400,7 @@ public function inlinecssDirectiveDataProvider()
             ],
             'Non-existent file results in unmodified markup' => [
                 '<html><p></p> {{inlinecss file="css/non-existent-file.css"}}</html>',
-                '<html><p></p> </html>',
+                'Compilation from source',
             ],
             'Plain template mode results in unmodified markup' => [
                 '<html><p></p> {{inlinecss file="css/email-inline-1.css"}}</html>',
@@ -417,12 +417,12 @@ public function inlinecssDirectiveDataProvider()
             ],
             'Production mode - File with compilation error results in structurally unmodified markup' => [
                 '<html><p></p> {{inlinecss file="css/file-with-error.css"}}</html>',
-                '<p></p>',
+                'We\'re sorry, an error has occurred while generating this content',
                 true,
             ],
             'Developer mode - File with compilation error results in error message' => [
                 '<html><p></p> {{inlinecss file="css/file-with-error.css"}}</html>',
-                'CSS inlining error:',
+                'Error filtering template',
                 false,
             ],
         ];

From 1668e9063ea4ca555555767ebe9daae40c9f2a0a Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Fri, 29 Jan 2021 12:42:13 +0000
Subject: [PATCH 15/16] magento/magento2#31342: Handled
 ContentProcessorException in backward compatible way

---
 .../Magento/Email/Model/Template/Filter.php   | 91 ++++++++++---------
 .../Email/Model/Template/FilterTest.php       |  6 +-
 2 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index a14c1cd523f37..87add921f9de8 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Email\Model\Template;
 
 use Exception;
@@ -904,19 +906,17 @@ public function cssDirective($construction)
             return '/* ' . __('"file" parameter must be specified') . ' */';
         }
 
-        $css = $this->cssProcessor->process(
-            $this->getCssFilesContent([$params['file']])
-        );
+        try {
+            $css = $this->cssProcessor->process($this->getCssFilesContent([$params['file']]));
+        } catch (ContentProcessorException $exception) {
+            return '/*' . PHP_EOL . $exception->getMessage() . PHP_EOL . '*/';
+        }
 
-        if (strpos($css, ContentProcessorInterface::ERROR_MESSAGE_PREFIX) !== false) {
-            // Return compilation error wrapped in CSS comment
-            return '/*' . PHP_EOL . $css . PHP_EOL . '*/';
-        } elseif (!empty($css)) {
-            return $css;
-        } else {
-            // Return CSS comment for debugging purposes
+        if (empty($css)){
             return '/* ' . __('Contents of the specified CSS file could not be loaded or is empty') . ' */';
         }
+
+        return $css;
     }
 
     /**
@@ -991,6 +991,7 @@ protected function getInlineCssFiles()
      * @param [] $files
      * @return string
      * @throws MailException
+     * @throws ContentProcessorException
      */
     public function getCssFilesContent(array $files)
     {
@@ -1014,10 +1015,6 @@ public function getCssFilesContent(array $files)
                     $css .= $asset->getContent();
                 }
             }
-        } catch (ContentProcessorException $exception) {
-            throw new MailException(
-                __($exception->getMessage())
-            );
         } catch (NotFoundException $exception) {
             $css = '';
         }
@@ -1037,39 +1034,51 @@ public function getCssFilesContent(array $files)
      */
     public function applyInlineCss($html)
     {
-        // Check to see if the {{inlinecss file=""}} directive set CSS file(s) to inline and then load those files
-        $cssToInline = $this->getCssFilesContent(
-            $this->getInlineCssFiles()
-        );
+        try {
+            // Check to see if the {{inlinecss file=""}} directive set CSS file(s) to inline and then load those files
+            $cssToInline = $this->getCssFilesContent($this->getInlineCssFiles());
+        } catch (ContentProcessorException $exception) {
+            return $this->getExceptionHtml($html, $exception);
+        }
+
         $cssToInline = $this->cssProcessor->process($cssToInline);
 
         // Only run Emogrify if HTML and CSS contain content
-        if ($html && $cssToInline) {
-            try {
-                // Don't try to compile CSS that has compilation errors
-                if (strpos($cssToInline, ContentProcessorInterface::ERROR_MESSAGE_PREFIX)
-                    !== false
-                ) {
-                    throw new MailException(
-                        __('<pre> %1 </pre>', PHP_EOL . $cssToInline . PHP_EOL)
-                    );
-                }
-                $this->cssInliner->setHtml($html);
-
-                $this->cssInliner->setCss($cssToInline);
-
-                // Don't parse inline <style> tags, since existing tag is intentionally for non-inline styles
-                $this->cssInliner->disableStyleBlocksParsing();
+        if (!$html || !$cssToInline) {
+            return $html;
+        }
 
-                $processedHtml = $this->cssInliner->process();
-            } catch (Exception $e) {
-                $processedHtml = $html;
-                $this->_logger->error($e);
+        try {
+            // Don't try to compile CSS that has compilation errors
+            if (strpos($cssToInline, ContentProcessorInterface::ERROR_MESSAGE_PREFIX) !== false) {
+                throw new MailException(__('<pre> %1 </pre>', PHP_EOL . $cssToInline . PHP_EOL));
             }
-        } else {
-            $processedHtml = $html;
+            $this->cssInliner->setHtml($html);
+            $this->cssInliner->setCss($cssToInline);
+            // Don't parse inline <style> tags, since existing tag is intentionally for non-inline styles
+            $this->cssInliner->disableStyleBlocksParsing();
+            return $this->cssInliner->process();
+        } catch (Exception $exception) {
+            return $this->getExceptionHtml($html, $exception);
+        }
+    }
+
+    /**
+     * Handle css inlining exception, log it, add to the content in developer mode
+     *
+     * @param string $html
+     * @param Exception $exception
+     * @return string
+     */
+    private function getExceptionHtml(string $html, Exception $exception): string
+    {
+        $this->_logger->error($exception);
+        if ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {
+            return __('CSS inlining error:') . PHP_EOL . $exception->getMessage()
+                . PHP_EOL
+                . $html;
         }
-        return $processedHtml;
+        return $html;
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
index 2c7a2331b3393..aa4d3f8c692f2 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
@@ -400,7 +400,7 @@ public function inlinecssDirectiveDataProvider()
             ],
             'Non-existent file results in unmodified markup' => [
                 '<html><p></p> {{inlinecss file="css/non-existent-file.css"}}</html>',
-                'Compilation from source',
+                '<html><p></p> </html>',
             ],
             'Plain template mode results in unmodified markup' => [
                 '<html><p></p> {{inlinecss file="css/email-inline-1.css"}}</html>',
@@ -417,12 +417,12 @@ public function inlinecssDirectiveDataProvider()
             ],
             'Production mode - File with compilation error results in structurally unmodified markup' => [
                 '<html><p></p> {{inlinecss file="css/file-with-error.css"}}</html>',
-                'We\'re sorry, an error has occurred while generating this content',
+                '<p></p>',
                 true,
             ],
             'Developer mode - File with compilation error results in error message' => [
                 '<html><p></p> {{inlinecss file="css/file-with-error.css"}}</html>',
-                'Error filtering template',
+                'CSS inlining error:',
                 false,
             ],
         ];

From ce09f9fcbdf166dd70139e418431f30bfcfa9ba9 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Fri, 29 Jan 2021 12:48:37 +0000
Subject: [PATCH 16/16] Updated composer.lock

---
 composer.lock | 718 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 713 insertions(+), 5 deletions(-)

diff --git a/composer.lock b/composer.lock
index 965b6d6a29d4b..ba560a95d9237 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f6241267d1ae96341ac1fd72c6a80e3e",
+    "content-hash": "438feb5366e2edd6b88e3c286b637f9b",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
@@ -291,6 +291,20 @@
                 "ssl",
                 "tls"
             ],
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-08-23T12:54:47+00:00"
         },
         {
@@ -371,6 +385,20 @@
                 "dependency",
                 "package"
             ],
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-30T21:31:58+00:00"
         },
         {
@@ -432,6 +460,20 @@
                 "validation",
                 "versioning"
             ],
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-27T13:13:07+00:00"
         },
         {
@@ -492,6 +534,20 @@
                 "spdx",
                 "validator"
             ],
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-07-15T15:35:07+00:00"
         },
         {
@@ -536,6 +592,20 @@
                 "Xdebug",
                 "performance"
             ],
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T12:39:10+00:00"
         },
         {
@@ -1622,6 +1692,12 @@
                 "events",
                 "laminas"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-08-25T11:10:44+00:00"
         },
         {
@@ -1689,6 +1765,12 @@
                 "feed",
                 "laminas"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-08-18T13:45:04+00:00"
         },
         {
@@ -1840,6 +1922,12 @@
                 "form",
                 "laminas"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-07-14T13:53:27+00:00"
         },
         {
@@ -1892,6 +1980,12 @@
                 "http client",
                 "laminas"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-08-18T17:11:58+00:00"
         },
         {
@@ -2027,6 +2121,12 @@
                 "i18n",
                 "laminas"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-10-24T13:14:32+00:00"
         },
         {
@@ -2332,6 +2432,12 @@
                 "laminas",
                 "mail"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-08-12T14:51:33+00:00"
         },
         {
@@ -2504,6 +2610,12 @@
                 "laminas",
                 "modulemanager"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-08-25T09:29:22+00:00"
         },
         {
@@ -2890,6 +3002,12 @@
                 "laminas",
                 "session"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-10-31T15:33:31+00:00"
         },
         {
@@ -2997,6 +3115,12 @@
                 "laminas",
                 "stdlib"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-08-25T09:08:16+00:00"
         },
         {
@@ -3094,6 +3218,12 @@
                 "laminas",
                 "uri"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-10-31T20:20:07+00:00"
         },
         {
@@ -3312,6 +3442,12 @@
                 "laminas",
                 "zf"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-09-14T14:23:00+00:00"
         },
         {
@@ -3397,6 +3533,12 @@
                 "sftp",
                 "storage"
             ],
+            "funding": [
+                {
+                    "url": "https://offset.earth/frankdejonge",
+                    "type": "other"
+                }
+            ],
             "time": "2020-08-23T07:39:11+00:00"
         },
         {
@@ -3532,6 +3674,16 @@
                 }
             ],
             "description": "Mime-type detection for Flysystem",
+            "funding": [
+                {
+                    "url": "https://github.com/frankdejonge",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/league/flysystem",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-18T11:50:25+00:00"
         },
         {
@@ -3769,6 +3921,16 @@
                 "logging",
                 "psr-3"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/Seldaek",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-07-23T08:35:51+00:00"
         },
         {
@@ -4239,6 +4401,20 @@
                 "x.509",
                 "x509"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/terrafrost",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/phpseclib",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-08T04:24:43+00:00"
         },
         {
@@ -4648,6 +4824,16 @@
                 "parser",
                 "validator"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/Seldaek",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-08-25T06:56:57+00:00"
         },
         {
@@ -4764,6 +4950,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T11:50:19+00:00"
         },
         {
@@ -4812,6 +5012,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T12:01:57+00:00"
         },
         {
@@ -4878,6 +5092,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T11:50:19+00:00"
         },
         {
@@ -4940,6 +5168,20 @@
                 "interoperability",
                 "standards"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-07-06T13:19:58+00:00"
         },
         {
@@ -4985,6 +5227,20 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T12:01:57+00:00"
         },
         {
@@ -5029,6 +5285,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T12:01:57+00:00"
         },
         {
@@ -5091,6 +5361,20 @@
                 "polyfill",
                 "portable"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5161,6 +5445,20 @@
                 "portable",
                 "shim"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5228,6 +5526,20 @@
                 "portable",
                 "shim"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5291,6 +5603,20 @@
                 "portable",
                 "shim"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5350,6 +5676,20 @@
                 "portable",
                 "shim"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5412,6 +5752,20 @@
                 "portable",
                 "shim"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5478,6 +5832,20 @@
                 "portable",
                 "shim"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5516,12 +5884,26 @@
                     "email": "fabien@symfony.com"
                 },
                 {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Process Component",
+            "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
                 }
             ],
-            "description": "Symfony Process Component",
-            "homepage": "https://symfony.com",
             "time": "2020-10-24T11:50:19+00:00"
         },
         {
@@ -5584,6 +5966,20 @@
                 "interoperability",
                 "standards"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-07T11:33:47+00:00"
         },
         {
@@ -5778,6 +6174,12 @@
                 "safe writer",
                 "webimpress"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/michalbundyra",
+                    "type": "github"
+                }
+            ],
             "time": "2020-08-25T07:21:11+00:00"
         },
         {
@@ -5830,6 +6232,12 @@
                 "api",
                 "graphql"
             ],
+            "funding": [
+                {
+                    "url": "https://opencollective.com/webonyx-graphql-php",
+                    "type": "open_collective"
+                }
+            ],
             "time": "2020-07-02T05:49:25+00:00"
         },
         {
@@ -6350,6 +6758,12 @@
                 "functional testing",
                 "unit testing"
             ],
+            "funding": [
+                {
+                    "url": "https://opencollective.com/codeception",
+                    "type": "open_collective"
+                }
+            ],
             "time": "2020-11-03T17:34:51+00:00"
         },
         {
@@ -6924,6 +7338,20 @@
                 "redis",
                 "xcache"
             ],
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-07-07T18:54:01+00:00"
         },
         {
@@ -7047,6 +7475,20 @@
                 "constructor",
                 "instantiate"
             ],
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-05-29T17:27:14+00:00"
         },
         {
@@ -8268,6 +8710,12 @@
                 "object",
                 "object graph"
             ],
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-06-29T13:22:24+00:00"
         },
         {
@@ -8919,6 +9367,12 @@
                 "phpmd",
                 "pmd"
             ],
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpmd/phpmd",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-23T22:06:32+00:00"
         },
         {
@@ -8974,6 +9428,16 @@
                 "php",
                 "type"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-07-20T17:29:33+00:00"
         },
         {
@@ -9157,6 +9621,12 @@
                 "testing",
                 "xunit"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-05-23T08:02:54+00:00"
         },
         {
@@ -9207,6 +9677,12 @@
                 "filesystem",
                 "iterator"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-09-28T05:57:25+00:00"
         },
         {
@@ -9260,6 +9736,12 @@
             "keywords": [
                 "process"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-09-28T05:58:55+00:00"
         },
         {
@@ -9309,6 +9791,12 @@
             "keywords": [
                 "template"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-10-26T05:33:50+00:00"
         },
         {
@@ -9407,6 +9895,12 @@
             "keywords": [
                 "tokenizer"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "abandoned": true,
             "time": "2020-08-04T08:28:15+00:00"
         },
@@ -9590,6 +10084,12 @@
             ],
             "description": "Collection of value objects that represent the PHP code units",
             "homepage": "https://github.com/sebastianbergmann/code-unit",
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-10-26T13:08:54+00:00"
         },
         {
@@ -9635,6 +10135,12 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-09-28T05:30:19+00:00"
         },
         {
@@ -9699,6 +10205,12 @@
                 "compare",
                 "equality"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-10-26T15:49:45+00:00"
         },
         {
@@ -9755,6 +10267,12 @@
                 "unidiff",
                 "unified diff"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-10-26T13:10:38+00:00"
         },
         {
@@ -9808,6 +10326,12 @@
                 "environment",
                 "hhvm"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-09-28T05:52:38+00:00"
         },
         {
@@ -9875,6 +10399,12 @@
                 "export",
                 "exporter"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-09-28T05:24:23+00:00"
         },
         {
@@ -10023,6 +10553,12 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-10-26T13:12:34+00:00"
         },
         {
@@ -10068,6 +10604,12 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-10-26T13:14:26+00:00"
         },
         {
@@ -10172,6 +10714,12 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-10-26T13:17:30+00:00"
         },
         {
@@ -10217,6 +10765,12 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-09-28T06:45:17+00:00"
         },
         {
@@ -10263,6 +10817,12 @@
             ],
             "description": "Collection of value objects that represent the types of the PHP type system",
             "homepage": "https://github.com/sebastianbergmann/type",
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-10-26T13:18:59+00:00"
         },
         {
@@ -10306,6 +10866,12 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-09-28T06:39:44+00:00"
         },
         {
@@ -10489,6 +11055,20 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T12:01:57+00:00"
         },
         {
@@ -10559,6 +11139,20 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-27T10:11:13+00:00"
         },
         {
@@ -10609,6 +11203,20 @@
             ],
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-07T11:33:47+00:00"
         },
         {
@@ -10665,6 +11273,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T12:01:57+00:00"
         },
         {
@@ -10723,6 +11345,20 @@
                 "mime",
                 "mime-type"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T12:01:57+00:00"
         },
         {
@@ -10774,6 +11410,20 @@
                 "configuration",
                 "options"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T12:01:57+00:00"
         },
         {
@@ -10825,6 +11475,20 @@
                 "portable",
                 "shim"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -10870,6 +11534,20 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T12:01:57+00:00"
         },
         {
@@ -10928,6 +11606,20 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T12:03:25+00:00"
         },
         {
@@ -11143,6 +11835,12 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
             "time": "2020-07-12T23:59:07+00:00"
         },
         {
@@ -11205,6 +11903,16 @@
                 "env",
                 "environment"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-07-14T17:54:18+00:00"
         },
         {