Skip to content

Commit 75ea7d7

Browse files
author
Cari Spruiell
committed
Merge remote-tracking branch 'mainline/develop' into api-sprint-61-pr
2 parents d01f715 + e7a0e89 commit 75ea7d7

File tree

26 files changed

+1383
-1222
lines changed

26 files changed

+1383
-1222
lines changed

app/etc/di.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@
141141
<preference for="Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface" type="Magento\Framework\Stdlib\DateTime\DateTimeFormatter"/>
142142
<preference for="Magento\Framework\Api\Search\SearchInterface" type="Magento\Framework\Search\Search"/>
143143
<preference for="Magento\Framework\View\Design\FileResolution\Fallback\ResolverInterface" type="Magento\Framework\View\Design\FileResolution\Fallback\Resolver\Simple" />
144+
<preference for="Cm\RedisSession\Handler\ConfigInterface" type="Magento\Framework\Session\SaveHandler\Redis\Config"/>
145+
<preference for="Cm\RedisSession\Handler\LoggerInterface" type="Magento\Framework\Session\SaveHandler\Redis\Logger"/>
144146
<type name="Magento\Framework\Model\ResourceModel\Db\TransactionManager" shared="false" />
145147
<type name="Magento\Framework\Logger\Handler\Base">
146148
<arguments>
@@ -200,9 +202,16 @@
200202
<arguments>
201203
<argument name="handlers" xsi:type="array">
202204
<item name="db" xsi:type="string">Magento\Framework\Session\SaveHandler\DbTable</item>
205+
<item name="redis" xsi:type="string">Magento\Framework\Session\SaveHandler\Redis</item>
203206
</argument>
204207
</arguments>
205208
</type>
209+
<type name="Magento\Framework\Session\SaveHandler\Redis">
210+
<arguments>
211+
<argument name="config" xsi:type="object">Cm\RedisSession\Handler\ConfigInterface</argument>
212+
<argument name="logger" xsi:type="object">Cm\RedisSession\Handler\LoggerInterface</argument>
213+
</arguments>
214+
</type>
206215
<virtualType name="interceptionConfigScope" type="Magento\Framework\Config\Scope">
207216
<arguments>
208217
<argument name="defaultScope" xsi:type="string">global</argument>

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
"zendframework/zend-log": "~2.4.6",
3333
"zendframework/zend-http": "~2.4.6",
3434
"magento/zendframework1": "1.12.16",
35+
"colinmollenhour/credis": "1.6",
36+
"colinmollenhour/php-redis-session-abstract": "1.0",
3537
"composer/composer": "1.0.0-alpha10",
3638
"monolog/monolog": "1.16.0",
3739
"oyejorge/less.php": "1.7.0.3",
@@ -183,7 +185,6 @@
183185
"magento/framework": "100.0.2",
184186
"trentrichardson/jquery-timepicker-addon": "1.4.3",
185187
"colinmollenhour/cache-backend-redis": "1.8",
186-
"colinmollenhour/credis": "1.5",
187188
"components/jquery": "1.11.0",
188189
"blueimp/jquery-file-upload": "5.6.14",
189190
"components/jqueryui": "1.10.4",
@@ -194,7 +195,6 @@
194195
"component_paths": {
195196
"trentrichardson/jquery-timepicker-addon": "lib/web/jquery/jquery-ui-timepicker-addon.js",
196197
"colinmollenhour/cache-backend-redis": "lib/internal/Cm/Cache/Backend/Redis.php",
197-
"colinmollenhour/credis": "lib/internal/Credis",
198198
"components/jquery": [
199199
"lib/web/jquery.js",
200200
"lib/web/jquery/jquery.min.js",

composer.lock

Lines changed: 120 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)