From 84488d921b5e01729be4f70f8eba8d52ca0209d2 Mon Sep 17 00:00:00 2001 From: Gabriel Caruso Date: Sat, 3 Feb 2018 12:24:56 -0200 Subject: [PATCH] Remove superfluous SKIPIF sections in more tests --- ext/com_dotnet/tests/bug45280.phpt | 1 - ext/dom/tests/bug74416.phpt | 1 - ext/gd/tests/bug75437.phpt | 1 - ext/mysqli/tests/bug74737.phpt | 1 - ext/mysqli/tests/bug75434.phpt | 1 - ext/openssl/tests/bug75307.phpt | 1 - ext/pdo/tests/pdo_014.phpt | 8 +++----- ext/pdo/tests/pdo_031.phpt | 6 +----- ext/phar/tests/bug74383.phpt | 2 +- ext/phar/tests/bug74386.phpt | 2 +- ext/phar/tests/create_new_and_modify.phpt | 1 - ext/phar/tests/create_new_phar_c.phpt | 1 - ext/phar/tests/create_path_error.phpt | 4 +--- ext/phar/tests/phar_bz2.phpt | 3 +-- ext/phar/tests/phar_copy.phpt | 3 +-- ext/phar/tests/phar_dir_iterate.phpt | 3 +-- ext/phar/tests/phar_get_supportedcomp1.phpt | 3 +-- ext/phar/tests/phar_get_supportedcomp2.phpt | 3 +-- ext/phar/tests/phar_get_supportedcomp3.phpt | 3 +-- ext/phar/tests/phar_get_supportedcomp4.phpt | 1 - ext/phar/tests/phar_gzip.phpt | 1 - ext/phar/tests/phar_offset_check.phpt | 1 - ext/phar/tests/phar_offset_get_error.phpt | 1 - ext/phar/tests/phar_oo_001.phpt | 3 +-- ext/phar/tests/phar_oo_002.phpt | 3 +-- ext/phar/tests/phar_oo_003.phpt | 3 +-- ext/phar/tests/phar_oo_004.phpt | 3 +-- ext/phar/tests/phar_oo_005.phpt | 3 +-- ext/phar/tests/phar_oo_006.phpt | 3 +-- ext/phar/tests/phar_oo_007.phpt | 3 +-- ext/phar/tests/phar_oo_008.phpt | 3 +-- ext/phar/tests/phar_oo_010.phpt | 3 +-- ext/phar/tests/phar_oo_011.phpt | 3 +-- ext/phar/tests/phar_oo_011b.phpt | 9 ++++----- ext/phar/tests/phar_oo_012.phpt | 3 +-- ext/phar/tests/phar_oo_012_confirm.phpt | 3 +-- ext/phar/tests/phar_oo_012b.phpt | 7 +++---- ext/phar/tests/phar_oo_getcontents.phpt | 5 ++--- ext/phar/tests/phar_oo_getcontentsgz.phpt | 5 ++--- ext/phar/tests/phar_oo_nosig.phpt | 3 +-- ext/phar/tests/refcount1.phpt | 1 - ext/phar/tests/tar/all.phpt | 1 - .../tests/tar/bug71317-duplicate-filename.phpt | 1 - ext/phar/tests/tar/bug71504.phpt | 1 - ext/phar/tests/tar/create_new_and_modify.phpt | 1 - ext/phar/tests/tar/phar_copy.phpt | 3 +-- ext/phar/tests/tar/refcount1.phpt | 1 - ext/phar/tests/tar/require_hash.phpt | 1 - ext/phar/tests/tar/tar_001.phpt | 1 - ext/phar/tests/tar/tar_002.phpt | 1 - ext/phar/tests/tar/tar_003.phpt | 1 - ext/phar/tests/tar/tar_004.phpt | 1 - ext/phar/tests/tar/tar_bz2.phpt | 1 - ext/phar/tests/tar/tar_gzip.phpt | 1 - ext/phar/tests/tar/tar_makebz2.phpt | 1 - ext/phar/tests/tar/tar_makegz.phpt | 3 +-- ext/phar/tests/tar/tar_nohash.phpt | 1 - ext/phar/tests/tar/tar_nostub.phpt | 1 - ext/phar/tests/tar/tar_openssl_hash.phpt | 1 - ext/phar/tests/zip/all.phpt | 1 - ext/phar/tests/zip/bug48791.phpt | 1 - ext/phar/tests/zip/bzip2.phpt | 1 - ext/phar/tests/zip/corrupt_001.phpt | 1 - ext/phar/tests/zip/corrupt_002.phpt | 1 - ext/phar/tests/zip/corrupt_003.phpt | 1 - ext/phar/tests/zip/corrupt_004.phpt | 1 - ext/phar/tests/zip/corrupt_005.phpt | 1 - ext/phar/tests/zip/corrupt_006.phpt | 1 - ext/phar/tests/zip/corrupt_007.phpt | 1 - ext/phar/tests/zip/corrupt_008.phpt | 1 - ext/phar/tests/zip/corrupt_009.phpt | 1 - ext/phar/tests/zip/corrupt_010.phpt | 1 - ext/phar/tests/zip/create_new_and_modify.phpt | 1 - ext/phar/tests/zip/odt.phpt | 1 - ext/phar/tests/zip/phar_copy.phpt | 3 +-- ext/phar/tests/zip/refcount1.phpt | 1 - ext/phar/tests/zip/unixzip.phpt | 1 - ext/phar/tests/zip/zlib.phpt | 1 - ext/session/tests/bug74541.phpt | 1 - ext/simplexml/tests/bug37565.phpt | 2 +- ext/spl/examples/tests/dualiterator_001.phpt | 6 ++---- ext/standard/tests/array/bug40191.phpt | 4 +--- ext/standard/tests/array/bug43505.phpt | 3 --- ext/standard/tests/array/count_recursive.phpt | 14 ++++++-------- ext/standard/tests/array/sizeof_object1.phpt | 14 +++----------- .../tests/general_functions/ini_get_all.phpt | 3 +-- ext/zlib/tests/bug75299.phpt | 2 +- sapi/cli/tests/004.phpt | 7 ++----- sapi/cli/tests/005.phpt | 7 ++----- sapi/cli/tests/006.phpt | 10 +++++----- 90 files changed, 64 insertions(+), 170 deletions(-) diff --git a/ext/com_dotnet/tests/bug45280.phpt b/ext/com_dotnet/tests/bug45280.phpt index a1f7e18f73..b530083cca 100644 --- a/ext/com_dotnet/tests/bug45280.phpt +++ b/ext/com_dotnet/tests/bug45280.phpt @@ -2,7 +2,6 @@ Bug #45280 (Reflection of instantiated COM classes causes PHP to crash) --SKIPIF-- --FILE-- diff --git a/ext/dom/tests/bug74416.phpt b/ext/dom/tests/bug74416.phpt index d441c0a7ab..c96a927c2e 100644 --- a/ext/dom/tests/bug74416.phpt +++ b/ext/dom/tests/bug74416.phpt @@ -3,7 +3,6 @@ Bug #74416 Wrong reflection on DOMNode::cloneNode --SKIPIF-- --FILE-- --FILE-- --FILE-- diff --git a/ext/openssl/tests/bug75307.phpt b/ext/openssl/tests/bug75307.phpt index 606f7a523b..2b0cae3a97 100644 --- a/ext/openssl/tests/bug75307.phpt +++ b/ext/openssl/tests/bug75307.phpt @@ -3,7 +3,6 @@ Bug #75307 Wrong reflection for openssl_open function --SKIPIF-- --FILE-- exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))'); -$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')'); -$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')'); +$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')'); +$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')'); $SELECT = 'SELECT val, grp FROM test'; class Test @@ -49,7 +47,7 @@ class PDOStatementAggregate extends PDOStatement implements IteratorAggregate private function __construct() { echo __METHOD__ . "\n"; - $this->setFetchMode(PDO::FETCH_NUM); + $this->setFetchMode(PDO::FETCH_NUM); /* default fetch mode is BOTH, so we see if the ctor can overwrite that */ } diff --git a/ext/pdo/tests/pdo_031.phpt b/ext/pdo/tests/pdo_031.phpt index 9065ce9719..11894e9708 100644 --- a/ext/pdo/tests/pdo_031.phpt +++ b/ext/pdo/tests/pdo_031.phpt @@ -3,19 +3,15 @@ PDO Common: PDOStatement SPL iterator --SKIPIF-- --FILE-- + --FILE-- + --FILE-- - --INI-- phar.readonly=0 phar.require_hash=1 diff --git a/ext/phar/tests/create_new_phar_c.phpt b/ext/phar/tests/create_new_phar_c.phpt index 6beaa2eb61..d32f758f93 100644 --- a/ext/phar/tests/create_new_phar_c.phpt +++ b/ext/phar/tests/create_new_phar_c.phpt @@ -2,7 +2,6 @@ Phar: create a completely new phar --SKIPIF-- - --INI-- phar.readonly=0 phar.require_hash=1 diff --git a/ext/phar/tests/create_path_error.phpt b/ext/phar/tests/create_path_error.phpt index 3449b07fc6..fd200d8613 100644 --- a/ext/phar/tests/create_path_error.phpt +++ b/ext/phar/tests/create_path_error.phpt @@ -2,7 +2,6 @@ Phar: create with illegal path --SKIPIF-- - --INI-- phar.readonly=0 phar.require_hash=1 @@ -29,7 +28,7 @@ set_error_handler('error_handler'); $count = 0; $checks = array( - '/', '.', '../', 'a/..', 'a/', 'b//a.php', + '/', '.', '../', 'a/..', 'a/', 'b//a.php', "Font\xE5\x84\xB7\xE9\xBB\x91pro.ttf", //two valid multi-byte characters "\xF0\x9F\x98\x8D.ttf", // valid 4 byte char - smiling face with heart-shaped eyes "Font\xE9\xBBpro.ttf", //Invalid multi-byte character - missing last byte @@ -81,4 +80,3 @@ string(5) "query" 12:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character 13:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character Error: Phar::offsetSet() expects parameter 1 to be a valid path, string given===DONE=== - diff --git a/ext/phar/tests/phar_bz2.phpt b/ext/phar/tests/phar_bz2.phpt index 556123a853..7328ba510b 100644 --- a/ext/phar/tests/phar_bz2.phpt +++ b/ext/phar/tests/phar_bz2.phpt @@ -3,7 +3,6 @@ Phar: bzipped phar --SKIPIF-- --INI-- @@ -62,4 +61,4 @@ bool(true) Warning: Phar::isFileFormat() expects parameter 1 to be integer, array given in %sphar_bz2.php on line %d Unknown file format specified -===DONE=== \ No newline at end of file +===DONE=== diff --git a/ext/phar/tests/phar_copy.phpt b/ext/phar/tests/phar_copy.phpt index 382b7f0754..8b270302ef 100644 --- a/ext/phar/tests/phar_copy.phpt +++ b/ext/phar/tests/phar_copy.phpt @@ -2,7 +2,6 @@ Phar: copy() --SKIPIF-- - --INI-- phar.readonly=0 @@ -81,4 +80,4 @@ file "a" cannot be copied to file "b", file must not already exist in phar %spha hi file "d" cannot be copied to file ".phar/stub.php", cannot copy to Phar meta-file in %sphar_copy2.phar.php file ".phar/stub.php" cannot be copied to file "d", cannot copy Phar meta-file in %sphar_copy2.phar.php -===DONE=== \ No newline at end of file +===DONE=== diff --git a/ext/phar/tests/phar_dir_iterate.phpt b/ext/phar/tests/phar_dir_iterate.phpt index 04968f28b5..6c04571d86 100644 --- a/ext/phar/tests/phar_dir_iterate.phpt +++ b/ext/phar/tests/phar_dir_iterate.phpt @@ -2,7 +2,6 @@ Phar object: iterate test with sub-directories and RecursiveIteratorIterator --SKIPIF-- - --INI-- phar.readonly=0 phar.require_hash=0 @@ -21,7 +20,7 @@ foreach (new RecursiveIteratorIterator($newphar) as $path => $obj) { ?> ===DONE=== --CLEAN-- - diff --git a/ext/phar/tests/phar_get_supportedcomp1.phpt b/ext/phar/tests/phar_get_supportedcomp1.phpt index d32e12c0ab..fecb806f2e 100644 --- a/ext/phar/tests/phar_get_supportedcomp1.phpt +++ b/ext/phar/tests/phar_get_supportedcomp1.phpt @@ -2,7 +2,6 @@ Phar::getSupportedCompression() (bz2 and zlib) --SKIPIF-- - --INI-- @@ -19,4 +18,4 @@ array(2) { [1]=> string(5) "BZIP2" } -===DONE=== \ No newline at end of file +===DONE=== diff --git a/ext/phar/tests/phar_get_supportedcomp2.phpt b/ext/phar/tests/phar_get_supportedcomp2.phpt index c607724918..aa941d0e4b 100644 --- a/ext/phar/tests/phar_get_supportedcomp2.phpt +++ b/ext/phar/tests/phar_get_supportedcomp2.phpt @@ -2,7 +2,6 @@ Phar::getSupportedCompression() (bz2 only) --SKIPIF-- - --INI-- @@ -17,4 +16,4 @@ array(1) { [0]=> string(5) "BZIP2" } -===DONE=== \ No newline at end of file +===DONE=== diff --git a/ext/phar/tests/phar_get_supportedcomp3.phpt b/ext/phar/tests/phar_get_supportedcomp3.phpt index c300407f3f..fadb482042 100644 --- a/ext/phar/tests/phar_get_supportedcomp3.phpt +++ b/ext/phar/tests/phar_get_supportedcomp3.phpt @@ -2,7 +2,6 @@ Phar::getSupportedCompression() (zlib only) --SKIPIF-- - --INI-- @@ -17,4 +16,4 @@ array(1) { [0]=> string(2) "GZ" } -===DONE=== \ No newline at end of file +===DONE=== diff --git a/ext/phar/tests/phar_get_supportedcomp4.phpt b/ext/phar/tests/phar_get_supportedcomp4.phpt index fba2c71bfc..1d953e2e38 100644 --- a/ext/phar/tests/phar_get_supportedcomp4.phpt +++ b/ext/phar/tests/phar_get_supportedcomp4.phpt @@ -2,7 +2,6 @@ Phar::getSupportedCompression() (none) --SKIPIF-- - --FILE-- diff --git a/ext/phar/tests/phar_gzip.phpt b/ext/phar/tests/phar_gzip.phpt index f7cf7f0964..3308424fa9 100644 --- a/ext/phar/tests/phar_gzip.phpt +++ b/ext/phar/tests/phar_gzip.phpt @@ -3,7 +3,6 @@ Phar: gzipped phar --SKIPIF-- --INI-- diff --git a/ext/phar/tests/phar_offset_check.phpt b/ext/phar/tests/phar_offset_check.phpt index 7609f2051f..469dce6c11 100644 --- a/ext/phar/tests/phar_offset_check.phpt +++ b/ext/phar/tests/phar_offset_check.phpt @@ -2,7 +2,6 @@ Phar: disallow stub and alias setting via offset*() methods --SKIPIF-- - --INI-- phar.readonly=0 phar.require_hash=1 diff --git a/ext/phar/tests/phar_offset_get_error.phpt b/ext/phar/tests/phar_offset_get_error.phpt index dade4726d9..8e96246eef 100644 --- a/ext/phar/tests/phar_offset_get_error.phpt +++ b/ext/phar/tests/phar_offset_get_error.phpt @@ -2,7 +2,6 @@ Phar: ignore filenames starting with / on offsetSet --SKIPIF-- - --INI-- phar.readonly=0 phar.require_hash=1 diff --git a/ext/phar/tests/phar_oo_001.phpt b/ext/phar/tests/phar_oo_001.phpt index f40e678d95..7ee7ca6fa5 100644 --- a/ext/phar/tests/phar_oo_001.phpt +++ b/ext/phar/tests/phar_oo_001.phpt @@ -3,7 +3,6 @@ Phar object: basics --SKIPIF-- --INI-- phar.require_hash=0 @@ -44,7 +43,7 @@ try { ?> ===DONE=== --CLEAN-- - diff --git a/ext/phar/tests/phar_oo_002.phpt b/ext/phar/tests/phar_oo_002.phpt index 269d9e5b0c..f62c9a509a 100644 --- a/ext/phar/tests/phar_oo_002.phpt +++ b/ext/phar/tests/phar_oo_002.phpt @@ -3,7 +3,6 @@ Phar object: iterator & entries --SKIPIF-- --INI-- phar.readonly=1 @@ -48,7 +47,7 @@ foreach(new RecursiveIteratorIterator($phar) as $name => $ent) ?> ===DONE=== --CLEAN-- - diff --git a/ext/phar/tests/phar_oo_003.phpt b/ext/phar/tests/phar_oo_003.phpt index 4395792632..01ca493a2f 100644 --- a/ext/phar/tests/phar_oo_003.phpt +++ b/ext/phar/tests/phar_oo_003.phpt @@ -2,7 +2,6 @@ Phar object: entry & openFile() --SKIPIF-- - --INI-- phar.require_hash=0 --FILE-- @@ -26,7 +25,7 @@ foreach($phar as $name => $ent) ?> ===DONE=== --CLEAN-- - diff --git a/ext/phar/tests/phar_oo_004.phpt b/ext/phar/tests/phar_oo_004.phpt index 3fc18dc65c..12492e2eef 100644 --- a/ext/phar/tests/phar_oo_004.phpt +++ b/ext/phar/tests/phar_oo_004.phpt @@ -3,7 +3,6 @@ Phar and DirectoryIterator --SKIPIF-- --INI-- phar.require_hash=0 @@ -76,7 +75,7 @@ foreach($it as $name => $ent) ?> ===DONE=== --CLEAN-- - diff --git a/ext/phar/tests/phar_oo_005.phpt b/ext/phar/tests/phar_oo_005.phpt index 7bc1db61d1..62887655b1 100644 --- a/ext/phar/tests/phar_oo_005.phpt +++ b/ext/phar/tests/phar_oo_005.phpt @@ -3,7 +3,6 @@ Phar and RecursiveDirectoryIterator --SKIPIF-- --INI-- phar.require_hash=0 @@ -29,7 +28,7 @@ foreach($it as $name => $ent) ?> ===DONE=== --CLEAN-- - diff --git a/ext/phar/tests/phar_oo_006.phpt b/ext/phar/tests/phar_oo_006.phpt index 5d1d705206..de9b499a83 100644 --- a/ext/phar/tests/phar_oo_006.phpt +++ b/ext/phar/tests/phar_oo_006.phpt @@ -2,7 +2,6 @@ Phar object: array access --SKIPIF-- - --INI-- phar.require_hash=0 --FILE-- @@ -37,7 +36,7 @@ echo $phar['b.php']->getFilename() . "\n"; ?> ===DONE=== --CLEAN-- - diff --git a/ext/phar/tests/phar_oo_007.phpt b/ext/phar/tests/phar_oo_007.phpt index d0b5aa5eca..ff9c721150 100644 --- a/ext/phar/tests/phar_oo_007.phpt +++ b/ext/phar/tests/phar_oo_007.phpt @@ -2,7 +2,6 @@ Phar object: access through SplFileObject --SKIPIF-- - --INI-- phar.require_hash=0 --FILE-- @@ -58,7 +57,7 @@ var_dump($f->eof()); ?> ===DONE=== --CLEAN-- - diff --git a/ext/phar/tests/phar_oo_008.phpt b/ext/phar/tests/phar_oo_008.phpt index d95af571b3..dc9ab7f9ca 100644 --- a/ext/phar/tests/phar_oo_008.phpt +++ b/ext/phar/tests/phar_oo_008.phpt @@ -2,7 +2,6 @@ Phar object: iterating via SplFileObject --SKIPIF-- - --INI-- phar.require_hash=0 --FILE-- @@ -82,7 +81,7 @@ foreach($v as $k => $d) ?> ===DONE=== --CLEAN-- - diff --git a/ext/phar/tests/phar_oo_010.phpt b/ext/phar/tests/phar_oo_010.phpt index 331d300a8c..ca3abddfce 100644 --- a/ext/phar/tests/phar_oo_010.phpt +++ b/ext/phar/tests/phar_oo_010.phpt @@ -2,7 +2,6 @@ Phar object: ArrayAccess and isset --SKIPIF-- - --INI-- phar.require_hash=0 --FILE-- @@ -35,7 +34,7 @@ var_dump(isset($phar['b'])); ?> ===DONE=== --CLEAN-- - diff --git a/ext/phar/tests/phar_oo_011.phpt b/ext/phar/tests/phar_oo_011.phpt index 01fa9f01e6..5b929363db 100644 --- a/ext/phar/tests/phar_oo_011.phpt +++ b/ext/phar/tests/phar_oo_011.phpt @@ -2,7 +2,6 @@ Phar object: add file --SKIPIF-- - --INI-- phar.readonly=0 phar.require_hash=0 @@ -25,7 +24,7 @@ echo "\n"; ?> ===DONE=== --CLEAN-- - diff --git a/ext/phar/tests/phar_oo_011b.phpt b/ext/phar/tests/phar_oo_011b.phpt index 34cae0e760..d36c083dff 100644 --- a/ext/phar/tests/phar_oo_011b.phpt +++ b/ext/phar/tests/phar_oo_011b.phpt @@ -2,7 +2,6 @@ Phar object: add file --SKIPIF-- - --INI-- phar.readonly=1 phar.require_hash=0 @@ -12,11 +11,11 @@ phar.require_hash=0 try { $pharconfig = 0; - + require_once 'files/phar_oo_test.inc'; - + $phar = new Phar($fname); - + $phar['f.php'] = 'hi'; var_dump(isset($phar['f.php'])); echo $phar['f.php']; @@ -30,7 +29,7 @@ catch (BadMethodCallException $e) ?> ===DONE=== --CLEAN-- - diff --git a/ext/phar/tests/phar_oo_012.phpt b/ext/phar/tests/phar_oo_012.phpt index b6f9f44b1e..f5566807fb 100644 --- a/ext/phar/tests/phar_oo_012.phpt +++ b/ext/phar/tests/phar_oo_012.phpt @@ -2,7 +2,6 @@ Phar object: unset file --SKIPIF-- - --INI-- phar.readonly=0 phar.require_hash=0 @@ -26,7 +25,7 @@ var_dump(isset($phar['f.php'])); ?> ===DONE=== --CLEAN-- - diff --git a/ext/phar/tests/phar_oo_012_confirm.phpt b/ext/phar/tests/phar_oo_012_confirm.phpt index ce5a58f212..d2798c3dd4 100644 --- a/ext/phar/tests/phar_oo_012_confirm.phpt +++ b/ext/phar/tests/phar_oo_012_confirm.phpt @@ -2,7 +2,6 @@ Phar object: unset file (confirm disk file is changed) --SKIPIF-- - --INI-- phar.readonly=0 phar.require_hash=0 @@ -29,7 +28,7 @@ var_dump(isset($phar['f.php'])); ?> ===DONE=== --CLEAN-- - diff --git a/ext/phar/tests/phar_oo_012b.phpt b/ext/phar/tests/phar_oo_012b.phpt index 066d3bc068..c650a3ceff 100644 --- a/ext/phar/tests/phar_oo_012b.phpt +++ b/ext/phar/tests/phar_oo_012b.phpt @@ -2,7 +2,6 @@ Phar object: unset file --SKIPIF-- - --INI-- phar.readonly=1 phar.require_hash=0 @@ -14,10 +13,10 @@ try $pharconfig = 0; require_once 'files/phar_oo_test.inc'; - + $phar = new Phar($fname); $phar->setInfoClass('SplFileObject'); - + $phar['f.php'] = 'hi'; var_dump(isset($phar['f.php'])); echo $phar['f.php']; @@ -33,7 +32,7 @@ catch (BadMethodCallException $e) ?> ===DONE=== --CLEAN-- - diff --git a/ext/phar/tests/phar_oo_getcontents.phpt b/ext/phar/tests/phar_oo_getcontents.phpt index e42bca46fc..e3a0c2dea7 100644 --- a/ext/phar/tests/phar_oo_getcontents.phpt +++ b/ext/phar/tests/phar_oo_getcontents.phpt @@ -2,7 +2,6 @@ Phar object: getContent() --SKIPIF-- - --INI-- phar.readonly=0 --FILE-- @@ -27,7 +26,7 @@ echo $e->getMessage(), "\n"; ?> ===DONE=== --CLEAN-- - @@ -36,4 +35,4 @@ file contents this works Phar error: Cannot retrieve contents, "a" in phar "%sphar_oo_getcontents.phar.php" is a directory Phar error: Cannot retrieve contents, "hi" in phar "%sphar_oo_getcontents.phar.php" is a directory -===DONE=== \ No newline at end of file +===DONE=== diff --git a/ext/phar/tests/phar_oo_getcontentsgz.phpt b/ext/phar/tests/phar_oo_getcontentsgz.phpt index a480a69637..e77b5cad1a 100644 --- a/ext/phar/tests/phar_oo_getcontentsgz.phpt +++ b/ext/phar/tests/phar_oo_getcontentsgz.phpt @@ -2,7 +2,6 @@ Phar object: getContent() (verify it works with compression) --SKIPIF-- - --INI-- phar.readonly=0 @@ -22,7 +21,7 @@ echo $phar2['a']->getContent() . "\n"; ?> ===DONE=== --CLEAN-- - - --INI-- phar.require_hash=0 --FILE-- @@ -15,7 +14,7 @@ var_dump($phar->getSignature()); ?> ===DONE=== --CLEAN-- - diff --git a/ext/phar/tests/refcount1.phpt b/ext/phar/tests/refcount1.phpt index 3c717eb37d..e2cb3b8cff 100644 --- a/ext/phar/tests/refcount1.phpt +++ b/ext/phar/tests/refcount1.phpt @@ -2,7 +2,6 @@ Phar: test that refcounting avoids problems with deleting a file --SKIPIF-- - --INI-- phar.readonly=0 phar.require_hash=0 diff --git a/ext/phar/tests/tar/all.phpt b/ext/phar/tests/tar/all.phpt index 9f693ff6aa..848f50502d 100644 --- a/ext/phar/tests/tar/all.phpt +++ b/ext/phar/tests/tar/all.phpt @@ -3,7 +3,6 @@ Phar: test that creation of tar-based phar generates valid tar with all bells/wh --SKIPIF-- diff --git a/ext/phar/tests/tar/bug71317-duplicate-filename.phpt b/ext/phar/tests/tar/bug71317-duplicate-filename.phpt index bcbccab1c8..b8004138bc 100644 --- a/ext/phar/tests/tar/bug71317-duplicate-filename.phpt +++ b/ext/phar/tests/tar/bug71317-duplicate-filename.phpt @@ -2,7 +2,6 @@ Bug #71317: regression in opening tar based phar files --SKIPIF-- - --FILE-- - --FILE-- - --INI-- phar.readonly=0 --FILE-- diff --git a/ext/phar/tests/tar/phar_copy.phpt b/ext/phar/tests/tar/phar_copy.phpt index ed5cdac8bc..782bb4fb5d 100644 --- a/ext/phar/tests/tar/phar_copy.phpt +++ b/ext/phar/tests/tar/phar_copy.phpt @@ -2,7 +2,6 @@ Phar: copy() tar-based --SKIPIF-- - --INI-- phar.readonly=0 @@ -53,4 +52,4 @@ hihibool(true) file "/error/.." contains invalid characters upper directory reference, cannot be copied from "a" in phar %s bool(true) -a: hib: hic: hi===DONE=== \ No newline at end of file +a: hib: hic: hi===DONE=== diff --git a/ext/phar/tests/tar/refcount1.phpt b/ext/phar/tests/tar/refcount1.phpt index 9d1cb5e415..7b4f05417a 100644 --- a/ext/phar/tests/tar/refcount1.phpt +++ b/ext/phar/tests/tar/refcount1.phpt @@ -2,7 +2,6 @@ Phar: test that refcounting avoids problems with deleting a file tar-based --SKIPIF-- - --INI-- phar.readonly=0 phar.require_hash=0 diff --git a/ext/phar/tests/tar/require_hash.phpt b/ext/phar/tests/tar/require_hash.phpt index 638534be1c..3841d1dce3 100644 --- a/ext/phar/tests/tar/require_hash.phpt +++ b/ext/phar/tests/tar/require_hash.phpt @@ -2,7 +2,6 @@ Phar: tar-based phar, require_hash=1, no signature --SKIPIF-- - --INI-- phar.readonly=1 phar.require_hash=0 diff --git a/ext/phar/tests/tar/tar_001.phpt b/ext/phar/tests/tar/tar_001.phpt index 500058b70d..a2c4f36fa3 100644 --- a/ext/phar/tests/tar/tar_001.phpt +++ b/ext/phar/tests/tar/tar_001.phpt @@ -2,7 +2,6 @@ Phar: tar-based phar corrupted --SKIPIF-- - --FILE-- - --INI-- phar.readonly=0 --FILE-- diff --git a/ext/phar/tests/tar/tar_003.phpt b/ext/phar/tests/tar/tar_003.phpt index 3dec341784..fe7e1d854e 100644 --- a/ext/phar/tests/tar/tar_003.phpt +++ b/ext/phar/tests/tar/tar_003.phpt @@ -2,7 +2,6 @@ Phar: tar-based phar, valid 1 --SKIPIF-- - --INI-- phar.readonly=0 phar.require_hash=0 diff --git a/ext/phar/tests/tar/tar_004.phpt b/ext/phar/tests/tar/tar_004.phpt index 3b28f47cec..d142857388 100644 --- a/ext/phar/tests/tar/tar_004.phpt +++ b/ext/phar/tests/tar/tar_004.phpt @@ -3,7 +3,6 @@ Phar: tar-based phar, tar phar with stub, mapPhar() --SKIPIF-- --INI-- phar.readonly=0 diff --git a/ext/phar/tests/tar/tar_bz2.phpt b/ext/phar/tests/tar/tar_bz2.phpt index 61914f52c6..d7e6dc0e26 100644 --- a/ext/phar/tests/tar/tar_bz2.phpt +++ b/ext/phar/tests/tar/tar_bz2.phpt @@ -3,7 +3,6 @@ Phar: tar-based phar, bzipped tar --SKIPIF-- --INI-- diff --git a/ext/phar/tests/tar/tar_gzip.phpt b/ext/phar/tests/tar/tar_gzip.phpt index 840e30ce6a..f64962c8c8 100644 --- a/ext/phar/tests/tar/tar_gzip.phpt +++ b/ext/phar/tests/tar/tar_gzip.phpt @@ -3,7 +3,6 @@ Phar: tar-based phar, gzipped tar --SKIPIF-- --INI-- diff --git a/ext/phar/tests/tar/tar_makebz2.phpt b/ext/phar/tests/tar/tar_makebz2.phpt index f703b46924..ed614d894b 100644 --- a/ext/phar/tests/tar/tar_makebz2.phpt +++ b/ext/phar/tests/tar/tar_makebz2.phpt @@ -2,7 +2,6 @@ Phar: tar-based phar, make new bzipped tar --SKIPIF-- - --INI-- phar.readonly=0 diff --git a/ext/phar/tests/tar/tar_makegz.phpt b/ext/phar/tests/tar/tar_makegz.phpt index 46fe177611..7d6ea89fd0 100644 --- a/ext/phar/tests/tar/tar_makegz.phpt +++ b/ext/phar/tests/tar/tar_makegz.phpt @@ -2,7 +2,6 @@ Phar: tar-based phar, make new gzipped tar --SKIPIF-- - --INI-- phar.readonly=0 @@ -38,4 +37,4 @@ var_dump($phar2->isCompressed() == Phar::GZ); bool(true) bool(true) bool(true) -===DONE=== \ No newline at end of file +===DONE=== diff --git a/ext/phar/tests/tar/tar_nohash.phpt b/ext/phar/tests/tar/tar_nohash.phpt index dae2bb92a8..3d1d0010a0 100644 --- a/ext/phar/tests/tar/tar_nohash.phpt +++ b/ext/phar/tests/tar/tar_nohash.phpt @@ -2,7 +2,6 @@ Phar: tar archive, require_hash=1, should not error out --SKIPIF-- - --INI-- phar.readonly=1 diff --git a/ext/phar/tests/tar/tar_nostub.phpt b/ext/phar/tests/tar/tar_nostub.phpt index 0036662c38..210f8815ec 100644 --- a/ext/phar/tests/tar/tar_nostub.phpt +++ b/ext/phar/tests/tar/tar_nostub.phpt @@ -2,7 +2,6 @@ Phar: tar-based phar, third-party tar with no stub, Phar->getStub() --SKIPIF-- - --INI-- phar.readonly=1 phar.require_hash=0 diff --git a/ext/phar/tests/tar/tar_openssl_hash.phpt b/ext/phar/tests/tar/tar_openssl_hash.phpt index 49ef77a44b..075136f687 100644 --- a/ext/phar/tests/tar/tar_openssl_hash.phpt +++ b/ext/phar/tests/tar/tar_openssl_hash.phpt @@ -2,7 +2,6 @@ Phar: tar archive, require_hash=1, OpenSSL hash --SKIPIF-- - --INI-- diff --git a/ext/phar/tests/zip/all.phpt b/ext/phar/tests/zip/all.phpt index 82769345ce..1b9f832fb5 100644 --- a/ext/phar/tests/zip/all.phpt +++ b/ext/phar/tests/zip/all.phpt @@ -3,7 +3,6 @@ Phar: test that creation of zip-based phar generates valid zip with all bells/wh --SKIPIF-- diff --git a/ext/phar/tests/zip/bug48791.phpt b/ext/phar/tests/zip/bug48791.phpt index 45c527188b..5ad1344bd7 100644 --- a/ext/phar/tests/zip/bug48791.phpt +++ b/ext/phar/tests/zip/bug48791.phpt @@ -2,7 +2,6 @@ Phar: Bug #48791: open office documents always reported as corrupted by phar extension --SKIPIF-- - --FILE-- - --FILE-- - --FILE-- - --FILE-- - --FILE-- - --FILE-- - --FILE-- - --FILE-- - --FILE-- - --FILE-- - --FILE-- - --FILE-- - --INI-- phar.readonly=0 --FILE-- diff --git a/ext/phar/tests/zip/odt.phpt b/ext/phar/tests/zip/odt.phpt index b007d447a8..20f9f112df 100644 --- a/ext/phar/tests/zip/odt.phpt +++ b/ext/phar/tests/zip/odt.phpt @@ -2,7 +2,6 @@ Phar: test a zip archive created by openoffice --SKIPIF-- - --FILE-- - --INI-- phar.readonly=0 phar.require_hash=1 @@ -52,4 +51,4 @@ hihibool(true) file "/error/.." contains invalid characters upper directory reference, cannot be copied from "a" in phar %s bool(true) -a: hib: hic: hi===DONE=== \ No newline at end of file +a: hib: hic: hi===DONE=== diff --git a/ext/phar/tests/zip/refcount1.phpt b/ext/phar/tests/zip/refcount1.phpt index 5b8085bdbc..82a6f5218f 100644 --- a/ext/phar/tests/zip/refcount1.phpt +++ b/ext/phar/tests/zip/refcount1.phpt @@ -2,7 +2,6 @@ Phar: test that refcounting avoids problems with deleting a file zip-based --SKIPIF-- - --INI-- phar.readonly=0 phar.require_hash=0 diff --git a/ext/phar/tests/zip/unixzip.phpt b/ext/phar/tests/zip/unixzip.phpt index e2b95be93c..d6cbe47898 100644 --- a/ext/phar/tests/zip/unixzip.phpt +++ b/ext/phar/tests/zip/unixzip.phpt @@ -2,7 +2,6 @@ Phar: test a zip archive created by unix "zip" command --SKIPIF-- - --FILE-- - --FILE-- --FILE-- + --FILE-- --FILE-- --FILE-- ---EXPECTF-- +--EXPECTF-- Warning: array_unique() expects parameter 1 to be array, object given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/bug43505.phpt b/ext/standard/tests/array/bug43505.phpt index 219bbfe292..802534dfec 100644 --- a/ext/standard/tests/array/bug43505.phpt +++ b/ext/standard/tests/array/bug43505.phpt @@ -2,8 +2,6 @@ Bug #43505 (Assign by reference bug) --INI-- error_reporting=0 ---SKIPIF-- - --FILE-- &NULL } - diff --git a/ext/standard/tests/array/count_recursive.phpt b/ext/standard/tests/array/count_recursive.phpt index b903d8b189..dcef3bd47b 100644 --- a/ext/standard/tests/array/count_recursive.phpt +++ b/ext/standard/tests/array/count_recursive.phpt @@ -1,7 +1,5 @@ --TEST-- Test count() function ---SKIPIF-- - --FILE-- 1, "b" => -2.344, "b" => "string", "c" => NULL, "d" => -2.344), array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL, 1 => -2.344, array()), - array( TRUE => TRUE, FALSE => FALSE, "" => "", " " => " ", + array( TRUE => TRUE, FALSE => FALSE, "" => "", " " => " ", NULL => NULL, "\x000" => "\x000", "\000" => "\000"), - array( NULL, 1.23 => "Hi", "string" => "hello", + array( NULL, 1.23 => "Hi", "string" => "hello", array("" => "World", "-2.34" => "a", "0" => "b")) ); @@ -58,14 +56,14 @@ $i = 0; foreach ($count_array as $count_value) { echo "\n-- Iteration $i --\n"; print "COUNT_NORMAL is ".count($count_value, COUNT_NORMAL)."\n"; - print "COUNT_RECURSIVE is ".count($count_value, COUNT_RECURSIVE)."\n"; + print "COUNT_RECURSIVE is ".count($count_value, COUNT_RECURSIVE)."\n"; $i++; } /* Testing count() by passing constant with no second argument */ print "\n-- Testing count() on constants with no second argument --\n"; -print "COUNT_NORMAL: should be 1, is ".count(100)."\n"; +print "COUNT_NORMAL: should be 1, is ".count(100)."\n"; print "COUNT_NORMAL: should be 1, is ".count(-23.45)."\n"; print "\n-- Testing count() on NULL and Unset variables --\n"; @@ -106,13 +104,13 @@ echo "\n-- Testing count() on arrays containing references --\n"; $arr = array(1, array("a", "b", "c")); $arr[2] = &$arr[1]; -$mode_arr = array( COUNT_NORMAL, COUNT_RECURSIVE, 0, 1, -1, -1.45, 2, TRUE, +$mode_arr = array( COUNT_NORMAL, COUNT_RECURSIVE, 0, 1, -1, -1.45, 2, TRUE, FALSE, NULL); for( $i =0; $i < count( $mode_arr ); $i++) { echo "For mode '$mode_arr[$i]' count is => "; var_dump(count($arr, $mode_arr[$i])); } - + echo "\n-- Testing error conditions --"; var_dump( count() ); // No. of args = 0 diff --git a/ext/standard/tests/array/sizeof_object1.phpt b/ext/standard/tests/array/sizeof_object1.phpt index 4705996054..e040585585 100644 --- a/ext/standard/tests/array/sizeof_object1.phpt +++ b/ext/standard/tests/array/sizeof_object1.phpt @@ -1,17 +1,9 @@ --TEST-- Test sizeof() function : object functionality - object with Countable interface ---SKIPIF-- - --FILE-- --FILE-- ---EXPECTF-- +--EXPECTF-- string(5) "array" Warning: ini_get_all(): Unable to find extension '' in %s on line %d diff --git a/ext/zlib/tests/bug75299.phpt b/ext/zlib/tests/bug75299.phpt index 1886b3ecaf..b9a9439f2e 100644 --- a/ext/zlib/tests/bug75299.phpt +++ b/ext/zlib/tests/bug75299.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #75299 Wrong reflection on inflate_init and inflate_add --SKIPIF-- - + --FILE-- --FILE-- ---EXPECTF-- +--EXPECTF-- string(45) "Exception: Function unknown() does not exist " string(42) "Exception: Function echo() does not exist diff --git a/sapi/cli/tests/005.phpt b/sapi/cli/tests/005.phpt index 5a1e8b8fb1..0790904f8c 100644 --- a/sapi/cli/tests/005.phpt +++ b/sapi/cli/tests/005.phpt @@ -1,11 +1,8 @@ --TEST-- show information about class --SKIPIF-- - --FILE-- ---EXPECTF-- +--EXPECTF-- string(40) "Exception: Class unknown does not exist " string(183) "Class [ class stdClass ] { diff --git a/sapi/cli/tests/006.phpt b/sapi/cli/tests/006.phpt index 72f0c5dfa5..fc3032602f 100644 --- a/sapi/cli/tests/006.phpt +++ b/sapi/cli/tests/006.phpt @@ -1,10 +1,10 @@ --TEST-- show information about extension --SKIPIF-- - ---EXPECTF-- +--EXPECTF-- string(44) "Exception: Extension unknown does not exist " string(37) "Exception: Extension does not exist -- 2.40.0