MAGETWO-64085: Static versioning and styles minification break email fonts styles #8241

- fix code

Author: cpartica

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

@@ -148,10 +148,16 @@ class Filter extends \Magento\Framework\Filter\Template
      */
     protected $urlModel;
 
+    /**
+     * @var \Pelago\Emogrifier
+     * @deprecated
+     */
+    protected $emogrifier;
+
     /**
      * @var \Magento\Framework\Css\PreProcessor\Adapter\CssInliner
      */
-    protected $cssInliner;
+    private $cssInliner;
 
     /**
      * @var \Magento\Email\Model\Source\Variables
@@ -180,9 +186,10 @@ 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 \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner
+     * @param \Pelago\Emogrifier $emogrifier
      * @param \Magento\Email\Model\Source\Variables $configVariables
      * @param array $variables
+     * @param \Magento\Framework\Css\PreProcessor\Adapter\CssInliner|null $cssInliner
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -198,9 +205,10 @@ public function __construct(
         \Magento\Framework\View\LayoutFactory $layoutFactory,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\UrlInterface $urlModel,
-        \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner,
+        \Pelago\Emogrifier $emogrifier,
         \Magento\Email\Model\Source\Variables $configVariables,
-        $variables = []
+        $variables = [],
+        \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner = null
     ) {
         $this->_escaper = $escaper;
         $this->_assetRepo = $assetRepo;
@@ -213,7 +221,9 @@ public function __construct(
         $this->_layoutFactory = $layoutFactory;
         $this->_appState = $appState;
         $this->urlModel = $urlModel;
-        $this->cssInliner = $cssInliner;
+        $this->emogrifier = $emogrifier;
+        $this->cssInliner = $cssInliner ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Css\PreProcessor\Adapter\CssInliner::class);
         $this->configVariables = $configVariables;
         parent::__construct($string, $variables);
     }

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 \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner
+     * @param \Pelago\Emogrifier $emogrifier
      * @param \Magento\Email\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,
-        \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner,
+        \Pelago\Emogrifier $emogrifier,
         \Magento\Email\Model\Source\Variables $configVariables,
         \Magento\Widget\Model\ResourceModel\Widget $widgetResource,
         \Magento\Widget\Model\Widget $widget
@@ -70,7 +70,7 @@ public function __construct(
             $layoutFactory,
             $appState,
             $urlModel,
-            $cssInliner,
+            $emogrifier,
             $configVariables
         );
     }

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

@@ -19,14 +19,14 @@ class CssInliner
 
     public function __construct()
     {
-        $this->emogrifier = new Emogrifier;
+        $this->emogrifier = new Emogrifier();
     }
 
     /**
-     * Sets the HTML to emogrify.
-     *
-     * @param string $html the HTML to emogrify, must be UTF-8-encoded
+     * 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)
@@ -35,10 +35,10 @@ public function setHtml($html)
     }
 
     /**
-     * Sets the CSS to merge with the HTML.
-     *
-     * @param string $css the CSS to merge, must be UTF-8-encoded
+     * 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)
@@ -63,13 +63,10 @@ public function disableStyleBlocksParsing()
     }
 
     /**
-     * Applies $this->css to $this->html and returns the HTML with the CSS
-     * applied.
-     *
-     * This method places the CSS inline.
+     * Processes the html by placing the css inline.
+     * You must set first the css by using setCss and html by using setHtml.
      *
      * @return string
-     *
      * @throws \BadMethodCallException
      */
     public function process()