Solve some issues with ObjectStorage.stub

stubs/ObjectMonitoringInterface.stub

@@ -0,0 +1,4 @@
+<?php
+namespace TYPO3\CMS\Extbase\Persistence;
+
+interface ObjectMonitoringInterface {}

stubs/ObjectStorage.stub

@@ -2,23 +2,24 @@
 namespace TYPO3\CMS\Extbase\Persistence;
 
 /**
+ * @template TKey of object
  * @template TEntity of object
- * @implements \ArrayAccess<string, TEntity>
- * @implements \Iterator<string, TEntity>
  * @phpstan-type ObjectStorageInternal array{obj: TEntity, inf: mixed}
+ * @implements \ArrayAccess<TKey, TEntity>
+ * @implements \Iterator<TKey, TEntity>
  */
-class ObjectStorage implements \Iterator, \ArrayAccess
+class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonitoringInterface
 {
     /**
      * @var array<string, ObjectStorageInternal>
      */
     protected array $storage;
 
     /**
-     * @param TEntity $object
-     * @param mixed $information
+     * @phpstan-param TEntity $offset
+     * @param ObjectStorageInternal $information
      */
-    public function offsetSet(mixed $object, mixed $information);
+    public function offsetSet(mixed $offset, mixed $information): void;
 
     /**
      * @param TEntity|int $value
@@ -29,11 +30,11 @@ class ObjectStorage implements \Iterator, \ArrayAccess
     /**
      * @param TEntity|int $value
      */
-    public function offsetUnset(mixed $value);
+    public function offsetUnset(mixed $value): void;
 
     /**
      * @param TEntity|int $value
-     * @return ($value is int ? TEntity|null : mixed)
+     * @return ($value is int ? TEntity|null : ObjectStorageInternal)
      */
     public function offsetGet(mixed $value);
 }

tests/Unit/Type/data/object-storage-stub-files.php

@@ -16,11 +16,11 @@ class MyModel extends AbstractEntity
 	public function foo(): void
 	{
 		$myModel = new self();
-		/** @var ObjectStorage<MyModel> $objectStorage */
+		/** @var ObjectStorage<string, MyModel> $objectStorage */
 		$objectStorage = new ObjectStorage();
 		$objectStorage->attach($myModel);
 
-		assertType('TYPO3\CMS\Extbase\Persistence\ObjectStorage<' . self::class . '>', $objectStorage);
+		assertType('TYPO3\CMS\Extbase\Persistence\ObjectStorage<string, ' . self::class . '>', $objectStorage);
 
 		foreach ($objectStorage as $key => $value) {
 
@@ -36,7 +36,7 @@ public function foo(): void
 		// @phpstan-ignore-next-line
 		assertType(self::class . '|null', $objectStorage[0]);
 
-		assertType('mixed', $objectStorage->offsetGet($myModel));
+		assertType('array{obj: ObjectStorage\My\Test\Extension\Domain\Model\MyModel, inf: mixed}', $objectStorage->offsetGet($myModel));
 	}
 
 }