From 98d004c9bc4777011abe7a2d540b6ac29008badf Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 3 Sep 2021 11:34:48 +0200 Subject: [PATCH] Fix CLEAN sections --- ext/phar/tests/bug65414.phpt | 4 -- ext/phar/tests/bug66960.phpt | 5 --- ext/phar/tests/create_new_phar_b.phpt | 3 -- ext/phar/tests/invalid_alias.phpt | 4 -- ext/phar/tests/invalid_setstubalias.phpt | 5 --- ext/phar/tests/phar_buildfromdirectory1.phpt | 5 --- ext/phar/tests/phar_buildfromdirectory2.phpt | 5 --- ext/phar/tests/phar_buildfromdirectory6.phpt | 1 - ext/phar/tests/phar_buildfromiterator1.phpt | 5 --- ext/phar/tests/phar_buildfromiterator5.phpt | 5 --- ext/phar/tests/phar_buildfromiterator6.phpt | 5 --- ext/phar/tests/phar_buildfromiterator7.phpt | 5 --- ext/phar/tests/phar_convert_again.phpt | 3 -- ext/phar/tests/phar_convert_repeated.phpt | 2 - ext/phar/tests/phar_convert_repeated_b.phpt | 5 --- ext/phar/tests/phar_convert_tar2.phpt | 1 - ext/phar/tests/phar_convert_tar3.phpt | 6 +-- ext/phar/tests/phar_extract.phpt | 39 +++++++++---------- ext/phar/tests/phar_gobyebye.phpt | 6 ++- ext/phar/tests/phar_oo_compressallbz2.phpt | 1 - ext/phar/tests/phar_oo_compressallgz.phpt | 1 - ext/phar/tests/phar_oo_getmodified.phpt | 1 - ext/phar/tests/phar_oo_nosig.phpt | 3 +- ext/phar/tests/phar_oo_uncompressall.phpt | 1 - ext/phar/tests/phar_setalias.phpt | 2 - ext/phar/tests/phar_setalias2.phpt | 3 -- ext/phar/tests/stat2_5.3.phpt | 6 ++- ext/phar/tests/tar/bignames_overflow.phpt | 2 - ext/phar/tests/tar/create_new_phar_b.phpt | 3 -- .../tests/tar/phar_buildfromiterator5.phpt | 5 --- .../tests/tar/phar_buildfromiterator6.phpt | 5 --- .../tests/tar/phar_buildfromiterator7.phpt | 5 --- ext/phar/tests/tar/phar_convert_phar.phpt | 1 - ext/phar/tests/tar/phar_convert_phar2.phpt | 1 - ext/phar/tests/tar/phar_convert_phar3.phpt | 2 - ext/phar/tests/tar/phar_convert_phar4.phpt | 2 - ext/phar/tests/tar/phar_setalias.phpt | 3 +- ext/phar/tests/tar/truncated.phpt | 5 --- ext/phar/tests/test_unset.phpt | 1 - ext/phar/tests/zip/all.phpt | 6 ++- ext/phar/tests/zip/create_new_phar_b.phpt | 3 -- .../tests/zip/phar_buildfromiterator5.phpt | 5 --- .../tests/zip/phar_buildfromiterator6.phpt | 5 --- .../tests/zip/phar_buildfromiterator7.phpt | 5 --- .../tests/session_save_path_variation4.phpt | 2 +- .../tests/session_save_path_variation5.phpt | 2 +- 46 files changed, 37 insertions(+), 158 deletions(-) diff --git a/ext/phar/tests/bug65414.phpt b/ext/phar/tests/bug65414.phpt index abbdf49b111..d3ff7794714 100644 --- a/ext/phar/tests/bug65414.phpt +++ b/ext/phar/tests/bug65414.phpt @@ -24,10 +24,6 @@ foreach ($bads as $bad) { } echo 'done' . PHP_EOL; ?> ---CLEAN-- - --EXPECT-- .phar/injected-1.txt:Cannot create any files in magic ".phar" directory /.phar/injected-2.txt:Cannot create any files in magic ".phar" directory diff --git a/ext/phar/tests/bug66960.phpt b/ext/phar/tests/bug66960.phpt index aab765b59cd..d17acc5f715 100644 --- a/ext/phar/tests/bug66960.phpt +++ b/ext/phar/tests/bug66960.phpt @@ -14,11 +14,6 @@ var_dump(file_exists("phar://$file/". str_repeat('a', PHP_MAXPATHLEN))); var_dump(file_exists("phar://$file/". str_repeat('a', PHP_MAXPATHLEN+1))); echo 'done'; ?> ---CLEAN-- - --EXPECT-- bool(false) bool(false) diff --git a/ext/phar/tests/create_new_phar_b.phpt b/ext/phar/tests/create_new_phar_b.phpt index 810da1f7ce6..fb106153ca8 100644 --- a/ext/phar/tests/create_new_phar_b.phpt +++ b/ext/phar/tests/create_new_phar_b.phpt @@ -12,9 +12,6 @@ file_put_contents('phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.pha 'brand new!'); include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/a.php'; ?> - ---CLEAN-- - --EXPECTF-- Warning: file_put_contents(phar://%screate_new_phar_b.phar.php/a.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d diff --git a/ext/phar/tests/invalid_alias.phpt b/ext/phar/tests/invalid_alias.phpt index fa44af3c148..231dd9fdb31 100644 --- a/ext/phar/tests/invalid_alias.phpt +++ b/ext/phar/tests/invalid_alias.phpt @@ -32,10 +32,6 @@ try { echo $e->getMessage() . "\n"; } ?> ---CLEAN-- - --EXPECTF-- Invalid alias "hi/" specified for phar "%sinvalid_alias.phar" Invalid alias "hi\l" specified for phar "%sinvalid_alias.phar" diff --git a/ext/phar/tests/invalid_setstubalias.phpt b/ext/phar/tests/invalid_setstubalias.phpt index 9b711bd2c3d..bcbcb266692 100644 --- a/ext/phar/tests/invalid_setstubalias.phpt +++ b/ext/phar/tests/invalid_setstubalias.phpt @@ -32,11 +32,6 @@ try { echo $e->getMessage() . "\n"; } -?> ---CLEAN-- - --EXPECTF-- Cannot set stub ".phar/stub.php" directly in phar "%sinvalid_setstubalias.phar.tar", use setStub diff --git a/ext/phar/tests/phar_buildfromdirectory1.phpt b/ext/phar/tests/phar_buildfromdirectory1.phpt index f7ee620b462..9ab1fb92151 100644 --- a/ext/phar/tests/phar_buildfromdirectory1.phpt +++ b/ext/phar/tests/phar_buildfromdirectory1.phpt @@ -16,11 +16,6 @@ try { echo $e->getMessage() . "\n"; } ?> ---CLEAN-- - --EXPECTF-- %s(24) "UnexpectedValueException" Cannot write to archive - write operations restricted by INI setting diff --git a/ext/phar/tests/phar_buildfromdirectory2.phpt b/ext/phar/tests/phar_buildfromdirectory2.phpt index 9de4edd89c7..c828587548a 100644 --- a/ext/phar/tests/phar_buildfromdirectory2.phpt +++ b/ext/phar/tests/phar_buildfromdirectory2.phpt @@ -19,11 +19,6 @@ try { echo $e->getMessage() . "\n"; } ?> ---CLEAN-- - --EXPECTF-- %s(24) "UnexpectedValueException" RecursiveDirectoryIterator::__construct(1): Failed to open directory: No such file or directory diff --git a/ext/phar/tests/phar_buildfromdirectory6.phpt b/ext/phar/tests/phar_buildfromdirectory6.phpt index 131247a8072..a652a89921d 100644 --- a/ext/phar/tests/phar_buildfromdirectory6.phpt +++ b/ext/phar/tests/phar_buildfromdirectory6.phpt @@ -26,7 +26,6 @@ var_dump(file_exists(__DIR__ . '/buildfromdirectory6.phar')); ?> --CLEAN-- getMessage() . "\n"; } ?> ---CLEAN-- - --EXPECTF-- %s(24) "UnexpectedValueException" Cannot write out phar archive, phar is read-only diff --git a/ext/phar/tests/phar_buildfromiterator5.phpt b/ext/phar/tests/phar_buildfromiterator5.phpt index 147fb26875a..1e937fe4e8d 100644 --- a/ext/phar/tests/phar_buildfromiterator5.phpt +++ b/ext/phar/tests/phar_buildfromiterator5.phpt @@ -44,11 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> ---CLEAN-- - --EXPECTF-- rewind valid diff --git a/ext/phar/tests/phar_buildfromiterator6.phpt b/ext/phar/tests/phar_buildfromiterator6.phpt index 59a5b6ef1c7..4e4f09f74aa 100644 --- a/ext/phar/tests/phar_buildfromiterator6.phpt +++ b/ext/phar/tests/phar_buildfromiterator6.phpt @@ -44,11 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> ---CLEAN-- - --EXPECTF-- rewind valid diff --git a/ext/phar/tests/phar_buildfromiterator7.phpt b/ext/phar/tests/phar_buildfromiterator7.phpt index 94a192c3dfb..646bcdac2a5 100644 --- a/ext/phar/tests/phar_buildfromiterator7.phpt +++ b/ext/phar/tests/phar_buildfromiterator7.phpt @@ -44,11 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> ---CLEAN-- - --EXPECTF-- rewind valid diff --git a/ext/phar/tests/phar_convert_again.phpt b/ext/phar/tests/phar_convert_again.phpt index d65e5df2564..008d28ad80f 100644 --- a/ext/phar/tests/phar_convert_again.phpt +++ b/ext/phar/tests/phar_convert_again.phpt @@ -155,11 +155,8 @@ echo $e->getMessage() . "\n"; --CLEAN-- --EXPECTF-- =================== new Phar() ======================= diff --git a/ext/phar/tests/phar_convert_repeated_b.phpt b/ext/phar/tests/phar_convert_repeated_b.phpt index 26589d84573..8adb581276f 100644 --- a/ext/phar/tests/phar_convert_repeated_b.phpt +++ b/ext/phar/tests/phar_convert_repeated_b.phpt @@ -77,15 +77,10 @@ try { ?> --CLEAN-- --EXPECT-- =================== new PharData() ================== diff --git a/ext/phar/tests/phar_convert_tar2.phpt b/ext/phar/tests/phar_convert_tar2.phpt index 10e1bd22454..8028d77418d 100644 --- a/ext/phar/tests/phar_convert_tar2.phpt +++ b/ext/phar/tests/phar_convert_tar2.phpt @@ -44,7 +44,6 @@ var_dump($phar->getStub()); --CLEAN-- diff --git a/ext/phar/tests/phar_convert_tar3.phpt b/ext/phar/tests/phar_convert_tar3.phpt index 8a693cf62ab..090782f3b27 100644 --- a/ext/phar/tests/phar_convert_tar3.phpt +++ b/ext/phar/tests/phar_convert_tar3.phpt @@ -11,7 +11,7 @@ phar.readonly=0 $fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'; $pname = 'phar://' . $fname; -$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar'; +$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar.bz2'; $fname3 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.phar.tar'; $stub = ''; $file = $stub; @@ -33,7 +33,7 @@ var_dump($phar->isFileFormat(Phar::TAR)); var_dump($phar->isCompressed()); var_dump($phar->getStub()); -copy($fname2 . '.bz2', $fname3); +copy($fname2, $fname3); $phar = new Phar($fname3); var_dump($phar->isFileFormat(Phar::TAR)); @@ -45,9 +45,7 @@ var_dump($phar->getStub()); --EXPECT-- bool(false) diff --git a/ext/phar/tests/phar_extract.phpt b/ext/phar/tests/phar_extract.phpt index 9f5faa8d2a5..7d50a3bed74 100644 --- a/ext/phar/tests/phar_extract.phpt +++ b/ext/phar/tests/phar_extract.phpt @@ -105,30 +105,27 @@ try { ?> --CLEAN-- --EXPECTF-- %sextract%cfile1.txt diff --git a/ext/phar/tests/phar_gobyebye.phpt b/ext/phar/tests/phar_gobyebye.phpt index 7ad8e18ce28..4db6e0d91cd 100644 --- a/ext/phar/tests/phar_gobyebye.phpt +++ b/ext/phar/tests/phar_gobyebye.phpt @@ -27,8 +27,10 @@ opendir("foo/hi"); include $pname . '/foo/hi'; ?> --CLEAN-- - - + --EXPECTF-- Warning: readfile(foo/hi): Failed to open stream: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d diff --git a/ext/phar/tests/phar_oo_compressallbz2.phpt b/ext/phar/tests/phar_oo_compressallbz2.phpt index 7a0fbfc7b74..16f8f22a4ee 100644 --- a/ext/phar/tests/phar_oo_compressallbz2.phpt +++ b/ext/phar/tests/phar_oo_compressallbz2.phpt @@ -43,7 +43,6 @@ var_dump($phar['b']->isCompressed(Phar::BZ2)); ?> --CLEAN-- --EXPECT-- diff --git a/ext/phar/tests/phar_oo_compressallgz.phpt b/ext/phar/tests/phar_oo_compressallgz.phpt index d6d75da6a78..c0b8ea9da2d 100644 --- a/ext/phar/tests/phar_oo_compressallgz.phpt +++ b/ext/phar/tests/phar_oo_compressallgz.phpt @@ -47,7 +47,6 @@ echo $e->getMessage() . "\n"; ?> --CLEAN-- --EXPECT-- diff --git a/ext/phar/tests/phar_oo_getmodified.phpt b/ext/phar/tests/phar_oo_getmodified.phpt index 27d4928de77..64bc109f933 100644 --- a/ext/phar/tests/phar_oo_getmodified.phpt +++ b/ext/phar/tests/phar_oo_getmodified.phpt @@ -26,7 +26,6 @@ var_dump($phar->getModified()); ?> --CLEAN-- --EXPECT-- diff --git a/ext/phar/tests/phar_oo_nosig.phpt b/ext/phar/tests/phar_oo_nosig.phpt index ff30c0a3b9b..68b0ae18a76 100644 --- a/ext/phar/tests/phar_oo_nosig.phpt +++ b/ext/phar/tests/phar_oo_nosig.phpt @@ -14,8 +14,7 @@ var_dump($phar->getSignature()); ?> --CLEAN-- --EXPECT-- bool(false) diff --git a/ext/phar/tests/phar_oo_uncompressall.phpt b/ext/phar/tests/phar_oo_uncompressall.phpt index ec680a6e4d7..d39f0308b88 100644 --- a/ext/phar/tests/phar_oo_uncompressall.phpt +++ b/ext/phar/tests/phar_oo_uncompressall.phpt @@ -51,7 +51,6 @@ var_dump($phar['a']->isCompressed()); ?> --CLEAN-- --EXPECT-- diff --git a/ext/phar/tests/phar_setalias.phpt b/ext/phar/tests/phar_setalias.phpt index e140aae3b9a..bd52e680786 100644 --- a/ext/phar/tests/phar_setalias.phpt +++ b/ext/phar/tests/phar_setalias.phpt @@ -26,8 +26,6 @@ echo $phar->getAlias() . "\n"; --CLEAN-- --EXPECT-- hio diff --git a/ext/phar/tests/phar_setalias2.phpt b/ext/phar/tests/phar_setalias2.phpt index d248873f2c8..7944af8330b 100644 --- a/ext/phar/tests/phar_setalias2.phpt +++ b/ext/phar/tests/phar_setalias2.phpt @@ -38,9 +38,6 @@ try { --CLEAN-- --EXPECTF-- hio diff --git a/ext/phar/tests/stat2_5.3.phpt b/ext/phar/tests/stat2_5.3.phpt index 0dae17d88b6..0696d351c58 100644 --- a/ext/phar/tests/stat2_5.3.phpt +++ b/ext/phar/tests/stat2_5.3.phpt @@ -33,8 +33,10 @@ __HALT_COMPILER();'); include $fname3; ?> --CLEAN-- - - + --EXPECT-- bool(true) is_link diff --git a/ext/phar/tests/tar/bignames_overflow.phpt b/ext/phar/tests/tar/bignames_overflow.phpt index d992bbeb77a..411c25a3f02 100644 --- a/ext/phar/tests/tar/bignames_overflow.phpt +++ b/ext/phar/tests/tar/bignames_overflow.phpt @@ -7,7 +7,6 @@ phar.require_hash=0 --FILE-- getContent() . "\n" --CLEAN-- --EXPECT-- a diff --git a/ext/phar/tests/tar/create_new_phar_b.phpt b/ext/phar/tests/tar/create_new_phar_b.phpt index 4b61403f27b..7ec06f42931 100644 --- a/ext/phar/tests/tar/create_new_phar_b.phpt +++ b/ext/phar/tests/tar/create_new_phar_b.phpt @@ -12,9 +12,6 @@ file_put_contents('phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.pha 'brand new!'); include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar/a.php'; ?> - ---CLEAN-- - --EXPECTF-- Warning: file_put_contents(phar://%screate_new_phar_b.phar.tar/a.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d diff --git a/ext/phar/tests/tar/phar_buildfromiterator5.phpt b/ext/phar/tests/tar/phar_buildfromiterator5.phpt index bcfbc0715ea..27d9dc323b4 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator5.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator5.phpt @@ -44,11 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> ---CLEAN-- - --EXPECTF-- rewind valid diff --git a/ext/phar/tests/tar/phar_buildfromiterator6.phpt b/ext/phar/tests/tar/phar_buildfromiterator6.phpt index addacc26f1a..91820369799 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator6.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator6.phpt @@ -44,11 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> ---CLEAN-- - --EXPECTF-- rewind valid diff --git a/ext/phar/tests/tar/phar_buildfromiterator7.phpt b/ext/phar/tests/tar/phar_buildfromiterator7.phpt index 6eee23929d0..297b40b5eed 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator7.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator7.phpt @@ -44,11 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> ---CLEAN-- - --EXPECTF-- rewind valid diff --git a/ext/phar/tests/tar/phar_convert_phar.phpt b/ext/phar/tests/tar/phar_convert_phar.phpt index 61ec4e1102d..c25ed7c556b 100644 --- a/ext/phar/tests/tar/phar_convert_phar.phpt +++ b/ext/phar/tests/tar/phar_convert_phar.phpt @@ -39,7 +39,6 @@ var_dump(strlen($phar->getStub())); getStub())); unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.gz'); unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); -unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.gz'); unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.phar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/tar/phar_convert_phar3.phpt b/ext/phar/tests/tar/phar_convert_phar3.phpt index bca4e3d3a89..c0acae3638a 100644 --- a/ext/phar/tests/tar/phar_convert_phar3.phpt +++ b/ext/phar/tests/tar/phar_convert_phar3.phpt @@ -43,8 +43,6 @@ unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.bz2'); unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.phar'); unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); -unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.bz2'); -__HALT_COMPILER(); ?> --EXPECT-- bool(false) diff --git a/ext/phar/tests/tar/phar_convert_phar4.phpt b/ext/phar/tests/tar/phar_convert_phar4.phpt index 0b61a181988..6046854114f 100644 --- a/ext/phar/tests/tar/phar_convert_phar4.phpt +++ b/ext/phar/tests/tar/phar_convert_phar4.phpt @@ -48,8 +48,6 @@ unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.gz'); unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.phar'); unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); -unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.gz'); -__HALT_COMPILER(); ?> --EXPECT-- bool(false) diff --git a/ext/phar/tests/tar/phar_setalias.phpt b/ext/phar/tests/tar/phar_setalias.phpt index 3408f515aa9..dd8be1ac0e3 100644 --- a/ext/phar/tests/tar/phar_setalias.phpt +++ b/ext/phar/tests/tar/phar_setalias.phpt @@ -9,7 +9,7 @@ phar.readonly=0 setStub(''); @@ -40,6 +40,7 @@ echo $a->getAlias() . "\n"; --CLEAN-- --EXPECT-- hio diff --git a/ext/phar/tests/tar/truncated.phpt b/ext/phar/tests/tar/truncated.phpt index 183c2148bc5..95ed3c1c752 100644 --- a/ext/phar/tests/tar/truncated.phpt +++ b/ext/phar/tests/tar/truncated.phpt @@ -10,11 +10,6 @@ try { echo $e->getMessage() . "\n"; } -?> ---CLEAN-- - --EXPECTF-- phar error: "%strunc.tar" is a corrupted tar file (truncated) diff --git a/ext/phar/tests/test_unset.phpt b/ext/phar/tests/test_unset.phpt index 5f593dd4c50..8aa422cb072 100644 --- a/ext/phar/tests/test_unset.phpt +++ b/ext/phar/tests/test_unset.phpt @@ -32,7 +32,6 @@ var_dump(file_exists($fname)); ?> --CLEAN-- - --EXPECTF-- NULL diff --git a/ext/phar/tests/zip/all.phpt b/ext/phar/tests/zip/all.phpt index 440d59b00dd..937bfbd0e44 100644 --- a/ext/phar/tests/zip/all.phpt +++ b/ext/phar/tests/zip/all.phpt @@ -41,8 +41,10 @@ var_dump($phar->getMetadata()); var_dump($phar['a']->getMetadata()); ?> --CLEAN-- - - + --EXPECT-- bool(false) bool(false) diff --git a/ext/phar/tests/zip/create_new_phar_b.phpt b/ext/phar/tests/zip/create_new_phar_b.phpt index cf70abfddaa..0f4e239f91d 100644 --- a/ext/phar/tests/zip/create_new_phar_b.phpt +++ b/ext/phar/tests/zip/create_new_phar_b.phpt @@ -12,9 +12,6 @@ file_put_contents('phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.pha 'brand new!'); include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip/a.php'; ?> - ---CLEAN-- - --EXPECTF-- Warning: file_put_contents(phar://%screate_new_phar_b.phar.zip/a.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d diff --git a/ext/phar/tests/zip/phar_buildfromiterator5.phpt b/ext/phar/tests/zip/phar_buildfromiterator5.phpt index dafd6ceda76..fb34f090954 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator5.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator5.phpt @@ -44,11 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> ---CLEAN-- - --EXPECTF-- rewind valid diff --git a/ext/phar/tests/zip/phar_buildfromiterator6.phpt b/ext/phar/tests/zip/phar_buildfromiterator6.phpt index 491fada9548..9d9140bc343 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator6.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator6.phpt @@ -44,11 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> ---CLEAN-- - --EXPECTF-- rewind valid diff --git a/ext/phar/tests/zip/phar_buildfromiterator7.phpt b/ext/phar/tests/zip/phar_buildfromiterator7.phpt index 4129c6b2325..f62be404a1e 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator7.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator7.phpt @@ -44,11 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> ---CLEAN-- - --EXPECTF-- rewind valid diff --git a/ext/session/tests/session_save_path_variation4.phpt b/ext/session/tests/session_save_path_variation4.phpt index dd68988805d..673fe243c4e 100644 --- a/ext/session/tests/session_save_path_variation4.phpt +++ b/ext/session/tests/session_save_path_variation4.phpt @@ -41,7 +41,7 @@ ob_end_flush(); --EXPECTF-- *** Testing session_save_path() : variation *** diff --git a/ext/session/tests/session_save_path_variation5.phpt b/ext/session/tests/session_save_path_variation5.phpt index f4cbfa637b6..1ea8afc66e3 100644 --- a/ext/session/tests/session_save_path_variation5.phpt +++ b/ext/session/tests/session_save_path_variation5.phpt @@ -38,7 +38,7 @@ ob_end_flush(); --EXPECTF-- *** Testing session_save_path() : variation ***