Skip to content

Commit 6066dd9

Browse files
authored
Fixes to 3.0 version (#188)
* Remove submodules fixes: add credis to composer.json, remove credis from modman, remove require_once * Move to community codepool * config.xml version bump * Add note about composer install only for 3.0.0 release
1 parent bc89343 commit 6066dd9

File tree

10 files changed

+7
-15
lines changed

10 files changed

+7
-15
lines changed

.gitmodules

Whitespace-only changes.

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ Be aware that if the `<max_lifetime>` setting is below your Cookie Lifetime, the
3434

3535
This extension can be installed with either Composer or modman.
3636

37+
**Important:** The 3.0.0 release is packaged exclusively as a composer module and cannot be installed with modman. If you do not use composer stick with the 2.x release.
38+
3739
The Magento Compiler feature is currently not supported.
3840

3941
#### Modman Installation ####
File renamed without changes.

app/code/local/Cm/RedisSession/Model/Session/Config.php renamed to app/code/community/Cm/RedisSession/Model/Session/Config.php

File renamed without changes.

app/code/local/Cm/RedisSession/Model/Session/Handler.php renamed to app/code/community/Cm/RedisSession/Model/Session/Handler.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,6 @@
2929
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030
*/
3131

32-
// Modman install will have files in module directory (submodule) and composer install
33-
// will have files in vendor directory with autoloader registered
34-
if (is_dir(__DIR__.'/../../lib/src/Cm/RedisSession')) {
35-
require_once __DIR__.'/../../lib/src/Cm/RedisSession/Handler/ConfigInterface.php';
36-
require_once __DIR__.'/../../lib/src/Cm/RedisSession/Handler/LoggerInterface.php';
37-
require_once __DIR__.'/../../lib/src/Cm/RedisSession/Handler.php';
38-
require_once __DIR__.'/../../lib/src/Cm/RedisSession/ConnectionFailedException.php';
39-
require_once __DIR__.'/../../lib/src/Cm/RedisSession/ConcurrentConnectionsExceededException.php';
40-
}
41-
4232
class Cm_RedisSession_Model_Session_Handler extends \Cm\RedisSession\Handler
4333
{
4434
public function __construct()

app/code/local/Cm/RedisSession/Model/Session/Logger.php renamed to app/code/community/Cm/RedisSession/Model/Session/Logger.php

File renamed without changes.

app/code/local/Cm/RedisSession/etc/config.xml renamed to app/code/community/Cm/RedisSession/etc/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3333
<config>
3434
<modules>
3535
<Cm_RedisSession>
36-
<version>0.2</version>
36+
<version>3.0</version>
3737
</Cm_RedisSession>
3838
</modules>
3939
<global>

app/etc/modules/Cm_RedisSession.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3434
<modules>
3535
<Cm_RedisSession>
3636
<active>true</active>
37-
<codePool>local</codePool>
37+
<codePool>community</codePool>
3838
</Cm_RedisSession>
3939
</modules>
4040
</config>

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
}
1111
],
1212
"require": {
13+
"colinmollenhour/credis": "*",
1314
"colinmollenhour/php-redis-session-abstract": "~1.4.0"
1415
},
1516
"suggest":{

modman

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
# Cm_RedisSession
2-
app/code/local/Cm/RedisSession app/code/local/Cm/RedisSession
3-
app/etc/modules/Cm_RedisSession.xml app/etc/modules/Cm_RedisSession_Local.xml
4-
app/code/local/Credis app/code/local/Credis
2+
app/code/community/Cm/RedisSession app/code/community/Cm/RedisSession
3+
app/etc/modules/Cm_RedisSession.xml app/etc/modules/Cm_RedisSession.xml

0 commit comments

Comments
 (0)