Skip to content

Port skipif.inc to EXTENSIONS #7141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Port skipif.inc to EXTENSIONS #7141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cefa264
Port ldap
nikic Jun 11, 2021
d0a8cd9
Use system temporary directory
nikic Jun 11, 2021
735768d
Use ENV section
nikic Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ext/ldap/tests/bug48441.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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--
Expand Down
4 changes: 2 additions & 2 deletions ext/ldap/tests/bug72021.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ";
Expand Down
6 changes: 2 additions & 4 deletions ext/ldap/tests/bug73933.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 */
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/bug77958.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_add_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_add_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_add_ext.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_bind_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_bind_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_bind_ext.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_bind_variation.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_compare_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_compare_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ext/ldap/tests/ldap_connect_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions ext/ldap/tests/ldap_connect_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
1 change: 1 addition & 0 deletions ext/ldap/tests/ldap_connect_ldap_conf.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uri ldaps://example.com:3141/
9 changes: 4 additions & 5 deletions ext/ldap/tests/ldap_connect_ldap_conf.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,22 @@
ldap_connect() - Connection using default host from openldap's ldap.conf
--CREDITS--
David Caldwell <david@galvanix.com>
--EXTENSIONS--
ldap
--ENV--
LDAPCONF={PWD}/ldap_connect_ldap_conf.conf
--SKIPIF--
<?php
require_once('skipif.inc');
ob_start();
phpinfo();
if (!preg_match("/vendor name => openldap/i", ob_get_clean()))
die("skip not openldap");
?>
--FILE--
<?php
$conf=tempnam("/tmp","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"
4 changes: 2 additions & 2 deletions ext/ldap/tests/ldap_connect_variation.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_controls.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_count_entries_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_count_references_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_delete_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_delete_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_delete_ext.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
4 changes: 2 additions & 2 deletions ext/ldap/tests/ldap_dn2ufn.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
ldap_dn2ufn() test
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--EXTENSIONS--
ldap
--FILE--
<?php

Expand Down
4 changes: 2 additions & 2 deletions ext/ldap/tests/ldap_err2str_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_errno_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_error_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ext/ldap/tests/ldap_escape_all.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
ldap_escape() test all
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--EXTENSIONS--
ldap
--FILE--
<?php

Expand Down
4 changes: 2 additions & 2 deletions ext/ldap/tests/ldap_escape_both.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
ldap_escape() test filter and DN
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--EXTENSIONS--
ldap
--FILE--
<?php

Expand Down
4 changes: 2 additions & 2 deletions ext/ldap/tests/ldap_escape_dn.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
ldap_escape() test DN
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--EXTENSIONS--
ldap
--FILE--
<?php

Expand Down
4 changes: 2 additions & 2 deletions ext/ldap/tests/ldap_escape_filter.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
ldap_escape() test filter
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--EXTENSIONS--
ldap
--FILE--
<?php

Expand Down
4 changes: 2 additions & 2 deletions ext/ldap/tests/ldap_escape_ignore.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
ldap_escape() test ignore
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--EXTENSIONS--
ldap
--FILE--
<?php

Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_exop.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_exop_passwd.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ext/ldap/tests/ldap_exop_passwd_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading