address feedback

Author: staabm

src/Type/MixedType.php

@@ -172,9 +172,8 @@ public function setExistingOffsetValueType(Type $offsetType, Type $valueType): T
 		$types = [
 			new ArrayType(new MixedType(), new MixedType()),
 			new ObjectType(ArrayAccess::class),
-			new NullType(),
 		];
-		if ($offsetType->isInteger()->yes()) {
+		if (!$offsetType->isInteger()->no()) {
 			$types[] = new StringType();
 		}
 		return TypeCombinator::union(...$types);

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

@@ -20,11 +20,33 @@ public function test(array $data): void
 		}
 	}
 
-	/*
-	public function doFoo(mixed $mixed, int $i): void
+	public function doFoo(
+		mixed $mixed,
+		mixed $mixed2,
+		mixed $mixed3,
+		mixed $mixed4,
+		int $i,
+		int $i2,
+		string|int $stringOrInt
+	): void
 	{
 		$mixed[$i]['a'] = true;
-		dumpType($mixed);
+		assertType('mixed', $mixed);
+
+		$mixed2[$stringOrInt]['a'] = true;
+		assertType('mixed', $mixed2);
+
+		$mixed3[$i][$stringOrInt] = true;
+		assertType('mixed', $mixed3);
+
+		$mixed4['a'][$stringOrInt] = true;
+		assertType('mixed', $mixed4);
+
+		$null = null;
+		$null[$i]['a'] = true;
+		assertType('non-empty-array<int, array{a: true}>', $null);
+
+		$i2['a'] = true;
+		assertType('*ERROR*', $i2);
 	}
-	*/
 }

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~(0|0.0|''|'0'|false)", $this->config['authors']);
+					assertType("mixed~(0|0.0|false|null)", $this->config['authors']);
 					unset($this->config['authors'][$key]);
-					assertType("mixed~(0|0.0|''|'0'|false)", $this->config['authors']);
+					assertType("mixed~(0|0.0|false|null)", $this->config['authors']);
 					continue;
 				}
-				assertType("mixed~(0|0.0|''|'0'|false)", $this->config['authors']);
+				assertType("mixed~(0|0.0|false|null)", $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~(0|0.0|''|'0'|false)", $this->config['authors']);
+					assertType("mixed~(0|0.0|false|null)", $this->config['authors']);
 					unset($this->config['authors'][$key]['homepage']);
-					assertType("array|ArrayAccess|null", $this->config['authors']);
+					assertType("array|ArrayAccess|string", $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~(0|0.0|''|'0'|false))", $this->config);
-			assertType("mixed~(0|0.0|''|'0'|false)", $this->config['authors']);
+			assertType("non-empty-array&hasOffsetValue('authors', mixed~(0|0.0|false|null))", $this->config);
+			assertType("mixed~(0|0.0|false|null)", $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~(0|0.0|''|'0'|false)", $this->config['authors']);
+				assertType("mixed~(0|0.0|false|null)", $this->config['authors']);
 				if (!is_array($author)) {
 					unset($this->config['authors'][$key]);
-					assertType("mixed~(0|0.0|''|'0'|false)", $this->config['authors']);
+					assertType("mixed~(0|0.0|false|null)", $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~(0|0.0|''|'0'|false)", $this->config['authors']);
+					assertType("mixed~(0|0.0|false|null)", $this->config['authors']);
 					unset($this->config['authors'][$key]);
-					assertType("mixed~(0|0.0|''|'0'|false)", $this->config['authors']);
+					assertType("mixed~(0|0.0|false|null)", $this->config['authors']);
 				}
-				assertType("mixed~(0|0.0|''|'0'|false)", $this->config['authors']);
+				assertType("mixed~(0|0.0|false|null)", $this->config['authors']);
 			}
-			assertType("mixed~(0|0.0|''|'0'|false)", $this->config['authors']);
+			assertType("mixed~(0|0.0|false|null)", $this->config['authors']);
 		}
 	}