summaryrefslogtreecommitdiff
path: root/ext/bz2
diff options
context:
space:
mode:
authorMax Semenik <maxsem.wiki@gmail.com>2021-03-22 16:10:15 +0300
committerNikita Popov <nikita.ppv@gmail.com>2021-03-22 17:51:02 +0100
commit56f90492d68cf01a35fb0ce0290a50c09660b86f (patch)
tree90eac66f56c965f86b0f215f811a0f3e303c02d7 /ext/bz2
parent550a662f67f83504b306969c16e637759796e758 (diff)
downloadphp-git-56f90492d68cf01a35fb0ce0290a50c09660b86f.tar.gz
Migrate skip checks to --EXTENSIONS--, p1
For rationale, see https://github.com/php/php-src/pull/6787 Extensions migrated in this part: * bcmath * bz2 * calendar * com_dotnet * ctype Closes GH-6797.
Diffstat (limited to 'ext/bz2')
-rw-r--r--ext/bz2/tests/001.phpt4
-rw-r--r--ext/bz2/tests/002.phpt4
-rw-r--r--ext/bz2/tests/003-mb.phpt4
-rw-r--r--ext/bz2/tests/003.phpt4
-rw-r--r--ext/bz2/tests/004.phpt4
-rw-r--r--ext/bz2/tests/005.phpt4
-rw-r--r--ext/bz2/tests/bug51997.phpt4
-rw-r--r--ext/bz2/tests/bug71263.phpt4
-rw-r--r--ext/bz2/tests/bug72447.phpt4
-rw-r--r--ext/bz2/tests/bug72613.phpt4
-rw-r--r--ext/bz2/tests/bug75776.phpt6
-rw-r--r--ext/bz2/tests/bz2_filter_compress.phpt4
-rw-r--r--ext/bz2/tests/bz2_filter_decompress.phpt4
-rw-r--r--ext/bz2/tests/bzopen_string_filename_with_null_bytes.phpt4
-rw-r--r--ext/bz2/tests/with_files.phpt4
-rw-r--r--ext/bz2/tests/with_strings.phpt4
16 files changed, 32 insertions, 34 deletions
diff --git a/ext/bz2/tests/001.phpt b/ext/bz2/tests/001.phpt
index 9561d5ac0f..6b86bd6b0b 100644
--- a/ext/bz2/tests/001.phpt
+++ b/ext/bz2/tests/001.phpt
@@ -1,7 +1,7 @@
--TEST--
bzopen() and invalid parameters
---SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+--EXTENSIONS--
+bz2
--FILE--
<?php
diff --git a/ext/bz2/tests/002.phpt b/ext/bz2/tests/002.phpt
index 3ff0aedeb5..00254776f7 100644
--- a/ext/bz2/tests/002.phpt
+++ b/ext/bz2/tests/002.phpt
@@ -1,7 +1,7 @@
--TEST--
bzopen() using fd opened in wrong mode
---SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+--EXTENSIONS--
+bz2
--FILE--
<?php
diff --git a/ext/bz2/tests/003-mb.phpt b/ext/bz2/tests/003-mb.phpt
index 75ec54ae4d..3189b473a4 100644
--- a/ext/bz2/tests/003-mb.phpt
+++ b/ext/bz2/tests/003-mb.phpt
@@ -1,7 +1,7 @@
--TEST--
bzread() tests
---SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+--EXTENSIONS--
+bz2
--FILE--
<?php
diff --git a/ext/bz2/tests/003.phpt b/ext/bz2/tests/003.phpt
index 229dd87058..4b6ee820dd 100644
--- a/ext/bz2/tests/003.phpt
+++ b/ext/bz2/tests/003.phpt
@@ -1,7 +1,7 @@
--TEST--
bzread() tests
---SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+--EXTENSIONS--
+bz2
--FILE--
<?php
diff --git a/ext/bz2/tests/004.phpt b/ext/bz2/tests/004.phpt
index 15eb90f89a..e644bfa6ce 100644
--- a/ext/bz2/tests/004.phpt
+++ b/ext/bz2/tests/004.phpt
@@ -1,7 +1,7 @@
--TEST--
bzread() tests with invalid files
---SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+--EXTENSIONS--
+bz2
--FILE--
<?php
diff --git a/ext/bz2/tests/005.phpt b/ext/bz2/tests/005.phpt
index 5fc7ef0b7c..769cace33f 100644
--- a/ext/bz2/tests/005.phpt
+++ b/ext/bz2/tests/005.phpt
@@ -1,7 +1,7 @@
--TEST--
bzcompress()/bzdecompress() tests
---SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+--EXTENSIONS--
+bz2
--FILE--
<?php
diff --git a/ext/bz2/tests/bug51997.phpt b/ext/bz2/tests/bug51997.phpt
index 303e0b3b67..249c72a3f5 100644
--- a/ext/bz2/tests/bug51997.phpt
+++ b/ext/bz2/tests/bug51997.phpt
@@ -1,7 +1,7 @@
--TEST--
Bug #51997 (SEEK_CUR with 0 value, returns a warning)
---SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+--EXTENSIONS--
+bz2
--FILE--
<?php
diff --git a/ext/bz2/tests/bug71263.phpt b/ext/bz2/tests/bug71263.phpt
index b20bbd8ef1..594f1aeee1 100644
--- a/ext/bz2/tests/bug71263.phpt
+++ b/ext/bz2/tests/bug71263.phpt
@@ -1,7 +1,7 @@
--TEST--
Bug #71263: fread() does not report bzip2.decompress errors
---SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip bz2 extension not loaded"; ?>
+--EXTENSIONS--
+bz2
--FILE--
<?php
diff --git a/ext/bz2/tests/bug72447.phpt b/ext/bz2/tests/bug72447.phpt
index 15321042df..7cbd43a443 100644
--- a/ext/bz2/tests/bug72447.phpt
+++ b/ext/bz2/tests/bug72447.phpt
@@ -1,7 +1,7 @@
--TEST--
Bug #72447: Type Confusion in php_bz2_filter_create()
---SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+--EXTENSIONS--
+bz2
--FILE--
<?php
$input = "AAAAAAAA";
diff --git a/ext/bz2/tests/bug72613.phpt b/ext/bz2/tests/bug72613.phpt
index d9463e212a..2dfc8c65d3 100644
--- a/ext/bz2/tests/bug72613.phpt
+++ b/ext/bz2/tests/bug72613.phpt
@@ -1,7 +1,7 @@
--TEST--
Bug #72613 (Inadequate error handling in bzread())
---SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+--EXTENSIONS--
+bz2
--FILE--
<?php
$fp = bzopen(__DIR__.'/72613.bz2', 'r');
diff --git a/ext/bz2/tests/bug75776.phpt b/ext/bz2/tests/bug75776.phpt
index 43cc6e07b5..e3cf299f25 100644
--- a/ext/bz2/tests/bug75776.phpt
+++ b/ext/bz2/tests/bug75776.phpt
@@ -1,9 +1,7 @@
--TEST--
Bug #75776 (Flushing streams with compression filter is broken)
---SKIPIF--
-<?php
-if (!extension_loaded('bz2')) die('skip bz2 extension not available');
-?>
+--EXTENSIONS--
+bz2
--FILE--
<?php
$text = str_repeat('0123456789abcdef', 1000);
diff --git a/ext/bz2/tests/bz2_filter_compress.phpt b/ext/bz2/tests/bz2_filter_compress.phpt
index e735d8876c..974f2599d5 100644
--- a/ext/bz2/tests/bz2_filter_compress.phpt
+++ b/ext/bz2/tests/bz2_filter_compress.phpt
@@ -1,7 +1,7 @@
--TEST--
bzip2.compress (with convert.base64-encode)
---SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+--EXTENSIONS--
+bz2
--FILE--
<?php
$text = 'I am the very model of a modern major general, I\'ve information vegetable, animal, and mineral.';
diff --git a/ext/bz2/tests/bz2_filter_decompress.phpt b/ext/bz2/tests/bz2_filter_decompress.phpt
index ca92f55934..0e1839f42b 100644
--- a/ext/bz2/tests/bz2_filter_decompress.phpt
+++ b/ext/bz2/tests/bz2_filter_decompress.phpt
@@ -1,7 +1,7 @@
--TEST--
bzip2.decompress (with convert.base64-decode)
---SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+--EXTENSIONS--
+bz2
--FILE--
<?php
$text = 'QlpoNDFBWSZTWRN6QG0AAAoVgECFACA395UgIABIintI1N6mpowIQ0E1MTTAQGYTNcRyMZm5kgW3ib7hVboE7Tmqj3ToGZ5G3q1ZauD2G58hibSck8KS95EEAbx1Cn+LuSKcKEgJvSA2gA==';
diff --git a/ext/bz2/tests/bzopen_string_filename_with_null_bytes.phpt b/ext/bz2/tests/bzopen_string_filename_with_null_bytes.phpt
index 1261981c6b..b76515a178 100644
--- a/ext/bz2/tests/bzopen_string_filename_with_null_bytes.phpt
+++ b/ext/bz2/tests/bzopen_string_filename_with_null_bytes.phpt
@@ -1,7 +1,7 @@
--TEST--
bzopen(): throw TypeError if filename contains null bytes
---SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+--EXTENSIONS--
+bz2
--FILE--
<?php
diff --git a/ext/bz2/tests/with_files.phpt b/ext/bz2/tests/with_files.phpt
index e24e28211f..d06666e665 100644
--- a/ext/bz2/tests/with_files.phpt
+++ b/ext/bz2/tests/with_files.phpt
@@ -1,7 +1,7 @@
--TEST--
BZ2 with files
---SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+--EXTENSIONS--
+bz2
--FILE--
<?php
diff --git a/ext/bz2/tests/with_strings.phpt b/ext/bz2/tests/with_strings.phpt
index 6815c1dae4..488a092c94 100644
--- a/ext/bz2/tests/with_strings.phpt
+++ b/ext/bz2/tests/with_strings.phpt
@@ -1,7 +1,7 @@
--TEST--
BZ2 with strings
---SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+--EXTENSIONS--
+bz2
--FILE--
<?php