From: Máté Kocsis Date: Tue, 19 May 2020 12:54:37 +0000 (+0200) Subject: Fix some final classes in stubs X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed6cf67879a176b090134f819249174b934383d0;p=php Fix some final classes in stubs --- diff --git a/ext/hash/hash.stub.php b/ext/hash/hash.stub.php index a634112d00..32465415fc 100644 --- a/ext/hash/hash.stub.php +++ b/ext/hash/hash.stub.php @@ -50,6 +50,7 @@ function mhash_count(): int {} function mhash(int $hash, string $data, string $key = UNKNOWN): string|false {} #endif -class HashContext { +final class HashContext +{ private function __construct() {} } diff --git a/ext/mysqli/mysqli.stub.php b/ext/mysqli/mysqli.stub.php index 0bf9fb2bf1..fe581a3723 100644 --- a/ext/mysqli/mysqli.stub.php +++ b/ext/mysqli/mysqli.stub.php @@ -2,7 +2,7 @@ /** @generate-function-entries */ -class mysqli_driver +final class mysqli_driver { } @@ -510,15 +510,14 @@ class mysqli_stmt #endif } -class mysqli_warning +final class mysqli_warning { protected function __construct(object $mysqli_link) {} - /** @return bool */ - public function next() {} + public function next(): bool {} } -class mysqli_sql_exception extends RuntimeException +final class mysqli_sql_exception extends RuntimeException { } diff --git a/ext/mysqli/mysqli_arginfo.h b/ext/mysqli/mysqli_arginfo.h index 80c5fcd7cb..f42ce8611f 100644 --- a/ext/mysqli/mysqli_arginfo.h +++ b/ext/mysqli/mysqli_arginfo.h @@ -683,7 +683,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_warning___construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, mysqli_link, IS_OBJECT, 0) ZEND_END_ARG_INFO() -#define arginfo_class_mysqli_warning_next arginfo_class_mysqli_character_set_name +#define arginfo_class_mysqli_warning_next arginfo_mysqli_thread_safe ZEND_FUNCTION(mysqli_affected_rows);