fix incorrect default stubs

vimeo · Jun 24, 2023 · 7f0217d · 7f0217d
1 parent 28b9e8d
commit 7f0217d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/src/Psalm/Internal/Provider/ReturnTypeProvider/SprintfReturnTypeProvider.php b/src/Psalm/Internal/Provider/ReturnTypeProvider/SprintfReturnTypeProvider.php
@@ -130,13 +130,7 @@ public static function getFunctionReturnType(FunctionReturnTypeProviderEvent $ev
                     '/%(?:\d+\$)?[-+]?(?:\d+|\*)(?:\.(?:\d+|\*))?[bcdouxXeEfFgGhHs]/',
                     $type->getSingleStringLiteral()->value,
                 ) === 1) {
-                    if ($event->getFunctionId() === 'printf') {
-                        return null;
-                    }
-
-                    // the core stubs are wrong for these too, since these might be empty strings
-                    // e.g. sprintf(\'%0.*s\', 0, "abc")
-                    return Type::getString();
+                    return null;
                 }
 
                 // assume a random, high number for tests

diff --git a/stubs/CoreGenericFunctions.phpstub b/stubs/CoreGenericFunctions.phpstub
@@ -1279,9 +1279,7 @@ function preg_quote(string $str, ?string $delimiter = null) : string {}
  * @psalm-pure
  *
  * @param string|int|float $values
- * @return ($format is non-empty-string
- *      ? ($values is non-empty-string|int|float ? non-empty-string : string)
- *      : string)
+ * @return (PHP_MAJOR_VERSION is 8 ? string : string|false)
  *
  * @psalm-flow ($format, $values) -> return
  */
@@ -1290,7 +1288,7 @@ function sprintf(string $format, ...$values) {}
 /**
  * @psalm-pure
  * @param array<string|int|float> $values
- * @return string|false
+ * @return (PHP_MAJOR_VERSION is 8 ? string : string|false)
  * @psalm-ignore-falsable-return
  *
  * @psalm-flow ($format, $values) -> return
@@ -1309,7 +1307,7 @@ function wordwrap(string $string, int $width = 75, string $break = "\n", bool $c
  * @psalm-pure
  *
  * @param string|int|float $values
- * @return int<0, max>
+ * @return (PHP_MAJOR_VERSION is 8 ? int<0, max> : int<0, max>|false)
  *
  * @psalm-taint-specialize
  * @psalm-flow ($format, $values) -> return
@@ -1320,7 +1318,7 @@ function printf(string $format, ...$values) {}
 
 /**
  * @param array<string|int|float> $values
- * @return int<0, max>
+ * @return (PHP_MAJOR_VERSION is 8 ? int<0, max> : int<0, max>|false)
  *
  * @psalm-pure
  * @psalm-taint-specialize