Skip to content

Commit 5813d87

Browse files
committed
Remove some unecessary connection setups
1 parent 9bb43db commit 5813d87

File tree

2 files changed

+20
-56
lines changed

2 files changed

+20
-56
lines changed

src/Illuminate/Foundation/Testing/Concerns/InteractsWithRedis.php

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -98,21 +98,10 @@ public function getRedisManager($connection, $driver = 'phpredis', $config = [])
9898
case 'phpredis':
9999
$config['default']['options']['name'] = 'phpredis';
100100
break;
101-
case 'phpredis_url':
102-
$config['default']['options']['name'] = 'phpredis_url';
103-
$config['default']['url'] = "redis://user@{$config['default']['host']}:{$config['default']['port']}";
104-
$config['default']['host'] = 'overwrittenByUrl';
105-
$config['default']['port'] = 'overwrittenByUrl';
106-
break;
107101
case 'phpredis_prefix':
108102
$config['default']['options']['name'] = 'phpredis_prefix';
109103
$config['default']['options']['prefix'] = 'laravel:';
110104
break;
111-
case 'phpredis_persistent':
112-
$config['default']['options']['name'] = 'phpredis_persistent';
113-
$config['default']['persistent'] = true;
114-
$config['default']['persistent_id'] = 'laravel';
115-
break;
116105
case 'phpredis_scan_noretry':
117106
$config['default']['options']['name'] = 'phpredis_scan_noretry';
118107
$config['default']['options']['scan'] = Redis::SCAN_NORETRY;
@@ -129,10 +118,6 @@ public function getRedisManager($connection, $driver = 'phpredis', $config = [])
129118
$config['default']['options']['name'] = 'phpredis_scan_noprefix';
130119
$config['default']['options']['scan'] = Redis::SCAN_NOPREFIX;
131120
break;
132-
case 'phpredis_serializer_none':
133-
$config['default']['options']['name'] = 'phpredis_serializer_none';
134-
$config['default']['options']['serializer'] = Redis::SERIALIZER_NONE;
135-
break;
136121
case 'phpredis_serializer_php':
137122
$config['default']['options']['name'] = 'phpredis_serializer_php';
138123
$config['default']['options']['serializer'] = Redis::SERIALIZER_PHP;
@@ -156,41 +141,13 @@ public function getRedisManager($connection, $driver = 'phpredis', $config = [])
156141
case 'phpredis_compression_zstd':
157142
$config['default']['options']['name'] = 'phpredis_compression_zstd';
158143
$config['default']['options']['compression'] = Redis::COMPRESSION_ZSTD;
159-
break;
160-
case 'phpredis_compression_zstd_default':
161-
$config['default']['options']['name'] = 'phpredis_compression_zstd_default';
162-
$config['default']['options']['compression'] = Redis::COMPRESSION_ZSTD;
163144
$config['default']['options']['compression_level'] = Redis::COMPRESSION_ZSTD_DEFAULT;
164145
break;
165-
case 'phpredis_compression_zstd_min':
166-
$config['default']['options']['name'] = 'phpredis_compression_zstd_min';
167-
$config['default']['options']['compression'] = Redis::COMPRESSION_ZSTD;
168-
$config['default']['options']['compression_level'] = Redis::COMPRESSION_ZSTD_MIN;
169-
break;
170-
case 'phpredis_compression_zstd_max':
171-
$config['default']['options']['name'] = 'phpredis_compression_zstd_max';
172-
$config['default']['options']['compression'] = Redis::COMPRESSION_ZSTD;
173-
$config['default']['options']['compression_level'] = Redis::COMPRESSION_ZSTD_MAX;
174-
break;
175146
case 'phpredis_compression_lz4':
176147
$config['default']['options']['name'] = 'phpredis_compression_lz4';
177148
$config['default']['options']['compression'] = Redis::COMPRESSION_LZ4;
178-
break;
179-
case 'phpredis_compression_lz4_default':
180-
$config['default']['options']['name'] = 'phpredis_compression_lz4_default';
181-
$config['default']['options']['compression'] = Redis::COMPRESSION_LZ4;
182149
$config['default']['options']['compression_level'] = 0;
183150
break;
184-
case 'phpredis_compression_lz4_min':
185-
$config['default']['options']['name'] = 'phpredis_compression_lz4_min';
186-
$config['default']['options']['compression'] = Redis::COMPRESSION_LZ4;
187-
$config['default']['options']['compression_level'] = 1;
188-
break;
189-
case 'phpredis_compression_lz4_max':
190-
$config['default']['options']['name'] = 'phpredis_compression_lz4_max';
191-
$config['default']['options']['compression'] = Redis::COMPRESSION_LZ4;
192-
$config['default']['options']['compression_level'] = 12;
193-
break;
194151
case 'phpredis_msgpack_and_lz4':
195152
$config['default']['options']['name'] = 'phpredis_msgpack_and_lz4';
196153
$config['default']['options']['serializer'] = Redis::SERIALIZER_MSGPACK;
@@ -230,9 +187,7 @@ public function getExtendedRedisConnections()
230187
$connections = [
231188
'predis',
232189
'phpredis',
233-
'phpredis_url',
234190
'phpredis_prefix',
235-
'phpredis_persistent',
236191
];
237192

238193
if (defined('Redis::SCAN_NORETRY')) {
@@ -251,10 +206,6 @@ public function getExtendedRedisConnections()
251206
$connections[] = 'phpredis_scan_noprefix';
252207
}
253208

254-
if (defined('Redis::SERIALIZER_NONE')) {
255-
$connections[] = 'phpredis_serializer_none';
256-
}
257-
258209
if (defined('Redis::SERIALIZER_PHP')) {
259210
$connections[] = 'phpredis_serializer_php';
260211
}
@@ -277,16 +228,10 @@ public function getExtendedRedisConnections()
277228

278229
if (defined('Redis::COMPRESSION_ZSTD')) {
279230
$connections[] = 'phpredis_compression_zstd';
280-
$connections[] = 'phpredis_compression_zstd_default';
281-
$connections[] = 'phpredis_compression_zstd_min';
282-
$connections[] = 'phpredis_compression_zstd_max';
283231
}
284232

285233
if (defined('Redis::COMPRESSION_LZ4')) {
286234
$connections[] = 'phpredis_compression_lz4';
287-
$connections[] = 'phpredis_compression_lz4_default';
288-
$connections[] = 'phpredis_compression_lz4_min';
289-
$connections[] = 'phpredis_compression_lz4_max';
290235
}
291236

292237
if (defined('Redis::SERIALIZER_MSGPACK') && defined('Redis::COMPRESSION_LZ4')) {

tests/Redis/RedisConnectionTest.php

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,26 @@ public function testItPersistsConnection()
606606

607607
$this->assertSame(
608608
'laravel',
609-
$this->getRedisManager('phpredis_persistent')->getPersistentID()
609+
$this
610+
->getRedisManager(
611+
'phpredis_persistent',
612+
'phpredis',
613+
[
614+
'cluster' => false,
615+
'default' => [
616+
'host' => env('REDIS_HOST', '127.0.0.1'),
617+
'port' => (int) env('REDIS_PORT', 6379),
618+
'timeout' => 0.5,
619+
'database' => 5,
620+
'persistent' => true,
621+
'persistent_id' => 'laravel',
622+
'options' => [
623+
'name' => 'phpredis_persistent',
624+
],
625+
],
626+
]
627+
)
628+
->getPersistentID()
610629
);
611630
}
612631

0 commit comments

Comments
 (0)