Commit 32b0875940 for woocommerce
commit 32b087594021968b1603e4091895b7fdb53a1670
Author: Rostislav Wolný <1082140+costasovo@users.noreply.github.com>
Date: Thu Sep 18 10:55:53 2025 +0200
Downgrade Emogrifier and its subdepencies (#60994)
* Downgrade emogrifier to 7.3.0
* Add changelog
diff --git a/packages/php/email-editor/changelog/downgrade-emogrifier b/packages/php/email-editor/changelog/downgrade-emogrifier
new file mode 100644
index 0000000000..e0d6f6b901
--- /dev/null
+++ b/packages/php/email-editor/changelog/downgrade-emogrifier
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Downgrade Emogrifier dependency to avoid conflict
diff --git a/packages/php/email-editor/composer.json b/packages/php/email-editor/composer.json
index 7057061921..196e5f7605 100644
--- a/packages/php/email-editor/composer.json
+++ b/packages/php/email-editor/composer.json
@@ -18,7 +18,7 @@
},
"require": {
"php": ">=7.4",
- "pelago/emogrifier": "^8.0"
+ "pelago/emogrifier": "7.3.0"
},
"require-dev": {
"automattic/jetpack-changelogger": "3.3.0",
diff --git a/packages/php/email-editor/composer.lock b/packages/php/email-editor/composer.lock
index 0c54da9c9b..7a7463ac10 100644
--- a/packages/php/email-editor/composer.lock
+++ b/packages/php/email-editor/composer.lock
@@ -4,45 +4,42 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "70a8bdaa4babde4b176d0ce936df3602",
+ "content-hash": "e055f4406dd685dcf449f84ab31025cd",
"packages": [
{
"name": "pelago/emogrifier",
- "version": "v8.0.0",
+ "version": "v7.3.0",
"source": {
"type": "git",
"url": "https://github.com/MyIntervals/emogrifier.git",
- "reference": "7fdf4ee46fe57bd017b92640bca1ec42d124440a"
+ "reference": "6e00d9d8235e8cc8eec857e8dcd6cfeefdfd0cd6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/7fdf4ee46fe57bd017b92640bca1ec42d124440a",
- "reference": "7fdf4ee46fe57bd017b92640bca1ec42d124440a",
+ "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/6e00d9d8235e8cc8eec857e8dcd6cfeefdfd0cd6",
+ "reference": "6e00d9d8235e8cc8eec857e8dcd6cfeefdfd0cd6",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"php": "~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
- "sabberworm/php-css-parser": "^9.0.0",
- "symfony/css-selector": "^5.4.35 || ~6.3.12 || ^6.4.3 || ^7.0.3"
+ "sabberworm/php-css-parser": "^8.7.0",
+ "symfony/css-selector": "^4.4.23 || ^5.4.0 || ^6.0.0 || ^7.0.0"
},
"require-dev": {
"php-parallel-lint/php-parallel-lint": "1.4.0",
- "phpmd/phpmd": "2.15.0",
"phpstan/extension-installer": "1.4.3",
- "phpstan/phpstan": "1.12.28 || 2.1.20",
- "phpstan/phpstan-phpunit": "1.4.2 || 2.0.7",
- "phpstan/phpstan-strict-rules": "1.6.2 || 2.0.6",
- "phpunit/phpunit": "9.6.23",
- "rawr/phpunit-data-provider": "3.3.1",
- "rector/rector": "1.2.10 || 2.1.2",
- "rector/type-perfect": "1.0.0 || 2.1.0"
+ "phpstan/phpstan": "1.12.7",
+ "phpstan/phpstan-phpunit": "1.4.0",
+ "phpstan/phpstan-strict-rules": "1.6.1",
+ "phpunit/phpunit": "9.6.21",
+ "rawr/cross-data-providers": "2.4.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "8.1.x-dev"
+ "dev-main": "8.0.x-dev"
}
},
"autoload": {
@@ -89,36 +86,29 @@
"issues": "https://github.com/MyIntervals/emogrifier/issues",
"source": "https://github.com/MyIntervals/emogrifier"
},
- "time": "2025-07-27T17:45:42+00:00"
+ "time": "2024-10-28T16:12:26+00:00"
},
{
"name": "sabberworm/php-css-parser",
- "version": "v9.0.0",
+ "version": "v8.9.0",
"source": {
"type": "git",
"url": "https://github.com/MyIntervals/PHP-CSS-Parser.git",
- "reference": "54574e3de2f8cdc91175ffd2337e5c6804a7d729"
+ "reference": "d8e916507b88e389e26d4ab03c904a082aa66bb9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/54574e3de2f8cdc91175ffd2337e5c6804a7d729",
- "reference": "54574e3de2f8cdc91175ffd2337e5c6804a7d729",
+ "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/d8e916507b88e389e26d4ab03c904a082aa66bb9",
+ "reference": "d8e916507b88e389e26d4ab03c904a082aa66bb9",
"shasum": ""
},
"require": {
"ext-iconv": "*",
- "php": "^7.2.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
+ "php": "^5.6.20 || ^7.0.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
},
"require-dev": {
- "php-parallel-lint/php-parallel-lint": "1.4.0",
- "phpstan/extension-installer": "1.4.3",
- "phpstan/phpstan": "1.12.28 || 2.1.19",
- "phpstan/phpstan-phpunit": "1.4.2 || 2.0.7",
- "phpstan/phpstan-strict-rules": "1.6.2 || 2.0.6",
- "phpunit/phpunit": "8.5.42",
- "rawr/phpunit-data-provider": "3.3.1",
- "rector/rector": "1.2.10 || 2.1.2",
- "rector/type-perfect": "1.0.0 || 2.1.0"
+ "phpunit/phpunit": "5.7.27 || 6.5.14 || 7.5.20 || 8.5.41",
+ "rawr/cross-data-providers": "^2.0.0"
},
"suggest": {
"ext-mbstring": "for parsing UTF-8 CSS"
@@ -126,7 +116,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "9.1.x-dev"
+ "dev-main": "9.0.x-dev"
}
},
"autoload": {
@@ -160,9 +150,9 @@
],
"support": {
"issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues",
- "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v9.0.0"
+ "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.9.0"
},
- "time": "2025-07-27T07:24:01+00:00"
+ "time": "2025-07-11T13:20:48+00:00"
},
{
"name": "symfony/css-selector",
diff --git a/plugins/woocommerce/changelog/downgrade-emogrifier b/plugins/woocommerce/changelog/downgrade-emogrifier
new file mode 100644
index 0000000000..e0d6f6b901
--- /dev/null
+++ b/plugins/woocommerce/changelog/downgrade-emogrifier
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Downgrade Emogrifier dependency to avoid conflict
diff --git a/plugins/woocommerce/composer.json b/plugins/woocommerce/composer.json
index 2a944f5f19..d3f5d3586f 100644
--- a/plugins/woocommerce/composer.json
+++ b/plugins/woocommerce/composer.json
@@ -45,7 +45,7 @@
"composer/installers": "^1.9",
"maxmind-db/reader": "^1.11",
"opis/json-schema": "*",
- "pelago/emogrifier": "^8.0",
+ "pelago/emogrifier": "7.3.0",
"woocommerce/action-scheduler": "3.9.3",
"woocommerce/blueprint": "*",
"woocommerce/email-editor": "1.5.0",
diff --git a/plugins/woocommerce/composer.lock b/plugins/woocommerce/composer.lock
index 300e08f720..acd841f4c5 100644
--- a/plugins/woocommerce/composer.lock
+++ b/plugins/woocommerce/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": "5b72cd066b457917cffd2fce63d3b491",
+ "content-hash": "b0d38cdf166a79c5c91e1cdd8ac0747a",
"packages": [
{
"name": "automattic/block-delimiter",
@@ -1070,41 +1070,38 @@
},
{
"name": "pelago/emogrifier",
- "version": "v8.0.0",
+ "version": "v7.3.0",
"source": {
"type": "git",
"url": "https://github.com/MyIntervals/emogrifier.git",
- "reference": "7fdf4ee46fe57bd017b92640bca1ec42d124440a"
+ "reference": "6e00d9d8235e8cc8eec857e8dcd6cfeefdfd0cd6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/7fdf4ee46fe57bd017b92640bca1ec42d124440a",
- "reference": "7fdf4ee46fe57bd017b92640bca1ec42d124440a",
+ "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/6e00d9d8235e8cc8eec857e8dcd6cfeefdfd0cd6",
+ "reference": "6e00d9d8235e8cc8eec857e8dcd6cfeefdfd0cd6",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"php": "~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
- "sabberworm/php-css-parser": "^9.0.0",
- "symfony/css-selector": "^5.4.35 || ~6.3.12 || ^6.4.3 || ^7.0.3"
+ "sabberworm/php-css-parser": "^8.7.0",
+ "symfony/css-selector": "^4.4.23 || ^5.4.0 || ^6.0.0 || ^7.0.0"
},
"require-dev": {
"php-parallel-lint/php-parallel-lint": "1.4.0",
- "phpmd/phpmd": "2.15.0",
"phpstan/extension-installer": "1.4.3",
- "phpstan/phpstan": "1.12.28 || 2.1.20",
- "phpstan/phpstan-phpunit": "1.4.2 || 2.0.7",
- "phpstan/phpstan-strict-rules": "1.6.2 || 2.0.6",
- "phpunit/phpunit": "9.6.23",
- "rawr/phpunit-data-provider": "3.3.1",
- "rector/rector": "1.2.10 || 2.1.2",
- "rector/type-perfect": "1.0.0 || 2.1.0"
+ "phpstan/phpstan": "1.12.7",
+ "phpstan/phpstan-phpunit": "1.4.0",
+ "phpstan/phpstan-strict-rules": "1.6.1",
+ "phpunit/phpunit": "9.6.21",
+ "rawr/cross-data-providers": "2.4.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "8.1.x-dev"
+ "dev-main": "8.0.x-dev"
}
},
"autoload": {
@@ -1151,36 +1148,29 @@
"issues": "https://github.com/MyIntervals/emogrifier/issues",
"source": "https://github.com/MyIntervals/emogrifier"
},
- "time": "2025-07-27T17:45:42+00:00"
+ "time": "2024-10-28T16:12:26+00:00"
},
{
"name": "sabberworm/php-css-parser",
- "version": "v9.0.0",
+ "version": "v8.9.0",
"source": {
"type": "git",
"url": "https://github.com/MyIntervals/PHP-CSS-Parser.git",
- "reference": "54574e3de2f8cdc91175ffd2337e5c6804a7d729"
+ "reference": "d8e916507b88e389e26d4ab03c904a082aa66bb9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/54574e3de2f8cdc91175ffd2337e5c6804a7d729",
- "reference": "54574e3de2f8cdc91175ffd2337e5c6804a7d729",
+ "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/d8e916507b88e389e26d4ab03c904a082aa66bb9",
+ "reference": "d8e916507b88e389e26d4ab03c904a082aa66bb9",
"shasum": ""
},
"require": {
"ext-iconv": "*",
- "php": "^7.2.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
+ "php": "^5.6.20 || ^7.0.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
},
"require-dev": {
- "php-parallel-lint/php-parallel-lint": "1.4.0",
- "phpstan/extension-installer": "1.4.3",
- "phpstan/phpstan": "1.12.28 || 2.1.19",
- "phpstan/phpstan-phpunit": "1.4.2 || 2.0.7",
- "phpstan/phpstan-strict-rules": "1.6.2 || 2.0.6",
- "phpunit/phpunit": "8.5.42",
- "rawr/phpunit-data-provider": "3.3.1",
- "rector/rector": "1.2.10 || 2.1.2",
- "rector/type-perfect": "1.0.0 || 2.1.0"
+ "phpunit/phpunit": "5.7.27 || 6.5.14 || 7.5.20 || 8.5.41",
+ "rawr/cross-data-providers": "^2.0.0"
},
"suggest": {
"ext-mbstring": "for parsing UTF-8 CSS"
@@ -1188,7 +1178,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "9.1.x-dev"
+ "dev-main": "9.0.x-dev"
}
},
"autoload": {
@@ -1222,9 +1212,9 @@
],
"support": {
"issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues",
- "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v9.0.0"
+ "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.9.0"
},
- "time": "2025-07-27T07:24:01+00:00"
+ "time": "2025-07-11T13:20:48+00:00"
},
{
"name": "symfony/css-selector",
@@ -1490,10 +1480,10 @@
"dist": {
"type": "path",
"url": "../../packages/php/email-editor",
- "reference": "69061b6442bfd146a3f3d66bd1d0c4c66f72c74e"
+ "reference": "9ab8bc7c476d09f09e6a0861bdcd82a02ac01abf"
},
"require": {
- "pelago/emogrifier": "^8.0",
+ "pelago/emogrifier": "7.3.0",
"php": ">=7.4"
},
"require-dev": {