From: Tyson Andre <tysonandre775@hotmail.com>
Date: Thu, 28 May 2020 16:53:12 +0000 (-0400)
Subject: Clean up calls to extension_loaded('json') in tests
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32a1ebbd43830937996116c73e39af4c4aa909d7;p=php

Clean up calls to extension_loaded('json') in tests

These are no longer needed after https://wiki.php.net/rfc/always_enable_json

Closes GH-5637
---

diff --git a/Zend/tests/type_declarations/union_types/type_checking_strict.phpt b/Zend/tests/type_declarations/union_types/type_checking_strict.phpt
index bfb02196f1..7054a7cc19 100644
--- a/Zend/tests/type_declarations/union_types/type_checking_strict.phpt
+++ b/Zend/tests/type_declarations/union_types/type_checking_strict.phpt
@@ -1,9 +1,5 @@
 --TEST--
 Behavior of union type checks (strict)
---SKIPIF--
-<?php
-if (!extension_loaded('json')) die('skip requires json');
-?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/type_declarations/union_types/type_checking_weak.phpt b/Zend/tests/type_declarations/union_types/type_checking_weak.phpt
index 2b1e7397fb..5675828953 100644
--- a/Zend/tests/type_declarations/union_types/type_checking_weak.phpt
+++ b/Zend/tests/type_declarations/union_types/type_checking_weak.phpt
@@ -1,9 +1,5 @@
 --TEST--
 Behavior of union type checks (weak)
---SKIPIF--
-<?php
-if (!extension_loaded('json')) die('skip requires json');
-?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/001.phpt b/ext/json/tests/001.phpt
index b429aef0dc..b7e6003ac5 100644
--- a/ext/json/tests/001.phpt
+++ b/ext/json/tests/001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 json_decode() tests
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/002.phpt b/ext/json/tests/002.phpt
index e0f4bedde6..0a3b3bc859 100644
--- a/ext/json/tests/002.phpt
+++ b/ext/json/tests/002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 json_encode() tests
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/003.phpt b/ext/json/tests/003.phpt
index e0a5e46978..5defd32f4b 100644
--- a/ext/json/tests/003.phpt
+++ b/ext/json/tests/003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 json_encode() & endless loop - 1
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/004.phpt b/ext/json/tests/004.phpt
index f712ffd38b..7c000c67ad 100644
--- a/ext/json/tests/004.phpt
+++ b/ext/json/tests/004.phpt
@@ -1,7 +1,5 @@
 --TEST--
 json_encode() & endless loop - 2
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/005.phpt b/ext/json/tests/005.phpt
index 48c4b38830..dacf678c21 100644
--- a/ext/json/tests/005.phpt
+++ b/ext/json/tests/005.phpt
@@ -1,7 +1,5 @@
 --TEST--
 json_encode() & endless loop - 3
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/006.phpt b/ext/json/tests/006.phpt
index da2fe009f1..fc42698e9b 100644
--- a/ext/json/tests/006.phpt
+++ b/ext/json/tests/006.phpt
@@ -1,7 +1,5 @@
 --TEST--
 json_encode() & extended encoding
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 $a = array('<foo>', "'bar'", '"baz"', '&blong&');
diff --git a/ext/json/tests/007.phpt b/ext/json/tests/007.phpt
index 008d1dd5de..dea641317e 100644
--- a/ext/json/tests/007.phpt
+++ b/ext/json/tests/007.phpt
@@ -1,7 +1,5 @@
 --TEST--
 json_last_error() tests
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 var_dump(json_decode("[1]"));
diff --git a/ext/json/tests/008.phpt b/ext/json/tests/008.phpt
index 6cfd91b89c..fa2f450ee0 100644
--- a/ext/json/tests/008.phpt
+++ b/ext/json/tests/008.phpt
@@ -1,7 +1,5 @@
 --TEST--
 json_decode() with large integers
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 $json = '{"largenum":123456789012345678901234567890}';
diff --git a/ext/json/tests/009.phpt b/ext/json/tests/009.phpt
index 2432e386f5..ec9d9dd0f0 100644
--- a/ext/json/tests/009.phpt
+++ b/ext/json/tests/009.phpt
@@ -1,7 +1,5 @@
 --TEST--
 json_encode() with non-packed array that should be encoded as an array rather than object
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 $a = array(1, 2, 3, 'foo' => 'bar');
diff --git a/ext/json/tests/bug40503.phpt b/ext/json/tests/bug40503.phpt
index 17c8fbd92a..71295c0435 100644
--- a/ext/json/tests/bug40503.phpt
+++ b/ext/json/tests/bug40503.phpt
@@ -2,8 +2,6 @@
 Bug #40503 (json_encode() value corruption on 32bit systems with overflown values)
 --INI--
 serialize_precision=-1
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 function json_test_show_eq($x, $y) {
diff --git a/ext/json/tests/bug41034.phpt b/ext/json/tests/bug41034.phpt
index 58ae281e6c..905f6d07d8 100644
--- a/ext/json/tests/bug41034.phpt
+++ b/ext/json/tests/bug41034.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #41034 (json_encode() ignores null byte started keys in arrays)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 echo json_encode(array(0, "\0ab"=>1, "\0null-prefixed value"));
diff --git a/ext/json/tests/bug41067.phpt b/ext/json/tests/bug41067.phpt
index b20e6e1b53..1cddafe889 100644
--- a/ext/json/tests/bug41067.phpt
+++ b/ext/json/tests/bug41067.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #41067 (json_encode() problem with UTF-16 input)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 $single_barline = "\360\235\204\200";
diff --git a/ext/json/tests/bug41403.phpt b/ext/json/tests/bug41403.phpt
index 91b4de7ead..23a5124a77 100644
--- a/ext/json/tests/bug41403.phpt
+++ b/ext/json/tests/bug41403.phpt
@@ -2,7 +2,6 @@
 Bug #41403 (json_decode cannot decode floats if localeconv decimal_point is not '.')
 --SKIPIF--
 <?php
-if (!extension_loaded('json')) die('skip');
 if (setlocale(LC_NUMERIC, "de_DE") === false) {
 	die("skip no de_DE locale");
 }
diff --git a/ext/json/tests/bug41504.phpt b/ext/json/tests/bug41504.phpt
index 2724f1690b..28bc56c1c7 100644
--- a/ext/json/tests/bug41504.phpt
+++ b/ext/json/tests/bug41504.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #41504 (json_decode() converts empty array keys to "_empty_")
---SKIPIF--
-<?php if (!extension_loaded('json')) print 'skip'; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug41567.phpt b/ext/json/tests/bug41567.phpt
index 05d8ca438b..491e3b5e3a 100644
--- a/ext/json/tests/bug41567.phpt
+++ b/ext/json/tests/bug41567.phpt
@@ -2,8 +2,6 @@
 Bug #41567 (json_encode() double conversion is inconsistent with PHP)
 --INI--
 serialize_precision=-1
---SKIPIF--
-<?php if (!extension_loaded('json')) print 'skip'; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug42090.phpt b/ext/json/tests/bug42090.phpt
index b0c9efc102..8d10e690d8 100644
--- a/ext/json/tests/bug42090.phpt
+++ b/ext/json/tests/bug42090.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #42090 (json_decode causes segmentation fault)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 var_dump(
diff --git a/ext/json/tests/bug42785.phpt b/ext/json/tests/bug42785.phpt
index fd5cdca069..7c39f4c8e2 100644
--- a/ext/json/tests/bug42785.phpt
+++ b/ext/json/tests/bug42785.phpt
@@ -4,7 +4,6 @@ Bug #42785 (Incorrect formatting of double values with non-english locales)
 serialize_precision=-1
 --SKIPIF--
 <?php
-if (!extension_loaded('json')) die('skip');
 if (!setlocale(LC_CTYPE, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1", "ISO8859-1")) {
 	die("skip locale needed for this test is not supported on this platform");
 }
diff --git a/ext/json/tests/bug43941.phpt b/ext/json/tests/bug43941.phpt
index 97ca58e07d..900f4d4f05 100644
--- a/ext/json/tests/bug43941.phpt
+++ b/ext/json/tests/bug43941.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #43941 (json_encode() invalid UTF-8)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug45791.phpt b/ext/json/tests/bug45791.phpt
index 7d3706825d..5737ade025 100644
--- a/ext/json/tests/bug45791.phpt
+++ b/ext/json/tests/bug45791.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #45791 (json_decode() does not handle number 0e0)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug46215.phpt b/ext/json/tests/bug46215.phpt
index eaf980d49a..da3344fec0 100644
--- a/ext/json/tests/bug46215.phpt
+++ b/ext/json/tests/bug46215.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #46215 (json_encode mutates its parameter and has some class-specific state)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug46944.phpt b/ext/json/tests/bug46944.phpt
index b5b0d97c34..6d5478c352 100644
--- a/ext/json/tests/bug46944.phpt
+++ b/ext/json/tests/bug46944.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #46944 (json_encode() doesn't handle 3 byte utf8 correctly)
---SKIPIF--
-<?php if (!extension_loaded('json')) print 'skip'; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug47644.phpt b/ext/json/tests/bug47644.phpt
index b5f4880cf9..d9d84b7c1c 100644
--- a/ext/json/tests/bug47644.phpt
+++ b/ext/json/tests/bug47644.phpt
@@ -2,7 +2,6 @@
 Bug #47644 (valid large integers are truncated)
 --SKIPIF--
 <?php
-if (!extension_loaded('json')) die('skip');
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
diff --git a/ext/json/tests/bug50224.phpt b/ext/json/tests/bug50224.phpt
index 95a6648c90..c6a8956025 100644
--- a/ext/json/tests/bug50224.phpt
+++ b/ext/json/tests/bug50224.phpt
@@ -2,8 +2,6 @@
 bug #50224 (json_encode() does not always encode a float as a float)
 --INI--
 serialize_precision=-1
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 echo "* Testing JSON output\n\n";
diff --git a/ext/json/tests/bug53946.phpt b/ext/json/tests/bug53946.phpt
index b8d3fcc3e4..a53504ce0d 100644
--- a/ext/json/tests/bug53946.phpt
+++ b/ext/json/tests/bug53946.phpt
@@ -1,7 +1,5 @@
 --TEST--
 bug #53946 (json_encode() with JSON_UNESCAPED_UNICODE)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 var_dump(json_encode("latin 1234 -/    russian мама мыла раму  specialchars \x02   \x08 \n   U+1D11E >𝄞<"));
diff --git a/ext/json/tests/bug54058.phpt b/ext/json/tests/bug54058.phpt
index 3f413b65f6..25c5b6f5ce 100644
--- a/ext/json/tests/bug54058.phpt
+++ b/ext/json/tests/bug54058.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #54058 (json_last_error() invalid UTF-8 produces wrong error)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug54484.phpt b/ext/json/tests/bug54484.phpt
index f70b96ee13..8b9e07da8d 100644
--- a/ext/json/tests/bug54484.phpt
+++ b/ext/json/tests/bug54484.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #54484 (Empty string in json_decode doesn't reset json_last_error)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 json_decode('{"test":"test"}');
diff --git a/ext/json/tests/bug55543.phpt b/ext/json/tests/bug55543.phpt
index 8657fe7767..536723775e 100644
--- a/ext/json/tests/bug55543.phpt
+++ b/ext/json/tests/bug55543.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #55543 (json_encode() with JSON_NUMERIC_CHECK & numeric string properties)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 $a = new stdClass;
diff --git a/ext/json/tests/bug61537.phpt b/ext/json/tests/bug61537.phpt
index 03a61d8645..32cae8c93d 100644
--- a/ext/json/tests/bug61537.phpt
+++ b/ext/json/tests/bug61537.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #61537 (json_encode() incorrectly truncates/discards information)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 $invalid_utf8 = "\x9f";
diff --git a/ext/json/tests/bug61978.phpt b/ext/json/tests/bug61978.phpt
index a26341e4cc..8853bdbbd2 100644
--- a/ext/json/tests/bug61978.phpt
+++ b/ext/json/tests/bug61978.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #61978 (Object recursion not detected for classes that implement JsonSerializable)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug62010.phpt b/ext/json/tests/bug62010.phpt
index 6b5c72589b..2591231dcd 100644
--- a/ext/json/tests/bug62010.phpt
+++ b/ext/json/tests/bug62010.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #62010 (json_decode produces invalid byte-sequences)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug62369.phpt b/ext/json/tests/bug62369.phpt
index 9c0be481e4..19dc299eb2 100644
--- a/ext/json/tests/bug62369.phpt
+++ b/ext/json/tests/bug62369.phpt
@@ -1,7 +1,5 @@
 --TEST--
 FR #62369 (Segfault on json_encode(deeply_nested_array)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug63737.phpt b/ext/json/tests/bug63737.phpt
index c7a60a28c4..e2709800e3 100644
--- a/ext/json/tests/bug63737.phpt
+++ b/ext/json/tests/bug63737.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #63737 (json_decode does not properly decode with options parameter)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 function decode($json) {
diff --git a/ext/json/tests/bug64695.phpt b/ext/json/tests/bug64695.phpt
index 899259f4b4..1cdad9e2c7 100644
--- a/ext/json/tests/bug64695.phpt
+++ b/ext/json/tests/bug64695.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #64695 JSON_NUMERIC_CHECK has issues with strings that are numbers plus the letter e
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 $t = array('test' => '123343e871700');
diff --git a/ext/json/tests/bug64874_part1.phpt b/ext/json/tests/bug64874_part1.phpt
index 6b79b8dc04..17ca0eef26 100644
--- a/ext/json/tests/bug64874_part1.phpt
+++ b/ext/json/tests/bug64874_part1.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 function decode($json) {
diff --git a/ext/json/tests/bug64874_part2.phpt b/ext/json/tests/bug64874_part2.phpt
index 338fc1141a..ec885c2e4f 100644
--- a/ext/json/tests/bug64874_part2.phpt
+++ b/ext/json/tests/bug64874_part2.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Case-sensitivity part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 function decode($json) {
diff --git a/ext/json/tests/bug66021.phpt b/ext/json/tests/bug66021.phpt
index 19d28eb66b..5f43948b6a 100644
--- a/ext/json/tests/bug66021.phpt
+++ b/ext/json/tests/bug66021.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #66021 (Blank line inside empty array/object when JSON_PRETTY_PRINT is set)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug66025.phpt b/ext/json/tests/bug66025.phpt
index 13bd6ea90b..8f12fa40ca 100644
--- a/ext/json/tests/bug66025.phpt
+++ b/ext/json/tests/bug66025.phpt
@@ -1,9 +1,5 @@
 --TEST--
 Bug #66025 (Indent wrong when json_encode() called from jsonSerialize function)
---SKIPIF--
-<?php
-if (!extension_loaded('json')) die('skip');
-?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug68546.phpt b/ext/json/tests/bug68546.phpt
index 4994ecf4b0..8835a72c5e 100644
--- a/ext/json/tests/bug68546.phpt
+++ b/ext/json/tests/bug68546.phpt
@@ -1,10 +1,5 @@
 --TEST--
 Bug #68546 (json_decode() Fatal error: Cannot access property started with '\0')
---SKIPIF--
-<?php
-
-if (!extension_loaded('json')) die('skip');
-?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug68567.phpt b/ext/json/tests/bug68567.phpt
index 4dbd83e170..888f08e72d 100644
--- a/ext/json/tests/bug68567.phpt
+++ b/ext/json/tests/bug68567.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #68567 JSON_PARTIAL_OUTPUT_ON_ERROR can result in JSON with null key
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug68817.phpt b/ext/json/tests/bug68817.phpt
index 33d0c84b29..b950818823 100644
--- a/ext/json/tests/bug68817.phpt
+++ b/ext/json/tests/bug68817.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #68817 (Null pointer deference)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug68938.phpt b/ext/json/tests/bug68938.phpt
index f6291ffe62..d2e8cb6315 100644
--- a/ext/json/tests/bug68938.phpt
+++ b/ext/json/tests/bug68938.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #68938 (json_decode() decodes empty string without indicating error)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 json_decode("");
diff --git a/ext/json/tests/bug68992.phpt b/ext/json/tests/bug68992.phpt
index 8e209e0709..f618f66ee4 100644
--- a/ext/json/tests/bug68992.phpt
+++ b/ext/json/tests/bug68992.phpt
@@ -1,9 +1,5 @@
 --TEST--
 Bug #68992 (json_encode stacks exceptions thrown by JsonSerializable classes)
---SKIPIF--
-<?php
-if (!extension_loaded('json')) die('skip');
-?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug69187.phpt b/ext/json/tests/bug69187.phpt
index 00fdbd46fd..b7d7deafc6 100644
--- a/ext/json/tests/bug69187.phpt
+++ b/ext/json/tests/bug69187.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #69187 json_last_error return BC in PHP7
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 var_dump(json_decode(NULL));
diff --git a/ext/json/tests/bug71835.phpt b/ext/json/tests/bug71835.phpt
index 334c84c595..a1c885046e 100644
--- a/ext/json/tests/bug71835.phpt
+++ b/ext/json/tests/bug71835.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 class SomeClass implements JsonSerializable {
diff --git a/ext/json/tests/bug72069.phpt b/ext/json/tests/bug72069.phpt
index d7c7729013..500df25af7 100644
--- a/ext/json/tests/bug72069.phpt
+++ b/ext/json/tests/bug72069.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #72069 (Behavior \JsonSerializable different from json_encode)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug72787.phpt b/ext/json/tests/bug72787.phpt
index 48983b0fb7..c08bd18ec9 100644
--- a/ext/json/tests/bug72787.phpt
+++ b/ext/json/tests/bug72787.phpt
@@ -1,7 +1,6 @@
 --TEST--
 Bug #72787 (json_decode reads out of bounds)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?>
 --FILE--
 <?php
diff --git a/ext/json/tests/bug73113.phpt b/ext/json/tests/bug73113.phpt
index 1bb1706331..aec95e6959 100644
--- a/ext/json/tests/bug73113.phpt
+++ b/ext/json/tests/bug73113.phpt
@@ -1,8 +1,6 @@
 --TEST--
 Bug #73113 (Segfault with throwing JsonSerializable)
 Also test that the custom exception is not wrapped by ext/json
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug73254.phpt b/ext/json/tests/bug73254.phpt
index b043330cb7..9a696cc58f 100644
--- a/ext/json/tests/bug73254.phpt
+++ b/ext/json/tests/bug73254.phpt
@@ -1,9 +1,5 @@
 --TEST--
 Bug #73254 (Incorrect indentation generated by json_encode() with JSON_PRETTY_PRINT)
---SKIPIF--
-<?php
-if (!extension_loaded('json')) die('skip');
-?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug73991.phpt b/ext/json/tests/bug73991.phpt
index fc0be19a92..d3f249d086 100644
--- a/ext/json/tests/bug73991.phpt
+++ b/ext/json/tests/bug73991.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Allow JSON_OBJECT_AS_ARRAY to have an effect
---SKIPIF--
-<?php if(!extension_loaded('json')) die('skip json extension not loaded') ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug77843.phpt b/ext/json/tests/bug77843.phpt
index dbcb024c26..c525285bf5 100644
--- a/ext/json/tests/bug77843.phpt
+++ b/ext/json/tests/bug77843.phpt
@@ -1,7 +1,5 @@
 --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/json/tests/fail001.phpt b/ext/json/tests/fail001.phpt
index b03b77f44d..8834bdbe63 100644
--- a/ext/json/tests/fail001.phpt
+++ b/ext/json/tests/fail001.phpt
@@ -1,9 +1,5 @@
 --TEST--
 JSON (http://www.crockford.com/JSON/JSON_checker/test/fail*.json)
---SKIPIF--
-<?php
-  if (!extension_loaded('json')) die('skip');
-?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/inf_nan_error.phpt b/ext/json/tests/inf_nan_error.phpt
index bb60a104ad..e4c356cdad 100644
--- a/ext/json/tests/inf_nan_error.phpt
+++ b/ext/json/tests/inf_nan_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
 An error is thrown when INF or NaN are encoded
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/json_decode_basic.phpt b/ext/json/tests/json_decode_basic.phpt
index 81501c1857..4e25391a9c 100644
--- a/ext/json/tests/json_decode_basic.phpt
+++ b/ext/json/tests/json_decode_basic.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test json_decode() function : basic functionality
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 echo "*** Testing json_decode() : basic functionality ***\n";
diff --git a/ext/json/tests/json_decode_error.phpt b/ext/json/tests/json_decode_error.phpt
index 36d86168cd..93306a58b3 100644
--- a/ext/json/tests/json_decode_error.phpt
+++ b/ext/json/tests/json_decode_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test json_decode() function : error conditions
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 echo "*** Testing json_decode() : error conditions ***\n";
diff --git a/ext/json/tests/json_decode_exceptions.phpt b/ext/json/tests/json_decode_exceptions.phpt
index ba1b57f5be..7dc2e7408a 100644
--- a/ext/json/tests/json_decode_exceptions.phpt
+++ b/ext/json/tests/json_decode_exceptions.phpt
@@ -1,7 +1,5 @@
 --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_decode_invalid_utf8.phpt b/ext/json/tests/json_decode_invalid_utf8.phpt
index b69400f360..749951c7ca 100644
--- a/ext/json/tests/json_decode_invalid_utf8.phpt
+++ b/ext/json/tests/json_decode_invalid_utf8.phpt
@@ -1,9 +1,5 @@
 --TEST--
 json_decode() invalid UTF8
---SKIPIF--
-<?php
-if (!extension_loaded("json")) print "skip";
-?>
 --FILE--
 <?php
 function json_decode_invalid_utf8($str) {
diff --git a/ext/json/tests/json_encode_basic.phpt b/ext/json/tests/json_encode_basic.phpt
index d351765c0a..b8c2e328d9 100644
--- a/ext/json/tests/json_encode_basic.phpt
+++ b/ext/json/tests/json_encode_basic.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test json_encode() function : basic functionality
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 echo "*** Testing json_encode() : basic functionality ***\n";
diff --git a/ext/json/tests/json_encode_basic_utf8.phpt b/ext/json/tests/json_encode_basic_utf8.phpt
index 76fd268b73..26c958f035 100644
--- a/ext/json/tests/json_encode_basic_utf8.phpt
+++ b/ext/json/tests/json_encode_basic_utf8.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test json_encode() function : basic functionality with UTF8 string input
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 echo "*** Testing json_encode() : basic functionality with UTF-8 input***\n";
diff --git a/ext/json/tests/json_encode_exceptions.phpt b/ext/json/tests/json_encode_exceptions.phpt
index a3d1f7ae25..2ca7ad4452 100644
--- a/ext/json/tests/json_encode_exceptions.phpt
+++ b/ext/json/tests/json_encode_exceptions.phpt
@@ -1,7 +1,5 @@
 --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_encode_invalid_utf8.phpt b/ext/json/tests/json_encode_invalid_utf8.phpt
index 7b032b81e6..1d9e37d9fd 100644
--- a/ext/json/tests/json_encode_invalid_utf8.phpt
+++ b/ext/json/tests/json_encode_invalid_utf8.phpt
@@ -1,9 +1,5 @@
 --TEST--
 json_encode() invalid UTF8
---SKIPIF--
-<?php
-if (!extension_loaded("json")) print "skip";
-?>
 --FILE--
 <?php
 function json_encode_invalid_utf8($str) {
diff --git a/ext/json/tests/json_encode_numeric.phpt b/ext/json/tests/json_encode_numeric.phpt
index c3c7edd444..beb069f1a5 100644
--- a/ext/json/tests/json_encode_numeric.phpt
+++ b/ext/json/tests/json_encode_numeric.phpt
@@ -2,8 +2,6 @@
 Test json_encode() function with numeric flag
 --INI--
 serialize_precision=-1
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 var_dump(
diff --git a/ext/json/tests/json_encode_pretty_print.phpt b/ext/json/tests/json_encode_pretty_print.phpt
index 0ac4a6d3fb..134b3e494a 100644
--- a/ext/json/tests/json_encode_pretty_print.phpt
+++ b/ext/json/tests/json_encode_pretty_print.phpt
@@ -1,7 +1,5 @@
 --TEST--
 json_encode() with JSON_PRETTY_PRINT
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 function encode_decode($json) {
diff --git a/ext/json/tests/json_encode_u2028_u2029.phpt b/ext/json/tests/json_encode_u2028_u2029.phpt
index 4b87e9b307..31e40fc465 100644
--- a/ext/json/tests/json_encode_u2028_u2029.phpt
+++ b/ext/json/tests/json_encode_u2028_u2029.phpt
@@ -1,7 +1,5 @@
 --TEST--
 json_encode() tests for U+2028, U+2029
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 var_dump(json_encode(array("a\xC3\xA1b")));
diff --git a/ext/json/tests/json_encode_unescaped_slashes.phpt b/ext/json/tests/json_encode_unescaped_slashes.phpt
index 72ebae927a..87baf8dfd6 100644
--- a/ext/json/tests/json_encode_unescaped_slashes.phpt
+++ b/ext/json/tests/json_encode_unescaped_slashes.phpt
@@ -1,7 +1,5 @@
 --TEST--
 json_decode() tests
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 var_dump(json_encode('a/b'));
diff --git a/ext/json/tests/json_exceptions_error_clearing.phpt b/ext/json/tests/json_exceptions_error_clearing.phpt
index 70dfca2171..317643b5ac 100644
--- a/ext/json/tests/json_exceptions_error_clearing.phpt
+++ b/ext/json/tests/json_exceptions_error_clearing.phpt
@@ -1,7 +1,5 @@
 --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/json/tests/json_last_error_error.phpt b/ext/json/tests/json_last_error_error.phpt
index cd88ef8a9e..d5c9b12232 100644
--- a/ext/json/tests/json_last_error_error.phpt
+++ b/ext/json/tests/json_last_error_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
 json_last_error() failures
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/json_last_error_msg_error.phpt b/ext/json/tests/json_last_error_msg_error.phpt
index 0eb55c4c66..61e5e1fcc5 100644
--- a/ext/json/tests/json_last_error_msg_error.phpt
+++ b/ext/json/tests/json_last_error_msg_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
 json_last_error_msg() failures
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/pass001.1.phpt b/ext/json/tests/pass001.1.phpt
index 7ac87cbdd8..eabdc24c18 100644
--- a/ext/json/tests/pass001.1.phpt
+++ b/ext/json/tests/pass001.1.phpt
@@ -2,10 +2,6 @@
 JSON (http://www.crockford.com/JSON/JSON_checker/test/pass1.json)
 --INI--
 serialize_precision=-1
---SKIPIF--
-<?php
-if (!extension_loaded('json')) die('skip json extension not loaded');
-?>
 --FILE--
 <?php
 /* Modified to test unescaped UNICODE as keys and values.
@@ -78,7 +74,7 @@ $test = "
 ,\"rosebud\"]
 ";
 
-echo 'Testing: ' . $test . "\n";
+echo 'Testing:' . $test . "\n";
 echo "DECODE: AS OBJECT\n";
 $obj = json_decode($test);
 var_dump($obj);
@@ -102,7 +98,7 @@ var_dump($arr);
 
 ?>
 --EXPECTF--
-Testing: 
+Testing:
 [
     "JSON Test Pattern pass1",
     {"object with 1 member":["array with 1 element"]},
diff --git a/ext/json/tests/pass001.1_64bit.phpt b/ext/json/tests/pass001.1_64bit.phpt
index c71adc20a1..6e0e2e5307 100644
--- a/ext/json/tests/pass001.1_64bit.phpt
+++ b/ext/json/tests/pass001.1_64bit.phpt
@@ -4,7 +4,6 @@ JSON (http://www.crockford.com/JSON/JSON_checker/test/pass1.json)
 serialize_precision=-1
 --SKIPIF--
 <?php
-if (!extension_loaded('json')) die('skip');
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
@@ -79,7 +78,7 @@ $test = "
 ,\"rosebud\"]
 ";
 
-echo 'Testing: ' . $test . "\n";
+echo 'Testing:' . $test . "\n";
 echo "DECODE: AS OBJECT\n";
 $obj = json_decode($test);
 var_dump($obj);
@@ -103,7 +102,7 @@ var_dump($arr);
 
 ?>
 --EXPECTF--
-Testing: 
+Testing:
 [
     "JSON Test Pattern pass1",
     {"object with 1 member":["array with 1 element"]},
diff --git a/ext/json/tests/pass001.phpt b/ext/json/tests/pass001.phpt
index 170437f307..7fab84cc2d 100644
--- a/ext/json/tests/pass001.phpt
+++ b/ext/json/tests/pass001.phpt
@@ -2,10 +2,6 @@
 JSON (http://www.crockford.com/JSON/JSON_checker/test/pass1.json)
 --INI--
 serialize_precision=-1
---SKIPIF--
-<?php
-if (!extension_loaded('json')) die('skip');
-?>
 --FILE--
 <?php
 
@@ -68,7 +64,7 @@ $test = "
 ,\"rosebud\"]
 ";
 
-echo 'Testing: ' . $test . "\n";
+echo 'Testing:' . $test . "\n";
 echo "DECODE: AS OBJECT\n";
 $obj = json_decode($test);
 var_dump($obj);
@@ -92,7 +88,7 @@ var_dump($arr);
 
 ?>
 --EXPECT--
-Testing: 
+Testing:
 [
     "JSON Test Pattern pass1",
     {"object with 1 member":["array with 1 element"]},
diff --git a/ext/json/tests/pass002.phpt b/ext/json/tests/pass002.phpt
index 1d375ad3cf..9d2edc4a93 100644
--- a/ext/json/tests/pass002.phpt
+++ b/ext/json/tests/pass002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 JSON (http://www.crockford.com/JSON/JSON_checker/test/pass2.json)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/pass003.phpt b/ext/json/tests/pass003.phpt
index 6afbf2d927..a45f92b6ac 100644
--- a/ext/json/tests/pass003.phpt
+++ b/ext/json/tests/pass003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 JSON (http://www.crockford.com/JSON/JSON_checker/test/pass3.json)
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
@@ -14,7 +12,7 @@ $test = '
 }
 ';
 
-echo 'Testing: ' . $test . "\n";
+echo 'Testing:' . $test . "\n";
 echo "DECODE: AS OBJECT\n";
 $obj = json_decode($test);
 var_dump($obj);
@@ -38,7 +36,7 @@ var_dump($arr);
 
 ?>
 --EXPECTF--
-Testing: 
+Testing:
 {
     "JSON Test Pattern pass3": {
         "The outermost value": "must be an object or array.",
diff --git a/ext/json/tests/serialize.phpt b/ext/json/tests/serialize.phpt
index ab2f9c926d..61396b332c 100644
--- a/ext/json/tests/serialize.phpt
+++ b/ext/json/tests/serialize.phpt
@@ -2,8 +2,6 @@
 json_encode() Serialization tests
 --INI--
 serialize_precision=-1
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/unsupported_type_error.phpt b/ext/json/tests/unsupported_type_error.phpt
index dd5a7963aa..449d423fd9 100644
--- a/ext/json/tests/unsupported_type_error.phpt
+++ b/ext/json/tests/unsupported_type_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
 An error is thrown when an unsupported type is encoded
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/jmp_elim_001.phpt b/ext/opcache/tests/jmp_elim_001.phpt
index 64a9af266f..69974a1fa0 100644
--- a/ext/opcache/tests/jmp_elim_001.phpt
+++ b/ext/opcache/tests/jmp_elim_001.phpt
@@ -2,7 +2,6 @@
 Edge-cases in constant conditional jump elimination
 --SKIPIF--
 <?php if (PHP_INT_SIZE != 8) die("skip for machines with 64-bit longs"); ?>
-<?php if (!extension_loaded("json")) print "skip"; ?>
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/pcre/tests/bug79241.phpt b/ext/pcre/tests/bug79241.phpt
index de89e19760..f6dbb8bea4 100644
--- a/ext/pcre/tests/bug79241.phpt
+++ b/ext/pcre/tests/bug79241.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #79241: Segmentation fault on preg_match()
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip json extension missing"; ?>
 --FILE--
 <?php
 
diff --git a/ext/pdo_pgsql/tests/bug66584.phpt b/ext/pdo_pgsql/tests/bug66584.phpt
index 4fc43d8817..6f6421450e 100644
--- a/ext/pdo_pgsql/tests/bug66584.phpt
+++ b/ext/pdo_pgsql/tests/bug66584.phpt
@@ -3,7 +3,6 @@ PDO PgSQL Bug #66584 (Segmentation fault on statement deallocation)
 --SKIPIF--
 <?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
-if (!extension_loaded('json')) die('skip json ext not loaded');
 require __DIR__ . '/config.inc';
 require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
 PDOTest::skip();
diff --git a/ext/pdo_pgsql/tests/bug71885_2.phpt b/ext/pdo_pgsql/tests/bug71885_2.phpt
index 452902ed38..2f9b9923b0 100644
--- a/ext/pdo_pgsql/tests/bug71885_2.phpt
+++ b/ext/pdo_pgsql/tests/bug71885_2.phpt
@@ -3,7 +3,6 @@ Request #71855 (PDO placeholder escaping, part 2)
 --SKIPIF--
 <?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
-if (!extension_loaded('json')) die('skip json extension not available');
 require_once dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
 require_once dirname(__FILE__) . '/config.inc';
 PDOTest::skip();
diff --git a/ext/simplexml/tests/bug66084_1.phpt b/ext/simplexml/tests/bug66084_1.phpt
index 85ab10ee59..794c9c7e9a 100644
--- a/ext/simplexml/tests/bug66084_1.phpt
+++ b/ext/simplexml/tests/bug66084_1.phpt
@@ -2,7 +2,6 @@
 Bug #66084 simplexml_load_string() mangles empty node name, json variant
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip simplexml not available"; ?>
-<?php if (!extension_loaded("json")) print "skip json not available"; ?>
 --FILE--
 <?php
 echo json_encode(simplexml_load_string('<a><b/><c><x/></c></a>')->c), "\n";
diff --git a/ext/standard/tests/general_functions/is_callable_variation1.phpt b/ext/standard/tests/general_functions/is_callable_variation1.phpt
index 4bb7f28a16..52da80951b 100644
--- a/ext/standard/tests/general_functions/is_callable_variation1.phpt
+++ b/ext/standard/tests/general_functions/is_callable_variation1.phpt
@@ -1,9 +1,5 @@
 --TEST--
 Test is_callable() function : usage variations - undefined functions
---SKIPIF--
-<?php
-if (!extension_loaded('json')) die("skip requires ext/json");
-?>
 --FILE--
 <?php
 /* Prototype: bool is_callable ( mixed $var [, bool $syntax_only [, string &$callable_name]] );
diff --git a/ext/standard/tests/strings/locale_independent_float_to_string.phpt b/ext/standard/tests/strings/locale_independent_float_to_string.phpt
index 634d2ce0e6..fc496c7e56 100644
--- a/ext/standard/tests/strings/locale_independent_float_to_string.phpt
+++ b/ext/standard/tests/strings/locale_independent_float_to_string.phpt
@@ -11,10 +11,6 @@ if (!setlocale
     die("skip - locale needed for this test is not supported on this platform");
 }
 
-if (!extension_loaded("json")) {
-    print "skip - test requires the json extension";
-}
-
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/strings/sprintf_variation54.phpt b/ext/standard/tests/strings/sprintf_variation54.phpt
index ff00c0440a..82efde8d7f 100644
Binary files a/ext/standard/tests/strings/sprintf_variation54.phpt and b/ext/standard/tests/strings/sprintf_variation54.phpt differ
diff --git a/ext/standard/tests/url/base64_decode_basic_003.phpt b/ext/standard/tests/url/base64_decode_basic_003.phpt
index 13c0f449d8..0871404453 100644
--- a/ext/standard/tests/url/base64_decode_basic_003.phpt
+++ b/ext/standard/tests/url/base64_decode_basic_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test base64_decode() function : basic functionality - padding and whitespace
---SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
 /* Prototype  : proto string base64_decode(string str[, bool strict])