From ced5bb7d88b48dbc9b98a2d24e3ee586fe65651a Mon Sep 17 00:00:00 2001
From: Fabien Villepinte <fabien.villepinte@displayce.com>
Date: Tue, 3 Sep 2019 22:54:41 +0200
Subject: Add the last missing SKIPIF

---
 ext/bz2/bug71263.phpt                         | 53 --------------------------
 ext/bz2/tests/bug71263.phpt                   | 55 +++++++++++++++++++++++++++
 ext/intl/tests/bug77895.phpt                  |  2 +
 ext/intl/tests/dateformat_bug65683_2.phpt     |  2 +
 ext/json/tests/bug77843.phpt                  |  2 +
 ext/session/tests/bug71162.phpt               |  2 +
 ext/session/tests/bug74892.phpt               |  2 +
 ext/tokenizer/no_inline_html_split.phpt       | 24 ------------
 ext/tokenizer/tests/bad_character.phpt        |  2 +
 ext/tokenizer/tests/bug76991.phpt             |  2 +
 ext/tokenizer/tests/no_inline_html_split.phpt | 26 +++++++++++++
 ext/tokenizer/tests/php_tag_only.phpt         |  2 +
 ext/zlib/tests/bug71417.phpt                  |  2 +
 13 files changed, 99 insertions(+), 77 deletions(-)
 delete mode 100644 ext/bz2/bug71263.phpt
 create mode 100644 ext/bz2/tests/bug71263.phpt
 delete mode 100644 ext/tokenizer/no_inline_html_split.phpt
 create mode 100644 ext/tokenizer/tests/no_inline_html_split.phpt

diff --git a/ext/bz2/bug71263.phpt b/ext/bz2/bug71263.phpt
deleted file mode 100644
index 387c06bfdb..0000000000
--- a/ext/bz2/bug71263.phpt
+++ /dev/null
@@ -1,53 +0,0 @@
---TEST--
-Bug #71263: fread() does not detects decoding errors from filter bzip2.decompress
---FILE--
-<?php
-
-// Should notices be generated?
-
-function test($case) {
-	$plain = "The quick brown fox jumps over the lazy dog.";
-	$fn = "bug71263.bz2";
-	$compressed = (string) bzcompress($plain);
-	echo "Compressed len = ", strlen($compressed), "\n";
-	
-    if ($case == 1) {
-        // Set a random byte in the middle of the compressed data
-        // --> php_bz2_decompress_filter() detects fatal error
-        // --> fread() displays empty string then garbage, no errors detected:
-        $compressed[strlen($compressed) - 15] = 'X';
-    } else if ($case == 2) {
-        // Truncate the compressed data
-        // --> php_bz2_decompress_filter() does not detect errors,
-        // --> fread() displays the empty string:
-    	$compressed = substr($compressed, 0, strlen($compressed) - 20);
-    } else {
-        // Corrupted final CRC
-        // --> php_bz2_decompress_filter() detects fatal error
-        // --> fread() displays an empty string, then the correct plain text, no error detected:
-    	$compressed[strlen($compressed)-2] = 'X';
-    }
-
-	file_put_contents($fn, $compressed);
-	
-	$r = fopen($fn, "r");
-	stream_filter_append($r, 'bzip2.decompress', STREAM_FILTER_READ);
-    while (!feof($r)) {
-        $s = fread($r, 100);
-        echo "read: "; var_dump($s);
-    }
-	fclose($r);
-	unlink($fn);
-}
-
-test(1);
-test(2);
-test(3);
-?>
---EXPECT--
-Compressed len = 81
-read: bool(false)
-Compressed len = 81
-read: string(0) ""
-Compressed len = 81
-read: bool(false)
diff --git a/ext/bz2/tests/bug71263.phpt b/ext/bz2/tests/bug71263.phpt
new file mode 100644
index 0000000000..d5c3ff91da
--- /dev/null
+++ b/ext/bz2/tests/bug71263.phpt
@@ -0,0 +1,55 @@
+--TEST--
+Bug #71263: fread() does not detects decoding errors from filter bzip2.decompress
+--SKIPIF--
+<?php if (!extension_loaded("bz2")) print "skip bz2 extension not loaded"; ?>
+--FILE--
+<?php
+
+// Should notices be generated?
+
+function test($case) {
+	$plain = "The quick brown fox jumps over the lazy dog.";
+	$fn = "bug71263.bz2";
+	$compressed = (string) bzcompress($plain);
+	echo "Compressed len = ", strlen($compressed), "\n";
+	
+    if ($case == 1) {
+        // Set a random byte in the middle of the compressed data
+        // --> php_bz2_decompress_filter() detects fatal error
+        // --> fread() displays empty string then garbage, no errors detected:
+        $compressed[strlen($compressed) - 15] = 'X';
+    } else if ($case == 2) {
+        // Truncate the compressed data
+        // --> php_bz2_decompress_filter() does not detect errors,
+        // --> fread() displays the empty string:
+    	$compressed = substr($compressed, 0, strlen($compressed) - 20);
+    } else {
+        // Corrupted final CRC
+        // --> php_bz2_decompress_filter() detects fatal error
+        // --> fread() displays an empty string, then the correct plain text, no error detected:
+    	$compressed[strlen($compressed)-2] = 'X';
+    }
+
+	file_put_contents($fn, $compressed);
+	
+	$r = fopen($fn, "r");
+	stream_filter_append($r, 'bzip2.decompress', STREAM_FILTER_READ);
+    while (!feof($r)) {
+        $s = fread($r, 100);
+        echo "read: "; var_dump($s);
+    }
+	fclose($r);
+	unlink($fn);
+}
+
+test(1);
+test(2);
+test(3);
+?>
+--EXPECT--
+Compressed len = 81
+read: bool(false)
+Compressed len = 81
+read: string(0) ""
+Compressed len = 81
+read: bool(false)
diff --git a/ext/intl/tests/bug77895.phpt b/ext/intl/tests/bug77895.phpt
index 18b4f778e6..17a86fd410 100644
--- a/ext/intl/tests/bug77895.phpt
+++ b/ext/intl/tests/bug77895.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #77895: IntlDateFormatter::create fails in strict mode if $locale = null 
+--SKIPIF--
+<?php if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
 --FILE--
 <?php
 
diff --git a/ext/intl/tests/dateformat_bug65683_2.phpt b/ext/intl/tests/dateformat_bug65683_2.phpt
index 1a709e4ae9..783ac4abd4 100644
--- a/ext/intl/tests/dateformat_bug65683_2.phpt
+++ b/ext/intl/tests/dateformat_bug65683_2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #65683: Intl does not support DateTimeImmutable (using datefmt_format_object)
+--SKIPIF--
+<?php if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
 --FILE--
 <?php
 $date = date_create('1970-01-01');
diff --git a/ext/json/tests/bug77843.phpt b/ext/json/tests/bug77843.phpt
index c525285bf5..dbcb024c26 100644
--- a/ext/json/tests/bug77843.phpt
+++ b/ext/json/tests/bug77843.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #77843: Use after free with json serializer
+--SKIPIF--
+<?php if(!extension_loaded('json')) die('skip json extension not loaded') ?>
 --FILE--
 <?php
 
diff --git a/ext/session/tests/bug71162.phpt b/ext/session/tests/bug71162.phpt
index 722889d417..31d3370499 100644
--- a/ext/session/tests/bug71162.phpt
+++ b/ext/session/tests/bug71162.phpt
@@ -1,5 +1,7 @@
 --TEST--
 updateTimestamp never called when session data is empty
+--SKIPIF--
+<?php include('skipif.inc'); ?>
 --INI--
 session.use_strict_mode=0
 session.save_handler=files
diff --git a/ext/session/tests/bug74892.phpt b/ext/session/tests/bug74892.phpt
index a4c977828a..0947df7761 100644
--- a/ext/session/tests/bug74892.phpt
+++ b/ext/session/tests/bug74892.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #74892 Url Rewriting (trans_sid) not working on urls that start with #
+--SKIPIF--
+<?php include('skipif.inc'); ?>
 --FILE--
 <?php
 ini_set('session.use_cookies', '0');
diff --git a/ext/tokenizer/no_inline_html_split.phpt b/ext/tokenizer/no_inline_html_split.phpt
deleted file mode 100644
index 7d5f75d6a3..0000000000
--- a/ext/tokenizer/no_inline_html_split.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-Inline HTML should not be split at partial PHP tags
---INI--
-short_open_tag=0
---FILE--
-<?php
-
-var_dump(token_get_all(<<<'PHP'
-Foo<?phpBar
-PHP));
-
-?>
---EXPECTF--
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(%d)
-    [1]=>
-    string(11) "Foo<?phpBar"
-    [2]=>
-    int(1)
-  }
-}
diff --git a/ext/tokenizer/tests/bad_character.phpt b/ext/tokenizer/tests/bad_character.phpt
index 0c6b1136a6..87f0179004 100644
--- a/ext/tokenizer/tests/bad_character.phpt
+++ b/ext/tokenizer/tests/bad_character.phpt
@@ -1,5 +1,7 @@
 --TEST--
 token_get_all() produces T_BAD_CHARACTER for unexpected characters
+--SKIPIF--
+<?php if (!extension_loaded("tokenizer")) print "skip tokenizer extension not enabled"; ?>
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/tests/bug76991.phpt b/ext/tokenizer/tests/bug76991.phpt
index 261abc5981..72f36cec3f 100644
--- a/ext/tokenizer/tests/bug76991.phpt
+++ b/ext/tokenizer/tests/bug76991.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #76991: Incorrect tokenization of multiple invalid flexible heredoc strings
+--SKIPIF--
+<?php if (!extension_loaded("tokenizer")) print "skip tokenizer extension not enabled"; ?>
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/tests/no_inline_html_split.phpt b/ext/tokenizer/tests/no_inline_html_split.phpt
new file mode 100644
index 0000000000..37608d73e0
--- /dev/null
+++ b/ext/tokenizer/tests/no_inline_html_split.phpt
@@ -0,0 +1,26 @@
+--TEST--
+Inline HTML should not be split at partial PHP tags
+--SKIPIF--
+<?php if (!extension_loaded("tokenizer")) print "skip tokenizer extension not enabled"; ?>
+--INI--
+short_open_tag=0
+--FILE--
+<?php
+
+var_dump(token_get_all(<<<'PHP'
+Foo<?phpBar
+PHP));
+
+?>
+--EXPECTF--
+array(1) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(%d)
+    [1]=>
+    string(11) "Foo<?phpBar"
+    [2]=>
+    int(1)
+  }
+}
diff --git a/ext/tokenizer/tests/php_tag_only.phpt b/ext/tokenizer/tests/php_tag_only.phpt
index a6df7ded4d..aec11f9e16 100644
--- a/ext/tokenizer/tests/php_tag_only.phpt
+++ b/ext/tokenizer/tests/php_tag_only.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Tokenization of only the <?php tag
+--SKIPIF--
+<?php if (!extension_loaded("tokenizer")) print "skip tokenizer extension not enabled"; ?>
 --FILE--
 <?php
 
diff --git a/ext/zlib/tests/bug71417.phpt b/ext/zlib/tests/bug71417.phpt
index 717b2effe4..ae1390134e 100644
--- a/ext/zlib/tests/bug71417.phpt
+++ b/ext/zlib/tests/bug71417.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #71417: fread() does not detect decoding errors from filter zlib.inflate
+--SKIPIF--
+<?php if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build'); ?>
 --FILE--
 <?php
 
-- 
cgit v1.2.1