Skip to content

Commit ea87e52

Browse files
minor symfony#54618 Bump ext-redis in CI on PHP >= 8.4 (nicolas-grekas)
This PR was merged into the 5.4 branch. Discussion ---------- Bump ext-redis in CI on PHP >= 8.4 | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT Trying to fix the ext-redis-related deprecations. Commits ------- 9189c8c Bump ext-redis in CI on PHP >= 8.4
2 parents 21608f1 + 9189c8c commit ea87e52

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.github/workflows/unit-tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
mode: low-deps
3535
- php: '8.3'
3636
- php: '8.4'
37+
extensions: amqp,apcu,igbinary,intl,mbstring,memcached,redis
3738
#mode: experimental
3839
fail-fast: false
3940

@@ -51,7 +52,7 @@ jobs:
5152
coverage: "none"
5253
ini-values: date.timezone=UTC,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1
5354
php-version: "${{ matrix.php }}"
54-
extensions: "${{ env.extensions }}"
55+
extensions: "${{ matrix.extensions || env.extensions }}"
5556
tools: flex
5657

5758
- name: Configure environment

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public function testKeepGettingPendingMessages()
154154
$redis = $this->createMock(\Redis::class);
155155

156156
$redis->expects($this->exactly(3))->method('xreadgroup')
157-
->with('symfony', 'consumer', ['queue' => 0], 1, null)
157+
->with('symfony', 'consumer', ['queue' => 0], 1, 1)
158158
->willReturn(['queue' => [['message' => json_encode(['body' => 'Test', 'headers' => []])]]]);
159159

160160
$connection = Connection::fromDsn('redis://localhost/queue', ['delete_after_ack' => true], $redis);
@@ -250,7 +250,7 @@ public function testGetPendingMessageFirst()
250250
$redis = $this->createMock(\Redis::class);
251251

252252
$redis->expects($this->exactly(1))->method('xreadgroup')
253-
->with('symfony', 'consumer', ['queue' => '0'], 1, null)
253+
->with('symfony', 'consumer', ['queue' => '0'], 1, 1)
254254
->willReturn(['queue' => [['message' => '{"body":"1","headers":[]}']]]);
255255

256256
$connection = Connection::fromDsn('redis://localhost/queue', ['delete_after_ack' => true], $redis);
@@ -275,11 +275,11 @@ public function testClaimAbandonedMessageWithRaceCondition()
275275
->willReturnCallback(function (...$args) {
276276
static $series = [
277277
// first call for pending messages
278-
[['symfony', 'consumer', ['queue' => '0'], 1, null], []],
278+
[['symfony', 'consumer', ['queue' => '0'], 1, 1], []],
279279
// second call because of claimed message (redisid-123)
280-
[['symfony', 'consumer', ['queue' => '0'], 1, null], []],
280+
[['symfony', 'consumer', ['queue' => '0'], 1, 1], []],
281281
// third call because of no result (other consumer claimed message redisid-123)
282-
[['symfony', 'consumer', ['queue' => '>'], 1, null], []],
282+
[['symfony', 'consumer', ['queue' => '>'], 1, 1], []],
283283
];
284284

285285
[$expectedArgs, $return] = array_shift($series);
@@ -311,9 +311,9 @@ public function testClaimAbandonedMessage()
311311
->willReturnCallback(function (...$args) {
312312
static $series = [
313313
// first call for pending messages
314-
[['symfony', 'consumer', ['queue' => '0'], 1, null], []],
314+
[['symfony', 'consumer', ['queue' => '0'], 1, 1], []],
315315
// second call because of claimed message (redisid-123)
316-
[['symfony', 'consumer', ['queue' => '0'], 1, null], ['queue' => [['message' => '{"body":"1","headers":[]}']]]],
316+
[['symfony', 'consumer', ['queue' => '0'], 1, 1], ['queue' => [['message' => '{"body":"1","headers":[]}']]]],
317317
];
318318

319319
[$expectedArgs, $return] = array_shift($series);

src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,7 @@ public function get(): ?array
389389
$this->group,
390390
$this->consumer,
391391
[$this->stream => $messageId],
392+
1,
392393
1
393394
);
394395
} catch (\RedisException $e) {

0 commit comments

Comments
 (0)