From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Sat, 3 Feb 2018 04:33:09 +0000 (-0200)
Subject: Add missing SKIPIF sections
X-Git-Tag: php-7.3.0alpha1~497
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6c9e71a5b65aa96ad133f90d7f48b18cdc95788;p=php

Add missing SKIPIF sections
---

diff --git a/ext/fileinfo/tests/precedural_finfo_in_method.phpt b/ext/fileinfo/tests/precedural_finfo_in_method.phpt
index 8495d4cc1e..539473fd95 100644
--- a/ext/fileinfo/tests/precedural_finfo_in_method.phpt
+++ b/ext/fileinfo/tests/precedural_finfo_in_method.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Using procedural finfo API in a method
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/filter_ipv4_rfc6890.phpt b/ext/filter/tests/filter_ipv4_rfc6890.phpt
index 157de77829..f232f9f04d 100644
--- a/ext/filter/tests/filter_ipv4_rfc6890.phpt
+++ b/ext/filter/tests/filter_ipv4_rfc6890.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #71745 FILTER_FLAG_NO_RES_RANGE does not cover whole 127.0.0.0/8 range
+SKIPIF--
+<?php if (!extension_loaded('filter')) die('skip filter extension not loaded'); ?>
 --FILE--
 <?php
 //https://tools.ietf.org/html/rfc6890#section-2.1
@@ -78,8 +80,7 @@ foreach ($reservedRanges as $key => $range) {
 	var_dump(filter_var($max, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_NO_RES_RANGE));
 }
 
-
-
+?>
 --EXPECT--
 string(10) "10.0.0.0/8"
 bool(false)
diff --git a/ext/gmp/tests/bug50175.phpt b/ext/gmp/tests/bug50175.phpt
index 0998e029c3..4c12aad667 100644
--- a/ext/gmp/tests/bug50175.phpt
+++ b/ext/gmp/tests/bug50175.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #50175: gmp_init() results 0 on given base and number starting with 0x or 0b
+--SKIPIF--
+<?php if (!extension_loaded('gmp')) die('skip gmp extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/bug67917.phpt b/ext/gmp/tests/bug67917.phpt
index 93d46cbb66..ce37634901 100644
--- a/ext/gmp/tests/bug67917.phpt
+++ b/ext/gmp/tests/bug67917.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #67917: Using GMP objects with overloaded operators can cause memory exhaustion
+--SKIPIF--
+<?php if (!extension_loaded('gmp')) die('skip gmp extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/bug69803.phpt b/ext/gmp/tests/bug69803.phpt
index e158cc5c0c..32e52dbad0 100644
--- a/ext/gmp/tests/bug69803.phpt
+++ b/ext/gmp/tests/bug69803.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #69803: gmp_random_range() modifies second parameter if GMP number
+--SKIPIF--
+<?php if (!extension_loaded('gmp')) die('skip gmp extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_binomial.phpt b/ext/gmp/tests/gmp_binomial.phpt
index 9c280c78df..85b956f390 100644
--- a/ext/gmp/tests/gmp_binomial.phpt
+++ b/ext/gmp/tests/gmp_binomial.phpt
@@ -1,5 +1,7 @@
 --TEST--
 gmp_binomial(): Binomial coefficients
+--SKIPIF--
+<?php if (!extension_loaded('gmp')) die('skip gmp extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_kronecker.phpt b/ext/gmp/tests/gmp_kronecker.phpt
index 8bfa876ee1..355d7d2256 100644
--- a/ext/gmp/tests/gmp_kronecker.phpt
+++ b/ext/gmp/tests/gmp_kronecker.phpt
@@ -1,5 +1,7 @@
 --TEST--
 gmp_kronecker(): Kronecker symbol
+--SKIPIF--
+<?php if (!extension_loaded('gmp')) die('skip gmp extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_lcm.phpt b/ext/gmp/tests/gmp_lcm.phpt
index 1534b3ff3a..6e2d1e8807 100644
--- a/ext/gmp/tests/gmp_lcm.phpt
+++ b/ext/gmp/tests/gmp_lcm.phpt
@@ -1,5 +1,7 @@
 --TEST--
 gmp_lcm(): Least common multiple
+--SKIPIF--
+<?php if (!extension_loaded('gmp')) die('skip gmp extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_perfect_power.phpt b/ext/gmp/tests/gmp_perfect_power.phpt
index df37f4eeeb..8c316bd2c9 100644
--- a/ext/gmp/tests/gmp_perfect_power.phpt
+++ b/ext/gmp/tests/gmp_perfect_power.phpt
@@ -1,5 +1,7 @@
 --TEST--
 gmp_perfect_power(): Check if number is a perfect power
+--SKIPIF--
+<?php if (!extension_loaded('gmp')) die('skip gmp extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/unserialize_with_reference.phpt b/ext/gmp/tests/unserialize_with_reference.phpt
index b733430a38..a8f95e5339 100644
--- a/ext/gmp/tests/unserialize_with_reference.phpt
+++ b/ext/gmp/tests/unserialize_with_reference.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Unserialize GMP instance with internal reference to itself
+--SKIPIF--
+<?php if (!extension_loaded('gmp')) die('skip gmp extension not loaded'); ?>
 --FILE--
 <?php
 $s = 'C:3:"GMP":23:{s:1:"2";a:1:{i:46;R:1;}}';
diff --git a/ext/hash/tests/bug73127.phpt b/ext/hash/tests/bug73127.phpt
index d9f1f7dca1..a0d5dec49f 100644
--- a/ext/hash/tests/bug73127.phpt
+++ b/ext/hash/tests/bug73127.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #73127 (gost-crypto hash incorrect if input data contains long 0xFF sequence)
+--SKIPIF--
+<?php if(!extension_loaded('hash')) die('skip hash extension not loaded'); ?>
 --FILE--
 <?php // $Id$
 
diff --git a/ext/hash/tests/hash_equals.phpt b/ext/hash/tests/hash_equals.phpt
index 8f87985f47..25304f6b0a 100644
--- a/ext/hash/tests/hash_equals.phpt
+++ b/ext/hash/tests/hash_equals.phpt
@@ -1,5 +1,7 @@
 --TEST--
 hash_equals() function
+--SKIPIF--
+<?php if(!extension_loaded('hash')) die('skip hash extension not loaded'); ?>
 --FILE--
 <?php
 var_dump(hash_equals("same", "same"));
@@ -15,6 +17,7 @@ var_dump(hash_equals(123, 123));
 var_dump(hash_equals(null, ""));
 var_dump(hash_equals(null, 123));
 var_dump(hash_equals(null, null));
+?>
 --EXPECTF--
 bool(true)
 bool(false)
diff --git a/ext/iconv/tests/bug69840.phpt b/ext/iconv/tests/bug69840.phpt
index af79bbcdd6..93bda9a731 100644
--- a/ext/iconv/tests/bug69840.phpt
+++ b/ext/iconv/tests/bug69840.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #69840 (iconv_substr() doesn't work with UTF-16BE)
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --FILE--
 <?php
 $str = iconv_substr("a\x00b\x00", 0, 1, 'UTF-16LE');
diff --git a/ext/intl/tests/bug75318.phpt b/ext/intl/tests/bug75318.phpt
index 7235846ea3..1328851f9e 100644
--- a/ext/intl/tests/bug75318.phpt
+++ b/ext/intl/tests/bug75318.phpt
@@ -1,6 +1,6 @@
 --TEST--
 Bug #75318 (The parameter of UConverter::getAliases() is not optional)
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('intl')) die('skip intl extension is not available');
 ?>
diff --git a/ext/json/tests/bug73991.phpt b/ext/json/tests/bug73991.phpt
index 06aba555f0..fc0be19a92 100644
--- a/ext/json/tests/bug73991.phpt
+++ b/ext/json/tests/bug73991.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Allow JSON_OBJECT_AS_ARRAY to have an effect
+--SKIPIF--
+<?php if(!extension_loaded('json')) die('skip json extension not loaded') ?>
 --FILE--
 <?php
 
@@ -9,6 +11,7 @@ var_dump(json_decode($json, false));
 var_dump(json_decode($json, true));
 var_dump(json_decode($json, null, 512, 0));
 var_dump(json_decode($json, null, 512, JSON_OBJECT_AS_ARRAY));
+?>
 --EXPECTF--
 object(stdClass)#%d (1) {
   ["foo"]=>
diff --git a/ext/json/tests/json_decode_exceptions.phpt b/ext/json/tests/json_decode_exceptions.phpt
index e71a3a54c0..14cf59fd02 100644
--- a/ext/json/tests/json_decode_exceptions.phpt
+++ b/ext/json/tests/json_decode_exceptions.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test json_decode() function : JSON_THROW_ON_ERROR flag
+--SKIPIF--
+<?php if(!extension_loaded('json')) die('skip json extension not loaded') ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/json_encode_exceptions.phpt b/ext/json/tests/json_encode_exceptions.phpt
index 7da2f9cdd0..507f16ede9 100644
--- a/ext/json/tests/json_encode_exceptions.phpt
+++ b/ext/json/tests/json_encode_exceptions.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test json_encode() function : JSON_THROW_ON_ERROR flag
+--SKIPIF--
+<?php if(!extension_loaded('json')) die('skip json extension not loaded') ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/json_exceptions_error_clearing.phpt b/ext/json/tests/json_exceptions_error_clearing.phpt
index e55be5e02b..6d01dd7c33 100644
--- a/ext/json/tests/json_exceptions_error_clearing.phpt
+++ b/ext/json/tests/json_exceptions_error_clearing.phpt
@@ -1,5 +1,7 @@
 --TEST--
 JSON_THROW_ON_ERROR: global error flag untouched
+--SKIPIF--
+<?php if(!extension_loaded('json')) die('skip json extension not loaded') ?>
 --FILE--
 <?php
 
diff --git a/ext/ldap/tests/ldap_exop_refresh.phpt b/ext/ldap/tests/ldap_exop_refresh.phpt
index 170f013943..613a4fbb26 100644
--- a/ext/ldap/tests/ldap_exop_refresh.phpt
+++ b/ext/ldap/tests/ldap_exop_refresh.phpt
@@ -1,5 +1,7 @@
 --TEST--
 ldap_exop_refresh() - Test LDAP refresh extended operation
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --CREDITS--
 Emmanuel Dreyfus <manu@netbsd.org>
 --SKIPIF--
@@ -7,7 +9,7 @@ Emmanuel Dreyfus <manu@netbsd.org>
 <?php require_once('skipifbindfailure.inc'); ?>
 <?php
 	$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
-	$r = ldap_read($link, '', 'objectClass=*', array('dynamicsubtrees')),
+	$r = ldap_read($link, '', 'objectClass=*', array('dynamicsubtrees'));
 	$info = ldap_get_entries($link, $r)[0];
 	if (!isset($info['dynamicsubtrees'])) {
 		die("Overlay DDS not available");
diff --git a/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt b/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt
index e31bf350ad..a8d23b9592 100644
--- a/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 ldap_option_reqcert_basic() - Error test for TLS require cert ldap option
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --CREDITS--
 Edwin Hoksberg <edwin@edwinhoksberg.nl>
 --FILE--
diff --git a/ext/mbstring/tests/bug62934.phpt b/ext/mbstring/tests/bug62934.phpt
index f3521a97c6..8e85ae7e22 100644
--- a/ext/mbstring/tests/bug62934.phpt
+++ b/ext/mbstring/tests/bug62934.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #62934: mb_convert_kana() does not convert iteration marks
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --FILE--
 <?php
 echo mb_convert_kana('あゝすゞめアヽスヾメ', 'C', 'UTF-8') . "\n";
diff --git a/ext/mbstring/tests/bug65544.phpt b/ext/mbstring/tests/bug65544.phpt
index 904b6d6611..0a8b5a7cda 100644
--- a/ext/mbstring/tests/bug65544.phpt
+++ b/ext/mbstring/tests/bug65544.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #65544: mb title case conversion-first word in quotation isn't capitalized
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --FILE--
 <?php
 var_dump(mb_convert_case("\"or else it doesn't, you know. the name of the song is called 'haddocks' eyes.'\"", MB_CASE_TITLE));
diff --git a/ext/mbstring/tests/bug69267.phpt b/ext/mbstring/tests/bug69267.phpt
index d8ca541e11..1f29d319aa 100644
--- a/ext/mbstring/tests/bug69267.phpt
+++ b/ext/mbstring/tests/bug69267.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #69267: mb_strtolower fails on titlecase characters
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/bug71298.phpt b/ext/mbstring/tests/bug71298.phpt
index f69ba29cbb..7defc469db 100644
--- a/ext/mbstring/tests/bug71298.phpt
+++ b/ext/mbstring/tests/bug71298.phpt
@@ -1,5 +1,7 @@
 --TEST--
-Bug #71298: MB_CASE_TITLE misbehaves with curled apostrophe/quote (HTML &rsquo;) 
+Bug #71298: MB_CASE_TITLE misbehaves with curled apostrophe/quote (HTML &rsquo;)
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --FILE--
 <?php
 echo mb_convert_case("People's issues versus people’s issues", MB_CASE_TITLE);
diff --git a/ext/mbstring/tests/bug72399.phpt b/ext/mbstring/tests/bug72399.phpt
index ba6ffb2cb1..7ed9a023f9 100644
--- a/ext/mbstring/tests/bug72399.phpt
+++ b/ext/mbstring/tests/bug72399.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #72399 (Use-After-Free in MBString (search_re))
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --FILE--
 <?php
 $var5 = mbereg_search_init("","2");
diff --git a/ext/mbstring/tests/bug73532.phpt b/ext/mbstring/tests/bug73532.phpt
index 0bc838b075..8173a20f68 100644
--- a/ext/mbstring/tests/bug73532.phpt
+++ b/ext/mbstring/tests/bug73532.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #73532 (Null pointer dereference in mb_eregi)
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --FILE--
 <?php
 var_dump(mb_eregi("a", "\xf5"));
diff --git a/ext/mbstring/tests/bug73646.phpt b/ext/mbstring/tests/bug73646.phpt
index a6aefb22d4..43c1dc7a08 100644
--- a/ext/mbstring/tests/bug73646.phpt
+++ b/ext/mbstring/tests/bug73646.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #73646 (mb_ereg_search_init null pointer dereference)
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/casefolding.phpt b/ext/mbstring/tests/casefolding.phpt
index 34f7984b07..1a68e84040 100644
--- a/ext/mbstring/tests/casefolding.phpt
+++ b/ext/mbstring/tests/casefolding.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Case-insensitive string comparisons use case folding
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/casemapping.phpt b/ext/mbstring/tests/casemapping.phpt
index 1f0e9fb1d5..3e2838392b 100644
--- a/ext/mbstring/tests/casemapping.phpt
+++ b/ext/mbstring/tests/casemapping.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Unicode case mapping
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/mb_convert_case_invalid_mode.phpt b/ext/mbstring/tests/mb_convert_case_invalid_mode.phpt
index af59cd2106..540463143a 100644
--- a/ext/mbstring/tests/mb_convert_case_invalid_mode.phpt
+++ b/ext/mbstring/tests/mb_convert_case_invalid_mode.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Calling mb_convert_case() with an invalid casing mode
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/zend_multibyte-01.phpt b/ext/mbstring/tests/zend_multibyte-01.phpt
index f2403abcac..5802cf2f21 100644
--- a/ext/mbstring/tests/zend_multibyte-01.phpt
+++ b/ext/mbstring/tests/zend_multibyte-01.phpt
@@ -1,6 +1,7 @@
 --TEST--
 zend multibyte (1)
 --SKIPIF--
+<?php require 'skipif.inc'; ?>
 --INI--
 zend.multibyte=On
 zend.script_encoding=Shift_JIS
diff --git a/ext/mbstring/tests/zend_multibyte-02.phpt b/ext/mbstring/tests/zend_multibyte-02.phpt
index 7db444841e..43eb0aebd8 100644
--- a/ext/mbstring/tests/zend_multibyte-02.phpt
+++ b/ext/mbstring/tests/zend_multibyte-02.phpt
@@ -1,5 +1,7 @@
 --TEST--
 zend multibyte (2)
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --INI--
 error_reporting=E_ALL & ~E_DEPRECATED
 zend.multibyte=On
diff --git a/ext/mbstring/tests/zend_multibyte-03.phpt b/ext/mbstring/tests/zend_multibyte-03.phpt
index 99c58bce70..b7e13d46ed 100644
--- a/ext/mbstring/tests/zend_multibyte-03.phpt
+++ b/ext/mbstring/tests/zend_multibyte-03.phpt
@@ -1,6 +1,7 @@
 --TEST--
 zend multibyte (3)
 --SKIPIF--
+<?php require 'skipif.inc'; ?>
 --INI--
 zend.multibyte=On
 zend.script_encoding=UTF-8
diff --git a/ext/mbstring/tests/zend_multibyte-04.phpt b/ext/mbstring/tests/zend_multibyte-04.phpt
index e7fdf81cdd..5cb3af3472 100644
--- a/ext/mbstring/tests/zend_multibyte-04.phpt
+++ b/ext/mbstring/tests/zend_multibyte-04.phpt
@@ -1,6 +1,7 @@
 --TEST--
 zend multibyte (4)
 --SKIPIF--
+<?php require 'skipif.inc'; ?>
 --INI--
 zend.multibyte=On
 zend.script_encoding=CP932
diff --git a/ext/mbstring/tests/zend_multibyte-05.phpt b/ext/mbstring/tests/zend_multibyte-05.phpt
index 3dd56d043d..4d0c236b7a 100644
--- a/ext/mbstring/tests/zend_multibyte-05.phpt
+++ b/ext/mbstring/tests/zend_multibyte-05.phpt
@@ -1,6 +1,7 @@
 --TEST--
 zend multibyte (5)
 --SKIPIF--
+<?php require 'skipif.inc'; ?>
 --INI--
 zend.multibyte=On
 zend.script_encoding=EUC-JP
diff --git a/ext/mbstring/tests/zend_multibyte-06.phpt b/ext/mbstring/tests/zend_multibyte-06.phpt
index 7eeac1d353..71e5c903b9 100644
--- a/ext/mbstring/tests/zend_multibyte-06.phpt
+++ b/ext/mbstring/tests/zend_multibyte-06.phpt
@@ -1,5 +1,7 @@
 --TEST--
 zend multibyte (6)
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --INI--
 zend.multibyte=On
 zend.script_encoding=EUC-JP
diff --git a/ext/mbstring/tests/zend_multibyte-07.phpt b/ext/mbstring/tests/zend_multibyte-07.phpt
index 685c6f1f04..b81104ca3e 100644
--- a/ext/mbstring/tests/zend_multibyte-07.phpt
+++ b/ext/mbstring/tests/zend_multibyte-07.phpt
@@ -1,5 +1,7 @@
 --TEST--
 zend multibyte (7)
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --INI--
 error_reporting=E_ALL & ~E_DEPRECATED
 zend.multibyte=On
diff --git a/ext/mbstring/tests/zend_multibyte-08.phpt b/ext/mbstring/tests/zend_multibyte-08.phpt
index 9e5b75eadd..1030dfdc91 100644
--- a/ext/mbstring/tests/zend_multibyte-08.phpt
+++ b/ext/mbstring/tests/zend_multibyte-08.phpt
@@ -1,5 +1,7 @@
 --TEST--
 zend multibyte (8)
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --INI--
 zend.multibyte=On
 zend.script_encoding=ISO-8859-1
diff --git a/ext/mbstring/tests/zend_multibyte-09.phpt b/ext/mbstring/tests/zend_multibyte-09.phpt
index f9b8bf734f..17d5840e47 100644
--- a/ext/mbstring/tests/zend_multibyte-09.phpt
+++ b/ext/mbstring/tests/zend_multibyte-09.phpt
@@ -1,5 +1,7 @@
 --TEST--
 zend multibyte (9)
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --INI--
 error_reporting=E_ALL & ~E_DEPRECATED
 zend.multibyte=On
diff --git a/ext/mbstring/tests/zend_multibyte-10.phpt b/ext/mbstring/tests/zend_multibyte-10.phpt
index ef8ce9d0bc..ad70b853af 100644
--- a/ext/mbstring/tests/zend_multibyte-10.phpt
+++ b/ext/mbstring/tests/zend_multibyte-10.phpt
@@ -1,5 +1,7 @@
 --TEST--
 zend multibyte (10)
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --INI--
 zend.multibyte=1
 --FILE--
@@ -9,4 +11,4 @@ declare(encoding="ISO-8859-1");
 echo "ok\n";
 ?>
 --EXPECTF--
-ok
\ No newline at end of file
+ok
diff --git a/ext/mbstring/tests/zend_multibyte-11.phpt b/ext/mbstring/tests/zend_multibyte-11.phpt
index 0f9874b538..c5e02eeae3 100644
--- a/ext/mbstring/tests/zend_multibyte-11.phpt
+++ b/ext/mbstring/tests/zend_multibyte-11.phpt
@@ -1,5 +1,7 @@
 --TEST--
 zend multibyte (11)
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --INI--
 zend.multibyte=1
 --FILE--
@@ -10,4 +12,4 @@ declare(encoding="ISO-8859-15") {
 }
 ?>
 --EXPECTF--
-Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line %d
\ No newline at end of file
+Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line %d
diff --git a/ext/mbstring/tests/zend_multibyte-12.phpt b/ext/mbstring/tests/zend_multibyte-12.phpt
index bbfa25d97f..844e3bc499 100644
--- a/ext/mbstring/tests/zend_multibyte-12.phpt
+++ b/ext/mbstring/tests/zend_multibyte-12.phpt
@@ -1,5 +1,7 @@
 --TEST--
 zend multibyte (12)
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --INI--
 zend.multibyte=1
 --FILE--
diff --git a/ext/mbstring/tests/zend_multibyte-13.phpt b/ext/mbstring/tests/zend_multibyte-13.phpt
index 6eaef985f5..f3a18fe481 100644
--- a/ext/mbstring/tests/zend_multibyte-13.phpt
+++ b/ext/mbstring/tests/zend_multibyte-13.phpt
@@ -1,6 +1,7 @@
 --TEST--
 zend multibyte (13)
 --SKIPIF--
+<?php require 'skipif.inc'; ?>
 --INI--
 zend.multibyte=On
 zend.script_encoding=UTF-8
diff --git a/ext/mbstring/tests/zend_multibyte-14.phpt b/ext/mbstring/tests/zend_multibyte-14.phpt
index 98c2f87e25..36c7c5355c 100644
--- a/ext/mbstring/tests/zend_multibyte-14.phpt
+++ b/ext/mbstring/tests/zend_multibyte-14.phpt
@@ -1,6 +1,7 @@
 --TEST--
 zend multibyte (14)
 --SKIPIF--
+<?php require 'skipif.inc'; ?>
 --INI--
 zend.multibyte=On
 zend.script_encoding=UTF-8
diff --git a/ext/mbstring/tests/zend_multibyte-15.phpt b/ext/mbstring/tests/zend_multibyte-15.phpt
index 6995444bbb..35246bcdca 100644
--- a/ext/mbstring/tests/zend_multibyte-15.phpt
+++ b/ext/mbstring/tests/zend_multibyte-15.phpt
@@ -1,5 +1,7 @@
 --TEST--
 zend multibyte (15)
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --INI--
 zend.multibyte=1
 --FILE--
@@ -13,4 +15,4 @@ declare(encoding="UTF-8") {
 ?>
 --EXPECTF--
 ok
-ok
\ No newline at end of file
+ok
diff --git a/ext/mbstring/tests/zend_multibyte-16.phpt b/ext/mbstring/tests/zend_multibyte-16.phpt
index 4470e3a87f..7f1d91e294 100644
--- a/ext/mbstring/tests/zend_multibyte-16.phpt
+++ b/ext/mbstring/tests/zend_multibyte-16.phpt
@@ -1,5 +1,7 @@
 --TEST--
 zend multibyte (16)
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --INI--
 zend.multibyte=1
 --FILE--
@@ -11,4 +13,4 @@ echo "ok\n";
 ?>
 --EXPECTF--
 ok
-ok
\ No newline at end of file
+ok
diff --git a/ext/simplexml/tests/SimpleXMLElement_getDocNamespaces.phpt b/ext/simplexml/tests/SimpleXMLElement_getDocNamespaces.phpt
index 9df7591003..52d1341ae5 100644
--- a/ext/simplexml/tests/SimpleXMLElement_getDocNamespaces.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_getDocNamespaces.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Testing getDocNamespaces() with invalid XML
+--SKIPIF--
+<?php if (!extension_loaded('simplexml')) die('skip simplexml extension not loaded'); ?>
 --FILE--
 <?php
 $xml = @new SimpleXMLElement("X",1);
diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
index fb7e6e90f0..3eb417cef2 100644
--- a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Testing xpath() with invalid XML
+--SKIPIF--
+<?php if (!extension_loaded('simplexml')) die('skip simplexml extension not loaded'); ?>
 --FILE--
 <?php
 // gracefully recover from parsing of invalid XML; not available in PHP
@@ -7,7 +9,7 @@ const XML_PARSE_RECOVER = 1;
 
 // we're not interested in checking concrete warnings regarding invalid XML
 $xml = @simplexml_load_string("XXXXXXX^", 'SimpleXMLElement', XML_PARSE_RECOVER);
-  
+
 // $xml is supposed to hold a SimpleXMLElement, but not FALSE/NULL
 var_dump($xml->xpath("BBBB"));
 ?>
diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt
index 75cf5720d5..cb6b3ad08f 100644
--- a/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt
@@ -2,6 +2,7 @@
 Testing xpath() with invalid XML
 --SKIPIF--
 <?php
+if (!extension_loaded('simplexml')) die('skip simplexml extension not loaded');
 if (PHP_MAJOR_VERSION < 7) die("skip this test is for PHP 7+ only");
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only");
 ?>
diff --git a/ext/simplexml/tests/bug53033.phpt b/ext/simplexml/tests/bug53033.phpt
index 626022cd54..3da0dbc11c 100644
--- a/ext/simplexml/tests/bug53033.phpt
+++ b/ext/simplexml/tests/bug53033.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #53033: Mathematical operations convert objects to integers
+--SKIPIF--
+<?php if (!extension_loaded('simplexml')) die('skip simplexml extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug54973.phpt b/ext/simplexml/tests/bug54973.phpt
index 29daaed788..58891eb3fe 100644
--- a/ext/simplexml/tests/bug54973.phpt
+++ b/ext/simplexml/tests/bug54973.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #54973: SimpleXML casts integers wrong
+--SKIPIF--
+<?php if (!extension_loaded('simplexml')) die('skip simplexml extension not loaded'); ?>
 --FILE--
 <?php
 $xml = simplexml_load_string("<xml><number>9223372036854775808</number></xml>");
diff --git a/ext/soap/tests/bug70211.phpt b/ext/soap/tests/bug70211.phpt
index 2d7124376b..bd1f94ecef 100644
--- a/ext/soap/tests/bug70211.phpt
+++ b/ext/soap/tests/bug70211.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #70211 (php 7 ZEND_HASH_IF_FULL_DO_RESIZE use after free)
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --FILE--
 <?php
 
diff --git a/ext/xml/tests/bug73135.phpt b/ext/xml/tests/bug73135.phpt
index 5fb43e91db..ede7b7acf0 100644
--- a/ext/xml/tests/bug73135.phpt
+++ b/ext/xml/tests/bug73135.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #73135 (xml_parse() segmentation fault)
+--SKIPIF--
+<?php if (!extension_loaded('xml')) die('skip xml extension not loaded'); ?>
 --CREDITS--
 edgarsandi - <edgar.r.sandi@gmail.com>
 --FILE--
@@ -21,4 +23,4 @@ HERE;
 --EXPECTF--
 Warning: xml_parse(): Unable to call handler ahihi() in %s%ebug73135.php on line %d
 
-Warning: xml_parse(): Unable to call handler ahihi() in %s%ebug73135.php on line %d
\ No newline at end of file
+Warning: xml_parse(): Unable to call handler ahihi() in %s%ebug73135.php on line %d
diff --git a/ext/zlib/tests/bug73944.phpt b/ext/zlib/tests/bug73944.phpt
index c4291afa4e..6d1e5e5b91 100644
--- a/ext/zlib/tests/bug73944.phpt
+++ b/ext/zlib/tests/bug73944.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #73944: Dictionary option of intflate_init() does not work
+--SKIPIF--
+<?php if(!extension_loaded('zlib')) die('skip zlib extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/zlib/tests/dictionary_usage.phpt b/ext/zlib/tests/dictionary_usage.phpt
index f7ef3b3a9c..0823b3ca94 100644
--- a/ext/zlib/tests/dictionary_usage.phpt
+++ b/ext/zlib/tests/dictionary_usage.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test dictionary usage on zlib methods
+--SKIPIF--
+<?php if(!extension_loaded('zlib')) die('skip zlib extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/zlib/tests/gzgetss.phpt b/ext/zlib/tests/gzgetss.phpt
index b0bdcb9c86..58c428cbc7 100644
--- a/ext/zlib/tests/gzgetss.phpt
+++ b/ext/zlib/tests/gzgetss.phpt
@@ -3,8 +3,6 @@ gzgetss — Get line from gz-file pointer and strip HTML tags - function
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br>
 --SKIPIF--
-<?php
-
 <?php
 if(!extension_loaded("zlib")){die("skip - ZLIB extension not loaded");}
 ?>
@@ -19,4 +17,4 @@ while (!gzeof($handle)){
 gzclose($handle);
 ?>
 --EXPECT--
-<code>stringgzgetss(resource $zp, int $length [, string $allowable_tags ]);<code/>
\ No newline at end of file
+<code>stringgzgetss(resource $zp, int $length [, string $allowable_tags ]);<code/>