MAGETWO-80209: [2.2.x] - Static versioning and styles minification break email fonts styles #8241 #10638

iivashchenko · iivashchenko · commit ae0af893a3e3 · 2017-10-06T16:50:08.000+03:00
diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
@@ -369,7 +369,7 @@ public function applyInlineCssDataProvider()
                 '<html><head><style type="text/css">div { color: #111; }</style></head><p></p></html>',
                 'p { color: #000 }',
                 [
-                    '<head><style type="text/css">div { color: #111; }</style></head>',
+                    '<style type="text/css">div { color: #111; }</style>',
                     '<p style="color: #000;"></p>',
                 ],
             ],
diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
         "composer/composer": "1.4.1",
         "monolog/monolog": "^1.17",
         "oyejorge/less.php": "~1.7.0",
-        "pelago/emogrifier": "0.1.1",
+        "pelago/emogrifier": "1.2.0",
         "tubalmartin/cssmin": "4.1.0",
         "magento/magento-composer-installer": ">=0.1.11",
         "braintree/braintree_php": "3.22.0",
diff --git a/composer.lock b/composer.lock
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
@@ -76,12 +76,10 @@ public function testGetFilesEmogrifier($htmlFilePath, $cssFilePath, $cssExpected
         $emogrifier->setHtml($html);
         $result = $emogrifier->emogrify();
         /**
-         * Tests a bug in the library where there's no spaces to CSS string before passing to Emogrifier
-         * to fix known parsing issue with library.
-         * This test should will fail when this bug is fixed in the library and we should fix the adapter.
-         * https://github.com/jjriv/emogrifier/issues/370
+         * This test was implemented for the issue which existed in the older version of Emogrifier.
+         * Test was updated, as the library got updated as well.
          */
-        $this->assertNotContains($cssExpected, $result);
+        $this->assertContains($cssExpected, $result);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
@@ -41,13 +41,7 @@ public function setHtml($html)
      */
     public function setCss($css)
     {
-        /**
-         * Adds space to CSS string before passing to Emogrifier to fix known parsing issue with library.
-         * https://github.com/jjriv/emogrifier/issues/370
-         */
-        $cssWithAddedSpaces = preg_replace('#([\{\}>])#i', ' $1 ', $css);
-
-        $this->emogrifier->setCss($cssWithAddedSpaces);
+        $this->emogrifier->setCss($css);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ public function applyInlineCssDataProvider()`
`369`	`369`	`'<html><head><style type="text/css">div { color: #111; }</style></head><p></p></html>',`
`370`	`370`	`'p { color: #000 }',`
`371`	`371`	`[`
`372`		`- '<head><style type="text/css">div { color: #111; }</style></head>',`
	`372`	`+ '<style type="text/css">div { color: #111; }</style>',`
`373`	`373`	`'<p style="color: #000;"></p>',`
`374`	`374`	`],`
`375`	`375`	`],`
Original file line number	Diff line number	Diff line change
`@@ -41,13 +41,7 @@ public function setHtml($html)`
`41`	`41`	`*/`
`42`	`42`	`public function setCss($css)`
`43`	`43`	`{`
`44`		`- /**`
`45`		`- * Adds space to CSS string before passing to Emogrifier to fix known parsing issue with library.`
`46`		`- * https://github.com/jjriv/emogrifier/issues/370`
`47`		`- */`
`48`		`- $cssWithAddedSpaces = preg_replace('#([\{\}>])#i', ' $1 ', $css);`
`49`		`-`
`50`		`- $this->emogrifier->setCss($cssWithAddedSpaces);`
	`44`	`+ $this->emogrifier->setCss($css);`
`51`	`45`	`}`
`52`	`46`
`53`	`47`	`/**`