Add @implements to SPL iterator stubs

src/Cache/FileCacheStorage.php

@@ -13,7 +13,9 @@
 use PHPStan\ShouldNotHappenException;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
+use SplFileInfo;
 use function array_keys;
+use function assert;
 use function closedir;
 use function dirname;
 use function error_get_last;
@@ -147,6 +149,7 @@ public function clearUnusedFiles(): void
 		$beginNew = "<?php declare(strict_types = 1);\n\n//";
 		$emptyDirectoriesToCheck = [];
 		foreach ($files as $file) {
+			assert($file instanceof SplFileInfo);
 			try {
 				$path = $file->getPathname();
 				$contents = FileReader::read($path);

stubs/iterable.stub

@@ -159,22 +159,19 @@ class ArrayIterator implements SeekableIterator, ArrayAccess, Countable
 }
 
 /**
- * @template T of \RecursiveIterator|\IteratorAggregate
- * @mixin T
+ * @template TValue = mixed
+ * @implements SeekableIterator<string, TValue>
  */
-class RecursiveIteratorIterator
+class DirectoryIterator extends SplFileInfo implements SeekableIterator
 {
-	/**
-	 * @param T $iterator
-	 */
-	public function __construct(
-		$iterator,
-		int $mode = RecursiveIteratorIterator::LEAVES_ONLY,
-		int $flags = 0
-	)
-	{
 
-	}
+}
+
+/**
+ * @extends DirectoryIterator<SplFileInfo|string>
+ */
+class FilesystemIterator extends DirectoryIterator
+{
 
 }
 
@@ -207,6 +204,29 @@ class IteratorIterator implements OuterIterator {
     public function __construct(Traversable $iterator) {}
 }
 
+/**
+ * @template T of \RecursiveIterator|\IteratorAggregate
+ *
+ * @implements OuterIterator<key-of<T>, value-of<T>>
+ *
+ * @mixin T
+ */
+class RecursiveIteratorIterator implements OuterIterator
+{
+	/**
+	 * @param T $iterator
+	 */
+	public function __construct(
+		$iterator,
+		int $mode = RecursiveIteratorIterator::LEAVES_ONLY,
+		int $flags = 0
+	)
+	{
+
+	}
+
+}
+
 /**
  * @template-covariant TKey
  * @template-covariant TValue
@@ -289,6 +309,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);
+		}
+	}
+}