Skip to content

Commit

Permalink
Merge branch 'PHP-7.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
@nikic
nikic committed Jul 25, 2019
2 parents 02cdef5 + 1cbcf0f commit 8d39510
Show file tree
Hide file tree
Showing 33 changed files with 913 additions and 627 deletions.
5 changes: 2 additions & 3 deletions ext/fileinfo/tests/bug61964-mb.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,10 @@ rmdir($dir);
?>
===DONE===
--EXPECTF--
bool(false)
bool(false)%A
resource(%d) of type (file_info)
resource(%d) of type (file_info)
bool(false)

bool(false)%A
Notice: finfo_open(): Warning: offset `string' invalid in %sbug61964-mb.php on line %d

Notice: finfo_open(): Warning: offset ` Core' invalid in %sbug61964-mb.php on line %d
Expand Down
5 changes: 2 additions & 3 deletions ext/fileinfo/tests/bug61964.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,10 @@ rmdir($dir);
?>
===DONE===
--EXPECTF--
bool(false)
bool(false)%A
resource(%d) of type (file_info)
resource(%d) of type (file_info)
bool(false)

bool(false)%A
Notice: finfo_open(): Warning: offset `string' invalid in %sbug61964.php on line %d

Notice: finfo_open(): Warning: offset ` Core' invalid in %sbug61964.php on line %d
Expand Down
2 changes: 2 additions & 0 deletions ext/standard/tests/file/007_variation1.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ int(0)
string(20) "line
line of text
li"

Notice: fwrite(): write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
bool(true)
string(7) "Unknown"
Expand Down
2 changes: 2 additions & 0 deletions ext/standard/tests/file/007_variation11-win32-mb.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ string(6) "stream"
int(0)
int(37)
int(37)

Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(true)
Expand Down
2 changes: 2 additions & 0 deletions ext/standard/tests/file/007_variation11-win32.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ string(6) "stream"
int(0)
int(37)
int(37)

Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(true)
Expand Down
2 changes: 2 additions & 0 deletions ext/standard/tests/file/007_variation11.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ string(6) "stream"
int(0)
int(37)
int(37)

Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(true)
Expand Down
2 changes: 2 additions & 0 deletions ext/standard/tests/file/007_variation13-win32.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ unlink(__DIR__."/007_variation13.tmp");
resource(%d) of type (stream)
string(6) "stream"
int(37)

Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(true)
Expand Down
2 changes: 2 additions & 0 deletions ext/standard/tests/file/007_variation13.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ unlink(__DIR__."/007_variation13.tmp");
resource(%d) of type (stream)
string(6) "stream"
int(37)

Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(true)
Expand Down
2 changes: 2 additions & 0 deletions ext/standard/tests/file/007_variation15.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ string(6) "stream"
int(0)
int(37)
int(37)

Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(true)
Expand Down
2 changes: 2 additions & 0 deletions ext/standard/tests/file/007_variation17.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ int(0)
string(20) "line
line of text
li"

Notice: fwrite(): write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
bool(true)
string(7) "Unknown"
Expand Down
2 changes: 2 additions & 0 deletions ext/standard/tests/file/007_variation19.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ string(6) "stream"
int(0)
int(37)
int(37)

Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(true)
Expand Down
2 changes: 2 additions & 0 deletions ext/standard/tests/file/007_variation21.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ unlink(__DIR__."/007_variation21.tmp");
resource(%d) of type (stream)
string(6) "stream"
int(37)

Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(true)
Expand Down
2 changes: 2 additions & 0 deletions ext/standard/tests/file/007_variation23.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ string(6) "stream"
int(0)
int(37)
int(37)

Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(true)
Expand Down
2 changes: 2 additions & 0 deletions ext/standard/tests/file/007_variation3.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ string(6) "stream"
int(0)
int(37)
int(37)

Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(true)
Expand Down
2 changes: 2 additions & 0 deletions ext/standard/tests/file/007_variation5.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ unlink(__DIR__."/007_variation5.tmp");
resource(%d) of type (stream)
string(6) "stream"
int(37)

Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(true)
Expand Down
2 changes: 2 additions & 0 deletions ext/standard/tests/file/007_variation7.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ string(6) "stream"
int(0)
int(37)
int(37)

Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(true)
Expand Down
2 changes: 2 additions & 0 deletions ext/standard/tests/file/007_variation9.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ int(0)
string(20) "line
line of text
li"

Notice: fwrite(): write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
bool(true)
string(7) "Unknown"
Expand Down
3 changes: 2 additions & 1 deletion ext/standard/tests/file/bug35781.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ var_dump(file_get_contents($filename));

echo "Done\n";
?>
--EXPECT--
--EXPECTF--
Notice: fpassthru(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
string(15) "Guvf vf n grfg
"
Done
20 changes: 19 additions & 1 deletion ext/standard/tests/file/fgetc_variation3.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,68 +49,86 @@ foreach ($file_modes as $file_mode ) {

echo "Done\n";
?>
--EXPECT--
--EXPECTF--
*** Testing fgetc() with file opened in write only mode ***
-- File opened in mode : w --
bool(true)
int(0)
bool(false)

Notice: fgetc(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(false)
-- File opened in mode : wb --
bool(true)
int(0)
bool(false)

Notice: fgetc(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(false)
-- File opened in mode : wt --
bool(true)
int(0)
bool(false)

Notice: fgetc(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(false)
-- File opened in mode : a --
bool(true)
int(0)
bool(false)

Notice: fgetc(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(false)
-- File opened in mode : ab --
bool(true)
int(0)
bool(false)

Notice: fgetc(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(false)
-- File opened in mode : at --
bool(true)
int(0)
bool(false)

Notice: fgetc(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(false)
-- File opened in mode : x --
bool(true)
int(0)
bool(false)

Notice: fgetc(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(false)
-- File opened in mode : xb --
bool(true)
int(0)
bool(false)

Notice: fgetc(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(false)
-- File opened in mode : xt --
bool(true)
int(0)
bool(false)

Notice: fgetc(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
bool(false)
int(0)
bool(false)
Expand Down
Loading

0 comments on commit 8d39510

Please sign in to comment.