8000 Merge branch '4.3' into 4.4 · symfony/symfony@d3a50d6 · GitHub
[go: up one dir, main page]
Skip to content

Commit d3a50d6

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.3' into 4.4
* 4.3: Properly handle optional tag attributes for !tagged_iterator [Mime] rename Headers::getAll() to all() [Mailer] Fix phpdoc for variadic methods [HttpClient] fix debug output added to stderr at shutdown
2 parents c9b149c + 3f98846 commit d3a50d6

File tree

14 files changed

+49
-31
lines changed

14 files changed

+49
-31
lines changed

‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ private function resolveServices($value, $file, $isParameter = false)
741741
throw new InvalidArgumentException(sprintf('"!%s" tag contains unsupported key "%s"; supported ones are "tag", "index_by" and "default_index_method".', $value->getTag(), implode('"", "', $diff)));
742742
}
743743

744-
$argument = new TaggedIteratorArgument($argument['tag'], $argument['index_by'], $argument['default_index_method'] ?? null, $forLocator);
744+
$argument = new TaggedIteratorArgument($argument['tag'], $argument['index_by'] ?? null, $argument['default_index_method'] ?? null, $forLocator);
745745

746746
if ($forLocator) {
747747
$argument = new ServiceLocatorArgument($argument);

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/tagged_iterator_optional.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
services:
2+
iterator_service:
3+
class: FooClass
4+
arguments: [!tagged_iterator {tag: test.tag}]

‎src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -858,4 +858,18 @@ public function testOverriddenDefaultsBindings()
858858

859859
$this->assertSame('overridden', $container->get('bar')->quz);
860860
}
861+
862+
/**
863+
* When creating a tagged iterator using the array syntax, all optional parameters should be properly handled.
864+
*/
865+
public function testDefaultValueOfTagged()
866+
{
867+
$container = new ContainerBuilder();
868+
$loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
869+
$loader->load('tagged_iterator_optional.yml');
870+
871+
$iteratorArgument = $container->getDefinition('iterator_service')->getArgument(0);
872+
$this->assertInstanceOf(TaggedIteratorArgument::class, $iteratorArgument);
873+
$this->assertNull($iteratorArgument->getIndexAttribute());
874+
}
861875
}

‎src/Symfony/Component/Mailer/Bridge/Mailchimp/Http/Api/MandrillTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private function getPayload(Email $email, SmtpEnvelope $envelope): array
8484
}
8585

8686
$headersToBypass = ['from', 'to', 'cc', 'bcc', 'subject', 'content-type'];
87-
foreach ($email->getHeaders()->getAll() as $name => $header) {
87+
foreach ($email->getHeaders()->all() as $name => $header) {
8888
if (\in_array($name, $headersToBypass, true)) {
8989
continue;
9090
}

‎src/Symfony/Component/Mailer/Bridge/Mailgun/Http/Api/MailgunTransport.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected function doSendApi(Email $email, SmtpEnvelope $envelope): ResponseInte
4545
{
4646
$body = new FormDataPart($this->getPayload($email, $envelope));
4747
$headers = [];
48-
foreach ($body->getPreparedHeaders()->getAll() as $header) {
48+
foreach ($body->getPreparedHeaders()->all() as $header) {
4949
$headers[] = $header->toString();
5050
}
5151

@@ -98,7 +98,7 @@ private function getPayload(Email $email, SmtpEnvelope $envelope): array
9898
}
9999

100100
$headersToBypass = ['from', 'to', 'cc', 'bcc', 'subject', 'content-type'];
101-
foreach ($headers->getAll() as $name => $header) {
101+
foreach ($headers->all() as $name => $header) {
102102
if (\in_array($name, $headersToBypass, true)) {
103103
continue;
104104
}

‎src/Symfony/Component/Mailer/Bridge/Mailgun/Http/MailgunTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
4747
'message' => new DataPart($message->toString(), 'message.mime'),
4848
]);
4949
$headers = [];
50-
foreach ($body->getPreparedHeaders()->getAll() as $header) {
50+
foreach ($body->getPreparedHeaders()->all() as $header) {
5151
$headers[] = $header->toString();
5252
}
5353
$endpoint = str_replace(['%domain%', '%region_dot%'], [urlencode($this->domain), 'us' !== ($this->region ?: 'us') ? $this->region.'.' : ''], self::ENDPOINT);

‎src/Symfony/Component/Mailer/Bridge/Postmark/Http/Api/PostmarkTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private function getPayload(Email $email, SmtpEnvelope $envelope): array
6969
];
7070

7171
$headersToBypass = ['from', 'to', 'cc', 'bcc', 'subject', 'content-type', 'sender'];
72-
foreach ($email->getHeaders()->getAll() as $name => $header) {
72+
foreach ($email->getHeaders()->all() as $name => $header) {
7373
if (\in_array($name, $headersToBypass, true)) {
7474
continue;
7575
}

‎src/Symfony/Component/Mailer/Bridge/Sendgrid/Http/Api/SendgridTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private function getPayload(Email $email, SmtpEnvelope $envelope): array
8383
// these headers can't be overwritten according to Sendgrid docs
8484
// see https://developers.pepipost.com/migration-api/new-subpage/email-send
8585
$headersToBypass = ['x-sg-id', 'x-sg-eid', 'received', 'dkim-signature', 'content-transfer-encoding', 'from', 'to', 'cc', 'bcc', 'subject', 'content-type', 'reply-to'];
86-
foreach ($email->getHeaders()->getAll() as $name => $header) {
86+
foreach ($email->getHeaders()->all() as $name => $header) {
8787
if (\in_array($name, $headersToBypass, true)) {
8888
continue;
8989
}

‎src/Symfony/Component/Mailer/DelayedSmtpEnvelope.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private static function getRecipientsFromHeaders(Headers $headers): array
7171
{
7272
$recipients = [];
7373
foreach (['to', 'cc', 'bcc'] as $name) {
74-
foreach ($headers->getAll($name) as $header) {
74+
foreach ($headers->all($name) as $header) {
7575
foreach ($header->getAddresses() as $address) {
7676
$recipients[] = new Address($address->getAddress());
7777
}

‎src/Symfony/Component/Mailer/EventListener/MessageListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ private function setHeaders(Message $message): void
5151
}
5252

5353
$headers = $message->getHeaders();
54-
foreach ($this->headers->getAll() as $name => $header) {
54+
foreach ($this->headers->all() as $name => $header) {
5555
if (!$headers->has($name)) {
5656
$headers->add($header);
5757
} else {

‎src/Symfony/Component/Mime/Email.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public function getSender(): ?Address
101101
}
102102

103103
/**
104-
* @param Address|NamedAddress|string $addresses
104+
* @param Address|NamedAddress|string ...$addresses
105105
*
106106
* @return $this
107107
*/
@@ -111,7 +111,7 @@ public function addFrom(...$addresses)
111111
}
112112

113113
/**
114-
* @param Address|NamedAddress|string $addresses
114+
* @param Address|NamedAddress|string ...$addresses
115115
*
116116
* @return $this
117117
*/
@@ -129,7 +129,7 @@ public function getFrom(): array
129129
}
130130

131131
/**
132-
* @param Address|string $addresses
132+
* @param Address|string ...$addresses
133133
*
134134
* @return $this
135135
*/
@@ -139,7 +139,7 @@ public function addReplyTo(...$addresses)
139139
}
140140

141141
/**
142-
* @param Address|string $addresses
142+
* @param Address|string ...$addresses
143143
*
144144
* @return $this
145145
*/
@@ -157,7 +157,7 @@ public function getReplyTo(): array
157157
}
158158

159159
/**
160-
* @param Address|NamedAddress|string $addresses
160+
* @param Address|NamedAddress|string ...$addresses
161161
*
162162
* @return $this
163163
*/
@@ -167,7 +167,7 @@ public function addTo(...$addresses)
167167
}
168168

169169
/**
170-
* @param Address|NamedAddress|string $addresses
170+
* @param Address|NamedAddress|string ...$addresses
171171
*
172172
* @return $this
173173
*/
@@ -185,7 +185,7 @@ public function getTo(): array
185185
}
186186

187187
/**
188-
* @param Address|NamedAddress|string $addresses
188+
* @param Address|NamedAddress|string ...$addresses
189189
*
190190
* @return $this
191191
*/
@@ -195,7 +195,7 @@ public function addCc(...$addresses)
195195
}
196196

197197
/**
198-
* @param Address|string $addresses
198+
* @param Address|string ...$addresses
199199
*
200200
* @return $this
201201
*/
@@ -213,7 +213,7 @@ public function getCc(): array
213213
}
214214

215215
/**
216-
* @param Address|NamedAddress|string $addresses
216+
* @param Address|NamedAddress|string ...$addresses
217217
*
218218
* @return $this
219219
*/
@@ -223,7 +223,7 @@ public function addBcc(...$addresses)
223223
}
224224

225225
/**
226-
* @param Address|string $addresses
226+
* @param Address|string ...$addresses
227227
*
228228
* @return $this
229229
*/

‎src/Symfony/Component/Mime/Header/Headers.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function __clone()
4949
public function setMaxLineLength(int $lineLength)
5050
{
5151
$this->lineLength = $lineLength;
52-
foreach ($this->getAll() as $header) {
52+
foreach ($this->all() as $header) {
5353
$header->setMaxLineLength($lineLength);
5454
}
5555
}
@@ -175,7 +175,7 @@ public function get(string $name): ?HeaderInterface
175175
return array_shift($values);
176176
}
177177

178-
public function getAll(string $name = null): iterable
178+
public function all(string $name = null): iterable
179179
{
180180
if (null === $name) {
181181
foreach ($this->headers as $name => $collection) {
@@ -218,7 +218,7 @@ public function toString(): string
218218
public function toArray(): array
219219
{
220220
$arr = [];
221-
foreach ($this->getAll() as $header) {
221+
foreach ($this->all() as $header) {
222222
if ('' !== $header->getBodyAsString()) {
223223
$arr[] = $header->toString();
224224
}

‎src/Symfony/Component/Mime/Tests/Header/HeadersTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public function testGetReturnsNullIfHeaderNotSet()
141141
$this->assertNull($headers->get('Message-ID'));
142142
}
143143

144-
public function testGetAllReturnsAllHeadersMatchingName()
144+
public function testAllReturnsAllHeadersMatchingName()
145145
{
146146
$header0 = new UnstructuredHeader('X-Test', 'some@id');
147147
$header1 = new UnstructuredHeader('X-Test', 'other@id');
@@ -150,10 +150,10 @@ public function testGetAllReturnsAllHeadersMatchingName()
150150
$headers->addTextHeader('X-Test', 'some@id');
151151
$headers->addTextHeader('X-Test', 'other@id');
152152
$headers->addTextHeader('X-Test', 'more@id');
153-
$this->assertEquals([$header0, $header1, $header2], iterator_to_array($headers->getAll('X-Test')));
153+
$this->assertEquals([$header0, $header1, $header2], iterator_to_array($headers->all('X-Test')));
154154
}
155155

156-
public function testGetAllReturnsAllHeadersIfNoArguments()
156+
public function testAllReturnsAllHeadersIfNoArguments()
157157
{
158158
$header0 = new IdentificationHeader('Message-ID', 'some@id');
159159
$header1 = new UnstructuredHeader('Subject', 'thing');
@@ -162,13 +162,13 @@ public function testGetAllReturnsAllHeadersIfNoArguments()
162162
$headers->addIdHeader('Message-ID', 'some@id');
163163
$headers->addTextHeader('Subject', 'thing');
164164
$headers->addMailboxListHeader('To', [new Address('person@example.org')]);
165-
$this->assertEquals(['message-id' => $header0, 'subject' => $header1, 'to' => $header2], iterator_to_array($headers->getAll()));
165+
$this->assertEquals(['message-id' => $header0, 'subject' => $header1, 'to' => $header2], iterator_to_array($headers->all()));
166166
}
167167

168-
public function testGetAllReturnsEmptyArrayIfNoneSet()
168+
public function testAllReturnsEmptyArrayIfNoneSet()
169169
{
170170
$headers = new Headers();
171-
$this->assertEquals([], iterator_to_array($headers->getAll('Received')));
171+
$this->assertEquals([], iterator_to_array($headers->all('Received')));
172172
}
173173

174174
public function testRemoveRemovesAllHeadersWithName()
@@ -199,12 +199,12 @@ public function testGetIsNotCaseSensitive()
199199
$this->assertEquals($header, $headers->get('message-id'));
200200
}
201201

202-
public function testGetAllIsNotCaseSensitive()
202+
public function testAllIsNotCaseSensitive()
203203
{
204204
$header = new IdentificationHeader('Message-ID', 'some@id');
205205
$headers = new Headers();
206206
$headers->addIdHeader('Message-ID', 'some@id');
207-
$this->assertEquals([$header], iterator_to_array($headers->getAll('message-id')));
207+
$this->assertEquals([$header], iterator_to_array($headers->all('message-id')));
208208
}
209209

210210
public function testRemoveIsNotCaseSensitive()

‎src/Symfony/Component/Mime/Tests/MessageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function testGetPreparedHeaders()
6868
$message = new Message();
6969
$message->getHeaders()->addMailboxListHeader('From', ['fabien@symfony.com']);
7070
$h = $message->getPreparedHeaders();
71-
$this->assertCount(4, iterator_to_array($h->getAll()));
71+
$this->assertCount(4, iterator_to_array($h->all()));
7272
$this->assertEquals(new MailboxListHeader('From', [new Address('fabien@symfony.com')]), $h->get('From'));
7373
$this->assertEquals(new UnstructuredHeader('MIME-Version', '1.0'), $h->get('mime-version'));
7474
$this->assertTrue($h->has('Message-Id'));

0 commit comments

Comments
 (0)
0