Move phpseclib, mcrypt_compat, net_idna2, Cm_RedisSession and Cm_Cache_Backend_Redis to composer

app/Mage.php

@@ -53,8 +53,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) {

composer.json

@@ -19,7 +19,12 @@
     "ext-simplexml": "*",
     "ext-soap": "*",
     "ext-zlib": "*",
-    "magento-hackathon/magento-composer-installer": "^3.1 || ^2.1 || ^4.0"
+    "magento-hackathon/magento-composer-installer": "^3.1 || ^2.1 || ^4.0",
+    "phpseclib/phpseclib": "^3.0.14",
+    "phpseclib/mcrypt_compat": "^2.0.3",
+    "pear/net_idna2": "dev-master",
+    "colinmollenhour/cache-backend-redis": "^1.14",
+    "colinmollenhour/magento-redis-session": "^3.0"
   },
   "require-dev": {
     "macopedia/phpstan-magento1": "^1.0.4",
@@ -61,11 +66,12 @@
     "branch-alias": {
       "dev-main": "1.9.4.x-dev"
     },
-    "magento-root-dir": "root"
+    "magento-root-dir": "."
   },
   "config": {
     "allow-plugins": {
-      "magento-hackathon/magento-composer-installer": true
+      "magento-hackathon/magento-composer-installer": true,
+      "cweagans/composer-patches": true
     },
     "sort-packages": true
   }