ohill Thu Jul 3 20:19:27 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard file.c
/php-src/ext/standard/tests/file 007_error.phpt fflush_error.phpt
fgetc_error.phpt
fgetc_variation2.phpt
fgets_error.phpt
fgets_variation2.phpt
fgetss_error.phpt
fpassthru_error.phpt
fread_error.phpt
fseek_ftell_rewind_error1.phpt
fseek_ftell_rewind_error2.phpt
fseek_ftell_rewind_error3.phpt
ftruncate_error.phpt fwrite.phpt
fwrite_error.phpt
popen_pclose_error.phpt
umask_error.phpt
Log:
New parameter parsing API
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.14&r2=1.409.2.6.2.28.2.15&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.14
php-src/ext/standard/file.c:1.409.2.6.2.28.2.15
--- php-src/ext/standard/file.c:1.409.2.6.2.28.2.14 Fri May 16 12:44:11 2008
+++ php-src/ext/standard/file.c Thu Jul 3 20:19:26 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.409.2.6.2.28.2.14 2008/05/16 12:44:11 felipe Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.28.2.15 2008/07/03 20:19:26 ohill Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -895,14 +895,14 @@
Close an open file pointer */
PHPAPI PHP_FUNCTION(fclose)
{
- zval **arg1;
+ zval *arg1;
php_stream *stream;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) ==
FAILURE) {
+ RETURN_FALSE;
}
-
- PHP_STREAM_TO_ZVAL(stream, arg1);
+
+ PHP_STREAM_TO_ZVAL(stream, &arg1);
if (!stream->is_persistent) {
zend_list_delete(stream->rsrc_id);
} else {
@@ -996,14 +996,14 @@
Close a file pointer opened by popen() */
PHP_FUNCTION(pclose)
{
- zval **arg1;
+ zval *arg1;
php_stream *stream;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) ==
FAILURE) {
+ RETURN_FALSE;
}
- PHP_STREAM_TO_ZVAL(stream, arg1);
+ PHP_STREAM_TO_ZVAL(stream, &arg1);
zend_list_delete(stream->rsrc_id);
RETURN_LONG(FG(pclose_ret));
@@ -1014,14 +1014,14 @@
Test for end-of-file on a file pointer */
PHPAPI PHP_FUNCTION(feof)
{
- zval **arg1;
+ zval *arg1;
php_stream *stream;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) ==
FAILURE) {
+ RETURN_FALSE;
}
- PHP_STREAM_TO_ZVAL(stream, arg1);
+ PHP_STREAM_TO_ZVAL(stream, &arg1);
if (php_stream_eof(stream)) {
RETURN_TRUE;
@@ -1035,18 +1035,18 @@
Get a line from file pointer */
PHPAPI PHP_FUNCTION(fgets)
{
- zval **arg1, **arg2;
- int len = 1024;
+ zval *arg1;
+ long len = 1024;
char *buf = NULL;
int argc = ZEND_NUM_ARGS();
size_t line_len = 0;
php_stream *stream;
- if (argc < 1 || argc > 2 || zend_get_parameters_ex(argc, &arg1, &arg2)
== FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &arg1,
&len) == FAILURE) {
+ RETURN_FALSE;
}
- PHP_STREAM_TO_ZVAL(stream, arg1);
+ PHP_STREAM_TO_ZVAL(stream, &arg1);
if (argc == 1) {
/* ask streams to give us a buffer of an appropriate size */
@@ -1055,9 +1055,6 @@
goto exit_failed;
}
} else if (argc > 1) {
- convert_to_long_ex(arg2);
- len = Z_LVAL_PP(arg2);
-
if (len <= 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length
parameter must be greater than 0");
RETURN_FALSE;
@@ -1094,16 +1091,16 @@
Get a character from file pointer */
PHPAPI PHP_FUNCTION(fgetc)
{
- zval **arg1;
+ zval *arg1;
char buf[2];
int result;
php_stream *stream;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) ==
FAILURE) {
+ RETURN_FALSE;
}
- PHP_STREAM_TO_ZVAL(stream, arg1);
+ PHP_STREAM_TO_ZVAL(stream, &arg1);
result = php_stream_getc(stream);
@@ -1122,7 +1119,8 @@
Get a line from file pointer and strip HTML tags */
PHPAPI PHP_FUNCTION(fgetss)
{
- zval **fd, **bytes = NULL, **allow=NULL;
+ zval *fd;
+ long bytes = 0;
size_t len = 0;
size_t actual_len, retval_len;
char *buf = NULL, *retval;
@@ -1130,44 +1128,19 @@
char *allowed_tags=NULL;
int allowed_tags_len=0;
- switch(ZEND_NUM_ARGS()) {
- case 1:
- if (zend_get_parameters_ex(1, &fd) == FAILURE) {
- RETURN_FALSE;
- }
- break;
-
- case 2:
- if (zend_get_parameters_ex(2, &fd, &bytes) == FAILURE) {
- RETURN_FALSE;
- }
- break;
-
- case 3:
- if (zend_get_parameters_ex(3, &fd, &bytes, &allow) ==
FAILURE) {
- RETURN_FALSE;
- }
- convert_to_string_ex(allow);
- allowed_tags = Z_STRVAL_PP(allow);
- allowed_tags_len = Z_STRLEN_PP(allow);
- break;
-
- default:
- WRONG_PARAM_COUNT;
- /* NOTREACHED */
- break;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|ls", &fd,
&bytes, &allowed_tags, &allowed_tags_len) == FAILURE) {
+ RETURN_FALSE;
}
- PHP_STREAM_TO_ZVAL(stream, fd);
+ PHP_STREAM_TO_ZVAL(stream, &fd);
- if (bytes != NULL) {
- convert_to_long_ex(bytes);
- if (Z_LVAL_PP(bytes) <= 0) {
+ if (ZEND_NUM_ARGS() >= 2) {
+ if (bytes <= 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length
parameter must be greater than 0");
RETURN_FALSE;
}
- len = (size_t) Z_LVAL_PP(bytes);
+ len = (size_t) bytes;
buf = safe_emalloc(sizeof(char), (len + 1), 0);
/*needed because recv doesnt set null char at end*/
memset(buf, 0, len + 1);
@@ -1248,48 +1221,37 @@
Binary-safe file write */
PHPAPI PHP_FUNCTION(fwrite)
{
- zval **arg1, **arg2, **arg3=NULL;
+ zval *arg1;
+ char *arg2;
+ int arg2len;
int ret;
int num_bytes;
+ long arg3;
char *buffer = NULL;
php_stream *stream;
- switch (ZEND_NUM_ARGS()) {
- case 2:
- if (zend_get_parameters_ex(2, &arg1, &arg2)==FAILURE) {
- RETURN_FALSE;
- }
- convert_to_string_ex(arg2);
- num_bytes = Z_STRLEN_PP(arg2);
- break;
-
- case 3:
- if (zend_get_parameters_ex(3, &arg1, &arg2,
&arg3)==FAILURE) {
- RETURN_FALSE;
- }
- convert_to_string_ex(arg2);
- convert_to_long_ex(arg3);
- num_bytes = MAX(0, MIN(Z_LVAL_PP(arg3),
Z_STRLEN_PP(arg2)));
- break;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &arg1,
&arg2, &arg2len, &arg3) == FAILURE) {
+ RETURN_FALSE;
+ }
- default:
- WRONG_PARAM_COUNT;
- /* NOTREACHED */
- break;
+ if (ZEND_NUM_ARGS() == 2) {
+ num_bytes = arg2len;
+ } else {
+ num_bytes = MAX(0, MIN((int)arg3, arg2len));
}
if (!num_bytes) {
RETURN_LONG(0);
}
- PHP_STREAM_TO_ZVAL(stream, arg1);
+ PHP_STREAM_TO_ZVAL(stream, &arg1);
if (PG(magic_quotes_runtime)) {
- buffer = estrndup(Z_STRVAL_PP(arg2), num_bytes);
+ buffer = estrndup(arg2, num_bytes);
php_stripslashes(buffer, &num_bytes TSRMLS_CC);
}
- ret = php_stream_write(stream, buffer ? buffer : Z_STRVAL_PP(arg2),
num_bytes);
+ ret = php_stream_write(stream, buffer ? buffer : arg2, num_bytes);
if (buffer) {
efree(buffer);
}
@@ -1302,15 +1264,15 @@
Flushes output */
PHPAPI PHP_FUNCTION(fflush)
{
- zval **arg1;
+ zval *arg1;
int ret;
php_stream *stream;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) ==
FAILURE) {
+ RETURN_FALSE;
}
- PHP_STREAM_TO_ZVAL(stream, arg1);
+ PHP_STREAM_TO_ZVAL(stream, &arg1);
ret = php_stream_flush(stream);
if (ret) {
@@ -1324,14 +1286,14 @@
Rewind the position of a file pointer */
PHPAPI PHP_FUNCTION(rewind)
{
- zval **arg1;
+ zval *arg1;
php_stream *stream;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) ==
FAILURE) {
+ RETURN_FALSE;
}
- PHP_STREAM_TO_ZVAL(stream, arg1);
+ PHP_STREAM_TO_ZVAL(stream, &arg1);
if (-1 == php_stream_rewind(stream)) {
RETURN_FALSE;
@@ -1344,15 +1306,15 @@
Get file pointer's read/write position */
PHPAPI PHP_FUNCTION(ftell)
{
- zval **arg1;
+ zval *arg1;
long ret;
php_stream *stream;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) ==
FAILURE) {
+ RETURN_FALSE;
}
- PHP_STREAM_TO_ZVAL(stream, arg1);
+ PHP_STREAM_TO_ZVAL(stream, &arg1);
ret = php_stream_tell(stream);
if (ret == -1) {
@@ -1366,23 +1328,17 @@
Seek on a file pointer */
PHPAPI PHP_FUNCTION(fseek)
{
- zval **arg1, **arg2, **arg3;
- int argcount = ZEND_NUM_ARGS(), whence = SEEK_SET;
+ zval *arg1;
+ long arg2, whence = SEEK_SET;
php_stream *stream;
- if (argcount < 2 || argcount > 3 || zend_get_parameters_ex(argcount,
&arg1, &arg2, &arg3) == FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|l", &arg1,
&arg2, &whence) == FAILURE) {
+ RETURN_FALSE;
}
- PHP_STREAM_TO_ZVAL(stream, arg1);
-
- convert_to_long_ex(arg2);
- if (argcount > 2) {
- convert_to_long_ex(arg3);
- whence = Z_LVAL_PP(arg3);
- }
+ PHP_STREAM_TO_ZVAL(stream, &arg1);
- RETURN_LONG(php_stream_seek(stream, Z_LVAL_PP(arg2), whence));
+ RETURN_LONG(php_stream_seek(stream, arg2, whence));
}
/* }}} */
@@ -1488,7 +1444,7 @@
Return or change the umask */
PHP_FUNCTION(umask)
{
- zval **arg1;
+ long arg1;
int oldumask;
int arg_count = ZEND_NUM_ARGS();
@@ -1501,11 +1457,10 @@
if (arg_count == 0) {
umask(oldumask);
} else {
- if (arg_count > 1 || zend_get_parameters_ex(1, &arg1) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l",
&arg1) == FAILURE) {
+ RETURN_FALSE;
}
- convert_to_long_ex(arg1);
- umask(Z_LVAL_PP(arg1));
+ umask(arg1);
}
RETURN_LONG(oldumask);
@@ -1516,15 +1471,15 @@
Output all remaining data from a file pointer */
PHPAPI PHP_FUNCTION(fpassthru)
{
- zval **arg1;
+ zval *arg1;
int size;
php_stream *stream;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) ==
FAILURE) {
+ RETURN_FALSE;
}
- PHP_STREAM_TO_ZVAL(stream, arg1);
+ PHP_STREAM_TO_ZVAL(stream, &arg1);
size = php_stream_passthru(stream);
RETURN_LONG(size);
@@ -1603,23 +1558,22 @@
Truncate file to 'size' length */
PHP_NAMED_FUNCTION(php_if_ftruncate)
{
- zval **fp , **size;
+ zval *fp;
+ long size;
php_stream *stream;
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &fp, &size) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &fp, &size)
== FAILURE) {
+ RETURN_FALSE;
}
- PHP_STREAM_TO_ZVAL(stream, fp);
-
- convert_to_long_ex(size);
+ PHP_STREAM_TO_ZVAL(stream, &fp);
if (!php_stream_truncate_supported(stream)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can't truncate
this stream!");
RETURN_FALSE;
}
- RETURN_BOOL(0 == php_stream_truncate_set_size(stream, Z_LVAL_PP(size)));
+ RETURN_BOOL(0 == php_stream_truncate_set_size(stream, size));
}
/* }}} */
@@ -1627,7 +1581,7 @@
Stat() on a filehandle */
PHP_NAMED_FUNCTION(php_if_fstat)
{
- zval **fp;
+ zval *fp;
zval *stat_dev, *stat_ino, *stat_mode, *stat_nlink, *stat_uid,
*stat_gid, *stat_rdev,
*stat_size, *stat_atime, *stat_mtime, *stat_ctime,
*stat_blksize, *stat_blocks;
php_stream *stream;
@@ -1637,11 +1591,11 @@
"size", "atime", "mtime", "ctime", "blksize", "blocks"
};
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &fp) == FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &fp) ==
FAILURE) {
+ RETURN_FALSE;
}
- PHP_STREAM_TO_ZVAL(stream, fp);
+ PHP_STREAM_TO_ZVAL(stream, &fp);
if (php_stream_stat(stream, &stat_ssb)) {
RETURN_FALSE;
@@ -1836,18 +1790,16 @@
Binary-safe file read */
PHPAPI PHP_FUNCTION(fread)
{
- zval **arg1, **arg2;
- int len;
+ zval *arg1;
+ long len;
php_stream *stream;
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg1, &arg2) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &arg1, &len)
== FAILURE) {
+ RETURN_FALSE;
}
- PHP_STREAM_TO_ZVAL(stream, arg1);
+ PHP_STREAM_TO_ZVAL(stream, &arg1);
- convert_to_long_ex(arg2);
- len = Z_LVAL_PP(arg2);
if (len <= 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter
must be greater than 0");
RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/007_error.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/007_error.phpt
diff -u php-src/ext/standard/tests/file/007_error.phpt:1.1.2.1.2.1
php-src/ext/standard/tests/file/007_error.phpt:1.1.2.1.2.2
--- php-src/ext/standard/tests/file/007_error.phpt:1.1.2.1.2.1 Fri Mar 7
04:14:53 2008
+++ php-src/ext/standard/tests/file/007_error.phpt Thu Jul 3 20:19:26 2008
@@ -78,103 +78,103 @@
Warning: fclose(): 5 is not a valid stream resource in %s on line %d
bool(false)
-Warning: fclose(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fclose() expects parameter 1 to be resource, string given %s on line
%d
bool(false)
-Warning: Wrong parameter count for fclose() in %s on line %d
-NULL
+Warning: fclose() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
Warning: feof(): 5 is not a valid stream resource in %s on line %d
bool(false)
-Warning: feof(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: feof() expects parameter 1 to be resource, string given %s on line %d
bool(false)
-Warning: Wrong parameter count for feof() in %s on line %d
-NULL
+Warning: feof() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
Warning: fopen() expects at most 4 parameters, 5 given in %s on line %d
bool(false)
-Warning: Wrong parameter count for fclose() in %s on line %d
-NULL
+Warning: fclose() expects exactly 1 parameter, 2 given in %s on line %d
+bool(false)
-Warning: Wrong parameter count for feof() in %s on line %d
-NULL
+Warning: feof() expects exactly 1 parameter, 2 given in %s on line %d
+bool(false)
-- Testing fopen(), fclose() & feof() with invalid arguments --
-- Iteration 1 --
Warning: fopen(string): failed to open stream: No such file or directory in %s
on line %d
bool(false)
-Warning: fclose(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fclose() expects parameter 1 to be resource, string given in %s on
line %d
bool(false)
-Warning: feof(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: feof() expects parameter 1 to be resource, string given in %s on line
%d
bool(false)
-- Iteration 2 --
Warning: fopen(10): failed to open stream: No such file or directory in %s on
line %d
bool(false)
-Warning: fclose(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fclose() expects parameter 1 to be resource, integer given in %s on
line %d
bool(false)
-Warning: feof(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: feof() expects parameter 1 to be resource, integer given in %s on
line %d
bool(false)
-- Iteration 3 --
Warning: fopen(10.5): failed to open stream: No such file or directory in %s
on line %d
bool(false)
-Warning: fclose(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fclose() expects parameter 1 to be resource, double given in %s on
line %d
bool(false)
-Warning: feof(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: feof() expects parameter 1 to be resource, double given in %s on line
%d
bool(false)
-- Iteration 4 --
Warning: fopen(1): failed to open stream: No such file or directory in %s on
line %d
bool(false)
-Warning: fclose(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fclose() expects parameter 1 to be resource, boolean given in %s on
line %d
bool(false)
-Warning: feof(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: feof() expects parameter 1 to be resource, boolean given in %s on
line %d
bool(false)
-- Iteration 5 --
Warning: fopen() expects parameter 1 to be string, array given in %s on line %d
bool(false)
-Warning: fclose(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fclose() expects parameter 1 to be resource, array given in %s on
line %d
bool(false)
-Warning: feof(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: feof() expects parameter 1 to be resource, array given in %s on line
%d
bool(false)
-- Iteration 6 --
Warning: fopen() expects parameter 1 to be string, object given in %s on line
%d
bool(false)
-Warning: fclose(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fclose() expects parameter 1 to be resource, object given in %s on
line %d
bool(false)
-Warning: feof(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: feof() expects parameter 1 to be resource, object given in %s on line
%d
bool(false)
-- Iteration 7 --
bool(false)
-Warning: fclose(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fclose() expects parameter 1 to be resource, null given in %s on line
%d
bool(false)
-Warning: feof(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: feof() expects parameter 1 to be resource, null given in %s on line %d
bool(false)
-- Iteration 8 --
bool(false)
-Warning: fclose(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fclose() expects parameter 1 to be resource, string given in %s on
line %d
bool(false)
-Warning: feof(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: feof() expects parameter 1 to be resource, string given in %s on line
%d
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fflush_error.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/fflush_error.phpt
diff -u php-src/ext/standard/tests/file/fflush_error.phpt:1.1.2.1.2.1
php-src/ext/standard/tests/file/fflush_error.phpt:1.1.2.1.2.2
--- php-src/ext/standard/tests/file/fflush_error.phpt:1.1.2.1.2.1 Mon Nov
5 17:43:20 2007
+++ php-src/ext/standard/tests/file/fflush_error.phpt Thu Jul 3 20:19:26 2008
@@ -54,36 +54,36 @@
*** Testing error conditions ***
-- Testing fflush(): with zero argument --
-Warning: Wrong parameter count for fflush() in %s on line %d
-NULL
+Warning: fflush() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
-- Testing fflush(): with more than expected number of arguments --
-Warning: Wrong parameter count for fflush() in %s on line %d
-NULL
+Warning: fflush() expects exactly 1 parameter, 2 given in %s on line %d
+bool(false)
-- Testing fflush(): with invalid arguments --
-- Iteration 1 --
-Warning: fflush(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fflush() expects parameter 1 to be resource, string given in %s on
line %d
bool(false)
-- Iteration 2 --
-Warning: fflush(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fflush() expects parameter 1 to be resource, integer given in %s on
line %d
bool(false)
-- Iteration 3 --
-Warning: fflush(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fflush() expects parameter 1 to be resource, double given in %s on
line %d
bool(false)
-- Iteration 4 --
-Warning: fflush(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fflush() expects parameter 1 to be resource, boolean given in %s on
line %d
bool(false)
-- Iteration 5 --
-Warning: fflush(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fflush() expects parameter 1 to be resource, array given in %s on
line %d
bool(false)
-- Iteration 6 --
-Warning: fflush(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fflush() expects parameter 1 to be resource, object given in %s on
line %d
bool(false)
*** Done ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetc_error.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/fgetc_error.phpt
diff -u php-src/ext/standard/tests/file/fgetc_error.phpt:1.1.2.1
php-src/ext/standard/tests/file/fgetc_error.phpt:1.1.2.1.2.1
--- php-src/ext/standard/tests/file/fgetc_error.phpt:1.1.2.1 Fri May 25
13:44:23 2007
+++ php-src/ext/standard/tests/file/fgetc_error.phpt Thu Jul 3 20:19:26 2008
@@ -39,35 +39,35 @@
*** Testing error conditions ***
-- Testing fgetc() with zero argument --
-Warning: Wrong parameter count for fgetc() in %s on line %d
-NULL
+Warning: fgetc() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
-- Testing fgetc() with more than expected number of arguments --
-Warning: Wrong parameter count for fgetc() in %s on line %d
-NULL
+Warning: fgetc() expects exactly 1 parameter, 2 given in %s on line %d
+bool(false)
-- Testing fgetc() with invalid arguments --
-- Iteration 1 --
-Warning: fgetc(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgetc() expects parameter 1 to be resource, string given in %s on
line %d
bool(false)
-- Iteration 2 --
-Warning: fgetc(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgetc() expects parameter 1 to be resource, integer given in %s on
line %d
bool(false)
-- Iteration 3 --
-Warning: fgetc(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgetc() expects parameter 1 to be resource, double given in %s on
line %d
bool(false)
-- Iteration 4 --
-Warning: fgetc(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgetc() expects parameter 1 to be resource, boolean given in %s on
line %d
bool(false)
-- Iteration 5 --
-Warning: fgetc(): supplied argument is not a valid stream resource in %s on
line %s
+Warning: fgetc() expects parameter 1 to be resource, array given in %s on line
%d
bool(false)
-- Iteration 6 --
-Warning: fgetc(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgetc() expects parameter 1 to be resource, object given in %s on
line %d
bool(false)
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetc_variation2.phpt?r1=1.1.2.1.2.2&r2=1.1.2.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/file/fgetc_variation2.phpt
diff -u php-src/ext/standard/tests/file/fgetc_variation2.phpt:1.1.2.1.2.2
php-src/ext/standard/tests/file/fgetc_variation2.phpt:1.1.2.1.2.3
--- php-src/ext/standard/tests/file/fgetc_variation2.phpt:1.1.2.1.2.2 Mon Feb
25 10:31:17 2008
+++ php-src/ext/standard/tests/file/fgetc_variation2.phpt Thu Jul 3
20:19:26 2008
@@ -47,6 +47,6 @@
Notice: Undefined variable: file_handle in %s on line %d
-Warning: fgetc(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgetc() expects parameter 1 to be resource, null given in %s on line
%d
bool(false)
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgets_error.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/fgets_error.phpt
diff -u php-src/ext/standard/tests/file/fgets_error.phpt:1.1.2.1
php-src/ext/standard/tests/file/fgets_error.phpt:1.1.2.1.2.1
--- php-src/ext/standard/tests/file/fgets_error.phpt:1.1.2.1 Sat Jul 21
07:55:07 2007
+++ php-src/ext/standard/tests/file/fgets_error.phpt Thu Jul 3 20:19:26 2008
@@ -59,12 +59,12 @@
*** Testing error conditions ***
-- Testing fgets() with zero argument --
-Warning: Wrong parameter count for fgets() in %s on line %d
-NULL
+Warning: fgets() expects at least 1 parameter, 0 given in %s on line %d
+bool(false)
-- Testing fgets() with more than expected number of arguments --
-Warning: Wrong parameter count for fgets() in %s on line %d
-NULL
+Warning: fgets() expects at most 2 parameters, 3 given in %s on line %d
+bool(false)
-- Testing fgets() with invalid length arguments --
Warning: fgets(): Length parameter must be greater than 0 in %s on line %d
@@ -76,32 +76,32 @@
-- Testing fgets() with invalid arguments --
-- Iteration 1 --
-Warning: fgets(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgets() expects parameter 1 to be resource, string given in %s on
line %d
bool(false)
-- Iteration 2 --
-Warning: fgets(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgets() expects parameter 1 to be resource, integer given in %s on
line %d
bool(false)
-- Iteration 3 --
-Warning: fgets(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgets() expects parameter 1 to be resource, double given in %s on
line %d
bool(false)
-- Iteration 4 --
-Warning: fgets(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgets() expects parameter 1 to be resource, boolean given in %s on
line %d
bool(false)
-- Iteration 5 --
-Warning: fgets(): supplied argument is not a valid stream resource in %s on
line %s
+Warning: fgets() expects parameter 1 to be resource, array given in %s on line
%d
bool(false)
-- Iteration 6 --
-Warning: fgets(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgets() expects parameter 1 to be resource, object given in %s on
line %d
bool(false)
-- Testing fgets() with closed/unset file handle --
Warning: fgets(): 5 is not a valid stream resource in %s on line %d
bool(false)
-Warning: fgets(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgets() expects parameter 1 to be resource, null given in %s on line
%d
bool(false)
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgets_variation2.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/fgets_variation2.phpt
diff -u php-src/ext/standard/tests/file/fgets_variation2.phpt:1.1.2.1
php-src/ext/standard/tests/file/fgets_variation2.phpt:1.1.2.1.2.1
--- php-src/ext/standard/tests/file/fgets_variation2.phpt:1.1.2.1 Sat Jul
21 07:55:07 2007
+++ php-src/ext/standard/tests/file/fgets_variation2.phpt Thu Jul 3
20:19:26 2008
@@ -52,11 +52,11 @@
Notice: Undefined variable: file_handle in %s on line %d
-Warning: fgets(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgets() expects parameter 1 to be resource, null given in %s on line
%d
bool(false)
Notice: Undefined variable: file_handle in %s on line %d
-Warning: fgets(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgets() expects parameter 1 to be resource, null given in %s on line
%d
bool(false)
-Done
\ No newline at end of file
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetss_error.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/fgetss_error.phpt
diff -u php-src/ext/standard/tests/file/fgetss_error.phpt:1.1.2.1
php-src/ext/standard/tests/file/fgetss_error.phpt:1.1.2.1.2.1
--- php-src/ext/standard/tests/file/fgetss_error.phpt:1.1.2.1 Sun Aug 12
06:53:04 2007
+++ php-src/ext/standard/tests/file/fgetss_error.phpt Thu Jul 3 20:19:26 2008
@@ -58,12 +58,12 @@
*** Testing error conditions ***
-- Testing fgetss() with zero argument --
-Warning: Wrong parameter count for fgetss() in %s on line %d
-NULL
+Warning: fgetss() expects at least 1 parameter, 0 given in %s on line %d
+bool(false)
-- Testing fgetss() with more than expected number of arguments --
-Warning: Wrong parameter count for fgetss() in %s on line %d
-NULL
+Warning: fgetss() expects at most 3 parameters, 4 given in %s on line %d
+bool(false)
-- Testing fgetss() with invalid length arguments --
Warning: fgetss(): Length parameter must be greater than 0 in %s on line %d
@@ -75,32 +75,32 @@
-- Testing fgetss() with invalid arguments --
-- Iteration 1 --
-Warning: fgetss(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgetss() expects parameter 1 to be resource, string given in %s on
line %d
bool(false)
-- Iteration 2 --
-Warning: fgetss(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgetss() expects parameter 1 to be resource, integer given in %s on
line %d
bool(false)
-- Iteration 3 --
-Warning: fgetss(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgetss() expects parameter 1 to be resource, double given in %s on
line %d
bool(false)
-- Iteration 4 --
-Warning: fgetss(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgetss() expects parameter 1 to be resource, boolean given in %s on
line %d
bool(false)
-- Iteration 5 --
-Warning: fgetss(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgetss() expects parameter 1 to be resource, array given in %s on
line %d
bool(false)
-- Iteration 6 --
-Warning: fgetss(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgetss() expects parameter 1 to be resource, object given in %s on
line %d
bool(false)
-- Testing fgetss() with closed/unset file handle --
Warning: fgetss(): 5 is not a valid stream resource in %s on line %d
bool(false)
-Warning: fgetss(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fgetss() expects parameter 1 to be resource, null given in %s on line
%d
bool(false)
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fpassthru_error.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/fpassthru_error.phpt
diff -u php-src/ext/standard/tests/file/fpassthru_error.phpt:1.1.2.1
php-src/ext/standard/tests/file/fpassthru_error.phpt:1.1.2.1.2.1
--- php-src/ext/standard/tests/file/fpassthru_error.phpt:1.1.2.1 Fri May
25 13:44:23 2007
+++ php-src/ext/standard/tests/file/fpassthru_error.phpt Thu Jul 3
20:19:26 2008
@@ -26,15 +26,15 @@
--EXPECTF--
*** Test error conditions of fpassthru() function ***
-Warning: fread(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fread() expects parameter 1 to be resource, string given in %s on
line %d
-Warning: fpassthru(): supplied argument is not a valid stream resource in %s
on line %d
+Warning: fpassthru() expects parameter 1 to be resource, boolean given in %s
on line %d
bool(false)
-Warning: Wrong parameter count for fpassthru() in %s on line %d
-NULL
+Warning: fpassthru() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
-Warning: Wrong parameter count for fpassthru() in %s on line %d
-NULL
+Warning: fpassthru() expects exactly 1 parameter, 2 given in %s on line %d
+bool(false)
*** Done ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fread_error.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/fread_error.phpt
diff -u php-src/ext/standard/tests/file/fread_error.phpt:1.1.2.1
php-src/ext/standard/tests/file/fread_error.phpt:1.1.2.1.2.1
--- php-src/ext/standard/tests/file/fread_error.phpt:1.1.2.1 Mon Jun 18
19:45:53 2007
+++ php-src/ext/standard/tests/file/fread_error.phpt Thu Jul 3 20:19:26 2008
@@ -61,12 +61,12 @@
*** Testing error conditions ***
-- Testing fread() with zero argument --
-Warning: Wrong parameter count for fread() in %s on line %d
-NULL
+Warning: fread() expects exactly 2 parameters, 0 given in %s on line %d
+bool(false)
-- Testing fread() with more than expected number of arguments --
-Warning: Wrong parameter count for fread() in %s on line %d
-NULL
+Warning: fread() expects exactly 2 parameters, 3 given in %s on line %d
+bool(false)
-- Testing fread() with invalid length arguments --
Warning: fread(): Length parameter must be greater than 0 in %s on line %d
@@ -77,27 +77,27 @@
-- Testing fread() with invalid arguments --
-- Iteration 1 --
-Warning: fread(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fread() expects parameter 1 to be resource, string given in %s on
line %d
bool(false)
-- Iteration 2 --
-Warning: fread(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fread() expects parameter 1 to be resource, integer given in %s on
line %d
bool(false)
-- Iteration 3 --
-Warning: fread(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fread() expects parameter 1 to be resource, double given in %s on
line %d
bool(false)
-- Iteration 4 --
-Warning: fread(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fread() expects parameter 1 to be resource, boolean given in %s on
line %d
bool(false)
-- Iteration 5 --
-Warning: fread(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fread() expects parameter 1 to be resource, array given in %s on line
%d
bool(false)
-- Iteration 6 --
-Warning: fread(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fread() expects parameter 1 to be resource, object given in %s on
line %d
bool(false)
-- Testing fwrite() with closed/unset file handle --
@@ -106,9 +106,9 @@
Warning: fread(): 5 is not a valid stream resource in %s on line %d
bool(false)
-Warning: fread(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fread() expects parameter 1 to be resource, null given in %s on line
%d
bool(false)
-Warning: fclose(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fclose() expects parameter 1 to be resource, null given in %s on line
%d
bool(false)
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
diff -u php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt:1.1.2.2
php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt:1.1.2.2.2.1
--- php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt:1.1.2.2
Sat Jul 21 17:30:23 2007
+++ php-src/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt Thu Jul
3 20:19:26 2008
@@ -56,44 +56,44 @@
*** Testing fseek() : error conditions ***
-- Testing fseek() with zero argument --
-Warning: Wrong parameter count for fseek() in %s on line %d
-NULL
+Warning: fseek() expects at least 2 parameters, 0 given in %s on line %d
+bool(false)
-- Testing fseek() with unexpected number of arguments --
-Warning: Wrong parameter count for fseek() in %s on line %d
-NULL
+Warning: fseek() expects at least 2 parameters, 1 given in %s on line %d
+bool(false)
-Warning: Wrong parameter count for fseek() in %s on line %d
-NULL
+Warning: fseek() expects at most 3 parameters, 4 given in %s on line %d
+bool(false)
-- Testing fseek() with invalid arguments --
-- Iteration 1 --
-Warning: fseek(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fseek() expects parameter 1 to be resource, string given in %s on
line %d
bool(false)
-- Iteration 2 --
-Warning: fseek(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fseek() expects parameter 1 to be resource, integer given in %s on
line %d
bool(false)
-- Iteration 3 --
-Warning: fseek(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fseek() expects parameter 1 to be resource, double given in %s on
line %d
bool(false)
-- Iteration 4 --
-Warning: fseek(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fseek() expects parameter 1 to be resource, boolean given in %s on
line %d
bool(false)
-- Iteration 5 --
-Warning: fseek(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fseek() expects parameter 1 to be resource, array given in %s on line
%d
bool(false)
-- Iteration 6 --
-Warning: fseek(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fseek() expects parameter 1 to be resource, object given in %s on
line %d
bool(false)
-- Testing fseek() with closed/unset file handle --
Warning: fseek(): 5 is not a valid stream resource in %s on line %d
bool(false)
-Warning: fseek(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fseek() expects parameter 1 to be resource, null given in %s on line
%d
bool(false)
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
diff -u php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt:1.1.2.2
php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt:1.1.2.2.2.1
--- php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt:1.1.2.2
Sat Jul 21 17:30:23 2007
+++ php-src/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt Thu Jul
3 20:19:26 2008
@@ -55,41 +55,41 @@
*** Testing ftell() : error conditions ***
-- Testing ftell() with zero argument --
-Warning: Wrong parameter count for ftell() in %s on line %d
-NULL
+Warning: ftell() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
-- Testing ftell() with more than expected number of arguments --
-Warning: Wrong parameter count for ftell() in %s on line %d
-NULL
+Warning: ftell() expects exactly 1 parameter, 2 given in %s on line %d
+bool(false)
-- Testing ftell() with invalid arguments --
-- Iteration 1 --
-Warning: ftell(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: ftell() expects parameter 1 to be resource, string given in %s on
line %d
bool(false)
-- Iteration 2 --
-Warning: ftell(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: ftell() expects parameter 1 to be resource, integer given in %s on
line %d
bool(false)
-- Iteration 3 --
-Warning: ftell(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: ftell() expects parameter 1 to be resource, double given in %s on
line %d
bool(false)
-- Iteration 4 --
-Warning: ftell(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: ftell() expects parameter 1 to be resource, boolean given in %s on
line %d
bool(false)
-- Iteration 5 --
-Warning: ftell(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: ftell() expects parameter 1 to be resource, array given in %s on line
%d
bool(false)
-- Iteration 6 --
-Warning: ftell(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: ftell() expects parameter 1 to be resource, object given in %s on
line %d
bool(false)
-- Testing ftell with closed/unset file handle --
Warning: ftell(): 5 is not a valid stream resource in %s on line %d
bool(false)
-Warning: ftell(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: ftell() expects parameter 1 to be resource, null given in %s on line
%d
bool(false)
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
diff -u php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt:1.1.2.2
php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt:1.1.2.2.2.1
--- php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt:1.1.2.2
Sat Jul 21 17:30:23 2007
+++ php-src/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt Thu Jul
3 20:19:26 2008
@@ -55,41 +55,41 @@
*** Testing rewind() : error conditions ***
-- Testing rewind() with zero argument --
-Warning: Wrong parameter count for rewind() in %s on line %d
-NULL
+Warning: rewind() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
-- Testing rewind() with more than expected number of arguments --
-Warning: Wrong parameter count for rewind() in %s on line %d
-NULL
+Warning: rewind() expects exactly 1 parameter, 2 given in %s on line %d
+bool(false)
-- Testing rewind() with invalid arguments --
-- Iteration 1 --
-Warning: rewind(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: rewind() expects parameter 1 to be resource, string given in %s on
line %d
bool(false)
-- Iteration 2 --
-Warning: rewind(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: rewind() expects parameter 1 to be resource, integer given in %s on
line %d
bool(false)
-- Iteration 3 --
-Warning: rewind(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: rewind() expects parameter 1 to be resource, double given in %s on
line %d
bool(false)
-- Iteration 4 --
-Warning: rewind(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: rewind() expects parameter 1 to be resource, boolean given in %s on
line %d
bool(false)
-- Iteration 5 --
-Warning: rewind(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: rewind() expects parameter 1 to be resource, array given in %s on
line %d
bool(false)
-- Iteration 6 --
-Warning: rewind(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: rewind() expects parameter 1 to be resource, object given in %s on
line %d
bool(false)
-- Testing rewind() with closed/unset file handle --
Warning: rewind(): 5 is not a valid stream resource in %s on line %d
bool(false)
-Warning: rewind(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: rewind() expects parameter 1 to be resource, null given in %s on line
%d
bool(false)
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/ftruncate_error.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/ftruncate_error.phpt
diff -u php-src/ext/standard/tests/file/ftruncate_error.phpt:1.1.2.2.2.1
php-src/ext/standard/tests/file/ftruncate_error.phpt:1.1.2.2.2.2
--- php-src/ext/standard/tests/file/ftruncate_error.phpt:1.1.2.2.2.1 Mon Nov
5 17:43:21 2007
+++ php-src/ext/standard/tests/file/ftruncate_error.phpt Thu Jul 3
20:19:26 2008
@@ -76,41 +76,41 @@
Initial file size = 36
-- Testing ftruncate() with less than expected number of arguments --
-Warning: Wrong parameter count for ftruncate() in %s on line %d
-NULL
+Warning: ftruncate() expects exactly 2 parameters, 0 given in %s on line %d
+bool(false)
-Warning: Wrong parameter count for ftruncate() in %s on line %d
-NULL
+Warning: ftruncate() expects exactly 2 parameters, 1 given in %s on line %d
+bool(false)
int(36)
-- Testing ftruncate() with more than expected number of arguments --
-Warning: Wrong parameter count for ftruncate() in %s on line %d
-NULL
+Warning: ftruncate() expects exactly 2 parameters, 3 given in %s on line %d
+bool(false)
int(36)
-- Testing ftruncate() with invalid file pointer --
-- Iteration 1 --
-Warning: ftruncate(): supplied argument is not a valid stream resource in %s
on line %d
+Warning: ftruncate() expects parameter 1 to be resource, string given in %s on
line %d
bool(false)
-- Iteration 2 --
-Warning: ftruncate(): supplied argument is not a valid stream resource in %s
on line %d
+Warning: ftruncate() expects parameter 1 to be resource, integer given in %s
on line %d
bool(false)
-- Iteration 3 --
-Warning: ftruncate(): supplied argument is not a valid stream resource in %s
on line %d
+Warning: ftruncate() expects parameter 1 to be resource, double given in %s on
line %d
bool(false)
-- Iteration 4 --
-Warning: ftruncate(): supplied argument is not a valid stream resource in %s
on line %d
+Warning: ftruncate() expects parameter 1 to be resource, boolean given in %s
on line %d
bool(false)
-- Iteration 5 --
-Warning: ftruncate(): supplied argument is not a valid stream resource in %s
on line %d
+Warning: ftruncate() expects parameter 1 to be resource, array given in %s on
line %d
bool(false)
-- Iteration 6 --
-Warning: ftruncate(): supplied argument is not a valid stream resource in %s
on line %d
+Warning: ftruncate() expects parameter 1 to be resource, object given in %s on
line %d
bool(false)
-- Testing ftruncate() with closed/unset file handle --
@@ -118,7 +118,7 @@
bool(false)
int(36)
-Warning: ftruncate(): supplied argument is not a valid stream resource in %s
on line %d
+Warning: ftruncate() expects parameter 1 to be resource, null given in %s on
line %d
bool(false)
int(36)
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fwrite.phpt?r1=1.1.2.3&r2=1.1.2.3.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/fwrite.phpt
diff -u php-src/ext/standard/tests/file/fwrite.phpt:1.1.2.3
php-src/ext/standard/tests/file/fwrite.phpt:1.1.2.3.2.1
--- php-src/ext/standard/tests/file/fwrite.phpt:1.1.2.3 Wed Nov 15 12:11:17 2006
+++ php-src/ext/standard/tests/file/fwrite.phpt Thu Jul 3 20:19:26 2008
@@ -30,21 +30,23 @@
echo "Done\n";
?>
--EXPECTF--
-Warning: Wrong parameter count for fwrite() in %s on line %d
-NULL
+Warning: fwrite() expects at least 2 parameters, 1 given in %s on line %d
+bool(false)
-Notice: Array to string conversion in %s on line %d
-int(5)
+Warning: fwrite() expects parameter 2 to be string, array given in %s on line
%d
+bool(false)
int(0)
int(0)
int(4)
int(0)
-int(0)
-Warning: fwrite(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fwrite() expects parameter 1 to be resource, array given in %s on
line %d
bool(false)
-Warning: Wrong parameter count for fwrite() in %s on line %d
-NULL
+Warning: fwrite() expects parameter 1 to be resource, array given in %s on
line %d
+bool(false)
+
+Warning: fwrite() expects at least 2 parameters, 1 given in %s on line %d
+bool(false)
string(4) "data"
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fwrite_error.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/fwrite_error.phpt
diff -u php-src/ext/standard/tests/file/fwrite_error.phpt:1.1.2.1
php-src/ext/standard/tests/file/fwrite_error.phpt:1.1.2.1.2.1
--- php-src/ext/standard/tests/file/fwrite_error.phpt:1.1.2.1 Wed Jun 13
22:38:49 2007
+++ php-src/ext/standard/tests/file/fwrite_error.phpt Thu Jul 3 20:19:26 2008
@@ -73,48 +73,48 @@
*** Testing fwrite() : error conditions ***
-- Testing fwrite() with less than expected number of arguments --
-Warning: Wrong parameter count for fwrite() in %s on line %d
-NULL
+Warning: fwrite() expects at least 2 parameters, 0 given in %s on line %d
+bool(false)
-Warning: Wrong parameter count for fwrite() in %s on line %d
-NULL
+Warning: fwrite() expects at least 2 parameters, 1 given in %s on line %d
+bool(false)
-- Testing fwrite() with more than expected number of arguments --
-Warning: Wrong parameter count for fwrite() in %s on line %d
-NULL
+Warning: fwrite() expects at most 3 parameters, 4 given in %s on line %d
+bool(false)
-- Testing fwrite() with invalid length arguments --
int(0)
int(0)
-- Testing fwrite() with invalid arguments --
-- Iteration 1 --
-Warning: fwrite(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fwrite() expects parameter 1 to be resource, string given in %s on
line %d
bool(false)
-- Iteration 2 --
-Warning: fwrite(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fwrite() expects parameter 1 to be resource, integer given in %s on
line %d
bool(false)
-- Iteration 3 --
-Warning: fwrite(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fwrite() expects parameter 1 to be resource, double given in %s on
line %d
bool(false)
-- Iteration 4 --
-Warning: fwrite(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fwrite() expects parameter 1 to be resource, boolean given in %s on
line %d
bool(false)
-- Iteration 5 --
-Warning: fwrite(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fwrite() expects parameter 1 to be resource, array given in %s on
line %d
bool(false)
-- Iteration 6 --
-Warning: fwrite(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fwrite() expects parameter 1 to be resource, object given in %s on
line %d
bool(false)
-- Testing fwrite() with closed/unset file handle --
Warning: fwrite(): 6 is not a valid stream resource in %s on line %d
bool(false)
-Warning: fwrite(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: fwrite() expects parameter 1 to be resource, null given in %s on line
%d
bool(false)
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/popen_pclose_error.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/popen_pclose_error.phpt
diff -u php-src/ext/standard/tests/file/popen_pclose_error.phpt:1.1.2.3.2.1
php-src/ext/standard/tests/file/popen_pclose_error.phpt:1.1.2.3.2.2
--- php-src/ext/standard/tests/file/popen_pclose_error.phpt:1.1.2.3.2.1 Mon Nov
5 17:43:21 2007
+++ php-src/ext/standard/tests/file/popen_pclose_error.phpt Thu Jul 3
20:19:26 2008
@@ -44,13 +44,13 @@
Warning: popen(abc.txt,rw): %s on line %d
bool(false)
-Warning: Wrong parameter count for pclose() in %s on line %d
-NULL
+Warning: pclose() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
-Warning: Wrong parameter count for pclose() in %s on line %d
-NULL
+Warning: pclose() expects exactly 1 parameter, 2 given in %s on line %d
+bool(false)
-Warning: pclose(): supplied argument is not a valid stream resource in %s on
line %d
+Warning: pclose() expects parameter 1 to be resource, integer given in %s on
line %d
bool(false)
--- Done ---
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/umask_error.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/umask_error.phpt
diff -u php-src/ext/standard/tests/file/umask_error.phpt:1.1.2.2
php-src/ext/standard/tests/file/umask_error.phpt:1.1.2.2.2.1
--- php-src/ext/standard/tests/file/umask_error.phpt:1.1.2.2 Sun Jul 22
12:26:18 2007
+++ php-src/ext/standard/tests/file/umask_error.phpt Thu Jul 3 20:19:26 2008
@@ -21,6 +21,6 @@
--EXPECTF--
*** Testing umask() : error conditions ***
-Warning: Wrong parameter count for umask() in %s on line %d
-NULL
+Warning: umask() expects at most 1 parameter, 2 given in %s on line %d
+bool(false)
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
