Fixed HasOffsetValueType accessory missing main-type

Author: staabm

src/Analyser/ResultCache/ResultCacheManager.php

@@ -1131,7 +1131,7 @@ private function getComposerLocks(): array
 	}
 
 	/**
-	 * @return array<string, string>
+	 * @return array<string, array<mixed>>
 	 */
 	private function getComposerInstalled(): array
 	{
@@ -1149,6 +1149,10 @@ private function getComposerInstalled(): array
 			}
 
 			$installed = require $filePath;
+			if (!is_array($installed)) {
+				throw new ShouldNotHappenException();
+			}
+
 			$rootName = $installed['root']['name'];
 			unset($installed['root']);
 			unset($installed['versions'][$rootName]);

src/Type/MixedType.php

@@ -169,7 +169,15 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni
 
 	public function setExistingOffsetValueType(Type $offsetType, Type $valueType): Type
 	{
-		return new self($this->isExplicitMixed);
+		$types = [
+			new ArrayType(new MixedType(), new MixedType()),
+			new ObjectType(ArrayAccess::class),
+			new NullType(),
+		];
+		if ($offsetType->isInteger()->yes()) {
+			$types[] = new StringType();
+		}
+		return TypeCombinator::union(...$types);
 	}
 
 	public function unsetOffset(Type $offsetType): Type

tests/PHPStan/Analyser/nsrt/bug-13270a.php

@@ -0,0 +1,30 @@
+<?php declare(strict_types = 1);
+
+namespace Bug13270a;
+
+use function PHPStan\Testing\assertType;
+
+final class HelloWorld
+{
+	/**
+	 * @param array<mixed> $data
+	 */
+	public function test(array $data): void
+	{
+		foreach($data as $k => $v) {
+			assertType('non-empty-array<mixed>', $data);
+			$data[$k]['a'] = true;
+			assertType("non-empty-array<(non-empty-array&hasOffsetValue('a', true))|(ArrayAccess&hasOffsetValue('a', true))>", $data);
+			foreach($data[$k] as $val) {
+			}
+		}
+	}
+
+	/*
+	public function doFoo(mixed $mixed, int $i): void
+	{
+		$mixed[$i]['a'] = true;
+		dumpType($mixed);
+	}
+	*/
+}

tests/PHPStan/Analyser/nsrt/bug-13270b.php

@@ -0,0 +1,27 @@
+<?php declare(strict_types=1);
+
+namespace Bug13270b;
+
+use function PHPStan\Testing\assertType;
+
+class Test
+{
+	/**
+	 * @param mixed[] $data
+	 * @return mixed[]
+	 */
+	public function parseData(array $data): array
+	{
+		if (isset($data['price'])) {
+			assertType('mixed~null', $data['price']);
+			if (!array_key_exists('priceWithVat', $data['price'])) {
+				$data['price']['priceWithVat'] = null;
+			}
+			assertType("(non-empty-array&hasOffsetValue('priceWithVat', mixed))|(ArrayAccess&hasOffsetValue('priceWithVat', null))", $data['price']);
+			if (!array_key_exists('priceWithoutVat', $data['price'])) {
+				$data['price']['priceWithoutVat'] = null;
+			}
+		}
+		return $data;
+	}
+}

tests/PHPStan/Analyser/nsrt/composer-array-bug.php

@@ -19,22 +19,22 @@ public function doFoo(): void
 			foreach ($this->config['authors'] as $key => $author) {
 				if (!is_array($author)) {
 					$this->errors[] = 'authors.'.$key.' : should be an array, '.gettype($author).' given';
-					assertType("mixed", $this->config['authors']);
+					assertType("mixed~(0|0.0|''|'0'|false)", $this->config['authors']);
 					unset($this->config['authors'][$key]);
-					assertType("mixed", $this->config['authors']);
+					assertType("mixed~(0|0.0|''|'0'|false)", $this->config['authors']);
 					continue;
 				}
-				assertType("mixed", $this->config['authors']);
+				assertType("mixed~(0|0.0|''|'0'|false)", $this->config['authors']);
 				foreach (['homepage', 'email', 'name', 'role'] as $authorData) {
 					if (isset($author[$authorData]) && !is_string($author[$authorData])) {
 						$this->errors[] = 'authors.'.$key.'.'.$authorData.' : invalid value, must be a string';
 						unset($this->config['authors'][$key][$authorData]);
 					}
 				}
 				if (isset($author['homepage'])) {
-					assertType("mixed", $this->config['authors']);
+					assertType("mixed~(0|0.0|''|'0'|false)", $this->config['authors']);
 					unset($this->config['authors'][$key]['homepage']);
-					assertType("mixed", $this->config['authors']);
+					assertType("array|ArrayAccess|null", $this->config['authors']);
 				}
 				if (isset($author['email']) && !filter_var($author['email'], FILTER_VALIDATE_EMAIL)) {
 					unset($this->config['authors'][$key]['email']);
@@ -44,8 +44,8 @@ public function doFoo(): void
 				}
 			}
 
-			assertType("non-empty-array&hasOffsetValue('authors', mixed)", $this->config);
-			assertType("mixed", $this->config['authors']);
+			assertType("non-empty-array&hasOffsetValue('authors', mixed~(0|0.0|''|'0'|false))", $this->config);
+			assertType("mixed~(0|0.0|''|'0'|false)", $this->config['authors']);
 
 			if (empty($this->config['authors'])) {
 				unset($this->config['authors']);

tests/PHPStan/Analyser/nsrt/composer-non-empty-array-after-unset.php

@@ -15,10 +15,10 @@ public function doFoo()
 		if (!empty($this->config['authors'])) {
 			assertType("mixed~(0|0.0|''|'0'|array{}|false|null)", $this->config['authors']);
 			foreach ($this->config['authors'] as $key => $author) {
-				assertType("mixed", $this->config['authors']);
+				assertType("mixed~(0|0.0|''|'0'|false)", $this->config['authors']);
 				if (!is_array($author)) {
 					unset($this->config['authors'][$key]);
-					assertType("mixed", $this->config['authors']);
+					assertType("mixed~(0|0.0|''|'0'|false)", $this->config['authors']);
 					continue;
 				}
 				foreach (['homepage', 'email', 'name', 'role'] as $authorData) {
@@ -33,13 +33,13 @@ public function doFoo()
 					unset($this->config['authors'][$key]['email']);
 				}
 				if (empty($this->config['authors'][$key])) {
-					assertType("mixed", $this->config['authors']);
+					assertType("mixed~(0|0.0|''|'0'|false)", $this->config['authors']);
 					unset($this->config['authors'][$key]);
-					assertType("mixed", $this->config['authors']);
+					assertType("mixed~(0|0.0|''|'0'|false)", $this->config['authors']);
 				}
-				assertType("mixed", $this->config['authors']);
+				assertType("mixed~(0|0.0|''|'0'|false)", $this->config['authors']);
 			}
-			assertType("mixed", $this->config['authors']);
+			assertType("mixed~(0|0.0|''|'0'|false)", $this->config['authors']);
 		}
 	}