Skip to content

Commit 59ae271

Browse files
makasimmakasim
authored
Merge pull request #23 from marmichalski/explicit-nullable-types
Explicit nullable types
2 parents 64112dd + 1511233 commit 59ae271

File tree

6 files changed

+24
-24
lines changed

6 files changed

+24
-24
lines changed

‎src/AmqpConsumer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ interface AmqpConsumer extends Consumer
2020
const FLAG_EXCLUSIVE = 4;
2121
const FLAG_NOWAIT = 8;
2222

23-
public function setConsumerTag(string $consumerTag = null): void;
23+
public function setConsumerTag(?string $consumerTag = null): void;
2424

2525
public function getConsumerTag(): ?string;
2626

‎src/AmqpMessage.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,27 @@ interface AmqpMessage extends Message
1414
const FLAG_MANDATORY = 1;
1515
const FLAG_IMMEDIATE = 2;
1616

17-
public function setContentType(string $type = null): void;
17+
public function setContentType(?string $type = null): void;
1818

1919
public function getContentType(): ?string;
2020

21-
public function setContentEncoding(string $encoding = null): void;
21+
public function setContentEncoding(?string $encoding = null): void;
2222

2323
public function getContentEncoding(): ?string;
2424

25-
public function setDeliveryMode(int $deliveryMode = null): void;
25+
public function setDeliveryMode(?int $deliveryMode = null): void;
2626

2727
public function getDeliveryMode(): ?int;
2828

29-
public function setPriority(int $priority = null): void;
29+
public function setPriority(?int $priority = null): void;
3030

3131
public function getPriority(): ?int;
3232

33-
public function setExpiration(int $expiration = null): void;
33+
public function setExpiration(?int $expiration = null): void;
3434

3535
public function getExpiration(): ?int;
3636

37-
public function setDeliveryTag(int $deliveryTag = null): void;
37+
public function setDeliveryTag(?int $deliveryTag = null): void;
3838

3939
/**
4040
* https://www.rabbitmq.com/amqp-0-9-1-reference.html#domain.delivery-tag
@@ -43,7 +43,7 @@ public function getDeliveryTag(): ?int;
4343

4444
public function getConsumerTag(): ?string;
4545

46-
public function setConsumerTag(string $consumerTag = null): void;
46+
public function setConsumerTag(?string $consumerTag = null): void;
4747

4848
public function clearFlags(): void;
4949

@@ -55,5 +55,5 @@ public function setFlags(int $flags): void;
5555

5656
public function getRoutingKey(): ?string ;
5757

58-
public function setRoutingKey(string $routingKey = null): void;
58+
public function setRoutingKey(?string $routingKey = null): void;
5959
}

‎src/AmqpQueue.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ public function getArgument(string $key);
2828

2929
public function getConsumerTag(): ?string;
3030

31-
public function setConsumerTag(string $consumerTag = null): void;
31+
public function setConsumerTag(?string $consumerTag = null): void;
3232
}

‎src/Impl/AmqpBind.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ final class AmqpBind implements InteropAmqpBind
3636
public function __construct(
3737
AmqpDestination $target,
3838
AmqpDestination $source,
39-
string $routingKey = null,
39+
?string $routingKey = null,
4040
int $flags = self::FLAG_NOPARAM,
4141
array $arguments = []
4242
) {

‎src/Impl/AmqpMessage.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public function isRedelivered(): bool
125125
return $this->redelivered;
126126
}
127127

128-
public function setCorrelationId(string $correlationId = null): void
128+
public function setCorrelationId(?string $correlationId = null): void
129129
{
130130
$this->setHeader('correlation_id', $correlationId);
131131
}
@@ -135,7 +135,7 @@ public function getCorrelationId(): ?string
135135
return $this->getHeader('correlation_id');
136136
}
137137

138-
public function setMessageId(string $messageId = null): void
138+
public function setMessageId(?string $messageId = null): void
139139
{
140140
$this->setHeader('message_id', $messageId);
141141
}
@@ -152,12 +152,12 @@ public function getTimestamp(): ?int
152152
return $value === null ? null : (int) $value;
153153
}
154154

155-
public function setTimestamp(int $timestamp = null): void
155+
public function setTimestamp(?int $timestamp = null): void
156156
{
157157
$this->setHeader('timestamp', $timestamp);
158158
}
159159

160-
public function setReplyTo(string $replyTo = null): void
160+
public function setReplyTo(?string $replyTo = null): void
161161
{
162162
$this->setHeader('reply_to', $replyTo);
163163
}
@@ -167,7 +167,7 @@ public function getReplyTo(): ?string
167167
return $this->getHeader('reply_to');
168168
}
169169

170-
public function setContentType(string $type = null): void
170+
public function setContentType(?string $type = null): void
171171
{
172172
$this->setHeader('content_type', $type);
173173
}
@@ -177,7 +177,7 @@ public function getContentType(): ?string
177177
return $this->getHeader('content_type');
178178
}
179179

180-
public function setContentEncoding(string $encoding = null): void
180+
public function setContentEncoding(?string $encoding = null): void
181181
{
182182
$this->setHeader('content_encoding', $encoding);
183183
}
@@ -192,12 +192,12 @@ public function getPriority(): ?int
192192
return $this->getHeader('priority');
193193
}
194194

195-
public function setPriority(int $priority = null): void
195+
public function setPriority(?int $priority = null): void
196196
{
197197
$this->setHeader('priority', $priority);
198198
}
199199

200-
public function setDeliveryMode(int $deliveryMode = null): void
200+
public function setDeliveryMode(?int $deliveryMode = null): void
201201
{
202202
$this->setHeader('delivery_mode', $deliveryMode);
203203
}
@@ -207,7 +207,7 @@ public function getDeliveryMode(): ?int
207207
return $this->getHeader('delivery_mode');
208208
}
209209

210-
public function setExpiration(int $expiration = null): void
210+
public function setExpiration(?int $expiration = null): void
211211
{
212212
// expiration is a string
213213
// https://www.rabbitmq.com/amqp-0-9-1-reference.html#domain.shortstr
@@ -227,7 +227,7 @@ public function getDeliveryTag(): ?int
227227
return $this->deliveryTag;
228228
}
229229

230-
public function setDeliveryTag(int $deliveryTag = null): void
230+
public function setDeliveryTag(?int $deliveryTag = null): void
231231
{
232232
$this->deliveryTag = $deliveryTag;
233233
}
@@ -237,7 +237,7 @@ public function getConsumerTag(): ?string
237237
return $this->consumerTag;
238238
}
239239

240-
public function setConsumerTag(string $consumerTag = null): void
240+
public function setConsumerTag(?string $consumerTag = null): void
241241
{
242242
$this->consumerTag = $consumerTag;
243243
}
@@ -267,7 +267,7 @@ public function getRoutingKey(): ?string
267267
return $this->routingKey;
268268
}
269269

270-
public function setRoutingKey(string $routingKey = null): void
270+
public function setRoutingKey(?string $routingKey = null): void
271271
{
272272
$this->routingKey = $routingKey;
273273
}

‎src/Impl/AmqpQueue.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function getConsumerTag(): ?string
4545
return $this->consumerTag;
4646
}
4747

48-
public function setConsumerTag(string $consumerTag = null): void
48+
public function setConsumerTag(?string $consumerTag = null): void
4949
{
5050
$this->consumerTag = $consumerTag;
5151
}

0 commit comments

Comments
 (0)