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 #46592 - Ignore getter with required parameters
  [Serializer] Fix inconsistent behaviour of nullable objects in key/value arrays

Author: derrabus

Mapping/Loader/AnnotationLoader.php

@@ -100,6 +100,11 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata): bool
                 continue;
             }
 
+            $getAccessor = preg_match('/^(get|)(.+)$/i', $method->name);
+            if ($getAccessor && 0 !== $method->getNumberOfRequiredParameters()) {
+                continue; /*  matches the BC behavior in `Symfony\Component\Serializer\Normalizer\ObjectNormalizer::extractAttributes` */
+            }
+
             $accessorOrMutator = preg_match('/^(get|is|has|set)(.+)$/i', $method->name, $matches);
             if ($accessorOrMutator) {
                 $attributeName = lcfirst($matches[2]);

Normalizer/AbstractObjectNormalizer.php

@@ -321,6 +321,10 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
 
         $this->validateCallbackContext($context);
 
+        if (null === $data && isset($context['value_type']) && $context['value_type'] instanceof Type && $context['value_type']->isNullable()) {
+            return null;
+        }
+
         $allowedAttributes = $this->getAllowedAttributes($type, $context, true);
         $normalizedData = $this->prepareForDenormalization($data);
         $extraAttributes = [];
@@ -486,6 +490,8 @@ private function validateAndDenormalize(array $types, string $currentClass, stri
                     if (\count($collectionKeyType = $type->getCollectionKeyTypes()) > 0) {
                         [$context['key_type']] = $collectionKeyType;
                     }
+
+                    $context['value_type'] = $collectionValueType;
                 } elseif ($type->isCollection() && \count($collectionValueType = $type->getCollectionValueTypes()) > 0 && Type::BUILTIN_TYPE_ARRAY === $collectionValueType[0]->getBuiltinType()) {
                     // get inner type for any nested array
                     [$innerType] = $collectionValueType;

Tests/Fixtures/Annotations/Entity45016.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Symfony\Component\Serializer\Tests\Fixtures\Annotations;
 
 use Symfony\Component\Serializer\Annotation\Ignore;

Tests/Fixtures/Annotations/IgnoreDummyAdditionalGetter.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Symfony\Component\Serializer\Tests\Fixtures\Annotations;
+
+use Symfony\Component\Serializer\Annotation\Ignore;
+
+class IgnoreDummyAdditionalGetter
+{
+    private $myValue;
+
+    /**
+     * @Ignore()
+     */
+    public function getMyValue()
+    {
+        return $this->myValue;
+    }
+
+    public function getExtraValue(string $parameter)
+    {
+        return $parameter;
+    }
+}

Tests/Fixtures/Annotations/IgnoreDummyAdditionalGetterWithoutIgnoreAnnotations.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Serializer\Tests\Fixtures\Annotations;
+
+class IgnoreDummyAdditionalGetterWithoutIgnoreAnnotations
+{
+    private $myValue;
+
+    public function getMyValue()
+    {
+        return $this->myValue;
+    }
+
+    public function getExtraValue(string $parameter)
+    {
+        return $parameter;
+    }
+}

Tests/Fixtures/Attributes/Entity45016.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Symfony\Component\Serializer\Tests\Fixtures\Attributes;
 
 use Symfony\Component\Serializer\Annotation\Ignore;

Tests/Fixtures/Attributes/IgnoreDummyAdditionalGetter.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Symfony\Component\Serializer\Tests\Fixtures\Attributes;
+
+use Symfony\Component\Serializer\Annotation\Ignore;
+
+class IgnoreDummyAdditionalGetter
+{
+    private $myValue;
+
+    #[Ignore]
+    public function getIgnored2()
+    {
+        return $this->myValue;
+    }
+
+    public function getExtraValue(string $parameter)
+    {
+        return $parameter;
+    }
+}

Tests/Fixtures/Attributes/IgnoreDummyAdditionalGetterWithoutIgnoreAnnotations.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Serializer\Tests\Fixtures\Attributes;
+
+class IgnoreDummyAdditionalGetterWithoutIgnoreAnnotations
+{
+    private $myValue;
+
+    public function getIgnored2()
+    {
+        return $this->myValue;
+    }
+
+    public function getExtraValue(string $parameter)
+    {
+        return $parameter;
+    }
+}

Tests/Mapping/Loader/AnnotationLoaderTest.php

@@ -152,6 +152,24 @@ public function testCanHandleUnrelatedIgnoredMethods()
         $loader->loadClassMetadata($metadata);
     }
 
+    public function testIgnoreGetterWirhRequiredParameterIfIgnoreAnnotationIsUsed()
+    {
+        $classMetadata = new ClassMetadata($this->getNamespace().'\IgnoreDummyAdditionalGetter');
+        $this->getLoaderForContextMapping()->loadClassMetadata($classMetadata);
+
+        $attributes = $classMetadata->getAttributesMetadata();
+        self::assertArrayNotHasKey('extraValue', $attributes);
+    }
+
+    public function testIgnoreGetterWirhRequiredParameterIfIgnoreAnnotationIsNotUsed()
+    {
+        $classMetadata = new ClassMetadata($this->getNamespace().'\IgnoreDummyAdditionalGetterWithoutIgnoreAnnotations');
+        $this->getLoaderForContextMapping()->loadClassMetadata($classMetadata);
+
+        $attributes = $classMetadata->getAttributesMetadata();
+        self::assertArrayNotHasKey('extraValue', $attributes);
+    }
+
     abstract protected function createLoader(): AnnotationLoader;
 
     abstract protected function getNamespace(): string;