Fix for Threaded

phpstan · Mar 24, 2022 · a355aaa · a355aaa
1 parent 707f57a
commit a355aaa
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/Type/ObjectType.php b/src/Type/ObjectType.php
@@ -696,7 +696,8 @@ public function getIterableKeyType(): Type
 			}
 		}
 
-		if ($this->isInstanceOf(Traversable::class)->yes() && !$this->isExtraOffsetAccessibleClass()->yes()) {
+		$extraOffsetAccessible = $this->isExtraOffsetAccessibleClass()->yes();
+		if ($this->isInstanceOf(Traversable::class)->yes() && !$extraOffsetAccessible) {
 			$isTraversable = true;
 			$tKey = GenericTypeVariableResolver::getType($this, Traversable::class, 'TKey');
 			if ($tKey !== null) {
@@ -712,6 +713,10 @@ public function getIterableKeyType(): Type
 			)->getReturnType());
 		}
 
+		if ($extraOffsetAccessible) {
+			return new MixedType(true);
+		}
+
 		if ($isTraversable) {
 			return new MixedType();
 		}
@@ -732,7 +737,8 @@ public function getIterableValueType(): Type
 			}
 		}
 
-		if ($this->isInstanceOf(Traversable::class)->yes() && !$this->isExtraOffsetAccessibleClass()->yes()) {
+		$extraOffsetAccessible = $this->isExtraOffsetAccessibleClass()->yes();
+		if ($this->isInstanceOf(Traversable::class)->yes() && !$extraOffsetAccessible) {
 			$isTraversable = true;
 			$tValue = GenericTypeVariableResolver::getType($this, Traversable::class, 'TValue');
 			if ($tValue !== null) {
@@ -748,6 +754,10 @@ public function getIterableValueType(): Type
 			)->getReturnType());
 		}
 
+		if ($extraOffsetAccessible) {
+			return new MixedType(true);
+		}
+
 		if ($isTraversable) {
 			return new MixedType();
 		}