Fixes colinmollenhour#129 - Replaces git submodules with Composer dep…

…endencies
kirkmadera · Oct 10, 2017 · 032e4d1 · 032e4d1
1 parent 474deeb
commit 032e4d1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/README.md b/README.md
@@ -32,10 +32,14 @@ Be aware that if the `<max_lifetime>` setting is below your Cookie Lifetime, the
 
 ## Installation ##
 
-1. Install module using [modman](https://github.com/colinmollenhour/modman):
-
-        modman clone https://github.com/colinmollenhour/Cm_RedisSession
-
+1. Install module using [composer](https://getcomposer.org/) with the
+   [magento-composer-installer](https://github.com/Cotya/magento-composer-installer) plugin:
+
+        composer require magento-hackathon/magento-composer-installer; # If not already installed
+        composer require colinmollenhour/magento-redis-session;
+2. Remove lib/Credis from your Magento installation. This module includes a newer version of the
+   Credis library and, due to the Magento 1 autoloader works, the version that ships with core
+   Magento must be removed.
 2. Configure via app/etc/local.xml adding a `global/redis_session` section with the appropriate configuration if needed.
    See the "Configuration Example" below.
 3. Refresh the config cache to allow the module to be installed by Magento.

diff --git a/code/lib b/code/lib
diff --git a/composer.json b/composer.json
@@ -10,7 +10,8 @@
         }
     ],
     "require": {
-      "colinmollenhour/php-redis-session-abstract": "~1.3.5"
+      "colinmollenhour/php-redis-session-abstract": "~1.3.5",
+      "colinmollenhour/credis": "^1.9.1"
     },
     "suggest":{
         "magento-hackathon/magento-composer-installer":"Makes it possible to manage this package as a dependency"

diff --git a/credis b/credis
diff --git a/modman b/modman
@@ -1,4 +1,3 @@
 # Cm_RedisSession
 code                                            app/code/local/Cm/RedisSession
 Cm_RedisSession.xml                             app/etc/modules/Cm_RedisSession_Local.xml
-credis                                          app/code/local/Credis