Merge pull request #9479 from fluffycondor/json_throw_with_unescaped_…

…unicode
vimeo · Mar 12, 2023 · d6daaa8 · d6daaa8
2 parents 20a2e66 + 7ba0f97
commit d6daaa8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/stubs/CoreGenericFunctions.phpstub b/stubs/CoreGenericFunctions.phpstub
@@ -1467,7 +1467,11 @@ function json_decode(string $json, ?bool $associative = null, int $depth = 512,
 /**
  * @psalm-pure
  *
- * @return ($flags is 4194304 ? non-empty-string : non-empty-string|false)
+ * @return (
+ *      $flags is 4194304
+ *          ? non-empty-string
+ *          : ($flags is 4194560 ? non-empty-string : non-empty-string|false)
+ *  )
  *
  * @psalm-flow ($value) -> return
  * @psalm-ignore-falsable-return

diff --git a/tests/CoreStubsTest.php b/tests/CoreStubsTest.php
@@ -123,5 +123,13 @@ function foo(string $foo): string
                 '$a===' => 'string',
             ],
         ];
+        yield 'json_encode returns a non-empty-string provided JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE' => [
+            'code' => '<?php
+                $a = json_encode([], JSON_UNESCAPED_UNICODE | JSON_THROW_ON_ERROR);
+            ',
+            'assertions' => [
+                '$a===' => 'non-empty-string',
+            ],
+        ];
     }
 }