From cefa264bc718f55ea599c203cb055d2801855cc1 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 11 Jun 2021 14:49:22 +0200
Subject: [PATCH 1/3] Port ldap

---
 ext/ldap/tests/bug48441.phpt                               | 3 ++-
 ext/ldap/tests/bug72021.phpt                               | 4 ++--
 ext/ldap/tests/bug73933.phpt                               | 6 ++----
 ext/ldap/tests/bug77958.phpt                               | 3 ++-
 ext/ldap/tests/ldap_add_basic.phpt                         | 3 ++-
 ext/ldap/tests/ldap_add_error.phpt                         | 3 ++-
 ext/ldap/tests/ldap_add_ext.phpt                           | 3 ++-
 ext/ldap/tests/ldap_bind_basic.phpt                        | 3 ++-
 ext/ldap/tests/ldap_bind_error.phpt                        | 3 ++-
 ext/ldap/tests/ldap_bind_ext.phpt                          | 3 ++-
 ext/ldap/tests/ldap_bind_variation.phpt                    | 3 ++-
 ext/ldap/tests/ldap_compare_basic.phpt                     | 3 ++-
 ext/ldap/tests/ldap_compare_error.phpt                     | 3 ++-
 ext/ldap/tests/ldap_connect_basic.phpt                     | 4 ++--
 ext/ldap/tests/ldap_connect_error.phpt                     | 4 ++--
 ext/ldap/tests/ldap_connect_ldap_conf.phpt                 | 3 ++-
 ext/ldap/tests/ldap_connect_variation.phpt                 | 4 ++--
 ext/ldap/tests/ldap_controls.phpt                          | 3 ++-
 ext/ldap/tests/ldap_count_entries_basic.phpt               | 3 ++-
 ext/ldap/tests/ldap_count_references_basic.phpt            | 3 ++-
 ext/ldap/tests/ldap_delete_basic.phpt                      | 3 ++-
 ext/ldap/tests/ldap_delete_error.phpt                      | 3 ++-
 ext/ldap/tests/ldap_delete_ext.phpt                        | 3 ++-
 ext/ldap/tests/ldap_dn2ufn.phpt                            | 4 ++--
 ext/ldap/tests/ldap_err2str_basic.phpt                     | 4 ++--
 ext/ldap/tests/ldap_errno_basic.phpt                       | 3 ++-
 ext/ldap/tests/ldap_error_basic.phpt                       | 3 ++-
 ext/ldap/tests/ldap_escape_all.phpt                        | 4 ++--
 ext/ldap/tests/ldap_escape_both.phpt                       | 4 ++--
 ext/ldap/tests/ldap_escape_dn.phpt                         | 4 ++--
 ext/ldap/tests/ldap_escape_filter.phpt                     | 4 ++--
 ext/ldap/tests/ldap_escape_ignore.phpt                     | 4 ++--
 ext/ldap/tests/ldap_exop.phpt                              | 3 ++-
 ext/ldap/tests/ldap_exop_passwd.phpt                       | 3 ++-
 ext/ldap/tests/ldap_exop_passwd_error.phpt                 | 3 ++-
 ext/ldap/tests/ldap_exop_refresh.phpt                      | 3 ++-
 ext/ldap/tests/ldap_exop_whoami.phpt                       | 3 ++-
 ext/ldap/tests/ldap_explode_dn.phpt                        | 4 ++--
 ext/ldap/tests/ldap_first_attribute_basic.phpt             | 3 ++-
 ext/ldap/tests/ldap_first_attribute_error.phpt             | 4 ++--
 ext/ldap/tests/ldap_first_entry_basic.phpt                 | 3 ++-
 ext/ldap/tests/ldap_first_reference_basic.phpt             | 3 ++-
 ext/ldap/tests/ldap_free_result_basic.phpt                 | 3 ++-
 ext/ldap/tests/ldap_get_attributes_basic.phpt              | 3 ++-
 ext/ldap/tests/ldap_get_dn_basic.phpt                      | 3 ++-
 ext/ldap/tests/ldap_get_entries_basic.phpt                 | 3 ++-
 ext/ldap/tests/ldap_get_entries_variation.phpt             | 3 ++-
 ext/ldap/tests/ldap_get_option_basic.phpt                  | 4 ++--
 ext/ldap/tests/ldap_get_option_controls.phpt               | 3 ++-
 ext/ldap/tests/ldap_get_option_package_basic.phpt          | 4 ++--
 ext/ldap/tests/ldap_get_option_variation.phpt              | 4 ++--
 ext/ldap/tests/ldap_get_values_len_basic.phpt              | 3 ++-
 ext/ldap/tests/ldap_get_values_len_error.phpt              | 3 ++-
 ext/ldap/tests/ldap_list_basic.phpt                        | 3 ++-
 ext/ldap/tests/ldap_mod_add_basic.phpt                     | 3 ++-
 ext/ldap/tests/ldap_mod_add_error.phpt                     | 3 ++-
 ext/ldap/tests/ldap_mod_del_basic.phpt                     | 3 ++-
 ext/ldap/tests/ldap_mod_del_error.phpt                     | 3 ++-
 ext/ldap/tests/ldap_mod_ext.phpt                           | 3 ++-
 ext/ldap/tests/ldap_mod_replace_basic.phpt                 | 3 ++-
 ext/ldap/tests/ldap_mod_replace_error.phpt                 | 3 ++-
 ext/ldap/tests/ldap_modify_basic.phpt                      | 3 ++-
 ext/ldap/tests/ldap_modify_batch_basic.phpt                | 3 ++-
 ext/ldap/tests/ldap_modify_batch_error.phpt                | 3 ++-
 ext/ldap/tests/ldap_modify_error.phpt                      | 3 ++-
 ext/ldap/tests/ldap_next_attribute_basic.phpt              | 3 ++-
 ext/ldap/tests/ldap_next_attribute_error.phpt              | 3 ++-
 ext/ldap/tests/ldap_next_entry_basic.phpt                  | 3 ++-
 ext/ldap/tests/ldap_next_reference_basic.phpt              | 3 ++-
 ext/ldap/tests/ldap_option_reqcert_basic.phpt              | 3 ++-
 ext/ldap/tests/ldap_option_reqcert_error.phpt              | 3 ++-
 ext/ldap/tests/ldap_parse_reference_basic.phpt             | 3 ++-
 ext/ldap/tests/ldap_parse_result_basic.phpt                | 3 ++-
 ext/ldap/tests/ldap_parse_result_controls.phpt             | 3 ++-
 ext/ldap/tests/ldap_read_basic.phpt                        | 3 ++-
 ext/ldap/tests/ldap_rename_basic.phpt                      | 3 ++-
 ext/ldap/tests/ldap_rename_error.phpt                      | 4 ++--
 ext/ldap/tests/ldap_rename_ext.phpt                        | 3 ++-
 ext/ldap/tests/ldap_sasl_bind_basic.phpt                   | 3 ++-
 ext/ldap/tests/ldap_sasl_bind_error.phpt                   | 3 ++-
 ext/ldap/tests/ldap_search_basic.phpt                      | 3 ++-
 ext/ldap/tests/ldap_search_error.phpt                      | 3 ++-
 ext/ldap/tests/ldap_search_overrides.phpt                  | 3 ++-
 ext/ldap/tests/ldap_search_paged_result_controls.phpt      | 3 ++-
 ext/ldap/tests/ldap_search_sort_controls.phpt              | 3 ++-
 ext/ldap/tests/ldap_search_variation1.phpt                 | 3 ++-
 ext/ldap/tests/ldap_search_variation2.phpt                 | 3 ++-
 ext/ldap/tests/ldap_search_variation3.phpt                 | 3 ++-
 ext/ldap/tests/ldap_search_variation4.phpt                 | 3 ++-
 ext/ldap/tests/ldap_search_variation5.phpt                 | 3 ++-
 ext/ldap/tests/ldap_search_variation6.phpt                 | 3 ++-
 ext/ldap/tests/ldap_set_option_basic.phpt                  | 4 ++--
 ext/ldap/tests/ldap_set_option_cafiles_basic.phpt          | 4 ++--
 ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt      | 4 ++--
 ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt         | 3 ++-
 ext/ldap/tests/ldap_set_option_crlcheck_error.phpt         | 4 ++--
 ext/ldap/tests/ldap_set_option_error.phpt                  | 4 ++--
 ext/ldap/tests/ldap_set_option_keepalive_basic.phpt        | 4 ++--
 ext/ldap/tests/ldap_set_option_reqcert_basic.phpt          | 4 ++--
 ext/ldap/tests/ldap_set_option_reqcert_error.phpt          | 4 ++--
 ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt | 4 ++--
 ext/ldap/tests/ldap_set_option_variation.phpt              | 4 ++--
 ext/ldap/tests/ldap_set_rebind_proc_basic.phpt             | 3 ++-
 ext/ldap/tests/ldap_set_rebind_proc_error.phpt             | 3 ++-
 ext/ldap/tests/ldap_start_tls_basic.phpt                   | 3 ++-
 ext/ldap/tests/ldap_unbind_basic.phpt                      | 3 ++-
 ext/ldap/tests/ldap_unbind_variation.phpt                  | 3 ++-
 ext/ldap/tests/skipif.inc                                  | 5 -----
 108 files changed, 214 insertions(+), 142 deletions(-)
 delete mode 100644 ext/ldap/tests/skipif.inc

diff --git a/ext/ldap/tests/bug48441.phpt b/ext/ldap/tests/bug48441.phpt
index 375a21fc7b0be..576ec2df1e188 100644
--- a/ext/ldap/tests/bug48441.phpt
+++ b/ext/ldap/tests/bug48441.phpt
@@ -2,9 +2,10 @@
 ldap_search() bug 48441 - options persists after specifying them in ldap_search
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
+--EXTENSIONS--
+ldap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifbindfailure.inc');
 ?>
 --FILE--
diff --git a/ext/ldap/tests/bug72021.phpt b/ext/ldap/tests/bug72021.phpt
index f5e46eb615ac7..a43cdacfaaaa3 100644
--- a/ext/ldap/tests/bug72021.phpt
+++ b/ext/ldap/tests/bug72021.phpt
@@ -2,8 +2,8 @@
 Bug #72021 (ldap_escape() with DN flag is not RFC compliant)
 --CREDITS--
 Chad Sikorra <Chad.Sikorra@gmail.com>
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 $subject = " Joe,= \rSmith ";
diff --git a/ext/ldap/tests/bug73933.phpt b/ext/ldap/tests/bug73933.phpt
index 3dd093223a969..0445b7ec27999 100644
--- a/ext/ldap/tests/bug73933.phpt
+++ b/ext/ldap/tests/bug73933.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #73933 (error/segfault with ldap_mod_replace and opcache)
---SKIPIF--
-<?php
-require_once('skipif.inc');
-?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 /* We are assuming 3333 is not connectable */
diff --git a/ext/ldap/tests/bug77958.phpt b/ext/ldap/tests/bug77958.phpt
index 03a95bf8984e2..da6edca348b79 100644
--- a/ext/ldap/tests/bug77958.phpt
+++ b/ext/ldap/tests/bug77958.phpt
@@ -2,8 +2,9 @@
 ldap_modify_batch() - bug 77958 - values in ldap_modify_batch must be "string"
 --CREDITS--
 Côme Chilliet <mcmic@php.net>
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_add_basic.phpt b/ext/ldap/tests/ldap_add_basic.phpt
index b247901d735e8..551dea60836df 100644
--- a/ext/ldap/tests/ldap_add_basic.phpt
+++ b/ext/ldap/tests/ldap_add_basic.phpt
@@ -3,8 +3,9 @@ ldap_add() - Basic add operation
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_add_error.phpt b/ext/ldap/tests/ldap_add_error.phpt
index 7a3326099972c..8f75933d6f503 100644
--- a/ext/ldap/tests/ldap_add_error.phpt
+++ b/ext/ldap/tests/ldap_add_error.phpt
@@ -3,8 +3,9 @@ ldap_add() - Add operation that should fail
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_add_ext.phpt b/ext/ldap/tests/ldap_add_ext.phpt
index ebf3d170e8f9a..d60b6aa65eb72 100644
--- a/ext/ldap/tests/ldap_add_ext.phpt
+++ b/ext/ldap/tests/ldap_add_ext.phpt
@@ -2,8 +2,9 @@
 ldap_add_ext() - Add operation with controls
 --CREDITS--
 Côme Chilliet <mcmic@php.net>
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 <?php
 require_once('skipifcontrol.inc');
diff --git a/ext/ldap/tests/ldap_bind_basic.phpt b/ext/ldap/tests/ldap_bind_basic.phpt
index 35948d0dc26bc..ad4090ee08959 100644
--- a/ext/ldap/tests/ldap_bind_basic.phpt
+++ b/ext/ldap/tests/ldap_bind_basic.phpt
@@ -3,8 +3,9 @@ ldap_bind() - Basic anonymous binding
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once __DIR__ .'/skipif.inc'; ?>
 <?php require_once __DIR__ .'/skipifbindfailure.inc'; ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_bind_error.phpt b/ext/ldap/tests/ldap_bind_error.phpt
index 3970bbdf85fb5..b4465be3db713 100644
--- a/ext/ldap/tests/ldap_bind_error.phpt
+++ b/ext/ldap/tests/ldap_bind_error.phpt
@@ -3,8 +3,9 @@ ldap_bind() - Binding that should fail
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_bind_ext.phpt b/ext/ldap/tests/ldap_bind_ext.phpt
index e7cba0bdae5cd..2b1a05affc010 100644
--- a/ext/ldap/tests/ldap_bind_ext.phpt
+++ b/ext/ldap/tests/ldap_bind_ext.phpt
@@ -2,8 +2,9 @@
 ldap_bind_ext() - Basic binding
 --CREDITS--
 Côme Chilliet <mcmic@php.net>
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once __DIR__ .'/skipif.inc'; ?>
 <?php require_once __DIR__ .'/skipifbindfailure.inc'; ?>
 <?php
 require_once('skipifcontrol.inc');
diff --git a/ext/ldap/tests/ldap_bind_variation.phpt b/ext/ldap/tests/ldap_bind_variation.phpt
index 6fa4c202f92c5..dc6aaf27269dc 100644
--- a/ext/ldap/tests/ldap_bind_variation.phpt
+++ b/ext/ldap/tests/ldap_bind_variation.phpt
@@ -3,8 +3,9 @@ ldap_bind() - Advanced binding
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once __DIR__ .'/skipif.inc'; ?>
 <?php require_once __DIR__ .'/skipifbindfailure.inc'; ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_compare_basic.phpt b/ext/ldap/tests/ldap_compare_basic.phpt
index 32f6ccf78f803..b99e709a4936e 100644
--- a/ext/ldap/tests/ldap_compare_basic.phpt
+++ b/ext/ldap/tests/ldap_compare_basic.phpt
@@ -3,8 +3,9 @@ ldap_compare() - Basic ldap_compare test
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_compare_error.phpt b/ext/ldap/tests/ldap_compare_error.phpt
index 1b1231b6f9c23..bc9389f655cdd 100644
--- a/ext/ldap/tests/ldap_compare_error.phpt
+++ b/ext/ldap/tests/ldap_compare_error.phpt
@@ -3,8 +3,9 @@ ldap_compare() - Testing ldap_compare() that should fail
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_connect_basic.phpt b/ext/ldap/tests/ldap_connect_basic.phpt
index a1a9e9f5d658e..9e85774ead09e 100644
--- a/ext/ldap/tests/ldap_connect_basic.phpt
+++ b/ext/ldap/tests/ldap_connect_basic.phpt
@@ -3,8 +3,8 @@ ldap_connect() - Basic connection
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_connect_error.phpt b/ext/ldap/tests/ldap_connect_error.phpt
index b8adcf1ded1d6..e44f2c38a49fd 100644
--- a/ext/ldap/tests/ldap_connect_error.phpt
+++ b/ext/ldap/tests/ldap_connect_error.phpt
@@ -5,8 +5,8 @@ Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
 --INI--
 ldap.max_links=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_connect_ldap_conf.phpt b/ext/ldap/tests/ldap_connect_ldap_conf.phpt
index 3c3c906f36108..0570c10d7715d 100644
--- a/ext/ldap/tests/ldap_connect_ldap_conf.phpt
+++ b/ext/ldap/tests/ldap_connect_ldap_conf.phpt
@@ -2,9 +2,10 @@
 ldap_connect() - Connection using default host from openldap's ldap.conf
 --CREDITS--
 David Caldwell <david@galvanix.com>
+--EXTENSIONS--
+ldap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 ob_start();
 phpinfo();
 if (!preg_match("/vendor name => openldap/i", ob_get_clean()))
diff --git a/ext/ldap/tests/ldap_connect_variation.phpt b/ext/ldap/tests/ldap_connect_variation.phpt
index 0dba788db0dea..b2b65dc416a46 100644
--- a/ext/ldap/tests/ldap_connect_variation.phpt
+++ b/ext/ldap/tests/ldap_connect_variation.phpt
@@ -3,8 +3,8 @@ ldap_connect() - Variation
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_controls.phpt b/ext/ldap/tests/ldap_controls.phpt
index e7365981cf584..f79b7ff7bc2e3 100644
--- a/ext/ldap/tests/ldap_controls.phpt
+++ b/ext/ldap/tests/ldap_controls.phpt
@@ -2,9 +2,10 @@
 Test the use of controls
 --CREDITS--
 Côme Chilliet <mcmic@php.net>
+--EXTENSIONS--
+ldap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifbindfailure.inc');
 require_once('skipifcontrol.inc');
 skipifunsupportedcontrol(LDAP_CONTROL_ASSERT);
diff --git a/ext/ldap/tests/ldap_count_entries_basic.phpt b/ext/ldap/tests/ldap_count_entries_basic.phpt
index 01847f1b03890..80f21996e2672 100644
--- a/ext/ldap/tests/ldap_count_entries_basic.phpt
+++ b/ext/ldap/tests/ldap_count_entries_basic.phpt
@@ -3,8 +3,9 @@ ldap_count_entries() - Basic counting LDAP entries
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_count_references_basic.phpt b/ext/ldap/tests/ldap_count_references_basic.phpt
index 52ed8c0253ad2..d39fb1f1ddfa1 100644
--- a/ext/ldap/tests/ldap_count_references_basic.phpt
+++ b/ext/ldap/tests/ldap_count_references_basic.phpt
@@ -1,7 +1,8 @@
 --TEST--
 ldap_count_references() - Basic ldap_count_references test
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_delete_basic.phpt b/ext/ldap/tests/ldap_delete_basic.phpt
index 046b14140762b..dd64bfb4111da 100644
--- a/ext/ldap/tests/ldap_delete_basic.phpt
+++ b/ext/ldap/tests/ldap_delete_basic.phpt
@@ -3,8 +3,9 @@ ldap_delete() - Basic delete operation
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_delete_error.phpt b/ext/ldap/tests/ldap_delete_error.phpt
index e924c3b59a0c5..6333692088abd 100644
--- a/ext/ldap/tests/ldap_delete_error.phpt
+++ b/ext/ldap/tests/ldap_delete_error.phpt
@@ -3,8 +3,9 @@ ldap_delete() - Delete operation that should fail
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_delete_ext.phpt b/ext/ldap/tests/ldap_delete_ext.phpt
index 29d4f10b7f246..c6b3194398a87 100644
--- a/ext/ldap/tests/ldap_delete_ext.phpt
+++ b/ext/ldap/tests/ldap_delete_ext.phpt
@@ -2,8 +2,9 @@
 ldap_delete_ext() - Delete operation with controls
 --CREDITS--
 Côme Chilliet <mcmic@php.net>
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 <?php
 require_once('skipifcontrol.inc');
diff --git a/ext/ldap/tests/ldap_dn2ufn.phpt b/ext/ldap/tests/ldap_dn2ufn.phpt
index 54c90658cfc6d..3f6bcd846dfbe 100644
--- a/ext/ldap/tests/ldap_dn2ufn.phpt
+++ b/ext/ldap/tests/ldap_dn2ufn.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ldap_dn2ufn() test
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 
diff --git a/ext/ldap/tests/ldap_err2str_basic.phpt b/ext/ldap/tests/ldap_err2str_basic.phpt
index fe04d3ca44ddb..b96680c7d0b05 100644
--- a/ext/ldap/tests/ldap_err2str_basic.phpt
+++ b/ext/ldap/tests/ldap_err2str_basic.phpt
@@ -3,8 +3,8 @@ ldap_err2str() - Basic error number to string conversion
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 var_dump(ldap_err2str(2));
diff --git a/ext/ldap/tests/ldap_errno_basic.phpt b/ext/ldap/tests/ldap_errno_basic.phpt
index 535bb290acee6..78f9a83f50a47 100644
--- a/ext/ldap/tests/ldap_errno_basic.phpt
+++ b/ext/ldap/tests/ldap_errno_basic.phpt
@@ -3,8 +3,9 @@ ldap_errno() - Basic ldap_errno() operation
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_error_basic.phpt b/ext/ldap/tests/ldap_error_basic.phpt
index 442936c3ae36d..903196090588f 100644
--- a/ext/ldap/tests/ldap_error_basic.phpt
+++ b/ext/ldap/tests/ldap_error_basic.phpt
@@ -3,8 +3,9 @@ ldap_error() - Basic ldap_error() operation
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_escape_all.phpt b/ext/ldap/tests/ldap_escape_all.phpt
index d5f4950c60adf..d42b824bc1234 100644
--- a/ext/ldap/tests/ldap_escape_all.phpt
+++ b/ext/ldap/tests/ldap_escape_all.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ldap_escape() test all
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 
diff --git a/ext/ldap/tests/ldap_escape_both.phpt b/ext/ldap/tests/ldap_escape_both.phpt
index 6c8c970b98ca3..9bb323a44b045 100644
--- a/ext/ldap/tests/ldap_escape_both.phpt
+++ b/ext/ldap/tests/ldap_escape_both.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ldap_escape() test filter and DN
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 
diff --git a/ext/ldap/tests/ldap_escape_dn.phpt b/ext/ldap/tests/ldap_escape_dn.phpt
index fd2ffb2567567..8b5558c3141eb 100644
--- a/ext/ldap/tests/ldap_escape_dn.phpt
+++ b/ext/ldap/tests/ldap_escape_dn.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ldap_escape() test DN
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 
diff --git a/ext/ldap/tests/ldap_escape_filter.phpt b/ext/ldap/tests/ldap_escape_filter.phpt
index 5f0be7f40a0de..067dc6c24cdaa 100644
--- a/ext/ldap/tests/ldap_escape_filter.phpt
+++ b/ext/ldap/tests/ldap_escape_filter.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ldap_escape() test filter
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 
diff --git a/ext/ldap/tests/ldap_escape_ignore.phpt b/ext/ldap/tests/ldap_escape_ignore.phpt
index 73260690d0f2d..58415f1e64289 100644
--- a/ext/ldap/tests/ldap_escape_ignore.phpt
+++ b/ext/ldap/tests/ldap_escape_ignore.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ldap_escape() test ignore
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 
diff --git a/ext/ldap/tests/ldap_exop.phpt b/ext/ldap/tests/ldap_exop.phpt
index cace5dfa81130..80ce871399303 100644
--- a/ext/ldap/tests/ldap_exop.phpt
+++ b/ext/ldap/tests/ldap_exop.phpt
@@ -2,8 +2,9 @@
 ldap_exop() and ldap_parse_exop() - EXOP operations
 --CREDITS--
 Côme Chilliet <mcmic@php.net>
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_exop_passwd.phpt b/ext/ldap/tests/ldap_exop_passwd.phpt
index f04d258aee3e2..5ce1d0338de43 100644
--- a/ext/ldap/tests/ldap_exop_passwd.phpt
+++ b/ext/ldap/tests/ldap_exop_passwd.phpt
@@ -2,8 +2,9 @@
 ldap_exop_passwd() - Changing password through EXOP
 --CREDITS--
 Côme Chilliet <mcmic@php.net>
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_exop_passwd_error.phpt b/ext/ldap/tests/ldap_exop_passwd_error.phpt
index de21b7af8e3fe..95ade778594d6 100644
--- a/ext/ldap/tests/ldap_exop_passwd_error.phpt
+++ b/ext/ldap/tests/ldap_exop_passwd_error.phpt
@@ -2,8 +2,9 @@
 ldap_exop_passwd() - Giving wrong value for old password
 --CREDITS--
 Côme Chilliet <mcmic@php.net>
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_exop_refresh.phpt b/ext/ldap/tests/ldap_exop_refresh.phpt
index b7e7835f384cc..8d3c614a65b9f 100644
--- a/ext/ldap/tests/ldap_exop_refresh.phpt
+++ b/ext/ldap/tests/ldap_exop_refresh.phpt
@@ -2,8 +2,9 @@
 ldap_exop_refresh() - Test LDAP refresh extended operation
 --CREDITS--
 Emmanuel Dreyfus <manu@netbsd.org>
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 <?php
     $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
diff --git a/ext/ldap/tests/ldap_exop_whoami.phpt b/ext/ldap/tests/ldap_exop_whoami.phpt
index 35c86ca1557f9..ef6cc568b0433 100644
--- a/ext/ldap/tests/ldap_exop_whoami.phpt
+++ b/ext/ldap/tests/ldap_exop_whoami.phpt
@@ -2,8 +2,9 @@
 ldap_exop_whoami() - EXOP whoami operation
 --CREDITS--
 Côme Chilliet <mcmic@php.net>
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_explode_dn.phpt b/ext/ldap/tests/ldap_explode_dn.phpt
index f573bcfc39d00..2012506c3ef07 100644
--- a/ext/ldap/tests/ldap_explode_dn.phpt
+++ b/ext/ldap/tests/ldap_explode_dn.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ldap_explode_dn() test
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 
diff --git a/ext/ldap/tests/ldap_first_attribute_basic.phpt b/ext/ldap/tests/ldap_first_attribute_basic.phpt
index 81bc538aea695..e9552ce547c30 100644
--- a/ext/ldap/tests/ldap_first_attribute_basic.phpt
+++ b/ext/ldap/tests/ldap_first_attribute_basic.phpt
@@ -3,8 +3,9 @@ ldap_first_attribute() - Basic ldap_first_attribute test
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_first_attribute_error.phpt b/ext/ldap/tests/ldap_first_attribute_error.phpt
index 181dcf5424e80..0d1175e8f94b0 100644
--- a/ext/ldap/tests/ldap_first_attribute_error.phpt
+++ b/ext/ldap/tests/ldap_first_attribute_error.phpt
@@ -3,8 +3,8 @@ ldap_first_attribute() - Testing ldap_first_attribute() that should fail
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_first_entry_basic.phpt b/ext/ldap/tests/ldap_first_entry_basic.phpt
index 1509c1eefd142..a69165997d25d 100644
--- a/ext/ldap/tests/ldap_first_entry_basic.phpt
+++ b/ext/ldap/tests/ldap_first_entry_basic.phpt
@@ -3,8 +3,9 @@ ldap_first_entry() - Basic ldap_first_entry test
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_first_reference_basic.phpt b/ext/ldap/tests/ldap_first_reference_basic.phpt
index 6056ea1e370be..7c4cb5fec5e5b 100644
--- a/ext/ldap/tests/ldap_first_reference_basic.phpt
+++ b/ext/ldap/tests/ldap_first_reference_basic.phpt
@@ -3,8 +3,9 @@ ldap_first_reference() - Basic ldap_first_reference test
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_free_result_basic.phpt b/ext/ldap/tests/ldap_free_result_basic.phpt
index dead9a62d3b23..788a81221e316 100644
--- a/ext/ldap/tests/ldap_free_result_basic.phpt
+++ b/ext/ldap/tests/ldap_free_result_basic.phpt
@@ -3,8 +3,9 @@ ldap_free_result() - Basic ldap_free_result tests
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_get_attributes_basic.phpt b/ext/ldap/tests/ldap_get_attributes_basic.phpt
index 0d11bce706de1..3c786edac746b 100644
--- a/ext/ldap/tests/ldap_get_attributes_basic.phpt
+++ b/ext/ldap/tests/ldap_get_attributes_basic.phpt
@@ -3,8 +3,9 @@ ldap_get_attributes() - Basic ldap_get_attributes test
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_get_dn_basic.phpt b/ext/ldap/tests/ldap_get_dn_basic.phpt
index 14865ffe3c664..2f2daa173ca4d 100644
--- a/ext/ldap/tests/ldap_get_dn_basic.phpt
+++ b/ext/ldap/tests/ldap_get_dn_basic.phpt
@@ -3,8 +3,9 @@ ldap_get_dn() - Basic ldap_get_dn test
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_get_entries_basic.phpt b/ext/ldap/tests/ldap_get_entries_basic.phpt
index bba2f08c69ad8..0807519b60e45 100644
--- a/ext/ldap/tests/ldap_get_entries_basic.phpt
+++ b/ext/ldap/tests/ldap_get_entries_basic.phpt
@@ -3,8 +3,9 @@ ldap_get_entries() - Basic modify operation
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_get_entries_variation.phpt b/ext/ldap/tests/ldap_get_entries_variation.phpt
index 9dd45b6282894..c078dc24a5a14 100644
--- a/ext/ldap/tests/ldap_get_entries_variation.phpt
+++ b/ext/ldap/tests/ldap_get_entries_variation.phpt
@@ -3,8 +3,9 @@ Test ldap_get_entries() function - variation: used on empty search
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_get_option_basic.phpt b/ext/ldap/tests/ldap_get_option_basic.phpt
index e9aa7cfc4fb8f..1dea64fde9494 100644
--- a/ext/ldap/tests/ldap_get_option_basic.phpt
+++ b/ext/ldap/tests/ldap_get_option_basic.phpt
@@ -3,8 +3,8 @@ ldap_get_option() - Basic ldap_get_option() operation
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_get_option_controls.phpt b/ext/ldap/tests/ldap_get_option_controls.phpt
index 3b5a1d845ce56..8a348baaa8ebc 100644
--- a/ext/ldap/tests/ldap_get_option_controls.phpt
+++ b/ext/ldap/tests/ldap_get_option_controls.phpt
@@ -2,9 +2,10 @@
 ldap_get_option() and ldap_set_option() tests related to ldap controls
 --CREDITS--
 Côme Chilliet <mcmic@php.net>
+--EXTENSIONS--
+ldap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifbindfailure.inc');
 ?>
 --FILE--
diff --git a/ext/ldap/tests/ldap_get_option_package_basic.phpt b/ext/ldap/tests/ldap_get_option_package_basic.phpt
index 1ad9442a38fb4..1dbbbd206e603 100644
--- a/ext/ldap/tests/ldap_get_option_package_basic.phpt
+++ b/ext/ldap/tests/ldap_get_option_package_basic.phpt
@@ -2,8 +2,8 @@
 ldap_get_option() - Basic test for getting the TLS package ldap option
 --CREDITS--
 Chad Sikorra <Chad.Sikorra@gmail.com>
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_get_option_variation.phpt b/ext/ldap/tests/ldap_get_option_variation.phpt
index 80384475b4a06..3af058b20894c 100644
--- a/ext/ldap/tests/ldap_get_option_variation.phpt
+++ b/ext/ldap/tests/ldap_get_option_variation.phpt
@@ -3,8 +3,8 @@ ldap_get_option() - More ldap_get_option() operations
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_get_values_len_basic.phpt b/ext/ldap/tests/ldap_get_values_len_basic.phpt
index eaf66c0fbc66e..4d4c43bbfd36a 100644
--- a/ext/ldap/tests/ldap_get_values_len_basic.phpt
+++ b/ext/ldap/tests/ldap_get_values_len_basic.phpt
@@ -3,8 +3,9 @@ ldap_get_values_len() - Basic ldap_get_values_len test
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_get_values_len_error.phpt b/ext/ldap/tests/ldap_get_values_len_error.phpt
index df1a38008265d..3b99e20a23646 100644
--- a/ext/ldap/tests/ldap_get_values_len_error.phpt
+++ b/ext/ldap/tests/ldap_get_values_len_error.phpt
@@ -3,8 +3,9 @@ ldap_get_values_len() - Testing ldap_get_values_len() that should fail
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_list_basic.phpt b/ext/ldap/tests/ldap_list_basic.phpt
index e332a0df32320..704a1d712c2c6 100644
--- a/ext/ldap/tests/ldap_list_basic.phpt
+++ b/ext/ldap/tests/ldap_list_basic.phpt
@@ -4,9 +4,10 @@ ldap_list() test
 Davide Mendolia <idaf1er@gmail.com>
 Patrick Allaert <patrickallaert@php.net>
 Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifbindfailure.inc');
 ?>
 --FILE--
diff --git a/ext/ldap/tests/ldap_mod_add_basic.phpt b/ext/ldap/tests/ldap_mod_add_basic.phpt
index 9096f3eb6325a..437a2103c407e 100644
--- a/ext/ldap/tests/ldap_mod_add_basic.phpt
+++ b/ext/ldap/tests/ldap_mod_add_basic.phpt
@@ -3,8 +3,9 @@ ldap_mod_add() - Basic modify operation
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_mod_add_error.phpt b/ext/ldap/tests/ldap_mod_add_error.phpt
index 7dd26616dcd0e..bbd9faf86b002 100644
--- a/ext/ldap/tests/ldap_mod_add_error.phpt
+++ b/ext/ldap/tests/ldap_mod_add_error.phpt
@@ -3,8 +3,9 @@ ldap_mod_add() - ldap_mod_add() operations that should fail
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_mod_del_basic.phpt b/ext/ldap/tests/ldap_mod_del_basic.phpt
index bafc190968b71..6972bc3dd9e08 100644
--- a/ext/ldap/tests/ldap_mod_del_basic.phpt
+++ b/ext/ldap/tests/ldap_mod_del_basic.phpt
@@ -3,8 +3,9 @@ ldap_mod_del() - Basic modify operation
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_mod_del_error.phpt b/ext/ldap/tests/ldap_mod_del_error.phpt
index 6df125c1b78ec..c149d283ff423 100644
--- a/ext/ldap/tests/ldap_mod_del_error.phpt
+++ b/ext/ldap/tests/ldap_mod_del_error.phpt
@@ -3,8 +3,9 @@ ldap_mod_del() - ldap_mod_del() operations that should fail
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_mod_ext.phpt b/ext/ldap/tests/ldap_mod_ext.phpt
index 4086e5908f946..ae86f6ce005c6 100644
--- a/ext/ldap/tests/ldap_mod_ext.phpt
+++ b/ext/ldap/tests/ldap_mod_ext.phpt
@@ -3,8 +3,9 @@ ldap_mod_ext() - Modify operations with controls
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 <?php
 require_once('skipifcontrol.inc');
diff --git a/ext/ldap/tests/ldap_mod_replace_basic.phpt b/ext/ldap/tests/ldap_mod_replace_basic.phpt
index 0dd9f2b1ea3c9..c871f51c07576 100644
--- a/ext/ldap/tests/ldap_mod_replace_basic.phpt
+++ b/ext/ldap/tests/ldap_mod_replace_basic.phpt
@@ -3,8 +3,9 @@ ldap_mod_replace() - Basic modify operation
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_mod_replace_error.phpt b/ext/ldap/tests/ldap_mod_replace_error.phpt
index 6a12107651e6d..c6228f451ac3e 100644
--- a/ext/ldap/tests/ldap_mod_replace_error.phpt
+++ b/ext/ldap/tests/ldap_mod_replace_error.phpt
@@ -3,8 +3,9 @@ ldap_mod_replace() - ldap_mod_replace() operations that should fail
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_modify_basic.phpt b/ext/ldap/tests/ldap_modify_basic.phpt
index 25899531474e1..cbb1866840cc4 100644
--- a/ext/ldap/tests/ldap_modify_basic.phpt
+++ b/ext/ldap/tests/ldap_modify_basic.phpt
@@ -3,8 +3,9 @@ ldap_modify() - Basic modify operation
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_modify_batch_basic.phpt b/ext/ldap/tests/ldap_modify_batch_basic.phpt
index 41d7c0f15f818..193deb770013c 100644
--- a/ext/ldap/tests/ldap_modify_batch_basic.phpt
+++ b/ext/ldap/tests/ldap_modify_batch_basic.phpt
@@ -3,8 +3,9 @@ ldap_modify_batch() - Basic batch modify operation
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 Ondřej Hošek <ondra.hosek@gmail.com>
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_modify_batch_error.phpt b/ext/ldap/tests/ldap_modify_batch_error.phpt
index 627d116d97ef6..cabd42b9fcb8a 100644
--- a/ext/ldap/tests/ldap_modify_batch_error.phpt
+++ b/ext/ldap/tests/ldap_modify_batch_error.phpt
@@ -3,8 +3,9 @@ ldap_modify_batch() - Batch modify operations that should fail
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 Ondřej Hošek <ondra.hosek@gmail.com>
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_modify_error.phpt b/ext/ldap/tests/ldap_modify_error.phpt
index 682abf7504485..ec4f1c93af55c 100644
--- a/ext/ldap/tests/ldap_modify_error.phpt
+++ b/ext/ldap/tests/ldap_modify_error.phpt
@@ -3,8 +3,9 @@ ldap_modify() - Modify operations that should fail
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_next_attribute_basic.phpt b/ext/ldap/tests/ldap_next_attribute_basic.phpt
index 4c9584ee0b924..af070b9133e47 100644
--- a/ext/ldap/tests/ldap_next_attribute_basic.phpt
+++ b/ext/ldap/tests/ldap_next_attribute_basic.phpt
@@ -3,8 +3,9 @@ ldap_next_attribute() - Basic ldap_next_attribute test
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_next_attribute_error.phpt b/ext/ldap/tests/ldap_next_attribute_error.phpt
index ffe12226268bd..1a613b9bcd5aa 100644
--- a/ext/ldap/tests/ldap_next_attribute_error.phpt
+++ b/ext/ldap/tests/ldap_next_attribute_error.phpt
@@ -3,8 +3,9 @@ ldap_next_attribute() - Testing ldap_next_attribute() that should fail
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_next_entry_basic.phpt b/ext/ldap/tests/ldap_next_entry_basic.phpt
index 764e062fbfb2a..7404ce1ba37ed 100644
--- a/ext/ldap/tests/ldap_next_entry_basic.phpt
+++ b/ext/ldap/tests/ldap_next_entry_basic.phpt
@@ -3,8 +3,9 @@ ldap_next_entry() - Basic ldap_first_entry test
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_next_reference_basic.phpt b/ext/ldap/tests/ldap_next_reference_basic.phpt
index cd8551afe5f3c..fc1d08f0aaf39 100644
--- a/ext/ldap/tests/ldap_next_reference_basic.phpt
+++ b/ext/ldap/tests/ldap_next_reference_basic.phpt
@@ -3,8 +3,9 @@ ldap_next_reference() - Basic ldap_next_reference test
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_option_reqcert_basic.phpt b/ext/ldap/tests/ldap_option_reqcert_basic.phpt
index 56f77f920e490..467c9d9e0936f 100644
--- a/ext/ldap/tests/ldap_option_reqcert_basic.phpt
+++ b/ext/ldap/tests/ldap_option_reqcert_basic.phpt
@@ -2,9 +2,10 @@
 ldap_option_reqcert_basic() - Basic test to check if PHP can connect to a LDAP server with an invalid certificate with certificate checking disabled
 --CREDITS--
 Edwin Hoksberg <edwin@edwinhoksberg.nl>
+--EXTENSIONS--
+ldap
 --SKIPIF--
 <?php
-    require_once __DIR__ .'/skipif.inc';
     require_once __DIR__ .'/skipifbindfailure.inc';
 ?>
 --FILE--
diff --git a/ext/ldap/tests/ldap_option_reqcert_error.phpt b/ext/ldap/tests/ldap_option_reqcert_error.phpt
index 17fba4bc23c50..a00476e48968b 100644
--- a/ext/ldap/tests/ldap_option_reqcert_error.phpt
+++ b/ext/ldap/tests/ldap_option_reqcert_error.phpt
@@ -2,9 +2,10 @@
 ldap_option_reqcert_error() - A test to check if ldap can't connect to a LDAP server with a invalid certificate with certificate checking enabled
 --CREDITS--
 Edwin Hoksberg <edwin@edwinhoksberg.nl>
+--EXTENSIONS--
+ldap
 --SKIPIF--
 <?php
-    require_once __DIR__ .'/skipif.inc';
     require_once __DIR__ .'/skipifbindfailure.inc';
 ?>
 --FILE--
diff --git a/ext/ldap/tests/ldap_parse_reference_basic.phpt b/ext/ldap/tests/ldap_parse_reference_basic.phpt
index d5aeef8a59ea6..310f1f09384a9 100644
--- a/ext/ldap/tests/ldap_parse_reference_basic.phpt
+++ b/ext/ldap/tests/ldap_parse_reference_basic.phpt
@@ -3,8 +3,9 @@ ldap_parse_reference() - Basic ldap_parse_reference test
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_parse_result_basic.phpt b/ext/ldap/tests/ldap_parse_result_basic.phpt
index ed7047164be97..cc93a9f9ef650 100644
--- a/ext/ldap/tests/ldap_parse_result_basic.phpt
+++ b/ext/ldap/tests/ldap_parse_result_basic.phpt
@@ -3,8 +3,9 @@ ldap_parse_result() - Basic ldap_parse_result test
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_parse_result_controls.phpt b/ext/ldap/tests/ldap_parse_result_controls.phpt
index de7d9d5a56cc0..b6cd5a3bcb1ad 100644
--- a/ext/ldap/tests/ldap_parse_result_controls.phpt
+++ b/ext/ldap/tests/ldap_parse_result_controls.phpt
@@ -2,8 +2,9 @@
 ldap_parse_result() - Test the parsing of controls from result object
 --CREDITS--
 Côme Chilliet <mcmic@php.net>
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 <?php
 require_once('skipifcontrol.inc');
diff --git a/ext/ldap/tests/ldap_read_basic.phpt b/ext/ldap/tests/ldap_read_basic.phpt
index 7223b7f1d9a79..86d790a82a676 100644
--- a/ext/ldap/tests/ldap_read_basic.phpt
+++ b/ext/ldap/tests/ldap_read_basic.phpt
@@ -4,9 +4,10 @@ ldap_read() test
 Davide Mendolia <idaf1er@gmail.com>
 Patrick Allaert <patrickallaert@php.net>
 Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifbindfailure.inc');
 ?>
 --FILE--
diff --git a/ext/ldap/tests/ldap_rename_basic.phpt b/ext/ldap/tests/ldap_rename_basic.phpt
index f985630ac6d24..1a6f0626c0f2b 100644
--- a/ext/ldap/tests/ldap_rename_basic.phpt
+++ b/ext/ldap/tests/ldap_rename_basic.phpt
@@ -3,8 +3,9 @@ ldap_rename() - Basic ldap_rename test
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_rename_error.phpt b/ext/ldap/tests/ldap_rename_error.phpt
index 57c2e03e71312..833f009bba055 100644
--- a/ext/ldap/tests/ldap_rename_error.phpt
+++ b/ext/ldap/tests/ldap_rename_error.phpt
@@ -3,8 +3,8 @@ ldap_rename() - Testing ldap_rename() that should fail
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_rename_ext.phpt b/ext/ldap/tests/ldap_rename_ext.phpt
index 3f14b22115c8c..f8b80a7f25520 100644
--- a/ext/ldap/tests/ldap_rename_ext.phpt
+++ b/ext/ldap/tests/ldap_rename_ext.phpt
@@ -2,8 +2,9 @@
 ldap_rename_ext() - Rename operation with controls
 --CREDITS--
 Côme Chilliet <mcmic@php.net>
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 <?php
 require_once('skipifcontrol.inc');
diff --git a/ext/ldap/tests/ldap_sasl_bind_basic.phpt b/ext/ldap/tests/ldap_sasl_bind_basic.phpt
index 3c4eb1b137917..205b8992cc7d9 100644
--- a/ext/ldap/tests/ldap_sasl_bind_basic.phpt
+++ b/ext/ldap/tests/ldap_sasl_bind_basic.phpt
@@ -3,8 +3,9 @@ ldap_sasl_bind() - Basic anonymous binding
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php if (!function_exists("ldap_sasl_bind")) die("skip LDAP extension not compiled with SASL support"); ?>
 <?php
     require "connect.inc";
diff --git a/ext/ldap/tests/ldap_sasl_bind_error.phpt b/ext/ldap/tests/ldap_sasl_bind_error.phpt
index 53a84eae1a90c..79fbf323b4306 100644
--- a/ext/ldap/tests/ldap_sasl_bind_error.phpt
+++ b/ext/ldap/tests/ldap_sasl_bind_error.phpt
@@ -3,8 +3,9 @@ ldap_sasl_bind() - Binding that should fail
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 <?php if (!function_exists("ldap_sasl_bind")) die("skip LDAP extension not compiled with SASL support"); ?>
 --FILE--
diff --git a/ext/ldap/tests/ldap_search_basic.phpt b/ext/ldap/tests/ldap_search_basic.phpt
index 79246730ededc..809b18dcd8e72 100644
--- a/ext/ldap/tests/ldap_search_basic.phpt
+++ b/ext/ldap/tests/ldap_search_basic.phpt
@@ -4,9 +4,10 @@ ldap_search() test
 Davide Mendolia <idaf1er@gmail.com>
 Patrick Allaert <patrickallaert@php.net>
 Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifbindfailure.inc');
 ?>
 --FILE--
diff --git a/ext/ldap/tests/ldap_search_error.phpt b/ext/ldap/tests/ldap_search_error.phpt
index 1b02e549b3f35..63d49eeac70cb 100644
--- a/ext/ldap/tests/ldap_search_error.phpt
+++ b/ext/ldap/tests/ldap_search_error.phpt
@@ -3,8 +3,9 @@ ldap_search() - operation that should fail
 --CREDITS--
 Davide Mendolia <idaf1er@gmail.com>
 Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once __DIR__ .'/skipif.inc'; ?>
 <?php require_once __DIR__ .'/skipifbindfailure.inc'; ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_search_overrides.phpt b/ext/ldap/tests/ldap_search_overrides.phpt
index fee6ad6ba11d7..7318dccc84c56 100644
--- a/ext/ldap/tests/ldap_search_overrides.phpt
+++ b/ext/ldap/tests/ldap_search_overrides.phpt
@@ -3,9 +3,10 @@ ldap_search() test - test that overrides aren't permanent
 --CREDITS--
 Tyson Andre <tandre@ifwe.co>
 # Based on ldap_search_basic.phpt
+--EXTENSIONS--
+ldap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifbindfailure.inc');
 ?>
 --FILE--
diff --git a/ext/ldap/tests/ldap_search_paged_result_controls.phpt b/ext/ldap/tests/ldap_search_paged_result_controls.phpt
index 8b5b696818f38..09865f9071b5b 100644
--- a/ext/ldap/tests/ldap_search_paged_result_controls.phpt
+++ b/ext/ldap/tests/ldap_search_paged_result_controls.phpt
@@ -2,9 +2,10 @@
 ldap_search() test with paged result controls
 --CREDITS--
 Côme Chilliet <mcmic@php.net>
+--EXTENSIONS--
+ldap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifbindfailure.inc');
 require_once('skipifcontrol.inc');
 skipifunsupportedcontrol(LDAP_CONTROL_PAGEDRESULTS);
diff --git a/ext/ldap/tests/ldap_search_sort_controls.phpt b/ext/ldap/tests/ldap_search_sort_controls.phpt
index d9bb423805de8..b19364e18fb3d 100644
--- a/ext/ldap/tests/ldap_search_sort_controls.phpt
+++ b/ext/ldap/tests/ldap_search_sort_controls.phpt
@@ -2,9 +2,10 @@
 ldap_search() test with sort and VLV controls
 --CREDITS--
 Côme Chilliet <mcmic@php.net>
+--EXTENSIONS--
+ldap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifbindfailure.inc');
 require_once('skipifcontrol.inc');
 skipifunsupportedcontrol(LDAP_CONTROL_SORTREQUEST);
diff --git a/ext/ldap/tests/ldap_search_variation1.phpt b/ext/ldap/tests/ldap_search_variation1.phpt
index 66a291663d041..3e9a9568308b1 100644
--- a/ext/ldap/tests/ldap_search_variation1.phpt
+++ b/ext/ldap/tests/ldap_search_variation1.phpt
@@ -4,9 +4,10 @@ ldap_search() test
 Davide Mendolia <idaf1er@gmail.com>
 Patrick Allaert <patrickallaert@php.net>
 Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifbindfailure.inc');
 ?>
 --FILE--
diff --git a/ext/ldap/tests/ldap_search_variation2.phpt b/ext/ldap/tests/ldap_search_variation2.phpt
index 7ce46f7880e21..25e021b9414b4 100644
--- a/ext/ldap/tests/ldap_search_variation2.phpt
+++ b/ext/ldap/tests/ldap_search_variation2.phpt
@@ -4,9 +4,10 @@ ldap_search() test
 Davide Mendolia <idaf1er@gmail.com>
 Patrick Allaert <patrickallaert@php.net>
 Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifbindfailure.inc');
 ?>
 --FILE--
diff --git a/ext/ldap/tests/ldap_search_variation3.phpt b/ext/ldap/tests/ldap_search_variation3.phpt
index 81ea4bb6a4493..f4111aa8636e7 100644
--- a/ext/ldap/tests/ldap_search_variation3.phpt
+++ b/ext/ldap/tests/ldap_search_variation3.phpt
@@ -4,9 +4,10 @@ ldap_search() test
 Davide Mendolia <idaf1er@gmail.com>
 Patrick Allaert <patrickallaert@php.net>
 Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifbindfailure.inc');
 ?>
 --FILE--
diff --git a/ext/ldap/tests/ldap_search_variation4.phpt b/ext/ldap/tests/ldap_search_variation4.phpt
index 96b51a3e15a5b..bfd758e04be2a 100644
--- a/ext/ldap/tests/ldap_search_variation4.phpt
+++ b/ext/ldap/tests/ldap_search_variation4.phpt
@@ -4,9 +4,10 @@ ldap_search() test
 Davide Mendolia <idaf1er@gmail.com>
 Patrick Allaert <patrickallaert@php.net>
 Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifbindfailure.inc');
 ?>
 --FILE--
diff --git a/ext/ldap/tests/ldap_search_variation5.phpt b/ext/ldap/tests/ldap_search_variation5.phpt
index ee46f2d1e4c19..bb7fd78627a8e 100644
--- a/ext/ldap/tests/ldap_search_variation5.phpt
+++ b/ext/ldap/tests/ldap_search_variation5.phpt
@@ -4,9 +4,10 @@ ldap_search() test
 Davide Mendolia <idaf1er@gmail.com>
 Patrick Allaert <patrickallaert@php.net>
 Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifbindfailure.inc');
 ?>
 --FILE--
diff --git a/ext/ldap/tests/ldap_search_variation6.phpt b/ext/ldap/tests/ldap_search_variation6.phpt
index fb0b262efeae1..1b55325edd713 100644
--- a/ext/ldap/tests/ldap_search_variation6.phpt
+++ b/ext/ldap/tests/ldap_search_variation6.phpt
@@ -4,9 +4,10 @@ ldap_search() test
 Davide Mendolia <idaf1er@gmail.com>
 Patrick Allaert <patrickallaert@php.net>
 Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifbindfailure.inc');
 ?>
 --FILE--
diff --git a/ext/ldap/tests/ldap_set_option_basic.phpt b/ext/ldap/tests/ldap_set_option_basic.phpt
index 161f2b5d43040..64ffb1627451c 100644
--- a/ext/ldap/tests/ldap_set_option_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_basic.phpt
@@ -3,8 +3,8 @@ ldap_set_option() - Basic ldap_set_option() operation
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt b/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt
index 945216d1c0102..29f0e45be23b4 100644
--- a/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt
@@ -2,8 +2,8 @@
 ldap_set_option() - Basic test for TLS CA/Cert/CRL/DH/Key file ldap options
 --CREDITS--
 Chad Sikorra <Chad.Sikorra@gmail.com>
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt b/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt
index f80da7c2dd380..58c132d8858e1 100644
--- a/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt
@@ -2,8 +2,8 @@
 ldap_set_option() - Basic test for TLS cipher suite ldap option
 --CREDITS--
 Chad Sikorra <Chad.Sikorra@gmail.com>
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt b/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt
index 646a7f2ed8950..5844766328917 100644
--- a/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt
@@ -2,8 +2,9 @@
 ldap_set_option() - Basic test for TLS CRL check ldap option
 --CREDITS--
 Chad Sikorra <Chad.Sikorra@gmail.com>
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php
     require "connect.inc";
     $link = ldap_connect($host, $port);
diff --git a/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt b/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt
index 053ba41c617d0..a40ba69d79ead 100644
--- a/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt
+++ b/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt
@@ -2,8 +2,8 @@
 ldap_set_option() - Error test for TLS CRL check ldap option
 --CREDITS--
 Chad Sikorra <Chad.Sikorra@gmail.com>
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_set_option_error.phpt b/ext/ldap/tests/ldap_set_option_error.phpt
index fba37df6ef34d..04603a4e1905d 100644
--- a/ext/ldap/tests/ldap_set_option_error.phpt
+++ b/ext/ldap/tests/ldap_set_option_error.phpt
@@ -3,8 +3,8 @@ ldap_set_option() - ldap_set_option() operation that should fail
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt b/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt
index f00e885ebea9b..54cf648648af1 100644
--- a/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt
@@ -2,8 +2,8 @@
 ldap_set_option() - Basic test for TCP keepalive ldap options
 --CREDITS--
 Chad Sikorra <Chad.Sikorra@gmail.com>
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt b/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt
index d087dbf88cc49..c97f518e6ae48 100644
--- a/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ldap_option_reqcert_basic() - Error test for TLS require cert ldap option
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+ldap
 --CREDITS--
 Edwin Hoksberg <edwin@edwinhoksberg.nl>
 --FILE--
diff --git a/ext/ldap/tests/ldap_set_option_reqcert_error.phpt b/ext/ldap/tests/ldap_set_option_reqcert_error.phpt
index b23d445955edb..fd41a3a3c5b88 100644
--- a/ext/ldap/tests/ldap_set_option_reqcert_error.phpt
+++ b/ext/ldap/tests/ldap_set_option_reqcert_error.phpt
@@ -2,8 +2,8 @@
 ldap_option_reqcert_basic() - Error test for TLS require cert ldap option
 --CREDITS--
 Edwin Hoksberg <edwin@edwinhoksberg.nl>
---SKIPIF--
-<?php require_once __DIR__ .'/skipif.inc'; ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt b/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt
index 782ea24992237..92f99e66d671c 100644
--- a/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt
@@ -2,8 +2,8 @@
 ldap_set_option() - Basic test for TLS protocol min ldap option
 --CREDITS--
 Chad Sikorra <Chad.Sikorra@gmail.com>
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_set_option_variation.phpt b/ext/ldap/tests/ldap_set_option_variation.phpt
index 4f1e8626d743d..bc0239da5a32c 100644
--- a/ext/ldap/tests/ldap_set_option_variation.phpt
+++ b/ext/ldap/tests/ldap_set_option_variation.phpt
@@ -3,8 +3,8 @@ ldap_set_option() - More ldap_set_option() operations
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 require "connect.inc";
diff --git a/ext/ldap/tests/ldap_set_rebind_proc_basic.phpt b/ext/ldap/tests/ldap_set_rebind_proc_basic.phpt
index 5c211fc298f85..09c0d06d81fd7 100644
--- a/ext/ldap/tests/ldap_set_rebind_proc_basic.phpt
+++ b/ext/ldap/tests/ldap_set_rebind_proc_basic.phpt
@@ -3,8 +3,9 @@ ldap_set_rebind_proc() - Basic ldap_set_rebind_proc test
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_set_rebind_proc_error.phpt b/ext/ldap/tests/ldap_set_rebind_proc_error.phpt
index 6344637d33e69..a0e2c7647950f 100644
--- a/ext/ldap/tests/ldap_set_rebind_proc_error.phpt
+++ b/ext/ldap/tests/ldap_set_rebind_proc_error.phpt
@@ -3,8 +3,9 @@ ldap_set_rebind_proc() - Testing ldap_set_rebind_proc() that should fail
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php
     if (!function_exists("ldap_set_rebind_proc")) {
         die("skip ldap_set_rebind_proc() does not exist");
diff --git a/ext/ldap/tests/ldap_start_tls_basic.phpt b/ext/ldap/tests/ldap_start_tls_basic.phpt
index a9e3c6c97ce52..bcf93cf3fcc66 100644
--- a/ext/ldap/tests/ldap_start_tls_basic.phpt
+++ b/ext/ldap/tests/ldap_start_tls_basic.phpt
@@ -3,8 +3,9 @@ ldap_start_tls() - Basic ldap_start_tls test
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once __DIR__ .'/skipif.inc'; ?>
 <?php require_once __DIR__ .'/skipifbindfailure.inc'; ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_unbind_basic.phpt b/ext/ldap/tests/ldap_unbind_basic.phpt
index 622d215546283..d16325a7c3e00 100644
--- a/ext/ldap/tests/ldap_unbind_basic.phpt
+++ b/ext/ldap/tests/ldap_unbind_basic.phpt
@@ -3,8 +3,9 @@ ldap_unbind() - Basic ldap_unbind() operation
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_unbind_variation.phpt b/ext/ldap/tests/ldap_unbind_variation.phpt
index 0c933543ebc75..896821785ca54 100644
--- a/ext/ldap/tests/ldap_unbind_variation.phpt
+++ b/ext/ldap/tests/ldap_unbind_variation.phpt
@@ -3,8 +3,9 @@ ldap_unbind() - Variation of ldap_unbind() function using ldap_set_rebind_proc()
 --CREDITS--
 Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
+--EXTENSIONS--
+ldap
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/skipif.inc b/ext/ldap/tests/skipif.inc
deleted file mode 100644
index dc016787dae71..0000000000000
--- a/ext/ldap/tests/skipif.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-if (!extension_loaded('ldap')){
-    die('skip ldap extension not available');
-}
-?>

From d0a8cd967d69a5e4e243b97e5e3f462e35eba47c Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 11 Jun 2021 16:27:04 +0200
Subject: [PATCH 2/3] Use system temporary directory

---
 ext/ldap/tests/ldap_connect_ldap_conf.phpt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ldap/tests/ldap_connect_ldap_conf.phpt b/ext/ldap/tests/ldap_connect_ldap_conf.phpt
index 0570c10d7715d..d89301d70a978 100644
--- a/ext/ldap/tests/ldap_connect_ldap_conf.phpt
+++ b/ext/ldap/tests/ldap_connect_ldap_conf.phpt
@@ -13,7 +13,7 @@ if (!preg_match("/vendor name => openldap/i", ob_get_clean()))
 ?>
 --FILE--
 <?php
-$conf=tempnam("/tmp","ldap.conf");
+$conf=tempnam(sys_get_temp_dir(),"ldap.conf");
 file_put_contents($conf, "uri ldaps://example.com:3141/");
 putenv("LDAPCONF=$conf");
 $link = ldap_connect();

From 735768db1f8f921ff36762b2ee302bf36f6f952e Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 14 Jun 2021 10:03:04 +0200
Subject: [PATCH 3/3] Use ENV section

---
 ext/ldap/tests/ldap_connect_ldap_conf.conf | 1 +
 ext/ldap/tests/ldap_connect_ldap_conf.phpt | 6 ++----
 run-tests.php                              | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 ext/ldap/tests/ldap_connect_ldap_conf.conf

diff --git a/ext/ldap/tests/ldap_connect_ldap_conf.conf b/ext/ldap/tests/ldap_connect_ldap_conf.conf
new file mode 100644
index 0000000000000..a01565d92f804
--- /dev/null
+++ b/ext/ldap/tests/ldap_connect_ldap_conf.conf
@@ -0,0 +1 @@
+uri ldaps://example.com:3141/
diff --git a/ext/ldap/tests/ldap_connect_ldap_conf.phpt b/ext/ldap/tests/ldap_connect_ldap_conf.phpt
index d89301d70a978..24ae2dc3d049b 100644
--- a/ext/ldap/tests/ldap_connect_ldap_conf.phpt
+++ b/ext/ldap/tests/ldap_connect_ldap_conf.phpt
@@ -4,6 +4,8 @@ ldap_connect() - Connection using default host from openldap's ldap.conf
 David Caldwell <david@galvanix.com>
 --EXTENSIONS--
 ldap
+--ENV--
+LDAPCONF={PWD}/ldap_connect_ldap_conf.conf
 --SKIPIF--
 <?php
 ob_start();
@@ -13,13 +15,9 @@ if (!preg_match("/vendor name => openldap/i", ob_get_clean()))
 ?>
 --FILE--
 <?php
-$conf=tempnam(sys_get_temp_dir(),"ldap.conf");
-file_put_contents($conf, "uri ldaps://example.com:3141/");
-putenv("LDAPCONF=$conf");
 $link = ldap_connect();
 ldap_get_option($link, LDAP_OPT_HOST_NAME, $host);
 var_dump($host);
-unlink($conf);
 ?>
 --EXPECT--
 string(16) "example.com:3141"
diff --git a/run-tests.php b/run-tests.php
index dcab3438dbc32..4b18190074873 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -2047,7 +2047,8 @@ function run_test(string $php, $file, array $env): string
     $env['TZ'] = '';
 
     if ($test->sectionNotEmpty('ENV')) {
-        foreach (explode("\n", $test->getSection('ENV')) as $e) {
+        $env_str = str_replace('{PWD}', dirname($file), $test->getSection('ENV'));
+        foreach (explode("\n", $env_str) as $e) {
             $e = explode('=', trim($e), 2);
 
             if (!empty($e[0]) && isset($e[1])) {