From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Sun, 4 Feb 2018 12:41:21 +0000 (-0200)
Subject: Add and fix SKIPIF sections
X-Git-Tag: php-7.3.0alpha1~476
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0d3c1bf837e382718768a3b5c80e19abf490d15;p=php

Add and fix SKIPIF sections
---

diff --git a/ext/com_dotnet/tests/bug73679.phpt b/ext/com_dotnet/tests/bug73679.phpt
index 6f46d87d7f..b5b884553f 100644
--- a/ext/com_dotnet/tests/bug73679.phpt
+++ b/ext/com_dotnet/tests/bug73679.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #73679 DOTNET read access violation using invalid codepage 
+Bug #73679 DOTNET read access violation using invalid codepage
 --SKIPIF--
 <?php # vim:ft=php
 if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?>
diff --git a/ext/dom/tests/bug67949.phpt b/ext/dom/tests/bug67949.phpt
index 823e6e1449..dd27352e6c 100644
--- a/ext/dom/tests/bug67949.phpt
+++ b/ext/dom/tests/bug67949.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #67949: DOMNodeList elements should be accessible through array notation
+--SKIPIF--
+<?php require 'skipif.inc' ?>
 --FILE--
 <?php
 
@@ -47,7 +49,7 @@ $anchor = $doc->getElementsByTagName('a')[0];
 var_dump($anchor->attributes[0]->name);
 
 echo "==DONE==\n";
-
+?>
 --EXPECTF--
 testing has_dimension
 bool(true)
@@ -84,4 +86,3 @@ NULL
 testing attribute access
 string(4) "href"
 ==DONE==
-
diff --git a/ext/dom/tests/bug69373.phpt b/ext/dom/tests/bug69373.phpt
index d04ac03983..ce4510082e 100644
--- a/ext/dom/tests/bug69373.phpt
+++ b/ext/dom/tests/bug69373.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #69373 References to deleted XPath query results
+--SKIPIF--
+<?php require 'skipif.inc' ?>
 --FILE--
 <?php
 $doc = new DOMDocument();
diff --git a/ext/dom/tests/bug69679.phpt b/ext/dom/tests/bug69679.phpt
index fc6db8d056..e96c11a056 100644
--- a/ext/dom/tests/bug69679.phpt
+++ b/ext/dom/tests/bug69679.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #69679 (DOMDocument::loadHTML refuses to accept NULL bytes)
+--SKIPIF--
+<?php require 'skipif.inc' ?>
 --FILE--
 <?php
 $doc = new DOMDocument();
diff --git a/ext/filter/tests/filter_ipv4_rfc6890.phpt b/ext/filter/tests/filter_ipv4_rfc6890.phpt
index f232f9f04d..a55bb36c30 100644
--- a/ext/filter/tests/filter_ipv4_rfc6890.phpt
+++ b/ext/filter/tests/filter_ipv4_rfc6890.phpt
@@ -1,6 +1,6 @@
 --TEST--
 Bug #71745 FILTER_FLAG_NO_RES_RANGE does not cover whole 127.0.0.0/8 range
-SKIPIF--
+--SKIPIF--
 <?php if (!extension_loaded('filter')) die('skip filter extension not loaded'); ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug75124.phpt b/ext/gd/tests/bug75124.phpt
index b37afc9785..513d452147 100644
--- a/ext/gd/tests/bug75124.phpt
+++ b/ext/gd/tests/bug75124.phpt
@@ -2,7 +2,7 @@
 Bug #75124 (gdImageGrayScale() may produce colors)
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('gd extension not available');
+if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.5', '<')) {
     die('skip only for bundled libgd or external libgd >= 2.2.5');
 }
diff --git a/ext/ldap/tests/ldap_exop_refresh.phpt b/ext/ldap/tests/ldap_exop_refresh.phpt
index 613a4fbb26..fd843a62c6 100644
--- a/ext/ldap/tests/ldap_exop_refresh.phpt
+++ b/ext/ldap/tests/ldap_exop_refresh.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ldap_exop_refresh() - Test LDAP refresh extended operation
---SKIPIF--
-<?php require 'skipif.inc'; ?>
 --CREDITS--
 Emmanuel Dreyfus <manu@netbsd.org>
 --SKIPIF--
diff --git a/ext/opcache/tests/bug73789.phpt b/ext/opcache/tests/bug73789.phpt
index 142d5229f9..c812982f20 100644
--- a/ext/opcache/tests/bug73789.phpt
+++ b/ext/opcache/tests/bug73789.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #73789 (Strange behavior of class constants in switch/case block)
+--SKIPIF--
+<?php if (!extension_loaded('ctype')) die('skip extension ctype not loaded'); ?>
 --FILE--
 <?php
 class Lexer
@@ -26,5 +28,6 @@ class Lexer
 	}
 }
 var_dump((new Lexer())->getType("dot"));
+?>
 --EXPECT--
 int(2)
diff --git a/ext/pdo_mysql/tests/PDO_getAvaliableDrivers.phpt b/ext/pdo_mysql/tests/PDO_getAvaliableDrivers.phpt
index 07ddca183a..b55110d511 100644
--- a/ext/pdo_mysql/tests/PDO_getAvaliableDrivers.phpt
+++ b/ext/pdo_mysql/tests/PDO_getAvaliableDrivers.phpt
@@ -1,6 +1,8 @@
 --TEST--
 public static array PDO::getAvailableDrivers ( void );
 array pdo_drivers ( void );
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
 --FILE--
diff --git a/ext/sqlite3/tests/sqlite3_busyTimeout.phpt b/ext/sqlite3/tests/sqlite3_busyTimeout.phpt
index 3c7c2dc41a..ba44e53ed9 100644
--- a/ext/sqlite3/tests/sqlite3_busyTimeout.phpt
+++ b/ext/sqlite3/tests/sqlite3_busyTimeout.phpt
@@ -2,8 +2,8 @@
 public bool SQLite3::busyTimeout ( int $msecs );
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
---XFAILIF--
-<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
+--SKIPIF--
+<?php require 'skipif.inc'; ?>
 --FILE--
 <?php
 require_once(dirname(__FILE__) . '/new_db.inc');
diff --git a/ext/xsl/tests/xsltprocessor_hasExsltSupport_not_available_extension.phpt b/ext/xsl/tests/xsltprocessor_hasExsltSupport_not_available_extension.phpt
deleted file mode 100644
index 771b401ba9..0000000000
--- a/ext/xsl/tests/xsltprocessor_hasExsltSupport_not_available_extension.phpt
+++ /dev/null
@@ -1,13 +0,0 @@
---TEST--
-Test the basics to function XSLTProcessor::hasExsltSupport() when the xsl extension os not available.
---CREDITS--
-Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
---SKIPIF--
-<?php (!extension_loaded('xsl')) or die('skip xsl extension is available'); ?>
---FILE--
-<?php
-$proc = new XSLTProcessor();
-var_dump($proc->hasExsltSupport());
-?>
---EXPECTF--
-Fatal error: Class 'XSLTProcessor' not found in %s on line %d
\ No newline at end of file