com php-src: Fixed ldap tests when ldap server hash out passwords: ext/ldap/tests/ldap_list_basic.phpt ext/ldap/tests/ldap _modify_batch_basic.phpt
ext/ldap/tests/ldap_search _basic.phpt ext/ldap/tests/ldap_search_overrides.ph pt ext/ldap/tests/ldap_search_variation6.phpt
| From: | Côme Bernigaud | Date: | Wed, 26 Jul 2017 15:34:18 +0000 |
| Subject: | com php-src: Fixed ldap tests when ldap server hash out passwords: ext/ldap/tests/ldap_list_basic.phpt ext/ldap/tests/ldap _modify_batch_basic.phpt ext/ldap/tests/ldap_search _basic.phpt ext/ldap/tests/ldap_search_overrides.ph pt ext/ldap/tests/ldap_search_variation6.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98823@lists.php.net to get a copy of this message | ||
Commit: afef1fe7786e22ad0f9e6944911c2c58da5f0147
Author: Côme Chilliet <mcmic@php.net> Wed, 26 Jul 2017 17:33:36 +0200
Parents: 5b69a35c8c106a39f94f5e5c843d326312352735
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=afef1fe7786e22ad0f9e6944911c2c58da5f0147
Log:
Fixed ldap tests when ldap server hash out passwords
Changed paths:
M ext/ldap/tests/ldap_list_basic.phpt
M ext/ldap/tests/ldap_modify_batch_basic.phpt
M ext/ldap/tests/ldap_search_basic.phpt
M ext/ldap/tests/ldap_search_overrides.phpt
M ext/ldap/tests/ldap_search_variation6.phpt
Diff:
diff --git a/ext/ldap/tests/ldap_list_basic.phpt b/ext/ldap/tests/ldap_list_basic.phpt
index 3f98bc8..1aadab6 100644
--- a/ext/ldap/tests/ldap_list_basic.phpt
+++ b/ext/ldap/tests/ldap_list_basic.phpt
@@ -67,7 +67,7 @@ array(3) {
["count"]=>
int(1)
[0]=>
- string(4) "oops"
+ string(%d) "%s"
}
[3]=>
string(12) "userpassword"
@@ -128,7 +128,7 @@ array(3) {
["count"]=>
int(1)
[0]=>
- string(15) "oopsIDitItAgain"
+ string(%d) "%s"
}
[3]=>
string(12) "userpassword"
diff --git a/ext/ldap/tests/ldap_modify_batch_basic.phpt
b/ext/ldap/tests/ldap_modify_batch_basic.phpt
index 23700b4..0bec0e0 100644
--- a/ext/ldap/tests/ldap_modify_batch_basic.phpt
+++ b/ext/ldap/tests/ldap_modify_batch_basic.phpt
@@ -76,7 +76,7 @@ array(2) {
["count"]=>
int(1)
[0]=>
- string(4) "oops"
+ string(%d) "%s"
}
[2]=>
string(12) "userpassword"
diff --git a/ext/ldap/tests/ldap_search_basic.phpt b/ext/ldap/tests/ldap_search_basic.phpt
index 54523de..618366b 100644
--- a/ext/ldap/tests/ldap_search_basic.phpt
+++ b/ext/ldap/tests/ldap_search_basic.phpt
@@ -68,7 +68,7 @@ array(4) {
["count"]=>
int(1)
[0]=>
- string(4) "oops"
+ string(%d) "%s"
}
[3]=>
string(12) "userpassword"
@@ -129,7 +129,7 @@ array(4) {
["count"]=>
int(1)
[0]=>
- string(15) "oopsIDitItAgain"
+ string(%d) "%s"
}
[3]=>
string(12) "userpassword"
@@ -181,7 +181,7 @@ array(4) {
["count"]=>
int(1)
[0]=>
- string(17) "0r1g1na1 passw0rd"
+ string(%d) "%s"
}
[3]=>
string(12) "userpassword"
diff --git a/ext/ldap/tests/ldap_search_overrides.phpt b/ext/ldap/tests/ldap_search_overrides.phpt
index 72d8e24..2434fe5 100644
--- a/ext/ldap/tests/ldap_search_overrides.phpt
+++ b/ext/ldap/tests/ldap_search_overrides.phpt
@@ -81,7 +81,7 @@ array(4) {
["count"]=>
int(1)
[0]=>
- string(4) "oops"
+ string(%d) "%s"
}
[3]=>
string(12) "userpassword"
@@ -142,7 +142,7 @@ array(4) {
["count"]=>
int(1)
[0]=>
- string(15) "oopsIDitItAgain"
+ string(%d) "%s"
}
[3]=>
string(12) "userpassword"
@@ -194,7 +194,7 @@ array(4) {
["count"]=>
int(1)
[0]=>
- string(17) "0r1g1na1 passw0rd"
+ string(%d) "%s"
}
[3]=>
string(12) "userpassword"
diff --git a/ext/ldap/tests/ldap_search_variation6.phpt b/ext/ldap/tests/ldap_search_variation6.phpt
index f4f98db..a920296 100644
--- a/ext/ldap/tests/ldap_search_variation6.phpt
+++ b/ext/ldap/tests/ldap_search_variation6.phpt
@@ -25,12 +25,12 @@ var_dump(
ldap_get_entries($link, $result[1]) === $result0
);
var_dump(
- $result = ldap_search(array($link, $link), null, $filter),
+ $result = ldap_search(array($link, $link), "", $filter),
ldap_get_entries($link, $result[0]),
ldap_get_entries($link, $result[1])
);
var_dump(
- $result = ldap_search(array($link, $link), null, array($filter, $filter)),
+ $result = ldap_search(array($link, $link), "", array($filter, $filter)),
ldap_get_entries($link, $result[0]),
ldap_get_entries($link, $result[1])
);
@@ -87,7 +87,7 @@ array(4) {
["count"]=>
int(1)
[0]=>
- string(4) "oops"
+ string(%d) "%s"
}
[3]=>
string(12) "userpassword"
@@ -148,7 +148,7 @@ array(4) {
["count"]=>
int(1)
[0]=>
- string(15) "oopsIDitItAgain"
+ string(%d) "%s"
}
[3]=>
string(12) "userpassword"
@@ -200,7 +200,7 @@ array(4) {
["count"]=>
int(1)
[0]=>
- string(17) "0r1g1na1 passw0rd"
+ string(%d) "%s"
}
[3]=>
string(12) "userpassword"