Skip to content

Commit 7a41156

Browse files
committed
Fix some more CLEAN sections
1 parent 2ab4482 commit 7a41156

File tree

8 files changed

+4
-19
lines changed

8 files changed

+4
-19
lines changed

ext/pgsql/tests/80_bug36625.phpt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,11 @@ array_walk($trace, 'search_trace_file');
3939
var_dump($found > 0);
4040
var_dump(file_exists($tracefile));
4141

42-
@unlink($tracefile);
43-
4442
?>
4543
--CLEAN--
4644
<?php
47-
4845
$tracefile = __DIR__ . '/trace.tmp';
49-
5046
unlink($tracefile);
51-
5247
?>
5348
--EXPECTF--
5449
bool(false)

ext/phar/tests/tar/phar_setalias.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ echo $a->getAlias() . "\n";
4040
--CLEAN--
4141
<?php
4242
unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
43-
unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phartmp.tar');
44-
__HALT_COMPILER();
4543
?>
4644
--EXPECT--
4745
hio

ext/phar/tests/tar/phar_setalias2.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ try {
4242
--CLEAN--
4343
<?php
4444
unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
45-
unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phartmp.tar');
46-
__HALT_COMPILER();
4745
?>
4846
--EXPECTF--
4947
hio

ext/standard/tests/file/filegroup_variation2.phpt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ foreach( $filenames as $filename ) {
3030
clearstatcache();
3131
}
3232
?>
33-
--CLEAN--
34-
<?php
35-
$file_path = __DIR__;
36-
unlink($file_path."/filegroup_variation2.tmp");
37-
?>
3833
--EXPECTF--
3934
*** Testing Invalid file types ***
4035

ext/standard/tests/file/rename_variation8.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ echo "Done\n";
4141
?>
4242
--CLEAN--
4343
<?php
44-
unlink(__DIR__."/rename_basic_new2.tmp");
4544
rmdir(__DIR__."/rename_basic_dir1");
4645
?>
4746
--EXPECTF--

ext/standard/tests/file/stream_copy_to_stream_empty.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ stream_copy_to_stream() from empty file
33
--FILE--
44
<?php
55

6-
$tmp_empty_file = __FILE__ . ".tmp";
6+
$tmp_empty_file = __DIR__ . "/stream_copy_to_stream_empty.tmp";
77
file_put_contents($tmp_empty_file, "");
88

99
$in = fopen($tmp_empty_file, 'r');
@@ -13,7 +13,7 @@ var_dump(stream_copy_to_stream($in, $out));
1313
?>
1414
--CLEAN--
1515
<?php
16-
unlink(__FILE__ . ".tmp");
16+
unlink(__DIR__ . "/stream_copy_to_stream_empty.tmp");
1717
?>
1818
--EXPECT--
1919
int(0)

ext/standard/tests/file/windows_links/bug78862.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ Stack trace:
1414
thrown in %s on line %d
1515
--CLEAN--
1616
<?php
17-
unlink(__DIR__ . '/bug78862.link');
17+
unlink(__DIR__ . '/bug78862.target');
1818
?>

ext/zip/tests/oo_getstatusstring.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ $arch->close();
2020
?>
2121
--CLEAN--
2222
<?php
23-
unlink($dirname.'foo.zip');
23+
unlink(__DIR__.'/foo.zip');
2424
?>
2525
--EXPECT--
2626
string(8) "No error"

0 commit comments

Comments
 (0)