Merge branch 'PHP-7.4'

* PHP-7.4: Add the last missing SKIPIF
2024-11-24 02:15:04 +08:00 · 2019-09-04 08:54:07 +02:00 · 2019-09-04 08:54:07 +02:00 · 68edbbfe76
commit 68edbbfe76
parent 6bd5567ce7 ced5bb7d88
11 changed files with 22 additions and 0 deletions
--- a/ext/bz2/tests/bug71263.phpt
+++ b/ext/bz2/tests/bug71263.phpt
@ -1,5 +1,7 @@
 --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

--- 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

--- 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');
--- 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

--- 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
--- 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');
--- 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

--- 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

--- a/ext/tokenizer/tests/no_inline_html_split.phpt
+++ b/ext/tokenizer/tests/no_inline_html_split.phpt
@ -1,5 +1,7 @@
 --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--
--- 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

--- 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