Added skip when control are not supported by the test ldap server

9 files changed, 44 insertions, 0 deletions

diff --git a/ext/ldap/tests/ldap_add_ext.phpt b/ext/ldap/tests/ldap_add_ext.phpt
index 89d39c9d17..12916d98c3 100644
--- a/ext/ldap/tests/ldap_add_ext.phpt
+++ b/ext/ldap/tests/ldap_add_ext.phpt
@@ -5,6 +5,10 @@ Côme Chilliet <mcmic@php.net>
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
+<?php
+require_once('skipifcontrol.inc');
+skipifunsupportedcontrol(LDAP_CONTROL_POST_READ);
+?>
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_bind_ext.phpt b/ext/ldap/tests/ldap_bind_ext.phpt
index 04134bf348..3a9ca415bd 100644
--- a/ext/ldap/tests/ldap_bind_ext.phpt
+++ b/ext/ldap/tests/ldap_bind_ext.phpt
@@ -5,6 +5,10 @@ Côme Chilliet <mcmic@php.net>
 --SKIPIF--
 <?php require_once dirname(__FILE__) .'/skipif.inc'; ?>
 <?php require_once dirname(__FILE__) .'/skipifbindfailure.inc'; ?>
+<?php
+require_once('skipifcontrol.inc');
+skipifunsupportedcontrol(LDAP_CONTROL_PASSWORDPOLICYREQUEST);
+?>
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_controls.phpt b/ext/ldap/tests/ldap_controls.phpt
index 02f65b549e..8a9c8f9f22 100644
--- a/ext/ldap/tests/ldap_controls.phpt
+++ b/ext/ldap/tests/ldap_controls.phpt
@@ -6,6 +6,9 @@ Côme Chilliet <mcmic@php.net>
 <?php
 require_once('skipif.inc');
 require_once('skipifbindfailure.inc');
+require_once('skipifcontrol.inc');
+skipifunsupportedcontrol(LDAP_CONTROL_ASSERT);
+skipifunsupportedcontrol(LDAP_CONTROL_VALUESRETURNFILTER);
 ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_delete_ext.phpt b/ext/ldap/tests/ldap_delete_ext.phpt
index f4e9937e03..c4d0264088 100644
--- a/ext/ldap/tests/ldap_delete_ext.phpt
+++ b/ext/ldap/tests/ldap_delete_ext.phpt
@@ -5,6 +5,10 @@ Côme Chilliet <mcmic@php.net>
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
+<?php
+require_once('skipifcontrol.inc');
+skipifunsupportedcontrol(LDAP_CONTROL_PRE_READ);
+?>
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_mod_ext.phpt b/ext/ldap/tests/ldap_mod_ext.phpt
index f97ce1412b..391ecbf909 100644
--- a/ext/ldap/tests/ldap_mod_ext.phpt
+++ b/ext/ldap/tests/ldap_mod_ext.phpt
@@ -6,6 +6,11 @@ Patrick Allaert <patrickallaert@php.net>
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
+<?php
+require_once('skipifcontrol.inc');
+skipifunsupportedcontrol(LDAP_CONTROL_PRE_READ);
+skipifunsupportedcontrol(LDAP_CONTROL_POST_READ);
+?>
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_parse_result_controls.phpt b/ext/ldap/tests/ldap_parse_result_controls.phpt
index 326f164f12..711507f6c0 100644
--- a/ext/ldap/tests/ldap_parse_result_controls.phpt
+++ b/ext/ldap/tests/ldap_parse_result_controls.phpt
@@ -5,6 +5,10 @@ Côme Chilliet <mcmic@php.net>
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
+<?php
+require_once('skipifcontrol.inc');
+skipifunsupportedcontrol(LDAP_CONTROL_PAGEDRESULTS);
+?>
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_rename_ext.phpt b/ext/ldap/tests/ldap_rename_ext.phpt
index 1de7e45364..bee180b6f7 100644
--- a/ext/ldap/tests/ldap_rename_ext.phpt
+++ b/ext/ldap/tests/ldap_rename_ext.phpt
@@ -5,6 +5,11 @@ Côme Chilliet <mcmic@php.net>
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
+<?php
+require_once('skipifcontrol.inc');
+skipifunsupportedcontrol(LDAP_CONTROL_PRE_READ);
+skipifunsupportedcontrol(LDAP_CONTROL_POST_READ);
+?>
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_search_paged_result_controls.phpt b/ext/ldap/tests/ldap_search_paged_result_controls.phpt
index fb85bc6709..2187a54148 100644
--- a/ext/ldap/tests/ldap_search_paged_result_controls.phpt
+++ b/ext/ldap/tests/ldap_search_paged_result_controls.phpt
@@ -6,6 +6,8 @@ Côme Chilliet <mcmic@php.net>
 <?php
 require_once('skipif.inc');
 require_once('skipifbindfailure.inc');
+require_once('skipifcontrol.inc');
+skipifunsupportedcontrol(LDAP_CONTROL_PAGEDRESULTS);
 ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/skipifcontrol.inc b/ext/ldap/tests/skipifcontrol.inc
new file mode 100644
index 0000000000..ae551d6add
--- /dev/null
+++ b/ext/ldap/tests/skipifcontrol.inc
@@ -0,0 +1,13 @@
+<?php
+require_once 'connect.inc';
+
+function skipifunsupportedcontrol($oid)
+{
+	global $host, $port, $user, $passwd, $protocol_version, $base;
+	$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+	$result = ldap_read($link, '', '(objectClass=*)', ['supportedControl']);
+	if (!in_array($oid, ldap_get_entries($link, $result)[0]['supportedcontrol'])) {
+		die(sprintf("skip Unsupported control %s", $oid));
+	}
+}
+?>