Merge pull request #8681 from Ocramius/stubs/better-json-encode-types

Making `json_encode()` always produce a `non-empty-string`, when successful
vimeo · Nov 7, 2022 · 4932337 · 4932337
2 parents 1986c8b + 5e9b921
commit 4932337
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -6586,7 +6586,7 @@
 'join' => ['string', 'separator'=>'string', 'array'=>'array'],
 'join\'1' => ['string', 'separator'=>'array'],
 'json_decode' => ['mixed', 'json'=>'string', 'associative='=>'bool', 'depth='=>'int', 'flags='=>'int'],
-'json_encode' => ['string|false', 'value'=>'mixed', 'flags='=>'int', 'depth='=>'int'],
+'json_encode' => ['non-empty-string|false', 'value'=>'mixed', 'flags='=>'int', 'depth='=>'int'],
 'json_last_error' => ['int'],
 'json_last_error_msg' => ['string'],
 'JsonException::__clone' => ['void'],

diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
@@ -12476,7 +12476,7 @@
     'join\'1' => ['string', 'separator'=>'array'],
     'jpeg2wbmp' => ['bool', 'jpegname'=>'string', 'wbmpname'=>'string', 'dest_height'=>'int', 'dest_width'=>'int', 'threshold'=>'int'],
     'json_decode' => ['mixed', 'json'=>'string', 'associative='=>'bool', 'depth='=>'int', 'flags='=>'int'],
-    'json_encode' => ['string|false', 'value'=>'mixed', 'flags='=>'int', 'depth='=>'int'],
+    'json_encode' => ['non-empty-string|false', 'value'=>'mixed', 'flags='=>'int', 'depth='=>'int'],
     'json_last_error' => ['int'],
     'json_last_error_msg' => ['string'],
     'judy_type' => ['int', 'array'=>'judy'],

diff --git a/stubs/CoreGenericFunctions.phpstub b/stubs/CoreGenericFunctions.phpstub
@@ -1294,7 +1294,7 @@ function json_decode(string $json, ?bool $associative = null, int $depth = 512,
 /**
  * @psalm-pure
  *
- * @return ($flags is 4194304 ? string : string|false)
+ * @return ($flags is 4194304 ? non-empty-string : non-empty-string|false)
  *
  * @psalm-flow ($value) -> return
  * @psalm-ignore-falsable-return