Merge branch '6.4' into 7.0

* 6.4:
  [HttpClient][Mailer] Revert "Let curl handle transfer encoding", use HTTP/1.1 for Mailgun
  Reviewed Catalan missing translations
  [AssetMapper] Upgrade importmap polyfill
  Fix typo: synchronous -> synchronously
  [Serializer] Check if exception message in test is correct
  Ibexa is sponsoring Symfony 5.4, thanks to them! \o/
  [VarDumper] Fix `FFICaster` test to be platform-adaptable
  [String] Add `alias` case to `EnglishInflector`
  [FrameworkBundle] Throw runtime exception when trying to use asset-mapper while http-client is disabled
  [SecurityBundle] Remove unused memory users’ `name` attribute from the XSD
  [VarExporter] generate __doUnserialize() method in ProxyHelper::generateLazyProxy()
  Double check if pcntl function exists
  Add additional headers in Scaleway bridge
  [VarDumper] Fix FFI caster test
  [DependencyInjection] Add test coverage for `AutowireCallable::buildDefinition()`

ProxyHelper.php

@@ -197,10 +197,35 @@ public static function generateLazyProxy(?\ReflectionClass $class, array $interf
         $body = $methods ? "\n".implode("\n\n", $methods)."\n" : '';
         $propertyScopes = $class ? self::exportPropertyScopes($class->name) : '[]';
 
+        if (
+            $class?->hasMethod('__unserialize')
+            && !$class->getMethod('__unserialize')->getParameters()[0]->getType()
+        ) {
+            // fix contravariance type problem when $class declares a `__unserialize()` method without typehint.
+            $lazyProxyTraitStatement = <<<EOPHP
+            use \Symfony\Component\VarExporter\LazyProxyTrait {
+                    __unserialize as private __doUnserialize;
+                }
+            EOPHP;
+
+            $body .= <<<EOPHP
+
+                    public function __unserialize(\$data): void
+                    {
+                        \$this->__doUnserialize(\$data);
+                    }
+
+                EOPHP;
+        } else {
+            $lazyProxyTraitStatement = <<<EOPHP
+            use \Symfony\Component\VarExporter\LazyProxyTrait;
+            EOPHP;
+        }
+
         return <<<EOPHP
             {$parent} implements \\{$interfaces}
             {
-                use \Symfony\Component\VarExporter\LazyProxyTrait;
+                {$lazyProxyTraitStatement}
 
                 private const LAZY_OBJECT_PROPERTY_SCOPES = {$propertyScopes};
             {$body}}

Tests/ProxyHelperTest.php

@@ -160,6 +160,50 @@ class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectState::class);
         $this->assertSame($expected, ProxyHelper::generateLazyProxy(null, [new \ReflectionClass(TestForProxyHelperInterface1::class), new \ReflectionClass(TestForProxyHelperInterface2::class)]));
     }
 
+    /**
+     * @dataProvider classWithUnserializeMagicMethodProvider
+     */
+    public function testGenerateLazyProxyForClassWithUnserializeMagicMethod(object $obj, string $expected)
+    {
+        $this->assertStringContainsString($expected, ProxyHelper::generateLazyProxy(new \ReflectionClass($obj::class)));
+    }
+
+    public static function classWithUnserializeMagicMethodProvider(): iterable
+    {
+        yield 'not type hinted __unserialize method' => [new class() {
+            public function __unserialize($array)
+            {
+            }
+        }, <<<'EOPHP'
+        implements \Symfony\Component\VarExporter\LazyObjectInterface
+        {
+            use \Symfony\Component\VarExporter\LazyProxyTrait {
+                __unserialize as private __doUnserialize;
+            }
+
+            private const LAZY_OBJECT_PROPERTY_SCOPES = [];
+
+            public function __unserialize($data): void
+            {
+                $this->__doUnserialize($data);
+            }
+        }
+        EOPHP];
+
+        yield 'type hinted __unserialize method' => [new class() {
+            public function __unserialize(array $array)
+            {
+            }
+        }, <<<'EOPHP'
+        implements \Symfony\Component\VarExporter\LazyObjectInterface
+        {
+            use \Symfony\Component\VarExporter\LazyProxyTrait;
+
+            private const LAZY_OBJECT_PROPERTY_SCOPES = [];
+        }
+        EOPHP];
+    }
+
     public function testAttributes()
     {
         $expected = <<<'EOPHP'
@@ -182,6 +226,7 @@ public function foo(#[\SensitiveParameter, AnotherAttribute] $a): int
             {
             }
         });
+
         $this->assertStringContainsString($expected, ProxyHelper::generateLazyProxy($class));
     }