From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 23 Mar 2018 17:57:16 +0000 (+0100)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~146
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad87e2bd6a3cdc792a15bdab987d36cb85a68563;p=php

Merge branch 'PHP-7.2'
---

ad87e2bd6a3cdc792a15bdab987d36cb85a68563
diff --cc ext/ldap/tests/ldap_exop_refresh.phpt
index 2c579931ca,0000000000..13539d53c1
mode 100644,000000..100644
--- a/ext/ldap/tests/ldap_exop_refresh.phpt
+++ b/ext/ldap/tests/ldap_exop_refresh.phpt
@@@ -1,43 -1,0 +1,43 @@@
 +--TEST--
 +ldap_exop_refresh() - Test LDAP refresh extended operation
 +--CREDITS--
 +Emmanuel Dreyfus <manu@netbsd.org>
 +--SKIPIF--
 +<?php require_once('skipif.inc'); ?>
 +<?php require_once('skipifbindfailure.inc'); ?>
 +<?php
 +	$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
 +	$r = ldap_read($link, '', 'objectClass=*', array('dynamicsubtrees'));
 +	$info = ldap_get_entries($link, $r)[0];
 +	if (!isset($info['dynamicsubtrees'])) {
- 		die("Overlay DDS not available");
++		die("skip Overlay DDS not available");
 +	}
 +?>
 +--FILE--
 +<?php
 +require "connect.inc";
 +
 +$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
 +
 +insert_dummy_data($link, $base);
 +ldap_add($link, "cn=tmp,$base", array(
 +	"objectclass" => array("person", "dynamicObject"),
 +	"cn" => "tmp",
 +	"sn" => "tmp"
 +));
 +var_dump(
 +	ldap_exop_refresh($link, "cn=tmp,$base", 1234)
 +);
 +?>
 +===DONE===
 +--CLEAN--
 +<?php
 +include "connect.inc";
 +
 +$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
 +ldap_delete($link, "cn=tmp,$base");
 +remove_dummy_data($link, $base);
 +?>
 +--EXPECT--
 +int(1234)
 +===DONE===