Revert "Dumb down parameter types in recently added stubs"

ondrejmirtes · ondrejmirtes · commit 950a491485c4 · 2024-09-30T12:44:11.000+02:00
This reverts commit 2d79c62.
diff --git a/stubs/core.stub b/stubs/core.stub
@@ -222,48 +222,48 @@ function preg_match_all($pattern, $subject, &$matches = [], int $flags = 1, int
 function preg_match($pattern, $subject, &$matches = [], int $flags = 0, int $offset = 0) {}
 
 /**
- * @param string|array<mixed> $pattern
- * @param callable(array<int|string, string>):string $callback
- * @param string|array<mixed> $subject
+ * @param string|string[] $pattern
+ * @param callable(string[]):string $callback
+ * @param string|array<string|int|float> $subject
  * @param int $count
  * @param-out 0|positive-int $count
  * @return ($subject is array ? list<string>|null : string|null)
  */
 function preg_replace_callback($pattern, $callback, $subject, int $limit = -1, &$count = null, int $flags = 0) {}
 
 /**
- * @param string|array<mixed> $pattern
- * @param string|array<mixed> $replacement
- * @param string|array<mixed> $subject
+ * @param string|string[] $pattern
+ * @param string|array<string|int|float> $replacement
+ * @param string|array<string|int|float> $subject
  * @param int $count
  * @param-out 0|positive-int $count
  * @return ($subject is array ? list<string>|null : string|null)
  */
 function preg_replace($pattern, $replacement, $subject, int $limit = -1, &$count = null) {}
 
 /**
- * @param string|array<mixed> $pattern
- * @param string|array<mixed> $replacement
- * @param string|array<mixed> $subject
+ * @param string|string[] $pattern
+ * @param string|array<string|int|float> $replacement
+ * @param string|array<string|int|float> $subject
  * @param int $count
  * @param-out 0|positive-int $count
  * @return ($subject is array ? list<string> : string|null)
  */
 function preg_filter($pattern, $replacement, $subject, int $limit = -1, &$count = null) {}
 
 /**
- * @param array<mixed>|string $search
- * @param array<mixed>|string $replace
- * @param array<mixed>|string $subject
+ * @param array<string>|string $search
+ * @param array<string>|string $replace
+ * @param array<string>|string $subject
  * @param-out int $count
  * @return list<string>|string
  */
 function str_replace($search, $replace, $subject, ?int &$count = null) {}
 
 /**
- * @param array<mixed>|string $search
- * @param array<mixed>|string $replace
- * @param array<mixed>|string $subject
+ * @param array<string>|string $search
+ * @param array<string>|string $replace
+ * @param array<string>|string $subject
  * @param-out int $count
  * @return list<string>|string
  */
diff --git a/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php b/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php
@@ -654,19 +654,19 @@ public function testPregReplaceCallback(): void
 	{
 		$this->analyse([__DIR__ . '/data/preg_replace_callback.php'], [
 			[
-				'Parameter #2 $callback of function preg_replace_callback expects callable(array<int|string, string>): string, Closure(string): string given.',
+				'Parameter #2 $callback of function preg_replace_callback expects callable(array<string>): string, Closure(string): string given.',
 				6,
 			],
 			[
-				'Parameter #2 $callback of function preg_replace_callback expects callable(array<int|string, string>): string, Closure(string): string given.',
+				'Parameter #2 $callback of function preg_replace_callback expects callable(array<string>): string, Closure(string): string given.',
 				13,
 			],
 			[
-				'Parameter #2 $callback of function preg_replace_callback expects callable(array<int|string, string>): string, Closure(array): void given.',
+				'Parameter #2 $callback of function preg_replace_callback expects callable(array<string>): string, Closure(array): void given.',
 				20,
 			],
 			[
-				'Parameter #2 $callback of function preg_replace_callback expects callable(array<int|string, string>): string, Closure(): void given.',
+				'Parameter #2 $callback of function preg_replace_callback expects callable(array<string>): string, Closure(): void given.',
 				25,
 			],
 		]);

Original file line number	Diff line number	Diff line change
`@@ -654,19 +654,19 @@ public function testPregReplaceCallback(): void`
`654`	`654`	`{`
`655`	`655`	`$this->analyse([__DIR__ . '/data/preg_replace_callback.php'], [`
`656`	`656`	`[`
`657`		`- 'Parameter #2 $callback of function preg_replace_callback expects callable(array<int\|string, string>): string, Closure(string): string given.',`
	`657`	`+ 'Parameter #2 $callback of function preg_replace_callback expects callable(array<string>): string, Closure(string): string given.',`
`658`	`658`	`6,`
`659`	`659`	`],`
`660`	`660`	`[`
`661`		`- 'Parameter #2 $callback of function preg_replace_callback expects callable(array<int\|string, string>): string, Closure(string): string given.',`
	`661`	`+ 'Parameter #2 $callback of function preg_replace_callback expects callable(array<string>): string, Closure(string): string given.',`
`662`	`662`	`13,`
`663`	`663`	`],`
`664`	`664`	`[`
`665`		`- 'Parameter #2 $callback of function preg_replace_callback expects callable(array<int\|string, string>): string, Closure(array): void given.',`
	`665`	`+ 'Parameter #2 $callback of function preg_replace_callback expects callable(array<string>): string, Closure(array): void given.',`
`666`	`666`	`20,`
`667`	`667`	`],`
`668`	`668`	`[`
`669`		`- 'Parameter #2 $callback of function preg_replace_callback expects callable(array<int\|string, string>): string, Closure(): void given.',`
	`669`	`+ 'Parameter #2 $callback of function preg_replace_callback expects callable(array<string>): string, Closure(): void given.',`
`670`	`670`	`25,`
`671`	`671`	`],`
`672`	`672`	`]);`