Fix CLEAN sections

ext/phar/tests/bug65414.phpt

@@ -24,10 +24,6 @@ foreach ($bads as $bad) {
 }
 echo 'done' . PHP_EOL;
 ?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/bug65414.phar');
-?>
 --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

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--
-<?php
-$file = __DIR__ . DIRECTORY_SEPARATOR . 'bug66960.phar';
-unlink($file);
-?>
 --EXPECT--
 bool(false)
 bool(false)

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--
-<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --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
 

ext/phar/tests/invalid_alias.phpt

@@ -32,10 +32,6 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar');
-?>
 --EXPECTF--
 Invalid alias "hi/" specified for phar "%sinvalid_alias.phar"
 Invalid alias "hi\l" specified for phar "%sinvalid_alias.phar"

ext/phar/tests/invalid_setstubalias.phpt

@@ -32,11 +32,6 @@ try {
     echo $e->getMessage() . "\n";
 }
 
-?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip');
 ?>
 --EXPECTF--
 Cannot set stub ".phar/stub.php" directly in phar "%sinvalid_setstubalias.phar.tar", use setStub

ext/phar/tests/phar_buildfromdirectory1.phpt

@@ -16,11 +16,6 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/buildfromdirectory1.phar');
-__HALT_COMPILER();
-?>
 --EXPECTF--
 %s(24) "UnexpectedValueException"
 Cannot write to archive - write operations restricted by INI setting

ext/phar/tests/phar_buildfromdirectory2.phpt

@@ -19,11 +19,6 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/buildfromdirectory2.phar');
-__HALT_COMPILER();
-?>
 --EXPECTF--
 %s(24) "UnexpectedValueException"
 RecursiveDirectoryIterator::__construct(1): Failed to open directory: No such file or directory

ext/phar/tests/phar_buildfromdirectory6.phpt

@@ -26,7 +26,6 @@ var_dump(file_exists(__DIR__ . '/buildfromdirectory6.phar'));
 ?>
 --CLEAN--
 <?php
-unlink(__DIR__ . '/buildfromdirectory6.phar');
 foreach(range(1, 4) as $i) {
     unlink(__DIR__ . "/testdir6/file$i.txt");
 }

ext/phar/tests/phar_buildfromiterator1.phpt

@@ -17,11 +17,6 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/buildfromiterator1.phar');
-__HALT_COMPILER();
-?>
 --EXPECTF--
 %s(24) "UnexpectedValueException"
 Cannot write out phar archive, phar is read-only

ext/phar/tests/phar_buildfromiterator5.phpt

@@ -44,11 +44,6 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/buildfromiterator5.phar');
-__HALT_COMPILER();
-?>
 --EXPECTF--
 rewind
 valid

ext/phar/tests/phar_buildfromiterator6.phpt

@@ -44,11 +44,6 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/buildfromiterator6.phar');
-__HALT_COMPILER();
-?>
 --EXPECTF--
 rewind
 valid

ext/phar/tests/phar_buildfromiterator7.phpt

@@ -44,11 +44,6 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/buildfromiterator7.phar');
-__HALT_COMPILER();
-?>
 --EXPECTF--
 rewind
 valid

ext/phar/tests/phar_convert_again.phpt

@@ -155,11 +155,8 @@ echo $e->getMessage() . "\n";
 --CLEAN--
 <?php
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar');
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.gz');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.zip');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar.gz');
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar.bz2');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.tbz');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '2.phar');

ext/phar/tests/phar_convert_repeated.phpt

@@ -94,8 +94,6 @@ unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.2.phar.zip');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.2.2.phar.tar');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.2.2.3.phar.zip');
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.3.phar.tar');
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.3.phar');
 ?>
 --EXPECTF--
 =================== new Phar() =======================

ext/phar/tests/phar_convert_repeated_b.phpt

@@ -77,15 +77,10 @@ try {
 ?>
 --CLEAN--
 <?php
-echo __DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.gz' . "\n";
-
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.gz');
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar.gz');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.1.2.tar');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.zip');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.1.zip');
-
 ?>
 --EXPECT--
 =================== new PharData() ==================

ext/phar/tests/phar_convert_tar2.phpt

@@ -44,7 +44,6 @@ var_dump($phar->getStub());
 --CLEAN--
 <?php
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.gz');
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 ?>

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 = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>';
 $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());
 <?php
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.bz2');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar');
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
-__HALT_COMPILER();
 ?>
 --EXPECT--
 bool(false)

ext/phar/tests/phar_extract.phpt

@@ -105,30 +105,27 @@ try {
 ?>
 --CLEAN--
 <?php
-@rmdir(__DIR__ . '/whatever');
+unlink(__DIR__ . '/oops');
-@unlink(__DIR__ . '/oops');
+rmdir(__DIR__ . '/oops1');
-@rmdir(__DIR__ . '/oops1');
+unlink(__DIR__ . '/tempmanifest1.phar.php');
-@unlink(__DIR__ . '/tempmanifest1.phar.php');
 $e = __DIR__ . '/extract/';
-@unlink($e . 'file1.txt');
+unlink($e . 'file1.txt');
-@unlink($e . 'file2.txt');
+unlink($e . 'file2.txt');
-@unlink($e . 'subdir/ectory/file.txt');
+unlink($e . 'subdir/ectory/file.txt');
-@rmdir($e . 'subdir/ectory');
+rmdir($e . 'subdir/ectory');
-@rmdir($e . 'subdir');
+rmdir($e . 'subdir');
-@rmdir($e . 'one/level');
+rmdir($e . 'one');
-@rmdir($e . 'one');
+rmdir($e);
-@rmdir($e);
 $e = __DIR__ . '/extract1/';
-@unlink($e . 'file1.txt');
+unlink($e . 'file1.txt');
-@unlink($e . 'subdir/ectory/file.txt');
+unlink($e . 'subdir/ectory/file.txt');
-@rmdir($e . 'subdir/ectory');
+rmdir($e . 'subdir/ectory');
-@rmdir($e . 'subdir');
+rmdir($e . 'subdir');
-@rmdir($e);
+rmdir($e);
 $e = __DIR__ . '/extract1-2/';
-@unlink($e . 'file2.txt');
+unlink($e . 'file2.txt');
-@rmdir($e . 'one/level');
+rmdir($e . 'one');
-@rmdir($e . 'one');
+rmdir($e);
-@rmdir($e);
 ?>
 --EXPECTF--
 %sextract%cfile1.txt

ext/phar/tests/phar_gobyebye.phpt

@@ -27,8 +27,10 @@ opendir("foo/hi");
 include $pname . '/foo/hi';
 ?>
 --CLEAN--
-<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
+<?php
-<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.php'); ?>
+@unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
+unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.php');
+?>
 --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
 

ext/phar/tests/phar_oo_compressallbz2.phpt

@@ -43,7 +43,6 @@ var_dump($phar['b']->isCompressed(Phar::BZ2));
 ?>
 --CLEAN--
 <?php
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 ?>
 --EXPECT--

ext/phar/tests/phar_oo_compressallgz.phpt

@@ -47,7 +47,6 @@ echo $e->getMessage() . "\n";
 ?>
 --CLEAN--
 <?php
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 ?>
 --EXPECT--

ext/phar/tests/phar_oo_getmodified.phpt

@@ -26,7 +26,6 @@ var_dump($phar->getModified());
 ?>
 --CLEAN--
 <?php
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 ?>
 --EXPECT--

ext/phar/tests/phar_oo_nosig.phpt

@@ -14,8 +14,7 @@ var_dump($phar->getSignature());
 ?>
 --CLEAN--
 <?php
-unlink(__DIR__ . '/files/phar_oo_test.phar.php');
+unlink(__DIR__ . '/files/phar_oo_nosig.phar.php');
-__halt_compiler();
 ?>
 --EXPECT--
 bool(false)

ext/phar/tests/phar_oo_uncompressall.phpt

@@ -51,7 +51,6 @@ var_dump($phar['a']->isCompressed());
 ?>
 --CLEAN--
 <?php
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 ?>
 --EXPECT--

ext/phar/tests/phar_setalias.phpt

@@ -26,8 +26,6 @@ echo $phar->getAlias() . "\n";
 --CLEAN--
 <?php
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php');
-__HALT_COMPILER();
 ?>
 --EXPECT--
 hio

ext/phar/tests/phar_setalias2.phpt

@@ -38,9 +38,6 @@ try {
 --CLEAN--
 <?php
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php');
-unlink(__DIR__ . '/notphar.phar');
-__HALT_COMPILER();
 ?>
 --EXPECTF--
 hio

ext/phar/tests/stat2_5.3.phpt

@@ -33,8 +33,10 @@ __HALT_COMPILER();');
 include $fname3;
 ?>
 --CLEAN--
-<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
+<?php
-<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?>
+unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
+@unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar');
+?>
 --EXPECT--
 bool(true)
 is_link

ext/phar/tests/tar/bignames_overflow.phpt

@@ -7,7 +7,6 @@ phar.require_hash=0
 --FILE--
 <?php
 $fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.tar';
-$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.2.tar';
 $pname = 'phar://' . $fname;
 
 include __DIR__ . '/files/make.dangerous.tar.php.inc';
@@ -29,7 +28,6 @@ echo $p1[str_repeat('a', 155) . '/' . str_repeat('a', 100)]->getContent() . "\n"
 --CLEAN--
 <?php
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar');
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.tar');
 ?>
 --EXPECT--
 a

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--
-<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
 --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
 

ext/phar/tests/tar/phar_buildfromiterator5.phpt

@@ -44,11 +44,6 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/buildfromiterator.phar.tar');
-__HALT_COMPILER();
-?>
 --EXPECTF--
 rewind
 valid

ext/phar/tests/tar/phar_buildfromiterator6.phpt

@@ -44,11 +44,6 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/buildfromiterator.phar.tar');
-__HALT_COMPILER();
-?>
 --EXPECTF--
 rewind
 valid

ext/phar/tests/tar/phar_buildfromiterator7.phpt

@@ -44,11 +44,6 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/buildfromiterator.phar.tar');
-__HALT_COMPILER();
-?>
 --EXPECTF--
 rewind
 valid

ext/phar/tests/tar/phar_convert_phar.phpt

@@ -39,7 +39,6 @@ var_dump(strlen($phar->getStub()));
 <?php
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.tar');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar');
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.3.phar');
 __HALT_COMPILER();

ext/phar/tests/tar/phar_convert_phar2.phpt

@@ -42,7 +42,6 @@ var_dump(strlen($phar->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();
 ?>

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)

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)

ext/phar/tests/tar/phar_setalias.phpt

@@ -9,7 +9,7 @@ phar.readonly=0
 <?php
 
 $fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar';
-$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '2.phar.tar';
+$fname2 = __DIR__ . '/' . basename(__FILE__, '.php') . '.copy.phar.tar';
 
 $phar = new Phar($fname);
 $phar->setStub('<?php echo "first stub\n"; __HALT_COMPILER(); ?>');
@@ -40,6 +40,7 @@ echo $a->getAlias() . "\n";
 --CLEAN--
 <?php
 unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
+unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.copy.phar.tar');
 ?>
 --EXPECT--
 hio

ext/phar/tests/tar/truncated.phpt

@@ -10,11 +10,6 @@ try {
     echo $e->getMessage() . "\n";
 }
 
-?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
-unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar');
 ?>
 --EXPECTF--
 phar error: "%strunc.tar" is a corrupted tar file (truncated)

ext/phar/tests/test_unset.phpt

@@ -32,7 +32,6 @@ var_dump(file_exists($fname));
 
 ?>
 --CLEAN--
-<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); ?>
 --EXPECTF--
 NULL

ext/phar/tests/zip/all.phpt

@@ -41,8 +41,10 @@ var_dump($phar->getMetadata());
 var_dump($phar['a']->getMetadata());
 ?>
 --CLEAN--
-<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?>
+<?php
-<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip.php'); ?>
+@unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php');
+unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip.php');
+?>
 --EXPECT--
 bool(false)
 bool(false)

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--
-<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
 --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
 

ext/phar/tests/zip/phar_buildfromiterator5.phpt

@@ -44,11 +44,6 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/buildfromiterator.phar.zip');
-__HALT_COMPILER();
-?>
 --EXPECTF--
 rewind
 valid

ext/phar/tests/zip/phar_buildfromiterator6.phpt

@@ -44,11 +44,6 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/buildfromiterator.phar.zip');
-__HALT_COMPILER();
-?>
 --EXPECTF--
 rewind
 valid

ext/phar/tests/zip/phar_buildfromiterator7.phpt

@@ -44,11 +44,6 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/buildfromiterator.phar.zip');
-__HALT_COMPILER();
-?>
 --EXPECTF--
 rewind
 valid

ext/session/tests/session_save_path_variation4.phpt

@@ -41,7 +41,7 @@ ob_end_flush();
 <?php
 $initdir = __DIR__;
 $sessions = ($initdir."/session_save_path_variation4");
-var_dump(rmdir($sessions));
+rmdir($sessions);
 ?>
 --EXPECTF--
 *** Testing session_save_path() : variation ***

ext/session/tests/session_save_path_variation5.phpt

@@ -38,7 +38,7 @@ ob_end_flush();
 <?php
 $directory = __DIR__;
 $sessions = ($directory."/session_save_path_variation5");
-var_dump(rmdir($sessions));
+rmdir($sessions);
 ?>
 --EXPECTF--
 *** Testing session_save_path() : variation ***