Skip to content

Commit

Permalink
Fixes to 3.0 version (#188)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
justinbeaty authored Aug 4, 2022
1 parent bc89343 commit 6066dd9
Show file tree
Hide file tree
Showing 10 changed files with 7 additions and 15 deletions.
Empty file removed .gitmodules
Empty file.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ Be aware that if the `<max_lifetime>` setting is below your Cookie Lifetime, the

This extension can be installed with either Composer or modman.

**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.

The Magento Compiler feature is currently not supported.

#### Modman Installation ####
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,6 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

// Modman install will have files in module directory (submodule) and composer install
// will have files in vendor directory with autoloader registered
if (is_dir(__DIR__.'/../../lib/src/Cm/RedisSession')) {
require_once __DIR__.'/../../lib/src/Cm/RedisSession/Handler/ConfigInterface.php';
require_once __DIR__.'/../../lib/src/Cm/RedisSession/Handler/LoggerInterface.php';
require_once __DIR__.'/../../lib/src/Cm/RedisSession/Handler.php';
require_once __DIR__.'/../../lib/src/Cm/RedisSession/ConnectionFailedException.php';
require_once __DIR__.'/../../lib/src/Cm/RedisSession/ConcurrentConnectionsExceededException.php';
}

class Cm_RedisSession_Model_Session_Handler extends \Cm\RedisSession\Handler
{
public function __construct()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<config>
<modules>
<Cm_RedisSession>
<version>0.2</version>
<version>3.0</version>
</Cm_RedisSession>
</modules>
<global>
Expand Down
2 changes: 1 addition & 1 deletion app/etc/modules/Cm_RedisSession.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<modules>
<Cm_RedisSession>
<active>true</active>
<codePool>local</codePool>
<codePool>community</codePool>
</Cm_RedisSession>
</modules>
</config>
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
}
],
"require": {
"colinmollenhour/credis": "*",
"colinmollenhour/php-redis-session-abstract": "~1.4.0"
},
"suggest":{
Expand Down
5 changes: 2 additions & 3 deletions modman
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Cm_RedisSession
app/code/local/Cm/RedisSession app/code/local/Cm/RedisSession
app/etc/modules/Cm_RedisSession.xml app/etc/modules/Cm_RedisSession_Local.xml
app/code/local/Credis app/code/local/Credis
app/code/community/Cm/RedisSession app/code/community/Cm/RedisSession
app/etc/modules/Cm_RedisSession.xml app/etc/modules/Cm_RedisSession.xml

0 comments on commit 6066dd9

Please sign in to comment.