Add @implements to SPL iterator stubs

phpstan-baseline.neon

@@ -120,6 +120,12 @@ parameters:
 			count: 5
 			path: src/Analyser/TypeSpecifier.php
 
+		-
+			rawMessage: 'Cannot call method getPathname() on SplFileInfo|string.'
+			identifier: method.nonObject
+			count: 1
+			path: src/Cache/FileCacheStorage.php
+
 		-
 			rawMessage: 'Template type TNodeType is declared as covariant, but occurs in contravariant position in parameter node of method PHPStan\Collectors\Collector::processNode().'
 			identifier: generics.variance

stubs/iterable.stub

@@ -159,22 +159,10 @@ class ArrayIterator implements SeekableIterator, ArrayAccess, Countable
 }
 
 /**
- * @template T of \RecursiveIterator|\IteratorAggregate
- * @mixin T
+ * @implements SeekableIterator<string, DirectoryIterator>
  */
-class RecursiveIteratorIterator
+class DirectoryIterator extends SplFileInfo implements SeekableIterator
 {
-	/**
-	 * @param T $iterator
-	 */
-	public function __construct(
-		$iterator,
-		int $mode = RecursiveIteratorIterator::LEAVES_ONLY,
-		int $flags = 0
-	)
-	{
-
-	}
 
 }
 
@@ -207,6 +195,29 @@ class IteratorIterator implements OuterIterator {
     public function __construct(Traversable $iterator) {}
 }
 
+/**
+ * @template TIterator of \RecursiveIterator|\IteratorAggregate
+ *
+ * @implements OuterIterator<key-of<TIterator>, value-of<TIterator>>
+ *
+ * @mixin TIterator
+ */
+class RecursiveIteratorIterator implements OuterIterator
+{
+	/**
+	 * @param TIterator $iterator
+	 */
+	public function __construct(
+		$iterator,
+		int $mode = RecursiveIteratorIterator::LEAVES_ONLY,
+		int $flags = 0
+	)
+	{
+
+	}
+
+}
+
 /**
  * @template-covariant TKey
  * @template-covariant TValue
@@ -289,6 +300,14 @@ class RecursiveArrayIterator extends ArrayIterator implements RecursiveIterator
     public function uksort($cmp_function) { }
 }
 
+/**
+ * @implements RecursiveIterator<string, SplFileInfo|string>
+ */
+class RecursiveDirectoryIterator extends FilesystemIterator implements RecursiveIterator
+{
+
+}
+
 /**
  * @template TKey
  * @template TValue

tests/PHPStan/Analyser/nsrt/bug-8435.php

@@ -0,0 +1,36 @@
+<?php declare(strict_types = 1);
+
+namespace Bug8435;
+
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use function PHPStan\Testing\assertType;
+
+class HelloWorld
+{
+	public function sayHello1(string $path): void
+	{
+		$iterator = new RecursiveDirectoryIterator($path);
+		foreach ($iterator as $fileinfo) {
+			assertType('SplFileInfo|string', $fileinfo);
+		}
+	}
+
+	public function sayHello2(string $path): void
+	{
+		$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path));
+		foreach ($iterator as $fileinfo) {
+			assertType('SplFileInfo|string', $fileinfo);
+		}
+	}
+
+	/**
+	 * @param RecursiveIteratorIterator<RecursiveDirectoryIterator> $iterator
+	 */
+	public function test(RecursiveIteratorIterator $iterator): void
+	{
+		foreach ($iterator as $fileinfo) {
+			assertType('SplFileInfo|string', $fileinfo);
+		}
+	}
+}

tests/PHPStan/Rules/Classes/InstantiationRuleTest.php

@@ -351,7 +351,7 @@ public function testBug3425(): void
 	{
 		$this->analyse([__DIR__ . '/data/bug-3425.php'], [
 			[
-				'Parameter #1 $iterator of class RecursiveIteratorIterator constructor expects T of IteratorAggregate|RecursiveIterator, Generator<int, int, mixed, void> given.',
+				'Parameter #1 $iterator of class RecursiveIteratorIterator constructor expects TIterator of IteratorAggregate|RecursiveIterator, Generator<int, int, mixed, void> given.',
 				5,
 			],
 		]);