8000 Merge branch '5.3' into 5.4 · symfony/symfony@d17ae34 · GitHub
[go: up one dir, main page]
Skip to content

Commit d17ae34

Browse files
derrabusderrabus
committed
Merge branch '5.3' into 5.4
* 5.3: [Mime] Relaxing in-reply-to header validation fix test to actually use data provider
2 parents a42dbe3 + 4d4d706 commit d17ae34

File tree

6 files changed

+23
-15
lines changed

6 files changed

+23
-15
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache_app_redis_tag_aware_pool.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22

33
$container->loadFromExtension('framework', [
44
'cache' => [
5-
'app' => 'cache.redis_tag_aware.bar',
5+
'app' => 'cache.redis_tag_aware.foo',
66
'pools' => [
77
'cache.redis_tag_aware.foo' => [
88
'adapter' => 'cache.adapter.redis_tag_aware',
99
],
10-
'cache.redis_tag_aware.bar' => [
11-
'adapter' => 'cache.redis_tag_aware.foo',
12-
],
1310
],
1411
],
1512
]);

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache_app_redis_tag_aware_pool.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77

88
<framework:config>
99
<framework:cache>
10-
<framework:app>cache.redis_tag_aware.bar</framework:app>
10+
<framework:app>cache.redis_tag_aware.foo</framework:app>
1111
<framework:pool name="cache.redis_tag_aware.foo" adapter="cache.adapter.redis_tag_aware" />
12-
<framework:pool name="cache.redis_tag_aware.bar" adapter="cache.redis_tag_aware.foo" />
1312
</framework:cache>
1413
</framework:config>
1514
</container>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/cache_app_redis_tag_aware_pool.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
framework:
22
cache:
3-
app: cache.redis_tag_aware.bar
3+
app: cache.redis_tag_aware.foo
44
pools:
55
cache.redis_tag_aware.foo:
66
adapter: cache.adapter.redis_tag_aware
7-
cache.redis_tag_aware.bar:
8-
adapter: cache.redis_tag_aware.foo

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1689,11 +1689,11 @@ public function testRedisTagAwareAdapter()
16891689
}
16901690

16911691
/**
1692-
* @dataProvider testAppRedisTagAwareConfigProvider
1692+
* @dataProvider appRedisTagAwareConfigProvider
16931693
*/
1694-
public function testAppRedisTagAwareAdapter()
1694+
public function testAppRedisTagAwareAdapter(string $configFile)
16951695
{
1696-
$container = $this->createContainerFromFile('cache_app_redis_tag_aware');
1696+
$container = $this->createContainerFromFile($configFile);
16971697

16981698
foreach ([TagAwareCacheInterface::class, CacheInterface::class, CacheItemPoolInterface::class] as $alias) {
16991699
$def = $container->findDefinition($alias);
@@ -1706,7 +1706,7 @@ public function testAppRedisTagAwareAdapter()
17061706
}
17071707
}
17081708

1709-
public function testAppRedisTagAwareConfigProvider(): array
1709+
public function appRedisTagAwareConfigProvider(): array
17101710
{
17111711
return [
17121712
['cache_app_redis_tag_aware'],

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ final class Headers
3434
'cc' => MailboxListHeader::class,
3535
'bcc' => MailboxListHeader::class,
3636
'message-id' => IdentificationHeader::class,
37-
'in-reply-to' => IdentificationHeader::class,
38-
'references' => IdentificationHeader::class,
37+
'in-reply-to' => UnstructuredHeader::class, // `In-Reply-To` and `References` are less strict than RFC 2822 (3.6.4) to allow users entering the original email's ...
38+
'references' => UnstructuredHeader::class, // ... `Message-ID`, even if that is no valid `msg-id`
3939
'return-path' => PathHeader::class,
4040
];
4141

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,20 @@ public function testToArray()
280280
], $headers->toArray());
281281
}
282282

283+
public function testInReplyToAcceptsNonIdentifierValues()
284+
{
285+
$headers = new Headers();
286+
$headers->addHeader('In-Reply-To', 'foobar');
287+
$this->assertEquals('foobar', $headers->get('In-Reply-To')->getBody());
288+
}
289+
290+
public function testReferencesAcceptsNonIdentifierValues()
291+
{
292+
$headers = new Headers();
293+
$headers->addHeader('References' , 'foobar');
294+
$this->assertEquals('foobar', $headers->get('References')->getBody());
295+
}
296+
283297
public function testHeaderBody()
284298
{
285299
$headers = new Headers();

0 commit comments

Comments
 (0)
0