Skip to content

Commit bc89343

Browse files
Compatibility with latest versions of openmage (#187)
* Remove submodules * Do not rewrite (ref: OpenMage/magento-lts#1513) Co-authored-by: Justin Beaty <justin.beaty@gmail.com>
1 parent 08025ef commit bc89343

File tree

5 files changed

+3
-23
lines changed

5 files changed

+3
-23
lines changed

.gitmodules

-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +0,0 @@
1-
[submodule "app/code/local/Cm/RedisSession/lib"]
2-
path = app/code/local/Cm/RedisSession/lib
3-
url = https://github.com/colinmollenhour/php-redis-session-abstract
4-
[submodule "app/code/local/Credis"]
5-
path = app/code/local/Credis
6-
url = https://github.com/colinmollenhour/credis

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

-10
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 implements \Zend_Session_SaveHandler_Interface
4333
{
4434

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

+3-5
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3838
</modules>
3939
<global>
4040
<models>
41-
<core_resource>
42-
<rewrite>
43-
<session>Cm_RedisSession_Model_Session</session>
44-
</rewrite>
45-
</core_resource>
41+
<cm_redissession>
42+
<class>Cm_RedisSession_Model</class>
43+
</cm_redissession>
4644
</models>
4745
</global>
4846
</config>

app/code/local/Cm/RedisSession/lib

-1
This file was deleted.

app/code/local/Credis

-1
This file was deleted.

0 commit comments

Comments
 (0)