Make ArrayHash stub generic

extension.neon

@@ -37,6 +37,9 @@ parameters:
 		- Nette\Http\SessionSection
 		- Nette\Security\Identity
 		- Nette\Security\SimpleIdentity
+	featureToggles:
+		skipCheckGenericClasses:
+			- Nette\Utils\ArrayHash
 	earlyTerminatingMethodCalls:
 		Nette\Application\UI\Component:
 			- error

stubs/Forms/Container.stub

@@ -5,7 +5,7 @@ namespace Nette\Forms;
 use Nette\Utils\ArrayHash;
 
 /**
- * @property   ArrayHash $values
+ * @property   ArrayHash<mixed> $values
  * @property-read \Iterator<array-key, mixed> $controls
  * @property-read Form|null $form
  * @phpstan-implements \ArrayAccess<string, \Nette\ComponentModel\IComponent>

stubs/Utils/ArrayHash.stub

@@ -3,16 +3,17 @@
 namespace Nette\Utils;
 
 /**
- * @implements \IteratorAggregate<array-key, mixed>
- * @implements \ArrayAccess<array-key, mixed>
+ * @template T
+ * @implements \IteratorAggregate<array-key, T>
+ * @implements \ArrayAccess<array-key, T>
  */
-class ArrayHash implements \ArrayAccess, \IteratorAggregate
+class ArrayHash extends \stdClass implements \ArrayAccess, \IteratorAggregate
 {
 
 	/**
-	 * @return \RecursiveArrayIterator<array-key, mixed>
+	 * @return \Iterator<array-key, T>
 	 */
-	public function getIterator(): \RecursiveArrayIterator
+	public function &getIterator(): \Iterator
 	{
 		// nothing
 	}

tests/Type/Nette/ArrayHashStubTest.php

@@ -0,0 +1,54 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Type\Nette;
+
+use Composer\InstalledVersions;
+use OutOfBoundsException;
+use PHPStan\Testing\TypeInferenceTestCase;
+use function class_exists;
+use function version_compare;
+
+final class ArrayHashStubTest extends TypeInferenceTestCase
+{
+
+	public static function dataFileAsserts(): iterable
+	{
+		yield from self::gatherAssertTypes(__DIR__ . '/data/array-hash.php');
+
+		try {
+			$utilsVersion = class_exists(InstalledVersions::class)
+				? InstalledVersions::getVersion('nette/utils')
+				: null;
+		} catch (OutOfBoundsException $e) {
+			$utilsVersion = null;
+		}
+
+		// nette/utils 4.0+ declares getIterator(): \Iterator, older versions \RecursiveArrayIterator
+		if ($utilsVersion === null || version_compare($utilsVersion, '4.0.0', '<')) {
+			return;
+		}
+
+		yield from self::gatherAssertTypes(__DIR__ . '/data/array-hash-iterator.php');
+	}
+
+	/**
+	 * @dataProvider dataFileAsserts
+	 * @param mixed ...$args
+	 */
+	public function testFileAsserts(
+		string $assertType,
+		string $file,
+		...$args
+	): void
+	{
+		$this->assertFileAsserts($assertType, $file, ...$args);
+	}
+
+	public static function getAdditionalConfigFiles(): array
+	{
+		return [
+			__DIR__ . '/phpstan.neon',
+		];
+	}
+
+}

tests/Type/Nette/data/array-hash-iterator.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace PHPStan\Type\Nette\Data\ArrayHashIterator;
+
+use Nette\Utils\ArrayHash;
+use function PHPStan\Testing\assertType;
+
+/**
+ * @param ArrayHash<int> $hash
+ */
+function test(ArrayHash $hash): void
+{
+	foreach ($hash as $key => $value) {
+		assertType('(int|string)', $key);
+		assertType('int', $value);
+	}
+}

tests/Type/Nette/data/array-hash.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace PHPStan\Type\Nette\Data\ArrayHash;
+
+use Nette\Utils\ArrayHash;
+use function PHPStan\Testing\assertType;
+
+/**
+ * @param ArrayHash<int> $hash
+ */
+function test(ArrayHash $hash): void
+{
+	assertType('Nette\\Utils\\ArrayHash<int>', $hash);
+	assertType('int|null', $hash['foo']);
+	assertType('mixed', $hash->foo);
+}