From: Tim Düsterhus Date: Wed, 22 Sep 2021 14:08:49 +0000 (+0200) Subject: Update pelago/emogrifier to 6.0 X-Git-Tag: 5.5.0_Alpha_1~412 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2673ed620ebb8794d8caeae0f434ba3d32e3f2b5;p=GitHub%2FWoltLab%2FWCF.git Update pelago/emogrifier to 6.0 --- diff --git a/wcfsetup/install/files/lib/system/api/composer.json b/wcfsetup/install/files/lib/system/api/composer.json index 6e369066f8..202f8a531b 100644 --- a/wcfsetup/install/files/lib/system/api/composer.json +++ b/wcfsetup/install/files/lib/system/api/composer.json @@ -11,7 +11,7 @@ "require": { "ezyang/htmlpurifier": "4.13.*", "erusev/parsedown": "1.7.*", - "pelago/emogrifier": "5.0.*", + "pelago/emogrifier": "6.0.*", "chrisjean/php-ico": "1.0.*", "true/punycode": "~2.0", "pear/net_idna2": "^0.2.0", diff --git a/wcfsetup/install/files/lib/system/api/composer.lock b/wcfsetup/install/files/lib/system/api/composer.lock index 0c4662ec4e..5c758ff882 100644 --- a/wcfsetup/install/files/lib/system/api/composer.lock +++ b/wcfsetup/install/files/lib/system/api/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": "c9ef596dad16a71e5309e4e0385aa29c", + "content-hash": "9c02293e502eb0eff8e7c8e6e862d41e", "packages": [ { "name": "chrisjean/php-ico", @@ -929,34 +929,34 @@ }, { "name": "pelago/emogrifier", - "version": "v5.0.1", + "version": "v6.0.0", "source": { "type": "git", "url": "https://github.com/MyIntervals/emogrifier.git", - "reference": "37595a9bb62c3c25969bdd9e8d7dd24c3ac62bc9" + "reference": "aa72d5407efac118f3896bcb995a2cba793df0ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/37595a9bb62c3c25969bdd9e8d7dd24c3ac62bc9", - "reference": "37595a9bb62c3c25969bdd9e8d7dd24c3ac62bc9", + "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/aa72d5407efac118f3896bcb995a2cba793df0ae", + "reference": "aa72d5407efac118f3896bcb995a2cba793df0ae", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", - "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" + "php": "~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0", + "sabberworm/php-css-parser": "^8.3.1", + "symfony/css-selector": "^3.4.32 || ^4.4 || ^5.3 || ^6.0" }, "require-dev": { - "php-parallel-lint/php-parallel-lint": "^1.2.0", - "rawr/cross-data-providers": "^2.3.0", - "slevomat/coding-standard": "^6.4.1", - "squizlabs/php_codesniffer": "^3.5.8" + "php-parallel-lint/php-parallel-lint": "^1.3.0", + "phpunit/phpunit": "^8.5.16", + "rawr/cross-data-providers": "^2.3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "6.0.x-dev" + "dev-main": "7.0.x-dev" } }, "autoload": { @@ -1003,7 +1003,7 @@ "issues": "https://github.com/MyIntervals/emogrifier/issues", "source": "https://github.com/MyIntervals/emogrifier" }, - "time": "2021-04-06T08:18:22+00:00" + "time": "2021-09-16T16:22:04+00:00" }, { "name": "psr/http-client", @@ -1266,6 +1266,55 @@ }, "time": "2019-03-08T08:55:37+00:00" }, + { + "name": "sabberworm/php-css-parser", + "version": "8.3.1", + "source": { + "type": "git", + "url": "https://github.com/sabberworm/PHP-CSS-Parser.git", + "reference": "d217848e1396ef962fb1997cf3e2421acba7f796" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/d217848e1396ef962fb1997cf3e2421acba7f796", + "reference": "d217848e1396ef962fb1997cf3e2421acba7f796", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "require-dev": { + "codacy/coverage": "^1.4", + "phpunit/phpunit": "~4.8" + }, + "type": "library", + "autoload": { + "psr-0": { + "Sabberworm\\CSS": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Raphael Schweikert" + } + ], + "description": "Parser for CSS Files written in PHP", + "homepage": "http://www.sabberworm.com/blog/2010/6/10/php-css-parser", + "keywords": [ + "css", + "parser", + "stylesheet" + ], + "support": { + "issues": "https://github.com/sabberworm/PHP-CSS-Parser/issues", + "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/8.3.1" + }, + "time": "2020-06-01T09:10:00+00:00" + }, { "name": "scssphp/scssphp", "version": "v1.8.1", diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php b/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php index 800c71c7a5..9a84a19590 100644 --- a/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php +++ b/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php @@ -465,7 +465,10 @@ return array( 'ParagonIE\\ConstantTime\\Hex' => $vendorDir . '/paragonie/constant_time_encoding/src/Hex.php', 'ParagonIE\\ConstantTime\\RFC4648' => $vendorDir . '/paragonie/constant_time_encoding/src/RFC4648.php', 'Parsedown' => $vendorDir . '/erusev/parsedown/Parsedown.php', + 'Pelago\\Emogrifier\\Caching\\SimpleStringCache' => $vendorDir . '/pelago/emogrifier/src/Caching/SimpleStringCache.php', 'Pelago\\Emogrifier\\CssInliner' => $vendorDir . '/pelago/emogrifier/src/CssInliner.php', + 'Pelago\\Emogrifier\\Css\\CssDocument' => $vendorDir . '/pelago/emogrifier/src/Css/CssDocument.php', + 'Pelago\\Emogrifier\\Css\\StyleRule' => $vendorDir . '/pelago/emogrifier/src/Css/StyleRule.php', 'Pelago\\Emogrifier\\HtmlProcessor\\AbstractHtmlProcessor' => $vendorDir . '/pelago/emogrifier/src/HtmlProcessor/AbstractHtmlProcessor.php', 'Pelago\\Emogrifier\\HtmlProcessor\\CssToAttributeConverter' => $vendorDir . '/pelago/emogrifier/src/HtmlProcessor/CssToAttributeConverter.php', 'Pelago\\Emogrifier\\HtmlProcessor\\HtmlNormalizer' => $vendorDir . '/pelago/emogrifier/src/HtmlProcessor/HtmlNormalizer.php', @@ -490,6 +493,42 @@ return array( 'Psr\\Http\\Message\\UriFactoryInterface' => $vendorDir . '/psr/http-factory/src/UriFactoryInterface.php', 'Psr\\Http\\Message\\UriInterface' => $vendorDir . '/psr/http-message/src/UriInterface.php', 'Psr\\Http\\Server\\RequestHandlerInterface' => $vendorDir . '/psr/http-server-handler/src/RequestHandlerInterface.php', + 'Sabberworm\\CSS\\CSSList\\AtRuleBlockList' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/CSSList/AtRuleBlockList.php', + 'Sabberworm\\CSS\\CSSList\\CSSBlockList' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/CSSList/CSSBlockList.php', + 'Sabberworm\\CSS\\CSSList\\CSSList' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/CSSList/CSSList.php', + 'Sabberworm\\CSS\\CSSList\\Document' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/CSSList/Document.php', + 'Sabberworm\\CSS\\CSSList\\KeyFrame' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/CSSList/KeyFrame.php', + 'Sabberworm\\CSS\\Comment\\Comment' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Comment/Comment.php', + 'Sabberworm\\CSS\\Comment\\Commentable' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Comment/Commentable.php', + 'Sabberworm\\CSS\\OutputFormat' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/OutputFormat.php', + 'Sabberworm\\CSS\\Parser' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Parser.php', + 'Sabberworm\\CSS\\Parsing\\OutputException' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Parsing/OutputException.php', + 'Sabberworm\\CSS\\Parsing\\ParserState' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Parsing/ParserState.php', + 'Sabberworm\\CSS\\Parsing\\SourceException' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Parsing/SourceException.php', + 'Sabberworm\\CSS\\Parsing\\UnexpectedTokenException' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Parsing/UnexpectedTokenException.php', + 'Sabberworm\\CSS\\Property\\AtRule' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Property/AtRule.php', + 'Sabberworm\\CSS\\Property\\CSSNamespace' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Property/CSSNamespace.php', + 'Sabberworm\\CSS\\Property\\Charset' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Property/Charset.php', + 'Sabberworm\\CSS\\Property\\Import' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Property/Import.php', + 'Sabberworm\\CSS\\Property\\Selector' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Property/Selector.php', + 'Sabberworm\\CSS\\Renderable' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Renderable.php', + 'Sabberworm\\CSS\\RuleSet\\AtRuleSet' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/RuleSet/AtRuleSet.php', + 'Sabberworm\\CSS\\RuleSet\\DeclarationBlock' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/RuleSet/DeclarationBlock.php', + 'Sabberworm\\CSS\\RuleSet\\RuleSet' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/RuleSet/RuleSet.php', + 'Sabberworm\\CSS\\Rule\\Rule' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Rule/Rule.php', + 'Sabberworm\\CSS\\Settings' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Settings.php', + 'Sabberworm\\CSS\\Value\\CSSFunction' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/CSSFunction.php', + 'Sabberworm\\CSS\\Value\\CSSString' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/CSSString.php', + 'Sabberworm\\CSS\\Value\\CalcFunction' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/CalcFunction.php', + 'Sabberworm\\CSS\\Value\\CalcRuleValueList' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/CalcRuleValueList.php', + 'Sabberworm\\CSS\\Value\\Color' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/Color.php', + 'Sabberworm\\CSS\\Value\\LineName' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/LineName.php', + 'Sabberworm\\CSS\\Value\\PrimitiveValue' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/PrimitiveValue.php', + 'Sabberworm\\CSS\\Value\\RuleValueList' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/RuleValueList.php', + 'Sabberworm\\CSS\\Value\\Size' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/Size.php', + 'Sabberworm\\CSS\\Value\\URL' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/URL.php', + 'Sabberworm\\CSS\\Value\\Value' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/Value.php', + 'Sabberworm\\CSS\\Value\\ValueList' => $vendorDir . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/ValueList.php', 'ScssPhp\\ScssPhp\\Base\\Range' => $vendorDir . '/scssphp/scssphp/src/Base/Range.php', 'ScssPhp\\ScssPhp\\Block' => $vendorDir . '/scssphp/scssphp/src/Block.php', 'ScssPhp\\ScssPhp\\Cache' => $vendorDir . '/scssphp/scssphp/src/Cache.php', diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_namespaces.php b/wcfsetup/install/files/lib/system/api/composer/autoload_namespaces.php index 67a9a9a041..04a393e300 100644 --- a/wcfsetup/install/files/lib/system/api/composer/autoload_namespaces.php +++ b/wcfsetup/install/files/lib/system/api/composer/autoload_namespaces.php @@ -6,6 +6,7 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = $vendorDir; return array( + 'Sabberworm\\CSS' => array($vendorDir . '/sabberworm/php-css-parser/lib'), 'Parsedown' => array($vendorDir . '/erusev/parsedown'), 'Net' => array($vendorDir . '/pear/net_idna2'), 'HTMLPurifier' => array($vendorDir . '/ezyang/htmlpurifier/library'), diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_static.php b/wcfsetup/install/files/lib/system/api/composer/autoload_static.php index 97cd82bdb6..d4e9d77cb3 100644 --- a/wcfsetup/install/files/lib/system/api/composer/autoload_static.php +++ b/wcfsetup/install/files/lib/system/api/composer/autoload_static.php @@ -157,6 +157,13 @@ class ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d ); public static $prefixesPsr0 = array ( + 'S' => + array ( + 'Sabberworm\\CSS' => + array ( + 0 => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib', + ), + ), 'P' => array ( 'Parsedown' => @@ -640,7 +647,10 @@ class ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d 'ParagonIE\\ConstantTime\\Hex' => __DIR__ . '/..' . '/paragonie/constant_time_encoding/src/Hex.php', 'ParagonIE\\ConstantTime\\RFC4648' => __DIR__ . '/..' . '/paragonie/constant_time_encoding/src/RFC4648.php', 'Parsedown' => __DIR__ . '/..' . '/erusev/parsedown/Parsedown.php', + 'Pelago\\Emogrifier\\Caching\\SimpleStringCache' => __DIR__ . '/..' . '/pelago/emogrifier/src/Caching/SimpleStringCache.php', 'Pelago\\Emogrifier\\CssInliner' => __DIR__ . '/..' . '/pelago/emogrifier/src/CssInliner.php', + 'Pelago\\Emogrifier\\Css\\CssDocument' => __DIR__ . '/..' . '/pelago/emogrifier/src/Css/CssDocument.php', + 'Pelago\\Emogrifier\\Css\\StyleRule' => __DIR__ . '/..' . '/pelago/emogrifier/src/Css/StyleRule.php', 'Pelago\\Emogrifier\\HtmlProcessor\\AbstractHtmlProcessor' => __DIR__ . '/..' . '/pelago/emogrifier/src/HtmlProcessor/AbstractHtmlProcessor.php', 'Pelago\\Emogrifier\\HtmlProcessor\\CssToAttributeConverter' => __DIR__ . '/..' . '/pelago/emogrifier/src/HtmlProcessor/CssToAttributeConverter.php', 'Pelago\\Emogrifier\\HtmlProcessor\\HtmlNormalizer' => __DIR__ . '/..' . '/pelago/emogrifier/src/HtmlProcessor/HtmlNormalizer.php', @@ -665,6 +675,42 @@ class ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d 'Psr\\Http\\Message\\UriFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/UriFactoryInterface.php', 'Psr\\Http\\Message\\UriInterface' => __DIR__ . '/..' . '/psr/http-message/src/UriInterface.php', 'Psr\\Http\\Server\\RequestHandlerInterface' => __DIR__ . '/..' . '/psr/http-server-handler/src/RequestHandlerInterface.php', + 'Sabberworm\\CSS\\CSSList\\AtRuleBlockList' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/CSSList/AtRuleBlockList.php', + 'Sabberworm\\CSS\\CSSList\\CSSBlockList' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/CSSList/CSSBlockList.php', + 'Sabberworm\\CSS\\CSSList\\CSSList' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/CSSList/CSSList.php', + 'Sabberworm\\CSS\\CSSList\\Document' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/CSSList/Document.php', + 'Sabberworm\\CSS\\CSSList\\KeyFrame' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/CSSList/KeyFrame.php', + 'Sabberworm\\CSS\\Comment\\Comment' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Comment/Comment.php', + 'Sabberworm\\CSS\\Comment\\Commentable' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Comment/Commentable.php', + 'Sabberworm\\CSS\\OutputFormat' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/OutputFormat.php', + 'Sabberworm\\CSS\\Parser' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Parser.php', + 'Sabberworm\\CSS\\Parsing\\OutputException' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Parsing/OutputException.php', + 'Sabberworm\\CSS\\Parsing\\ParserState' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Parsing/ParserState.php', + 'Sabberworm\\CSS\\Parsing\\SourceException' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Parsing/SourceException.php', + 'Sabberworm\\CSS\\Parsing\\UnexpectedTokenException' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Parsing/UnexpectedTokenException.php', + 'Sabberworm\\CSS\\Property\\AtRule' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Property/AtRule.php', + 'Sabberworm\\CSS\\Property\\CSSNamespace' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Property/CSSNamespace.php', + 'Sabberworm\\CSS\\Property\\Charset' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Property/Charset.php', + 'Sabberworm\\CSS\\Property\\Import' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Property/Import.php', + 'Sabberworm\\CSS\\Property\\Selector' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Property/Selector.php', + 'Sabberworm\\CSS\\Renderable' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Renderable.php', + 'Sabberworm\\CSS\\RuleSet\\AtRuleSet' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/RuleSet/AtRuleSet.php', + 'Sabberworm\\CSS\\RuleSet\\DeclarationBlock' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/RuleSet/DeclarationBlock.php', + 'Sabberworm\\CSS\\RuleSet\\RuleSet' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/RuleSet/RuleSet.php', + 'Sabberworm\\CSS\\Rule\\Rule' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Rule/Rule.php', + 'Sabberworm\\CSS\\Settings' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Settings.php', + 'Sabberworm\\CSS\\Value\\CSSFunction' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/CSSFunction.php', + 'Sabberworm\\CSS\\Value\\CSSString' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/CSSString.php', + 'Sabberworm\\CSS\\Value\\CalcFunction' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/CalcFunction.php', + 'Sabberworm\\CSS\\Value\\CalcRuleValueList' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/CalcRuleValueList.php', + 'Sabberworm\\CSS\\Value\\Color' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/Color.php', + 'Sabberworm\\CSS\\Value\\LineName' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/LineName.php', + 'Sabberworm\\CSS\\Value\\PrimitiveValue' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/PrimitiveValue.php', + 'Sabberworm\\CSS\\Value\\RuleValueList' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/RuleValueList.php', + 'Sabberworm\\CSS\\Value\\Size' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/Size.php', + 'Sabberworm\\CSS\\Value\\URL' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/URL.php', + 'Sabberworm\\CSS\\Value\\Value' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/Value.php', + 'Sabberworm\\CSS\\Value\\ValueList' => __DIR__ . '/..' . '/sabberworm/php-css-parser/lib/Sabberworm/CSS/Value/ValueList.php', 'ScssPhp\\ScssPhp\\Base\\Range' => __DIR__ . '/..' . '/scssphp/scssphp/src/Base/Range.php', 'ScssPhp\\ScssPhp\\Block' => __DIR__ . '/..' . '/scssphp/scssphp/src/Block.php', 'ScssPhp\\ScssPhp\\Cache' => __DIR__ . '/..' . '/scssphp/scssphp/src/Cache.php', diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.json b/wcfsetup/install/files/lib/system/api/composer/installed.json index df4de03ed4..2bd5b0709a 100644 --- a/wcfsetup/install/files/lib/system/api/composer/installed.json +++ b/wcfsetup/install/files/lib/system/api/composer/installed.json @@ -949,36 +949,36 @@ }, { "name": "pelago/emogrifier", - "version": "v5.0.1", - "version_normalized": "5.0.1.0", + "version": "v6.0.0", + "version_normalized": "6.0.0.0", "source": { "type": "git", "url": "https://github.com/MyIntervals/emogrifier.git", - "reference": "37595a9bb62c3c25969bdd9e8d7dd24c3ac62bc9" + "reference": "aa72d5407efac118f3896bcb995a2cba793df0ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/37595a9bb62c3c25969bdd9e8d7dd24c3ac62bc9", - "reference": "37595a9bb62c3c25969bdd9e8d7dd24c3ac62bc9", + "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/aa72d5407efac118f3896bcb995a2cba793df0ae", + "reference": "aa72d5407efac118f3896bcb995a2cba793df0ae", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", - "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" + "php": "~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0", + "sabberworm/php-css-parser": "^8.3.1", + "symfony/css-selector": "^3.4.32 || ^4.4 || ^5.3 || ^6.0" }, "require-dev": { - "php-parallel-lint/php-parallel-lint": "^1.2.0", - "rawr/cross-data-providers": "^2.3.0", - "slevomat/coding-standard": "^6.4.1", - "squizlabs/php_codesniffer": "^3.5.8" + "php-parallel-lint/php-parallel-lint": "^1.3.0", + "phpunit/phpunit": "^8.5.16", + "rawr/cross-data-providers": "^2.3.0" }, - "time": "2021-04-06T08:18:22+00:00", + "time": "2021-09-16T16:22:04+00:00", "type": "library", "extra": { "branch-alias": { - "dev-main": "6.0.x-dev" + "dev-main": "7.0.x-dev" } }, "installation-source": "dist", @@ -1294,6 +1294,58 @@ "description": "A polyfill for getallheaders.", "install-path": "../ralouphie/getallheaders" }, + { + "name": "sabberworm/php-css-parser", + "version": "8.3.1", + "version_normalized": "8.3.1.0", + "source": { + "type": "git", + "url": "https://github.com/sabberworm/PHP-CSS-Parser.git", + "reference": "d217848e1396ef962fb1997cf3e2421acba7f796" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/d217848e1396ef962fb1997cf3e2421acba7f796", + "reference": "d217848e1396ef962fb1997cf3e2421acba7f796", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "require-dev": { + "codacy/coverage": "^1.4", + "phpunit/phpunit": "~4.8" + }, + "time": "2020-06-01T09:10:00+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "Sabberworm\\CSS": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Raphael Schweikert" + } + ], + "description": "Parser for CSS Files written in PHP", + "homepage": "http://www.sabberworm.com/blog/2010/6/10/php-css-parser", + "keywords": [ + "css", + "parser", + "stylesheet" + ], + "support": { + "issues": "https://github.com/sabberworm/PHP-CSS-Parser/issues", + "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/8.3.1" + }, + "install-path": "../sabberworm/php-css-parser" + }, { "name": "scssphp/scssphp", "version": "v1.8.1", @@ -1824,6 +1876,6 @@ "install-path": "../true/punycode" } ], - "dev": true, + "dev": false, "dev-package-names": [] } diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.php b/wcfsetup/install/files/lib/system/api/composer/installed.php index 1ea5183b56..946e641522 100644 --- a/wcfsetup/install/files/lib/system/api/composer/installed.php +++ b/wcfsetup/install/files/lib/system/api/composer/installed.php @@ -7,7 +7,7 @@ 'aliases' => array(), 'reference' => NULL, 'name' => '__root__', - 'dev' => true, + 'dev' => false, ), 'versions' => array( '__root__' => array( @@ -146,12 +146,12 @@ 'dev_requirement' => false, ), 'pelago/emogrifier' => array( - 'pretty_version' => 'v5.0.1', - 'version' => '5.0.1.0', + 'pretty_version' => 'v6.0.0', + 'version' => '6.0.0.0', 'type' => 'library', 'install_path' => __DIR__ . '/../pelago/emogrifier', 'aliases' => array(), - 'reference' => '37595a9bb62c3c25969bdd9e8d7dd24c3ac62bc9', + 'reference' => 'aa72d5407efac118f3896bcb995a2cba793df0ae', 'dev_requirement' => false, ), 'psr/http-client' => array( @@ -217,6 +217,15 @@ 'reference' => '120b605dfeb996808c31b6477290a714d356e822', 'dev_requirement' => false, ), + 'sabberworm/php-css-parser' => array( + 'pretty_version' => '8.3.1', + 'version' => '8.3.1.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../sabberworm/php-css-parser', + 'aliases' => array(), + 'reference' => 'd217848e1396ef962fb1997cf3e2421acba7f796', + 'dev_requirement' => false, + ), 'scssphp/scssphp' => array( 'pretty_version' => 'v1.8.1', 'version' => '1.8.1.0', diff --git a/wcfsetup/install/files/lib/system/api/pelago/emogrifier/CHANGELOG.md b/wcfsetup/install/files/lib/system/api/pelago/emogrifier/CHANGELOG.md index 6266a95e90..8e44e6e90c 100644 --- a/wcfsetup/install/files/lib/system/api/pelago/emogrifier/CHANGELOG.md +++ b/wcfsetup/install/files/lib/system/api/pelago/emogrifier/CHANGELOG.md @@ -9,422 +9,256 @@ This project adheres to [Semantic Versioning](https://semver.org/). ### Changed +### Deprecated +- Support for PHP 7.3 will be removed in Emogrifier 8.0. + +### Removed + +### Fixed + +## 6.0.0 + +### Added +- Test with Symfony 6-dev (#1109) +- Add support for PHP 8.1 (#1103) +- Add a dedicated class for caching (#1097) +- Allow installation together with Symfony 6 (#1065) +- Support more file types in the `.editorconfig` (#1035) +- Set `align` attribute of `` elements with `CssToAttributeConverter` (#1008) + +### Changed +- Use `sabberworm/php-css-parser` to parse the CSS (#1015) +- Also check the unit test code with Psalm (#1003) + ### Deprecated - Support for PHP 7.2 will be removed in Emogrifier 7.0. ### Removed +- Remove a redundant CSS data cache (#1018) +- Drop support for Symfony 5.1 and 5.2 (#972, #1104) +- Drop support for PHP 7.1 (#967) ### Fixed +- Allow `@import` after ignored invalid `@charset` (@1081) +- Allow line feeds within `` tag (#987) ## 5.0.1 ### Changed -- Switch the default branch from `master` to `main` - ([#951](https://github.com/MyIntervals/emogrifier/pull/951)) +- Switch the default branch from `master` to `main` (#951) ### Fixed -- Ignore `http-equiv` `Content-Type` in `` - ([#961](https://github.com/MyIntervals/emogrifier/pull/961)) -- Allow "Content-Type" in content - ([#959](https://github.com/MyIntervals/emogrifier/pull/959)) +- Ignore `http-equiv` `Content-Type` in `` (#961) +- Allow "Content-Type" in content (#959) ## 5.0.0 ### Added -- Add an `.editorconfig` file - ([#940](https://github.com/MyIntervals/emogrifier/pull/940)) -- Support PHP 8.0 - ([#926](https://github.com/MyIntervals/emogrifier/pull/926)) -- Run the CI build once a week - ([#933](https://github.com/MyIntervals/emogrifier/pull/933)) -- Move more development tools to PHIVE - ([#894](https://github.com/MyIntervals/emogrifier/pull/894), - [#907](https://github.com/MyIntervals/emogrifier/pull/907)) +- Add an `.editorconfig` file (#940) +- Support PHP 8.0 (#926) +- Run the CI build once a week (#933) +- Move more development tools to PHIVE (#894, #907) ### Changed -- Automatically add a backslash for global functions - ([#909](https://github.com/MyIntervals/emogrifier/pull/909)) -- Update the development tools - ([#898](https://github.com/MyIntervals/emogrifier/pull/898), - [#895](https://github.com/MyIntervals/emogrifier/pull/895)) -- Upgrade to PHPUnit 7.5 - ([#888](https://github.com/MyIntervals/emogrifier/pull/888)) -- Enforce constant visibility - ([#892](https://github.com/MyIntervals/emogrifier/pull/892)) -- Rename the PHPCS configuration file - ([#891](https://github.com/MyIntervals/emogrifier/pull/891), - [#896](https://github.com/MyIntervals/emogrifier/pull/896)) -- Make use of PHP 7.1 language features - ([#883](https://github.com/MyIntervals/emogrifier/pull/883)) +- Automatically add a backslash for global functions (#909) +- Update the development tools (#898, #895) +- Upgrade to PHPUnit 7.5 (#888) +- Enforce constant visibility (#892) +- Rename the PHPCS configuration file (#891, #896) +- Make use of PHP 7.1 language features (#883) ### Deprecated - Support for PHP 7.1 will be removed in Emogrifier 6.0. ### Removed -- Drop support for Symfony 4.3 and 5.0 - ([#936](https://github.com/MyIntervals/emogrifier/pull/936)) -- Stop checking `tests/` with Psalm - ([#885](https://github.com/MyIntervals/emogrifier/pull/885)) -- Drop support for PHP 7.0 - ([#880](https://github.com/MyIntervals/emogrifier/pull/880)) +- Drop support for Symfony 4.3 and 5.0 (#936) +- Stop checking `tests/` with Psalm (#885) +- Drop support for PHP 7.0 (#880) ### Fixed -- Fix a nonsensical code example in the README - ([#920](https://github.com/MyIntervals/emogrifier/issues/920), - [#935](https://github.com/MyIntervals/emogrifier/pull/935)) +- Fix a nonsensical code example in the README (#920, #935) - Remove `!important` from `style` attributes also when uppercase, mixed case or - having whitespace after `!` - ([#911](https://github.com/MyIntervals/emogrifier/pull/911)) -- Copy rules using `:...of-type` without a type to the `