8000 [Mailer] Flag $engagementTracking renamed to $disableTracking and DSN… · symfony/symfony@c283bb4 · GitHub
[go: up one dir, main page]
Skip to content

Commit c283bb4

Browse files
hafaelhafael
committed
[Mailer] Flag $engagementTracking renamed to $disableTracking and DSN option to disable_tracking (false as default)
1 parent bf2d302 commit c283bb4

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

‎src/Symfony/Component/Mailer/Bridge/Azure/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ MAILER_DSN=azure+api://ACS_RESOURCE_NAME:KEY@default
1111
1212
#API with options
1313
14-
MAILER_DSN=azure+api://ACS_RESOURCE_NAME:KEY@default?api-version=2023-03-31&tracking=false
14+
MAILER_DSN=azure+api://ACS_RESOURCE_NAME:KEY@default?api_version=2023-03-31&disable_tracking=false
1515
```
1616

1717
where:

‎src/Symfony/Component/Mailer/Bridge/Azure/Transport/AzureApiTransport.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ final class AzureApiTransport extends AbstractApiTransport
4545
private string $apiVersion;
4646

4747
/**
48-
* Indicates whether user engagement tracking should be enabled.
48+
* Indicates whether user engagement tracking should be disabled.
4949
*/
50-
private bool $engagementTracking;
50+
private bool $disableTracking;
5151

52-
public function __construct(string $key, string $resourceName, bool $engagementTracking = true, string $apiVersion = '2023-03-31', HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
52+
public function __construct(string $key, string $resourceName, bool $disableTracking = false, string $apiVersion = '2023-03-31', HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
5353
{
5454
if (str_contains($resourceName, '.') || str_ends_with($resourceName, '.')) {
5555
throw new \Exception('Resource name cannot contain or end with a dot.');
@@ -58,7 +58,7 @@ public function __construct(string $key, string $resourceName, bool $engagementT
5858
$this->resourceName = $resourceName;
5959
$this->key = $key;
6060
$this->apiVersion = $apiVersion;
61-
$this->engagementTracking = $engagementTracking;
61+
$this->disableTracking = $disableTracking;
6262
parent::__construct($client, $dispatcher, $logger);
6363
}
6464

@@ -126,7 +126,7 @@ private function getPayload(Email $email, Envelope $envelope): array
126126
],
127127
'senderAddress' => $envelope->getSender()->getAddress(),
128128
'attachments' => $this->getMessageAttachments($email),
129-
'userEngagementTrackingDisabled' => !$this->engagementTracking,
129+
'userEngagementTrackingDisabled' => $this->disableTracking,
130130
'headers' => empty($headers = $this->getMessageCustomHeaders($email)) ? null : $headers,
131131
'importance' => $this->getPriorityLevel($email->getPriority()),
132132
];

‎src/Symfony/Component/Mailer/Bridge/Azure/Transport/AzureTransportFactory.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ public function create(Dsn $dsn): TransportInterface
2929
$user = $this->getUser($dsn); // resourceName
3030
$password = $this->getPassword($dsn); // apiKey
3131
$host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
32-
$apiVersion = $dsn->getOption('api-version', '2023-03-31');
33-
$engagementTracking = (bool) $dsn->getOption('tracking', false);
32+
$apiVersion = $dsn->getOption('api_version', '2023-03-31');
33+
$disableTracking = (bool) $dsn->getOption('disable_tracking', false);
3434

35-
return (new AzureApiTransport($password, $user, $engagementTracking, $apiVersion, $this->client, $this->dispatcher, $this->logger))->setHost($host);
35+
return (new AzureApiTransport($password, $user, $disableTracking, $apiVersion, $this->client, $this->dispatcher, $this->logger))->setHost($host);
3636
}
3737

3838
protected function getSupportedSchemes(): array

0 commit comments

Comments
 (0)
0