Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit f0ee163

Browse filesBrowse files
committed
Merge branch '5.3' into 5.4
* 5.3: [Messenger] Fix broken Redis mocks Pin ext-redis version in CI
2 parents 55aa2f6 + 0fee05e commit f0ee163
Copy full SHA for f0ee163

File tree

Expand file treeCollapse file tree

2 files changed

+6
-6
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+6
-6
lines changed

‎.github/workflows/unit-tests.yml

Copy file name to clipboardExpand all lines: .github/workflows/unit-tests.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: Ubuntu-20.04
1616

1717
env:
18-
extensions: amqp,apcu,igbinary,intl,mbstring,memcached,mongodb,redis
18+
extensions: amqp,apcu,igbinary,intl,mbstring,memcached,mongodb,redis-5.3.4
1919

2020
strategy:
2121
matrix:

‎src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function testFromDsnWithTls()
7878
$redis->expects($this->once())
7979
->method('connect')
8080
->with('tls://127.0.0.1', 6379)
81-
->willReturn(null);
81+
->willReturn(true);
8282

8383
Connection::fromDsn('redis://127.0.0.1?tls=1', [], $redis);
8484
}
@@ -92,7 +92,7 @@ public function testFromDsnWithTlsOption()
9292
$redis->expects($this->once())
9393
->method('connect')
9494
->with('tls://127.0.0.1', 6379)
95-
->willReturn(null);
95+
->willReturn(true);
9696

9797
Connection::fromDsn('redis://127.0.0.1', ['tls' => true], $redis);
9898
}
@@ -103,7 +103,7 @@ public function testFromDsnWithRedissScheme()
103103
$redis->expects($this->once())
104104
->method('connect')
105105
->with('tls://127.0.0.1', 6379)
106-
->willReturn(null);
106+
->willReturn(true);
107107

108108
Connection::fromDsn('rediss://127.0.0.1?delete_after_ack=true', [], $redis);
109109
}
@@ -315,7 +315,7 @@ public function testMaxEntries()
315315

316316
$redis->expects($this->exactly(1))->method('xadd')
317317
->with('queue', '*', ['message' => '{"body":"1","headers":[]}'], 20000, true)
318-
->willReturn(1);
318+
->willReturn('1');
319319

320320
$connection = Connection::fromDsn('redis://localhost/queue?stream_max_entries=20000', ['delete_after_ack' => true], $redis);
321321
$connection->add('1', []);
@@ -365,7 +365,7 @@ public function testLastErrorGetsCleared()
365365
{
366366
$redis = $this->createMock(\Redis::class);
367367

368-
$redis->expects($this->once())->method('xadd')->willReturn(0);
368+
$redis->expects($this->once())->method('xadd')->willReturn('0');
369369
$redis->expects($this->once())->method('xack')->willReturn(0);
370370

371371
$redis->method('getLastError')->willReturnOnConsecutiveCalls('xadd error', 'xack error');

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.