Use acutal return type in ObjectStorageReturnTypeExtension and refactor tests

Author: sascha-egerer

src/Type/ObjectStorageDynamicReturnTypeExtension.php

@@ -43,11 +43,13 @@ public function getTypeFromMethodCall(
 		$argumentType = $scope->getType($firstArgument->value);
 
 		if ((new StringType())->isSuperTypeOf($argumentType)->yes()) {
-			return null;
+			return $methodReflection->getVariants()[0]->getReturnType();
 		}
+
 		if ((new IntegerType())->isSuperTypeOf($argumentType)->yes()) {
-			return null;
+			return $methodReflection->getVariants()[0]->getReturnType();
 		}
+
 		return new MixedType();
 	}
 

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

@@ -13,32 +13,44 @@
 class MyModel extends AbstractEntity
 {
 
-	public function foo(): void
+	/**
+	 * @var ObjectStorage<self>
+	 */
+	protected ObjectStorage $testStorage;
+
+	public function checkObjectStorageType(): void
 	{
 		$myModel = new self();
 		/** @var ObjectStorage<MyModel> $objectStorage */
 		$objectStorage = new ObjectStorage();
 		$objectStorage->attach($myModel);
 
 		assertType('TYPO3\CMS\Extbase\Persistence\ObjectStorage<' . self::class . '>', $objectStorage);
+	}
 
-		foreach ($objectStorage as $key => $value) {
-
+	public function checkIteration(): void
+	{
+		foreach ($this->testStorage as $key => $value) {
 			assertType('string', $key);
 			assertType(self::class, $value);
 		}
+	}
 
-		assertType(self::class . '|null', $objectStorage->offsetGet(0));
-		assertType(self::class . '|null', $objectStorage->offsetGet('0'));
-		assertType(self::class . '|null', $objectStorage->current());
+	public function checkArrayAccess(): void
+	{
+		assertType(self::class . '|null', $this->testStorage->offsetGet(0));
+		assertType(self::class . '|null', $this->testStorage->offsetGet('0'));
+		assertType(self::class . '|null', $this->testStorage->current());
 
 		// We ignore errors in the next line as this will produce an
 		// "Offset 0 does not exist on TYPO3\CMS\Extbase\Persistence\ObjectStorage<ObjectStorage\My\Test\Extension\Domain\Model\MyModel>
 		// due to the weird implementation of ArrayAccess in ObjectStorage::offsetGet()
 		// @phpstan-ignore-next-line
-		assertType(self::class . '|null', $objectStorage[0]);
+		assertType(self::class . '|null', $this->testStorage[0]);
+
+		$myModel = new self();
 
-		assertType('mixed', $objectStorage->offsetGet($myModel));
+		assertType('mixed', $this->testStorage->offsetGet($myModel));
 	}
 
 }