Skip to content

Commit cc66741

Browse files
derrabusderrabus
committed
Merge branch '6.1' into 6.2
* 6.1: Fix CS Fix CS quote address names if they contain parentheses [FrameworkBundle] Fail gracefully when forms use disabled CSRF [Mime] Fix inline parts when added via attachPart() Fail gracefully when attempting to autowire composite types [VarDumper] Add a test case for nesting intersection and union types Fix symfony#46592 - Ignore getter with required parameters [Serializer] Fix inconsistent behaviour of nullable objects in key/value arrays
2 parents 1bd42d0 + aa975a8 commit cc66741

25 files changed

+701
-28
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,10 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont
712712
}
713713

714714
if ($this->isConfigEnabled($container, $config['form']['csrf_protection'])) {
715+
if (!$container->hasDefinition('security.csrf.token_generator')) {
716+
throw new \LogicException('To use form CSRF protection, "framework.csrf_protection" must be enabled.');
717+
}
718+
715719
$loader->load('form_csrf.php');
716720

717721
$container->setParameter('form.type_extension.csrf.enabled', true);

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework', [
4+
'csrf_protection' => false,
5+
'form' => [
6+
'csrf_protection' => true,
7+
],
8+
]);

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" ?>
2+
3+
<container xmlns="http://symfony.com/schema/dic/services"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xmlns:framework="http://symfony.com/schema/dic/symfony"
6+
xsi:schemaLocation="http://symfony.com/schema/dic/services
7+
https://symfony.com/schema/dic/services/services-1.0.xsd
8+
http://symfony.com/schema/dic/symfony
9+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
10+
>
11+
<framework:config>
12+
<framework:csrf-protection enabled="false"/>
13+
<framework:form enabled="true">
14+
<framework:csrf-protection enabled="true"/>
15+
</framework:form>
16+
</framework:config>
17+
</container>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
framework:
2+
csrf_protection: false
3+
form:
4+
csrf_protection: true

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,14 @@ public function testFormCsrfProtection()
100100
$this->assertEquals('%form.type_extension.csrf.field_name%', $def->getArgument(2));
101101
}
102102

103+
public function testFormCsrfProtectionWithCsrfDisabled()
104+
{
105+
$this->expectException(\LogicException::class);
106+
$this->expectExceptionMessage('To use form CSRF protection `framework.csrf_protection` must be enabled.');
107+
108+
$this->createContainerFromFile('form_csrf_disabled');
109+
}
110+
103111
public function testPropertyAccessWithDefaultValue()
104112
{
105113
$container = $this->createContainerFromFile('full');

‎src/Symfony/Component/DependencyInjection/LazyProxy/ProxyHelper.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionPa
3232
return null;
3333
}
3434

35+
return self::getTypeHintForType($type, $r, $noBuiltin);
36+
}
37+
38+
private static function getTypeHintForType(\ReflectionType $type, \ReflectionFunctionAbstract $r, bool $noBuiltin): ?string
39+
{
3540
$types = [];
3641
$glue = '|';
3742
if ($type instanceof \ReflectionUnionType) {
@@ -46,6 +51,17 @@ public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionPa
4651
}
4752

4853
foreach ($reflectionTypes as $type) {
54+
if ($type instanceof \ReflectionIntersectionType) {
55+
$typeHint = self::getTypeHintForType($type, $r, $noBuiltin);
56+
if (null === $typeHint) {
57+
return null;
58+
}
59+
60+
$types[] = sprintf('(%s)', $typeHint);
61+
62+
continue;
63+
}
64+
4965
if ($type->isBuiltin()) {
5066
if (!$noBuiltin) {
5167
$types[] = $type->getName();

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,6 @@ public function testTypeNotGuessableNoServicesFound()
240240

241241
public function testTypeNotGuessableUnionType()
242242
{
243-
$this->expectException(AutowiringFailedException::class);
244-
$this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\UnionClasses::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionA|Symfony\Component\DependencyInjection\Tests\Compiler\CollisionB" but this class was not found.');
245243
$container = new ContainerBuilder();
246244

247245
$container->register(CollisionA::class);
@@ -251,6 +249,9 @@ public function testTypeNotGuessableUnionType()
251249
$aDefinition->setAutowired(true);
252250

253251
$pass = new AutowirePass();
252+
253+
$this->expectException(AutowiringFailedException::class);
254+
$this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\UnionClasses::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionA|Symfony\Component\DependencyInjection\Tests\Compiler\CollisionB" but this class was not found.');
254255
$pass->process($container);
255256
}
256257

@@ -284,7 +285,27 @@ public function testTypeNotGuessableIntersectionType()
284285
$pass = new AutowirePass();
285286

286287
$this->expectException(AutowiringFailedException::class);
287-
$this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\IntersectionClasses::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\AnotherInterface&Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but this class was not found.');
288+
$this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\IntersectionClasses::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface&Symfony\Component\DependencyInjection\Tests\Compiler\AnotherInterface" but this class was not found.');
289+
$pass->process($container);
290+
}
291+
292+
/**
293+
* @requires PHP 8.2
294+
*/
295+
public function testTypeNotGuessableCompositeType()
296+
{
297+
$container = new ContainerBuilder();
298+
299+
$container->register(CollisionInterface::class);
300+
$container->register(AnotherInterface::class);
301+
302+
$aDefinition = $container->register('a', CompositeTypeClasses::class);
303+
$aDefinition->setAutowired(true);
304+
305+
$pass = new AutowirePass();
306+
307+
$this->expectException(AutowiringFailedException::class);
308+
$this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\CompositeTypeClasses::__construct()" has type "(Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface&Symfony\Component\DependencyInjection\Tests\Compiler\AnotherInterface)|Symfony\Component\DependencyInjection\Tests\Compiler\YetAnotherInterface" but this class was not found.');
288309
$pass->process($container);
289310
}
290311

@@ -402,6 +423,22 @@ public function testParameterWithNullUnionIsSkipped()
402423
$this->assertNull($definition->getArgument(0));
403424
}
404425

426+
/**
427+
* @requires PHP 8.2
428+
*/
429+
public function testParameterWithNullableIntersectionIsSkipped()
430+
{
431+
$container = new ContainerBuilder();
432+
433+
$optDefinition = $container->register('opt', NullableIntersection::class);
434+
$optDefinition->setAutowired(true);
435+
436+
(new AutowirePass())->process($container);
437+
438+
$definition = $container->getDefinition('opt');
439+
$this->assertNull($definition->getArgument(0));
440+
}
441+
405442
public function testParameterWithNullUnionIsAutowired()
406443
{
407444
$container = new ContainerBuilder();

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
require __DIR__.'/uniontype_classes.php';
88
require __DIR__.'/autowiring_classes_80.php';
99
require __DIR__.'/intersectiontype_classes.php';
10+
if (\PHP_VERSION_ID >= 80200) {
11+
require __DIR__.'/compositetype_classes.php';
12+
}
1013

1114
class Foo
1215
{

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/compositetype_classes.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?php
2+
3+
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
4+
5+
interface YetAnotherInterface
6+
{
7+
}
8+
9+
class CompositeTypeClasses
10+
{
11+
public function __construct((CollisionInterface&AnotherInterface)|YetAnotherInterface $collision)
12+
{
13+
}
14+
}
15+
16+
class NullableIntersection
17+
{
18+
public function __construct((CollisionInterface&AnotherInterface)|null $a)
19+
{
20+
}
21+
}

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

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -501,25 +501,37 @@ private function prepareParts(): ?array
501501
$names = array_filter(array_unique($names));
502502
}
503503

504+
// usage of reflection is a temporary workaround for missing getters that will be added in 6.2
505+
$dispositionRef = new \ReflectionProperty(TextPart::class, 'disposition');
506+
$dispositionRef->setAccessible(true);
507+
$nameRef = new \ReflectionProperty(TextPart::class, 'name');
508+
$nameRef->setAccessible(true);
504509
$attachmentParts = $inlineParts = [];
505510
foreach ($this->attachments as $attachment) {
511+
$part = $this->createDataPart($attachment);
512+
if (isset($attachment['part'])) {
513+
$attachment['name'] = $nameRef->getValue($part);
514+
}
515+
506516
foreach ($names as $name) {
507-
if (isset($attachment['part'])) {
508-
continue;
509-
}
510517
if ($name !== $attachment['name']) {
511518
continue;
512519
}
513520
if (isset($inlineParts[$name])) {
514521
continue 2;
515522
}
516-
$attachment['inline'] = true;
517-
$inlineParts[$name] = $part = $this->createDataPart($attachment);
523+
$part->setDisposition('inline');
518524
$html = str_replace('cid:'.$name, 'cid:'.$part->getContentId(), $html);
519525
$part->setName($part->getContentId());
520-
continue 2;
526+
527+
break;
528+
}
529+
530+
if ('inline' === $dispositionRef->getValue($part)) {
531+
$inlineParts[$attachment['name']] = $part;
532+
} else {
533+
$attachmentParts[] = $part;
521534
}
522-
$attachmentParts[] = $this->createDataPart($attachment);
523535
}
524536
if (null !== $htmlPart) {
525537
$htmlPart = new TextPart($html, $this->htmlCharset, 'html');

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,11 @@ protected function createPhrase(HeaderInterface $header, string $string, string
109109
}
110110
$phraseStr = $this->encodeWords($header, $string, $usedLength);
111111
}
112+
} elseif (str_contains($phraseStr, '(')) {
113+
foreach (['\\', '"'] as $char) {
114+
$phraseStr = str_replace($char, '\\'.$char, $phraseStr);
115+
}
116+
$phraseStr = '"'.$phraseStr.'"';
112117
}
113118

114119
return $phraseStr;

0 commit comments

Comments
 (0)