Skip to content

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

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
sivaschenko merged 18 commits into from
Jan 29, 2021
Merged

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8baf259
pelago/emogrifier and friendsofphp/php-cs-fixer updated
konarshankar07 Jan 20, 2021
3750a84
Compatibility with Pelago\Emogrifier updates
konarshankar07 Jan 21, 2021
8ec4878
Fixed unit test
konarshankar07 Jan 22, 2021
6e51158
Feedback changes for preserving the existing interface of framework c…
konarshankar07 Jan 23, 2021
e259c61
Feeback changes for changing the optional parameters
konarshankar07 Jan 23, 2021
6ab99af
composer lock file regenerated using 1.10.19 version
konarshankar07 Jan 23, 2021
cd0dad1
friendsofphp/php-cs-fixer upgraded to 2.18.1
konarshankar07 Jan 23, 2021
6f19a4e
Fixed static tests
konarshankar07 Jan 23, 2021
5cdb807
Fixed unit test
konarshankar07 Jan 23, 2021
780d166
Fixed Integration tests
konarshankar07 Jan 25, 2021
6a2ec97
magento/magento2#31342: Updated CssInliner in a backward compatible way
sivaschenko Jan 26, 2021
78c6f55
Merge branch 'php8-develop' of github.com:magento/magento2 into php8-…
sivaschenko Jan 26, 2021
48c61c8
magento/magento2#31342: Added default values for CssInliner properties
sivaschenko Jan 26, 2021
2d621ef
Fixed unit test
konarshankar07 Jan 27, 2021
e992a93
Updates for refactoring
konarshankar07 Jan 28, 2021
7f21ad7
Fixed Merge conflict
konarshankar07 Jan 28, 2021
1668e90
magento/magento2#31342: Handled ContentProcessorException in backward…
sivaschenko Jan 29, 2021
ce09f9f
Updated composer.lock
sivaschenko Jan 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions app/code/Magento/Email/Model/Template/Filter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,6 @@ class Filter extends \Magento\Framework\Filter\Template
*/
protected $urlModel;

/**
* @var \Pelago\Emogrifier
* @deprecated 100.2.0
*/
protected $emogrifier;

/**
* @var \Magento\Framework\Css\PreProcessor\Adapter\CssInliner
*/
Expand Down Expand Up @@ -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 $emogrifier
* @param \Magento\Variable\Model\Source\Variables $configVariables
* @param array $variables
* @param \Magento\Framework\Css\PreProcessor\Adapter\CssInliner|null $cssInliner
Expand All @@ -217,7 +210,6 @@ public function __construct(
\Magento\Framework\View\LayoutFactory $layoutFactory,
\Magento\Framework\App\State $appState,
\Magento\Framework\UrlInterface $urlModel,
\Pelago\Emogrifier $emogrifier,
\Magento\Variable\Model\Source\Variables $configVariables,
$variables = [],
\Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner = null,
Expand All @@ -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()
Expand Down Expand Up @@ -1040,15 +1031,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)->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()
Expand Down
9 changes: 0 additions & 9 deletions app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
use Magento\Store\Model\StoreManagerInterface;
use Magento\Variable\Model\Source\Variables;
use Magento\Variable\Model\VariableFactory;
use Pelago\Emogrifier;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
use Psr\Log\LoggerInterface;
Expand Down Expand Up @@ -114,11 +113,6 @@ class FilterTest extends TestCase
*/
private $configVariables;

/**
* @var Emogrifier
*/
private $emogrifier;

/**
* @var CssInliner
*/
Expand Down Expand Up @@ -195,8 +189,6 @@ protected function setUp(): void
->disableOriginalConstructor()
->getMockForAbstractClass();

$this->emogrifier = $this->objectManager->getObject(Emogrifier::class);

$this->configVariables = $this->getMockBuilder(Variables::class)
->disableOriginalConstructor()
->getMock();
Expand Down Expand Up @@ -257,7 +249,6 @@ protected function getModel($mockedMethods = null)
$this->layoutFactory,
$this->appState,
$this->backendUrlBuilder,
$this->emogrifier,
$this->configVariables,
[],
$this->cssInliner,
Expand Down
4 changes: 1 addition & 3 deletions app/code/Magento/Widget/Model/Template/Filter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -51,7 +51,6 @@ public function __construct(
\Magento\Framework\View\LayoutFactory $layoutFactory,
\Magento\Framework\App\State $appState,
\Magento\Framework\UrlInterface $urlModel,
\Pelago\Emogrifier $emogrifier,
\Magento\Variable\Model\Source\Variables $configVariables,
\Magento\Widget\Model\ResourceModel\Widget $widgetResource,
\Magento\Widget\Model\Widget $widget
Expand All @@ -70,7 +69,6 @@ public function __construct(
$layoutFactory,
$appState,
$urlModel,
$emogrifier,
$configVariables
);
}
Expand Down
12 changes: 6 additions & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*",
Expand All @@ -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",
Expand Down
Loading