Skip to content

Commit e206b68

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: ext/standard: Fix test conflict with I/O tests
2 parents c87f29f + 75f6132 commit e206b68

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

ext/standard/tests/filters/stream_filter_remove_basic.phpt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if(! in_array( "string.rot13", $filters )) die( "skip rot13 filter not available
99
<?php
1010
echo "*** Testing stream_filter_remove() : basic functionality ***\n";
1111

12-
$file = __DIR__ . DIRECTORY_SEPARATOR . 'streamfilterTest.txt';
12+
$file = __DIR__ . DIRECTORY_SEPARATOR . 'streamfilterTestBasics.txt';
1313
touch( $file );
1414

1515
$fp = fopen( $file, 'w+' );
@@ -27,10 +27,8 @@ fclose( $fp );
2727
?>
2828
--CLEAN--
2929
<?php
30-
31-
$file = __DIR__ . DIRECTORY_SEPARATOR . 'streamfilterTest.txt';
32-
unlink( $file );
33-
30+
$file = __DIR__ . DIRECTORY_SEPARATOR . 'streamfilterTestBasics.txt';
31+
@unlink($file);
3432
?>
3533
--EXPECT--
3634
*** Testing stream_filter_remove() : basic functionality ***

ext/standard/tests/filters/stream_filter_remove_error.phpt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if(! in_array( "string.rot13", $filters )) die( "skip rot13 filter not available
77
?>
88
--FILE--
99
<?php
10-
$file = __DIR__ . DIRECTORY_SEPARATOR . 'streamfilterTest.txt';
10+
$file = __DIR__ . DIRECTORY_SEPARATOR . 'streamfilterTestErrors.txt';
1111
touch( $file );
1212
$fp = fopen( $file, 'w+' );
1313
$filter = stream_filter_append( $fp, "string.rot13", STREAM_FILTER_WRITE );
@@ -35,10 +35,8 @@ fclose( $fp );
3535
?>
3636
--CLEAN--
3737
<?php
38-
39-
$file = __DIR__ . DIRECTORY_SEPARATOR . 'streamfilterTest.txt';
40-
unlink( $file );
41-
38+
$file = __DIR__ . DIRECTORY_SEPARATOR . 'streamfilterTestErrors.txt';
39+
@unlink($file);
4240
?>
4341
--EXPECT--
4442
*** Testing stream_filter_remove() : error conditions ***

0 commit comments

Comments
 (0)