From: Côme Chilliet <mcmic@php.net>
Date: Tue, 29 Sep 2020 07:36:25 +0000 (+0200)
Subject: Improve parameter names in ext/ldap
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19453554352ef7bfe2c0d72d37fd7206babf20f3;p=php

Improve parameter names in ext/ldap

Merging PR 6153
---

diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php
index 3a51986b4f..df973b933c 100644
--- a/ext/ldap/ldap.stub.php
+++ b/ext/ldap/ldap.stub.php
@@ -37,19 +37,19 @@ function ldap_sasl_bind($ldap, ?string $dn = null, ?string $password = null, ?st
  * @param resource|array $ldap
  * @return resource|false
  */
-function ldap_read($ldap, array|string $base, array|string $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {}
+function ldap_read($ldap, array|string $base, array|string $filter, array $attributes = [], int $attributes_only = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {}
 
 /**
  * @param resource|array $ldap
  * @return resource|false
  */
-function ldap_list($ldap, array|string $base, array|string $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {}
+function ldap_list($ldap, array|string $base, array|string $filter, array $attributes = [], int $attributes_only = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {}
 
 /**
  * @param resource|array $ldap
  * @return resource|false
  */
-function ldap_search($ldap, array|string $base, array|string $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {}
+function ldap_search($ldap, array|string $base, array|string $filter, array $attributes = [], int $attributes_only = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {}
 
 /** @param resource $ldap */
 function ldap_free_result($ldap): bool {}
@@ -218,9 +218,9 @@ function ldap_rename_ext($ldap, string $dn, string $new_rdn, string $new_parent,
 
 /**
  * @param resource $ldap
- * @param array|string|int $retval
+ * @param array|string|int $value
  */
-function ldap_get_option($ldap, int $option, &$retval = null): bool {}
+function ldap_get_option($ldap, int $option, &$value = null): bool {}
 
 /**
  * @param resource|null $ldap
@@ -261,13 +261,13 @@ function ldap_parse_reference($ldap, $entry, &$referrals): bool {}
 /**
  * @param resource $ldap
  * @param resource $result
- * @param int $errcode
- * @param string $matcheddn
- * @param string $errmsg
+ * @param int $error_code
+ * @param string $matched_dn
+ * @param string $error_message
  * @param array $referrals
  * @param array $controls
  */
-function ldap_parse_result($ldap, $result, &$errcode, &$matcheddn = null, &$errmsg = null, &$referrals = null, &$controls = null): bool {}
+function ldap_parse_result($ldap, $result, &$error_code, &$matched_dn = null, &$error_message = null, &$referrals = null, &$controls = null): bool {}
 #endif
 #endif
 
@@ -293,11 +293,11 @@ function ldap_8859_to_t61(string $value): string|false {}
 #ifdef HAVE_LDAP_EXTENDED_OPERATION_S
 /**
  * @param resource $ldap
- * @param string $retdata
- * @param string $retoid
+ * @param string $response_data
+ * @param string $response_oid
  * @return resource|bool
  */
-function ldap_exop($ldap, string $reqoid, ?string $reqdata = null, ?array $controls = [], &$retdata = null, &$retoid = null) {}
+function ldap_exop($ldap, string $request_oid, ?string $request_data = null, ?array $controls = [], &$response_data = null, &$response_oid = null) {}
 #endif
 
 #ifdef HAVE_LDAP_PASSWD
@@ -323,8 +323,8 @@ function ldap_exop_refresh($ldap, string $dn, int $ttl): int|false {}
 /**
  * @param resource $ldap
  * @param resource $result
- * @param string $retdata
- * @param string $retoid
+ * @param string $response_data
+ * @param string $response_oid
  */
-function ldap_parse_exop($ldap, $result, &$retdata = null, &$retoid = null): bool {}
+function ldap_parse_exop($ldap, $result, &$response_data = null, &$response_oid = null): bool {}
 #endif
diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h
index 24fe4c3acd..4b73b68d8f 100644
--- a/ext/ldap/ldap_arginfo.h
+++ b/ext/ldap/ldap_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 4802f25ebc9936ccd6e4705d07a49a61892b71f3 */
+ * Stub hash: 0c721a3272fef9d1a06a8cb4163eeb219661fb00 */
 
 #if defined(HAVE_ORALDAP)
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0)
@@ -55,7 +55,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_read, 0, 0, 3)
 	ZEND_ARG_TYPE_MASK(0, base, MAY_BE_ARRAY|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_MASK(0, filter, MAY_BE_ARRAY|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, attributes, IS_ARRAY, 0, "[]")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, attrsonly, IS_LONG, 0, "0")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, attributes_only, IS_LONG, 0, "0")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sizelimit, IS_LONG, 0, "-1")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timelimit, IS_LONG, 0, "-1")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, deref, IS_LONG, 0, "LDAP_DEREF_NEVER")
@@ -216,9 +216,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_rename_ext, 0, 0, 5)
 	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, newrdn, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, newparent, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, deleteoldrdn, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, new_rdn, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, new_parent, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, delete_old_rdn, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 #endif
@@ -227,7 +227,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_get_option, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retval, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, value, "null")
 ZEND_END_ARG_INFO()
 #endif
 
@@ -272,9 +272,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_result, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_INFO(0, result)
-	ZEND_ARG_INFO(1, errcode)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, matcheddn, "null")
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, errmsg, "null")
+	ZEND_ARG_INFO(1, error_code)
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, matched_dn, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, error_message, "null")
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, referrals, "null")
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, controls, "null")
 ZEND_END_ARG_INFO()
@@ -312,11 +312,11 @@ ZEND_END_ARG_INFO()
 #if defined(HAVE_LDAP_EXTENDED_OPERATION_S)
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_exop, 0, 0, 2)
 	ZEND_ARG_INFO(0, ldap)
-	ZEND_ARG_TYPE_INFO(0, reqoid, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, reqdata, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO(0, request_oid, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, request_data, IS_STRING, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 1, "[]")
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retdata, "null")
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retoid, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response_data, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response_oid, "null")
 ZEND_END_ARG_INFO()
 #endif
 
@@ -348,8 +348,8 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_exop, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_INFO(0, result)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retdata, "null")
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retoid, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response_data, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response_oid, "null")
 ZEND_END_ARG_INFO()
 #endif