Skip to content

Commit 5d63e76

Browse files
authored
Merge pull request #67 from nezaniel/php84Compatibility
PHP 8.4 compatibility
2 parents 3cc99b5 + 94118de commit 5d63e76

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

Classes/Job/JobManager.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ protected function emitMessageFinished(QueueInterface $queue, Message $message):
258258
* @Flow\Signal
259259
* @api
260260
*/
261-
protected function emitMessageReleased(QueueInterface $queue, Message $message, array $releaseOptions, \Exception $jobExecutionException = null): void
261+
protected function emitMessageReleased(QueueInterface $queue, Message $message, array $releaseOptions, ?\Exception $jobExecutionException = null): void
262262
{
263263
}
264264

@@ -272,7 +272,7 @@ protected function emitMessageReleased(QueueInterface $queue, Message $message,
272272
* @Flow\Signal
273273
* @api
274274
*/
275-
protected function emitMessageFailed(QueueInterface $queue, Message $message, \Exception $jobExecutionException = null): void
275+
protected function emitMessageFailed(QueueInterface $queue, Message $message, ?\Exception $jobExecutionException = null): void
276276
{
277277
}
278278

Classes/Queue/FakeQueue.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@ public function submit($payload, array $options = []): string
9898
/**
9999
* @inheritdoc
100100
*/
101-
public function waitAndTake(int $timeout = null): Message
101+
public function waitAndTake(?int $timeout = null): Message
102102
{
103103
throw new \BadMethodCallException('The FakeQueue does not support reserving of messages.' . chr(10) . 'It is not required to use a worker for this queue as messages are handled immediately upon submission.', 1468425275);
104104
}
105105

106106
/**
107107
* @inheritdoc
108108
*/
109-
public function waitAndReserve(int $timeout = null): Message
109+
public function waitAndReserve(?int $timeout = null): Message
110110
{
111111
throw new \BadMethodCallException('The FakeQueue does not support reserving of messages.' . chr(10) . 'It is not required to use a worker for this queue as messages are handled immediately upon submission.', 1468425280);
112112
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ class Package extends BasePackage
373373
374374
$dispatcher->connect(
375375
JobManager::class, 'messageFailed',
376-
function(QueueInterface $queue, Message $message, \Exception $jobExecutionException = null) use ($bootstrap) {
376+
function(QueueInterface $queue, Message $message, ?\Exception $jobExecutionException = null) use ($bootstrap) {
377377
$additionalData = [
378378
'queue' => $queue->getName(),
379379
'message' => $message->getIdentifier()

Tests/Unit/Fixtures/TestQueue.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public function submit($payload, array $options = []): string
115115
/**
116116
* @inheritdoc
117117
*/
118-
public function waitAndTake(int $timeout = null): ?Message
118+
public function waitAndTake(?int $timeout = null): ?Message
119119
{
120120
$message = $this->reserveMessage($timeout);
121121
if ($message === null) {
@@ -129,16 +129,16 @@ public function waitAndTake(int $timeout = null): ?Message
129129
/**
130130
* @inheritdoc
131131
*/
132-
public function waitAndReserve(int $timeout = null): ?Message
132+
public function waitAndReserve(?int $timeout = null): ?Message
133133
{
134134
return $this->reserveMessage($timeout);
135135
}
136136

137137
/**
138-
* @param int $timeout
138+
* @param int|null $timeout
139139
* @return Message
140140
*/
141-
protected function reserveMessage(int $timeout = null): ?Message
141+
protected function reserveMessage(?int $timeout = null): ?Message
142142
{
143143
if ($timeout === null) {
144144
$timeout = $this->defaultTimeout;

0 commit comments

Comments
 (0)