From 74d757e3fdd442d153203c6abf3174bd68073b55 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 7 Oct 2020 15:14:41 +0200
Subject: [PATCH] Update ext/dba parameter names

Closes GH-6292.
---
 ext/dba/dba.stub.php  | 54 +++++++++++++++++++++----------------------
 ext/dba/dba_arginfo.h | 18 +++++++--------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/ext/dba/dba.stub.php b/ext/dba/dba.stub.php
index c79594b3b1c..745a88d4f82 100644
--- a/ext/dba/dba.stub.php
+++ b/ext/dba/dba.stub.php
@@ -5,68 +5,68 @@
 /**
  * @param string $path
  * @param string $mode
- * @param string $handlername
- * @param string $handler_parameters
+ * @param string $handler
+ * @param string $handler_params
  * @return resource|false
  */
-function dba_popen($path, $mode, $handlername = UNKNOWN, ...$handler_parameters) {}
+function dba_popen($path, $mode, $handler = UNKNOWN, ...$handler_params) {}
 
 /**
  * @param string $path
  * @param string $mode
- * @param string $handlername
- * @param string $handler_parameters
+ * @param string $handler
+ * @param string $handler_params
  * @return resource|false
  */
-function dba_open($path, $mode, $handlername = UNKNOWN, ...$handler_parameters) {}
+function dba_open($path, $mode, $handler = UNKNOWN, ...$handler_params) {}
 
-/** @param resource $handle */
-function dba_close($handle): void {}
+/** @param resource $dba */
+function dba_close($dba): void {}
 
 /**
  * @param string|array $key
- * @param resource $handle
+ * @param resource $dba
  */
-function dba_exists($key, $handle): bool {}
+function dba_exists($key, $dba): bool {}
 
 /**
  * @param string|array $key
- * @param int|resource $skip actually this parameter is optional, not $handle
- * @param resource $handle
+ * @param int|resource $skip actually this parameter is optional, not $dba
+ * @param resource $dba
  */
-function dba_fetch($key, $skip, $handle = UNKNOWN): string|false {}
+function dba_fetch($key, $skip, $dba = UNKNOWN): string|false {}
 
 function dba_key_split(string $key): array|false {}
 
-/** @param resource $handle */
-function dba_firstkey($handle): string|false {}
+/** @param resource $dba */
+function dba_firstkey($dba): string|false {}
 
-/** @param resource $handle */
-function dba_nextkey($handle): string|false {}
+/** @param resource $dba */
+function dba_nextkey($dba): string|false {}
 
 /**
  * @param string|array $key
- * @param resource $handle
+ * @param resource $dba
  */
-function dba_delete($key, $handle): bool {}
+function dba_delete($key, $dba): bool {}
 
 /**
  * @param string|array $key
- * @param resource $handle
+ * @param resource $dba
  */
-function dba_insert($key, string $value, $handle): bool {}
+function dba_insert($key, string $value, $dba): bool {}
 
 /**
  * @param string|array $key
- * @param resource $handle
+ * @param resource $dba
  */
-function dba_replace($key, string $value, $handle): bool {}
+function dba_replace($key, string $value, $dba): bool {}
 
-/** @param resource $handle */
-function dba_optimize($handle): bool {}
+/** @param resource $dba */
+function dba_optimize($dba): bool {}
 
-/** @param resource $handle */
-function dba_sync($handle): bool {}
+/** @param resource $dba */
+function dba_sync($dba): bool {}
 
 function dba_handlers(bool $full_info = false): array {}
 
diff --git a/ext/dba/dba_arginfo.h b/ext/dba/dba_arginfo.h
index bada5c39f26..be8d0d6862f 100644
--- a/ext/dba/dba_arginfo.h
+++ b/ext/dba/dba_arginfo.h
@@ -1,28 +1,28 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 5b43c7cfcb48f3081d5585192eaaa5185df036f8 */
+ * Stub hash: 15c236854ed1d2e775486de5c8018adbd00506f9 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2)
 	ZEND_ARG_INFO(0, path)
 	ZEND_ARG_INFO(0, mode)
-	ZEND_ARG_INFO(0, handlername)
-	ZEND_ARG_VARIADIC_INFO(0, handler_parameters)
+	ZEND_ARG_INFO(0, handler)
+	ZEND_ARG_VARIADIC_INFO(0, handler_params)
 ZEND_END_ARG_INFO()
 
 #define arginfo_dba_open arginfo_dba_popen
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_dba_close, 0, 1, IS_VOID, 0)
-	ZEND_ARG_INFO(0, handle)
+	ZEND_ARG_INFO(0, dba)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_dba_exists, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, key)
-	ZEND_ARG_INFO(0, handle)
+	ZEND_ARG_INFO(0, dba)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_dba_fetch, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, key)
 	ZEND_ARG_INFO(0, skip)
-	ZEND_ARG_INFO(0, handle)
+	ZEND_ARG_INFO(0, dba)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_dba_key_split, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
@@ -30,7 +30,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_dba_key_split, 0, 1, MAY_BE_ARRA
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_dba_firstkey, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_INFO(0, handle)
+	ZEND_ARG_INFO(0, dba)
 ZEND_END_ARG_INFO()
 
 #define arginfo_dba_nextkey arginfo_dba_firstkey
@@ -40,13 +40,13 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_dba_insert, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, key)
 	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
-	ZEND_ARG_INFO(0, handle)
+	ZEND_ARG_INFO(0, dba)
 ZEND_END_ARG_INFO()
 
 #define arginfo_dba_replace arginfo_dba_insert
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_dba_optimize, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, handle)
+	ZEND_ARG_INFO(0, dba)
 ZEND_END_ARG_INFO()
 
 #define arginfo_dba_sync arginfo_dba_optimize