Merge branch '7.4' into 8.0

* 7.4:
  [Serializer] Fix mixed-typed constructor parameters overriding getter-inferred type
  Fix tests
  [Cache] Ensure compatibility with Relay extension 0.21.0
  [Mime][TwigBridge] Fix merge conflict resolution
  [Ldap] Make the Adapter resettable
  [Serializer] Remove needless line in changelog
  [MonologBridge] Fix ConsoleHandler losing output after nested command terminates
  [Cache] Fix tests
  [EventDispatcher] Fix memory leak in TraceableEventDispatcher for long-running processes
  [TwigBridge][Mime] Add missing tests
  [TwigBridge] Refactor image method to use DataPart content ID
  [Cache] Fix undefined property access
  [Console] Fix performance regression in OutputFormatter for ASCII content
  [Serializer] Fix can*() prefix support in GetSetMethodNormalizer
  [Cache] Fix Psr16Cache::getMultiple() returning ValueWrapper with TagAwareAdapter
  Configure deprecation triggers

Author: nicolas-grekas

Part/DataPart.php

@@ -137,6 +137,7 @@ public function __serialize(): array
             '_parent' => $parent,
             'filename' => $this->filename,
             'mediaType' => $this->mediaType,
+            'cid' => $this->cid,
         ];
     }
 
@@ -145,5 +146,6 @@ public function __unserialize(array $data): void
         parent::__unserialize(['_headers' => $data['_headers'] ?? $data["\0*\0_headers"], ...$data['_parent'] ?? $data["\0*\0_parent"]]);
         $this->filename = $data['filename'] ?? $data["\0".self::class."\0filename"] ?? null;
         $this->mediaType = $data['mediaType'] ?? $data["\0".self::class."\0mediaType"];
+        $this->cid = $data['cid'] ?? $data["\0".self::class."\0cid"] ?? null;
     }
 }

Tests/Part/DataPartTest.php

@@ -222,4 +222,16 @@ public function testSerialize()
         $expected = clone $p;
         $this->assertEquals($expected->toString(), unserialize(serialize($p))->toString());
     }
+
+    public function testSerializePreservesContentId()
+    {
+        $p = new DataPart('content', 'image.jpg', 'image/jpeg');
+        $p->asInline();
+        $cid = $p->getContentId();
+
+        $unserialized = unserialize(serialize($p));
+
+        $this->assertTrue($unserialized->hasContentId());
+        $this->assertSame($cid, $unserialized->getContentId());
+    }
 }

phpunit.xml.dist

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="vendor/autoload.php"
@@ -20,6 +20,11 @@
     </testsuites>
 
     <source ignoreSuppressionOfDeprecations="true">
+        <deprecationTrigger>
+            <function>trigger_deprecation</function>
+            <method>Doctrine\Deprecations\Deprecation::trigger</method>
+            <method>Doctrine\Deprecations\Deprecation::triggerIfCalledFromOutside</method>
+        </deprecationTrigger>
         <include>
             <directory>./</directory>
         </include>