Moved phpseclib, mcrypt_compat, Cm_RedisSession, Cm_Cache_Backend_Red…

…is and Pelago_Emogrifier to composer (#2411)
OpenMage · Dec 3, 2022 · a3a54fd · sreichel · Dec 6, 2022 · fballiano
1 parent 8ec52e6
commit a3a54fd
Show file tree

Hide file tree

Showing 40 changed files with 764 additions and 39,270 deletions.
diff --git a/app/Mage.php b/app/Mage.php
@@ -48,8 +48,13 @@
 
 Varien_Autoload::register();
 
-include_once "phpseclib/bootstrap.php";
-include_once "mcryptcompat/mcrypt.php";
+/** AUTOLOADER PATCH **/
+if (file_exists($autoloaderPath = BP . DS . 'vendor/autoload.php') ||
+    file_exists($autoloaderPath = BP . DS . '../vendor/autoload.php')
+) {
+    require $autoloaderPath;
+}
+/** AUTOLOADER PATCH **/
 
 /* Support additional includes, such as composer's vendor/autoload.php files */
 foreach (glob(BP . DS . 'app' . DS . 'etc' . DS . 'includes' . DS . '*.php') as $path) {

diff --git a/app/code/community/Cm/RedisSession/Model/Session.php b/app/code/community/Cm/RedisSession/Model/Session.php
diff --git a/app/code/community/Cm/RedisSession/etc/config.xml b/app/code/community/Cm/RedisSession/etc/config.xml
diff --git a/app/code/core/Mage/Core/Model/Email/Template/Abstract.php b/app/code/core/Mage/Core/Model/Email/Template/Abstract.php
@@ -197,13 +197,10 @@ protected function _applyInlineCss($html)
             // Only run Emogrify if HTML exists
             if (strlen($html) && $inlineCssFile) {
                 $cssToInline = $this->_getCssFileContent($inlineCssFile);
-                $emogrifier = new Pelago_Emogrifier();
-                $emogrifier->setHtml($html);
-                $emogrifier->setCss($cssToInline);
-                // Don't parse inline <style> tags, since existing tag is intentionally for no-inline styles
-                $emogrifier->setParseInlineStyleTags(false);
-
-                $processedHtml = $emogrifier->emogrify();
+                $emogrifier = \Pelago\Emogrifier\CssInliner::fromHtml($html)
+                    ->inlineCss($cssToInline)
+                    ->disableInlineStyleAttributesParsing();
+                $processedHtml = $emogrifier->render();
             } else {
                 $processedHtml = $html;
             }

diff --git a/app/etc/modules/Cm_RedisSession.xml b/app/etc/modules/Cm_RedisSession.xml
diff --git a/composer.json b/composer.json
@@ -22,7 +22,12 @@
     "ext-simplexml": "*",
     "ext-soap": "*",
     "ext-zlib": "*",
-    "magento-hackathon/magento-composer-installer": "^3.1 || ^2.1 || ^4.0"
+    "colinmollenhour/cache-backend-redis": "^1.14",
+    "colinmollenhour/magento-redis-session": "^3.0",
+    "magento-hackathon/magento-composer-installer": "^3.1 || ^2.1 || ^4.0",
+    "pelago/emogrifier": "^6.0",
+    "phpseclib/mcrypt_compat": "^2.0.3",
+    "phpseclib/phpseclib": "^3.0.14"
   },
   "require-dev": {
     "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",