summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/ldap/tests/ldap_connect_error.phpt4
-rw-r--r--ext/ldap/tests/ldap_count_entries_error.phpt23
-rw-r--r--ext/ldap/tests/ldap_dn2ufn.phpt7
-rw-r--r--ext/ldap/tests/ldap_err2str_error.phpt28
-rw-r--r--ext/ldap/tests/ldap_errno_error.phpt23
-rw-r--r--ext/ldap/tests/ldap_error_error.phpt23
-rw-r--r--ext/ldap/tests/ldap_explode_dn.phpt10
-rw-r--r--ext/ldap/tests/ldap_first_attribute_error.phpt15
-rw-r--r--ext/ldap/tests/ldap_first_entry_error.phpt27
-rw-r--r--ext/ldap/tests/ldap_first_reference_error.phpt27
-rw-r--r--ext/ldap/tests/ldap_free_result_error.phpt23
-rw-r--r--ext/ldap/tests/ldap_get_attributes_error.phpt23
-rw-r--r--ext/ldap/tests/ldap_get_dn_error.phpt23
-rw-r--r--ext/ldap/tests/ldap_get_entries_error.phpt33
-rw-r--r--ext/ldap/tests/ldap_get_option_error.phpt40
-rw-r--r--ext/ldap/tests/ldap_list_error.phpt35
-rw-r--r--ext/ldap/tests/ldap_next_entry_error.phpt27
-rw-r--r--ext/ldap/tests/ldap_next_reference_error.phpt27
-rw-r--r--ext/ldap/tests/ldap_parse_reference_error.phpt31
-rw-r--r--ext/ldap/tests/ldap_parse_result_error.phpt17
-rw-r--r--ext/ldap/tests/ldap_read_error.phpt35
-rw-r--r--ext/ldap/tests/ldap_rename_error.phpt7
-rw-r--r--ext/ldap/tests/ldap_set_option_error.phpt19
23 files changed, 9 insertions, 518 deletions
diff --git a/ext/ldap/tests/ldap_connect_error.phpt b/ext/ldap/tests/ldap_connect_error.phpt
index b93375c39e..24561e1576 100644
--- a/ext/ldap/tests/ldap_connect_error.phpt
+++ b/ext/ldap/tests/ldap_connect_error.phpt
@@ -12,7 +12,6 @@ ldap.max_links=1
require "connect.inc";
// too many arguments
-var_dump(ldap_connect(null, null, null));
var_dump(ldap_connect("ldap://$host:$port/$base"));
$links = array();
@@ -21,9 +20,6 @@ $links[1] = ldap_connect($host, $port);
?>
===DONE===
--EXPECTF--
-Warning: ldap_connect() expects at most 2 parameters, 3 given in %s on line %d
-bool(false)
-
Warning: ldap_connect(): Could not create session handle: %s in %s on line %d
bool(false)
diff --git a/ext/ldap/tests/ldap_count_entries_error.phpt b/ext/ldap/tests/ldap_count_entries_error.phpt
deleted file mode 100644
index 552625a7eb..0000000000
--- a/ext/ldap/tests/ldap_count_entries_error.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-ldap_count_entries() - Testing counting LDAP entries that should fail
---CREDITS--
-Patrick Allaert <patrickallaert@php.net>
-# Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-require "connect.inc";
-
-$link = ldap_connect($host, $port);
-var_dump(ldap_count_entries($link));
-var_dump(ldap_count_entries($link, $link));
-?>
-===DONE===
---EXPECTF--
-Warning: ldap_count_entries() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
-
-Warning: ldap_count_entries(): supplied resource is not a valid ldap result resource in %s on line %d
-bool(false)
-===DONE===
diff --git a/ext/ldap/tests/ldap_dn2ufn.phpt b/ext/ldap/tests/ldap_dn2ufn.phpt
index 8082e97809..54c90658cf 100644
--- a/ext/ldap/tests/ldap_dn2ufn.phpt
+++ b/ext/ldap/tests/ldap_dn2ufn.phpt
@@ -14,20 +14,15 @@ var_dump(ldap_dn2ufn("cn=bob,ou=users,dc=example,dc=com"));
/* Convert DN with < > characters */
var_dump(ldap_dn2ufn("cn=<bob>,dc=example,dc=com"));
-/* Too many parameters */
-ldap_dn2ufn("cn=bob,dc=example,dc=com", 1);
-
/* Bad DN value */
var_dump(ldap_dn2ufn("bob,dc=example,dc=com"));
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
string(16) "bob, example.com"
string(23) "bob, users, example.com"
bool(false)
-
-Warning: ldap_dn2ufn() expects exactly 1 parameter, 2 given in %s on line %d
bool(false)
Done
diff --git a/ext/ldap/tests/ldap_err2str_error.phpt b/ext/ldap/tests/ldap_err2str_error.phpt
deleted file mode 100644
index 0963ac4101..0000000000
--- a/ext/ldap/tests/ldap_err2str_error.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-ldap_err2str() - Incorrect usage of number to string conversion
---CREDITS--
-Patrick Allaert <patrickallaert@php.net>
-# Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-// Too few args
-var_dump(ldap_err2str());
-
-// Too many args
-var_dump(ldap_err2str(1, "Additional data"));
-
-var_dump(ldap_err2str("weird"));
-?>
-===DONE===
---EXPECTF--
-Warning: ldap_err2str() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: ldap_err2str() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: ldap_err2str() expects parameter 1 to be int, string given in %s on line %d
-NULL
-===DONE===
diff --git a/ext/ldap/tests/ldap_errno_error.phpt b/ext/ldap/tests/ldap_errno_error.phpt
deleted file mode 100644
index a05876c88e..0000000000
--- a/ext/ldap/tests/ldap_errno_error.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-ldap_errno() - ldap_errno() operation that should fail
---CREDITS--
-Patrick Allaert <patrickallaert@php.net>
-# Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-// Too few parameters
-var_dump(ldap_errno());
-
-// Too many parameters
-var_dump(ldap_errno(null, null));
-?>
-===DONE===
---EXPECTF--
-Warning: ldap_errno() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: ldap_errno() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-===DONE===
diff --git a/ext/ldap/tests/ldap_error_error.phpt b/ext/ldap/tests/ldap_error_error.phpt
deleted file mode 100644
index e74eacf008..0000000000
--- a/ext/ldap/tests/ldap_error_error.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-ldap_error() - ldap_error() operation that should fail
---CREDITS--
-Patrick Allaert <patrickallaert@php.net>
-# Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-// Too few parameters
-var_dump(ldap_error());
-
-// Too many parameters
-var_dump(ldap_error(null, null));
-?>
-===DONE===
---EXPECTF--
-Warning: ldap_error() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: ldap_error() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-===DONE===
diff --git a/ext/ldap/tests/ldap_explode_dn.phpt b/ext/ldap/tests/ldap_explode_dn.phpt
index 2337ac9eff..aa8ab10088 100644
--- a/ext/ldap/tests/ldap_explode_dn.phpt
+++ b/ext/ldap/tests/ldap_explode_dn.phpt
@@ -23,12 +23,6 @@ var_dump(ldap_explode_dn("cn=<bob>,dc=example,dc=com", 0));
/* Explode without attributes and < > characters */
var_dump(ldap_explode_dn("cn=<bob>,dc=example,dc=com", 1));
-/* Too few parameters */
-ldap_explode_dn("cn=bob,dc=example,dc=com");
-
-/* Too many parameters */
-ldap_explode_dn("cn=bob,dc=example,dc=com", 1, 1);
-
/* Bad DN value with attributes */
var_dump(ldap_explode_dn("bob,dc=example,dc=com", 0));
@@ -85,10 +79,6 @@ array(5) {
}
bool(false)
bool(false)
-
-Warning: ldap_explode_dn() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: ldap_explode_dn() expects exactly 2 parameters, 3 given in %s on line %d
bool(false)
bool(false)
Done
diff --git a/ext/ldap/tests/ldap_first_attribute_error.phpt b/ext/ldap/tests/ldap_first_attribute_error.phpt
index f7016c539f..9737df96c6 100644
--- a/ext/ldap/tests/ldap_first_attribute_error.phpt
+++ b/ext/ldap/tests/ldap_first_attribute_error.phpt
@@ -10,14 +10,13 @@ Patrick Allaert <patrickallaert@php.net>
require "connect.inc";
$link = ldap_connect($host, $port);
-var_dump(ldap_first_attribute($link));
-var_dump(ldap_first_attribute($link, $link));
+try {
+ var_dump(ldap_first_attribute($link, $link));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
?>
===DONE===
---EXPECTF--
-Warning: ldap_first_attribute() expects %s 2 parameters, 1 given in %s on line %d
-NULL
-
-Warning: ldap_first_attribute(): supplied resource is not a valid ldap result entry resource in %s on line %d
-bool(false)
+--EXPECT--
+ldap_first_attribute(): supplied resource is not a valid ldap result entry resource
===DONE===
diff --git a/ext/ldap/tests/ldap_first_entry_error.phpt b/ext/ldap/tests/ldap_first_entry_error.phpt
deleted file mode 100644
index 9f232e0e8f..0000000000
--- a/ext/ldap/tests/ldap_first_entry_error.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-ldap_first_entry() - Testing ldap_first_entry() that should fail
---CREDITS--
-Patrick Allaert <patrickallaert@php.net>
-# Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-require "connect.inc";
-
-$link = ldap_connect($host, $port);
-var_dump(ldap_first_entry($link));
-var_dump(ldap_first_entry($link, $link, "Additional data"));
-var_dump(ldap_first_entry($link, $link));
-?>
-===DONE===
---EXPECTF--
-Warning: ldap_first_entry() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
-
-Warning: ldap_first_entry() expects exactly 2 parameters, 3 given in %s on line %d
-NULL
-
-Warning: ldap_first_entry(): supplied resource is not a valid ldap result resource in %s on line %d
-bool(false)
-===DONE===
diff --git a/ext/ldap/tests/ldap_first_reference_error.phpt b/ext/ldap/tests/ldap_first_reference_error.phpt
deleted file mode 100644
index d5541e10fc..0000000000
--- a/ext/ldap/tests/ldap_first_reference_error.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-ldap_first_reference() - Testing ldap_first_reference() that should fail
---CREDITS--
-Patrick Allaert <patrickallaert@php.net>
-# Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-require "connect.inc";
-
-$link = ldap_connect($host, $port);
-var_dump(ldap_first_reference($link));
-var_dump(ldap_first_reference($link, $link, "Additional data"));
-var_dump(ldap_first_reference($link, $link));
-?>
-===DONE===
---EXPECTF--
-Warning: ldap_first_reference() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
-
-Warning: ldap_first_reference() expects exactly 2 parameters, 3 given in %s on line %d
-NULL
-
-Warning: ldap_first_reference(): supplied resource is not a valid ldap result resource in %s on line %d
-bool(false)
-===DONE===
diff --git a/ext/ldap/tests/ldap_free_result_error.phpt b/ext/ldap/tests/ldap_free_result_error.phpt
deleted file mode 100644
index 05623d62d0..0000000000
--- a/ext/ldap/tests/ldap_free_result_error.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-ldap_free_result() - Testing ldap_free_result() that should fail
---CREDITS--
-Patrick Allaert <patrickallaert@php.net>
-# Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-require "connect.inc";
-
-$link = ldap_connect($host, $port);
-var_dump(ldap_free_result($link));
-var_dump(ldap_free_result($link, "Additional data"));
-?>
-===DONE===
---EXPECTF--
-Warning: ldap_free_result(): supplied resource is not a valid ldap result resource in %s on line %d
-bool(false)
-
-Warning: ldap_free_result() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-===DONE===
diff --git a/ext/ldap/tests/ldap_get_attributes_error.phpt b/ext/ldap/tests/ldap_get_attributes_error.phpt
deleted file mode 100644
index 465ba4fd72..0000000000
--- a/ext/ldap/tests/ldap_get_attributes_error.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-ldap_get_attributes() - Testing ldap_get_attributes() that should fail
---CREDITS--
-Patrick Allaert <patrickallaert@php.net>
-# Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-require "connect.inc";
-
-$link = ldap_connect($host, $port);
-var_dump(ldap_get_attributes($link));
-var_dump(ldap_get_attributes($link, $link));
-?>
-===DONE===
---EXPECTF--
-Warning: ldap_get_attributes() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
-
-Warning: ldap_get_attributes(): supplied resource is not a valid ldap result entry resource in %s on line %d
-bool(false)
-===DONE===
diff --git a/ext/ldap/tests/ldap_get_dn_error.phpt b/ext/ldap/tests/ldap_get_dn_error.phpt
deleted file mode 100644
index 71df6a3da1..0000000000
--- a/ext/ldap/tests/ldap_get_dn_error.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-ldap_get_dn() - Testing ldap_get_dn() that should fail
---CREDITS--
-Patrick Allaert <patrickallaert@php.net>
-# Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-require "connect.inc";
-
-$link = ldap_connect($host, $port);
-var_dump(ldap_get_dn($link));
-var_dump(ldap_get_dn($link, $link));
-?>
-===DONE===
---EXPECTF--
-Warning: ldap_get_dn() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
-
-Warning: ldap_get_dn(): supplied resource is not a valid ldap result entry resource in %s on line %d
-bool(false)
-===DONE===
diff --git a/ext/ldap/tests/ldap_get_entries_error.phpt b/ext/ldap/tests/ldap_get_entries_error.phpt
deleted file mode 100644
index 7e0f4c0b98..0000000000
--- a/ext/ldap/tests/ldap_get_entries_error.phpt
+++ /dev/null
@@ -1,33 +0,0 @@
---TEST--
-ldap_get_entries() - ldap_get_entries() operation that should fail
---CREDITS--
-Patrick Allaert <patrickallaert@php.net>
-# Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-require "connect.inc";
-
-$link = ldap_connect($host, $port);
-
-// Too few parameters
-var_dump(ldap_get_entries($link));
-
-// Too many parameters
-var_dump(ldap_get_entries($link, $link, "Additional data"));
-
-// Bad parameter
-var_dump(ldap_get_entries($link, "string"));
-?>
-===DONE===
---EXPECTF--
-Warning: ldap_get_entries() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
-
-Warning: ldap_get_entries() expects exactly 2 parameters, 3 given in %s on line %d
-NULL
-
-Warning: ldap_get_entries() expects parameter 2 to be resource, string given in %s on line %d
-NULL
-===DONE===
diff --git a/ext/ldap/tests/ldap_get_option_error.phpt b/ext/ldap/tests/ldap_get_option_error.phpt
deleted file mode 100644
index cf7a0e5d49..0000000000
--- a/ext/ldap/tests/ldap_get_option_error.phpt
+++ /dev/null
@@ -1,40 +0,0 @@
---TEST--
-ldap_get_option() - ldap_get_option() operation that should fail
---CREDITS--
-Patrick Allaert <patrickallaert@php.net>
-# Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-require "connect.inc";
-
-$link = ldap_connect($host, $port);
-$option = null;
-
-// Too few parameters
-var_dump(ldap_get_option());
-var_dump(ldap_get_option($link));
-var_dump(ldap_get_option($link, LDAP_OPT_PROTOCOL_VERSION));
-
-// Too many parameters
-var_dump(
- ldap_get_option($link, LDAP_OPT_PROTOCOL_VERSION, $option, "Additional data"),
- $option
-);
-?>
-===DONE===
---EXPECTF--
-Warning: ldap_get_option() expects exactly 3 parameters, 0 given in %s on line %d
-NULL
-
-Warning: ldap_get_option() expects exactly 3 parameters, 1 given in %s on line %d
-NULL
-
-Warning: ldap_get_option() expects exactly 3 parameters, 2 given in %s on line %d
-NULL
-
-Warning: ldap_get_option() expects exactly 3 parameters, 4 given in %s on line %d
-NULL
-NULL
-===DONE===
diff --git a/ext/ldap/tests/ldap_list_error.phpt b/ext/ldap/tests/ldap_list_error.phpt
deleted file mode 100644
index 817622e725..0000000000
--- a/ext/ldap/tests/ldap_list_error.phpt
+++ /dev/null
@@ -1,35 +0,0 @@
---TEST--
-ldap_list() - operation that should fail
---CREDITS--
-Patrick Allaert <patrickallaert@php.net>
-# Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "connect.inc";
-
-$link = ldap_connect($host, $port);
-
-// Too few parameters
-var_dump(ldap_list());
-var_dump(ldap_list($link));
-var_dump(ldap_list($link, $link));
-
-// Too many parameters
-var_dump(ldap_list($link, "$base", "(objectClass=*)", array(), 0, 0, 0, 0, [], "Additional data"));
-?>
-===DONE===
---EXPECTF--
-Warning: ldap_list() expects at least 3 parameters, 0 given in %s on line %d
-NULL
-
-Warning: ldap_list() expects at least 3 parameters, 1 given in %s on line %d
-NULL
-
-Warning: ldap_list() expects at least 3 parameters, 2 given in %s on line %d
-NULL
-
-Warning: ldap_list() expects at most 9 parameters, 10 given in %s on line %d
-NULL
-===DONE===
diff --git a/ext/ldap/tests/ldap_next_entry_error.phpt b/ext/ldap/tests/ldap_next_entry_error.phpt
deleted file mode 100644
index 59e9cdcab5..0000000000
--- a/ext/ldap/tests/ldap_next_entry_error.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-ldap_next_entry() - Testing ldap_next_entry() that should fail
---CREDITS--
-Patrick Allaert <patrickallaert@php.net>
-# Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-require "connect.inc";
-
-$link = ldap_connect($host, $port);
-var_dump(ldap_next_entry($link));
-var_dump(ldap_next_entry($link, $link, "Additional data"));
-var_dump(ldap_next_entry($link, $link));
-?>
-===DONE===
---EXPECTF--
-Warning: ldap_next_entry() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
-
-Warning: ldap_next_entry() expects exactly 2 parameters, 3 given in %s on line %d
-NULL
-
-Warning: ldap_next_entry(): supplied resource is not a valid ldap result entry resource in %s on line %d
-bool(false)
-===DONE===
diff --git a/ext/ldap/tests/ldap_next_reference_error.phpt b/ext/ldap/tests/ldap_next_reference_error.phpt
deleted file mode 100644
index 0e47c5ef5c..0000000000
--- a/ext/ldap/tests/ldap_next_reference_error.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-ldap_next_reference() - Testing ldap_next_reference() that should fail
---CREDITS--
-Patrick Allaert <patrickallaert@php.net>
-# Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-require "connect.inc";
-
-$link = ldap_connect($host, $port);
-var_dump(ldap_next_reference($link));
-var_dump(ldap_next_reference($link, $link, "Additional data"));
-var_dump(ldap_next_reference($link, $link));
-?>
-===DONE===
---EXPECTF--
-Warning: ldap_next_reference() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
-
-Warning: ldap_next_reference() expects exactly 2 parameters, 3 given in %s on line %d
-NULL
-
-Warning: ldap_next_reference(): supplied resource is not a valid ldap result entry resource in %s on line %d
-bool(false)
-===DONE===
diff --git a/ext/ldap/tests/ldap_parse_reference_error.phpt b/ext/ldap/tests/ldap_parse_reference_error.phpt
deleted file mode 100644
index 9d180e717d..0000000000
--- a/ext/ldap/tests/ldap_parse_reference_error.phpt
+++ /dev/null
@@ -1,31 +0,0 @@
---TEST--
-ldap_parse_reference() - ldap_parse_reference() operations that should fail
---CREDITS--
-Patrick Allaert <patrickallaert@php.net>
-# Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-require "connect.inc";
-$link = ldap_connect($host, $port);
-$refs = null;
-var_dump(
- ldap_parse_reference($link, $link),
- ldap_parse_reference($link, $link, $refs),
- ldap_parse_reference($link, $refs, $refs, "Additional data"),
- $refs
-);
-?>
-===DONE===
---EXPECTF--
-Warning: ldap_parse_reference() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: ldap_parse_reference(): supplied resource is not a valid ldap result entry resource in %s on line %d
-
-Warning: ldap_parse_reference() expects exactly 3 parameters, 4 given in %s on line %d
-NULL
-bool(false)
-NULL
-NULL
-===DONE===
diff --git a/ext/ldap/tests/ldap_parse_result_error.phpt b/ext/ldap/tests/ldap_parse_result_error.phpt
deleted file mode 100644
index 33f86f40b9..0000000000
--- a/ext/ldap/tests/ldap_parse_result_error.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-ldap_parse_result() - Testing ldap_parse_result() that should fail
---CREDITS--
-Patrick Allaert <patrickallaert@php.net>
-# Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-require "connect.inc";
-var_dump(ldap_parse_result(null, null));
-?>
-===DONE===
---EXPECTF--
-Warning: ldap_parse_result() expects at least 3 parameters, 2 given in %s on line %d
-NULL
-===DONE===
diff --git a/ext/ldap/tests/ldap_read_error.phpt b/ext/ldap/tests/ldap_read_error.phpt
deleted file mode 100644
index 08f6280490..0000000000
--- a/ext/ldap/tests/ldap_read_error.phpt
+++ /dev/null
@@ -1,35 +0,0 @@
---TEST--
-ldap_read() - operation that should fail
---CREDITS--
-Patrick Allaert <patrickallaert@php.net>
-# Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-include "connect.inc";
-
-$link = ldap_connect($host, $port);
-
-// Too few parameters
-var_dump(ldap_read());
-var_dump(ldap_read($link));
-var_dump(ldap_read($link, $link));
-
-// Too many parameters
-var_dump(ldap_read($link, "$base", "(objectClass=*)", array(), 0, 0, 0, 0, [], "Additional data"));
-?>
-===DONE===
---EXPECTF--
-Warning: ldap_read() expects at least 3 parameters, 0 given in %s on line %d
-NULL
-
-Warning: ldap_read() expects at least 3 parameters, 1 given in %s on line %d
-NULL
-
-Warning: ldap_read() expects at least 3 parameters, 2 given in %s on line %d
-NULL
-
-Warning: ldap_read() expects at most 9 parameters, 10 given in %s on line %d
-NULL
-===DONE===
diff --git a/ext/ldap/tests/ldap_rename_error.phpt b/ext/ldap/tests/ldap_rename_error.phpt
index 8a580e5c34..57c2e03e71 100644
--- a/ext/ldap/tests/ldap_rename_error.phpt
+++ b/ext/ldap/tests/ldap_rename_error.phpt
@@ -10,12 +10,7 @@ Patrick Allaert <patrickallaert@php.net>
require "connect.inc";
$link = ldap_connect($host, $port);
-var_dump(ldap_rename($link));
var_dump(ldap_rename($link, "cn=userNotFound,$base", "cn=userZ", "$base", true));
?>
-===DONE===
---EXPECTF--
-Warning: ldap_rename() expects at least 5 parameters, 1 given in %s on line %d
-NULL
+--EXPECT--
bool(false)
-===DONE===
diff --git a/ext/ldap/tests/ldap_set_option_error.phpt b/ext/ldap/tests/ldap_set_option_error.phpt
index 3ea49cbc7e..a67f972293 100644
--- a/ext/ldap/tests/ldap_set_option_error.phpt
+++ b/ext/ldap/tests/ldap_set_option_error.phpt
@@ -23,14 +23,6 @@ $controls = array(
"notanarray"
);
-// Too few parameters
-var_dump(ldap_set_option());
-var_dump(ldap_set_option($link));
-var_dump(ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION));
-
-// Too many parameters
-var_dump(ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, 3, "Additional data"));
-
var_dump(ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, 10));
foreach ($controls as $control)
@@ -40,17 +32,6 @@ var_dump(ldap_set_option($link, 999999, 999999));
?>
===DONE===
--EXPECTF--
-Warning: ldap_set_option() expects exactly 3 parameters, 0 given in %s on line %d
-NULL
-
-Warning: ldap_set_option() expects exactly 3 parameters, 1 given in %s on line %d
-NULL
-
-Warning: ldap_set_option() expects exactly 3 parameters, 2 given in %s on line %d
-NULL
-
-Warning: ldap_set_option() expects exactly 3 parameters, 4 given in %s on line %d
-NULL
bool(false)
Warning: ldap_set_option(): Control must have an oid key in %s on line %d