Merge branch '7.4' into 8.0

* 7.4:
  [TypeInfo] Simple array should be array type
  Handle signals on text input
  [TwigBridge] Fix form constraint
  [Runtime] Reuse the already created Request object when the app needs it as argument returns a kernel
  [Config] Fix array shape generation for backed enums
  [Config] Define `TreeBuilder` default generic type
  Update validators.el.xlf
  Fix MoneyType: add missing step attribute when html5=true
  [JsonStreamer] fix invalid json output for list of self
  [Console] Preserve `--help` option when a command is not found
  [FrameworkBundle] Fix using `FailedMessages*Command` with `SigningSerializer`
  [Lock] Fix unserializing already serialized Key payloads
  [HttpClient] CachingHttpClient must run after UriTemplate and Scoping
  Only register PhpConfigReferenceDumpPass in dev env with debug flag enabled
  [Messenger] Fix PHP 8.5 deprecation for pgsqlGetNotify() in PostgreSQL transport
  chore: PHP CS Fixer - do not use deprecated sets in config
  verify spanish translations with state needs-review-translation
  [Security] Fix OIDC discovery when using multiple HttpClient instances
  [DependencyInjection] Allow manual bindings on parameters with #[Target]

Author: nicolas-grekas

Key.php

@@ -18,7 +18,7 @@
  *
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
-final class Key
+final class Key implements \Stringable
 {
     private ?float $expiringTime = null;
     private array $state = [];
@@ -91,9 +91,9 @@ public function isExpired(): bool
 
     public function __unserialize(array $data): void
     {
-        $this->resource = $data['resource'];
-        $this->expiringTime = $data['expiringTime'];
-        $this->state = $data['state'];
+        $this->resource = $data['resource'] ?? $data["\0".self::class."\0resource"];
+        $this->expiringTime = $data['expiringTime'] ?? $data["\0".self::class."\0expiringTime"] ?? null;
+        $this->state = $data['state'] ?? $data["\0".self::class."\0state"] ?? [];
     }
 
     public function __serialize(): array

Tests/KeyTest.php

@@ -31,6 +31,17 @@ public function testSerialize()
         $this->assertEqualsWithDelta($key->getRemainingLifetime(), $copy->getRemainingLifetime(), 0.001);
     }
 
+    public function testLegacyPayloadCanBeUnserialized()
+    {
+        $serialized = base64_decode('TzoyNjoiU3ltZm9ueVxDb21wb25lbnRcTG9ja1xLZXkiOjM6e3M6MzY6IgBTeW1mb255XENvbXBvbmVudFxMb2NrXEtleQByZXNvdXJjZSI7czo2OiJsZWdhY3kiO3M6NDA6IgBTeW1mb255XENvbXBvbmVudFxMb2NrXEtleQBleHBpcmluZ1RpbWUiO047czozMzoiAFN5bWZvbnlcQ29tcG9uZW50XExvY2tcS2V5AHN0YXRlIjthOjA6e319', true);
+
+        $key = unserialize($serialized, ['allowed_classes' => [Key::class]]);
+
+        $this->assertInstanceOf(Key::class, $key);
+        $this->assertSame('legacy', (string) $key);
+        $this->assertNull($key->getRemainingLifetime());
+    }
+
     public function testUnserialize()
     {
         $key = new Key(__METHOD__);