Fixed ldap tests when ldap server hash out passwords

diff --git a/ext/ldap/tests/ldap_list_basic.phpt b/ext/ldap/tests/ldap_list_basic.phpt
index 3f98bc8e2d074a780e63267f08f5ef7593d912fe..1aadab6a17fcb130c612a01fb36f175d6c972aa0 100644 (file)
--- 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 23700b49b20ef65f9e11ee44bce03b3716498638..0bec0e03c4eefd87d7d96efe3bb06b0533c3fe55 100644 (file)
--- 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 54523de38ae1afa387388129c9d534c1a1adf09e..618366b1a184f49f1ad9e043cb6fe3f15b90521a 100644 (file)
--- 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 72d8e2498e58642e44765cb925a63ef2014260a3..2434fe5db242e82be64ce6f89a5280a3adf79330 100644 (file)
--- 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 f4f98db873d61633cb21064b35f5ffc0e76746af..a9202967b47b64290e9834876b6e670fc6f10328 100644 (file)
--- 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"