Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/coding_standards.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ jobs:
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache dependencies
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-

- name: Install dependencies
run: composer install --prefer-dist

# Run PHP CodeSniffer
- name: Run PHP CodeSniffer
run: php vendor/bin/phpcs
run: php vendor/bin/phpcs
6 changes: 3 additions & 3 deletions .github/workflows/installation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ jobs:
run: echo "::set-output name=dir::$(composer config -d ./app cache-files-dir)"

- name: Cache dependencies
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-

# Install the bundle
- name: Install AymdevMessengerAzureBundle
run: composer require -d ./app --prefer-source aymdev/messenger-azure-bundle:"*"
run: composer require -d ./app --prefer-source aymdev/messenger-azure-bundle:"*"
6 changes: 3 additions & 3 deletions .github/workflows/testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ jobs:
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache dependencies
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-

- name: Install dependencies
Expand All @@ -42,4 +42,4 @@ jobs:

# Run PHPStan
- name: Run PHPStan
run: php vendor/bin/phpstan
run: php vendor/bin/phpstan
15 changes: 10 additions & 5 deletions src/Messenger/Stamp/AzureBrokerPropertiesStamp.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function __construct(
private ?string $replyTo = null,
private readonly ?\DateTimeInterface $enqueuedTimeUtc = null,
private readonly ?int $sequenceNumber = null,
private ?int $timeToLive = null,
private ?float $timeToLive = null,
private ?string $to = null,
private ?\DateTimeInterface $scheduledEnqueueTimeUtc = null,
private ?string $replyToSessionId = null,
Expand Down Expand Up @@ -65,7 +65,7 @@ public static function createFromJson(string $json): self
* ReplyTo?: string,
* EnqueuedTimeUtc?: string,
* SequenceNumber?: int,
* TimeToLive?: int,
* TimeToLive?: float,
* To?: string,
* ScheduledEnqueueTimeUtc?: string,
* ReplyToSessionId?: string,
Expand Down Expand Up @@ -93,6 +93,11 @@ public static function createFromJson(string $json): self
$scheduledEnqueueTimeUtc = $scheduledEnqueueTimeUtc->setTimezone($defaultTimeZone);
}

$timeToLive = null;
if (isset($properties['TimeToLive'])) {
$timeToLive = floatval($properties['TimeToLive']);
}

return new self(
$properties['ContentType'] ?? null,
$properties['CorrelationId'] ?? null,
Expand All @@ -105,7 +110,7 @@ public static function createFromJson(string $json): self
$properties['ReplyTo'] ?? null,
$enqueuedTimeUtc,
$properties['SequenceNumber'] ?? null,
$properties['TimeToLive'] ?? null,
$timeToLive,
$properties['To'] ?? null,
$scheduledEnqueueTimeUtc,
$properties['ReplyToSessionId'] ?? null,
Expand Down Expand Up @@ -243,12 +248,12 @@ public function getSequenceNumber(): ?int
return $this->sequenceNumber;
}

public function getTimeToLive(): ?int
public function getTimeToLive(): ?float
{
return $this->timeToLive;
}

public function setTimeToLive(?int $timeToLive): self
public function setTimeToLive(?float $timeToLive): self
{
$this->timeToLive = $timeToLive;
return $this;
Expand Down
2 changes: 1 addition & 1 deletion tests/Messenger/Stamp/AzureBrokerPropertiesStampTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public function testCreateFromResponse(): void
$replyTo = 'test-reply-to';
$enqueuedTimeUtc = '1970-01-01 00:00:00';
$sequenceNumber = 2;
$timeToLive = 3;
$timeToLive = 3.12;
$to = 'test-to';
$scheduledEnqueueTimeUtc = '1970-01-01 00:00:00';
$replyToSessionId = 'test-reply-to-session-id';
Expand Down