From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 10 Jul 2020 07:57:13 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc68f10b7624f76707188e56371bcbdd43f8b8bc;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  enable ext/ldap/tests on azure
  fix some ext/ldap/tests
---

bc68f10b7624f76707188e56371bcbdd43f8b8bc
diff --cc ext/ldap/tests/ldap_sasl_bind_basic.phpt
index d447572e09,d85cd73a5c..3ab977b854
--- a/ext/ldap/tests/ldap_sasl_bind_basic.phpt
+++ b/ext/ldap/tests/ldap_sasl_bind_basic.phpt
@@@ -17,9 -17,21 +17,20 @@@ Patrick Allaert <patrickallaert@php.net
  <?php
  require "connect.inc";
  
+ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+ insert_dummy_data($link, $base);
+ ldap_unbind($link);
+ 
  $link = ldap_connect($host, $port);
  ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
- var_dump(ldap_sasl_bind($link, null, $passwd, 'DIGEST-MD5', 'realm', $sasl_user));
+ var_dump(ldap_sasl_bind($link, null, $sasl_passwd, 'DIGEST-MD5', 'realm', $sasl_user));
+ ?>
 -===DONE===
+ --CLEAN--
+ <?php
+ include "connect.inc";
+ 
+ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+ remove_dummy_data($link, $base);
  ?>
  --EXPECT--
  bool(true)
diff --cc ext/ldap/tests/ldap_sasl_bind_error.phpt
index eb68370ff6,8e2e5e1d13..53a84eae1a
--- a/ext/ldap/tests/ldap_sasl_bind_error.phpt
+++ b/ext/ldap/tests/ldap_sasl_bind_error.phpt
@@@ -14,21 -18,35 +18,28 @@@ ldap_unbind($link)
  $link = ldap_connect($host, $port);
  ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
  
 -// Invalid parameter count
 -var_dump(ldap_sasl_bind());
 -
  // Invalid DN
- var_dump(ldap_sasl_bind($link, "Invalid DN", $passwd, 'DIGEST-MD5', 'realm', $sasl_user));
+ var_dump(ldap_sasl_bind($link, "Invalid DN", $sasl_passwd, 'DIGEST-MD5', 'realm', $sasl_user));
  
  // Invalid user
- var_dump(ldap_sasl_bind($link, null, "ThisIsNotCorrect$passwd", 'DIGEST-MD5', "realm", "invalid$sasl_user"));
+ var_dump(ldap_sasl_bind($link, null, "ThisIsNotCorrect$sasl_passwd", 'DIGEST-MD5', "realm", "invalid$sasl_user"));
  
  // Invalid password
- var_dump(ldap_sasl_bind($link, null, "ThisIsNotCorrect$passwd", 'DIGEST-MD5', "realm", $sasl_user));
+ var_dump(ldap_sasl_bind($link, null, "ThisIsNotCorrect$sasl_passwd", 'DIGEST-MD5', "realm", $sasl_user));
  
- var_dump(ldap_sasl_bind($link, null, $passwd, 'DIGEST-MD5', "realm", "Manager", "test"));
+ var_dump(ldap_sasl_bind($link, null, $sasl_passwd, 'DIGEST-MD5', "realm", "Manager", "test"));
  
  // Invalid DN syntax
- var_dump(ldap_sasl_bind($link, "unexistingProperty=weirdValue,$user", $passwd));
+ var_dump(ldap_sasl_bind($link, "unexistingProperty=weirdValue,$user", $sasl_passwd));
+ ?>
 -===DONE===
+ --CLEAN--
+ <?php
+ include "connect.inc";
+ 
+ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+ remove_dummy_data($link, $base);
  ?>
  --EXPECTF--
 -Warning: ldap_sasl_bind() expects at least 1 parameter, 0 given in %s on line %d
 -bool(false)
 -
  Warning: ldap_sasl_bind(): Unable to bind to server: Invalid DN syntax in %s on line %d
  bool(false)