Skip to content

Commit 94c92f0

Browse files
committed
More windows fixes
1 parent 46ee57e commit 94c92f0

5 files changed

+3
-10
lines changed

ext/spl/tests/SplFileInfo_getExtension_basic.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ foreach ($exts as $ext) {
1515
$file = md5('SplFileInfo::getExtension');
1616
$exts = array('.txt', '.extension', '..', '.', '');
1717
foreach ($exts as $ext) {
18-
unlink($file . $ext);
18+
@unlink($file . $ext);
1919
}
2020
?>
2121
--EXPECT--

ext/standard/tests/file/005_variation-win32.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ unlink($file_path."/005_variation_softlink.tmp");
139139
unlink($file_path."/005_variation_hardlink.tmp");
140140
unlink($file_path."/005_variation1.tmp");
141141
unlink($file_path."/005_variation_copy.tmp");
142-
unlink($file_path."/005_variation_touch.tmp");
142+
@unlink($file_path."/005_variation_touch.tmp");
143143
unlink($file_path."/005_variation_touch_fly.tmp");
144144
unlink($file_path."/005_variation_touch_new.tmp");
145145
?>

ext/standard/tests/file/rename_variation1-win32.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ echo "Done\n";
5555
--CLEAN--
5656
<?php
5757
$file_path = __DIR__;
58-
unlink($file_path."/rename_variation_link.tmp");
59-
unlink($file_path."/rename_variation.tmp");
6058
rmdir($file_path."/rename_variation_dir");
6159
?>
6260
--EXPECT--

ext/standard/tests/file/rename_variation2-win32.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,12 @@ var_dump( rename($file_path."/rename_variation2_dir/", $file_path."/12345") );
3434
var_dump( file_exists($file_path."/rename_variation2_dir" ) ); // expecting false
3535
var_dump( file_exists($file_path."/12345" ) ); // expecting true
3636

37-
rmdir($file_path."/12345");
38-
3937
echo "Done\n";
4038
?>
4139
--CLEAN--
4240
<?php
4341
$file_path = __DIR__;
44-
unlink($file_path."/rename_variation2.tmp");
45-
rmdir($file_path."/rename_variation2_dir");
42+
rmdir($file_path."/12345");
4643
?>
4744
--EXPECT--
4845
*** Testing rename() by renaming a file and directory to numeric name ***

ext/standard/tests/file/rename_variation3-win32.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ echo "Done\n";
5151
--CLEAN--
5252
<?php
5353
$file_path = __DIR__;
54-
unlink($file_path."/rename_variation3.tmp");
55-
rmdir($file_path."/rename_variation3_dir");
5654
rmdir($file_path."/rename_variation3.tmp");
5755
?>
5856
--EXPECTF--

0 commit comments

Comments
 (0)