Skip to content

Commit bdaf613

Browse files
committed
Squash all changes from OpenMage#2138
1 parent cf82b8f commit bdaf613

40 files changed

+9
-41773
lines changed

app/Mage.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@
5151

5252
Varien_Autoload::register();
5353

54-
include_once "phpseclib/bootstrap.php";
55-
include_once "mcryptcompat/mcrypt.php";
56-
5754
/* Support additional includes, such as composer's vendor/autoload.php files */
5855
foreach (glob(BP . DS . 'app' . DS . 'etc' . DS . 'includes' . DS . '*.php') as $path) {
5956
include_once $path;

app/code/community/Cm/RedisSession/Model/Session.php

Lines changed: 0 additions & 695 deletions
This file was deleted.

app/code/community/Cm/RedisSession/etc/config.xml

Lines changed: 0 additions & 46 deletions
This file was deleted.

app/etc/modules/Cm_RedisSession.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

composer.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,12 @@
1919
"ext-soap": "*",
2020
"ext-iconv": "*",
2121
"ext-zlib": "*",
22-
"magento-hackathon/magento-composer-installer": "^3.1 || ^2.1 || ^4.0"
22+
"magento-hackathon/magento-composer-installer": "^3.1 || ^2.1 || ^4.0",
23+
"phpseclib/phpseclib": "^3.0.14",
24+
"phpseclib/mcrypt_compat": "^2.0.3",
25+
"pear/net_idna2": "dev-master",
26+
"colinmollenhour/cache-backend-redis": "^1.14",
27+
"colinmollenhour/magento-redis-session": "^3.0"
2328
},
2429
"require-dev": {
2530
"macopedia/phpstan-magento1": "^1.0.4",
@@ -58,11 +63,12 @@
5863
"branch-alias": {
5964
"dev-main": "1.9.4.x-dev"
6065
},
61-
"magento-root-dir": "root"
66+
"magento-root-dir": "."
6267
},
6368
"config": {
6469
"allow-plugins": {
65-
"magento-hackathon/magento-composer-installer": true
70+
"magento-hackathon/magento-composer-installer": true,
71+
"cweagans/composer-patches": true
6672
}
6773
}
6874
}

0 commit comments

Comments
 (0)