From 13b8da40d27d8d9668e06900f3a1e61aecbfafc1 Mon Sep 17 00:00:00 2001
From: Michael Strelan <mstrelan@gmail.com>
Date: Tue, 14 Oct 2025 12:50:50 +1000
Subject: [PATCH 1/2] TKey

---
 stubs/Drupal/Core/TypedData/ListInterface.stub | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/stubs/Drupal/Core/TypedData/ListInterface.stub b/stubs/Drupal/Core/TypedData/ListInterface.stub
index c3859dc1..ae8986cb 100644
--- a/stubs/Drupal/Core/TypedData/ListInterface.stub
+++ b/stubs/Drupal/Core/TypedData/ListInterface.stub
@@ -3,9 +3,10 @@
 namespace Drupal\Core\TypedData;
 
 /**
+ * @template TKey of int
  * @template T of TypedDataInterface
  * @extends TraversableTypedDataInterface<int, T>
- * @extends \ArrayAccess<int,T>
+ * @extends \ArrayAccess<TKey,T>
  */
 interface ListInterface extends TraversableTypedDataInterface, \ArrayAccess, \Countable {
 

From 12df8829c329261e425a238dd674c817981f9636 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Thu, 16 Oct 2025 11:02:27 +0200
Subject: [PATCH 2/2] Fix ListInterface extends to define TKey

---
 stubs/Drupal/Core/Field/FieldItemListInterface.stub       | 2 +-
 stubs/Drupal/Core/TypedData/ListInterface.stub            | 2 +-
 stubs/Drupal/Core/TypedData/Plugin/DataType/ItemList.stub | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/stubs/Drupal/Core/Field/FieldItemListInterface.stub b/stubs/Drupal/Core/Field/FieldItemListInterface.stub
index 473ae449..23dfb5a8 100644
--- a/stubs/Drupal/Core/Field/FieldItemListInterface.stub
+++ b/stubs/Drupal/Core/Field/FieldItemListInterface.stub
@@ -7,7 +7,7 @@ use Drupal\Core\TypedData\ListInterface;
 
 /**
  * @template T of FieldItemInterface
- * @extends ListInterface<T>
+ * @extends ListInterface<int, T>
  * @property mixed $value
  */
 interface FieldItemListInterface extends ListInterface {
diff --git a/stubs/Drupal/Core/TypedData/ListInterface.stub b/stubs/Drupal/Core/TypedData/ListInterface.stub
index ae8986cb..ef16da40 100644
--- a/stubs/Drupal/Core/TypedData/ListInterface.stub
+++ b/stubs/Drupal/Core/TypedData/ListInterface.stub
@@ -5,7 +5,7 @@ namespace Drupal\Core\TypedData;
 /**
  * @template TKey of int
  * @template T of TypedDataInterface
- * @extends TraversableTypedDataInterface<int, T>
+ * @extends TraversableTypedDataInterface<TKey, T>
  * @extends \ArrayAccess<TKey,T>
  */
 interface ListInterface extends TraversableTypedDataInterface, \ArrayAccess, \Countable {
diff --git a/stubs/Drupal/Core/TypedData/Plugin/DataType/ItemList.stub b/stubs/Drupal/Core/TypedData/Plugin/DataType/ItemList.stub
index a7834ff9..2ba9a9cc 100644
--- a/stubs/Drupal/Core/TypedData/Plugin/DataType/ItemList.stub
+++ b/stubs/Drupal/Core/TypedData/Plugin/DataType/ItemList.stub
@@ -10,7 +10,7 @@ use Drupal\Core\TypedData\TypedDataInterface;
 /**
  * @template T of TypedDataInterface
  * @implements \IteratorAggregate<int, T>
- * @implements ListInterface<T>
+ * @implements ListInterface<int, T>
  */
 class ItemList extends TypedData implements \IteratorAggregate, ListInterface {