Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 12b8bc8

Browse filesBrowse files
Merge branch '6.4' into 7.2
* 6.4: [Notifier] Fix Clicksend transport validate translate src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf:471 fix: Add argument as integer
2 parents 5ec5f40 + 62c4b11 commit 12b8bc8
Copy full SHA for 12b8bc8

File tree

Expand file treeCollapse file tree

4 files changed

+8
-3
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+8
-3
lines changed

‎src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ class Connection
3131
'x-max-length-bytes',
3232
'x-max-priority',
3333
'x-message-ttl',
34+
'x-delivery-limit',
3435
];
3536

3637
/**

‎src/Symfony/Component/Notifier/Bridge/ClickSend/ClickSendTransport.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Bridge/ClickSend/ClickSendTransport.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ protected function doSend(MessageInterface $message): SentMessage
8787

8888
$response = $this->client->request('POST', $endpoint, [
8989
'auth_basic' => [$this->apiUsername, $this->apiKey],
90-
'json' => array_filter($options),
90+
'json' => ['messages' => [array_filter($options)]],
9191
]);
9292

9393
try {

‎src/Symfony/Component/Notifier/Bridge/ClickSend/Tests/ClickSendTransportTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Bridge/ClickSend/Tests/ClickSendTransportTest.php
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,14 @@ public function testNoInvalidArgumentExceptionIsThrownIfFromIsValid(string $from
6363
$response = $this->createMock(ResponseInterface::class);
6464
$response->expects(self::exactly(2))->method('getStatusCode')->willReturn(200);
6565
$response->expects(self::once())->method('getContent')->willReturn('');
66-
$client = new MockHttpClient(function (string $method, string $url) use ($response): ResponseInterface {
66+
$client = new MockHttpClient(function (string $method, string $url, array $options) use ($response): ResponseInterface {
6767
self::assertSame('POST', $method);
6868
self::assertSame('https://rest.clicksend.com/v3/sms/send', $url);
6969

70+
$body = json_decode($options['body'], true);
71+
self::assertIsArray($body);
72+
self::assertArrayHasKey('messages', $body);
73+
7074
return $response;
7175
});
7276
$transport = $this->createTransport($client, $from);

‎src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@
468468
</trans-unit>
469469
<trans-unit id="121">
470470
<source>This value is not a valid Twig template.</source>
471-
<target state="needs-review-translation">Это значение не является допустимым шаблоном Twig.</target>
471+
<target>Это значение не является корректным шаблоном Twig.</target>
472472
</trans-unit>
473473
</body>
474474
</file>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.