From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 15 Nov 2019 11:43:22 +0000 (+0100)
Subject: password_hash() can't return false
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40dcf2bd3df6a59b632220c0038cf0c4cd89eeb1;p=php

password_hash() can't return false
---

diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
index 8c878b74e9..b35b84fffa 100755
--- a/ext/standard/basic_functions.stub.php
+++ b/ext/standard/basic_functions.stub.php
@@ -991,7 +991,7 @@ function unpack(string $format, string $data, int $offset = 0): array|false {}
 
 function password_get_info(string $hash): ?array {}
 
-function password_hash(string $password, $algo, array $options = []): string|false|null {}
+function password_hash(string $password, $algo, array $options = []): ?string {}
 
 function password_needs_rehash(string $hash, $algo, array $options = []): bool {}
 
diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
index 431830d632..f62df22dae 100755
--- a/ext/standard/basic_functions_arginfo.h
+++ b/ext/standard/basic_functions_arginfo.h
@@ -1476,7 +1476,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_password_get_info, 0, 1, IS_ARRA
 	ZEND_ARG_TYPE_INFO(0, hash, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_password_hash, 0, 2, MAY_BE_STRING|MAY_BE_FALSE|MAY_BE_NULL)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_password_hash, 0, 2, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0)
 	ZEND_ARG_INFO(0, algo)
 	ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 0)