From b466a965e7322d07f3b703ad6bf52ecb8df26b54 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas.gerbet@enalean.com>
Date: Tue, 23 Aug 2022 14:01:44 +0200
Subject: [PATCH] Allow *bin2hex and *bin2base64 functions to keep
 non-empty-string type

Those functions should not return a string when they receive a
non-empty-string in input.

The following example is expected to work:
```php
<?php

/**
 * @param non-empty-string $i
 */
function takesNonEmptyString(string $i): void {
    echo $i;
}

takesNonEmptyString(bin2hex("a"));
takesNonEmptyString(base64_encode("a"));
```
---
 stubs/CoreGenericFunctions.phpstub | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/stubs/CoreGenericFunctions.phpstub b/stubs/CoreGenericFunctions.phpstub
index 54bd9d8f27b..92f2ae5306e 100644
--- a/stubs/CoreGenericFunctions.phpstub
+++ b/stubs/CoreGenericFunctions.phpstub
@@ -334,6 +334,22 @@ function fclose(&$stream) : bool
 {
 }
 
+/**
+ * @psalm-pure
+ * @template T as string
+ * @param T $string
+ * @return T
+ */
+function sodium_bin2base64(string $string, int $id): string
+
+/**
+ * @psalm-pure
+ * @template T as string
+ * @param T $string
+ * @return T
+ */
+function sodium_bin2hex(string $string): string {}
+
 /**
  * @param string $string
  * @param-out null $string
@@ -1308,9 +1324,21 @@ function base64_decode(string $string, bool $strict = false) {}
  * @psalm-pure
  *
  * @psalm-flow ($string) -> return
+ * @template T as string
+ * @param T $string
+ * @return T
  */
 function base64_encode(string $string) : string {}
 
+/**
+ * @psalm-pure
+ *
+ * @template T as string
+ * @param T $string
+ * @return T
+ */
+function bin2hex(string $string): string {}
+
 /**
  * @psalm-pure
  *