Skip to content

Commit 369773b

Browse files
committed
- changed the "servers" option for configuration array (no need for MEMCACHED_POOL env variable)
- fixes the unit test
1 parent d520068 commit 369773b

2 files changed

Lines changed: 7 additions & 11 deletions

File tree

Handler/MemcachedHandler.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,10 @@ public function gc($maxLifetime): bool
6666

6767
private function configuration(SessionConfiguration $settings): array
6868
{
69-
if (!$servers = $settings->get('servers')) {
70-
$servers = json_decode(getenv('MEMCACHED_POOL'), true) ?? [['127.0.0.1', 11211]];
71-
}
72-
7369
return [
74-
'servers' => $servers,
75-
'id' => $settings->get('id', $settings->get('name', ini_get('session.name'))),
76-
'options' => $settings->get('options', []) + [
70+
'servers' => (array)$settings->get('servers', [['127.0.0.1', 11211]]),
71+
'id' => (string)$settings->get('id', $settings->get('name', ini_get('session.name'))),
72+
'options' => (array)$settings->get('options', []) + [
7773
\Memcached::OPT_PREFIX_KEY => $settings->prefix ?? 'session.'
7874
]
7975
];

Tests/Handler/MemcachedHandlerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ protected function setUp()
2626
'name' => 'test',
2727
'save_handler' => 'memcached',
2828
'expire_at_browser_close' => false,
29+
'use_cookies' => false,
30+
'cache_limiter' => '',
31+
'gc_maxlifetime' => 60,
2932

33+
'servers' => defined('CI') ? [['127.0.0.1', 11211]] : [['memcached', 11211]],
3034
'options' => [
3135
\Memcached::OPT_DISTRIBUTION => null,
3236
\Memcached::OPT_PREFIX_KEY => 'sess.'
3337
],
34-
35-
'use_cookies' => false,
36-
'cache_limiter' => '',
37-
'gc_maxlifetime' => 60,
3838
]
3939
]);
4040

0 commit comments

Comments
 (0)