From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 18 Jan 2021 22:39:42 +0000 (+0100)
Subject: ldap_search() and friends can return array
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f33105dcb6fb6f59801ebf122fd7223a41fa83aa;p=php

ldap_search() and friends can return array

See the description of <https://www.php.net/ldap-search>, and also the
implementation.

Closes GH-6620.
---

diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php
index 987c1120b9..d859c69af3 100644
--- a/ext/ldap/ldap.stub.php
+++ b/ext/ldap/ldap.stub.php
@@ -35,19 +35,19 @@ function ldap_sasl_bind($ldap, ?string $dn = null, ?string $password = null, ?st
 
 /**
  * @param resource|array $ldap
- * @return resource|false
+ * @return resource|array|false
  */
 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 = null) {}
 
 /**
  * @param resource|array $ldap
- * @return resource|false
+ * @return resource|array|false
  */
 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 = null) {}
 
 /**
  * @param resource|array $ldap
- * @return resource|false
+ * @return resource|array|false
  */
 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 = null) {}
 
diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h
index f235aa1f89..15e41afe72 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: 836e18943977613fc0abf7443ad4d5afdbe65a0a */
+ * Stub hash: 9d6315aeee2e3a1be51c05b65a960ed433bbe4ec */
 
 #if defined(HAVE_ORALDAP)
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0)