From d59bc8078291883f1dc010a38c234600c17d0385 Mon Sep 17 00:00:00 2001
From: =?utf8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Wed, 18 Dec 2019 20:38:40 +0100
Subject: [PATCH] Fix smaller issues with stubs

GH-5025
---
 ext/bcmath/bcmath.stub.php             | 18 +++++++-------
 ext/gd/gd.stub.php                     |  4 +--
 ext/hash/hash.c                        |  2 +-
 ext/hash/hash.stub.php                 |  4 ++-
 ext/hash/hash_arginfo.h                |  2 ++
 ext/standard/basic_functions.c         |  2 +-
 ext/standard/basic_functions.stub.php  | 14 +++++------
 ext/standard/basic_functions_arginfo.h |  2 +-
 ext/zlib/zlib.stub.php                 | 34 +++++++++++++-------------
 9 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/ext/bcmath/bcmath.stub.php b/ext/bcmath/bcmath.stub.php
index 5f59487f41..0a975352bb 100644
--- a/ext/bcmath/bcmath.stub.php
+++ b/ext/bcmath/bcmath.stub.php
@@ -1,21 +1,21 @@
 <?php
 
-function bcadd(string $left_operand, string $right_operand, int $scale = UNKNOWN) : string {}
+function bcadd(string $left_operand, string $right_operand, int $scale = UNKNOWN): string {}
 
-function bcsub(string $left_operand, string $right_operand, int $scale = UNKNOWN) : string {}
+function bcsub(string $left_operand, string $right_operand, int $scale = UNKNOWN): string {}
 
-function bcmul(string $left_operand, string $right_operand, int $scale = UNKNOWN) : string {}
+function bcmul(string $left_operand, string $right_operand, int $scale = UNKNOWN): string {}
 
-function bcdiv(string $dividend, string $divisor, int $scale = UNKNOWN) : string {}
+function bcdiv(string $dividend, string $divisor, int $scale = UNKNOWN): string {}
 
-function bcmod(string $dividend, string $divisor, int $scale = UNKNOWN) : string {}
+function bcmod(string $dividend, string $divisor, int $scale = UNKNOWN): string {}
 
 function bcpowmod(string $base, string $exponent, string $modulus, int $scale = UNKNOWN): string|false {}
 
-function bcpow(string $base, string $exponent, int $scale = UNKNOWN) : string {}
+function bcpow(string $base, string $exponent, int $scale = UNKNOWN): string {}
 
-function bcsqrt(string $operand, int $scale = UNKNOWN) : string {}
+function bcsqrt(string $operand, int $scale = UNKNOWN): string {}
 
-function bccomp(string $left_operand, string $right_operand, int $scale = UNKNOWN) : int {}
+function bccomp(string $left_operand, string $right_operand, int $scale = UNKNOWN): int {}
 
-function bcscale(int $scale = UNKNOWN) : int {}
+function bcscale(int $scale = UNKNOWN): int {}
diff --git a/ext/gd/gd.stub.php b/ext/gd/gd.stub.php
index a1c9a2f74a..3dbb694856 100644
--- a/ext/gd/gd.stub.php
+++ b/ext/gd/gd.stub.php
@@ -205,9 +205,9 @@ function imagegetclip(GdImage $im): array {}
 #ifdef HAVE_GD_FREETYPE
 function imageftbbox(float $size, float $angle, string $font_file, string $text, array $extrainfo = UNKNOWN): array|false {}
 
-function imagefttext(GdImage $im, float $size, float $angle, int $x, int $y, int $col, string $font_file, string $text, array $extrainfo = UNKNOWN) {}
+function imagefttext(GdImage $im, float $size, float $angle, int $x, int $y, int $col, string $font_file, string $text, array $extrainfo = UNKNOWN): array|false {}
 
-function imagettfbbox(float $size, float $angle, string $font_file, string $text) {}
+function imagettfbbox(float $size, float $angle, string $font_file, string $text): array|false {}
 
 function imagettftext(GdImage $im, float $size, float $angle, int $x, int $y, int $col, string $font_file, string $text) {}
 #endif
diff --git a/ext/hash/hash.c b/ext/hash/hash.c
index 94d673ada2..38a32803f4 100644
--- a/ext/hash/hash.c
+++ b/ext/hash/hash.c
@@ -1329,7 +1329,7 @@ static const zend_function_entry hash_functions[] = {
 	PHP_FE(hash_copy,								arginfo_hash_copy)
 
 	PHP_FE(hash_algos,								arginfo_hash_algos)
-	PHP_FE(hash_hmac_algos,							arginfo_hash_algos)
+	PHP_FE(hash_hmac_algos,							arginfo_hash_hmac_algos)
 	PHP_FE(hash_pbkdf2,								arginfo_hash_pbkdf2)
 	PHP_FE(hash_equals,								arginfo_hash_equals)
 	PHP_FE(hash_hkdf,								arginfo_hash_hkdf)
diff --git a/ext/hash/hash.stub.php b/ext/hash/hash.stub.php
index d874a0ab18..f17084db1d 100644
--- a/ext/hash/hash.stub.php
+++ b/ext/hash/hash.stub.php
@@ -24,13 +24,15 @@ function hash_copy(HashContext $context): HashContext {}
 
 function hash_algos(): array {}
 
+function hash_hmac_algos(): array {}
+
 function hash_pbkdf2(string $algo, string $password, string $salt, int $iterations, int $length = 0, bool $raw_output = false): string {}
 
 /**
  * @param $known_string no type juggling is performed
  * @param $user_string no type juggling is performed
  */
-function hash_equals(string $known_string, string $user_string) : bool {}
+function hash_equals(string $known_string, string $user_string): bool {}
 
 function hash_hkdf(string $algo, string $ikm, int $length = 0, string $info = '', string $salt = ''): string {}
 
diff --git a/ext/hash/hash_arginfo.h b/ext/hash/hash_arginfo.h
index 41d22f4a8e..27083f35bd 100644
--- a/ext/hash/hash_arginfo.h
+++ b/ext/hash/hash_arginfo.h
@@ -56,6 +56,8 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_hash_algos, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_hash_hmac_algos arginfo_hash_algos
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_hash_pbkdf2, 0, 4, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, algo, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0)
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index da97eabf75..7971cce82e 100755
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -129,7 +129,7 @@ static const zend_function_entry basic_functions[] = { /* {{{ */
 	PHP_FE(sleep,															arginfo_sleep)
 	PHP_FE(usleep,															arginfo_usleep)
 #if HAVE_NANOSLEEP
-	PHP_FE(time_nanosleep,													arginfo_nanosleep)
+	PHP_FE(time_nanosleep,													arginfo_time_nanosleep)
 	PHP_FE(time_sleep_until,												arginfo_time_sleep_until)
 #endif
 
diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
index 246e9be833..2a427b8ab8 100755
--- a/ext/standard/basic_functions.stub.php
+++ b/ext/standard/basic_functions.stub.php
@@ -264,7 +264,7 @@ function sleep(int $seconds): int {}
 function usleep(int $microseconds): void {}
 
 #if HAVE_NANOSLEEP
-function nanosleep(int $seconds, int $nanoseconds): array|bool {}
+function time_nanosleep(int $seconds, int $nanoseconds): array|bool {}
 
 function time_sleep_until(float $timestamp): bool {}
 #endif
@@ -472,9 +472,9 @@ function inet_pton(string $ip_address): string|false {}
 function metaphone(string $text, int $phones = 0): string|false {}
 
 /* {{{ head.c */
-function header(string $string, bool $replace = true, int $http_response_code = 0): void { }
+function header(string $string, bool $replace = true, int $http_response_code = 0): void {}
 
-function header_remove(string $name = UNKNOWN): void { }
+function header_remove(string $name = UNKNOWN): void {}
 
 /** @param int|array $expires_or_options */
 function setrawcookie(string $name, string $value = '', $expires_or_options = 0, string $path = '', string $domain = '', bool $secure = false, bool $httponly = false): bool {}
@@ -486,7 +486,7 @@ function http_response_code(int $response_code = 0): int|bool {}
 
 function headers_sent(&$file = null, &$line = null): bool {}
 
-function headers_list(): array { }
+function headers_list(): array {}
 
 /* {{{ html.c */
 
@@ -686,7 +686,7 @@ class Directory
      * @param resource $dir_handle
      * @return string|false
      */
-    public function read($dir_handle = UNKNOWN) { }
+    public function read($dir_handle = UNKNOWN) {}
 }
 
 /**
@@ -872,9 +872,9 @@ function fileowner(string $filename): int|false {}
 
 function fileperms(string $filename): int|false {}
 
-function filesize(string $filename): int|false  {}
+function filesize(string $filename): int|false {}
 
-function filetype(string $filename): string|false  {}
+function filetype(string $filename): string|false {}
 
 function file_exists(string $filename): bool {}
 
diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
index e67de5024f..93e2a5bda6 100755
--- a/ext/standard/basic_functions_arginfo.h
+++ b/ext/standard/basic_functions_arginfo.h
@@ -408,7 +408,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_usleep, 0, 1, IS_VOID, 0)
 ZEND_END_ARG_INFO()
 
 #if HAVE_NANOSLEEP
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_nanosleep, 0, 2, MAY_BE_ARRAY|MAY_BE_BOOL)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_time_nanosleep, 0, 2, MAY_BE_ARRAY|MAY_BE_BOOL)
 	ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, nanoseconds, IS_LONG, 0)
 ZEND_END_ARG_INFO()
diff --git a/ext/zlib/zlib.stub.php b/ext/zlib/zlib.stub.php
index 25fd4e87b1..312e570de0 100644
--- a/ext/zlib/zlib.stub.php
+++ b/ext/zlib/zlib.stub.php
@@ -28,52 +28,52 @@ function gzdecode(string $data, int $max_decoded_len = 0): string|false {}
 function gzuncompress(string $data, int $max_decoded_len = 0): string|false {}
 
 /** @param resource $fp */
-function gzwrite($fp, string $str, int $length = UNKNOWN): int|false {};
+function gzwrite($fp, string $str, int $length = UNKNOWN): int|false {}
 
 /** @param resource $fp */
-function gzputs($fp, string $str, int $length = UNKNOWN): int|false {};
+function gzputs($fp, string $str, int $length = UNKNOWN): int|false {}
 
 /** @param resource $fp */
-function gzrewind($fp): bool {};
+function gzrewind($fp): bool {}
 
 /** @param resource $fp */
-function gzclose($fp): bool {};
+function gzclose($fp): bool {}
 
 /** @param resource $fp */
-function gzeof($fp): bool {};
+function gzeof($fp): bool {}
 
 /** @param resource $fp */
-function gzgetc($fp): string|false {};
+function gzgetc($fp): string|false {}
 
 /** @param resource $fp */
-function gzpassthru($fp): int {};
+function gzpassthru($fp): int {}
 
 /** @param resource $fp */
-function gzseek($fp, int $offset, int $whence = SEEK_SET): int {};
+function gzseek($fp, int $offset, int $whence = SEEK_SET): int {}
 
 /** @param resource $fp */
-function gztell($fp): int|false {};
+function gztell($fp): int|false {}
 
 /** @param resource $fp */
-function gzread($fp, int $length): string|false {};
+function gzread($fp, int $length): string|false {}
 
 /** @param resource $fp */
-function gzgets($fp, int $length = 1024): string|false {};
+function gzgets($fp, int $length = 1024): string|false {}
 
 /** @return resource|false */
-function deflate_init(int $encoding, array $options = []) {};
+function deflate_init(int $encoding, array $options = []) {}
 
 /** @param resource $resource */
-function deflate_add($resource, string $add, int $flush_behavior = ZLIB_SYNC_FLUSH): string|false {};
+function deflate_add($resource, string $add, int $flush_behavior = ZLIB_SYNC_FLUSH): string|false {}
 
 /** @return resource|false */
-function inflate_init(int $encoding, array $options = []) {};
+function inflate_init(int $encoding, array $options = []) {}
 
 /** @param resource $context */
-function inflate_add($context, string $encoded_data, int $flush_mode = ZLIB_SYNC_FLUSH): string|false {};
+function inflate_add($context, string $encoded_data, int $flush_mode = ZLIB_SYNC_FLUSH): string|false {}
 
 /** @param resource $resource */
-function inflate_get_status($resource): int|false {};
+function inflate_get_status($resource): int|false {}
 
 /** @param resource $resource */
-function inflate_get_read_len($resource): int|false {};
+function inflate_get_read_len($resource): int|false {}
-- 
2.50.1