Merge branch '6.4' into 7.4

nicolas-grekas · nicolas-grekas · commit bd395bbc6fab · 2026-03-06T14:15:18.000+01:00
* 6.4:
  [HttpFoundation] Fix session cookie_lifetime not applied in mock session storage
  [Serializer] Fix denormalization of magic `__set` properties
  Add 'sms' to hostless schemes
diff --git a/Normalizer/ObjectNormalizer.php b/Normalizer/ObjectNormalizer.php
@@ -146,9 +146,18 @@ protected function isAllowedAttribute($classOrObject, string $attribute, ?string
         $context = array_intersect_key($context, ['enable_getter_setter_extraction' => true, 'enable_magic_methods_extraction' => true, 'enable_constructor_extraction' => true, 'enable_adder_remover_extraction' => true]);
         $cacheKey = $class.$attribute.hash('xxh128', serialize($context));
 
-        return self::$isWritableCache[$cacheKey] ??= str_contains($attribute, '.')
-            || $this->propertyInfoExtractor->isWritable($class, $attribute, $context)
-            || !\in_array($this->writeInfoExtractor->getWriteInfo($class, $attribute, $context)?->getType(), [null, PropertyWriteInfo::TYPE_NONE, PropertyWriteInfo::TYPE_PROPERTY], true);
+        if (isset(self::$isWritableCache[$cacheKey])) {
+            return self::$isWritableCache[$cacheKey];
+        }
+
+        if (str_contains($attribute, '.') || $this->propertyInfoExtractor->isWritable($class, $attribute, $context)) {
+            return self::$isWritableCache[$cacheKey] = true;
+        }
+
+        $writeType = $this->writeInfoExtractor->getWriteInfo($class, $attribute, $context)?->getType();
+
+        return self::$isWritableCache[$cacheKey] = !\in_array($writeType, [null, PropertyWriteInfo::TYPE_NONE], true)
+            && (PropertyWriteInfo::TYPE_PROPERTY !== $writeType || !property_exists($class, $attribute));
     }
 
     private function hasAttributeAccessorMethod(string $class, string $attribute): bool
diff --git a/Tests/Fixtures/MagicSetDummy.php b/Tests/Fixtures/MagicSetDummy.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+class MagicSetDummy
+{
+    public array $params = [];
+
+    public function __set(string $name, mixed $value): void
+    {
+        $this->params[$name] = $value;
+    }
+
+    public function __get(string $name)
+    {
+        return $this->params[$name] ?? null;
+    }
+
+    public function __isset(string $name): bool
+    {
+        return true;
+    }
+}
diff --git a/Tests/Normalizer/ObjectNormalizerTest.php b/Tests/Normalizer/ObjectNormalizerTest.php
@@ -54,6 +54,7 @@
 use Symfony\Component\Serializer\Tests\Fixtures\CircularReferenceDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\DummyPrivatePropertyWithoutGetter;
 use Symfony\Component\Serializer\Tests\Fixtures\DummyWithUnion;
+use Symfony\Component\Serializer\Tests\Fixtures\MagicSetDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\OtherSerializedNameDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\Php74Dummy;
 use Symfony\Component\Serializer\Tests\Fixtures\Php74DummyPrivate;
@@ -909,6 +910,19 @@ public function testDenormalizeNonExistingAttribute()
         );
     }
 
+    public function testDenormalizeMagicSet()
+    {
+        $obj = $this->normalizer->denormalize(
+            ['param1' => 'test', 'param2' => 42],
+            MagicSetDummy::class,
+            'any',
+            [AbstractNormalizer::ALLOW_EXTRA_ATTRIBUTES => true]
+        );
+
+        $this->assertSame('test', $obj->params['param1']);
+        $this->assertSame(42, $obj->params['param2']);
+    }
+
     public function testNoTraversableSupport()
     {
         $this->assertFalse($this->normalizer->supportsNormalization(new \ArrayObject()));
