Skip to content

Commit 8b3d14b

Browse files
Merge branch '6.0' into 6.1
* 6.0: [Semaphore] fix tests [HttpClient] fix destructing CurlResponse [Cache] Fix connecting to Redis via a socket file [DependencyInjection][FrameworkBundle] Fix using PHP 8.1 enum as parameters [PropertyAccessor] Add missing TypeError catch [HttpKernel] Fixed error count by log not displayed in WebProfilerBundle Added `kernel.event_listener` to the default list of behavior describing tags, fixing AsEventListener attribute not working on decorators. [HttpKernel] Fix FileLinkFormatter with empty xdebug.file_link_format [WebProfilerBundle] Fixes weird spacing in log message context/trace output [Notifier] fix Microsoft Teams webhook url [FrameworkBundle] Fix log channel of TagAwareAdapter [Postmark] ensure only a single tag can be used with Postmark [Mailer] allow Mailchimp to handle multiple TagHeader's [HttpClient] Fix Content-Length header when possible [Routing] AnnotationDirectoryLoader::load() may return null [DependencyInjection] Don't dump polyfilled classes in preload script
2 parents dfcbbdd + 3d4b4fa commit 8b3d14b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected function setUp(): void
4242
self::markTestSkipped('Extension redis required.');
4343
}
4444
try {
45-
(new \Redis())->connect(getenv('REDIS_HOST'));
45+
(new \Redis())->connect(...explode(':', getenv('REDIS_HOST')));
4646
} catch (\Exception $e) {
4747
self::markTestSkipped($e->getMessage());
4848
}

Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ class PredisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCas
2020
{
2121
protected function createRedisClient(string $host): Client
2222
{
23-
return new Client([['host' => $host]]);
23+
return new Client([array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => 6379])]);
2424
}
2525
}

Tests/Session/Storage/Handler/PredisSessionHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ class PredisSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
2020
{
2121
protected function createRedisClient(string $host): Client
2222
{
23-
return new Client(['host' => $host]);
23+
return new Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => 6379]));
2424
}
2525
}

Tests/Session/Storage/Handler/RedisSessionHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class RedisSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
1919
protected function createRedisClient(string $host): \Redis
2020
{
2121
$client = new \Redis();
22-
$client->connect($host);
22+
$client->connect(...explode(':', $host));
2323

2424
return $client;
2525
}

0 commit comments

Comments
 (0)