Add offsetGet to stub again

Author: sascha-egerer

phpstan.neon

@@ -18,25 +18,10 @@ parameters:
          - '*tests/*/Source/*'
          - '*tests/*/data/*'
     ignoreErrors:
-        -
-            message: '#^Class TYPO3\\CMS\\Core\\Context\\[a-zA-Z]* not found\.#'
-            path: src/Type/ContextDynamicReturnTypeExtension.php
         -
             message: "#^Calling PHPStan\\\\Reflection\\\\InitializerExprTypeResolver\\:\\:getClassConstFetchType\\(\\) is not covered by backward compatibility promise\\. The method might change in a minor PHPStan version\\.$#"
             count: 1
             path: src/Rule/ValidatorResolverOptionsRule.php
-        -
-            message: "#^Method SaschaEgerer\\\\PhpstanTypo3\\\\Tests\\\\Unit\\\\Type\\\\QueryResultToArrayDynamicReturnTypeExtension\\\\FrontendUserGroupCustomFindAllWithoutModelTypeRepository\\:\\:findAll\\(\\) return type with generic interface TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\QueryResultInterface does not specify its types\\: ModelType$#"
-            count: 1
-            path: tests/Unit/Type/QueryResultToArrayDynamicReturnTypeExtension/data/query-result-to-array.php
-        -
-            message: "#^PHPDoc tag @var for variable \\$queryResult contains generic class TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\Generic\\\\QueryResult but does not specify its types\\: ModelType$#"
-            count: 2
-            path: tests/Unit/Type/QueryResultToArrayDynamicReturnTypeExtension/data/query-result-to-array.php
-        -
-            message: "#^Return type \\(TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\QueryResultInterface\\) of method SaschaEgerer\\\\PhpstanTypo3\\\\Tests\\\\Unit\\\\Type\\\\QueryResultToArrayDynamicReturnTypeExtension\\\\FrontendUserGroupCustomFindAllWithoutModelTypeRepository\\:\\:findAll\\(\\) should be covariant with return type \\(array\\<int, SaschaEgerer\\\\PhpstanTypo3\\\\Tests\\\\Unit\\\\Type\\\\QueryResultToArrayDynamicReturnTypeExtension\\\\FrontendUserGroup\\>\\|TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\QueryResultInterface\\<SaschaEgerer\\\\PhpstanTypo3\\\\Tests\\\\Unit\\\\Type\\\\QueryResultToArrayDynamicReturnTypeExtension\\\\FrontendUserGroup\\>\\) of method TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\Repository\\<SaschaEgerer\\\\PhpstanTypo3\\\\Tests\\\\Unit\\\\Type\\\\QueryResultToArrayDynamicReturnTypeExtension\\\\FrontendUserGroup\\>\\:\\:findAll\\(\\)$#"
-            count: 1
-            path: tests/Unit/Type/QueryResultToArrayDynamicReturnTypeExtension/data/query-result-to-array.php
         -
             message: '#^Although PHPStan\\Reflection\\Php\\PhpPropertyReflection is covered by backward compatibility promise, this instanceof assumption might break because it''s not guaranteed to always stay the same\.$#'
             identifier: phpstanApi.instanceofAssumption

stubs/ObjectStorage.stub

@@ -10,8 +10,8 @@ namespace TYPO3\CMS\Extbase\Persistence;
 class ObjectStorage implements \Iterator, \ArrayAccess
 {
     /**
-     * @param TEntity|int|string $value
-     * @return ($value is int ? TEntity|null : mixed)
+     * @param TEntity|string|int $value
+     * @phpstan-return TEntity|null
      */
-    public function offsetGet($value);
+    public function offsetGet(mixed $value);
 }

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

@@ -41,15 +41,11 @@ 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', $this->testStorage[0]);
 
 		$myModel = new self();
 
+		assertType('mixed', $this->testStorage->offsetGet($this->testStorage->current()));
 		assertType('mixed', $this->testStorage->offsetGet($myModel));
 	}