Bleeding Edge - more precise RecursiveIteratorIterator::__construct() parameter types

Author: staabm

resources/functionMap_bleedingEdge.php

@@ -124,6 +124,7 @@
 		'stream_socket_client' => ['resource|false', 'remoteaddress'=>'string', '&w_errcode='=>'int', '&w_errstring='=>'string', 'timeout='=>'float', 'flags='=>'int-mask<STREAM_CLIENT_CONNECT|STREAM_CLIENT_ASYNC_CONNECT|STREAM_CLIENT_PERSISTENT>', 'context='=>'resource'],
 		'stream_socket_enable_crypto' => ['0|bool', 'stream'=>'resource', 'enable'=>'bool', 'crypto_method='=>'STREAM_CRYPTO_METHOD_SSLv2_CLIENT|STREAM_CRYPTO_METHOD_SSLv3_CLIENT|STREAM_CRYPTO_METHOD_SSLv23_CLIENT|STREAM_CRYPTO_METHOD_ANY_CLIENT|STREAM_CRYPTO_METHOD_TLS_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT|STREAM_CRYPTO_METHOD_SSLv2_SERVER|STREAM_CRYPTO_METHOD_SSLv3_SERVER|STREAM_CRYPTO_METHOD_SSLv23_SERVER|STREAM_CRYPTO_METHOD_ANY_SERVER|STREAM_CRYPTO_METHOD_TLS_SERVER|STREAM_CRYPTO_METHOD_TLSv1_0_SERVER|STREAM_CRYPTO_METHOD_TLSv1_1_SERVER|STREAM_CRYPTO_METHOD_TLSv1_2_SERVER|STREAM_CRYPTO_METHOD_TLSv1_3_SERVER', 'session_stream='=>'resource'],
 		'extract' => ['0|positive-int', '&rw_var_array'=>'array', 'extract_type='=>'EXTR_OVERWRITE|EXTR_SKIP|EXTR_PREFIX_SAME|EXTR_PREFIX_ALL|EXTR_PREFIX_INVALID|EXTR_IF_EXISTS|EXTR_PREFIX_IF_EXISTS|EXTR_REFS', 'prefix='=>'string|null'],
+		'RecursiveIteratorIterator::__construct' => ['void', 'iterator'=>'RecursiveIterator|IteratorAggregate', 'mode='=>'RecursiveIteratorIterator::LEAVES_ONLY|RecursiveIteratorIterator::SELF_FIRST|RecursiveIteratorIterator::CHILD_FIRST', 'flags='=>'0|RecursiveIteratorIterator::CATCH_GET_CHILD'],
 	],
 	'old' => [
 

stubs/iterable.stub

@@ -157,15 +157,12 @@ class ArrayIterator implements SeekableIterator, ArrayAccess, Countable
  */
 class RecursiveIteratorIterator
 {
-
 	/**
 	 * @param T $iterator
-	 * @param int $mode
-	 * @param int $flags
 	 */
 	public function __construct(
 		$iterator,
-		$mode = RecursiveIteratorIterator::LEAVES_ONLY,
+		int $mode = RecursiveIteratorIterator::LEAVES_ONLY,
 		int $flags = 0
 	)
 	{

tests/PHPStan/Rules/Classes/InstantiationRuleTest.php

@@ -461,4 +461,14 @@ public function testBug9946(): void
 		$this->analyse([__DIR__ . '/data/bug-9946.php'], []);
 	}
 
+	public function testBug10324(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-10324.php'], [
+			[
+				'Parameter #3 $flags of class RecursiveIteratorIterator constructor expects 0|16, 2 given.',
+				23,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/Classes/data/bug-10324.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Bug10324;
+
+use RecursiveIteratorIterator;
+use RecursiveDirectoryIterator;
+
+class HelloWorld
+{
+	public function findfile(string $directory, string $filename): ?string
+	{
+		$fontPath = null;
+		$it = new RecursiveDirectoryIterator(
+			$directory,
+			RecursiveDirectoryIterator::SKIP_DOTS
+			| RecursiveDirectoryIterator::FOLLOW_SYMLINKS
+		);
+		foreach (
+			new RecursiveIteratorIterator(
+				$it,
+				RecursiveIteratorIterator::LEAVES_ONLY,
+				//RecursiveIteratorIterator::CATCH_GET_CHILD
+				RecursiveIteratorIterator::CHILD_FIRST
+			) as $file
+		) {
+			if (basename($file) === $filename) {
+				$fontPath = $file;
+				break;
+			}
+		}
+		return $fontPath;
+	}
+}