Skip to content

Commit 252e665

Browse files
author
Igor Melnikov
committed
MAGETWO-51068: Admin User session expired despite Session Lifetime
Annotation
1 parent 63a5aec commit 252e665

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,19 +101,19 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
101101
const PARAM_BREAK_AFTER = 'session/redis/break_after';
102102

103103
/**
104-
* Cookie Lifetime config path
104+
* Cookie lifetime config path
105105
*/
106106
const XML_PATH_COOKIE_LIFETIME = 'web/cookie/cookie_lifetime';
107107

108108
/**
109-
* Admin Session Lifetime config path
109+
* Admin session lifetime config path
110110
*/
111111
const XML_PATH_ADMIN_SESSION_LIFETIME = 'admin/security/session_lifetime';
112112

113113
/**
114-
* Max Admin Session Lifetime
114+
* Max admin session lifetime
115115
*/
116-
const ADMIN_SESSION_MAX_LIFETIME = 31536000; //One year
116+
const ADMIN_SESSION_MAX_LIFETIME = 31536000;
117117

118118
/**
119119
* Deployment config

lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/ConfigTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
1212
/**
1313
* @var \Magento\Framework\App\DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
1414
*/
15-
protected $deploymentConfigMock;
15+
private $deploymentConfigMock;
1616

1717
/**
1818
* @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject
1919
*/
20-
protected $appStateMock;
20+
private $appStateMock;
2121

2222
/**
2323
* @var \Magento\Framework\App\Config|\PHPUnit_Framework_MockObject_MockObject
2424
*/
25-
protected $scopeConfigMock;
25+
private $scopeConfigMock;
2626

2727
/**
2828
* @var \Magento\Framework\Session\SaveHandler\Redis\Config
2929
*/
30-
protected $config;
30+
private $config;
3131

3232
public function setUp()
3333
{
@@ -218,8 +218,8 @@ public function testBreakAfter()
218218

219219
public function testGetLifetimeAdmin()
220220
{
221-
$expectedLifetime = 12345;
222221
$areaCode = 'adminhtml';
222+
$expectedLifetime = 123;
223223
$this->appStateMock->expects($this->once())
224224
->method('getAreaCode')
225225
->willReturn($areaCode);
@@ -232,8 +232,8 @@ public function testGetLifetimeAdmin()
232232

233233
public function testGetLifetimeFrontend()
234234
{
235-
$expectedLifetime = 3010;
236235
$areaCode = 'frontend';
236+
$expectedLifetime = 234;
237237
$this->appStateMock->expects($this->once())
238238
->method('getAreaCode')
239239
->willReturn($areaCode);

0 commit comments

Comments
 (0)