archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3'

Browse source 
* PHP-8.3:
  ext/standard: Fix test conflict with I/O tests
This commit is contained in:
Gina Peter Banyard 2024-06-02 17:03:57 +01:00
commit d2a932b8af
No known key found for this signature in database
GPG key ID: 3306078E3194AEBD
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/standard/tests/filters/stream_filter_remove_basic.phpt
View file

@ -9,7 +9,7 @@ if(! in_array( "string.rot13", $filters )) die( "skip rot13 filter not available
<?php <?php
echo "*** Testing stream_filter_remove() : basic functionality ***\n"; echo "*** Testing stream_filter_remove() : basic functionality ***\n";
$file = __DIR__ . DIRECTORY_SEPARATOR . 'streamfilterTest.txt'; $file = __DIR__ . DIRECTORY_SEPARATOR . 'streamfilterTestBasics.txt';
touch( $file ); touch( $file );
$fp = fopen( $file, 'w+' ); $fp = fopen( $file, 'w+' );
@ -27,10 +27,8 @@ fclose( $fp );
?> ?>
--CLEAN-- --CLEAN--
<?php <?php
$file = __DIR__ . DIRECTORY_SEPARATOR . 'streamfilterTestBasics.txt';
$file = __DIR__ . DIRECTORY_SEPARATOR . 'streamfilterTest.txt'; @unlink($file);
unlink( $file );
?> ?>
--EXPECT-- --EXPECT--
*** Testing stream_filter_remove() : basic functionality *** *** Testing stream_filter_remove() : basic functionality ***

8
ext/standard/tests/filters/stream_filter_remove_error.phpt
View file

@ -7,7 +7,7 @@ if(! in_array( "string.rot13", $filters )) die( "skip rot13 filter not available
?> ?>
--FILE-- --FILE--
<?php <?php
$file = __DIR__ . DIRECTORY_SEPARATOR . 'streamfilterTest.txt'; $file = __DIR__ . DIRECTORY_SEPARATOR . 'streamfilterTestErrors.txt';
touch( $file ); touch( $file );
$fp = fopen( $file, 'w+' ); $fp = fopen( $file, 'w+' );
$filter = stream_filter_append( $fp, "string.rot13", STREAM_FILTER_WRITE ); $filter = stream_filter_append( $fp, "string.rot13", STREAM_FILTER_WRITE );
@ -35,10 +35,8 @@ fclose( $fp );
?> ?>
--CLEAN-- --CLEAN--
<?php <?php
$file = __DIR__ . DIRECTORY_SEPARATOR . 'streamfilterTestErrors.txt';
$file = __DIR__ . DIRECTORY_SEPARATOR . 'streamfilterTest.txt'; @unlink($file);
unlink( $file );
?> ?>
--EXPECT-- --EXPECT--
*** Testing stream_filter_remove() : error conditions *** *** Testing stream_filter_remove() : error conditions ***