Fixed issue with ArrayAccess stub

ondrejmirtes · ondrejmirtes · commit ab851203d475 · 2020-03-17T16:14:51.000+01:00
diff --git a/stubs/ArrayObject.stub b/stubs/ArrayObject.stub
@@ -20,7 +20,7 @@ interface ArrayAccess
 	public function offsetGet($offset);
 
 	/**
-	 * @param TKey $offset
+	 * @param TKey|null $offset
 	 * @param TValue $value
 	 * @return void
 	 */
diff --git a/tests/PHPStan/Rules/Arrays/OffsetAccessAssignmentRuleTest.php b/tests/PHPStan/Rules/Arrays/OffsetAccessAssignmentRuleTest.php
@@ -121,4 +121,10 @@ public function testInheritDocTemplateTypeResolution(): void
 		$this->analyse([__DIR__ . '/data/inherit-doc-template-type-resolution.php'], []);
 	}
 
+	public function testAssignNewOffsetToStubbedClass(): void
+	{
+		$this->checkUnionTypes = true;
+		$this->analyse([__DIR__ . '/data/new-offset-stub.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Arrays/data/new-offset-stub.php b/tests/PHPStan/Rules/Arrays/data/new-offset-stub.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace NewOffsetStub;
+
+/**
+ * @phpstan-implements \ArrayAccess<int, \stdClass>
+ */
+abstract class Foo implements \ArrayAccess
+{
+
+}
+
+function (Foo $foo): void {
+	$foo[] = new \stdClass();
+};
diff --git a/tests/PHPStan/Rules/Methods/data/bug-2950.php b/tests/PHPStan/Rules/Methods/data/bug-2950.php
@@ -100,7 +100,7 @@ public function offsetGet($offset): float
 	}
 
 	/**
-	 * @param int   $offset
+	 * @param int|null   $offset
 	 * @param float $value
 	 */
 	public function offsetSet($offset, $value): void

Original file line number	Diff line number	Diff line change
`@@ -121,4 +121,10 @@ public function testInheritDocTemplateTypeResolution(): void`
`121`	`121`	`$this->analyse([__DIR__ . '/data/inherit-doc-template-type-resolution.php'], []);`
`122`	`122`	`}`
`123`	`123`
	`124`	`+ public function testAssignNewOffsetToStubbedClass(): void`
	`125`	`+ {`
	`126`	`+ $this->checkUnionTypes = true;`
	`127`	`+ $this->analyse([__DIR__ . '/data/new-offset-stub.php'], []);`
	`128`	`+ }`
	`129`	`+`
`124`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function offsetGet($offset): float`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`/**`
`103`		`- * @param int $offset`
	`103`	`+ * @param int\|null $offset`
`104`	`104`	`* @param float $value`
`105`	`105`	`*/`
`106`	`106`	`public function offsetSet($offset, $value): void`