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 bfb02196f1f9b9755c330fb4d3d4c1d5382a30d2..7054a7cc19127211b278375b7c5ca3fe91d42b12 100644 (file)
--- 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 2b1e7397fbfa6ea5a2dcb3b8773e35880a6807de..56758289534236deed3819aa8ac41661cd5122a0 100644 (file)
--- 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 b429aef0dcf55b86a7a49589d2194524a2b56775..b7e6003ac5eb561785e5780c8fc558073ecc491b 100644 (file)
--- 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 e0f4bedde6bbb08c1bd9954fb1af9543e4141161..0a3b3bc8593b74ea004f330e9fe34178c3a981c3 100644 (file)
--- 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 e0a5e469787c461b52c11c5fae6d618504bb5814..5defd32f4bdab7e25e10bc3a427dccad205b9f5b 100644 (file)
--- 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 f712ffd38ba3743eb74eda2c66d236fc1aa3b4d8..7c000c67ad682170305e1f8faa9836b3c1d49073 100644 (file)
--- 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 48c4b38830363182c149c4eca6001b3d16ff7929..dacf678c21598424f2e049a5b097c93d4b3b999d 100644 (file)
--- 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 da2fe009f1f1a96325d4ab09322372f65647ef60..fc42698e9b27902393c0aae547b55d249679b310 100644 (file)
--- 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 008d1dd5de454e885aa9610c0c5b53dc70ace063..dea641317e97f0b12850b44bfd8d0a14cefbf01c 100644 (file)
--- 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 6cfd91b89ce3ca2586ceacafb31739a9d5dce37f..fa2f450ee0b75794f2319d1cf867dcb7d1456a47 100644 (file)
--- 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 2432e386f58639e9771ba328a70d8c4ecd8fd1d9..ec9d9dd0f0eedb7fb02ffc6613e03ba2af183746 100644 (file)
--- 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 17c8fbd92a65146939be22eb228bdfd096d047cc..71295c04352c20fb0034e2a298052cd78b4bb648 100644 (file)
--- 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 58ae281e6c40e7a0f6c635015d59f3bf5978f74d..905f6d07d88a7bdad903da10fcaf53aec3a74f3a 100644 (file)
--- 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 b20e6e1b53a4190b5730569b37f4b16a48b5dd61..1cddafe88921c5a570273f4b7e6ddf2d7bc794a3 100644 (file)
--- 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 91b4de7ead4e8f1b012599b2a120e195c1e04dc9..23a5124a7739c175479996f5c283b4643a7d8160 100644 (file)
--- 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 2724f1690be381a516e5627b51a55eea8b9e44e7..28bc56c1c702b53278d8956d2b16c9b091dba5ef 100644 (file)
--- 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 05d8ca438b0a4a0fb727caab1358a8bb4b28781e..491e3b5e3a6b6804497869fc47692c6e67ed6f0c 100644 (file)
--- 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 b0c9efc102ced4c61c2000ee8f4e5da13ec3a735..8d10e690d8d28863af44aad78ea16762b9e5a09e 100644 (file)
--- 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 fd5cdca0690e4a510eb7937d6a78b59a383470c3..7c39f4c8e2992e70fda6d5d3f0f058f2ad02a700 100644 (file)
--- 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 97ca58e07d9d46327e72b3bc95559c072590b9f5..900f4d4f05ae6672a6c6d52509a455f056b3ec60 100644 (file)
--- 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 7d3706825dec3548f682c58fb1ef9bc27903da30..5737ade02584d52396a93cd0d7bfe05ccfff1582 100644 (file)
--- 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 eaf980d49aa3bc998293b3a12df968b9528ce10f..da3344fec04ec769718e30c5f0b8e30683342f24 100644 (file)
--- 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 b5b0d97c344505b28144a3dfa77fd12fc98b8bbe..6d5478c3528b887ebeee9618a9ae85cd485a08f1 100644 (file)
--- 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 b5f4880cf92337a804f1d247eb4dfe6b23228c07..d9d84b7c1c11dbdfda7ad5f0bddd9ffb98502ef0 100644 (file)
--- 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 95a6648c9076606fd31603b20ce0cb0822dec3f3..c6a8956025d26aeda31aabba93f0795d547c4d03 100644 (file)
--- 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 b8d3fcc3e426f7bff8c420f778c6796e849224ce..a53504ce0dc807244bdf1d361efe3123be70e2b8 100644 (file)
--- 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 3f413b65f6b7d8918ff64ab2af81cde001915701..25c5b6f5ceba77ff48f6061fffa3de30ad80ccc2 100644 (file)
--- 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 f70b96ee13554a7e222f40760528b5b4933078f3..8b9e07da8db146e276f359cf99f9315546e85138 100644 (file)
--- 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 8657fe77678b21ad4a9748a4ca80a4649c498ad5..536723775ece5a4584a836e88a62e83bf3410887 100644 (file)
--- 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 03a61d8645d4add921dd9f049fa537fa00ba400e..32cae8c93dc269c418eca6848b793eb393dc3251 100644 (file)
--- 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 a26341e4cccdea4b44aa46d75d1dd80ae801fac4..8853bdbbd280f86109bdf0e1ca2e408ca83ad07d 100644 (file)
--- 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 6b5c72589b61ac4de51f217ce11611c3aaccc992..2591231dcdda1a15ec05542a44c1a4d5b1be49d9 100644 (file)
--- 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 9c0be481e432794df5ff043d1e29e17c0377a1e0..19dc299eb2a230b191c590d433a50af5a45524ba 100644 (file)
--- 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 c7a60a28c4379d60d7e5a194f344847347728896..e2709800e31a24554dcee21ea27151449fd3ff1d 100644 (file)
--- 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 899259f4b48312106c9fde9981b17cdd242d7b86..1cdad9e2c77851f56ff7ca3f19f6d493720c7d68 100644 (file)
--- 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 6b79b8dc047edbcc8e54a56f6ffdacec3df390fb..17ca0eef26e68503f0dc73ce0fd568637d41b37d 100644 (file)
--- 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 338fc1141abbe48adb2724f5100e258d478f9156..ec885c2e4fca1c7dc6e05cbb39be4318ff9f2972 100644 (file)
--- 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 19d28eb66bc6e6336cc50a2847ce5e14af1f8437..5f43948b6a18a9caad32855e82c749075febf46f 100644 (file)
--- 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 13bd6ea90b1025fbcd96954c40b8c98690225306..8f12fa40ca0fa8c4619cedb2e7db5f17c483172b 100644 (file)
--- 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 4994ecf4b0d642085e53344b2fe88c96a1b667d4..8835a72c5eac74ecbe6dfd67d5d5214e2bd3984d 100644 (file)
--- 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 4dbd83e170270b1031761bf5216cecb3438ed0e7..888f08e72d897bcfadacfde40dc4904cb422d3d6 100644 (file)
--- 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 33d0c84b295d56a83366d8ae0a27d429740df6a0..b95081882361499abae6dcc399a822d0ec1640a0 100644 (file)
--- 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 f6291ffe62109faac718d7f4b9e3eaebeea5d75e..d2e8cb6315aa2adbf40aed468c948d79d02e9a8a 100644 (file)
--- 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 8e209e0709329f4275b2439ea2522cfb69aa50cb..f618f66ee43f6d9da1292fec6f43fc1afbf479ef 100644 (file)
--- 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 00fdbd46fd53bdb68e9ce98cedb9ae0c02186763..b7d7deafc689b8dd9fbb47b8cfe5a7d5f6bf6fdb 100644 (file)
--- 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 334c84c5952b3573c2694def31501c55217fb1db..a1c885046e3e2b6c48ba51d3500335d4c87548f1 100644 (file)
--- 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 d7c772901326f1e95d48cd09b3b880fb30bf1a99..500df25af79bd3955fa5e1acd26880dce2aae068 100644 (file)
--- 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 48983b0fb7055c1609a6758cca60d0dcba73fc35..c08bd18ec9b1fa18bb9d417f352cc06fe5010584 100644 (file)
--- 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 1bb17063315561cf0d05e8b153ce9612aa628037..aec95e6959ec78515ec7fab511cc904afaf69eb7 100644 (file)
--- 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 b043330cb74f36a1c57f189f2ba8d23e1f438cb5..9a696cc58fd5fc00e2756815c7fce05745d206e7 100644 (file)
--- 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 fc0be19a92969c108edeeb21658589dc573a3f21..d3f249d08608695bba64d5ee79321e99cd6d9587 100644 (file)
--- 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 dbcb024c2681f547b9c0f142707ef722b89bfd34..c525285bf5abd89d177b3aa3146af0ee6c4b9930 100644 (file)
--- 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 b03b77f44db6e5fd02017555fccc112c38d62942..8834bdbe63aa8783f117eb1696f80b2e18d2814f 100644 (file)
--- 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 bb60a104adcf7ca66e712963b6604833a763d8a3..e4c356cdadbd8c7295a875912ce7abf279a3671d 100644 (file)
--- 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 81501c1857ef0c4f2234fc9a9bca844ce33ffa89..4e25391a9c8594ef15f245e258486fbadd77bf8b 100644 (file)
--- 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 36d86168cd2dabf853ac6f3d715a0828fb82cb97..93306a58b39d64c215f1eb9b52cdec3dbb1d081b 100644 (file)
--- 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 ba1b57f5bec232eea69b9c49a9eee873f488f082..7dc2e7408a02cd0c13b9fc6912f65e7900afca0e 100644 (file)
--- 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 b69400f360ff9fb3cb05b0238cceba61dd430c56..749951c7ca930a5cf90d73907177b091189e43b8 100644 (file)
--- 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 d351765c0acd1ffdede19441823577852e1b81fd..b8c2e328d9b77b9418ab1b79884f5d8237c932eb 100644 (file)
--- 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 76fd268b734f3b57ccb34d4a7c483a25bcb468c3..26c958f035433b68082dba76234029abad4a0ca5 100644 (file)
--- 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 a3d1f7ae250c05ed59147dca5e8cbcc0b1f7a54e..2ca7ad4452d72b81f91c629f7701b8795c02bb65 100644 (file)
--- 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 7b032b81e6c07512209c4ccc962bfd139ddf97d3..1d9e37d9fd12ed7e8f4361f09e0cdb44182ba4b2 100644 (file)
--- 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 c3c7edd444459eb2b1beaf189da010bc47b4acce..beb069f1a549a8c7817a7a8782c8fb08b1c1f052 100644 (file)
--- 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 0ac4a6d3fba35ff2faf19edbb9c4d0202a03667e..134b3e494a03b0a7cb72aa9c20e005ebbf65cb97 100644 (file)
--- 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 4b87e9b307c92763ee3d6d3563ef0217135c1bd4..31e40fc46563725b364badd71109138a2d30815e 100644 (file)
--- 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 72ebae927adfccae56aee80112d76d9a61e65f3d..87baf8dfd67ad7421eaad7bdc8d074ca73c62303 100644 (file)
--- 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 70dfca2171651c675773db8c90fc679c32c3dac9..317643b5ac3585b60d5994cde331cbce08afa26b 100644 (file)
--- 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 cd88ef8a9e28c7df7787f6b266fe53064cd3294e..d5c9b12232003efb5bcc320d361eaf45543c088e 100644 (file)
--- 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 0eb55c4c660f18028776b0483057c492f80091f4..61e5e1fcc5960fdc9165498029981b997c1575f6 100644 (file)
--- 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 7ac87cbdd88ea757058c196701f1fb2cf0e28047..eabdc24c18db1d0d6e4ffa21512a245a88363847 100644 (file)
--- 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 c71adc20a1f959cc47b3e4f39939a9eebbff28a4..6e0e2e5307a24e51c3accfaae942c41b016c06c3 100644 (file)
--- 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 170437f3075da2d87da03332127d3e64cd72d289..7fab84cc2d98c849dd70170a69883343e96fade2 100644 (file)
--- 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 1d375ad3cf092b52ad4eeba29675dc1f48c8d992..9d2edc4a9307f3fb3d59c96843c2fe85d2214580 100644 (file)
--- 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 6afbf2d9273185f677e2b344ba9de31ee09b4dda..a45f92b6ac03b2844bc099fc0617f73409d352a5 100644 (file)
--- 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 ab2f9c926d640c4a19987808d01152560031ea88..61396b332cb14d91956d63d5066f84d9ad3df173 100644 (file)
--- 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 dd5a7963aa1bcf9d6a78baf0565e2848c56f88d8..449d423fd9d0c053c246d8e37081335ad13298a1 100644 (file)
--- 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 64a9af266fb5e467d51c15abe5b2bc4059ed9fd7..69974a1fa0f10a48caea21b00f7ca580e7a60385 100644 (file)
--- 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 de89e1976019ebb5044edda91318dd8fc1822cf4..f6dbb8bea4e9090a0458eb57cca6631c1a6d5c94 100644 (file)
--- 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 4fc43d881719a5cb9f99c82bc719c84e09b5bf84..6f6421450e17c2e730d023ae0f673362796da8c9 100644 (file)
--- 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 452902ed3897660002fc732e5846a53f1f39bd12..2f9b9923b06fd11a2abee4083896fcf9f8052e27 100644 (file)
--- 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 85ab10ee59d080ba690f98d459c687480d9259fd..794c9c7e9a8d2e6e40ca3986f16770fd7601fa40 100644 (file)
--- 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 4bb7f28a163a997a0e60dd14bec46f7a109e2c35..52da80951bfee71d1065cf049513e22e2a80c3d9 100644 (file)
--- 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 634d2ce0e6f2f9efdc1b100e5fb95cc17fdefc51..fc496c7e562ecc13c0ccaa5ccb9ebc1a8d9fd7ee 100644 (file)
--- 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 ff00c0440a45f709b130339e82dd5d9b85c3b86e..82efde8d7f038294db5e75eb2d20c484df170a4a 100644 (file)
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 13c0f449d81b1862eae88e95cb607b61a8be20f7..0871404453b34b631d62ea62c3bd606c3970b96a 100644 (file)
--- 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])