diff --git a/Zend/tests/bug30998.phpt b/Zend/tests/bug30998.phpt index 2ff3068e5ca34..95409daead412 100644 --- a/Zend/tests/bug30998.phpt +++ b/Zend/tests/bug30998.phpt @@ -15,7 +15,7 @@ $f = fopen("/tmp/blah", "r"); ?> ===DONE=== --EXPECTF-- -fopen(/tmp/blah): failed to open stream: %s (2) in %s:%d +fopen(): failed to open stream (/tmp/blah): %s (2) in %s:%d -Warning: fopen(/tmp/blah): failed to open stream: %s in %s on line %d +Warning: fopen(): failed to open stream (/tmp/blah): %s in %s on line %d ===DONE=== diff --git a/Zend/tests/bug60909_1.phpt b/Zend/tests/bug60909_1.phpt index e4c07face1c5f..3ad06e6777384 100644 --- a/Zend/tests/bug60909_1.phpt +++ b/Zend/tests/bug60909_1.phpt @@ -10,10 +10,10 @@ set_error_handler(function($errno, $errstr, $errfile, $errline){ require 'notfound.php'; --EXPECTF-- -error(require(notfound.php): failed to open stream: %s) +error(require(): failed to open stream (notfound.php): %s) Warning: Uncaught Exception: Foo in %sbug60909_1.php:5 Stack trace: -#0 %sbug60909_1.php(8): {closure}(2, 'require(notfoun...', '%s', 8, Array) +#0 %sbug60909_1.php(8): {closure}(2, 'require(): fail...', '%s', 8, Array) #1 %sbug60909_1.php(8): require() #2 {main} thrown in %sbug60909_1.php on line 5 diff --git a/Zend/tests/debug_backtrace_with_include_and_this.phpt b/Zend/tests/debug_backtrace_with_include_and_this.phpt index 5d58279eb50c9..880684cea64a7 100644 --- a/Zend/tests/debug_backtrace_with_include_and_this.phpt +++ b/Zend/tests/debug_backtrace_with_include_and_this.phpt @@ -28,7 +28,7 @@ try { echo $e."\n"; } --EXPECTF-- -ERR#2: include(class://non.existent.Class): failed to open stream: "CLWrapper::stream_open" call failed @ include +ERR#2: include(): failed to open stream (class://non.existent.Class): "CLWrapper::stream_open" call failed @ include ERR#2: include(): Failed opening 'class://non.existent.Class' for inclusion (include_path='%s') @ include Fatal error: Uncaught Exception: Failed loading class://non.existent.Class in %s diff --git a/ext/bz2/tests/001.phpt b/ext/bz2/tests/001.phpt index 5a6b2878b8087..65220ee9e2399 100644 --- a/ext/bz2/tests/001.phpt +++ b/ext/bz2/tests/001.phpt @@ -37,7 +37,7 @@ bool(false) Warning: bzopen(): 'rw' is not a valid mode for bzopen(). Only 'w' and 'r' are supported. in %s on line %d bool(false) -Warning: bzopen(no_such_file): failed to open stream: No such file or directory in %s on line %d +Warning: bzopen(): failed to open stream (no_such_file): No such file or directory in %s on line %d bool(false) resource(%d) of type (stream) Done diff --git a/ext/bz2/tests/002.phpt b/ext/bz2/tests/002.phpt index a69514a71132c..e5c76bfd816e6 100644 --- a/ext/bz2/tests/002.phpt +++ b/ext/bz2/tests/002.phpt @@ -83,12 +83,12 @@ bool(false) resource(%d) of type (stream) resource(%d) of type (stream) -Warning: fopen(bz_open_002.txt): failed to open stream: Bad file %s in %s on line %d +Warning: fopen(): failed to open stream (bz_open_002.txt): Bad file %s in %s on line %d Warning: bzopen(): first parameter has to be string or file-resource in %s on line %d bool(false) -Warning: fopen(bz_open_002.txt): failed to open stream: Bad file %s in %s on line %d +Warning: fopen(): failed to open stream (bz_open_002.txt): Bad file %s in %s on line %d Warning: bzopen(): first parameter has to be string or file-resource in %s on line %d bool(false) diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 952993582b413..dbeb49dc25aad 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -710,7 +710,8 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) if (ac==2) { hptr = DBA_G(default_hptr); if (!hptr) { - php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_WARNING, "No default handler selected"); + php_error_docref(NULL, E_WARNING, "No default handler selected for path \"%s\" with mode %s", + Z_STRVAL(args[0]), Z_STRVAL(args[1])); FREENOW; RETURN_FALSE; } @@ -719,7 +720,8 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) } if (!hptr->name) { - php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_WARNING, "No such handler: %s", Z_STRVAL(args[2])); + php_error_docref(NULL, E_WARNING, "No such handler: %s for path \"%s\" with mode %s", + Z_STRVAL(args[2]), Z_STRVAL(args[0]), Z_STRVAL(args[1])); FREENOW; RETURN_FALSE; } @@ -750,13 +752,15 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) case 'l': lock_flag = DBA_LOCK_ALL; if ((hptr->flags & DBA_LOCK_ALL) == 0) { - php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_NOTICE, "Handler %s does locking internally", hptr->name); + php_error_docref(NULL, E_NOTICE, "Handler %s does locking internally with path %s with mode %s", + hptr->name, Z_STRVAL(args[0]), Z_STRVAL(args[1])); } break; default: case '-': if ((hptr->flags & DBA_LOCK_ALL) == 0) { - php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_WARNING, "Locking cannot be disabled for handler %s", hptr->name); + php_error_docref(NULL, E_WARNING, "Locking cannot be disabled for handler %s with path %s with mode %s", + hptr->name, Z_STRVAL(args[0]), Z_STRVAL(args[1])); FREENOW; RETURN_FALSE; } @@ -827,7 +831,8 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) file_mode = "w+b"; break; default: - php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_WARNING, "Illegal DBA mode"); + /* Mode is second argument and path is first argument */ + php_error_docref(NULL, E_WARNING, "Illegal DBA mode %s for path \"%s\"", Z_STRVAL(args[1]), Z_STRVAL(args[0])); FREENOW; RETURN_FALSE; } @@ -840,17 +845,23 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) if (*pmode=='t') { pmode++; if (!lock_flag) { - php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_WARNING, "You cannot combine modifiers - (no lock) and t (test lock)"); + php_error_docref(NULL, E_WARNING, + "Cannot combine modifiers - (no lock) and t (test lock) for path \"%s\" with mode %s", + Z_STRVAL(args[0]), Z_STRVAL(args[1])); FREENOW; RETURN_FALSE; } if (!lock_mode) { if ((hptr->flags & DBA_LOCK_ALL) == 0) { - php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_WARNING, "Handler %s uses its own locking which doesn't support mode modifier t (test lock)", hptr->name); + php_error_docref(NULL, E_WARNING, + "Handler %s uses its own locking which doesn't support mode modifier t (test lock) for path \"%s\" with mode %s", + hptr->name, Z_STRVAL(args[0]), Z_STRVAL(args[1])); FREENOW; RETURN_FALSE; } else { - php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_WARNING, "Handler %s doesn't uses locking for this mode which makes modifier t (test lock) obsolete", hptr->name); + php_error_docref(NULL, E_WARNING, + "Handler %s doesn't uses locking for this mode which makes modifier t (test lock) obsolete for path \"%s\" with mode %s", + hptr->name, Z_STRVAL(args[0]), Z_STRVAL(args[1])); FREENOW; RETURN_FALSE; } @@ -859,7 +870,8 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) } } if (*pmode) { - php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_WARNING, "Illegal DBA mode"); + /* Mode is second argument and path is first argument */ + php_error_docref(NULL, E_WARNING, "Illegal DBA mode %s for path \"%s\"", Z_STRVAL(args[1]), Z_STRVAL(args[0])); FREENOW; RETURN_FALSE; } @@ -993,7 +1005,8 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) if (error || hptr->open(info, &error) != SUCCESS) { dba_close(info); - php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_WARNING, "Driver initialization failed for handler: %s%s%s", hptr->name, error?": ":"", error?error:""); + php_error_docref(NULL, E_WARNING, "Driver initialization failed for handler: %s%s%s for path \"%s\" with mode %s", + hptr->name, error?": ":"", error?error:"", Z_STRVAL(args[0]), Z_STRVAL(args[1])); FREENOW; RETURN_FALSE; } @@ -1005,7 +1018,8 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) if (persistent) { if (zend_register_persistent_resource(key, keylen, info, le_pdb) == NULL) { dba_close(info); - php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_WARNING, "Could not register persistent resource"); + php_error_docref(NULL, E_WARNING, "Could not register persistent resource for path \"%s\" with mode %s", + Z_STRVAL(args[0]), Z_STRVAL(args[1])); FREENOW; RETURN_FALSE; } diff --git a/ext/dba/dba_flatfile.c b/ext/dba/dba_flatfile.c index 9a4a3674f3923..f52bc4712eab7 100644 --- a/ext/dba/dba_flatfile.c +++ b/ext/dba/dba_flatfile.c @@ -91,10 +91,10 @@ DBA_UPDATE_FUNC(flatfile) case 1: return FAILURE; case -1: - php_error_docref1(NULL, key, E_WARNING, "Operation not possible"); + php_error_docref(NULL, E_WARNING, "Operation impossible with key \"%s\"", key); return FAILURE; default: - php_error_docref2(NULL, key, val, E_WARNING, "Unknown return value"); + php_error_docref(NULL, E_WARNING, "Unknown return value for key-value pair (%s, %s)", key, val); return FAILURE; } } diff --git a/ext/dba/dba_gdbm.c b/ext/dba/dba_gdbm.c index 185241421d0d8..195cd25d82ec4 100644 --- a/ext/dba/dba_gdbm.c +++ b/ext/dba/dba_gdbm.c @@ -107,10 +107,10 @@ DBA_UPDATE_FUNC(gdbm) case 1: return FAILURE; case -1: - php_error_docref2(NULL, key, val, E_WARNING, "%s", gdbm_strerror(gdbm_errno)); + php_error_docref(NULL, E_WARNING, "%s for key-value pair (%s, %s)", gdbm_strerror(gdbm_errno), key, val); return FAILURE; default: - php_error_docref2(NULL, key, val, E_WARNING, "Unknown return value"); + php_error_docref(NULL, E_WARNING, "Unknown return value for key-value pair (%s, %s)", key, val); return FAILURE; } } diff --git a/ext/dba/dba_inifile.c b/ext/dba/dba_inifile.c index ed001654af121..040741be2aa9f 100644 --- a/ext/dba/dba_inifile.c +++ b/ext/dba/dba_inifile.c @@ -93,7 +93,7 @@ DBA_UPDATE_FUNC(inifile) INIFILE_DONE; switch(res) { case -1: - php_error_docref1(NULL, key, E_WARNING, "Operation not possible"); + php_error_docref(NULL, E_WARNING, "Operation impossible with key \"%s\"", key); return FAILURE; default: case 0: diff --git a/ext/dba/dba_lmdb.c b/ext/dba/dba_lmdb.c index 4bc085177d4d7..8e128d0d47b92 100644 --- a/ext/dba/dba_lmdb.c +++ b/ext/dba/dba_lmdb.c @@ -112,7 +112,7 @@ DBA_FETCH_FUNC(lmdb) rc = mdb_txn_begin(LMDB_IT(env), NULL, MDB_RDONLY, &LMDB_IT(txn)); } if (rc) { - php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc)); + php_error_docref(NULL, E_WARNING, "Error %s on key \"%s\"", mdb_strerror(rc), key); return NULL; } @@ -122,7 +122,7 @@ DBA_FETCH_FUNC(lmdb) rc = mdb_get(LMDB_IT(txn), LMDB_IT(dbi), &k, &v); if (rc) { if (MDB_NOTFOUND != rc) { - php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc)); + php_error_docref(NULL, E_WARNING, "Error %s on key \"%s\"", mdb_strerror(rc), key); } mdb_txn_abort(LMDB_IT(txn)); return NULL; @@ -149,7 +149,7 @@ DBA_UPDATE_FUNC(lmdb) rc = mdb_txn_begin(LMDB_IT(env), NULL, 0, &LMDB_IT(txn)); if (rc) { - php_error_docref2(NULL, key, val, E_WARNING, "%s", mdb_strerror(rc)); + php_error_docref(NULL, E_WARNING, "%s for key-value pair (%s, %s)", mdb_strerror(rc), key, val); return FAILURE; } @@ -161,7 +161,7 @@ DBA_UPDATE_FUNC(lmdb) rc = mdb_put(LMDB_IT(txn), LMDB_IT(dbi), &k, &v, mode == 1 ? MDB_NOOVERWRITE : 0); if (rc) { if (MDB_KEYEXIST != rc) { - php_error_docref2(NULL, key, val, E_WARNING, "%s", mdb_strerror(rc)); + php_error_docref(NULL, E_WARNING, "%s for key-value pair (%s, %s)", mdb_strerror(rc), key, val); } mdb_txn_abort(LMDB_IT(txn)); return FAILURE; @@ -169,7 +169,7 @@ DBA_UPDATE_FUNC(lmdb) rc = mdb_txn_commit(LMDB_IT(txn)); if (rc) { - php_error_docref2(NULL, key, val, E_WARNING, "%s", mdb_strerror(rc)); + php_error_docref(NULL, E_WARNING, "%s for key-value pair (%s, %s)", mdb_strerror(rc), key, val); mdb_txn_abort(LMDB_IT(txn)); return FAILURE; } @@ -188,7 +188,7 @@ DBA_EXISTS_FUNC(lmdb) rc = mdb_txn_begin(LMDB_IT(env), NULL, MDB_RDONLY, &LMDB_IT(txn)); } if (rc) { - php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc)); + php_error_docref(NULL, E_WARNING, "Error %s on key \"%s\"", mdb_strerror(rc), key); return FAILURE; } @@ -198,7 +198,7 @@ DBA_EXISTS_FUNC(lmdb) rc = mdb_get(LMDB_IT(txn), LMDB_IT(dbi), &k, &v); if (rc) { if (MDB_NOTFOUND != rc) { - php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc)); + php_error_docref(NULL, E_WARNING, "Error %s on key \"%s\"", mdb_strerror(rc), key); } mdb_txn_abort(LMDB_IT(txn)); return FAILURE; @@ -220,7 +220,7 @@ DBA_DELETE_FUNC(lmdb) rc = mdb_txn_begin(LMDB_IT(env), NULL, 0, &LMDB_IT(txn)); if (rc) { - php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc)); + php_error_docref(NULL, E_WARNING, "Error %s on key \"%s\"", mdb_strerror(rc), key); return FAILURE; } @@ -231,14 +231,14 @@ DBA_DELETE_FUNC(lmdb) if (!rc) { rc = mdb_txn_commit(LMDB_IT(txn)); if (rc) { - php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc)); + php_error_docref(NULL, E_WARNING, "Error %s on key \"%s\"", mdb_strerror(rc), key); mdb_txn_abort(LMDB_IT(txn)); return FAILURE; } return SUCCESS; } - php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc)); + php_error_docref(NULL, E_WARNING, "Error %s on key \"%s\"", mdb_strerror(rc), key); return FAILURE; } diff --git a/ext/dba/dba_qdbm.c b/ext/dba/dba_qdbm.c index ba68bcc4ba25e..7c79c57cd2183 100644 --- a/ext/dba/dba_qdbm.c +++ b/ext/dba/dba_qdbm.c @@ -100,7 +100,7 @@ DBA_UPDATE_FUNC(qdbm) } if (dpecode != DP_EKEEP) { - php_error_docref2(NULL, key, val, E_WARNING, "%s", dperrmsg(dpecode)); + php_error_docref(NULL, E_WARNING, "%s for key-value pair (%s, %s)", dperrmsg(dpecode), key, val); } return FAILURE; diff --git a/ext/dba/dba_tcadb.c b/ext/dba/dba_tcadb.c index 2df943302626b..4f02f06ec7a8e 100644 --- a/ext/dba/dba_tcadb.c +++ b/ext/dba/dba_tcadb.c @@ -120,7 +120,7 @@ DBA_UPDATE_FUNC(tcadb) return SUCCESS; } - php_error_docref2(NULL, key, val, E_WARNING, "Error updating data"); + php_error_docref(NULL, E_WARNING, "Error updating data for key-value pair (%s, %s)", key, val); return FAILURE; } diff --git a/ext/dba/tests/bug72157.phpt b/ext/dba/tests/bug72157.phpt index 71fa8730b89ac..032f7e9dec4fb 100644 --- a/ext/dba/tests/bug72157.phpt +++ b/ext/dba/tests/bug72157.phpt @@ -13,10 +13,10 @@ $var5 = dba_open(null,$var0); $var5 = dba_open($var0,$var0); ?> --EXPECTF-- -Warning: dba_open(,Resource id #5): Illegal DBA mode in %sbug72157.php on line %d +Warning: dba_open(): Illegal DBA mode Resource id #5 for path "" in %sbug72157.php on line %d -Warning: dba_open(,Resource id #5): Illegal DBA mode in %sbug72157.php on line %d +Warning: dba_open(): Illegal DBA mode Resource id #5 for path "" in %sbug72157.php on line %d -Warning: dba_open(,Resource id #5): Illegal DBA mode in %sbug72157.php on line %d +Warning: dba_open(): Illegal DBA mode Resource id #5 for path "" in %sbug72157.php on line %d -Warning: dba_open(Resource id #5,Resource id #5): Illegal DBA mode in %sbug72157.php on line %d +Warning: dba_open(): Illegal DBA mode Resource id #5 for path "Resource id #5" in %sbug72157.php on line %d diff --git a/ext/dba/tests/dba011.phpt b/ext/dba/tests/dba011.phpt index 087233667cffa..abeaef990975f 100644 --- a/ext/dba/tests/dba011.phpt +++ b/ext/dba/tests/dba011.phpt @@ -27,12 +27,12 @@ Warning: Wrong parameter count for dba_open() in %sdba011.php on line %d NULL resource(%d) of type (dba) -Warning: dba_open(%stest0.dbm,n): No such handler: bogus in %sdba011.php on line %d +Warning: dba_open(): No such handler: bogus for path "%stest0.dbm" with mode n in %sdba011.php on line %d bool(false) -Warning: dba_open(%stest0.dbm,q): Illegal DBA mode in %sdba011.php on line %d +Warning: dba_open(): Illegal DBA mode q for path "%stest0.dbm" in %sdba011.php on line %d bool(false) -Warning: dba_open(%stest0.dbm,nq): Illegal DBA mode in %sdba011.php on line %d +Warning: dba_open(): Illegal DBA mode nq for path "%stest0.dbm" in %sdba011.php on line %d bool(false) resource(%d) of type (dba) diff --git a/ext/dba/tests/dba012.phpt b/ext/dba/tests/dba012.phpt index 022ca03fc3998..3c66cc00acd1f 100644 --- a/ext/dba/tests/dba012.phpt +++ b/ext/dba/tests/dba012.phpt @@ -38,5 +38,5 @@ Warning: ini_set(): No such handler: does_not_exist in %sdba012.php on line %d resource(%d) of type (dba) Test 2 -Warning: dba_open(%stest0.dbm,n): No default handler selected in %sdba012.php on line %d +Warning: dba_open(): No default handler selected for path "%stest0.dbm" with mode n in %sdba012.php on line %d bool(false) diff --git a/ext/dba/tests/dba016.phpt b/ext/dba/tests/dba016.phpt index 60bf4da4bf1f4..c640ed93de9d4 100644 --- a/ext/dba/tests/dba016.phpt +++ b/ext/dba/tests/dba016.phpt @@ -23,5 +23,5 @@ $db_file1 = dba_popen($db_filename, 'n-t', 'flatfile'); --EXPECTF-- database handler: flatfile -Warning: dba_popen(%stest0.dbm,n-t): You cannot combine modifiers - (no lock) and t (test lock) in %sdba016.php on line %d +Warning: dba_popen(): Cannot combine modifiers - (no lock) and t (test lock) for path "%stest0.dbm" with mode n-t in %sdba016.php on line %d ===DONE=== diff --git a/ext/dba/tests/dba_cdb_001.phpt b/ext/dba/tests/dba_cdb_001.phpt index 82a1c0b585aaf..b183d5bc0a8de 100644 --- a/ext/dba/tests/dba_cdb_001.phpt +++ b/ext/dba/tests/dba_cdb_001.phpt @@ -77,13 +77,13 @@ bool(true) bool(true) Test 1 -Warning: dba_open(%stest0.dbm,c): Driver initialization failed for handler: cdb: Update operations are not supported in %sdba_cdb_001.php on line %d +Warning: dba_open(): Driver initialization failed for handler: cdb: Update operations are not supported for path "%stest0.dbm" with mode c in %sdba_cdb_001.php on line %d Failed to open DB Test 2 Warning: dba_insert(): You cannot perform a modification to a database without proper access in %sdba_cdb_001.php on line %d Test 3 -Warning: dba_open(%stest0.dbm,w): Driver initialization failed for handler: cdb: Update operations are not supported in %sdba_cdb_001.php on line %d +Warning: dba_open(): Driver initialization failed for handler: cdb: Update operations are not supported for path "%stest0.dbm" with mode w in %sdba_cdb_001.php on line %d Failed to open DB ===DONE=== diff --git a/ext/exif/exif.c b/ext/exif/exif.c index de4468990277c..b2283dac4b34c 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -4560,7 +4560,8 @@ PHP_FUNCTION(exif_read_data) exif_discard_imageinfo(&ImageInfo); #ifdef EXIF_DEBUG - php_error_docref1(NULL, (Z_TYPE_P(stream) == IS_RESOURCE ? "" : Z_STRVAL_P(stream)), E_NOTICE, "Done"); + php_error_docref(NULL, E_NOTICE, "Done for %s", + (Z_TYPE_P(stream) == IS_RESOURCE ? "" : Z_STRVAL_P(stream))); #endif } /* }}} */ @@ -4643,7 +4644,9 @@ PHP_FUNCTION(exif_thumbnail) exif_discard_imageinfo(&ImageInfo); #ifdef EXIF_DEBUG - php_error_docref1(NULL, (Z_TYPE_P(stream) == IS_RESOURCE ? "" : Z_STRVAL_P(stream)), E_NOTICE, "Done"); + + php_error_docref(NULL, E_NOTICE, "Done for %s", + (Z_TYPE_P(stream) == IS_RESOURCE ? "" : Z_STRVAL_P(stream))); #endif } /* }}} */ diff --git a/ext/exif/tests/exif_imagetype_error.phpt b/ext/exif/tests/exif_imagetype_error.phpt index 80538a0f6836a..bacd199ad9d71 100644 --- a/ext/exif/tests/exif_imagetype_error.phpt +++ b/ext/exif/tests/exif_imagetype_error.phpt @@ -40,6 +40,6 @@ NULL -- Testing exif_imagetype() function with an unknown file -- -Warning: exif_imagetype(%s/foo.jpg): failed to open stream: No such file or directory in %s on line %d +Warning: exif_imagetype(): failed to open stream (%s/foo.jpg): No such file or directory in %s on line %d bool(false) ===Done=== diff --git a/ext/fileinfo/tests/finfo_file_001.phpt b/ext/fileinfo/tests/finfo_file_001.phpt index 4650ff1c16203..ff5d6af8786ee 100644 --- a/ext/fileinfo/tests/finfo_file_001.phpt +++ b/ext/fileinfo/tests/finfo_file_001.phpt @@ -24,5 +24,5 @@ Warning: finfo_file(): Empty filename or path in %s on line %d bool(false) string(9) "directory" -Warning: finfo_file(&): failed to open stream: No such file or directory in %s on line %d +Warning: finfo_file(): failed to open stream (&): No such file or directory in %s on line %d bool(false) diff --git a/ext/fileinfo/tests/finfo_open_001.phpt b/ext/fileinfo/tests/finfo_open_001.phpt index 6089776aa11db..3118ec9a6fd28 100644 --- a/ext/fileinfo/tests/finfo_open_001.phpt +++ b/ext/fileinfo/tests/finfo_open_001.phpt @@ -19,23 +19,23 @@ bool(false) resource(%d) of type (file_info) resource(%d) of type (file_info) -Warning: finfo_open(%s123): failed to open stream: No such file or directory in %s on line %d +Warning: finfo_open(): failed to open stream (%s123): No such file or directory in %s on line %d -Warning: finfo_open(%s123): failed to open stream: No such file or directory in %s on line %d +Warning: finfo_open(): failed to open stream (%s123): No such file or directory in %s on line %d Warning: finfo_open(): Failed to load magic database at '%s123'. in %s on line %d bool(false) -Warning: finfo_open(%s1): failed to open stream: No such file or directory in %s on line %d +Warning: finfo_open(): failed to open stream (%s1): No such file or directory in %s on line %d -Warning: finfo_open(%s1): failed to open stream: No such file or directory in %s on line %d +Warning: finfo_open(): failed to open stream (%s1): No such file or directory in %s on line %d Warning: finfo_open(): Failed to load magic database at '%s1'. in %s on line %d bool(false) -Warning: finfo_open(%sinexistent): failed to open stream: No such file or directory in %s on line %d +Warning: finfo_open(): failed to open stream (%sinexistent): No such file or directory in %s on line %d -Warning: finfo_open(%sinexistent): failed to open stream: No such file or directory in %s on line %d +Warning: finfo_open(): failed to open stream (%sinexistent): No such file or directory in %s on line %d Warning: finfo_open(): Failed to load magic database at '%sinexistent'. in %s on line %d bool(false) diff --git a/ext/fileinfo/tests/finfo_open_error.phpt b/ext/fileinfo/tests/finfo_open_error.phpt index b4fc57c18c31f..51b4c2e4fbe71 100644 --- a/ext/fileinfo/tests/finfo_open_error.phpt +++ b/ext/fileinfo/tests/finfo_open_error.phpt @@ -31,9 +31,9 @@ try { --EXPECTF-- *** Testing finfo_open() : error functionality *** -Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or directory in %sfinfo_open_error.php on line 12 +Warning: finfo_open(): failed to open stream (%sfoobarfile): No such file or directory in %sfinfo_open_error.php on line 12 -Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or directory in %sfinfo_open_error.php on line 12 +Warning: finfo_open(): failed to open stream (%sfoobarfile): No such file or directory in %sfinfo_open_error.php on line 12 Warning: finfo_open(): Failed to load magic database at '%sfoobarfile'. in %sfinfo_open_error.php on line 12 bool(false) diff --git a/ext/fileinfo/tests/mime_content_type_001.phpt b/ext/fileinfo/tests/mime_content_type_001.phpt index 8d18cb43ac494..91e92c4b340f3 100644 --- a/ext/fileinfo/tests/mime_content_type_001.phpt +++ b/ext/fileinfo/tests/mime_content_type_001.phpt @@ -23,7 +23,7 @@ Warning: mime_content_type(): Can only process string or stream arguments in %s Warning: mime_content_type(): Can only process string or stream arguments in %s on line %d -Warning: mime_content_type(foo/inexistent): failed to open stream: No such file or directory in %s on line %d +Warning: mime_content_type(): failed to open stream (foo/inexistent): No such file or directory in %s on line %d Warning: mime_content_type(): Empty filename or path in %s on line %d diff --git a/ext/gd/tests/001-mb.phpt b/ext/gd/tests/001-mb.phpt index 8ee2e9a415433..37513fcaa47c3 100644 --- a/ext/gd/tests/001-mb.phpt +++ b/ext/gd/tests/001-mb.phpt @@ -17,7 +17,7 @@ var_dump(imagecreatefrompng($file)); echo "Done\n"; ?> --EXPECTF-- -Warning: imagecreatefrompng(%s001私はガラスを食べられます.test): failed to open stream: No such file or directory in %s on line %d +Warning: imagecreatefrompng(): failed to open stream (%s001私はガラスを食べられます.test): No such file or directory in %s on line %d bool(false) Warning: imagecreatefrompng(): '%s001私はガラスを食べられます.test' is not a valid PNG file in %s on line %d diff --git a/ext/gd/tests/001.phpt b/ext/gd/tests/001.phpt index b820ac1cc00cc..e570487eb0e94 100644 --- a/ext/gd/tests/001.phpt +++ b/ext/gd/tests/001.phpt @@ -17,7 +17,7 @@ var_dump(imagecreatefrompng($file)); echo "Done\n"; ?> --EXPECTF-- -Warning: imagecreatefrompng(%s001.test): failed to open stream: No such file or directory in %s on line %d +Warning: imagecreatefrompng(): failed to open stream (%s001.test): No such file or directory in %s on line %d bool(false) Warning: imagecreatefrompng(): '%s001.test' is not a valid PNG file in %s on line %d diff --git a/ext/gd/tests/imageloadfont_error2.phpt b/ext/gd/tests/imageloadfont_error2.phpt index 262009f2cf8b2..71d9b90998df1 100644 --- a/ext/gd/tests/imageloadfont_error2.phpt +++ b/ext/gd/tests/imageloadfont_error2.phpt @@ -11,5 +11,5 @@ Austin Drouare #testfest #tek11 var_dump( imageloadfont('\src\invalidfile.font') ); ?> --EXPECTF-- -Warning: imageloadfont(\src\invalidfile.font): failed to open stream: No such file or directory in %s on line %d +Warning: imageloadfont(): failed to open stream (\src\invalidfile.font): No such file or directory in %s on line %d bool(false) diff --git a/ext/hash/tests/hash_file_error.phpt b/ext/hash/tests/hash_file_error.phpt index a634070de5b32..39e1b5d6c8fab 100644 --- a/ext/hash/tests/hash_file_error.phpt +++ b/ext/hash/tests/hash_file_error.phpt @@ -50,7 +50,7 @@ bool(false) -- Testing hash_file() function with a non-existent file -- -Warning: hash_file(%s): failed to open stream: No such file or directory in %s on line %d +Warning: hash_file(): failed to open stream (%s): No such file or directory in %s on line %d bool(false) -- Testing hash_file() function with less than expected no. of arguments -- diff --git a/ext/libxml/tests/bug61367-write.phpt b/ext/libxml/tests/bug61367-write.phpt index 155c9aba9db7f..09448977bdecb 100644 --- a/ext/libxml/tests/bug61367-write.phpt +++ b/ext/libxml/tests/bug61367-write.phpt @@ -42,5 +42,5 @@ bool(true) Warning: DOMDocument::save(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d -Warning: DOMDocument::save(%s): failed to open stream: Operation not permitted in %s on line %d +Warning: DOMDocument::save(): failed to open stream (%s): Operation not permitted in %s on line %d bool(false) diff --git a/ext/phar/tests/013.phpt b/ext/phar/tests/013.phpt index 7667a98db95fc..dcbcaa9ff3a22 100644 --- a/ext/phar/tests/013.phpt +++ b/ext/phar/tests/013.phpt @@ -20,4 +20,4 @@ echo file_get_contents($pname.'/a'); --CLEAN-- --EXPECTF-- -Warning: file_get_contents(phar://%s/a): failed to open stream: phar error: internal corruption of phar "%s" (%s file "a") in %s on line %d +Warning: file_get_contents(): failed to open stream (phar://%s/a): phar error: internal corruption of phar "%s" (%s file "a") in %s on line %d diff --git a/ext/phar/tests/014.phpt b/ext/phar/tests/014.phpt index 08247d17435ac..b2b752482b743 100644 --- a/ext/phar/tests/014.phpt +++ b/ext/phar/tests/014.phpt @@ -20,4 +20,4 @@ echo file_get_contents($pname.'/a'); --CLEAN-- --EXPECTF-- -Warning: file_get_contents(phar://%s/a): failed to open stream: phar error: internal corruption of phar "%s" (crc32 mismatch on file "a") in %s on line %d +Warning: file_get_contents(): failed to open stream (phar://%s/a): phar error: internal corruption of phar "%s" (crc32 mismatch on file "a") in %s on line %d diff --git a/ext/phar/tests/016.phpt b/ext/phar/tests/016.phpt index e94a17f059f70..d2cfb0572bf94 100644 --- a/ext/phar/tests/016.phpt +++ b/ext/phar/tests/016.phpt @@ -28,12 +28,12 @@ var_dump(file_get_contents($pname . '/d')); --CLEAN-- --EXPECTF-- -Warning: file_get_contents(phar://%s/a): failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "a") in %s on line %d +Warning: file_get_contents(): failed to open stream (phar://%s/a): phar error: internal corruption of phar "%s" (actual filesize mismatch on file "a") in %s on line %d bool(false) -Warning: file_get_contents(phar://%s/b): failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "b") in %s on line %d +Warning: file_get_contents(): failed to open stream (phar://%s/b): phar error: internal corruption of phar "%s" (actual filesize mismatch on file "b") in %s on line %d bool(false) string(1) "*" -Warning: file_get_contents(phar://%s/d): failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "d") in %s on line %d +Warning: file_get_contents(): failed to open stream (phar://%s/d): phar error: internal corruption of phar "%s" (actual filesize mismatch on file "d") in %s on line %d bool(false) diff --git a/ext/phar/tests/016b.phpt b/ext/phar/tests/016b.phpt index fa2727bede243..ebe8c410547b3 100644 --- a/ext/phar/tests/016b.phpt +++ b/ext/phar/tests/016b.phpt @@ -21,4 +21,4 @@ echo file_get_contents($pname . '/a'); --CLEAN-- --EXPECTF-- -Warning: file_get_contents(phar://%s/a): failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "a") in %s on line %d +Warning: file_get_contents(): failed to open stream (phar://%s/a): phar error: internal corruption of phar "%s" (actual filesize mismatch on file "a") in %s on line %d diff --git a/ext/phar/tests/017.phpt b/ext/phar/tests/017.phpt index 69169b7a0b5e3..c3a8f2b8a5ec9 100644 --- a/ext/phar/tests/017.phpt +++ b/ext/phar/tests/017.phpt @@ -29,5 +29,5 @@ $dir = opendir('phar://hio'); string(%d) "%s017.phar.php" bool(true) -Warning: opendir(phar://hio): failed to open dir: phar error: no directory in "phar://hio", must have at least phar://hio/ for root directory (always use full path to a new phar) +Warning: opendir(): failed to open dir (phar://hio): phar error: no directory in "phar://hio", must have at least phar://hio/ for root directory (always use full path to a new phar) phar url "phar://hio" is unknown in %s017.php on line %d diff --git a/ext/phar/tests/027.phpt b/ext/phar/tests/027.phpt index 935f92c2d2cb3..c57b6e3cb90fe 100644 --- a/ext/phar/tests/027.phpt +++ b/ext/phar/tests/027.phpt @@ -86,11 +86,11 @@ int(0) bool(false) opendir edge cases -Warning: opendir(phar://): failed to open dir: phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar) +Warning: opendir(): failed to open dir (phar://): phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar) phar url "phar://" is unknown in %s027.php on line %d bool(false) -Warning: opendir(phar://foo.phar/hi): failed to open dir: phar error: invalid url or non-existent phar "phar://foo.phar/hi" +Warning: opendir(): failed to open dir (phar://foo.phar/hi): phar error: invalid url or non-existent phar "phar://foo.phar/hi" phar url "phar://foo.phar/hi" is unknown in %s027.php on line %d bool(false) ===DONE=== diff --git a/ext/phar/tests/bug69720.phpt b/ext/phar/tests/bug69720.phpt index c0f76c7a0e375..53ad366a8ce03 100644 --- a/ext/phar/tests/bug69720.phpt +++ b/ext/phar/tests/bug69720.phpt @@ -24,7 +24,7 @@ try { --EXPECTF-- MY_METADATA_NULL -Warning: file_get_contents(phar://%s): failed to open stream: phar error: "test.php" is not a file in phar "%s.phar" in %s.php on line %d +Warning: file_get_contents(): failed to open stream (phar://%s): phar error: "test.php" is not a file in phar "%s.phar" in %s.php on line %d array(1) { ["whatever"]=> int(123) diff --git a/ext/phar/tests/cache_list/frontcontroller22.phpt b/ext/phar/tests/cache_list/frontcontroller22.phpt index f0d659b4c3ebc..251fb826d385d 100644 --- a/ext/phar/tests/cache_list/frontcontroller22.phpt +++ b/ext/phar/tests/cache_list/frontcontroller22.phpt @@ -17,6 +17,6 @@ Content-type: text/html; charset=UTF-8 string(4) "test" string(12) "oof/test.php" -Warning: include(./hi.php): failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d +Warning: include(): failed to open stream (./hi.php): No such file or directory in phar://%s/oof/test.php on line %d Warning: include(): Failed opening './hi.php' for inclusion (include_path='%s') in phar://%soof/test.php on line %d diff --git a/ext/phar/tests/create_new_phar_b.phpt b/ext/phar/tests/create_new_phar_b.phpt index 8b0d6e26dc2a9..4bf5197f7ca44 100644 --- a/ext/phar/tests/create_new_phar_b.phpt +++ b/ext/phar/tests/create_new_phar_b.phpt @@ -17,9 +17,9 @@ include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/a.ph --CLEAN-- --EXPECTF-- -Warning: file_put_contents(phar://%screate_new_phar_b.phar.php/a.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d +Warning: file_put_contents(): failed to open stream (phar://%screate_new_phar_b.phar.php/a.php): phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d -Warning: include(phar://%screate_new_phar_b.phar.php/a.php): failed to open stream: %s in %screate_new_phar_b.php on line %d +Warning: include(): failed to open stream (phar://%screate_new_phar_b.phar.php/a.php): %s in %screate_new_phar_b.php on line %d Warning: include(): Failed opening 'phar://%screate_new_phar_b.phar.php/a.php' for inclusion (include_path='%s') in %screate_new_phar_b.php on line %d diff --git a/ext/phar/tests/create_path_error.phpt b/ext/phar/tests/create_path_error.phpt index 047e7e3806307..667f89a0ef7f2 100644 --- a/ext/phar/tests/create_path_error.phpt +++ b/ext/phar/tests/create_path_error.phpt @@ -66,17 +66,17 @@ foreach($checks as $check) --EXPECTF-- string(5) "query" string(5) "query" -1:Error: file_put_contents(phar://%s//): failed to open stream: phar error: file "" in phar "%s" cannot be empty -2:Error: file_put_contents(phar://%s/.): failed to open stream: phar error: file "" in phar "%s" cannot be empty -3:Error: file_put_contents(phar://%s/../): failed to open stream: phar error: file "" in phar "%s" cannot be empty -4:Error: file_put_contents(phar://%s/a/..): failed to open stream: phar error: file "" in phar "%s" cannot be empty +1:Error: file_put_contents(): failed to open stream (phar://%s//): phar error: file "" in phar "%s" cannot be empty +2:Error: file_put_contents(): failed to open stream (phar://%s/.): phar error: file "" in phar "%s" cannot be empty +3:Error: file_put_contents(): failed to open stream (phar://%s/../): phar error: file "" in phar "%s" cannot be empty +4:Error: file_put_contents(): failed to open stream (phar://%s/a/..): phar error: file "" in phar "%s" cannot be empty 5: 6: 7: 8: -9:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character -10:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character -11:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character -12:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character -13:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character +9:Error: file_put_contents(): failed to open stream (phar://%s): phar error: invalid path "%s" contains illegal character +10:Error: file_put_contents(): failed to open stream (phar://%s): phar error: invalid path "%s" contains illegal character +11:Error: file_put_contents(): failed to open stream (phar://%s): phar error: invalid path "%s" contains illegal character +12:Error: file_put_contents(): failed to open stream (phar://%s): phar error: invalid path "%s" contains illegal character +13:Error: file_put_contents(): failed to open stream (phar://%s): phar error: invalid path "%s" contains illegal character Error: Phar::offsetSet() expects parameter 1 to be a valid path, string given===DONE=== diff --git a/ext/phar/tests/delete.phpt b/ext/phar/tests/delete.phpt index 56559777d7352..af95c5919231c 100644 --- a/ext/phar/tests/delete.phpt +++ b/ext/phar/tests/delete.phpt @@ -28,4 +28,4 @@ echo file_get_contents($pname . '/a') . "\n"; --EXPECTF-- a -Warning: file_get_contents(phar://%sdelete.phar.php/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.php" in %sdelete.php on line 16 +Warning: file_get_contents(): failed to open stream (phar://%sdelete.phar.php/a): phar error: "a" is not a file in phar "%sdelete.phar.php" in %sdelete.php on line 16 diff --git a/ext/phar/tests/delete_in_phar.phpt b/ext/phar/tests/delete_in_phar.phpt index 6644030936481..8bc906ff96a14 100644 --- a/ext/phar/tests/delete_in_phar.phpt +++ b/ext/phar/tests/delete_in_phar.phpt @@ -49,7 +49,7 @@ This is b/c This is a This is b -Warning: include(%sdelete_in_phar.phar.php/b/c.php): failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar.phar.php" in %sdelete_in_phar.php on line %d +Warning: include(): failed to open stream (%sdelete_in_phar.phar.php/b/c.php): phar error: "b/c.php" is not a file in phar "%sdelete_in_phar.phar.php" in %sdelete_in_phar.php on line %d Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.php/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d diff --git a/ext/phar/tests/delete_in_phar_confirm.phpt b/ext/phar/tests/delete_in_phar_confirm.phpt index 2596e06462a5a..4f4e3e8322ebb 100644 --- a/ext/phar/tests/delete_in_phar_confirm.phpt +++ b/ext/phar/tests/delete_in_phar_confirm.phpt @@ -53,7 +53,7 @@ This is b/c This is a This is b -Warning: include(%sdelete_in_phar_confirm.phar.php/b/c.php): failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar_confirm.phar.php" in %sdelete_in_phar_confirm.php on line %d +Warning: include(): failed to open stream (%sdelete_in_phar_confirm.phar.php/b/c.php): phar error: "b/c.php" is not a file in phar "%sdelete_in_phar_confirm.phar.php" in %sdelete_in_phar_confirm.php on line %d Warning: include(): Failed opening 'phar://%sdelete_in_phar_confirm.phar.php/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar_confirm.php on line %d diff --git a/ext/phar/tests/fgc_edgecases.phpt b/ext/phar/tests/fgc_edgecases.phpt index 11916603e3c49..22fc935226f0b 100644 --- a/ext/phar/tests/fgc_edgecases.phpt +++ b/ext/phar/tests/fgc_edgecases.phpt @@ -79,7 +79,7 @@ echo file_get_contents("./hi"); echo file_get_contents("./hi", 0, $context, 0, 0); ?> -Warning: file_get_contents(phar://%sfgc_edgecases.phar.php/oops): failed to open stream: phar error: path "oops" is a directory in phar://%sfgc_edgecases.phar.php/foo/hi on line %d +Warning: file_get_contents(): failed to open stream (phar://%sfgc_edgecases.phar.php/oops): phar error: path "oops" is a directory in phar://%sfgc_edgecases.phar.php/foo/hi on line %d Warning: file_get_contents(): Failed to seek to position 50000 in the stream in phar://%sfgc_edgecases.phar.php/foo/hi on line %d -Warning: file_get_contents(phar://%stempmanifest1.phar.php/testit/directory): failed to open stream: phar error: path "testit/directory" is a directory in phar://%stempmanifest1.phar.php/index.php on line %d +Warning: file_get_contents(): failed to open stream (phar://%stempmanifest1.phar.php/testit/directory): phar error: path "testit/directory" is a directory in phar://%stempmanifest1.phar.php/index.php on line %d oops string(%d) "phar://%sextfile.php" diff --git a/ext/phar/tests/open_for_write_existing_b.phpt b/ext/phar/tests/open_for_write_existing_b.phpt index d7ed20fd06742..b1dba318dc407 100644 --- a/ext/phar/tests/open_for_write_existing_b.phpt +++ b/ext/phar/tests/open_for_write_existing_b.phpt @@ -28,7 +28,7 @@ include $pname . '/b/c.php'; --CLEAN-- --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_existing_b.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d +Warning: fopen(): failed to open stream (phar://%sopen_for_write_existing_b.phar.php/b/c.php): phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_existing_b.php on line %d diff --git a/ext/phar/tests/open_for_write_existing_c.phpt b/ext/phar/tests/open_for_write_existing_c.phpt index 2809d46c814a3..c505de3597258 100644 --- a/ext/phar/tests/open_for_write_existing_c.phpt +++ b/ext/phar/tests/open_for_write_existing_c.phpt @@ -28,7 +28,7 @@ include $pname . '/b/c.php'; --CLEAN-- --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_existing_c.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d +Warning: fopen(): failed to open stream (phar://%sopen_for_write_existing_c.phar.php/b/c.php): phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d Warning: fwrite() expects parameter 1 to be resource, bool given in %spen_for_write_existing_c.php on line %d diff --git a/ext/phar/tests/open_for_write_newfile_b.phpt b/ext/phar/tests/open_for_write_newfile_b.phpt index 782249249812e..7bfbe3da1b1b2 100644 --- a/ext/phar/tests/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/open_for_write_newfile_b.phpt @@ -30,14 +30,14 @@ include $pname . '/b/new.php'; --CLEAN-- --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d +Warning: fopen(): failed to open stream (phar://%sopen_for_write_newfile_b.phar.php/b/new.php): phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d This is b/c -Warning: include(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.php" in %sopen_for_write_newfile_b.php on line %d +Warning: include(): failed to open stream (phar://%sopen_for_write_newfile_b.phar.php/b/new.php): phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.php" in %sopen_for_write_newfile_b.php on line %d Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_b.phar.php/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_b.php on line %d diff --git a/ext/phar/tests/open_for_write_newfile_c.phpt b/ext/phar/tests/open_for_write_newfile_c.phpt index aa288d1110264..3b11510d2824b 100644 --- a/ext/phar/tests/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/open_for_write_newfile_c.phpt @@ -30,14 +30,14 @@ include $pname . '/b/new.php'; --CLEAN-- --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d +Warning: fopen(): failed to open stream (phar://%sopen_for_write_newfile_c.phar.php/b/new.php): phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d This is b/c -Warning: include(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.php" in %sopen_for_write_newfile_c.php on line %d +Warning: include(): failed to open stream (phar://%sopen_for_write_newfile_c.phar.php/b/new.php): phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.php" in %sopen_for_write_newfile_c.php on line %d Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.php/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line %d diff --git a/ext/phar/tests/opendir.phpt b/ext/phar/tests/opendir.phpt index 2f5f6635d7f38..75f968a818e16 100644 --- a/ext/phar/tests/opendir.phpt +++ b/ext/phar/tests/opendir.phpt @@ -36,9 +36,9 @@ opendir('phar://hi.phar'); --EXPECTF-- file1.txtfile2.txtfile3.txt -Warning: opendir(phar://): failed to open dir: phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar) +Warning: opendir(): failed to open dir (phar://): phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar) phar url "phar://" is unknown in %sopendir.php on line %d -Warning: opendir(phar://hi.phar): failed to open dir: phar error: invalid url or non-existent phar "phar://hi.phar" +Warning: opendir(): failed to open dir (phar://hi.phar): phar error: invalid url or non-existent phar "phar://hi.phar" phar url "phar://hi.phar" is unknown in %sopendir.php on line %d ===DONE=== diff --git a/ext/phar/tests/opendir_edgecases.phpt b/ext/phar/tests/opendir_edgecases.phpt index c3303705cbbaf..49975e051a3a7 100644 --- a/ext/phar/tests/opendir_edgecases.phpt +++ b/ext/phar/tests/opendir_edgecases.phpt @@ -57,5 +57,5 @@ Warning: opendir() expects parameter 1 to be a valid path, array given in %sopen .. foo -Warning: opendir(phar://%sopendir_edgecases.phar.php/oops): failed to open dir: %s in phar://%sopendir_edgecases.phar.php/foo on line %d +Warning: opendir(): failed to open dir (phar://%sopendir_edgecases.phar.php/oops): %s in phar://%sopendir_edgecases.phar.php/foo on line %d ===DONE=== diff --git a/ext/phar/tests/phar_buildfromdirectory2-win.phpt b/ext/phar/tests/phar_buildfromdirectory2-win.phpt index fd552302ae5e6..05fb60d823c17 100644 --- a/ext/phar/tests/phar_buildfromdirectory2-win.phpt +++ b/ext/phar/tests/phar_buildfromdirectory2-win.phpt @@ -26,5 +26,5 @@ __HALT_COMPILER(); ?> --EXPECTF-- %s(24) "UnexpectedValueException" -RecursiveDirectoryIterator::__construct(1,1): %s (code: 2) +RecursiveDirectoryIterator::__construct(): The system cannot find the file specified. (1) (code: 2) ===DONE=== diff --git a/ext/phar/tests/phar_buildfromdirectory2.phpt b/ext/phar/tests/phar_buildfromdirectory2.phpt index 0105d1967c322..ff54db93414fe 100644 --- a/ext/phar/tests/phar_buildfromdirectory2.phpt +++ b/ext/phar/tests/phar_buildfromdirectory2.phpt @@ -26,5 +26,5 @@ __HALT_COMPILER(); ?> --EXPECTF-- %s(24) "UnexpectedValueException" -RecursiveDirectoryIterator::__construct(1): failed to open dir: No such file or directory +RecursiveDirectoryIterator::__construct(): failed to open dir (1): No such file or directory ===DONE=== diff --git a/ext/phar/tests/phar_gobyebye-win32.phpt b/ext/phar/tests/phar_gobyebye-win32.phpt index ff7b685aac9b5..22705234b2e56 100644 --- a/ext/phar/tests/phar_gobyebye-win32.phpt +++ b/ext/phar/tests/phar_gobyebye-win32.phpt @@ -29,11 +29,11 @@ include $pname . '/foo/hi'; --EXPECTF-- -Warning: readfile(foo/hi): failed to open stream: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d +Warning: readfile(): failed to open stream (foo/hi): No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d -Warning: fopen(foo/hi): failed to open stream: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d +Warning: fopen(): failed to open stream (foo/hi): No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d -Warning: file_get_contents(foo/hi): failed to open stream: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d +Warning: file_get_contents(): failed to open stream (foo/hi): No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d Warning: stat(): stat failed for foo/hi in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d bool(false) @@ -42,7 +42,7 @@ bool(false) bool(false) bool(false) -Warning: opendir(foo/hi,foo/hi): %s (code: 3) in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d +Warning: opendir(): The system cannot find the path specified. (foo/hi) (code: 3) in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d -Warning: opendir(foo/hi): failed to open dir: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d +Warning: opendir(): failed to open dir (foo/hi): No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d ===DONE=== diff --git a/ext/phar/tests/phar_gobyebye.phpt b/ext/phar/tests/phar_gobyebye.phpt index 753562571de76..f2cd112051e06 100644 --- a/ext/phar/tests/phar_gobyebye.phpt +++ b/ext/phar/tests/phar_gobyebye.phpt @@ -30,11 +30,11 @@ include $pname . '/foo/hi'; --EXPECTF-- -Warning: readfile(foo/hi): failed to open stream: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d +Warning: readfile(): failed to open stream (foo/hi): No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d -Warning: fopen(foo/hi): failed to open stream: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d +Warning: fopen(): failed to open stream (foo/hi): No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d -Warning: file_get_contents(foo/hi): failed to open stream: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d +Warning: file_get_contents(): failed to open stream (foo/hi): No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d Warning: stat(): stat failed for foo/hi in phar://%sphar_gobyebye.phar.php/foo/hi on line %d bool(false) @@ -43,5 +43,5 @@ bool(false) bool(false) bool(false) -Warning: opendir(foo/hi): failed to open dir: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d +Warning: opendir(): failed to open dir (foo/hi): No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d ===DONE=== diff --git a/ext/phar/tests/readfile_edgecases.phpt b/ext/phar/tests/readfile_edgecases.phpt index 0213f182c65d5..93867901c8235 100644 --- a/ext/phar/tests/readfile_edgecases.phpt +++ b/ext/phar/tests/readfile_edgecases.phpt @@ -58,5 +58,5 @@ readfile("./hi", 0, $context); readfile("../oops"); ?> -Warning: readfile(phar://%sreadfile_edgecases.phar.php/oops): failed to open stream: phar error: path "oops" is a directory in phar://%sreadfile_edgecases.phar.php/foo/hi on line %d +Warning: readfile(): failed to open stream (phar://%sreadfile_edgecases.phar.php/oops): phar error: path "oops" is a directory in phar://%sreadfile_edgecases.phar.php/foo/hi on line %d ===DONE=== diff --git a/ext/phar/tests/rename.phpt b/ext/phar/tests/rename.phpt index 9e3824729a573..e609468ab99f7 100644 --- a/ext/phar/tests/rename.phpt +++ b/ext/phar/tests/rename.phpt @@ -29,4 +29,4 @@ echo file_get_contents($pname . '/a') . "\n"; a a -Warning: file_get_contents(phar://%srename.phar.php/a): failed to open stream: phar error: "a" is not a file in phar "%srename.phar.php" in %srename.php on line %d +Warning: file_get_contents(): failed to open stream (phar://%srename.phar.php/a): phar error: "a" is not a file in phar "%srename.phar.php" in %srename.php on line %d diff --git a/ext/phar/tests/rename_dir.phpt b/ext/phar/tests/rename_dir.phpt index 7283135632720..bb2fc8f74df18 100644 --- a/ext/phar/tests/rename_dir.phpt +++ b/ext/phar/tests/rename_dir.phpt @@ -30,4 +30,4 @@ echo file_get_contents($pname . '/a/x') . "\n"; a a -Warning: file_get_contents(phar://%srename_dir.phar.php/a/x): failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.php" in %srename_dir.php on line %d +Warning: file_get_contents(): failed to open stream (phar://%srename_dir.phar.php/a/x): phar error: "a/x" is not a file in phar "%srename_dir.phar.php" in %srename_dir.php on line %d diff --git a/ext/phar/tests/tar/create_new_phar_b.phpt b/ext/phar/tests/tar/create_new_phar_b.phpt index 1b41db61345b7..640fa8721efa2 100644 --- a/ext/phar/tests/tar/create_new_phar_b.phpt +++ b/ext/phar/tests/tar/create_new_phar_b.phpt @@ -17,9 +17,9 @@ include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar/a.ph --CLEAN-- --EXPECTF-- -Warning: file_put_contents(phar://%screate_new_phar_b.phar.tar/a.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d +Warning: file_put_contents(): failed to open stream (phar://%screate_new_phar_b.phar.tar/a.php): phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d -Warning: include(phar://%screate_new_phar_b.phar.tar/a.php): failed to open stream: %s in %screate_new_phar_b.php on line %d +Warning: include(): failed to open stream (phar://%screate_new_phar_b.phar.tar/a.php): %s in %screate_new_phar_b.php on line %d Warning: include(): Failed opening 'phar://%screate_new_phar_b.phar.tar/a.php' for inclusion (include_path='%s') in %screate_new_phar_b.php on line %d diff --git a/ext/phar/tests/tar/delete.phpt b/ext/phar/tests/tar/delete.phpt index c34c720d313dc..20b6619e5b2eb 100644 --- a/ext/phar/tests/tar/delete.phpt +++ b/ext/phar/tests/tar/delete.phpt @@ -29,4 +29,4 @@ echo file_get_contents($alias . '/a') . "\n"; --EXPECTF-- a -Warning: file_get_contents(phar://%sdelete.phar.tar/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.tar" in %sdelete.php on line %d +Warning: file_get_contents(): failed to open stream (phar://%sdelete.phar.tar/a): phar error: "a" is not a file in phar "%sdelete.phar.tar" in %sdelete.php on line %d diff --git a/ext/phar/tests/tar/delete_in_phar.phpt b/ext/phar/tests/tar/delete_in_phar.phpt index 871f2fe6f410d..0161cec6a0d16 100644 --- a/ext/phar/tests/tar/delete_in_phar.phpt +++ b/ext/phar/tests/tar/delete_in_phar.phpt @@ -50,7 +50,7 @@ This is b/c This is a This is b -Warning: include(%sdelete_in_phar.phar.tar/b/c.php): failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar.phar.tar" in %sdelete_in_phar.php on line %d +Warning: include(): failed to open stream (%sdelete_in_phar.phar.tar/b/c.php): phar error: "b/c.php" is not a file in phar "%sdelete_in_phar.phar.tar" in %sdelete_in_phar.php on line %d Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.tar/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d diff --git a/ext/phar/tests/tar/delete_in_phar_confirm.phpt b/ext/phar/tests/tar/delete_in_phar_confirm.phpt index b66656b8c1a68..458edf5602843 100644 --- a/ext/phar/tests/tar/delete_in_phar_confirm.phpt +++ b/ext/phar/tests/tar/delete_in_phar_confirm.phpt @@ -53,7 +53,7 @@ This is b/c This is a This is b -Warning: include(%sdelete_in_phar_confirm.phar.tar/b/c.php): failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar_confirm.phar.tar" in %sdelete_in_phar_confirm.php on line %d +Warning: include(): failed to open stream (%sdelete_in_phar_confirm.phar.tar/b/c.php): phar error: "b/c.php" is not a file in phar "%sdelete_in_phar_confirm.phar.tar" in %sdelete_in_phar_confirm.php on line %d Warning: include(): Failed opening 'phar://%sdelete_in_phar_confirm.phar.tar/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar_confirm.php on line %d diff --git a/ext/phar/tests/tar/open_for_write_existing_b.phpt b/ext/phar/tests/tar/open_for_write_existing_b.phpt index fda72c36e8211..719a67aa63b37 100644 --- a/ext/phar/tests/tar/open_for_write_existing_b.phpt +++ b/ext/phar/tests/tar/open_for_write_existing_b.phpt @@ -41,7 +41,7 @@ include $alias . '/b/c.php'; --CLEAN-- --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_existing_b.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d +Warning: fopen(): failed to open stream (phar://%sopen_for_write_existing_b.phar.tar/b/c.php): phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_existing_b.php on line %d diff --git a/ext/phar/tests/tar/open_for_write_existing_c.phpt b/ext/phar/tests/tar/open_for_write_existing_c.phpt index 03ebf3591202f..72a32ddf257de 100644 --- a/ext/phar/tests/tar/open_for_write_existing_c.phpt +++ b/ext/phar/tests/tar/open_for_write_existing_c.phpt @@ -41,7 +41,7 @@ include $alias . '/b/c.php'; --CLEAN-- --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_existing_c.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d +Warning: fopen(): failed to open stream (phar://%sopen_for_write_existing_c.phar.tar/b/c.php): phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d Warning: fwrite() expects parameter 1 to be resource, bool given in %spen_for_write_existing_c.php on line %d diff --git a/ext/phar/tests/tar/open_for_write_newfile_b.phpt b/ext/phar/tests/tar/open_for_write_newfile_b.phpt index cc4333150a2d2..0cde07b0788d8 100644 --- a/ext/phar/tests/tar/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile_b.phpt @@ -42,14 +42,14 @@ include $alias . '/b/new.php'; --CLEAN-- --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d +Warning: fopen(): failed to open stream (phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d This is b/c -Warning: include(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.tar" in %sopen_for_write_newfile_b.php on line %d +Warning: include(): failed to open stream (phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.tar" in %sopen_for_write_newfile_b.php on line %d Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_b.phar.tar/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_b.php on line %d diff --git a/ext/phar/tests/tar/open_for_write_newfile_c.phpt b/ext/phar/tests/tar/open_for_write_newfile_c.phpt index 36b5a423d1742..52fc8c563f13d 100644 --- a/ext/phar/tests/tar/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile_c.phpt @@ -41,14 +41,14 @@ include $alias . '/b/new.php'; --CLEAN-- --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d +Warning: fopen(): failed to open stream (phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d This is b/c -Warning: include(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.tar" in %sopen_for_write_newfile_c.php on line %d +Warning: include(): failed to open stream (phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.tar" in %sopen_for_write_newfile_c.php on line %d Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.tar/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line %d diff --git a/ext/phar/tests/tar/rename.phpt b/ext/phar/tests/tar/rename.phpt index 8774fb2581cde..71ccb71e81961 100644 --- a/ext/phar/tests/tar/rename.phpt +++ b/ext/phar/tests/tar/rename.phpt @@ -39,4 +39,4 @@ echo file_get_contents($alias . '/a') . "\n"; a a -Warning: file_get_contents(phar://%srename.phar.tar/a): failed to open stream: phar error: "a" is not a file in phar "%srename.phar.tar" in %srename.php on line %d +Warning: file_get_contents(): failed to open stream (phar://%srename.phar.tar/a): phar error: "a" is not a file in phar "%srename.phar.tar" in %srename.php on line %d diff --git a/ext/phar/tests/tar/rename_dir.phpt b/ext/phar/tests/tar/rename_dir.phpt index f0b8a9b00e722..2a1c56957737a 100644 --- a/ext/phar/tests/tar/rename_dir.phpt +++ b/ext/phar/tests/tar/rename_dir.phpt @@ -39,4 +39,4 @@ echo file_get_contents($alias . '/a/x') . "\n"; a a -Warning: file_get_contents(phar://%srename_dir.phar.tar/a/x): failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.tar" in %srename_dir.php on line %d +Warning: file_get_contents(): failed to open stream (phar://%srename_dir.phar.tar/a/x): phar error: "a/x" is not a file in phar "%srename_dir.phar.tar" in %srename_dir.php on line %d diff --git a/ext/phar/tests/tar/tar_001.phpt b/ext/phar/tests/tar/tar_001.phpt index 5eabc301a984d..50236ac621335 100644 --- a/ext/phar/tests/tar/tar_001.phpt +++ b/ext/phar/tests/tar/tar_001.phpt @@ -25,6 +25,6 @@ try { @unlink(__DIR__ . '/tar_001.phar.tar'); ?> --EXPECTF-- -Warning: fopen(phar://%star_001.phar.tar/tar_001.phpt): failed to open stream: phar error: "%star_001.phar.tar" is a corrupted tar file (truncated) in %star_001.php on line 9 +Warning: fopen(): failed to open stream (phar://%star_001.phar.tar/tar_001.phpt): phar error: "%star_001.phar.tar" is a corrupted tar file (truncated) in %star_001.php on line 9 phar error: "%star_001.phar.tar" is a corrupted tar file (truncated) ===DONE=== diff --git a/ext/phar/tests/tar/tar_002.phpt b/ext/phar/tests/tar/tar_002.phpt index 38623a40302c6..dbce943c7da58 100644 --- a/ext/phar/tests/tar/tar_002.phpt +++ b/ext/phar/tests/tar/tar_002.phpt @@ -28,6 +28,6 @@ try { @unlink(__DIR__ . '/tar_002.phar.tar'); ?> --EXPECTF-- -Warning: fopen(phar://%star_002.phar.tar/tar_002.phpt): failed to open stream: phar error: "%star_002.phar.tar" is a corrupted tar file (truncated) in %star_002.php on line 9 +Warning: fopen(): failed to open stream (phar://%star_002.phar.tar/tar_002.phpt): phar error: "%star_002.phar.tar" is a corrupted tar file (truncated) in %star_002.php on line 9 phar error: "%star_002.phar.tar" is a corrupted tar file (truncated) ===DONE=== diff --git a/ext/phar/tests/tar/tar_nostub.phpt b/ext/phar/tests/tar/tar_nostub.phpt index d71f834280d15..d46457edc11b9 100644 --- a/ext/phar/tests/tar/tar_nostub.phpt +++ b/ext/phar/tests/tar/tar_nostub.phpt @@ -42,7 +42,7 @@ try { @unlink(__DIR__ . '/tar_nostub.tar'); ?> --EXPECTF-- -RecursiveDirectoryIterator::__construct(phar://%star_nostub.phar.tar/): failed to open dir: '%star_nostub.phar.tar' is not a phar archive. Use PharData::__construct() for a standard zip or tar archive +RecursiveDirectoryIterator::__construct(): failed to open dir (phar://%star_nostub.phar.tar/): '%star_nostub.phar.tar' is not a phar archive. Use PharData::__construct() for a standard zip or tar archive phar url "phar://%star_nostub.phar.tar/" is unknown string(0) "" ===DONE=== diff --git a/ext/phar/tests/test_alias_unset.phpt b/ext/phar/tests/test_alias_unset.phpt index fe0ffa970f9d7..5916d10c6ca9a 100644 --- a/ext/phar/tests/test_alias_unset.phpt +++ b/ext/phar/tests/test_alias_unset.phpt @@ -41,5 +41,5 @@ $a = file_get_contents($pname . '/file1.txt'); // this fails because $fname2 ref Cannot open archive "%stest_alias_unset.2.phar.php", alias is already in use by existing archive string(5) "first" -Warning: file_get_contents(phar://%sfile1.txt): failed to open stream: Cannot open archive "%stest_alias_unset.phar.php", alias is already in use by existing archive in %stest_alias_unset.php on line %d +Warning: file_get_contents(): failed to open stream (phar://%sfile1.txt): Cannot open archive "%stest_alias_unset.phar.php", alias is already in use by existing archive in %stest_alias_unset.php on line %d ===DONE=== diff --git a/ext/phar/tests/zip/create_new_phar_b.phpt b/ext/phar/tests/zip/create_new_phar_b.phpt index d8a72c9d42cd3..a78a0a59ff048 100644 --- a/ext/phar/tests/zip/create_new_phar_b.phpt +++ b/ext/phar/tests/zip/create_new_phar_b.phpt @@ -17,9 +17,9 @@ include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip/a.ph --CLEAN-- --EXPECTF-- -Warning: file_put_contents(phar://%screate_new_phar_b.phar.zip/a.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d +Warning: file_put_contents(): failed to open stream (phar://%screate_new_phar_b.phar.zip/a.php): phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d -Warning: include(phar://%screate_new_phar_b.phar.zip/a.php): failed to open stream: %s in %screate_new_phar_b.php on line %d +Warning: include(): failed to open stream (phar://%screate_new_phar_b.phar.zip/a.php): %s in %screate_new_phar_b.php on line %d Warning: include(): Failed opening 'phar://%screate_new_phar_b.phar.zip/a.php' for inclusion (include_path='%s') in %screate_new_phar_b.php on line %d diff --git a/ext/phar/tests/zip/delete.phpt b/ext/phar/tests/zip/delete.phpt index 87536c9666a58..4363aa37662cf 100644 --- a/ext/phar/tests/zip/delete.phpt +++ b/ext/phar/tests/zip/delete.phpt @@ -28,4 +28,4 @@ echo file_get_contents($alias . '/a') . "\n"; --EXPECTF-- a -Warning: file_get_contents(phar://%sdelete.phar.zip/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.zip" in %sdelete.php on line %d +Warning: file_get_contents(): failed to open stream (phar://%sdelete.phar.zip/a): phar error: "a" is not a file in phar "%sdelete.phar.zip" in %sdelete.php on line %d diff --git a/ext/phar/tests/zip/delete_in_phar.phpt b/ext/phar/tests/zip/delete_in_phar.phpt index 5c83202509c2e..11618e01f667a 100644 --- a/ext/phar/tests/zip/delete_in_phar.phpt +++ b/ext/phar/tests/zip/delete_in_phar.phpt @@ -49,7 +49,7 @@ This is b/c This is a This is b -Warning: include(%sdelete_in_phar.phar.zip/b/c.php): failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar.phar.zip" in %sdelete_in_phar.php on line %d +Warning: include(): failed to open stream (%sdelete_in_phar.phar.zip/b/c.php): phar error: "b/c.php" is not a file in phar "%sdelete_in_phar.phar.zip" in %sdelete_in_phar.php on line %d Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.zip/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d diff --git a/ext/phar/tests/zip/delete_in_phar_confirm.phpt b/ext/phar/tests/zip/delete_in_phar_confirm.phpt index 262dabdbb35ca..71d2d4d9ec0f7 100644 --- a/ext/phar/tests/zip/delete_in_phar_confirm.phpt +++ b/ext/phar/tests/zip/delete_in_phar_confirm.phpt @@ -54,7 +54,7 @@ This is b/c This is a This is b -Warning: include(%sdelete_in_phar_confirm.phar.zip/b/c.php): failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar_confirm.phar.zip" in %sdelete_in_phar_confirm.php on line %d +Warning: include(): failed to open stream (%sdelete_in_phar_confirm.phar.zip/b/c.php): phar error: "b/c.php" is not a file in phar "%sdelete_in_phar_confirm.phar.zip" in %sdelete_in_phar_confirm.php on line %d Warning: include(): Failed opening 'phar://%sdelete_in_phar_confirm.phar.zip/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar_confirm.php on line %d diff --git a/ext/phar/tests/zip/notphar.phpt b/ext/phar/tests/zip/notphar.phpt index ff30a0c162a97..99986f3a89acf 100644 --- a/ext/phar/tests/zip/notphar.phpt +++ b/ext/phar/tests/zip/notphar.phpt @@ -21,5 +21,5 @@ unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); __HALT_COMPILER(); ?> --EXPECTF-- -Warning: include(phar://%snotphar.phar.zip/.phar/stub.php): failed to open stream: '%snotphar.phar.zip' is not a phar archive. Use PharData::__construct() for a standard zip or tar archive in %snotphar.php on line %d +Warning: include(): failed to open stream (phar://%snotphar.phar.zip/.phar/stub.php): '%snotphar.phar.zip' is not a phar archive. Use PharData::__construct() for a standard zip or tar archive in %snotphar.php on line %d PK%a diff --git a/ext/phar/tests/zip/open_for_write_existing_b.phpt b/ext/phar/tests/zip/open_for_write_existing_b.phpt index 35bd6cf3eca77..f30bde4446245 100644 --- a/ext/phar/tests/zip/open_for_write_existing_b.phpt +++ b/ext/phar/tests/zip/open_for_write_existing_b.phpt @@ -38,7 +38,7 @@ include $alias . '/b/c.php'; --CLEAN-- --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_existing_b.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d +Warning: fopen(): failed to open stream (phar://%sopen_for_write_existing_b.phar.zip/b/c.php): phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d Warning: fwrite() expects parameter 1 to be resource, bool given in %spen_for_write_existing_b.php on line %d diff --git a/ext/phar/tests/zip/open_for_write_existing_c.phpt b/ext/phar/tests/zip/open_for_write_existing_c.phpt index 8c58025608f28..35e7141ba8717 100644 --- a/ext/phar/tests/zip/open_for_write_existing_c.phpt +++ b/ext/phar/tests/zip/open_for_write_existing_c.phpt @@ -38,7 +38,7 @@ include $alias . '/b/c.php'; --CLEAN-- --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_existing_c.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d +Warning: fopen(): failed to open stream (phar://%sopen_for_write_existing_c.phar.zip/b/c.php): phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d Warning: fwrite() expects parameter 1 to be resource, bool given in %spen_for_write_existing_c.php on line %d diff --git a/ext/phar/tests/zip/open_for_write_newfile_b.phpt b/ext/phar/tests/zip/open_for_write_newfile_b.phpt index d39dffb986502..6c1a30770f000 100644 --- a/ext/phar/tests/zip/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile_b.phpt @@ -41,14 +41,14 @@ include $alias . '/b/new.php'; --CLEAN-- --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d +Warning: fopen(): failed to open stream (phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_b.php on line %d This is b/c -Warning: include(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.zip" in %sopen_for_write_newfile_b.php on line %d +Warning: include(): failed to open stream (phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.zip" in %sopen_for_write_newfile_b.php on line %d Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_b.phar.zip/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_b.php on line %d diff --git a/ext/phar/tests/zip/open_for_write_newfile_c.phpt b/ext/phar/tests/zip/open_for_write_newfile_c.phpt index f927a618cceb4..da961526892de 100644 --- a/ext/phar/tests/zip/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile_c.phpt @@ -41,14 +41,14 @@ include $alias . '/b/new.php'; --CLEAN-- --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d +Warning: fopen(): failed to open stream (phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d Warning: fwrite() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d Warning: fclose() expects parameter 1 to be resource, bool given in %sopen_for_write_newfile_c.php on line %d This is b/c -Warning: include(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.zip" in %sopen_for_write_newfile_c.php on line %d +Warning: include(): failed to open stream (phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.zip" in %sopen_for_write_newfile_c.php on line %d Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.zip/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line %d diff --git a/ext/phar/tests/zip/rename.phpt b/ext/phar/tests/zip/rename.phpt index 82e2850927c40..91bed3ef2045a 100644 --- a/ext/phar/tests/zip/rename.phpt +++ b/ext/phar/tests/zip/rename.phpt @@ -31,4 +31,4 @@ echo file_get_contents($alias . '/a') . "\n"; a a -Warning: file_get_contents(phar://%srename.phar.zip/a): failed to open stream: phar error: "a" is not a file in phar "%srename.phar.zip" in %srename.php on line %d +Warning: file_get_contents(): failed to open stream (phar://%srename.phar.zip/a): phar error: "a" is not a file in phar "%srename.phar.zip" in %srename.php on line %d diff --git a/ext/phar/tests/zip/rename_dir.phpt b/ext/phar/tests/zip/rename_dir.phpt index a65113c3cf646..da6d4b100c8fa 100644 --- a/ext/phar/tests/zip/rename_dir.phpt +++ b/ext/phar/tests/zip/rename_dir.phpt @@ -31,4 +31,4 @@ echo file_get_contents($alias . '/a/x') . "\n"; a a -Warning: file_get_contents(phar://%srename_dir.phar.zip/a/x): failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.zip" in %srename_dir.php on line %d +Warning: file_get_contents(): failed to open stream (phar://%srename_dir.phar.zip/a/x): phar error: "a/x" is not a file in phar "%srename_dir.phar.zip" in %srename_dir.php on line %d diff --git a/ext/session/tests/session_set_save_handler_variation4.phpt b/ext/session/tests/session_set_save_handler_variation4.phpt index bf74385839bf2..0bdb2a371918b 100644 --- a/ext/session/tests/session_set_save_handler_variation4.phpt +++ b/ext/session/tests/session_set_save_handler_variation4.phpt @@ -80,6 +80,6 @@ array(3) { } Destroy [%s,%s] -Warning: unlink(%s): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (%s) in %s on line %d Close [%s,PHPSESSID] bool(true) diff --git a/ext/session/tests/session_set_save_handler_variation5.phpt b/ext/session/tests/session_set_save_handler_variation5.phpt index 23847aadf4e03..5a20de202b486 100644 --- a/ext/session/tests/session_set_save_handler_variation5.phpt +++ b/ext/session/tests/session_set_save_handler_variation5.phpt @@ -94,6 +94,6 @@ GC [0] bool(true) Destroy [%s,PHPT-%d] -Warning: unlink(%s): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (%s) in %s on line %d Close [%s,PHPSESSID] bool(true) diff --git a/ext/standard/file.c b/ext/standard/file.c index a651c8744ce00..65112d9f4cda3 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -954,7 +954,7 @@ PHP_FUNCTION(popen) fp = VCWD_POPEN(command, posix_mode); if (!fp) { - php_error_docref2(NULL, command, posix_mode, E_WARNING, "%s", strerror(errno)); + php_error_docref(NULL, E_WARNING, "%s with command \"%s\" and POSIX mode %s", strerror(errno), command, posix_mode); efree(posix_mode); RETURN_FALSE; } @@ -962,7 +962,7 @@ PHP_FUNCTION(popen) stream = php_stream_fopen_from_pipe(fp, mode); if (stream == NULL) { - php_error_docref2(NULL, command, mode, E_WARNING, "%s", strerror(errno)); + php_error_docref(NULL, E_WARNING, "%s with command \"%s\" and mode %s", strerror(errno), command, mode); RETVAL_FALSE; } else { php_stream_to_zval(stream, return_value); diff --git a/ext/standard/tests/dir/dir_variation5.phpt b/ext/standard/tests/dir/dir_variation5.phpt index ea040bed8a02c..b454463092061 100644 --- a/ext/standard/tests/dir/dir_variation5.phpt +++ b/ext/standard/tests/dir/dir_variation5.phpt @@ -30,6 +30,6 @@ echo "Done"; --EXPECTF-- *** Testing dir() : open a file instead of a directory *** -Warning: dir(%s): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (%s): %s in %s on line %d bool(false) Done diff --git a/ext/standard/tests/dir/dir_variation6.phpt b/ext/standard/tests/dir/dir_variation6.phpt index c7ce2bc08099d..017b4dc862ccd 100644 --- a/ext/standard/tests/dir/dir_variation6.phpt +++ b/ext/standard/tests/dir/dir_variation6.phpt @@ -48,10 +48,10 @@ echo "Done"; *** Testing dir() : open a non-existent directory *** -- opening previously removed directory -- -Warning: dir(%s): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (%s): %s in %s on line %d bool(false) -- opening non-existent directory -- -Warning: dir(%s): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (%s): %s in %s on line %d bool(false) Done diff --git a/ext/standard/tests/dir/dir_variation7.phpt b/ext/standard/tests/dir/dir_variation7.phpt index e069043fe33c9..60f1750ce4dac 100644 --- a/ext/standard/tests/dir/dir_variation7.phpt +++ b/ext/standard/tests/dir/dir_variation7.phpt @@ -85,10 +85,10 @@ rmdir($parent_dir_path); *** Testing dir() : remove execute permission from the parent dir *** -- After restricting 1st level parent directory -- -Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (%s/dir_variation7/sub_dir/child_dir): %s in %s on line %d bool(false) -- After restricting parent directory -- -Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (%s/dir_variation7/sub_dir/child_dir): %s in %s on line %d bool(false) Done diff --git a/ext/standard/tests/dir/dir_variation8.phpt b/ext/standard/tests/dir/dir_variation8.phpt index 8664a33e3416c..79622a37d60d4 100644 --- a/ext/standard/tests/dir/dir_variation8.phpt +++ b/ext/standard/tests/dir/dir_variation8.phpt @@ -45,16 +45,16 @@ echo "Done"; *** Testing dir() : checking with wildcard characters *** -- wildcard = '*' -- -Warning: dir(%s/dir_var*): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (%s/dir_var*): %s in %s on line %d bool(false) -Warning: dir(%s/*): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (%s/*): %s in %s on line %d bool(false) -- wildcard = '?' -- -Warning: dir(%s/dir_variation81/sub_dir?): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (%s/dir_variation81/sub_dir?): %s in %s on line %d bool(false) -Warning: dir(%s/dir_variation81/sub?dir1): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (%s/dir_variation81/sub?dir1): %s in %s on line %d bool(false) Done diff --git a/ext/standard/tests/dir/dir_variation9.phpt b/ext/standard/tests/dir/dir_variation9.phpt index 50f6d6c3ce7ee..e7944213c9d8c 100644 --- a/ext/standard/tests/dir/dir_variation9.phpt +++ b/ext/standard/tests/dir/dir_variation9.phpt @@ -103,15 +103,15 @@ object(Directory)#%d (2) { -- With invalid paths -- -Warning: dir(%s/dir_variation91/sub_dir12/sub_dir111/..): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (%s/dir_variation91/sub_dir12/sub_dir111/..): %s in %s on line %d bool(false) -Warning: dir(%s/dir_variation92/sub_dir21/../dir_variation91): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (%s/dir_variation92/sub_dir21/../dir_variation91): %s in %s on line %d bool(false) -Warning: dir(%s/dir_variation92/sub_dir21/../../dir_variation91/sub_dir12/..): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (%s/dir_variation92/sub_dir21/../../dir_variation91/sub_dir12/..): %s in %s on line %d bool(false) -Warning: dir(%s/dir_variation91/sub_dir11/sub_dir111/../../dir_variation92/sub_dir21/..): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (%s/dir_variation91/sub_dir11/sub_dir111/../../dir_variation92/sub_dir21/..): %s in %s on line %d bool(false) Done diff --git a/ext/standard/tests/dir/opendir_error2.phpt b/ext/standard/tests/dir/opendir_error2.phpt index 47b7709cec5bf..a8ab3a455913f 100644 --- a/ext/standard/tests/dir/opendir_error2.phpt +++ b/ext/standard/tests/dir/opendir_error2.phpt @@ -33,11 +33,11 @@ var_dump(opendir('idonotexist')); -- Pass a non-existent absolute path: -- -Warning: opendir(%s/idonotexist): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (%s/idonotexist): %s in %s on line %d bool(false) -- Pass a non-existent relative path: -- -Warning: opendir(idonotexist): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (idonotexist): %s in %s on line %d bool(false) ===DONE=== diff --git a/ext/standard/tests/dir/opendir_variation5.phpt b/ext/standard/tests/dir/opendir_variation5.phpt index ac129302800ea..f4c48d2ed7142 100644 --- a/ext/standard/tests/dir/opendir_variation5.phpt +++ b/ext/standard/tests/dir/opendir_variation5.phpt @@ -92,11 +92,11 @@ rmdir($parent_dir_path); -- After restricting 1st level parent directory -- -Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (%s/opendir_variation5/sub_dir/child_dir): %s in %s on line %d bool(false) -- After restricting parent directory -- -Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (%s/opendir_variation5/sub_dir/child_dir): %s in %s on line %d bool(false) ===DONE=== diff --git a/ext/standard/tests/dir/opendir_variation6-win32.phpt b/ext/standard/tests/dir/opendir_variation6-win32.phpt index 3e3c26e6795f3..9fef1ad7ef3ec 100644 --- a/ext/standard/tests/dir/opendir_variation6-win32.phpt +++ b/ext/standard/tests/dir/opendir_variation6-win32.phpt @@ -51,25 +51,25 @@ rmdir($dir_path); -- Wildcard = '*' -- -Warning: opendir(%s/opendir_var*,%s/opendir_var*): %s in %s on line %d +Warning: opendir(): The operation completed successfully. (%s/opendir_var*) (code: 0) in %s on line %d -Warning: opendir(%s/opendir_var*): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (%s/opendir_var*): %s in %s on line %d bool(false) -Warning: opendir(%s/*,%s/*): %s in %s on line %d +Warning: opendir(): The operation completed successfully. (%s/*) (code: 0) in %s on line %d -Warning: opendir(%s/*): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (%s/*): %s in %s on line %d bool(false) -- Wildcard = '?' -- -Warning: opendir(%s/opendir_variation6/sub_dir?,%s/opendir_variation6/sub_dir?): %s in %s on line %d +Warning: opendir(): The operation completed successfully. (%s/opendir_variation6/sub_dir?) (code: 0) in %s on line %d -Warning: opendir(%s/opendir_variation6/sub_dir?): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (%s/opendir_variation6/sub_dir?): %s in %s on line %d bool(false) -Warning: opendir(%s/opendir_variation6/sub?dir1,%s/opendir_variation6/sub?dir1): %s in %s on line %d +Warning: opendir(): The operation completed successfully. (%s/opendir_variation6/sub?dir1) (code: 0) in %s on line %d -Warning: opendir(%s/opendir_variation6/sub?dir1): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (%s/opendir_variation6/sub?dir1): %s in %s on line %d bool(false) ===DONE=== diff --git a/ext/standard/tests/dir/opendir_variation6.phpt b/ext/standard/tests/dir/opendir_variation6.phpt index c51cd4ca26d68..e3af684a694e1 100644 --- a/ext/standard/tests/dir/opendir_variation6.phpt +++ b/ext/standard/tests/dir/opendir_variation6.phpt @@ -51,17 +51,17 @@ rmdir($dir_path); -- Wildcard = '*' -- -Warning: opendir(%s/opendir_var*): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (%s/opendir_var*): %s in %s on line %d bool(false) -Warning: opendir(%s/*): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (%s/*): %s in %s on line %d bool(false) -- Wildcard = '?' -- -Warning: opendir(%s/opendir_variation6/sub_dir?): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (%s/opendir_variation6/sub_dir?): %s in %s on line %d bool(false) -Warning: opendir(%s/opendir_variation6/sub?dir1): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (%s/opendir_variation6/sub?dir1): %s in %s on line %d bool(false) ===DONE=== diff --git a/ext/standard/tests/dir/scandir_error2.phpt b/ext/standard/tests/dir/scandir_error2.phpt index 121d68bab8925..910f12cb84a1d 100644 --- a/ext/standard/tests/dir/scandir_error2.phpt +++ b/ext/standard/tests/dir/scandir_error2.phpt @@ -33,14 +33,14 @@ var_dump(scandir('/idonotexist')); -- Pass scandir() an absolute path that does not exist -- -Warning: scandir(%s/idonotexist): failed to open dir: %s in %s on line %d +Warning: scandir(): failed to open dir (%s/idonotexist): %s in %s on line %d Warning: scandir(): (errno %d): %s in %s on line %d bool(false) -- Pass scandir() a relative path that does not exist -- -Warning: scandir(/idonotexist): failed to open dir: %s in %s on line %d +Warning: scandir(): failed to open dir (/idonotexist): %s in %s on line %d Warning: scandir(): (errno %d): %s in %s on line %d bool(false) diff --git a/ext/standard/tests/dir/scandir_variation5.phpt b/ext/standard/tests/dir/scandir_variation5.phpt index 47539c493f62f..80f6375994e49 100644 --- a/ext/standard/tests/dir/scandir_variation5.phpt +++ b/ext/standard/tests/dir/scandir_variation5.phpt @@ -84,14 +84,14 @@ rmdir($parent_dir_path); -- After restricting 1st level parent directory -- -Warning: scandir(%s/scandir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d +Warning: scandir(): failed to open dir (%s/scandir_variation5/sub_dir/child_dir): %s in %s on line %d Warning: scandir(): (errno %d): %s in %s on line %d bool(false) -- After restricting parent directory -- -Warning: scandir(%s/scandir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d +Warning: scandir(): failed to open dir (%s/scandir_variation5/sub_dir/child_dir): %s in %s on line %d Warning: scandir(): (errno %d): %s in %s on line %d bool(false) diff --git a/ext/standard/tests/dir/scandir_variation6.phpt b/ext/standard/tests/dir/scandir_variation6.phpt index d516411886a20..8a6e22f1282d4 100644 --- a/ext/standard/tests/dir/scandir_variation6.phpt +++ b/ext/standard/tests/dir/scandir_variation6.phpt @@ -52,24 +52,24 @@ rmdir($dir_path); -- Wildcard = '*' -- -Warning: scandir(%s/scandir_var*): failed to open dir: %s in %s on line %d +Warning: scandir(): failed to open dir (%s/scandir_var*): %s in %s on line %d Warning: scandir(): (errno %d): %s in %s on line %d bool(false) -Warning: scandir(%s/*): failed to open dir: %s in %s on line %d +Warning: scandir(): failed to open dir (%s/*): %s in %s on line %d Warning: scandir(): (errno %d): %s in %s on line %d bool(false) -- Wildcard = '?' -- -Warning: scandir(%s/scandir_variation6/sub_dir?): failed to open dir: %s in %s on line %d +Warning: scandir(): failed to open dir (%s/scandir_variation6/sub_dir?): %s in %s on line %d Warning: scandir(): (errno %d): %s in %s on line %d bool(false) -Warning: scandir(%s/scandir_variation6/sub?dir1): failed to open dir: %s in %s on line %d +Warning: scandir(): failed to open dir (%s/scandir_variation6/sub?dir1): %s in %s on line %d Warning: scandir(): (errno %d): %s in %s on line %d bool(false) diff --git a/ext/standard/tests/file/007_error.phpt b/ext/standard/tests/file/007_error.phpt index 93a6a23e5f523..9223cc0a5fe14 100644 --- a/ext/standard/tests/file/007_error.phpt +++ b/ext/standard/tests/file/007_error.phpt @@ -105,7 +105,7 @@ 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 +Warning: fopen(): failed to open stream (string): No such file or directory in %s on line %d bool(false) Warning: fclose() expects parameter 1 to be resource, string given in %s on line %d @@ -115,7 +115,7 @@ Warning: feof() expects parameter 1 to be resource, string given in %s on line % bool(false) -- Iteration 2 -- -Warning: fopen(10): failed to open stream: No such file or directory in %s on line %d +Warning: fopen(): failed to open stream (10): No such file or directory in %s on line %d bool(false) Warning: fclose() expects parameter 1 to be resource, int given in %s on line %d @@ -125,7 +125,7 @@ Warning: feof() expects parameter 1 to be resource, int 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 +Warning: fopen(): failed to open stream (10.5): No such file or directory in %s on line %d bool(false) Warning: fclose() expects parameter 1 to be resource, float given in %s on line %d @@ -135,7 +135,7 @@ Warning: feof() expects parameter 1 to be resource, float 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 +Warning: fopen(): failed to open stream (1): No such file or directory in %s on line %d bool(false) Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d diff --git a/ext/standard/tests/file/007_variation15.phpt b/ext/standard/tests/file/007_variation15.phpt index 39a7e506e5a92..ba753519cd0a4 100644 --- a/ext/standard/tests/file/007_variation15.phpt +++ b/ext/standard/tests/file/007_variation15.phpt @@ -54,5 +54,5 @@ int(0) bool(true) string(7) "Unknown" -Warning: fopen(%s): failed to open stream: File exists in %s on line %d +Warning: fopen(): failed to open stream (%s): File exists in %s on line %d *** Done *** diff --git a/ext/standard/tests/file/007_variation16.phpt b/ext/standard/tests/file/007_variation16.phpt index 9173138db4abc..063bef62d62ac 100644 --- a/ext/standard/tests/file/007_variation16.phpt +++ b/ext/standard/tests/file/007_variation16.phpt @@ -56,5 +56,5 @@ int(37) bool(true) string(7) "Unknown" -Warning: fopen(%s): failed to open stream: File exists in %s on line %d +Warning: fopen(): failed to open stream (%s): File exists in %s on line %d *** Done *** diff --git a/ext/standard/tests/file/007_variation23.phpt b/ext/standard/tests/file/007_variation23.phpt index c4b4aa86a5962..78479cb30e59d 100644 --- a/ext/standard/tests/file/007_variation23.phpt +++ b/ext/standard/tests/file/007_variation23.phpt @@ -54,5 +54,5 @@ int(0) bool(true) string(7) "Unknown" -Warning: fopen(%s): failed to open stream: File exists in %s on line %d +Warning: fopen(): failed to open stream (%s): File exists in %s on line %d *** Done *** diff --git a/ext/standard/tests/file/007_variation24.phpt b/ext/standard/tests/file/007_variation24.phpt index 86b7347a1cd9b..5da5884f8aefb 100644 --- a/ext/standard/tests/file/007_variation24.phpt +++ b/ext/standard/tests/file/007_variation24.phpt @@ -56,5 +56,5 @@ int(37) bool(true) string(7) "Unknown" -Warning: fopen(%s): failed to open stream: File exists in %s on line %d +Warning: fopen(): failed to open stream (%s): File exists in %s on line %d *** Done *** diff --git a/ext/standard/tests/file/007_variation7.phpt b/ext/standard/tests/file/007_variation7.phpt index 974bfe0c8c39a..aaf7ff6938550 100644 --- a/ext/standard/tests/file/007_variation7.phpt +++ b/ext/standard/tests/file/007_variation7.phpt @@ -54,5 +54,5 @@ int(0) bool(true) string(7) "Unknown" -Warning: fopen(%s): failed to open stream: File exists in %s on line %d +Warning: fopen(): failed to open stream (%s): File exists in %s on line %d *** Done *** diff --git a/ext/standard/tests/file/007_variation8.phpt b/ext/standard/tests/file/007_variation8.phpt index b19fbaf9ec0d1..d1f346c206852 100644 --- a/ext/standard/tests/file/007_variation8.phpt +++ b/ext/standard/tests/file/007_variation8.phpt @@ -56,5 +56,5 @@ int(37) bool(true) string(7) "Unknown" -Warning: fopen(%s): failed to open stream: File exists in %s on line %d +Warning: fopen(): failed to open stream (%s): File exists in %s on line %d *** Done *** diff --git a/ext/standard/tests/file/bug35740.phpt b/ext/standard/tests/file/bug35740.phpt index 29e8d8ebf83ec..a510d3a97d387 100644 --- a/ext/standard/tests/file/bug35740.phpt +++ b/ext/standard/tests/file/bug35740.phpt @@ -8,7 +8,7 @@ include (__DIR__); echo "Done\n"; ?> --EXPECTF-- -Warning: include(%s): failed to open stream: %s in %s on line %d +Warning: include(): failed to open stream (%s): %s in %s on line %d Warning: include(): Failed opening '%s' for inclusion (include_path='%s') in %s on line %d Done diff --git a/ext/standard/tests/file/bug38450_2.phpt b/ext/standard/tests/file/bug38450_2.phpt index 774de66bfe7fe..11bc42964475a 100644 --- a/ext/standard/tests/file/bug38450_2.phpt +++ b/ext/standard/tests/file/bug38450_2.phpt @@ -102,7 +102,7 @@ var_dump($myvar); echo "Done\n"; ?> --EXPECTF-- -Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %s on line %d +Warning: fopen(): failed to open stream (var://myvar): "VariableStream::stream_open" call failed in %s on line %d Fatal error: Uncaught Exception: constructor in %s:%d Stack trace: diff --git a/ext/standard/tests/file/bug38450_3.phpt b/ext/standard/tests/file/bug38450_3.phpt index 0bcaeb2a89ff1..d3e52c3a00c88 100644 --- a/ext/standard/tests/file/bug38450_3.phpt +++ b/ext/standard/tests/file/bug38450_3.phpt @@ -102,7 +102,7 @@ var_dump($myvar); echo "Done\n"; ?> --EXPECTF-- -Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %sbug38450_3.php on line %d +Warning: fopen(): failed to open stream (var://myvar): "VariableStream::stream_open" call failed in %sbug38450_3.php on line %d Fatal error: Uncaught ArgumentCountError: Too few arguments to function VariableStream::__construct(), 0 passed and exactly 1 expected in %sbug38450_3.php:7 Stack trace: diff --git a/ext/standard/tests/file/bug43353.phpt b/ext/standard/tests/file/bug43353.phpt index d9576f24e21ca..27e53d566dec4 100644 --- a/ext/standard/tests/file/bug43353.phpt +++ b/ext/standard/tests/file/bug43353.phpt @@ -16,5 +16,5 @@ bool(false) bool(false) string(3) "foo" -Warning: file_get_contents(datafoo:text/plain,foo): failed to open stream: No such file or directory in %s +Warning: file_get_contents(): failed to open stream (datafoo:text/plain,foo): No such file or directory in %s bool(false) diff --git a/ext/standard/tests/file/copy_error.phpt b/ext/standard/tests/file/copy_error.phpt index 2d6395167b338..d607caf08077c 100644 --- a/ext/standard/tests/file/copy_error.phpt +++ b/ext/standard/tests/file/copy_error.phpt @@ -23,7 +23,7 @@ echo "*** Done ***\n"; --EXPECTF-- *** Testing copy() function: error conditions -- -Warning: copy(/no/file): failed to open stream: No such file or directory in %s on line %d +Warning: copy(): failed to open stream (/no/file): No such file or directory in %s on line %d bool(false) Warning: copy() expects at least 2 parameters, 0 given in %s on line %d diff --git a/ext/standard/tests/file/copy_variation14.phpt b/ext/standard/tests/file/copy_variation14.phpt index 45289af90affb..59eef4d5a3c1f 100644 --- a/ext/standard/tests/file/copy_variation14.phpt +++ b/ext/standard/tests/file/copy_variation14.phpt @@ -34,12 +34,12 @@ unlink(__DIR__."/copy_variation14.tmp"); ?> --EXPECTF-- *** Test copy() function: Trying to create a copy of non-existing source in existing destination *** -Warning: copy(%s): %s +Warning: copy(): failed to open stream (%s/nosuchfile.tmp): No such file or directory in %s on line %d bool(false) bool(false) *** Test copy() function: Trying to create copy of an existing source in non-existing destination *** -Warning: copy(%s): %s +Warning: copy(): failed to open stream (%s/nodir/copy_nosuchfile.tmp): No such file or directory in %s on line %d bool(false) bool(false) int(1500) diff --git a/ext/standard/tests/file/copy_variation15.phpt b/ext/standard/tests/file/copy_variation15.phpt index a641a8675a8b3..263f878756780 100644 --- a/ext/standard/tests/file/copy_variation15.phpt +++ b/ext/standard/tests/file/copy_variation15.phpt @@ -55,7 +55,7 @@ rmdir(__DIR__."/copy_variation15"); ?> --EXPECTF-- *** Test copy() function: Trying to create a copy of file in a dir which doesn't have write permissions *** -Warning: copy(%s): %s +Warning: copy(): failed to open stream (%s/copy_copy_variation15.tmp): Permission denied in %s on line %d bool(false) bool(false) int(300) diff --git a/ext/standard/tests/file/copy_variation16-win32.phpt b/ext/standard/tests/file/copy_variation16-win32.phpt index 9321c1d9a9dc1..cd4271afde8e4 100644 --- a/ext/standard/tests/file/copy_variation16-win32.phpt +++ b/ext/standard/tests/file/copy_variation16-win32.phpt @@ -130,7 +130,7 @@ Size of destination file => int(3500) -- Iteration 7 -- Size of source file => int(3500) Copy operation => -Warning: copy(%s): failed to open stream: No such file or directory in %s on line %d +Warning: copy(): failed to open stream (%s): No such file or directory in %s on line %d bool(false) Existence of destination file => bool(false) diff --git a/ext/standard/tests/file/copy_variation17.phpt b/ext/standard/tests/file/copy_variation17.phpt index 337e7ec46e962..0fb2b30a36cea 100644 --- a/ext/standard/tests/file/copy_variation17.phpt +++ b/ext/standard/tests/file/copy_variation17.phpt @@ -56,19 +56,19 @@ bool(true) bool(true) int(1500) -Warning: copy(%s): %s +Warning: copy(): failed to open stream (%s/copy*17.tmp): No such file or directory in %s on line %d bool(false) bool(false) -Warning: copy(%s): %s +Warning: copy(): failed to open stream (%s/*_variation17.tmp): No such file or directory in %s on line %d bool(false) bool(false) -Warning: copy(%s): %s +Warning: copy(): failed to open stream (%s/copy_variation*.tmp): No such file or directory in %s on line %d bool(false) bool(false) -Warning: copy(%s): %s +Warning: copy(): failed to open stream (%s/*.tmp): No such file or directory in %s on line %d bool(false) bool(false) *** Done *** diff --git a/ext/standard/tests/file/copy_variation4.phpt b/ext/standard/tests/file/copy_variation4.phpt index b082c082b5cb3..4c3f6bc458c32 100644 Binary files a/ext/standard/tests/file/copy_variation4.phpt and b/ext/standard/tests/file/copy_variation4.phpt differ diff --git a/ext/standard/tests/file/copy_variation5-win32.phpt b/ext/standard/tests/file/copy_variation5-win32.phpt index 8ef72ef8ce7da..558f72092f61a 100644 --- a/ext/standard/tests/file/copy_variation5-win32.phpt +++ b/ext/standard/tests/file/copy_variation5-win32.phpt @@ -103,7 +103,7 @@ Destination file name => %s/CopY.TMP Size of source file => int(1500) Size of destination file => int(1500) -Warning: unlink(%s/COPY.TMP): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (%s/COPY.TMP) in %s on line %d -Warning: unlink(%s/CopY.TMP): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (%s/CopY.TMP) in %s on line %d *** Done *** diff --git a/ext/standard/tests/file/copy_variation6-win32.phpt b/ext/standard/tests/file/copy_variation6-win32.phpt index ce2dc89f99f00..939482cc0c009 100644 --- a/ext/standard/tests/file/copy_variation6-win32.phpt +++ b/ext/standard/tests/file/copy_variation6-win32.phpt @@ -129,7 +129,7 @@ Size of destination file => int(0) -- Iteration 7 -- Copy operation => -Warning: copy(%s/copy_variation6/copy_variation6_sub/..///../*): failed to open stream: No such file or directory in %s on line %d +Warning: copy(): failed to open stream (%s/copy_variation6/copy_variation6_sub/..///../*): No such file or directory in %s on line %d bool(false) Existence of destination file => bool(false) diff --git a/ext/standard/tests/file/file_error.phpt b/ext/standard/tests/file/file_error.phpt index d932966ee5a09..1a6f0a0661e96 100644 --- a/ext/standard/tests/file/file_error.phpt +++ b/ext/standard/tests/file/file_error.phpt @@ -41,7 +41,7 @@ NULL array(0) { } -Warning: file(temp.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file(): failed to open stream (temp.tmp): No such file or directory in %s on line %d bool(false) --- Done --- diff --git a/ext/standard/tests/file/file_get_contents_error.phpt b/ext/standard/tests/file/file_get_contents_error.phpt index d4c6f16529fe1..f6202dc590808 100644 --- a/ext/standard/tests/file/file_get_contents_error.phpt +++ b/ext/standard/tests/file/file_get_contents_error.phpt @@ -50,7 +50,7 @@ if(file_exists($file_path."/file_put_contents1.tmp")) { -- Testing with Non-existing file -- -Warning: file_get_contents(/no/such/file/or/dir): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (/no/such/file/or/dir): No such file or directory in %s on line %d -- Testing No.of arguments less than expected -- diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt index f34e6ef418cf1..ab3eb5e6d4543 100644 --- a/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt +++ b/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt @@ -48,7 +48,7 @@ unlink($file_path."/file_put_contents1.tmp"); -- Testing with Non-existing file -- -Warning: file_get_contents(/no/such/file/or/dir): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (/no/such/file/or/dir): No such file or directory in %s on line %d -- Testing No.of arguments less than expected -- diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt index 0f2c58a86dfd9..95fa63afcd63c 100644 --- a/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt @@ -84,12 +84,12 @@ string(%d) "contents read" -- Iteration 5 -- -Warning: file_get_contents(%sfileGetContentsVar7私はガラスを食べられます.dir\fileGetContentsVar7Sub私はガラスを食べられます\..\\\fileGetContentsVar7Sub私はガラスを食べられます\\..\\..\fileGetContentsVar7Sub私はガラスを食べられます\FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (%sfileGetContentsVar7私はガラスを食べられます.dir\fileGetContentsVar7Sub私はガラスを食べられます\..\\\fileGetContentsVar7Sub私はガラスを食べられます\\..\\..\fileGetContentsVar7Sub私はガラスを食べられます\FileGetContentsVar7.tmp): No such file or directory in %s on line %d bool(false) -- Iteration 6 -- -Warning: file_get_contents(%sfileGetContentsVar7私はガラスを食べられます.dir\fileGetContentsVar7Sub私はガラスを食べられます\BADDIR\FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (%sfileGetContentsVar7私はガラスを食べられます.dir\fileGetContentsVar7Sub私はガラスを食べられます\BADDIR\FileGetContentsVar7.tmp): No such file or directory in %s on line %d bool(false) -- Iteration 7 -- @@ -106,7 +106,7 @@ string(%d) "contents read" -- Iteration 11 -- -Warning: file_get_contents(BADDIR\FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (BADDIR\FileGetContentsVar7.tmp): No such file or directory in %s on line %d bool(false) -- Iteration 12 -- diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt index 8e9f34520a82a..aa671c51ed308 100644 --- a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt @@ -84,12 +84,12 @@ string(%d) "contents read" -- Iteration 5 -- -Warning: file_get_contents(%sfileGetContentsVar7.dir\fileGetContentsVar7Sub\..\\\fileGetContentsVar7Sub\\..\\..\fileGetContentsVar7Sub\FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (%sfileGetContentsVar7.dir\fileGetContentsVar7Sub\..\\\fileGetContentsVar7Sub\\..\\..\fileGetContentsVar7Sub\FileGetContentsVar7.tmp): No such file or directory in %s on line %d bool(false) -- Iteration 6 -- -Warning: file_get_contents(%sfileGetContentsVar7.dir\fileGetContentsVar7Sub\BADDIR\FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (%sfileGetContentsVar7.dir\fileGetContentsVar7Sub\BADDIR\FileGetContentsVar7.tmp): No such file or directory in %s on line %d bool(false) -- Iteration 7 -- @@ -106,7 +106,7 @@ string(%d) "contents read" -- Iteration 11 -- -Warning: file_get_contents(BADDIR\FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (BADDIR\FileGetContentsVar7.tmp): No such file or directory in %s on line %d bool(false) -- Iteration 12 -- diff --git a/ext/standard/tests/file/file_get_contents_variation7.phpt b/ext/standard/tests/file/file_get_contents_variation7.phpt index e2d317a4a0ff3..65109c3915946 100644 --- a/ext/standard/tests/file/file_get_contents_variation7.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7.phpt @@ -76,12 +76,12 @@ string(%d) "contents read" -- Iteration 5 -- -Warning: file_get_contents(%sfileGetContentsVar7.dir/fileGetContentsVar7Sub/..///fileGetContentsVar7Sub//..//../fileGetContentsVar7Sub/FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (%sfileGetContentsVar7.dir/fileGetContentsVar7Sub/..///fileGetContentsVar7Sub//..//../fileGetContentsVar7Sub/FileGetContentsVar7.tmp): No such file or directory in %s on line %d bool(false) -- Iteration 6 -- -Warning: file_get_contents(%sfileGetContentsVar7.dir/fileGetContentsVar7Sub/BADDIR/FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (%sfileGetContentsVar7.dir/fileGetContentsVar7Sub/BADDIR/FileGetContentsVar7.tmp): No such file or directory in %s on line %d bool(false) -- Iteration 7 -- @@ -98,7 +98,7 @@ string(%d) "contents read" -- Iteration 11 -- -Warning: file_get_contents(BADDIR/FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (BADDIR/FileGetContentsVar7.tmp): No such file or directory in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt index 4928404098fe1..353648d5ffac6 100644 --- a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt @@ -48,12 +48,12 @@ foreach($names_arr as $key =>$value) { -- Filename: -1 -- -Warning: file_get_contents(-1): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (-1): No such file or directory in %s on line %d bool(false) -- Filename: TRUE -- -Warning: file_get_contents(1): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (1): No such file or directory in %s on line %d bool(false) -- Filename: FALSE -- @@ -73,7 +73,7 @@ bool(false) -- Filename: " " -- -Warning: file_get_contents( ): failed to open stream: Permission denied in %s on line %d +Warning: file_get_contents(): failed to open stream ( ): Permission denied in %s on line %d bool(false) -- Filename: \0 -- @@ -88,11 +88,11 @@ NULL -- Filename: /no/such/file/dir -- -Warning: file_get_contents(/no/such/file/dir): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (/no/such/file/dir): No such file or directory in %s on line %d bool(false) -- Filename: php/php -- -Warning: file_get_contents(php/php): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (php/php): No such file or directory in %s on line %d bool(false) ===Done=== diff --git a/ext/standard/tests/file/file_get_contents_variation8.phpt b/ext/standard/tests/file/file_get_contents_variation8.phpt index 97a3495d5439b..f87c88f535f46 100644 --- a/ext/standard/tests/file/file_get_contents_variation8.phpt +++ b/ext/standard/tests/file/file_get_contents_variation8.phpt @@ -46,11 +46,11 @@ echo "\n*** Done ***\n"; *** Testing file_get_contents() : variation *** -- Iteration 0 -- -Warning: file_get_contents(-1): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (-1): No such file or directory in %s on line %d bool(false) -- Iteration 1 -- -Warning: file_get_contents(1): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (1): No such file or directory in %s on line %d bool(false) -- Iteration 2 -- @@ -66,7 +66,7 @@ Warning: file_get_contents(): Filename cannot be empty in %s on line %d bool(false) -- Iteration 5 -- -Warning: file_get_contents( ): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream ( ): No such file or directory in %s on line %d bool(false) -- Iteration 6 -- @@ -78,11 +78,11 @@ Warning: file_get_contents() expects parameter 1 to be a valid path, array given NULL -- Iteration 8 -- -Warning: file_get_contents(/no/such/file/dir): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (/no/such/file/dir): No such file or directory in %s on line %d bool(false) -- Iteration 9 -- -Warning: file_get_contents(php/php): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(): failed to open stream (php/php): No such file or directory in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt index 138b4ede84ca4..45d4859fac0e2 100644 --- a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt +++ b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt @@ -99,12 +99,12 @@ Data written correctly -- Iteration 5 -- -Warning: file_put_contents(%sfilePutContentsVar7.dir\filePutContentsVar7Sub\..\\\filePutContentsVar7Sub\\..\\..\filePutContentsVar7Sub\FileGetContentsVar7.tmp): failed to open stream: %s in %s on line %d +Warning: file_put_contents(): failed to open stream (%sfilePutContentsVar7.dir\filePutContentsVar7Sub\..\\\filePutContentsVar7Sub\\..\\..\filePutContentsVar7Sub\FileGetContentsVar7.tmp): %s in %s on line %d No data written -- Iteration 6 -- -Warning: file_put_contents(%sfilePutContentsVar7.dir\filePutContentsVar7Sub\BADDIR\FileGetContentsVar7.tmp): failed to open stream: %s in %s on line %d +Warning: file_put_contents(): failed to open stream (%sfilePutContentsVar7.dir\filePutContentsVar7Sub\BADDIR\FileGetContentsVar7.tmp): %s in %s on line %d No data written -- Iteration 7 -- @@ -121,7 +121,7 @@ Data written correctly -- Iteration 11 -- -Warning: file_put_contents(BADDIR\FileGetContentsVar7.tmp): failed to open stream: %s in %s on line %d +Warning: file_put_contents(): failed to open stream (BADDIR\FileGetContentsVar7.tmp): %s in %s on line %d No data written -- Iteration 12 -- diff --git a/ext/standard/tests/file/file_put_contents_variation7.phpt b/ext/standard/tests/file/file_put_contents_variation7.phpt index 561c78b37459f..f8412395a3e4f 100644 --- a/ext/standard/tests/file/file_put_contents_variation7.phpt +++ b/ext/standard/tests/file/file_put_contents_variation7.phpt @@ -91,12 +91,12 @@ Data written correctly -- Iteration 5 -- -Warning: file_put_contents(%sfilePutContentsVar7.dir/filePutContentsVar7Sub/..///filePutContentsVar7Sub//..//../filePutContentsVar7Sub/FileGetContentsVar7.tmp): failed to open stream: %s in %s on line %d +Warning: file_put_contents(): failed to open stream (%sfilePutContentsVar7.dir/filePutContentsVar7Sub/..///filePutContentsVar7Sub//..//../filePutContentsVar7Sub/FileGetContentsVar7.tmp): %s in %s on line %d No data written -- Iteration 6 -- -Warning: file_put_contents(%sfilePutContentsVar7.dir/filePutContentsVar7Sub/BADDIR/FileGetContentsVar7.tmp): failed to open stream: %s in %s on line %d +Warning: file_put_contents(): failed to open stream (%sfilePutContentsVar7.dir/filePutContentsVar7Sub/BADDIR/FileGetContentsVar7.tmp): %s in %s on line %d No data written -- Iteration 7 -- @@ -113,7 +113,7 @@ Data written correctly -- Iteration 11 -- -Warning: file_put_contents(BADDIR/FileGetContentsVar7.tmp): failed to open stream: %s in %s on line %d +Warning: file_put_contents(): failed to open stream (BADDIR/FileGetContentsVar7.tmp): %s in %s on line %d No data written *** Done *** diff --git a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt index 095980b53627c..bf0c23e8e2b9c 100644 --- a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt @@ -73,7 +73,7 @@ Failed to write data to: "" -- Filename: " " -- -Warning: file_put_contents( ): failed to open stream: Permission denied in %s on line %d +Warning: file_put_contents(): failed to open stream ( ): Permission denied in %s on line %d Failed to write data to: " " -- Filename: \0 -- @@ -88,11 +88,11 @@ Failed to write data to: array() -- Filename: /no/such/file/dir -- -Warning: file_put_contents(/no/such/file/dir): failed to open stream: %s in %s on line %d +Warning: file_put_contents(): failed to open stream (/no/such/file/dir): %s in %s on line %d Failed to write data to: /no/such/file/dir -- Filename: php/php -- -Warning: file_put_contents(php/php): failed to open stream: %s in %s on line %d +Warning: file_put_contents(): failed to open stream (php/php): %s in %s on line %d Failed to write data to: php/php ===Done=== diff --git a/ext/standard/tests/file/file_put_contents_variation8.phpt b/ext/standard/tests/file/file_put_contents_variation8.phpt index f0161dca57450..0c27f7a75fd90 100644 Binary files a/ext/standard/tests/file/file_put_contents_variation8.phpt and b/ext/standard/tests/file/file_put_contents_variation8.phpt differ diff --git a/ext/standard/tests/file/file_variation8-win32.phpt b/ext/standard/tests/file/file_variation8-win32.phpt index b5a2004473257..3f56a2f879079 100644 --- a/ext/standard/tests/file/file_variation8-win32.phpt +++ b/ext/standard/tests/file/file_variation8-win32.phpt @@ -96,12 +96,12 @@ array(1) { -- Iteration 5 -- -Warning: file(%sfileVar8.dir\fileVar8Sub\..\\\fileVar8Sub\\..\\..\fileVar8Sub\FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file(): failed to open stream (%sfileVar8.dir\fileVar8Sub\..\\\fileVar8Sub\\..\\..\fileVar8Sub\FileGetContentsVar7.tmp): No such file or directory in %s on line %d bool(false) -- Iteration 6 -- -Warning: file(%sfileVar8.dir\fileVar8Sub\BADDIR\FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file(): failed to open stream (%sfileVar8.dir\fileVar8Sub\BADDIR\FileGetContentsVar7.tmp): No such file or directory in %s on line %d bool(false) -- Iteration 7 -- @@ -130,7 +130,7 @@ array(1) { -- Iteration 11 -- -Warning: file(BADDIR\FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file(): failed to open stream (BADDIR\FileGetContentsVar7.tmp): No such file or directory in %s on line %d bool(false) -- Iteration 12 -- diff --git a/ext/standard/tests/file/file_variation8.phpt b/ext/standard/tests/file/file_variation8.phpt index f56ca9af7daf0..7dd7d03ea75ea 100644 --- a/ext/standard/tests/file/file_variation8.phpt +++ b/ext/standard/tests/file/file_variation8.phpt @@ -88,12 +88,12 @@ array(1) { -- Iteration 5 -- -Warning: file(%sfileVar8.dir/fileVar8Sub/..///fileVar8Sub//..//../fileVar8Sub/FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file(): failed to open stream (%sfileVar8.dir/fileVar8Sub/..///fileVar8Sub//..//../fileVar8Sub/FileGetContentsVar7.tmp): No such file or directory in %s on line %d bool(false) -- Iteration 6 -- -Warning: file(%sfileVar8.dir/fileVar8Sub/BADDIR/FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file(): failed to open stream (%sfileVar8.dir/fileVar8Sub/BADDIR/FileGetContentsVar7.tmp): No such file or directory in %s on line %d bool(false) -- Iteration 7 -- @@ -122,7 +122,7 @@ array(1) { -- Iteration 11 -- -Warning: file(BADDIR/FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file(): failed to open stream (BADDIR/FileGetContentsVar7.tmp): No such file or directory in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/file/fopen_variation10-win32.phpt b/ext/standard/tests/file/fopen_variation10-win32.phpt index 300cf5286467d..1411fe52be471 100644 --- a/ext/standard/tests/file/fopen_variation10-win32.phpt +++ b/ext/standard/tests/file/fopen_variation10-win32.phpt @@ -95,21 +95,21 @@ file in root --c-- -Warning: fopen(c\fopen_variation10.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: fopen(): failed to open stream (c\fopen_variation10.tmp): No such file or directory in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d --\-- -Warning: fopen(\\fopen_variation10.tmp): failed to open stream: Invalid argument in %s on line %d +Warning: fopen(): failed to open stream (\\fopen_variation10.tmp): Invalid argument in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d --/-- -Warning: fopen(/\fopen_variation10.tmp): failed to open stream: Invalid argument in %s on line %d +Warning: fopen(): failed to open stream (/\fopen_variation10.tmp): Invalid argument in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d @@ -119,7 +119,7 @@ file in fopen10.tmpdirTwo --c:adir-- -Warning: fopen(c:adir\fopen_variation10.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: fopen(): failed to open stream (c:adir\fopen_variation10.tmp): No such file or directory in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d @@ -141,7 +141,7 @@ file in fopen10.tmpDir --/sortout-- -Warning: fopen(/sortout\fopen_variation10.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: fopen(): failed to open stream (/sortout\fopen_variation10.tmp): No such file or directory in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d diff --git a/ext/standard/tests/file/fopen_variation11-win32.phpt b/ext/standard/tests/file/fopen_variation11-win32.phpt index ed6508b69a381..28d1e0b5a80f3 100644 --- a/ext/standard/tests/file/fopen_variation11-win32.phpt +++ b/ext/standard/tests/file/fopen_variation11-win32.phpt @@ -93,21 +93,21 @@ file in root --c-- -Warning: fopen(c\fopen_variation11.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: fopen(): failed to open stream (c\fopen_variation11.tmp): No such file or directory in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d --\-- -Warning: fopen(\\FOPEN_VARIATION11.TMP): failed to open stream: Invalid argument in %s on line %d +Warning: fopen(): failed to open stream (\\FOPEN_VARIATION11.TMP): Invalid argument in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d --/-- -Warning: fopen(\\FOPEN_VARIATION11.TMP): failed to open stream: Invalid argument in %s on line %d +Warning: fopen(): failed to open stream (\\FOPEN_VARIATION11.TMP): Invalid argument in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d @@ -117,7 +117,7 @@ file in fopen11.tmpdirTwo --c:adir-- -Warning: fopen(c:adir\fopen_variation11.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: fopen(): failed to open stream (c:adir\fopen_variation11.tmp): No such file or directory in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d @@ -139,7 +139,7 @@ file in fopen11.tmpDir --/sortout-- -Warning: fopen(/sortout\fopen_variation11.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: fopen(): failed to open stream (/sortout\fopen_variation11.tmp): No such file or directory in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d diff --git a/ext/standard/tests/file/fopen_variation14-win32.phpt b/ext/standard/tests/file/fopen_variation14-win32.phpt index 73c5d68e76060..8ec0ff84aef44 100644 --- a/ext/standard/tests/file/fopen_variation14-win32.phpt +++ b/ext/standard/tests/file/fopen_variation14-win32.phpt @@ -105,42 +105,42 @@ function runtest($fileURIs) { Warning: fopen(): remote host file access not supported, file://fopen14.tmpDir\fopen_variation14.tmp in %s on line %d -Warning: fopen(file://fopen14.tmpDir\fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://fopen14.tmpDir\fopen_variation14.tmp): no suitable wrapper could be found in %s on line %d --- WRITE: file://fopen14.tmpDir\fopen_variation14.tmp --- Warning: fopen(): remote host file access not supported, file://fopen14.tmpDir\fopen_variation14.tmp in %s on line %d -Warning: fopen(file://fopen14.tmpDir\fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://fopen14.tmpDir\fopen_variation14.tmp): no suitable wrapper could be found in %s on line %d --- READ: file://fopen14.tmpDir/fopen_variation14.tmp --- Warning: fopen(): remote host file access not supported, file://fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://fopen14.tmpDir/fopen_variation14.tmp): no suitable wrapper could be found in %s on line %d --- WRITE: file://fopen14.tmpDir/fopen_variation14.tmp --- Warning: fopen(): remote host file access not supported, file://fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://fopen14.tmpDir/fopen_variation14.tmp): no suitable wrapper could be found in %s on line %d --- READ: file://./fopen14.tmpDir/fopen_variation14.tmp --- Warning: fopen(): remote host file access not supported, file://./fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://./fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://./fopen14.tmpDir/fopen_variation14.tmp): no suitable wrapper could be found in %s on line %d --- WRITE: file://./fopen14.tmpDir/fopen_variation14.tmp --- Warning: fopen(): remote host file access not supported, file://./fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://./fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://./fopen14.tmpDir/fopen_variation14.tmp): no suitable wrapper could be found in %s on line %d --- READ: file://.\fopen14.tmpDir\fopen_variation14.tmp --- Warning: fopen(): remote host file access not supported, file://.\fopen14.tmpDir\fopen_variation14.tmp in %s on line %d -Warning: fopen(file://.\fopen14.tmpDir\fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://.\fopen14.tmpDir\fopen_variation14.tmp): no suitable wrapper could be found in %s on line %d --- WRITE: file://.\fopen14.tmpDir\fopen_variation14.tmp --- Warning: fopen(): remote host file access not supported, file://.\fopen14.tmpDir\fopen_variation14.tmp in %s on line %d -Warning: fopen(file://.\fopen14.tmpDir\fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://.\fopen14.tmpDir\fopen_variation14.tmp): no suitable wrapper could be found in %s on line %d --- READ: file://%s/fopen14.tmpDir/fopen_variation14.tmp --- test passed --- WRITE: file://%s/fopen14.tmpDir/fopen_variation14.tmp --- @@ -157,22 +157,22 @@ test passed Warning: fopen(): remote host file access not supported, file://../fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://../fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://../fopen14.tmpDir/fopen_variation14.tmp): no suitable wrapper could be found in %s on line %d --- WRITE: file://../fopen14.tmpDir/fopen_variation14.tmp --- Warning: fopen(): remote host file access not supported, file://../fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://../fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://../fopen14.tmpDir/fopen_variation14.tmp): no suitable wrapper could be found in %s on line %d --- READ: file://..\fopen14.tmpDir\fopen_variation14.tmp --- Warning: fopen(): remote host file access not supported, file://..\fopen14.tmpDir\fopen_variation14.tmp in %s on line %d -Warning: fopen(file://..\fopen14.tmpDir\fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://..\fopen14.tmpDir\fopen_variation14.tmp): no suitable wrapper could be found in %s on line %d --- WRITE: file://..\fopen14.tmpDir\fopen_variation14.tmp --- Warning: fopen(): remote host file access not supported, file://..\fopen14.tmpDir\fopen_variation14.tmp in %s on line %d -Warning: fopen(file://..\fopen14.tmpDir\fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://..\fopen14.tmpDir\fopen_variation14.tmp): no suitable wrapper could be found in %s on line %d --- READ: file://%s/fopen14.tmpDir/fopen_variation14.tmp --- test passed --- WRITE: file://%s/fopen14.tmpDir/fopen_variation14.tmp --- diff --git a/ext/standard/tests/file/fopen_variation14.phpt b/ext/standard/tests/file/fopen_variation14.phpt index f1e37fdda07ae..da027270cf761 100644 --- a/ext/standard/tests/file/fopen_variation14.phpt +++ b/ext/standard/tests/file/fopen_variation14.phpt @@ -97,22 +97,22 @@ function runtest($fileURIs) { Warning: fopen(): remote host file access not supported, file://fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://fopen14.tmpDir/fopen_variation14.tmp): no suitable wrapper could be found in %s on line %d --- WRITE: file://fopen14.tmpDir/fopen_variation14.tmp --- Warning: fopen(): remote host file access not supported, file://fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://fopen14.tmpDir/fopen_variation14.tmp): no suitable wrapper could be found in %s on line %d --- READ: file://./fopen14.tmpDir/fopen_variation14.tmp --- Warning: fopen(): remote host file access not supported, file://./fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://./fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://./fopen14.tmpDir/fopen_variation14.tmp): no suitable wrapper could be found in %s on line %d --- WRITE: file://./fopen14.tmpDir/fopen_variation14.tmp --- Warning: fopen(): remote host file access not supported, file://./fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://./fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://./fopen14.tmpDir/fopen_variation14.tmp): no suitable wrapper could be found in %s on line %d --- READ: file:///%s/fopen14.tmpDir/fopen_variation14.tmp --- test passed --- WRITE: file:///%s/fopen14.tmpDir/fopen_variation14.tmp --- @@ -121,12 +121,12 @@ test passed Warning: fopen(): remote host file access not supported, file://../fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://../fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://../fopen14.tmpDir/fopen_variation14.tmp): no suitable wrapper could be found in %s on line %d --- WRITE: file://../fopen14.tmpDir/fopen_variation14.tmp --- Warning: fopen(): remote host file access not supported, file://../fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://../fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://../fopen14.tmpDir/fopen_variation14.tmp): no suitable wrapper could be found in %s on line %d --- READ: file:///%s/fopen14.tmpDir/fopen_variation14.tmp --- test passed --- WRITE: file:///%s/fopen14.tmpDir/fopen_variation14.tmp --- diff --git a/ext/standard/tests/file/fopen_variation15-win32.phpt b/ext/standard/tests/file/fopen_variation15-win32.phpt index 52f69db746a6d..69710fd35428c 100644 --- a/ext/standard/tests/file/fopen_variation15-win32.phpt +++ b/ext/standard/tests/file/fopen_variation15-win32.phpt @@ -109,42 +109,42 @@ function runtest($fileURIs) { Warning: fopen(): remote host file access not supported, file://fopen15.tmpDir\fopen_variation15.tmp in %s on line %d -Warning: fopen(file://fopen15.tmpDir\fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://fopen15.tmpDir\fopen_variation15.tmp): no suitable wrapper could be found in %s on line %d --- WRITE: file://fopen15.tmpDir\fopen_variation15.tmp --- Warning: fopen(): remote host file access not supported, file://fopen15.tmpDir\fopen_variation15.tmp in %s on line %d -Warning: fopen(file://fopen15.tmpDir\fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://fopen15.tmpDir\fopen_variation15.tmp): no suitable wrapper could be found in %s on line %d --- READ: file://fopen15.tmpDir/fopen_variation15.tmp --- Warning: fopen(): remote host file access not supported, file://fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://fopen15.tmpDir/fopen_variation15.tmp): no suitable wrapper could be found in %s on line %d --- WRITE: file://fopen15.tmpDir/fopen_variation15.tmp --- Warning: fopen(): remote host file access not supported, file://fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://fopen15.tmpDir/fopen_variation15.tmp): no suitable wrapper could be found in %s on line %d --- READ: file://./fopen15.tmpDir/fopen_variation15.tmp --- Warning: fopen(): remote host file access not supported, file://./fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://./fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://./fopen15.tmpDir/fopen_variation15.tmp): no suitable wrapper could be found in %s on line %d --- WRITE: file://./fopen15.tmpDir/fopen_variation15.tmp --- Warning: fopen(): remote host file access not supported, file://./fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://./fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://./fopen15.tmpDir/fopen_variation15.tmp): no suitable wrapper could be found in %s on line %d --- READ: file://.\fopen15.tmpDir\fopen_variation15.tmp --- Warning: fopen(): remote host file access not supported, file://.\fopen15.tmpDir\fopen_variation15.tmp in %s on line %d -Warning: fopen(file://.\fopen15.tmpDir\fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://.\fopen15.tmpDir\fopen_variation15.tmp): no suitable wrapper could be found in %s on line %d --- WRITE: file://.\fopen15.tmpDir\fopen_variation15.tmp --- Warning: fopen(): remote host file access not supported, file://.\fopen15.tmpDir\fopen_variation15.tmp in %s on line %d -Warning: fopen(file://.\fopen15.tmpDir\fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://.\fopen15.tmpDir\fopen_variation15.tmp): no suitable wrapper could be found in %s on line %d --- READ: file://%s/fopen15.tmpDir/fopen_variation15.tmp --- test passed --- WRITE: file://%s/fopen15.tmpDir/fopen_variation15.tmp --- @@ -161,22 +161,22 @@ test passed Warning: fopen(): remote host file access not supported, file://../fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://../fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://../fopen15.tmpDir/fopen_variation15.tmp): no suitable wrapper could be found in %s on line %d --- WRITE: file://../fopen15.tmpDir/fopen_variation15.tmp --- Warning: fopen(): remote host file access not supported, file://../fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://../fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://../fopen15.tmpDir/fopen_variation15.tmp): no suitable wrapper could be found in %s on line %d --- READ: file://..\fopen15.tmpDir\fopen_variation15.tmp --- Warning: fopen(): remote host file access not supported, file://..\fopen15.tmpDir\fopen_variation15.tmp in %s on line %d -Warning: fopen(file://..\fopen15.tmpDir\fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://..\fopen15.tmpDir\fopen_variation15.tmp): no suitable wrapper could be found in %s on line %d --- WRITE: file://..\fopen15.tmpDir\fopen_variation15.tmp --- Warning: fopen(): remote host file access not supported, file://..\fopen15.tmpDir\fopen_variation15.tmp in %s on line %d -Warning: fopen(file://..\fopen15.tmpDir\fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://..\fopen15.tmpDir\fopen_variation15.tmp): no suitable wrapper could be found in %s on line %d --- READ: file://%s/fopen15.tmpDir/fopen_variation15.tmp --- test passed --- WRITE: file://%s/fopen15.tmpDir/fopen_variation15.tmp --- diff --git a/ext/standard/tests/file/fopen_variation15.phpt b/ext/standard/tests/file/fopen_variation15.phpt index bad0a0b63cc1b..1452bf1763fbe 100644 --- a/ext/standard/tests/file/fopen_variation15.phpt +++ b/ext/standard/tests/file/fopen_variation15.phpt @@ -101,22 +101,22 @@ function runtest($fileURIs) { Warning: fopen(): remote host file access not supported, file://fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://fopen15.tmpDir/fopen_variation15.tmp): no suitable wrapper could be found in %s on line %d --- WRITE: file://fopen15.tmpDir/fopen_variation15.tmp --- Warning: fopen(): remote host file access not supported, file://fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://fopen15.tmpDir/fopen_variation15.tmp): no suitable wrapper could be found in %s on line %d --- READ: file://./fopen15.tmpDir/fopen_variation15.tmp --- Warning: fopen(): remote host file access not supported, file://./fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://./fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://./fopen15.tmpDir/fopen_variation15.tmp): no suitable wrapper could be found in %s on line %d --- WRITE: file://./fopen15.tmpDir/fopen_variation15.tmp --- Warning: fopen(): remote host file access not supported, file://./fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://./fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://./fopen15.tmpDir/fopen_variation15.tmp): no suitable wrapper could be found in %s on line %d --- READ: file:///%s/fopen15.tmpDir/fopen_variation15.tmp --- test passed --- WRITE: file:///%s/fopen15.tmpDir/fopen_variation15.tmp --- @@ -125,12 +125,12 @@ test passed Warning: fopen(): remote host file access not supported, file://../fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://../fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://../fopen15.tmpDir/fopen_variation15.tmp): no suitable wrapper could be found in %s on line %d --- WRITE: file://../fopen15.tmpDir/fopen_variation15.tmp --- Warning: fopen(): remote host file access not supported, file://../fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://../fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://../fopen15.tmpDir/fopen_variation15.tmp): no suitable wrapper could be found in %s on line %d --- READ: file:///%s/fopen15.tmpDir/fopen_variation15.tmp --- test passed --- WRITE: file:///%s/fopen15.tmpDir/fopen_variation15.tmp --- diff --git a/ext/standard/tests/file/include_userstream_002.phpt b/ext/standard/tests/file/include_userstream_002.phpt index cc1887c446ad3..810985488b5d5 100644 --- a/ext/standard/tests/file/include_userstream_002.phpt +++ b/ext/standard/tests/file/include_userstream_002.phpt @@ -99,8 +99,8 @@ include "test2://hello"; Warning: fopen(): test1:// wrapper is disabled in the server configuration by allow_url_include=0 in %sinclude_userstream_002.php on line 10 -Warning: fopen(test1://hello): failed to open stream: no suitable wrapper could be found in %sinclude_userstream_002.php on line 10 +Warning: fopen(): failed to open stream (test1://hello): no suitable wrapper could be found in %sinclude_userstream_002.php on line 10 -Warning: include(test2://hello): failed to open stream: "test::stream_open" call failed in %sinclude_userstream_002.php on line 89 +Warning: include(): failed to open stream (test2://hello): "test::stream_open" call failed in %sinclude_userstream_002.php on line 89 Warning: include(): Failed opening 'test2://hello' for inclusion (include_path='%s') in %sinclude_userstream_002.php on line 89 diff --git a/ext/standard/tests/file/include_userstream_003.phpt b/ext/standard/tests/file/include_userstream_003.phpt index d7701a5d6af17..f0a58455a78af 100644 --- a/ext/standard/tests/file/include_userstream_003.phpt +++ b/ext/standard/tests/file/include_userstream_003.phpt @@ -96,26 +96,26 @@ include "test2://hello"; --EXPECTF-- Warning: file_get_contents(): test1:// wrapper is disabled in the server configuration by allow_url_fopen=0 in %sinclude_userstream_003.php on line 86 -Warning: file_get_contents(test1://hello): failed to open stream: no suitable wrapper could be found in %sinclude_userstream_003.php on line 86 +Warning: file_get_contents(): failed to open stream (test1://hello): no suitable wrapper could be found in %sinclude_userstream_003.php on line 86 Warning: include(): test1:// wrapper is disabled in the server configuration by allow_url_fopen=0 in %sinclude_userstream_003.php on line 87 -Warning: include(test1://hello): failed to open stream: no suitable wrapper could be found in %sinclude_userstream_003.php on line 87 +Warning: include(): failed to open stream (test1://hello): no suitable wrapper could be found in %sinclude_userstream_003.php on line 87 Warning: include(): Failed opening 'test1://hello' for inclusion (include_path='%s') in %sinclude_userstream_003.php on line 87 Warning: fopen(): test1:// wrapper is disabled in the server configuration by allow_url_fopen=0 in %sinclude_userstream_003.php on line 10 -Warning: fopen(test1://hello): failed to open stream: no suitable wrapper could be found in %sinclude_userstream_003.php on line 10 +Warning: fopen(): failed to open stream (test1://hello): no suitable wrapper could be found in %sinclude_userstream_003.php on line 10 -Warning: file_get_contents(test2://hello): failed to open stream: "test::stream_open" call failed in %sinclude_userstream_003.php on line 88 +Warning: file_get_contents(): failed to open stream (test2://hello): "test::stream_open" call failed in %sinclude_userstream_003.php on line 88 Warning: fopen(): test1:// wrapper is disabled in the server configuration by allow_url_fopen=0 in %sinclude_userstream_003.php on line 10 -Warning: fopen(test1://hello): failed to open stream: no suitable wrapper could be found in %sinclude_userstream_003.php on line 10 +Warning: fopen(): failed to open stream (test1://hello): no suitable wrapper could be found in %sinclude_userstream_003.php on line 10 -Warning: include(test2://hello): failed to open stream: "test::stream_open" call failed in %sinclude_userstream_003.php on line 89 +Warning: include(): failed to open stream (test2://hello): "test::stream_open" call failed in %sinclude_userstream_003.php on line 89 Warning: include(): Failed opening 'test2://hello' for inclusion (include_path='%s') in %sinclude_userstream_003.php on line 89 diff --git a/ext/standard/tests/file/mkdir_rmdir_error.phpt b/ext/standard/tests/file/mkdir_rmdir_error.phpt index 17f908c3f6e33..1bf8788d8eea9 100644 --- a/ext/standard/tests/file/mkdir_rmdir_error.phpt +++ b/ext/standard/tests/file/mkdir_rmdir_error.phpt @@ -53,6 +53,6 @@ bool(false) *** Testing rmdir() on non-existent directory *** -Warning: rmdir(temp): No such file or directory in %s on line %d +Warning: rmdir(): No such file or directory (temp) in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/mkdir_rmdir_variation-win32-mb.phpt b/ext/standard/tests/file/mkdir_rmdir_variation-win32-mb.phpt index 20535a05366c4..097c79f437b75 100644 --- a/ext/standard/tests/file/mkdir_rmdir_variation-win32-mb.phpt +++ b/ext/standard/tests/file/mkdir_rmdir_variation-win32-mb.phpt @@ -1599,7 +1599,7 @@ bool(true) *** Testing rmdir() on a non-empty directory *** bool(true) -Warning: rmdir(%s/mkdir私はガラスを食べられます/): Directory not empty in %s on line %d +Warning: rmdir(): Directory not empty (%s/mkdir私はガラスを食べられます/) in %s on line %d bool(false) *** Testing mkdir() and rmdir() for binary safe functionality *** diff --git a/ext/standard/tests/file/mkdir_rmdir_variation-win32.phpt b/ext/standard/tests/file/mkdir_rmdir_variation-win32.phpt index 3391472f991e4..34d6e760324cb 100644 --- a/ext/standard/tests/file/mkdir_rmdir_variation-win32.phpt +++ b/ext/standard/tests/file/mkdir_rmdir_variation-win32.phpt @@ -1599,7 +1599,7 @@ bool(true) *** Testing rmdir() on a non-empty directory *** bool(true) -Warning: rmdir(%s/mkdir/): Directory not empty in %s on line %d +Warning: rmdir(): Directory not empty (%s/mkdir/) in %s on line %d bool(false) *** Testing mkdir() and rmdir() for binary safe functionality *** diff --git a/ext/standard/tests/file/mkdir_rmdir_variation2.phpt b/ext/standard/tests/file/mkdir_rmdir_variation2.phpt index b6a7395337236..e22b2ad93c760 100644 --- a/ext/standard/tests/file/mkdir_rmdir_variation2.phpt +++ b/ext/standard/tests/file/mkdir_rmdir_variation2.phpt @@ -60,7 +60,7 @@ bool(true) *** Testing rmdir() on a non-empty directory *** bool(true) -Warning: rmdir(%s/mkdir_variation2/): %s on line %d +Warning: rmdir(): Directory not empty (%s/mkdir_variation2/) in %s on line %d bool(false) *** Testing mkdir() and rmdir() for binary safe functionality *** diff --git a/ext/standard/tests/file/parse_ini_file_error.phpt b/ext/standard/tests/file/parse_ini_file_error.phpt index 29e022fb13b2e..8d0f240b73172 100644 --- a/ext/standard/tests/file/parse_ini_file_error.phpt +++ b/ext/standard/tests/file/parse_ini_file_error.phpt @@ -37,11 +37,11 @@ bool(false) -- Testing parse_ini_file() function with more than expected no. of arguments -- -Warning: parse_ini_file(%s): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(): failed to open stream (%s): No such file or directory in %s on line %d bool(false) -- Testing parse_ini_file() function with a non-existent file -- -Warning: parse_ini_file(%s): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(): failed to open stream (%s): No such file or directory in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt b/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt index df98a632b40c6..cb23f6bb0b80d 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt @@ -97,12 +97,12 @@ array(1) { -- Iteration 5 -- -Warning: parse_ini_file(%sparseIniFileVar私はガラスを食べられます.dir\parseIniFileVar私はガラスを食べられますSub\..\\\parseIniFileVar私はガラスを食べられますSub\\..\\..\parseIniFileVar私はガラスを食べられますSub\parseIniFileVar私はガラスを食べられます.ini): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(): failed to open stream (%sparseIniFileVar私はガラスを食べられます.dir\parseIniFileVar私はガラスを食べられますSub\..\\\parseIniFileVar私はガラスを食べられますSub\\..\\..\parseIniFileVar私はガラスを食べられますSub\parseIniFileVar私はガラスを食べられます.ini): No such file or directory in %s on line %d bool(false) -- Iteration 6 -- -Warning: parse_ini_file(%sparseIniFileVar私はガラスを食べられます.dir\parseIniFileVar私はガラスを食べられますSub\BADDIR\parseIniFileVar私はガラスを食べられます.ini): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(): failed to open stream (%sparseIniFileVar私はガラスを食べられます.dir\parseIniFileVar私はガラスを食べられますSub\BADDIR\parseIniFileVar私はガラスを食べられます.ini): No such file or directory in %s on line %d bool(false) -- Iteration 7 -- @@ -131,7 +131,7 @@ array(1) { -- Iteration 11 -- -Warning: parse_ini_file(BADDIR\parseIniFileVar私はガラスを食べられます.ini): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(): failed to open stream (BADDIR\parseIniFileVar私はガラスを食べられます.ini): No such file or directory in %s on line %d bool(false) -- Iteration 12 -- diff --git a/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt b/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt index 2ef1d88fcccb9..e112f59bf53c0 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt @@ -97,12 +97,12 @@ array(1) { -- Iteration 5 -- -Warning: parse_ini_file(%sparseIniFileVar6.dir\parseIniFileVar6Sub\..\\\parseIniFileVar6Sub\\..\\..\parseIniFileVar6Sub\ParseIniFileVar6.ini): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(): failed to open stream (%sparseIniFileVar6.dir\parseIniFileVar6Sub\..\\\parseIniFileVar6Sub\\..\\..\parseIniFileVar6Sub\ParseIniFileVar6.ini): No such file or directory in %s on line %d bool(false) -- Iteration 6 -- -Warning: parse_ini_file(%sparseIniFileVar6.dir\parseIniFileVar6Sub\BADDIR\ParseIniFileVar6.ini): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(): failed to open stream (%sparseIniFileVar6.dir\parseIniFileVar6Sub\BADDIR\ParseIniFileVar6.ini): No such file or directory in %s on line %d bool(false) -- Iteration 7 -- @@ -131,7 +131,7 @@ array(1) { -- Iteration 11 -- -Warning: parse_ini_file(BADDIR\ParseIniFileVar6.ini): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(): failed to open stream (BADDIR\ParseIniFileVar6.ini): No such file or directory in %s on line %d bool(false) -- Iteration 12 -- diff --git a/ext/standard/tests/file/parse_ini_file_variation6.phpt b/ext/standard/tests/file/parse_ini_file_variation6.phpt index 7c6d8ab4cbd22..6c740b3dbcf86 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6.phpt @@ -89,12 +89,12 @@ array(1) { -- Iteration 5 -- -Warning: parse_ini_file(%sparseIniFileVar6.dir/parseIniFileVar6Sub/..///parseIniFileVar6Sub//..//../parseIniFileVar6Sub/ParseIniFileVar6.ini): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(): failed to open stream (%sparseIniFileVar6.dir/parseIniFileVar6Sub/..///parseIniFileVar6Sub//..//../parseIniFileVar6Sub/ParseIniFileVar6.ini): No such file or directory in %s on line %d bool(false) -- Iteration 6 -- -Warning: parse_ini_file(%sparseIniFileVar6.dir/parseIniFileVar6Sub/BADDIR/ParseIniFileVar6.ini): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(): failed to open stream (%sparseIniFileVar6.dir/parseIniFileVar6Sub/BADDIR/ParseIniFileVar6.ini): No such file or directory in %s on line %d bool(false) -- Iteration 7 -- @@ -123,7 +123,7 @@ array(1) { -- Iteration 11 -- -Warning: parse_ini_file(BADDIR/ParseIniFileVar6.ini): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(): failed to open stream (BADDIR/ParseIniFileVar6.ini): No such file or directory in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/file/php_fd_wrapper_03.phpt b/ext/standard/tests/file/php_fd_wrapper_03.phpt index c004a4319f51b..706bbe7046756 100644 --- a/ext/standard/tests/file/php_fd_wrapper_03.phpt +++ b/ext/standard/tests/file/php_fd_wrapper_03.phpt @@ -11,12 +11,12 @@ echo "\nDone.\n"; --EXPECTF-- Warning: fopen(): Invalid php:// URL specified in %s on line %d -Warning: fopen(php://fd): failed to open stream: operation failed in %s on line 2 +Warning: fopen(): failed to open stream (php://fd): operation failed in %s on line 2 -Warning: fopen(php://fd/): failed to open stream: php://fd/ stream must be specified in the form php://fd/ in %s on line %d +Warning: fopen(): failed to open stream (php://fd/): php://fd/ stream must be specified in the form php://fd/ in %s on line %d -Warning: fopen(php://fd/-2): failed to open stream: The file descriptors must be non-negative numbers smaller than %d in %s on line %d +Warning: fopen(): failed to open stream (php://fd/-2): The file descriptors must be non-negative numbers smaller than %d in %s on line %d -Warning: fopen(php://fd/1/): failed to open stream: php://fd/ stream must be specified in the form php://fd/ in %s on line %d +Warning: fopen(): failed to open stream (php://fd/1/): php://fd/ stream must be specified in the form php://fd/ in %s on line %d Done. diff --git a/ext/standard/tests/file/php_fd_wrapper_04.phpt b/ext/standard/tests/file/php_fd_wrapper_04.phpt index 2b3a69ce1aff3..951269b6fcffc 100644 --- a/ext/standard/tests/file/php_fd_wrapper_04.phpt +++ b/ext/standard/tests/file/php_fd_wrapper_04.phpt @@ -6,6 +6,6 @@ fopen("php://fd/12", "w"); echo "\nDone.\n"; --EXPECTF-- -Warning: fopen(php://fd/12): failed to open stream: Error duping file descriptor 12; possibly it doesn't exist: [9]: %s in %s on line %d +Warning: fopen(): failed to open stream (php://fd/12): Error duping file descriptor 12; possibly it doesn't exist: [9]: %s in %s on line %d Done. diff --git a/ext/standard/tests/file/popen_pclose_error.phpt b/ext/standard/tests/file/popen_pclose_error.phpt index b0e86be65c8a3..4ed3041a9bbaa 100644 --- a/ext/standard/tests/file/popen_pclose_error.phpt +++ b/ext/standard/tests/file/popen_pclose_error.phpt @@ -40,7 +40,7 @@ NULL Warning: popen() expects exactly 2 parameters, 1 given in %s on line %d NULL -Warning: popen(abc.txt,rw): %s on line %d +Warning: popen(): %s with command "abc.txt" and POSIX mode rw in %s on line %d bool(false) Warning: pclose() expects exactly 1 parameter, 0 given in %s on line %d diff --git a/ext/standard/tests/file/readfile_error.phpt b/ext/standard/tests/file/readfile_error.phpt index 0dc1f7b82fa34..631b8011b7c7d 100644 --- a/ext/standard/tests/file/readfile_error.phpt +++ b/ext/standard/tests/file/readfile_error.phpt @@ -56,6 +56,6 @@ bool(false) -- Testing readfile() with non-existent file -- -Warning: readfile(%s/non_existent_file.tmp): failed to open stream: %s in %s on line %d +Warning: readfile(): failed to open stream (%s/non_existent_file.tmp): %s in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/readfile_variation10-win32.phpt b/ext/standard/tests/file/readfile_variation10-win32.phpt index a240a826b967b..17b547d35065e 100644 --- a/ext/standard/tests/file/readfile_variation10-win32.phpt +++ b/ext/standard/tests/file/readfile_variation10-win32.phpt @@ -47,11 +47,11 @@ foreach($names_arr as $key => $value) { -- Filename: -1 -- -Warning: readfile(-1): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(): failed to open stream (-1): No such file or directory in %s on line %d -- Filename: TRUE -- -Warning: readfile(1): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(): failed to open stream (1): No such file or directory in %s on line %d -- Filename: FALSE -- @@ -67,7 +67,7 @@ Warning: readfile(): Filename cannot be empty in %s on line %d -- Filename: " " -- -Warning: readfile( ): failed to open stream: Permission denied in %s on line %d +Warning: readfile(): failed to open stream ( ): Permission denied in %s on line %d -- Filename: \0 -- @@ -79,9 +79,9 @@ Warning: readfile() expects parameter 1 to be a valid path, array given in %s on -- Filename: /no/such/file/dir -- -Warning: readfile(/no/such/file/dir): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(): failed to open stream (/no/such/file/dir): No such file or directory in %s on line %d -- Filename: php/php -- -Warning: readfile(php/php): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(): failed to open stream (php/php): No such file or directory in %s on line %d ===Done=== diff --git a/ext/standard/tests/file/readfile_variation10.phpt b/ext/standard/tests/file/readfile_variation10.phpt index 59b92ad365827..e2ca1bc674153 100644 Binary files a/ext/standard/tests/file/readfile_variation10.phpt and b/ext/standard/tests/file/readfile_variation10.phpt differ diff --git a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt index 4ca719266f4b7..6f770b7ed382b 100644 --- a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt +++ b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt @@ -86,11 +86,11 @@ The File Contents The File Contents -- %s\readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub\..\\\readfileVar私はガラスを食べられます8Sub\\..\\..\readfileVar私はガラスを食べられます8Sub -- -Warning: readfile(%s\readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub\..\\\readfileVar私はガラスを食べられます8Sub\\..\\..\readfileVar私はガラスを食べられます8Sub\fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(): failed to open stream (%s\readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub\..\\\readfileVar私はガラスを食べられます8Sub\\..\\..\readfileVar私はガラスを食べられます8Sub\fileToRead.tmp): No such file or directory in %s on line %d -- %s\readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub\BADDIR -- -Warning: readfile(%s\readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub\BADDIR\fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(): failed to open stream (%s\readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub\BADDIR\fileToRead.tmp): No such file or directory in %s on line %d -- readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub -- The File Contents @@ -102,7 +102,7 @@ The File Contents The File Contents -- BADDIR -- -Warning: readfile(BADDIR\fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(): failed to open stream (BADDIR\fileToRead.tmp): No such file or directory in %s on line %d -- /%s/readfileVar私はガラスを食べられます8/readfileVar私はガラスを食べられます8Sub -- The File Contents diff --git a/ext/standard/tests/file/readfile_variation8-win32.phpt b/ext/standard/tests/file/readfile_variation8-win32.phpt index c914786407412..836d8ca34acd3 100644 --- a/ext/standard/tests/file/readfile_variation8-win32.phpt +++ b/ext/standard/tests/file/readfile_variation8-win32.phpt @@ -86,11 +86,11 @@ The File Contents The File Contents -- %s\readfileVar8\readfileVar8Sub\..\\\readfileVar8Sub\\..\\..\readfileVar8Sub -- -Warning: readfile(%s\readfileVar8\readfileVar8Sub\..\\\readfileVar8Sub\\..\\..\readfileVar8Sub\fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(): failed to open stream (%s\readfileVar8\readfileVar8Sub\..\\\readfileVar8Sub\\..\\..\readfileVar8Sub\fileToRead.tmp): No such file or directory in %s on line %d -- %s\readfileVar8\readfileVar8Sub\BADDIR -- -Warning: readfile(%s\readfileVar8\readfileVar8Sub\BADDIR\fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(): failed to open stream (%s\readfileVar8\readfileVar8Sub\BADDIR\fileToRead.tmp): No such file or directory in %s on line %d -- readfileVar8\readfileVar8Sub -- The File Contents @@ -102,7 +102,7 @@ The File Contents The File Contents -- BADDIR -- -Warning: readfile(BADDIR\fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(): failed to open stream (BADDIR\fileToRead.tmp): No such file or directory in %s on line %d -- /%s/readfileVar8/readfileVar8Sub -- The File Contents diff --git a/ext/standard/tests/file/readfile_variation9.phpt b/ext/standard/tests/file/readfile_variation9.phpt index 1d536e61f1d0f..57db9960bb934 100644 --- a/ext/standard/tests/file/readfile_variation9.phpt +++ b/ext/standard/tests/file/readfile_variation9.phpt @@ -78,11 +78,11 @@ The File Contents The File Contents -- Iteration 5 -- -Warning: readfile(%sreadfileVar8Sub/..///readfileVar8Sub//..//../readfileVar8Sub/fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(): failed to open stream (%sreadfileVar8Sub/..///readfileVar8Sub//..//../readfileVar8Sub/fileToRead.tmp): No such file or directory in %s on line %d -- Iteration 6 -- -Warning: readfile(%sreadfileVar8Sub/BADDIR/fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(): failed to open stream (%sreadfileVar8Sub/BADDIR/fileToRead.tmp): No such file or directory in %s on line %d -- Iteration 7 -- The File Contents @@ -94,6 +94,6 @@ The File Contents The File Contents -- Iteration 11 -- -Warning: readfile(BADDIR/fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(): failed to open stream (BADDIR/fileToRead.tmp): No such file or directory in %s on line %d *** Done *** diff --git a/ext/standard/tests/file/readlink_realpath_variation2.phpt b/ext/standard/tests/file/readlink_realpath_variation2.phpt index 82deabecb6b2e..1f6fa12c277db 100644 --- a/ext/standard/tests/file/readlink_realpath_variation2.phpt +++ b/ext/standard/tests/file/readlink_realpath_variation2.phpt @@ -84,7 +84,7 @@ Warning: readlink(): No such file or directory in %s on line %d bool(false) bool(false) -Warning: unlink(%s/./readlink_realpath_variation2/home/../home//tests//..//..//..//home//readlink_realpath_variation2_link.tmp/): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (%s/./readlink_realpath_variation2/home/../home//tests//..//..//..//home//readlink_realpath_variation2_link.tmp/) in %s on line %d -- Testing readlink() and realpath() with hardlink, linkname stored inside an array -- bool(true) @@ -100,5 +100,5 @@ Warning: readlink(): No such file or directory in %s on line %d bool(false) bool(false) -Warning: unlink(%s/./readlink_realpath_variation2/home/../home//tests//..//..//..//home//readlink_realpath_variation2_link.tmp/): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (%s/./readlink_realpath_variation2/home/../home//tests//..//..//..//home//readlink_realpath_variation2_link.tmp/) in %s on line %d Done diff --git a/ext/standard/tests/file/rename_variation-win32.phpt b/ext/standard/tests/file/rename_variation-win32.phpt index 9b194c689c0f0..4bd334e4cab7a 100644 --- a/ext/standard/tests/file/rename_variation-win32.phpt +++ b/ext/standard/tests/file/rename_variation-win32.phpt @@ -69,12 +69,12 @@ bool(false) bool(true) -- Iteration 2 -- -Warning: rename(%s/rename_variation/rename_variation.tmp/,%s/rename_variation2.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d +Warning: rename(): The filename, directory name, or volume label syntax is incorrect. (%s/rename_variation/rename_variation.tmp/) (code: 123) in %s on line %d bool(false) bool(false) bool(false) -Warning: unlink(%s/rename_variation2.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (%s/rename_variation2.tmp) in %s on line %d -- Iteration 3 -- bool(true) bool(false) diff --git a/ext/standard/tests/file/rename_variation.phpt b/ext/standard/tests/file/rename_variation.phpt index c347a223fc23e..0e31102376fbf 100644 --- a/ext/standard/tests/file/rename_variation.phpt +++ b/ext/standard/tests/file/rename_variation.phpt @@ -55,12 +55,12 @@ bool(false) bool(true) -- Iteration 2 -- -Warning: rename(%s,%s): Not a directory in %s on line %d +Warning: rename(): (%s) Not a directory in %s on line %d bool(false) bool(false) bool(false) -Warning: unlink(%s): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (%s) in %s on line %d -- Iteration 3 -- bool(true) bool(false) diff --git a/ext/standard/tests/file/rename_variation11-win32.phpt b/ext/standard/tests/file/rename_variation11-win32.phpt index fbf358f79b58b..d562aee4ab489 100644 --- a/ext/standard/tests/file/rename_variation11-win32.phpt +++ b/ext/standard/tests/file/rename_variation11-win32.phpt @@ -92,12 +92,12 @@ bool(true) -- Iteration 5 -- -Warning: rename(%s\renameVar11\renameVar11Sub\..\\\renameVar11Sub\\..\\..\renameVar11Sub\renameMe.tmp,%s\renameVar11\renameVar11Sub\..\\\renameVar11Sub\\..\\..\renameVar11Sub\IwasRenamed.tmp): The system cannot find the path specified. (code: 3) in %s on line %d +Warning: rename(): The system cannot find the path specified. (%s\renameVar11\renameVar11Sub\..\\\renameVar11Sub\\..\\..\renameVar11Sub\renameMe.tmp) (code: 3) in %s on line %d bool(false) -- Iteration 6 -- -Warning: rename(%s\renameVar11\renameVar11Sub\BADDIR\renameMe.tmp,%s\renameVar11\renameVar11Sub\BADDIR\IwasRenamed.tmp): The system cannot find the path specified. (code: 3) in %s on line %d +Warning: rename(): The system cannot find the path specified. (%s\renameVar11\renameVar11Sub\BADDIR\renameMe.tmp) (code: 3) in %s on line %d bool(false) -- Iteration 7 -- @@ -118,7 +118,7 @@ bool(true) -- Iteration 11 -- -Warning: rename(BADDIR\renameMe.tmp,BADDIR\IwasRenamed.tmp): The system cannot find the path specified. (code: 3) in %s on line %d +Warning: rename(): The system cannot find the path specified. (BADDIR\renameMe.tmp) (code: 3) in %s on line %d bool(false) -- Iteration 12 -- diff --git a/ext/standard/tests/file/rename_variation12-win32.phpt b/ext/standard/tests/file/rename_variation12-win32.phpt index 2c5b4a0ea81da..928f3f71f6865 100644 --- a/ext/standard/tests/file/rename_variation12-win32.phpt +++ b/ext/standard/tests/file/rename_variation12-win32.phpt @@ -89,12 +89,12 @@ bool(true) -- Iteration 5 -- -Warning: rename(%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/renameMe.tmp,%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/IwasRenamed.tmp): The system cannot find the path specified. (code: 3) in %s on line %d +Warning: rename(): The system cannot find the path specified. (%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/renameMe.tmp) (code: 3) in %s on line %d bool(false) -- Iteration 6 -- -Warning: rename(%s/renameVar11/renameVar11Sub/BADDIR/renameMe.tmp,%s/renameVar11/renameVar11Sub/BADDIR/IwasRenamed.tmp): The system cannot find the path specified. (code: 3) in %s on line %d +Warning: rename(): The system cannot find the path specified. (%s/renameVar11/renameVar11Sub/BADDIR/renameMe.tmp) (code: 3) in %s on line %d bool(false) -- Iteration 7 -- @@ -115,7 +115,7 @@ bool(true) -- Iteration 11 -- -Warning: rename(BADDIR/renameMe.tmp,BADDIR/IwasRenamed.tmp): The system cannot find the path specified. (code: 3) in %s on line %d +Warning: rename(): The system cannot find the path specified. (BADDIR/renameMe.tmp) (code: 3) in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/file/rename_variation12.phpt b/ext/standard/tests/file/rename_variation12.phpt index e2193a4fb9ed0..7208e68407adf 100644 --- a/ext/standard/tests/file/rename_variation12.phpt +++ b/ext/standard/tests/file/rename_variation12.phpt @@ -89,12 +89,12 @@ bool(true) -- Iteration 5 -- -Warning: rename(%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/renameMe.tmp,%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/IwasRenamed.tmp): %s in %s on line %d +Warning: rename(): No such file or directory (%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/renameMe.tmp) in %s on line %d bool(false) -- Iteration 6 -- -Warning: rename(%s/renameVar11/renameVar11Sub/BADDIR/renameMe.tmp,%s/renameVar11/renameVar11Sub/BADDIR/IwasRenamed.tmp): %s in %s on line %d +Warning: rename(): No such file or directory (%s/renameVar11/renameVar11Sub/BADDIR/renameMe.tmp) in %s on line %d bool(false) -- Iteration 7 -- @@ -115,7 +115,7 @@ bool(true) -- Iteration 11 -- -Warning: rename(BADDIR/renameMe.tmp,BADDIR/IwasRenamed.tmp): %s in %s on line %d +Warning: rename(): No such file or directory (BADDIR/renameMe.tmp) in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/file/rename_variation13-win32.phpt b/ext/standard/tests/file/rename_variation13-win32.phpt index d8db734e383d8..047de12dd867d 100644 Binary files a/ext/standard/tests/file/rename_variation13-win32.phpt and b/ext/standard/tests/file/rename_variation13-win32.phpt differ diff --git a/ext/standard/tests/file/rename_variation13.phpt b/ext/standard/tests/file/rename_variation13.phpt index 1cadd8a4383df..f30c57caa6703 100644 --- a/ext/standard/tests/file/rename_variation13.phpt +++ b/ext/standard/tests/file/rename_variation13.phpt @@ -64,42 +64,42 @@ echo "\n*** Done ***\n"; -- testing '-1' -- bool(true) -Warning: rename(-1,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d +Warning: rename(): No such file or directory (-1) in %s on line %d bool(false) -- testing '1' -- bool(true) -Warning: rename(1,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d +Warning: rename(): No such file or directory (1) in %s on line %d bool(false) -- testing '' -- -Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d +Warning: rename(): %r(Invalid argument|No such file or directory)%r (%s/renameVar13/afile.tmp) in %s on line %d bool(false) -Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d +Warning: rename(): %r(Invalid argument|No such file or directory)%r () in %s on line %d bool(false) -- testing '' -- -Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d +Warning: rename(): %r(Invalid argument|No such file or directory)%r (%s/renameVar13/afile.tmp) in %s on line %d bool(false) -Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d +Warning: rename(): %r(Invalid argument|No such file or directory)%r () in %s on line %d bool(false) -- testing '' -- -Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d +Warning: rename(): %r(Invalid argument|No such file or directory)%r (%s/renameVar13/afile.tmp) in %s on line %d bool(false) -Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d +Warning: rename(): %r(Invalid argument|No such file or directory)%r () in %s on line %d bool(false) -- testing ' ' -- bool(true) -Warning: rename( ,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d +Warning: rename(): No such file or directory ( ) in %s on line %d bool(false) -- testing '%s' -- -Warning: rename() %s in %s on line %d +Warning: rename() expects parameter 2 to be a valid path, string given in %s on line %d bool(false) Warning: file_exists() expects parameter 1 to be a valid path, string given in %s on line %d @@ -117,17 +117,17 @@ Warning: rename() expects parameter 1 to be a valid path, array given in %s on l bool(false) -- testing '/no/such/file/dir' -- -Warning: rename(%s/renameVar13/afile.tmp,/no/such/file/dir): No such file or directory in %s on line %d +Warning: rename(): No such file or directory (%s/renameVar13/afile.tmp) in %s on line %d bool(false) -Warning: rename(/no/such/file/dir,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d +Warning: rename(): No such file or directory (/no/such/file/dir) in %s on line %d bool(false) -- testing 'php/php' -- -Warning: rename(%s/renameVar13/afile.tmp,php/php): %s directory in %s on line %d +Warning: rename(): No such file or directory (%s/renameVar13/afile.tmp) in %s on line %d bool(false) -Warning: rename(php/php,%s/renameVar13/afile.tmp): %s directory in %s on line %d +Warning: rename(): No such file or directory (php/php) in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/file/rename_variation3-win32.phpt b/ext/standard/tests/file/rename_variation3-win32.phpt index b14b814295e49..8c885751c9095 100644 --- a/ext/standard/tests/file/rename_variation3-win32.phpt +++ b/ext/standard/tests/file/rename_variation3-win32.phpt @@ -71,7 +71,7 @@ bool(true) -- Renaming existing file to existing directory name -- -Warning: rename(%s/rename_variation3.tmp,%s/rename_variation3_dir): Access is denied. (code: 5) in %s on line %d +Warning: rename(): Access is denied. (%s/rename_variation3.tmp) (code: 5) in %s on line %d bool(false) bool(true) bool(true) diff --git a/ext/standard/tests/file/rename_variation5.phpt b/ext/standard/tests/file/rename_variation5.phpt index 04a4e23c7c98b..875acbb23bedb 100644 --- a/ext/standard/tests/file/rename_variation5.phpt +++ b/ext/standard/tests/file/rename_variation5.phpt @@ -70,7 +70,7 @@ bool(true) -- Renaming existing link to existing directory name -- -Warning: rename(%s,%s): Is a directory in %s on line %d +Warning: rename(): (%s) Is a directory in %s on line %d bool(false) -- Renaming existing link to existing file name -- @@ -78,7 +78,7 @@ bool(true) -- Renaming existing file to existing directory name -- -Warning: rename(%s,%s): Is a directory in %s on line %d +Warning: rename(): (%s) Is a directory in %s on line %d bool(false) -- Renaming existing file to existing link name -- @@ -86,11 +86,11 @@ bool(true) -- Renaming existing directory to existing file name -- -Warning: rename(%s,%s): Not a directory in %s on line %d +Warning: rename(): (%s) Not a directory in %s on line %d bool(false) -- Renaming existing directory to existing link name -- -Warning: rename(%s,%s): Not a directory in %s on line %d +Warning: rename(): (%s) Not a directory in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/rename_variation8-win32.phpt b/ext/standard/tests/file/rename_variation8-win32.phpt index df0fd55bb7d3b..194008b9422c0 100644 --- a/ext/standard/tests/file/rename_variation8-win32.phpt +++ b/ext/standard/tests/file/rename_variation8-win32.phpt @@ -50,7 +50,7 @@ rmdir(__DIR__."/rename_basic_dir1"); --EXPECTF-- *** Testing rename() on non-existing file *** -Warning: rename(%s/non_existent_file.tmp,%s/rename_variation8_new.tmp): The system cannot find the file specified. (code: 2) in %s on line %d +Warning: rename(): The system cannot find the file specified. (%s/non_existent_file.tmp) (code: 2) in %s on line %d bool(false) bool(false) bool(false) @@ -62,7 +62,7 @@ bool(true) *** Testing rename() on non-existing directory *** -Warning: rename(%s/non_existent_dir,%s/rename_basic_dir2): The system cannot find the file specified. (code: 2) in %s on line %d +Warning: rename(): The system cannot find the file specified. (%s/non_existent_dir) (code: 2) in %s on line %d bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/file/rename_variation8.phpt b/ext/standard/tests/file/rename_variation8.phpt index 660925b61fdf9..4dadd717ec670 100644 --- a/ext/standard/tests/file/rename_variation8.phpt +++ b/ext/standard/tests/file/rename_variation8.phpt @@ -51,7 +51,7 @@ rmdir(__DIR__."/rename_basic_dir1"); --EXPECTF-- *** Testing rename() on non-existing file *** -Warning: rename(%s/non_existent_file.tmp,%s/rename_variation8_new.tmp): No such file or directory in %s on line %d +Warning: rename(): No such file or directory (%s/non_existent_file.tmp) in %s on line %d bool(false) bool(false) bool(false) @@ -63,7 +63,7 @@ bool(true) *** Testing rename() on non-existing directory *** -Warning: rename(%s/non_existent_dir,%s/rename_basic_dir2): No such file or directory in %s on line %d +Warning: rename(): No such file or directory (%s/non_existent_dir) in %s on line %d bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/file/rmdir_variation3-win32.phpt b/ext/standard/tests/file/rmdir_variation3-win32.phpt index ac8c9dd368d40..4d24cc9ca969c 100644 --- a/ext/standard/tests/file/rmdir_variation3-win32.phpt +++ b/ext/standard/tests/file/rmdir_variation3-win32.phpt @@ -82,10 +82,10 @@ Directory removed Directory removed -- removing rmdirVar3.tmp\..\BADDIR\aSubDir -- -Warning: rmdir(rmdirVar3.tmp\..\BADDIR\aSubDir): No such file or directory in %s on line %d +Warning: rmdir(): No such file or directory (rmdirVar3.tmp\..\BADDIR\aSubDir) in %s on line %d -- removing BADDIR\aSubDir -- -Warning: rmdir(BADDIR\aSubDir): No such file or directory in %s on line %d +Warning: rmdir(): No such file or directory (BADDIR\aSubDir) in %s on line %d -- removing %s\rmdirVar3.tmp\aSubDir -- Directory removed -- removing %s\.\rmdirVar3.tmp\aSubDir -- @@ -94,7 +94,7 @@ Directory removed Directory removed -- removing %s\BADDIR\aSubDir -- -Warning: rmdir(%s\BADDIR\aSubDir): No such file or directory in %s on line %d +Warning: rmdir(): No such file or directory (%s\BADDIR\aSubDir) in %s on line %d -- removing rmdirVar3.tmp\aSubDir\ -- Directory removed -- removing %s\rmdirVar3.tmp\aSubDir\ -- diff --git a/ext/standard/tests/file/rmdir_variation3.phpt b/ext/standard/tests/file/rmdir_variation3.phpt index 095cde0880c0c..6d75dd0a4a26f 100644 --- a/ext/standard/tests/file/rmdir_variation3.phpt +++ b/ext/standard/tests/file/rmdir_variation3.phpt @@ -72,10 +72,10 @@ Directory removed Directory removed -- removing rmdirVar3.tmp/../BADDIR/aSubDir -- -Warning: rmdir(rmdirVar3.tmp/../BADDIR/aSubDir): No such file or directory in %s on line %d +Warning: rmdir(): No such file or directory (rmdirVar3.tmp/../BADDIR/aSubDir) in %s on line %d -- removing BADDIR/aSubDir -- -Warning: rmdir(BADDIR/aSubDir): No such file or directory in %s on line %d +Warning: rmdir(): No such file or directory (BADDIR/aSubDir) in %s on line %d -- removing %s/rmdirVar3.tmp/aSubDir -- Directory removed -- removing %s/./rmdirVar3.tmp/aSubDir -- @@ -84,7 +84,7 @@ Directory removed Directory removed -- removing %s/BADDIR/aSubDir -- -Warning: rmdir(%s/BADDIR/aSubDir): No such file or directory in %s on line %d +Warning: rmdir(): No such file or directory (%s/BADDIR/aSubDir) in %s on line %d -- removing rmdirVar3.tmp/aSubDir/ -- Directory removed -- removing %s/rmdirVar3.tmp/aSubDir/ -- diff --git a/ext/standard/tests/file/stream_001.phpt b/ext/standard/tests/file/stream_001.phpt index 6e692c554a9c0..b6efe18d230cf 100644 --- a/ext/standard/tests/file/stream_001.phpt +++ b/ext/standard/tests/file/stream_001.phpt @@ -17,7 +17,7 @@ Warning: fopen(): Unable to find the wrapper "file" - did you forget to enable i Warning: fopen(): file:// wrapper is disabled in the server configuration in %s on line %d -Warning: fopen(file://%s): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(): failed to open stream (file://%s): no suitable wrapper could be found in %s on line %d bool(false) bool(true) resource(%d) of type (stream) diff --git a/ext/standard/tests/file/stream_rfc2397_002.phpt b/ext/standard/tests/file/stream_rfc2397_002.phpt index 1dce5adf6cc74..6d2f81975a814 100644 --- a/ext/standard/tests/file/stream_rfc2397_002.phpt +++ b/ext/standard/tests/file/stream_rfc2397_002.phpt @@ -51,7 +51,7 @@ array(7) { } NULL -Warning: fopen(data://): failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d +Warning: fopen(): failed to open stream (data://): rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d NULL NULL array(7) { @@ -72,15 +72,15 @@ array(7) { } NULL -Warning: fopen(data://;base64): failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d +Warning: fopen(): failed to open stream (data://;base64): rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d NULL NULL -Warning: fopen(data://foo,): failed to open stream: rfc2397: illegal media type in %sstream_rfc2397_002.php on line %d +Warning: fopen(): failed to open stream (data://foo,): rfc2397: illegal media type in %sstream_rfc2397_002.php on line %d NULL NULL -Warning: fopen(data://foo=bar,): failed to open stream: rfc2397: illegal media type in %sstream_rfc2397_002.php on line %d +Warning: fopen(): failed to open stream (data://foo=bar,): rfc2397: illegal media type in %sstream_rfc2397_002.php on line %d NULL NULL array(8) { @@ -103,7 +103,7 @@ array(8) { } NULL -Warning: fopen(data://text/plain;foo,): failed to open stream: rfc2397: illegal parameter in %sstream_rfc2397_002.php on line %d +Warning: fopen(): failed to open stream (data://text/plain;foo,): rfc2397: illegal parameter in %sstream_rfc2397_002.php on line %d NULL NULL array(9) { @@ -128,7 +128,7 @@ array(9) { } string(3) "bar" -Warning: fopen(data://text/plain;foo=bar;bla,): failed to open stream: rfc2397: illegal parameter in %sstream_rfc2397_002.php on line %d +Warning: fopen(): failed to open stream (data://text/plain;foo=bar;bla,): rfc2397: illegal parameter in %sstream_rfc2397_002.php on line %d NULL NULL array(9) { @@ -153,7 +153,7 @@ array(9) { } string(3) "bar" -Warning: fopen(data://text/plain;foo=bar;bar=baz): failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d +Warning: fopen(): failed to open stream (data://text/plain;foo=bar;bar=baz): rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d NULL NULL array(10) { diff --git a/ext/standard/tests/file/stream_rfc2397_006.phpt b/ext/standard/tests/file/stream_rfc2397_006.phpt index f6616a0c886a7..3e4793393d53f 100644 --- a/ext/standard/tests/file/stream_rfc2397_006.phpt +++ b/ext/standard/tests/file/stream_rfc2397_006.phpt @@ -27,9 +27,9 @@ NULL Warning: file_get_contents() expects parameter 1 to be a valid path, string given in %s line %d NULL -Warning: file_get_contents(data:;base64,#Zm9vYmFyIGZvb2Jhcg==): failed to open stream: rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d +Warning: file_get_contents(): failed to open stream (data:;base64,#Zm9vYmFyIGZvb2Jhcg==): rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d bool(false) -Warning: file_get_contents(data:;base64,#Zm9vYmFyIGZvb2Jhc=): failed to open stream: rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d +Warning: file_get_contents(): failed to open stream (data:;base64,#Zm9vYmFyIGZvb2Jhc=): rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d bool(false) ===DONE=== diff --git a/ext/standard/tests/file/tempnam_variation7-win32.phpt b/ext/standard/tests/file/tempnam_variation7-win32.phpt index 5bacb5e876a7e..32ecf5fe55f18 100644 --- a/ext/standard/tests/file/tempnam_variation7-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation7-win32.phpt @@ -99,13 +99,13 @@ File created in => temp dir Warning: tempnam() expects parameter 1 to be a valid path, string given in %stempnam_variation7-win32.php on line %d -- File is not created -- -Warning: unlink(): %r(Invalid argument|No such file or directory)%r in %s on line %d +Warning: unlink(): %r(Invalid argument|No such file or directory)%r () in %s on line %d -- Iteration 7 -- Warning: tempnam() expects parameter 1 to be a valid path, array given in %s on line %d -- File is not created -- -Warning: unlink(): %r(Invalid argument|No such file or directory)%r in %s on line %d +Warning: unlink(): %r(Invalid argument|No such file or directory)%r () in %s on line %d -- Iteration 8 -- Notice: tempnam(): file created in the system's temporary directory in %stempnam_variation7-win32.php on line %d diff --git a/ext/standard/tests/file/unlink_error-win32-mb.phpt b/ext/standard/tests/file/unlink_error-win32-mb.phpt index a208e5675b745..1a9da45121120 100644 --- a/ext/standard/tests/file/unlink_error-win32-mb.phpt +++ b/ext/standard/tests/file/unlink_error-win32-mb.phpt @@ -99,11 +99,11 @@ bool(false) -- Testing unlink() on non-existent file -- -Warning: unlink(%s/non_existent_file.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (%s/non_existent_file.tmp) in %s on line %d bool(false) -- Testing unlink() on directory -- -Warning: unlink(%s/unlink_error): Is a directory in %s on line %d +Warning: unlink(): (%s/unlink_error) Is a directory in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/unlink_error-win32.phpt b/ext/standard/tests/file/unlink_error-win32.phpt index d62c715a94616..ab8badd324293 100644 --- a/ext/standard/tests/file/unlink_error-win32.phpt +++ b/ext/standard/tests/file/unlink_error-win32.phpt @@ -96,11 +96,11 @@ bool(false) -- Testing unlink() on non-existent file -- -Warning: unlink(%s/non_existent_file.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (%s/non_existent_file.tmp) in %s on line %d bool(false) -- Testing unlink() on directory -- -Warning: unlink(%s/unlink_error): Is a directory in %s on line %d +Warning: unlink(): (%s/unlink_error) Is a directory in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/unlink_error.phpt b/ext/standard/tests/file/unlink_error.phpt index 61aac03dd3190..f6b104aa53aeb 100644 --- a/ext/standard/tests/file/unlink_error.phpt +++ b/ext/standard/tests/file/unlink_error.phpt @@ -76,15 +76,15 @@ bool(true) -- Testing unlink() on invalid arguments -- -Warning: unlink(): %s in %s on line %d +Warning: unlink(): %r(Invalid argument|No such file or directory)%r () in %s on line %d bool(false) bool(false) -Warning: unlink(): %s in %s on line %d +Warning: unlink(): %r(Invalid argument|No such file or directory)%r () in %s on line %d bool(false) bool(false) -Warning: unlink(): %s in %s on line %d +Warning: unlink(): %r(Invalid argument|No such file or directory)%r () in %s on line %d bool(false) bool(false) @@ -96,11 +96,11 @@ bool(false) -- Testing unlink() on non-existent file -- -Warning: unlink(%s/non_existent_file.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (%s/non_existent_file.tmp) in %s on line %d bool(false) -- Testing unlink() on directory -- -Warning: unlink(%s/unlink_error): %s in %s on line %d +Warning: unlink(): %r(|Operation not permitted )%r(%s/unlink_error)%r( Is a directory|)%r in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/unlink_variation1-win32-mb.phpt b/ext/standard/tests/file/unlink_variation1-win32-mb.phpt index e18049fdbe4db..e81f0edea1c1b 100644 --- a/ext/standard/tests/file/unlink_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/unlink_variation1-win32-mb.phpt @@ -80,7 +80,7 @@ bool(true) -- Unlinking file without write permission, its dir having default permission -- bool(true) -Warning: unlink(%s/unlink_variation1/unlink_variation1-win32.tmp): Permission denied in %s on line %d +Warning: unlink(): Permission denied (%s/unlink_variation1/unlink_variation1-win32.tmp) in %s on line %d bool(false) bool(true) bool(false) diff --git a/ext/standard/tests/file/unlink_variation1-win32.phpt b/ext/standard/tests/file/unlink_variation1-win32.phpt index 7be1421f77c65..34221914c5eff 100644 --- a/ext/standard/tests/file/unlink_variation1-win32.phpt +++ b/ext/standard/tests/file/unlink_variation1-win32.phpt @@ -78,7 +78,7 @@ bool(true) -- Unlinking file without write permission, its dir having default permission -- bool(true) -Warning: unlink(%s/unlink_variation1/unlink_variation1-win32.tmp): Permission denied in %s on line %d +Warning: unlink(): Permission denied (%s/unlink_variation1/unlink_variation1-win32.tmp) in %s on line %d bool(false) bool(true) bool(false) diff --git a/ext/standard/tests/file/unlink_variation1.phpt b/ext/standard/tests/file/unlink_variation1.phpt index 0ce7cdf74fa6b..f88a7a3f2d5df 100644 --- a/ext/standard/tests/file/unlink_variation1.phpt +++ b/ext/standard/tests/file/unlink_variation1.phpt @@ -76,7 +76,7 @@ echo "Done\n"; -- Unlink file having default permission and its dir having read only permission -- bool(true) -Warning: unlink(%s): %s in %s on line %d +Warning: unlink(): %r(Permission denied|No such file or directory)%r (%s) in %s on line %d bool(false) bool(false) bool(true) diff --git a/ext/standard/tests/file/unlink_variation10.phpt b/ext/standard/tests/file/unlink_variation10.phpt index 585b8f87fb3ad..35e6c03809949 100644 --- a/ext/standard/tests/file/unlink_variation10.phpt +++ b/ext/standard/tests/file/unlink_variation10.phpt @@ -102,5 +102,5 @@ directory unlinked --- try to unlink a directory --- -Warning: unlink(unlinkVar10.tmp/linkme.tmp): %s in %s on line %d +Warning: unlink(): %r(|Operation not permitted )%r(unlinkVar10.tmp/linkme.tmp)%r( Is a directory|)%r in %s on line %d ===DONE=== diff --git a/ext/standard/tests/file/unlink_variation4.phpt b/ext/standard/tests/file/unlink_variation4.phpt index bc88b48adf361..1cb9ab1202e44 100644 --- a/ext/standard/tests/file/unlink_variation4.phpt +++ b/ext/standard/tests/file/unlink_variation4.phpt @@ -32,6 +32,6 @@ echo "Done\n"; bool(true) bool(false) -Warning: unlink(%s/unlink_variation4.tmp): %s in %s on line %d +Warning: unlink(): No such file or directory (%s/unlink_variation4.tmp) in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/unlink_variation8-win32.phpt b/ext/standard/tests/file/unlink_variation8-win32.phpt index 9ee6b49d2a163..4a787d9443b6b 100644 --- a/ext/standard/tests/file/unlink_variation8-win32.phpt +++ b/ext/standard/tests/file/unlink_variation8-win32.phpt @@ -87,10 +87,10 @@ file removed file removed -- removing unlinkVar8.tmp/../BADDIR/file.tmp -- -Warning: unlink(unlinkVar8.tmp/../BADDIR/file.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (unlinkVar8.tmp/../BADDIR/file.tmp) in %s on line %d -- removing BADDIR/file.tmp -- -Warning: unlink(BADDIR/file.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (BADDIR/file.tmp) in %s on line %d -- removing %s/unlinkVar8.tmp/file.tmp -- file removed -- removing %s/./unlinkVar8.tmp/file.tmp -- @@ -99,13 +99,13 @@ file removed file removed -- removing %s/BADDIR/file.tmp -- -Warning: unlink(%s/BADDIR/file.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (%s/BADDIR/file.tmp) in %s on line %d -- removing unlinkVar8.tmp/file.tmp/ -- -Warning: unlink(unlinkVar8.tmp/file.tmp/): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (unlinkVar8.tmp/file.tmp/) in %s on line %d -- removing %s/unlinkVar8.tmp/file.tmp/ -- -Warning: unlink(%s/unlinkVar8.tmp/file.tmp/): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (%s/unlinkVar8.tmp/file.tmp/) in %s on line %d -- removing unlinkVar8.tmp//file.tmp -- file removed -- removing %s//unlinkVar8.tmp//file.tmp -- diff --git a/ext/standard/tests/file/unlink_variation8.phpt b/ext/standard/tests/file/unlink_variation8.phpt index ab074c7849e7b..795a7c530b1d7 100644 --- a/ext/standard/tests/file/unlink_variation8.phpt +++ b/ext/standard/tests/file/unlink_variation8.phpt @@ -130,22 +130,22 @@ file unlinked file unlinked -- removing unlinkVar8.tmp/../BADDIR/file.tmp -- -Warning: unlink(unlinkVar8.tmp/../BADDIR/file.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (unlinkVar8.tmp/../BADDIR/file.tmp) in %s on line %d -- unlinking soft link unlinkVar8.tmp/../BADDIR/file.tmp -- -Warning: unlink(unlinkVar8.tmp/../BADDIR/file.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (unlinkVar8.tmp/../BADDIR/file.tmp) in %s on line %d -- unlinking hard link unlinkVar8.tmp/../BADDIR/file.tmp -- -Warning: unlink(unlinkVar8.tmp/../BADDIR/file.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (unlinkVar8.tmp/../BADDIR/file.tmp) in %s on line %d -- removing BADDIR/file.tmp -- -Warning: unlink(BADDIR/file.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (BADDIR/file.tmp) in %s on line %d -- unlinking soft link BADDIR/file.tmp -- -Warning: unlink(BADDIR/file.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (BADDIR/file.tmp) in %s on line %d -- unlinking hard link BADDIR/file.tmp -- -Warning: unlink(BADDIR/file.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (BADDIR/file.tmp) in %s on line %d -- removing /%s/unlinkVar8.tmp/file.tmp -- file removed -- unlinking soft link /%s/unlinkVar8.tmp/file.tmp -- @@ -166,31 +166,31 @@ file unlinked file unlinked -- removing /%s/BADDIR/file.tmp -- -Warning: unlink(/%s/BADDIR/file.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (/%s/BADDIR/file.tmp) in %s on line %d -- unlinking soft link /%s/BADDIR/file.tmp -- -Warning: unlink(/%s/BADDIR/file.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (/%s/BADDIR/file.tmp) in %s on line %d -- unlinking hard link /%s/BADDIR/file.tmp -- -Warning: unlink(/%s/BADDIR/file.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (/%s/BADDIR/file.tmp) in %s on line %d -- removing unlinkVar8.tmp/file.tmp/ -- -Warning: unlink(unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d +Warning: unlink(): Not a directory (unlinkVar8.tmp/file.tmp/) in %s on line %d -- unlinking soft link unlinkVar8.tmp/file.tmp/ -- -Warning: unlink(unlinkVar8.tmp/file.tmp/): %s directory in %s on line %d +Warning: unlink(): %r(No such file or|Not a)%r directory (unlinkVar8.tmp/file.tmp/) in %s on line %d -- unlinking hard link unlinkVar8.tmp/file.tmp/ -- -Warning: unlink(unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d +Warning: unlink(): Not a directory (unlinkVar8.tmp/file.tmp/) in %s on line %d -- removing /%s/unlinkVar8.tmp/file.tmp/ -- -Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d +Warning: unlink(): Not a directory (/%s/unlinkVar8.tmp/file.tmp/) in %s on line %d -- unlinking soft link /%s/unlinkVar8.tmp/file.tmp/ -- -Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): %s directory in %s on line %d +Warning: unlink(): %r(No such file or|Not a)%r directory (/%s/unlinkVar8.tmp/file.tmp/) in %s on line %d -- unlinking hard link /%s/unlinkVar8.tmp/file.tmp/ -- -Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d +Warning: unlink(): Not a directory (/%s/unlinkVar8.tmp/file.tmp/) in %s on line %d -- removing unlinkVar8.tmp//file.tmp -- file removed -- unlinking soft link unlinkVar8.tmp//file.tmp -- diff --git a/ext/standard/tests/file/unlink_variation9-win32.phpt b/ext/standard/tests/file/unlink_variation9-win32.phpt index 2331c9edc8bf5..87786a0f80492 100644 --- a/ext/standard/tests/file/unlink_variation9-win32.phpt +++ b/ext/standard/tests/file/unlink_variation9-win32.phpt @@ -89,10 +89,10 @@ file removed file removed -- removing unlinkVar9.tmp\..\BADDIR\file.tmp -- -Warning: unlink(unlinkVar9.tmp\..\BADDIR\file.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (unlinkVar9.tmp\..\BADDIR\file.tmp) in %s on line %d -- removing BADDIR\file.tmp -- -Warning: unlink(BADDIR\file.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (BADDIR\file.tmp) in %s on line %d -- removing %s\unlinkVar9.tmp\file.tmp -- file removed -- removing %s\.\unlinkVar9.tmp\file.tmp -- @@ -101,13 +101,13 @@ file removed file removed -- removing %s\BADDIR\file.tmp -- -Warning: unlink(%s\BADDIR\file.tmp): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (%s\BADDIR\file.tmp) in %s on line %d -- removing unlinkVar9.tmp\file.tmp\ -- -Warning: unlink(unlinkVar9.tmp\file.tmp\): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (unlinkVar9.tmp\file.tmp\) in %s on line %d -- removing %s\unlinkVar9.tmp\file.tmp\ -- -Warning: unlink(%s\unlinkVar9.tmp\file.tmp\): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (%s\unlinkVar9.tmp\file.tmp\) in %s on line %d -- removing unlinkVar9.tmp\\file.tmp -- file removed -- removing %s\\unlinkVar9.tmp\\file.tmp -- diff --git a/ext/standard/tests/general_functions/bug44295-win.phpt b/ext/standard/tests/general_functions/bug44295-win.phpt index 13a8918bcd3fc..af9dba3f31697 100644 --- a/ext/standard/tests/general_functions/bug44295-win.phpt +++ b/ext/standard/tests/general_functions/bug44295-win.phpt @@ -25,5 +25,5 @@ try { --EXPECTF-- before -in catch: DirectoryIterator::__construct(c:\not\exists\here,c:\not\exists\here): %s (code: 3) +in catch: DirectoryIterator::__construct(): The system cannot find the path specified. (c:\not\exists\here) (code: 3) ==DONE== diff --git a/ext/standard/tests/general_functions/bug44295.phpt b/ext/standard/tests/general_functions/bug44295.phpt index c9744e64dd644..203b20f72f226 100644 --- a/ext/standard/tests/general_functions/bug44295.phpt +++ b/ext/standard/tests/general_functions/bug44295.phpt @@ -25,5 +25,5 @@ try { --EXPECT-- before -in catch: DirectoryIterator::__construct(/this/path/does/not/exist): failed to open dir: No such file or directory +in catch: DirectoryIterator::__construct(): failed to open dir (/this/path/does/not/exist): No such file or directory ==DONE== diff --git a/ext/standard/tests/general_functions/parse_ini_file.phpt b/ext/standard/tests/general_functions/parse_ini_file.phpt index 368d262a6e042..6a0c63065bb89 100644 --- a/ext/standard/tests/general_functions/parse_ini_file.phpt +++ b/ext/standard/tests/general_functions/parse_ini_file.phpt @@ -127,10 +127,10 @@ bool(false) Warning: parse_ini_file() expects at most 3 parameters, 4 given in %sparse_ini_file.php on line 7 bool(false) -Warning: parse_ini_file(%sparse_ini_file.dat): failed to open stream: No such file or directory in %sparse_ini_file.php on line 8 +Warning: parse_ini_file(): failed to open stream (%sparse_ini_file.dat): No such file or directory in %sparse_ini_file.php on line 8 bool(false) -Warning: parse_ini_file(%sparse_ini_file.dat): failed to open stream: No such file or directory in %sparse_ini_file.php on line 9 +Warning: parse_ini_file(): failed to open stream (%sparse_ini_file.dat): No such file or directory in %sparse_ini_file.php on line 9 bool(false) array(1) { ["test"]=> diff --git a/ext/standard/tests/general_functions/proc_open_pipes3.phpt b/ext/standard/tests/general_functions/proc_open_pipes3.phpt index 7671b1dce1794..d66862c8944a6 100644 --- a/ext/standard/tests/general_functions/proc_open_pipes3.phpt +++ b/ext/standard/tests/general_functions/proc_open_pipes3.phpt @@ -41,7 +41,7 @@ array(4) { resource(%d) of type (Unknown) } -Warning: proc_open(test): failed to open stream: %s in %s on line %d +Warning: proc_open(): failed to open stream (test): %s in %s on line %d array(4) { [3]=> resource(%d) of type (Unknown) diff --git a/ext/standard/tests/http/bug38802.phpt b/ext/standard/tests/http/bug38802.phpt index 5e9fd10273565..11703c60c6c96 100644 --- a/ext/standard/tests/http/bug38802.phpt +++ b/ext/standard/tests/http/bug38802.phpt @@ -105,7 +105,7 @@ Connection: close " -- Test: fail after 2 redirections -- -Warning: fopen(http://127.0.0.1:12342/foo/bar): failed to open stream: Redirection limit reached, aborting in %s +Warning: fopen(): failed to open stream (http://127.0.0.1:12342/foo/bar): Redirection limit reached, aborting in %s bool(false) string(%d) "GET /foo/bar HTTP/1.0 Host: 127.0.0.1:12342 @@ -118,7 +118,7 @@ Connection: close " -- Test: fail at first redirection -- -Warning: fopen(http://127.0.0.1:12342/foo/bar): failed to open stream: Redirection limit reached, aborting in %s +Warning: fopen(): failed to open stream (http://127.0.0.1:12342/foo/bar): Redirection limit reached, aborting in %s bool(false) string(%d) "GET /foo/bar HTTP/1.0 Host: 127.0.0.1:12342 @@ -127,7 +127,7 @@ Connection: close " -- Test: fail at first redirection (2) -- -Warning: fopen(http://127.0.0.1:12342/foo/bar): failed to open stream: Redirection limit reached, aborting in %s +Warning: fopen(): failed to open stream (http://127.0.0.1:12342/foo/bar): Redirection limit reached, aborting in %s bool(false) string(%d) "GET /foo/bar HTTP/1.0 Host: 127.0.0.1:12342 diff --git a/ext/standard/tests/http/bug60570.phpt b/ext/standard/tests/http/bug60570.phpt index 5996df369a095..cdfec80f476b9 100644 --- a/ext/standard/tests/http/bug60570.phpt +++ b/ext/standard/tests/http/bug60570.phpt @@ -38,13 +38,13 @@ function do_test() { do_test(); --EXPECTF-- -Warning: file_get_contents(http://127.0.0.1:12342/): failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found +Warning: file_get_contents(): failed to open stream (http://127.0.0.1:12342/): HTTP request failed! HTTP/1.0 404 Not Found in %s on line %d -Warning: file_get_contents(http://127.0.0.1:12342/): failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found +Warning: file_get_contents(): failed to open stream (http://127.0.0.1:12342/): HTTP request failed! HTTP/1.0 404 Not Found in %s on line %d -Warning: file_get_contents(http://127.0.0.1:12342/): failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found +Warning: file_get_contents(): failed to open stream (http://127.0.0.1:12342/): HTTP request failed! HTTP/1.0 404 Not Found in %s on line %d leak? penultimate iteration: %d, last one: %d bool(true) diff --git a/ext/standard/tests/http/bug69337.phpt b/ext/standard/tests/http/bug69337.phpt index 8de8187485832..da3089d4d2a18 100644 --- a/ext/standard/tests/http/bug69337.phpt +++ b/ext/standard/tests/http/bug69337.phpt @@ -34,6 +34,6 @@ var_dump($f); ?> ==DONE== --EXPECTF-- -Warning: file_get_contents(http://127.0.0.1:22345/): failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found%ain %s on line %d +Warning: file_get_contents(): failed to open stream (http://127.0.0.1:22345/): HTTP request failed! HTTP/1.0 404 Not Found%ain %s on line %d bool(false) ==DONE== diff --git a/ext/standard/tests/http/http_response_header_03.phpt b/ext/standard/tests/http/http_response_header_03.phpt index 907983ac4b80c..36eedc8c4e219 100644 --- a/ext/standard/tests/http/http_response_header_03.phpt +++ b/ext/standard/tests/http/http_response_header_03.phpt @@ -27,7 +27,7 @@ http_server_kill($pid); ?> ==DONE== --EXPECTF-- -Warning: file_get_contents(http://127.0.0.1:22348/): failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found%a +Warning: file_get_contents(): failed to open stream (http://127.0.0.1:22348/): HTTP request failed! HTTP/1.0 404 Not Found%a bool(false) array(5) { [0]=> diff --git a/ext/standard/tests/http/ignore_errors.phpt b/ext/standard/tests/http/ignore_errors.phpt index 54a0073b5e82c..c75c0c8a6b9bd 100644 --- a/ext/standard/tests/http/ignore_errors.phpt +++ b/ext/standard/tests/http/ignore_errors.phpt @@ -68,7 +68,7 @@ Connection: close " -Warning: fopen(http://127.0.0.1:12342/foo/bar): failed to open stream: HTTP request failed! HTTP/1.0 404 Not found +Warning: fopen(): failed to open stream (http://127.0.0.1:12342/foo/bar): HTTP request failed! HTTP/1.0 404 Not found in %s on line %d bool(false) string(%d) "GET /foo/bar HTTP/1.0 diff --git a/ext/standard/tests/image/getimagesize_variation3.phpt b/ext/standard/tests/image/getimagesize_variation3.phpt index a608047707d12..56efeb0ce9557 100644 --- a/ext/standard/tests/image/getimagesize_variation3.phpt +++ b/ext/standard/tests/image/getimagesize_variation3.phpt @@ -50,10 +50,10 @@ array(0) { -- Non-existent file (nofile.ext) -- -Warning: getimagesize(%snofile.ext): failed to open stream: No such file or directory in %s on line %d +Warning: getimagesize(): failed to open stream (%snofile.ext): No such file or directory in %s on line %d bool(false) -Warning: getimagesize(%snofile.ext): failed to open stream: No such file or directory in %s on line %d +Warning: getimagesize(): failed to open stream (%snofile.ext): No such file or directory in %s on line %d bool(false) array(0) { } diff --git a/ext/standard/tests/streams/bug49936_win32.phpt b/ext/standard/tests/streams/bug49936_win32.phpt index 594fcae4be57b..6850201780939 100644 --- a/ext/standard/tests/streams/bug49936_win32.phpt +++ b/ext/standard/tests/streams/bug49936_win32.phpt @@ -20,11 +20,11 @@ var_dump(opendir($dir)); Warning: opendir(): connect() failed: %s in %s on line %d -Warning: opendir(ftp://...@localhost/): failed to open dir: operation failed in %s on line %d +Warning: opendir(): failed to open dir (ftp://...@localhost/): operation failed in %s on line %d bool(false) Warning: opendir(): connect() failed: %s in %s on line %d -Warning: opendir(ftp://...@localhost/): failed to open dir: operation failed in %s on line %d +Warning: opendir(): failed to open dir (ftp://...@localhost/): operation failed in %s on line %d bool(false) diff --git a/ext/standard/tests/streams/bug72771.phpt b/ext/standard/tests/streams/bug72771.phpt index ebb358707ed0f..608b635d5b0e3 100644 --- a/ext/standard/tests/streams/bug72771.phpt +++ b/ext/standard/tests/streams/bug72771.phpt @@ -18,6 +18,6 @@ var_dump($ds); ?> ==DONE== --EXPECTF-- -Warning: opendir(ftps://127.0.0.1:%d/): failed to open dir: Server doesn't support FTPS. in %s on line %d +Warning: opendir(): failed to open dir (ftps://127.0.0.1:%d/): Server doesn't support FTPS. in %s on line %d bool(false) ==DONE== diff --git a/ext/standard/tests/streams/bug73457.phpt b/ext/standard/tests/streams/bug73457.phpt index a49a2026b7f77..1907e7ec703c9 100644 --- a/ext/standard/tests/streams/bug73457.phpt +++ b/ext/standard/tests/streams/bug73457.phpt @@ -18,6 +18,6 @@ var_dump($ds); ?> ==DONE== --EXPECTF-- -Warning: file_get_contents(ftp://127.0.0.1:%d/bug73457): failed to open stream: Failed to set up data channel: Connection refused in %s on line %d +Warning: file_get_contents(): failed to open stream (ftp://127.0.0.1:%d/bug73457): Failed to set up data channel: Connection refused in %s on line %d bool(false) ==DONE== diff --git a/ext/standard/tests/streams/bug74951.phpt b/ext/standard/tests/streams/bug74951.phpt index b45bee7c3bc92..b726c4f4210c4 100644 --- a/ext/standard/tests/streams/bug74951.phpt +++ b/ext/standard/tests/streams/bug74951.phpt @@ -9,4 +9,4 @@ trait Stream00ploiter{ stream_wrapper_register('e0ploit','Stream00ploiter'); $s=fopen('e0ploit://',0); --EXPECTF-- -Warning: fopen(e0ploit://): failed to open stream: operation failed in %s%ebug74951.php on line 7 +Warning: fopen(): failed to open stream (e0ploit://): operation failed in %s%ebug74951.php on line 7 diff --git a/ext/standard/tests/streams/bug77664.phpt b/ext/standard/tests/streams/bug77664.phpt index 6a925417e2ab8..86ebbe19c666e 100644 --- a/ext/standard/tests/streams/bug77664.phpt +++ b/ext/standard/tests/streams/bug77664.phpt @@ -10,7 +10,7 @@ stream_wrapper_register('error',ErrorWrapper::class); file_get_contents('error://test'); ?> --EXPECTF-- -Warning: file_get_contents(error://test): failed to open stream: operation failed in %sbug77664.php on line %d +Warning: file_get_contents(): failed to open stream (error://test): operation failed in %sbug77664.php on line %d Fatal error: Uncaught Error: Undefined class constant 'self::INVALID' in %sbug77664.php:%d Stack trace: diff --git a/ext/standard/tests/streams/glob-wrapper.phpt b/ext/standard/tests/streams/glob-wrapper.phpt index 0e4438fdcc622..2a4d592b6048d 100644 --- a/ext/standard/tests/streams/glob-wrapper.phpt +++ b/ext/standard/tests/streams/glob-wrapper.phpt @@ -25,11 +25,11 @@ foreach ( [ __DIR__, "glob://".__DIR__ ] as $spec) { Warning: opendir(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (/does_not_exist) in %s%eglob-wrapper.php on line 5 -Warning: opendir(%s): failed to open dir: Operation not permitted in %s%eglob-wrapper.php on line 5 +Warning: opendir(): failed to open dir (%s): Operation not permitted in %s%eglob-wrapper.php on line 5 Failed to open %s ** Opening glob://%s Warning: opendir(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (/does_not_exist) in %s%eglob-wrapper.php on line 5 -Warning: opendir(glob://%s): failed to open dir: operation failed in %s%eglob-wrapper.php on line 5 +Warning: opendir(): failed to open dir (glob://%s): operation failed in %s%eglob-wrapper.php on line 5 Failed to open glob://%s diff --git a/ext/standard/tests/streams/opendir-001.phpt b/ext/standard/tests/streams/opendir-001.phpt index d2d2ce8b9ce31..90a28ae1504c8 100644 --- a/ext/standard/tests/streams/opendir-001.phpt +++ b/ext/standard/tests/streams/opendir-001.phpt @@ -16,7 +16,7 @@ var_dump(opendir($path)); ?> ==DONE== --EXPECTF-- -Warning: opendir(ftp://localhost:%d/bogusdir): failed to open dir: FTP server reports 250 /bogusdir: No such file or directory +Warning: opendir(): failed to open dir (ftp://localhost:%d/bogusdir): FTP server reports 250 /bogusdir: No such file or directory in %s on line %d bool(false) ==DONE== diff --git a/ext/standard/tests/streams/opendir-003.phpt b/ext/standard/tests/streams/opendir-003.phpt index 2b3aedbf30ae5..f2f44286b5292 100644 --- a/ext/standard/tests/streams/opendir-003.phpt +++ b/ext/standard/tests/streams/opendir-003.phpt @@ -20,7 +20,7 @@ var_dump(opendir($path, $context)); ?> ==DONE== --EXPECTF-- -Warning: opendir(ftps://127.0.0.1:%d/bogusdir): failed to open dir: FTP server reports 250 /bogusdir: No such file or directory +Warning: opendir(): failed to open dir (ftps://127.0.0.1:%d/bogusdir): FTP server reports 250 /bogusdir: No such file or directory in %s on line %d bool(false) ==DONE== diff --git a/ext/standard/tests/streams/user-stream-error.phpt b/ext/standard/tests/streams/user-stream-error.phpt index 5cc87e73607dd..ece33f91b7dca 100644 --- a/ext/standard/tests/streams/user-stream-error.phpt +++ b/ext/standard/tests/streams/user-stream-error.phpt @@ -12,7 +12,7 @@ stream_wrapper_register('mystream', 'FailStream'); fopen('mystream://foo', 'r'); echo 'Done'; --EXPECTF-- -Warning: fopen(mystream://foo): failed to open stream: "FailStream::stream_open" call failed in %s%euser-stream-error.php on line %d +Warning: fopen(): failed to open stream (mystream://foo): "FailStream::stream_open" call failed in %s%euser-stream-error.php on line %d Fatal error: Uncaught Error: Call to undefined function _some_undefined_function() in %s%euser-stream-error.php:%d Stack trace: diff --git a/ext/standard/tests/strings/006.phpt b/ext/standard/tests/strings/006.phpt index 7665aa20f5f2b..ba4dbeacd9ffd 100644 --- a/ext/standard/tests/strings/006.phpt +++ b/ext/standard/tests/strings/006.phpt @@ -13,7 +13,7 @@ var_dump(ob_get_contents()); ?> ===DONE=== --EXPECTF-- -Warning: highlight_file(AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA): failed to open stream: %s006.php on line %d +Warning: highlight_file(): failed to open stream (AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA): %s006.php on line %d Warning: highlight_file(): Failed opening 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' for highlighting in %s006.php on line %d bool(false) diff --git a/ext/standard/tests/strings/007-win32.phpt b/ext/standard/tests/strings/007-win32.phpt index 7d06f018a5fcb..c2e468579fdee 100644 --- a/ext/standard/tests/strings/007-win32.phpt +++ b/ext/standard/tests/strings/007-win32.phpt @@ -14,7 +14,7 @@ var_dump(ob_get_contents()); ?> ===DONE=== --EXPECTF-- -Warning: php_strip_whitespace(%s): failed to open stream: No such file or directory in %s on line %d +Warning: php_strip_whitespace(): failed to open stream (%s): No such file or directory in %s on line %d string(0) "" bool(false) ===DONE=== diff --git a/ext/standard/tests/strings/007.phpt b/ext/standard/tests/strings/007.phpt index a0fd8acdf4e82..b060c8f63c58e 100644 --- a/ext/standard/tests/strings/007.phpt +++ b/ext/standard/tests/strings/007.phpt @@ -14,7 +14,7 @@ var_dump(ob_get_contents()); ?> ===DONE=== --EXPECTF-- -Warning: php_strip_whitespace(%s): failed to open stream: File name too long in %s007.php on line %d +Warning: php_strip_whitespace(): failed to open stream (%s): File name too long in %s007.php on line %d string(0) "" bool(false) ===DONE=== diff --git a/ext/standard/tests/strings/bug68996.phpt b/ext/standard/tests/strings/bug68996.phpt index 3f1e6c49294e2..7a2413cc965b2 100644 --- a/ext/standard/tests/strings/bug68996.phpt +++ b/ext/standard/tests/strings/bug68996.phpt @@ -8,4 +8,4 @@ fopen("\xfc\x63", "r"); ?> --EXPECTF--
-Warning: : failed to open stream: No such file or directory in %sbug68996.php on line %d
+Warning: fopen(): failed to open stream (�c): No such file or directory in %sbug68996.php on line %d
diff --git a/ext/standard/tests/strings/highlight_file.phpt b/ext/standard/tests/strings/highlight_file.phpt index 9861c6c27f413..7253a86b35bc4 100644 --- a/ext/standard/tests/strings/highlight_file.phpt +++ b/ext/standard/tests/strings/highlight_file.phpt @@ -40,7 +40,7 @@ echo "Done\n"; Warning: highlight_file() expects at least 1 parameter, 0 given in %s on line %d bool(false) -Warning: highlight_file(%shighlight_file.dat): failed to open stream: No such file or directory in %s on line %d +Warning: highlight_file(): failed to open stream (%shighlight_file.dat): No such file or directory in %s on line %d Warning: highlight_file(): Failed opening '%shighlight_file.dat' for highlighting in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/md5_file.phpt b/ext/standard/tests/strings/md5_file.phpt index 45009669f4ac4..7569ec4eefb1d 100644 Binary files a/ext/standard/tests/strings/md5_file.phpt and b/ext/standard/tests/strings/md5_file.phpt differ diff --git a/ext/standard/tests/strings/php_strip_whitespace.phpt b/ext/standard/tests/strings/php_strip_whitespace.phpt index 442672c6aa005..cd7f5fbdbda43 100644 --- a/ext/standard/tests/strings/php_strip_whitespace.phpt +++ b/ext/standard/tests/strings/php_strip_whitespace.phpt @@ -43,7 +43,7 @@ echo "Done\n"; Warning: php_strip_whitespace() expects exactly 1 parameter, 0 given in %s on line %d bool(false) -Warning: php_strip_whitespace(%sphp_strip_whitespace.dat): failed to open stream: No such file or directory in %s on line %d +Warning: php_strip_whitespace(): failed to open stream (%sphp_strip_whitespace.dat): No such file or directory in %s on line %d string(0) "" string(18) "/* test comment */" string(9) "" diff --git a/ext/standard/tests/strings/sha1.phpt b/ext/standard/tests/strings/sha1.phpt index 1dc73881eff8d..d71584fce3b63 100644 --- a/ext/standard/tests/strings/sha1.phpt +++ b/ext/standard/tests/strings/sha1.phpt @@ -47,5 +47,5 @@ bool(true) string(20) "%a" string(20) "%a" -Warning: sha1_file(%ssha1.dat): failed to open stream: No such file or directory in %s on line %d +Warning: sha1_file(): failed to open stream (%ssha1.dat): No such file or directory in %s on line %d Done diff --git a/ext/standard/tests/strings/sha1_file.phpt b/ext/standard/tests/strings/sha1_file.phpt index 102dab75ff6f9..2618e1e14071c 100644 --- a/ext/standard/tests/strings/sha1_file.phpt +++ b/ext/standard/tests/strings/sha1_file.phpt @@ -82,12 +82,12 @@ bool(false) -- invalid filename -- -Warning: sha1_file(rewncwYcn89q): failed to open stream: No such file or directory in %s on line %d +Warning: sha1_file(): failed to open stream (rewncwYcn89q): No such file or directory in %s on line %d bool(false) -- Scalar value as filename -- -Warning: sha1_file(12): failed to open stream: No such file or directory in %s on line %d +Warning: sha1_file(): failed to open stream (12): No such file or directory in %s on line %d bool(false) -- NULL as filename -- diff --git a/ext/zip/tests/bug53603.phpt b/ext/zip/tests/bug53603.phpt index 0a501071e5532..9a9c8818b8b46 100644 --- a/ext/zip/tests/bug53603.phpt +++ b/ext/zip/tests/bug53603.phpt @@ -28,5 +28,5 @@ if ($zip->open($file) !== TRUE) { $a = $zip->extractTo('teststream://test'); var_dump($a); --EXPECTF-- -Warning: ZipArchive::extractTo(teststream://test/foo): failed to open stream: "TestStream::stream_open" call failed in %s on line %d +Warning: ZipArchive::extractTo(): failed to open stream (teststream://test/foo): "TestStream::stream_open" call failed in %s on line %d bool(false) diff --git a/ext/zip/tests/oo_encryption.phpt b/ext/zip/tests/oo_encryption.phpt index 7567111dbbd32..8db8685716dd9 100644 --- a/ext/zip/tests/oo_encryption.phpt +++ b/ext/zip/tests/oo_encryption.phpt @@ -59,7 +59,7 @@ string(3) "bar" == Stream string(3) "foo" -Warning: file_get_contents(%s): failed to open stream: operation failed in %s on line %d +Warning: file_get_contents(): failed to open stream (%s): operation failed in %s on line %d bool(false) string(3) "bar" == Done diff --git a/ext/zlib/tests/004-mb.phpt b/ext/zlib/tests/004-mb.phpt index 07a26e5294fab..ddab322697d1b 100644 --- a/ext/zlib/tests/004-mb.phpt +++ b/ext/zlib/tests/004-mb.phpt @@ -18,7 +18,7 @@ echo "Done\n"; Warning: gzfile() expects at least 1 parameter, 0 given in %s on line %d NULL -Warning: gzfile(nonexistent_file_gzfile): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(): failed to open stream (nonexistent_file_gzfile): No such file or directory in %s on line %d bool(false) Warning: gzfile() expects at most 2 parameters, 3 given in %s on line %d diff --git a/ext/zlib/tests/004.phpt b/ext/zlib/tests/004.phpt index 7689ad0cf1fed..5187b44918681 100644 --- a/ext/zlib/tests/004.phpt +++ b/ext/zlib/tests/004.phpt @@ -18,7 +18,7 @@ echo "Done\n"; Warning: gzfile() expects at least 1 parameter, 0 given in %s on line %d NULL -Warning: gzfile(nonexistent_file_gzfile): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(): failed to open stream (nonexistent_file_gzfile): No such file or directory in %s on line %d bool(false) Warning: gzfile() expects at most 2 parameters, 3 given in %s on line %d diff --git a/ext/zlib/tests/gzfile_variation4.phpt b/ext/zlib/tests/gzfile_variation4.phpt index 9b3128125a511..d5dfe8d979ede 100644 --- a/ext/zlib/tests/gzfile_variation4.phpt +++ b/ext/zlib/tests/gzfile_variation4.phpt @@ -26,18 +26,18 @@ foreach ( $variation as $var ) { ?> ===DONE=== --EXPECTF-- -Warning: gzfile(10.5): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(): failed to open stream (10.5): No such file or directory in %s on line %d bool(false) -Warning: gzfile(-10.5): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(): failed to open stream (-10.5): No such file or directory in %s on line %d bool(false) -Warning: gzfile(123456789000): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(): failed to open stream (123456789000): No such file or directory in %s on line %d bool(false) -Warning: gzfile(-123456789000): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(): failed to open stream (-123456789000): No such file or directory in %s on line %d bool(false) -Warning: gzfile(0.5): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(): failed to open stream (0.5): No such file or directory in %s on line %d bool(false) ===DONE=== diff --git a/ext/zlib/tests/gzfile_variation5.phpt b/ext/zlib/tests/gzfile_variation5.phpt index 1627d2eb11119..fbb8fb84d6b9e 100644 --- a/ext/zlib/tests/gzfile_variation5.phpt +++ b/ext/zlib/tests/gzfile_variation5.phpt @@ -25,15 +25,15 @@ foreach ( $variation as $var ) { ?> ===DONE=== --EXPECTF-- -Warning: gzfile(0): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(): failed to open stream (0): No such file or directory in %s on line %d bool(false) -Warning: gzfile(1): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(): failed to open stream (1): No such file or directory in %s on line %d bool(false) -Warning: gzfile(12345): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(): failed to open stream (12345): No such file or directory in %s on line %d bool(false) -Warning: gzfile(-2345): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(): failed to open stream (-2345): No such file or directory in %s on line %d bool(false) ===DONE=== diff --git a/ext/zlib/tests/gzfile_variation7.phpt b/ext/zlib/tests/gzfile_variation7.phpt index 04fa2e666bf34..5451b118b5d35 100644 --- a/ext/zlib/tests/gzfile_variation7.phpt +++ b/ext/zlib/tests/gzfile_variation7.phpt @@ -29,15 +29,15 @@ foreach ( $variation_array as $var ) { ?> ===DONE=== --EXPECTF-- -Warning: gzfile(string): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(): failed to open stream (string): No such file or directory in %s on line %d bool(false) -Warning: gzfile(string): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(): failed to open stream (string): No such file or directory in %s on line %d bool(false) -Warning: gzfile(sTrInG): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(): failed to open stream (sTrInG): No such file or directory in %s on line %d bool(false) -Warning: gzfile(hello world): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(): failed to open stream (hello world): No such file or directory in %s on line %d bool(false) ===DONE=== diff --git a/ext/zlib/tests/gzopen_variation9.phpt b/ext/zlib/tests/gzopen_variation9.phpt index d948b435cac54..6f20a2bc98ace 100644 --- a/ext/zlib/tests/gzopen_variation9.phpt +++ b/ext/zlib/tests/gzopen_variation9.phpt @@ -49,7 +49,7 @@ gzopen=bool(false) mode=e -Warning: gzopen(%s/004.txt.gz): failed to open stream: %s in %s on line %d +Warning: gzopen(): failed to open stream (%s/004.txt.gz): %s in %s on line %d gzopen=bool(false) ===DONE=== diff --git a/ext/zlib/tests/readgzfile_variation4.phpt b/ext/zlib/tests/readgzfile_variation4.phpt index 32f434cba2d69..93763e5133d41 100644 --- a/ext/zlib/tests/readgzfile_variation4.phpt +++ b/ext/zlib/tests/readgzfile_variation4.phpt @@ -26,18 +26,18 @@ foreach ( $variation as $var ) { ?> ===DONE=== --EXPECTF-- -Warning: readgzfile(10.5): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(): failed to open stream (10.5): No such file or directory in %s on line %d bool(false) -Warning: readgzfile(-10.5): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(): failed to open stream (-10.5): No such file or directory in %s on line %d bool(false) -Warning: readgzfile(123456789000): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(): failed to open stream (123456789000): No such file or directory in %s on line %d bool(false) -Warning: readgzfile(-123456789000): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(): failed to open stream (-123456789000): No such file or directory in %s on line %d bool(false) -Warning: readgzfile(0.5): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(): failed to open stream (0.5): No such file or directory in %s on line %d bool(false) ===DONE=== diff --git a/ext/zlib/tests/readgzfile_variation5.phpt b/ext/zlib/tests/readgzfile_variation5.phpt index 2aa83fde3b377..2510d9ea6afa7 100644 --- a/ext/zlib/tests/readgzfile_variation5.phpt +++ b/ext/zlib/tests/readgzfile_variation5.phpt @@ -25,15 +25,15 @@ foreach ( $variation as $var ) { ?> ===DONE=== --EXPECTF-- -Warning: readgzfile(0): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(): failed to open stream (0): No such file or directory in %s on line %d bool(false) -Warning: readgzfile(1): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(): failed to open stream (1): No such file or directory in %s on line %d bool(false) -Warning: readgzfile(12345): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(): failed to open stream (12345): No such file or directory in %s on line %d bool(false) -Warning: readgzfile(-2345): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(): failed to open stream (-2345): No such file or directory in %s on line %d bool(false) ===DONE=== diff --git a/ext/zlib/tests/readgzfile_variation7.phpt b/ext/zlib/tests/readgzfile_variation7.phpt index f4abdac9b5450..19a440188ef18 100644 --- a/ext/zlib/tests/readgzfile_variation7.phpt +++ b/ext/zlib/tests/readgzfile_variation7.phpt @@ -29,15 +29,15 @@ foreach ( $variation_array as $var ) { ?> ===DONE=== --EXPECTF-- -Warning: readgzfile(string): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(): failed to open stream (string): No such file or directory in %s on line %d bool(false) -Warning: readgzfile(string): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(): failed to open stream (string): No such file or directory in %s on line %d bool(false) -Warning: readgzfile(sTrInG): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(): failed to open stream (sTrInG): No such file or directory in %s on line %d bool(false) -Warning: readgzfile(hello world): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(): failed to open stream (hello world): No such file or directory in %s on line %d bool(false) ===DONE=== diff --git a/ext/zlib/tests/zlib_scheme_dir_basic.phpt b/ext/zlib/tests/zlib_scheme_dir_basic.phpt index 768cdb23a12a6..c61893796d927 100644 --- a/ext/zlib/tests/zlib_scheme_dir_basic.phpt +++ b/ext/zlib/tests/zlib_scheme_dir_basic.phpt @@ -20,7 +20,7 @@ var_dump(rmdir($srcFile)); bool(false) bool(false) -Warning: opendir(compress.zlib://%s/dir.gz): failed to open dir: not implemented in %s on line %d +Warning: opendir(): failed to open dir (compress.zlib://%s/dir.gz): not implemented in %s on line %d bool(false) bool(false) ===DONE=== diff --git a/main/main.c b/main/main.c index 48e0e1a7f761d..5a92c705ba67a 100644 --- a/main/main.c +++ b/main/main.c @@ -962,7 +962,7 @@ PHPAPI size_t php_printf(const char *format, ...) /* }}} */ /* {{{ php_verror */ -/* php_verror is called from php_error_docref functions. +/* php_verror is called from the php_error_docref function. * Its purpose is to unify error messages and automatically generate clickable * html error messages if correcponding ini setting (html_errors) is activated. * See: CODING_STANDARDS.md for details. @@ -1175,37 +1175,8 @@ PHPAPI ZEND_COLD void php_error_docref(const char *docref, int type, const char } /* }}} */ -/* {{{ php_error_docref1 */ -/* See: CODING_STANDARDS.md for details. */ -PHPAPI ZEND_COLD void php_error_docref1(const char *docref, const char *param1, int type, const char *format, ...) -{ - va_list args; - - va_start(args, format); - php_verror(docref, param1, type, format, args); - va_end(args); -} -/* }}} */ - -/* {{{ php_error_docref2 */ -/* See: CODING_STANDARDS.md for details. */ -PHPAPI ZEND_COLD void php_error_docref2(const char *docref, const char *param1, const char *param2, int type, const char *format, ...) -{ - char *params; - va_list args; - - spprintf(¶ms, 0, "%s,%s", param1, param2); - va_start(args, format); - php_verror(docref, params ? params : "...", type, format, args); - va_end(args); - if (params) { - efree(params); - } -} -/* }}} */ - #ifdef PHP_WIN32 -PHPAPI ZEND_COLD void php_win32_docref2_from_error(DWORD error, const char *param1, const char *param2) { +PHPAPI ZEND_COLD void php_win32_docref_from_error_with_param(DWORD error, const char *param) { char *buf = php_win32_error_to_msg(error); size_t buf_len; @@ -1214,7 +1185,7 @@ PHPAPI ZEND_COLD void php_win32_docref2_from_error(DWORD error, const char *para buf[buf_len - 1] = '\0'; buf[buf_len - 2] = '\0'; } - php_error_docref2(NULL, param1, param2, E_WARNING, "%s (code: %lu)", buf, error); + php_error_docref(NULL, E_WARNING, "%s (%s) (code: %lu)", buf, param, error); php_win32_error_msg_free(buf); } #endif diff --git a/main/php.h b/main/php.h index f8b1a3ca8e4a6..3dcedbd11b778 100644 --- a/main/php.h +++ b/main/php.h @@ -341,12 +341,8 @@ PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int typ /* PHPAPI void php_error(int type, const char *format, ...); */ PHPAPI ZEND_COLD void php_error_docref(const char *docref, int type, const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 3, 4); -PHPAPI ZEND_COLD void php_error_docref1(const char *docref, const char *param1, int type, const char *format, ...) - PHP_ATTRIBUTE_FORMAT(printf, 4, 5); -PHPAPI ZEND_COLD void php_error_docref2(const char *docref, const char *param1, const char *param2, int type, const char *format, ...) - PHP_ATTRIBUTE_FORMAT(printf, 5, 6); #ifdef PHP_WIN32 -PHPAPI ZEND_COLD void php_win32_docref2_from_error(DWORD error, const char *param1, const char *param2); +PHPAPI ZEND_COLD void php_win32_docref_from_error_with_param(DWORD error, const char *param); #endif END_EXTERN_C() diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 1bfb2129dc4d8..b67f684fdcff8 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -982,7 +982,7 @@ static php_stream *php_plain_files_dir_opener(php_stream_wrapper *wrapper, const #ifdef PHP_WIN32 if (!dir) { - php_win32_docref2_from_error(GetLastError(), path, path); + php_win32_docref_from_error_with_param(GetLastError(), path); } if (dir && dir->finished) { @@ -1148,7 +1148,12 @@ static int php_plain_files_unlink(php_stream_wrapper *wrapper, const char *url, ret = VCWD_UNLINK(url); if (ret == -1) { if (options & REPORT_ERRORS) { - php_error_docref1(NULL, url, E_WARNING, "%s", strerror(errno)); + /* If error is "Is directory" show url after error message */ + if (errno == EISDIR) { + php_error_docref(NULL, E_WARNING, "(%s) %s", url, strerror(errno)); + } else { + php_error_docref(NULL, E_WARNING, "%s (%s)", strerror(errno), url); + } } return 0; } @@ -1169,11 +1174,13 @@ static int php_plain_files_rename(php_stream_wrapper *wrapper, const char *url_f #ifdef PHP_WIN32 if (!php_win32_check_trailing_space(url_from, strlen(url_from))) { - php_win32_docref2_from_error(ERROR_INVALID_NAME, url_from, url_to); + php_error_docref(NULL, E_WARNING, + "The filename, directory name, or volume label syntax is incorrect. (%s) (code: 123)", url_from); return 0; } if (!php_win32_check_trailing_space(url_to, strlen(url_to))) { - php_win32_docref2_from_error(ERROR_INVALID_NAME, url_from, url_to); + php_error_docref(NULL, E_WARNING, + "The filename, directory name, or volume label syntax is incorrect. (%s) (code: 123)", url_to); return 0; } #endif @@ -1214,7 +1221,7 @@ static int php_plain_files_rename(php_stream_wrapper *wrapper, const char *url_f * access to the file in the meantime. */ if (VCWD_CHOWN(url_to, sb.st_uid, sb.st_gid)) { - php_error_docref2(NULL, url_from, url_to, E_WARNING, "%s", strerror(errno)); + php_error_docref(NULL, E_WARNING, "%s from %s to %s", strerror(errno), url_from, url_to); if (errno != EPERM) { success = 0; } @@ -1222,7 +1229,7 @@ static int php_plain_files_rename(php_stream_wrapper *wrapper, const char *url_f if (success) { if (VCWD_CHMOD(url_to, sb.st_mode)) { - php_error_docref2(NULL, url_from, url_to, E_WARNING, "%s", strerror(errno)); + php_error_docref(NULL, E_WARNING, "%s from %s to %s", strerror(errno), url_from, url_to); if (errno != EPERM) { success = 0; } @@ -1233,10 +1240,10 @@ static int php_plain_files_rename(php_stream_wrapper *wrapper, const char *url_f VCWD_UNLINK(url_from); } } else { - php_error_docref2(NULL, url_from, url_to, E_WARNING, "%s", strerror(errno)); + php_error_docref(NULL, E_WARNING, "%s from %s to %s", strerror(errno), url_from, url_to); } } else { - php_error_docref2(NULL, url_from, url_to, E_WARNING, "%s", strerror(errno)); + php_error_docref(NULL, E_WARNING, "%s from %s to %s", strerror(errno), url_from, url_to); } # if !defined(ZTS) && !defined(TSRM_WIN32) umask(oldmask); @@ -1246,11 +1253,16 @@ static int php_plain_files_rename(php_stream_wrapper *wrapper, const char *url_f # endif #endif + /* If error is "Is directory" or "Not a directory" then faulty argument is url_to */ + if (errno == EISDIR || errno == ENOTDIR) { + php_error_docref(NULL, E_WARNING, "(%s) %s", url_to, strerror(errno)); + } else { #ifdef PHP_WIN32 - php_win32_docref2_from_error(GetLastError(), url_from, url_to); + php_win32_docref_from_error_with_param(GetLastError(), url_from); #else - php_error_docref2(NULL, url_from, url_to, E_WARNING, "%s", strerror(errno)); + php_error_docref(NULL, E_WARNING, "%s (%s)", strerror(errno), url_from); #endif + } return 0; } @@ -1357,13 +1369,13 @@ static int php_plain_files_rmdir(php_stream_wrapper *wrapper, const char *url, i #ifdef PHP_WIN32 if (!php_win32_check_trailing_space(url, strlen(url))) { - php_error_docref1(NULL, url, E_WARNING, "%s", strerror(ENOENT)); + php_error_docref(NULL, E_WARNING, "%s (%s)", strerror(errno), url); return 0; } #endif if (VCWD_RMDIR(url) < 0) { - php_error_docref1(NULL, url, E_WARNING, "%s", strerror(errno)); + php_error_docref(NULL, E_WARNING, "%s (%s)", strerror(errno), url); return 0; } @@ -1385,7 +1397,8 @@ static int php_plain_files_metadata(php_stream_wrapper *wrapper, const char *url #ifdef PHP_WIN32 if (!php_win32_check_trailing_space(url, strlen(url))) { - php_error_docref1(NULL, url, E_WARNING, "%s", strerror(ENOENT)); + /* Seems no tests is covering this section */ + php_error_docref(NULL, E_WARNING, "%s with URI (%s)", strerror(ENOENT), url); return 0; } #endif @@ -1404,7 +1417,7 @@ static int php_plain_files_metadata(php_stream_wrapper *wrapper, const char *url if (VCWD_ACCESS(url, F_OK) != 0) { FILE *file = VCWD_FOPEN(url, "w"); if (file == NULL) { - php_error_docref1(NULL, url, E_WARNING, "Unable to create file %s because %s", url, strerror(errno)); + php_error_docref(NULL, E_WARNING, "Unable to create file %s because %s", url, strerror(errno)); return 0; } fclose(file); @@ -1417,7 +1430,7 @@ static int php_plain_files_metadata(php_stream_wrapper *wrapper, const char *url case PHP_STREAM_META_OWNER: if(option == PHP_STREAM_META_OWNER_NAME) { if(php_get_uid_by_name((char *)value, &uid) != SUCCESS) { - php_error_docref1(NULL, url, E_WARNING, "Unable to find uid for %s", (char *)value); + php_error_docref(NULL, E_WARNING, "Unable to find uid for %s at %s", (char *)value, url); return 0; } } else { @@ -1429,7 +1442,7 @@ static int php_plain_files_metadata(php_stream_wrapper *wrapper, const char *url case PHP_STREAM_META_GROUP_NAME: if(option == PHP_STREAM_META_GROUP_NAME) { if(php_get_gid_by_name((char *)value, &gid) != SUCCESS) { - php_error_docref1(NULL, url, E_WARNING, "Unable to find gid for %s", (char *)value); + php_error_docref(NULL, E_WARNING, "Unable to find gid for %s at %s", (char *)value, url); return 0; } } else { @@ -1443,11 +1456,11 @@ static int php_plain_files_metadata(php_stream_wrapper *wrapper, const char *url ret = VCWD_CHMOD(url, mode); break; default: - php_error_docref1(NULL, url, E_WARNING, "Unknown option %d for stream_metadata", option); + php_error_docref(NULL, E_WARNING, "Unknown option %d for stream_metadata at URI %s", option, url); return 0; } if (ret == -1) { - php_error_docref1(NULL, url, E_WARNING, "Operation failed: %s", strerror(errno)); + php_error_docref(NULL, E_WARNING, "(%s) Operation failed: %s", url, strerror(errno)); return 0; } php_clear_stat_cache(0, NULL, 0); diff --git a/main/streams/streams.c b/main/streams/streams.c index 5f467c12cefbb..559b130993bb1 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -207,7 +207,7 @@ void php_stream_display_wrapper_errors(php_stream_wrapper *wrapper, const char * } php_strip_url_passwd(tmp); - php_error_docref1(NULL, tmp, E_WARNING, "%s: %s", caption, msg); + php_error_docref(NULL, E_WARNING, "%s (%s): %s", caption, tmp, msg); efree(tmp); if (free_msg) { efree(msg); @@ -2097,8 +2097,7 @@ PHPAPI php_stream *_php_stream_open_wrapper_ex(const char *path, const char *mod if (options & REPORT_ERRORS) { char *tmp = estrdup(path); php_strip_url_passwd(tmp); - php_error_docref1(NULL, tmp, E_WARNING, "could not make seekable - %s", - tmp); + php_error_docref(NULL, E_WARNING, "Error with argument tmp: could not make seekable - %s", tmp); efree(tmp); options ^= REPORT_ERRORS; diff --git a/sapi/cli/tests/bug69655.phpt b/sapi/cli/tests/bug69655.phpt index 73791c95d589d..708e5454c380e 100644 --- a/sapi/cli/tests/bug69655.phpt +++ b/sapi/cli/tests/bug69655.phpt @@ -17,11 +17,11 @@ foreach (['MKCO', 'MKCOLL', 'M'] as $method) { } ?> --EXPECTF-- -Warning: file_get_contents(http://localhost:8964): failed to open stream: HTTP request failed! HTTP/1.0 501 Not Implemented +Warning: file_get_contents(): failed to open stream (http://localhost:8964): HTTP request failed! HTTP/1.0 501 Not Implemented in %s on line %d -Warning: file_get_contents(http://localhost:8964): failed to open stream: HTTP request failed! HTTP/1.0 501 Not Implemented +Warning: file_get_contents(): failed to open stream (http://localhost:8964): HTTP request failed! HTTP/1.0 501 Not Implemented in %s on line %d -Warning: file_get_contents(http://localhost:8964): failed to open stream: HTTP request failed! HTTP/1.0 501 Not Implemented +Warning: file_get_contents(): failed to open stream (http://localhost:8964): HTTP request failed! HTTP/1.0 501 Not Implemented in %s on line %d diff --git a/sapi/cli/tests/bug70264.phpt b/sapi/cli/tests/bug70264.phpt index 877b1194f2648..ae993a58b2bb6 100644 --- a/sapi/cli/tests/bug70264.phpt +++ b/sapi/cli/tests/bug70264.phpt @@ -14,8 +14,8 @@ echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS . "/..\\CREDITS"); echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS . "/..%5CCREDITS"); ?> --EXPECTF-- -Warning: file_get_contents(http://%s/..\CREDITS): failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found +Warning: file_get_contents(): failed to open stream (http://%s/..\CREDITS): HTTP request failed! HTTP/1.0 404 Not Found in %sbug70264.php on line %d -Warning: file_get_contents(http://%s/..%5CCREDITS): failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found +Warning: file_get_contents(): failed to open stream (http://%s/..%5CCREDITS): HTTP request failed! HTTP/1.0 404 Not Found in %sbug70264.php on line %d diff --git a/tests/lang/bug35176.phpt b/tests/lang/bug35176.phpt index 2928f7ec455b8..124b35ff56af7 100644 --- a/tests/lang/bug35176.phpt +++ b/tests/lang/bug35176.phpt @@ -10,6 +10,6 @@ require_once('nonexisiting.php'); ?> --EXPECTF--
-Warning: require_once(nonexisiting.php) [function.require-once.html]: failed to open stream: No such file or directory in %sbug35176.php on line 2
+Warning: require_once() [function.require-once.html]: failed to open stream (nonexisiting.php): No such file or directory in %sbug35176.php on line 2

Fatal error: require_once() [function.require.html]: Failed opening required 'nonexisiting.php' (%s) in %sbug35176.php on line 2
diff --git a/tests/lang/bug43958.phpt b/tests/lang/bug43958.phpt index c1fca9d633a88..f15ab59731b5e 100644 --- a/tests/lang/bug43958.phpt +++ b/tests/lang/bug43958.phpt @@ -11,6 +11,6 @@ class MyClass MyClass::loadCode('file-which-does-not-exist-on-purpose.php'); --EXPECTF-- -Warning: include(file-which-does-not-exist-on-purpose.php): failed to open stream: No such file or directory in %sbug43958.php on line 5 +Warning: include(): failed to open stream (file-which-does-not-exist-on-purpose.php): No such file or directory in %sbug43958.php on line 5 Warning: include(): Failed opening 'file-which-does-not-exist-on-purpose.php' for inclusion (include_path='%s') in %sbug43958.php on line 5 diff --git a/tests/output/bug75236.phpt b/tests/output/bug75236.phpt index f6c7a51aa365a..a8c35049877ba 100644 --- a/tests/output/bug75236.phpt +++ b/tests/output/bug75236.phpt @@ -14,5 +14,5 @@ Bug #75236: infinite loop when printing an error-message --EXPECTF-- before getfilecontent
-Warning: file_get_contents(no/suchfile): failed to open stream: No such file or directory in %s on line 7
+Warning: file_get_contents(): failed to open stream (no/suchfile): No such file or directory in %s on line 7
after getfilecontent diff --git a/tests/security/open_basedir_copy.phpt b/tests/security/open_basedir_copy.phpt index 989570d64003e..9ad626cfa6b19 100644 --- a/tests/security/open_basedir_copy.phpt +++ b/tests/security/open_basedir_copy.phpt @@ -35,42 +35,42 @@ bool(true) Warning: copy(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d -Warning: copy(../bad): failed to open stream: %s in %s on line %d +Warning: copy(): failed to open stream (../bad): %s in %s on line %d bool(false) Warning: copy(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: copy(../bad/bad.txt): failed to open stream: %s in %s on line %d +Warning: copy(): failed to open stream (../bad/bad.txt): %s in %s on line %d bool(false) Warning: copy(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d -Warning: copy(..): failed to open stream: %s in %s on line %d +Warning: copy(): failed to open stream (..): %s in %s on line %d bool(false) Warning: copy(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d -Warning: copy(../): failed to open stream: %s in %s on line %d +Warning: copy(): failed to open stream (../): %s in %s on line %d bool(false) Warning: copy(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d -Warning: copy(/): failed to open stream: %s in %s on line %d +Warning: copy(): failed to open stream (/): %s in %s on line %d bool(false) Warning: copy(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d -Warning: copy(../bad/.): failed to open stream: %s in %s on line %d +Warning: copy(): failed to open stream (../bad/.): %s in %s on line %d bool(false) Warning: copy(): open_basedir restriction in effect. File(../bad/./bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: copy(../bad/./bad.txt): failed to open stream: %s in %s on line %d +Warning: copy(): failed to open stream (../bad/./bad.txt): %s in %s on line %d bool(false) Warning: copy(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d -Warning: copy(./../.): failed to open stream: %s in %s on line %d +Warning: copy(): failed to open stream (./../.): %s in %s on line %d bool(false) bool(true) bool(true) diff --git a/tests/security/open_basedir_copy_variation1.phpt b/tests/security/open_basedir_copy_variation1.phpt index e388ad76d7829..9c61b870c49fe 100644 --- a/tests/security/open_basedir_copy_variation1.phpt +++ b/tests/security/open_basedir_copy_variation1.phpt @@ -28,6 +28,6 @@ bool(true) Warning: copy(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d bool(false) -Warning: unlink(copy.txt): No such file or directory in %s on line %d +Warning: unlink(): No such file or directory (copy.txt) in %s on line %d bool(false) *** Finished testing open_basedir configuration [copy] *** diff --git a/tests/security/open_basedir_dir.phpt b/tests/security/open_basedir_dir.phpt index 90f55e5a95b22..54fa45eed747b 100644 --- a/tests/security/open_basedir_dir.phpt +++ b/tests/security/open_basedir_dir.phpt @@ -30,42 +30,42 @@ bool(true) Warning: dir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d -Warning: dir(../bad): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (../bad): %s in %s on line %d bool(false) Warning: dir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: dir(../bad/bad.txt): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (../bad/bad.txt): %s in %s on line %d bool(false) Warning: dir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d -Warning: dir(..): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (..): %s in %s on line %d bool(false) Warning: dir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d -Warning: dir(../): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (../): %s in %s on line %d bool(false) Warning: dir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d -Warning: dir(/): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (/): %s in %s on line %d bool(false) Warning: dir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d -Warning: dir(../bad/.): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (../bad/.): %s in %s on line %d bool(false) Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: dir(%s/test/bad/bad.txt): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (%s/test/bad/bad.txt): %s in %s on line %d bool(false) Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: dir(%s/test/bad/../bad/bad.txt): failed to open dir: %s in %s on line %d +Warning: dir(): failed to open dir (%s/test/bad/../bad/bad.txt): %s in %s on line %d bool(false) object(Directory)#%d (2) { ["path"]=> diff --git a/tests/security/open_basedir_error_log_variation.phpt b/tests/security/open_basedir_error_log_variation.phpt index e3cb15d258a76..63ba545489c6a 100644 --- a/tests/security/open_basedir_error_log_variation.phpt +++ b/tests/security/open_basedir_error_log_variation.phpt @@ -32,17 +32,17 @@ bool(true) Warning: error_log(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: error_log(%s/test/bad/bad.txt): failed to open stream: %s in %s on line %d +Warning: error_log(): failed to open stream (%s/test/bad/bad.txt): %s in %s on line %d bool(false) Warning: error_log(): open_basedir restriction in effect. File(%s/test/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: error_log(%s/test/bad.txt): failed to open stream: %s in %s on line %d +Warning: error_log(): failed to open stream (%s/test/bad.txt): %s in %s on line %d bool(false) Warning: error_log(): open_basedir restriction in effect. File(%s/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: error_log(%s/bad.txt): failed to open stream: %s in %s on line %d +Warning: error_log(): failed to open stream (%s/bad.txt): %s in %s on line %d bool(false) bool(true) *** Finished testing open_basedir configuration [error_log] *** diff --git a/tests/security/open_basedir_file.phpt b/tests/security/open_basedir_file.phpt index 3382ae865d893..0a27b3567d409 100644 --- a/tests/security/open_basedir_file.phpt +++ b/tests/security/open_basedir_file.phpt @@ -31,42 +31,42 @@ bool(true) Warning: file(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d -Warning: file(../bad): failed to open stream: %s in %s on line %d +Warning: file(): failed to open stream (../bad): %s in %s on line %d bool(false) Warning: file(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: file(../bad/bad.txt): failed to open stream: %s in %s on line %d +Warning: file(): failed to open stream (../bad/bad.txt): %s in %s on line %d bool(false) Warning: file(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d -Warning: file(..): failed to open stream: %s in %s on line %d +Warning: file(): failed to open stream (..): %s in %s on line %d bool(false) Warning: file(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d -Warning: file(../): failed to open stream: %s in %s on line %d +Warning: file(): failed to open stream (../): %s in %s on line %d bool(false) Warning: file(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d -Warning: file(/): failed to open stream: %s in %s on line %d +Warning: file(): failed to open stream (/): %s in %s on line %d bool(false) Warning: file(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d -Warning: file(../bad/.): failed to open stream: %s in %s on line %d +Warning: file(): failed to open stream (../bad/.): %s in %s on line %d bool(false) Warning: file(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: file(%s/test/bad/bad.txt): failed to open stream: %s in %s on line %d +Warning: file(): failed to open stream (%s/test/bad/bad.txt): %s in %s on line %d bool(false) Warning: file(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: file(%s/test/bad/../bad/bad.txt): failed to open stream: %s in %s on line %d +Warning: file(): failed to open stream (%s/test/bad/../bad/bad.txt): %s in %s on line %d bool(false) array(1) { [0]=> diff --git a/tests/security/open_basedir_file_get_contents.phpt b/tests/security/open_basedir_file_get_contents.phpt index b5a34de0749d9..d1df9a9b16ccd 100644 --- a/tests/security/open_basedir_file_get_contents.phpt +++ b/tests/security/open_basedir_file_get_contents.phpt @@ -31,42 +31,42 @@ bool(true) Warning: file_get_contents(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d -Warning: file_get_contents(../bad): failed to open stream: %s in %s on line %d +Warning: file_get_contents(): failed to open stream (../bad): %s in %s on line %d bool(false) Warning: file_get_contents(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: file_get_contents(../bad/bad.txt): failed to open stream: %s in %s on line %d +Warning: file_get_contents(): failed to open stream (../bad/bad.txt): %s in %s on line %d bool(false) Warning: file_get_contents(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d -Warning: file_get_contents(..): failed to open stream: %s in %s on line %d +Warning: file_get_contents(): failed to open stream (..): %s in %s on line %d bool(false) Warning: file_get_contents(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d -Warning: file_get_contents(../): failed to open stream: %s in %s on line %d +Warning: file_get_contents(): failed to open stream (../): %s in %s on line %d bool(false) Warning: file_get_contents(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d -Warning: file_get_contents(/): failed to open stream: %s in %s on line %d +Warning: file_get_contents(): failed to open stream (/): %s in %s on line %d bool(false) Warning: file_get_contents(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d -Warning: file_get_contents(../bad/.): failed to open stream: %s in %s on line %d +Warning: file_get_contents(): failed to open stream (../bad/.): %s in %s on line %d bool(false) Warning: file_get_contents(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: file_get_contents(%s/test/bad/bad.txt): failed to open stream: %s in %s on line %d +Warning: file_get_contents(): failed to open stream (%s/test/bad/bad.txt): %s in %s on line %d bool(false) Warning: file_get_contents(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: file_get_contents(%s/test/bad/../bad/bad.txt): failed to open stream: %s in %s on line %d +Warning: file_get_contents(): failed to open stream (%s/test/bad/../bad/bad.txt): %s in %s on line %d bool(false) string(12) "Hello World!" string(12) "Hello World!" diff --git a/tests/security/open_basedir_file_put_contents.phpt b/tests/security/open_basedir_file_put_contents.phpt index 9f1f3bf13be5f..24d40b81b9fae 100644 --- a/tests/security/open_basedir_file_put_contents.phpt +++ b/tests/security/open_basedir_file_put_contents.phpt @@ -31,26 +31,26 @@ bool(true) Warning: file_put_contents(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: file_put_contents(../bad/bad.txt): failed to open stream: %s in %s on line %d +Warning: file_put_contents(): failed to open stream (../bad/bad.txt): %s in %s on line %d bool(false) Warning: file_put_contents(): open_basedir restriction in effect. File(.././bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: file_put_contents(.././bad/bad.txt): failed to open stream: %s in %s on line %d +Warning: file_put_contents(): failed to open stream (.././bad/bad.txt): %s in %s on line %d bool(false) Warning: file_put_contents(): open_basedir restriction in effect. File(../bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: file_put_contents(../bad/../bad/bad.txt): failed to open stream: %s in %s on line %d +Warning: file_put_contents(): failed to open stream (../bad/../bad/bad.txt): %s in %s on line %d bool(false) Warning: file_put_contents(): open_basedir restriction in effect. File(./.././bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: file_put_contents(./.././bad/bad.txt): failed to open stream: %s in %s on line %d +Warning: file_put_contents(): failed to open stream (./.././bad/bad.txt): %s in %s on line %d bool(false) Warning: file_put_contents(): open_basedir restriction in effect. File%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: file_put_contents%s/test/bad/bad.txt): failed to open stream: %s in %s on line %d +Warning: file_put_contents(): failed to open stream (%s/test/bad/bad.txt): %s in %s on line %d bool(false) *** Finished testing open_basedir configuration [file_put_contents] *** diff --git a/tests/security/open_basedir_fopen.phpt b/tests/security/open_basedir_fopen.phpt index e0fee66f0cb33..3a2b0a06807e4 100644 --- a/tests/security/open_basedir_fopen.phpt +++ b/tests/security/open_basedir_fopen.phpt @@ -40,42 +40,42 @@ bool(true) Warning: fopen(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d -Warning: fopen(../bad): failed to open stream: %s in %s on line %d +Warning: fopen(): failed to open stream (../bad): %s in %s on line %d bool(false) Warning: fopen(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: fopen(../bad/bad.txt): failed to open stream: %s in %s on line %d +Warning: fopen(): failed to open stream (../bad/bad.txt): %s in %s on line %d bool(false) Warning: fopen(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d -Warning: fopen(..): failed to open stream: %s in %s on line %d +Warning: fopen(): failed to open stream (..): %s in %s on line %d bool(false) Warning: fopen(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d -Warning: fopen(../): failed to open stream: %s in %s on line %d +Warning: fopen(): failed to open stream (../): %s in %s on line %d bool(false) Warning: fopen(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d -Warning: fopen(/): failed to open stream: %s in %s on line %d +Warning: fopen(): failed to open stream (/): %s in %s on line %d bool(false) Warning: fopen(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d -Warning: fopen(../bad/.): failed to open stream: %s in %s on line %d +Warning: fopen(): failed to open stream (../bad/.): %s in %s on line %d bool(false) Warning: fopen(): open_basedir restriction in effect. File(../bad/./bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: fopen(../bad/./bad.txt): failed to open stream: %s in %s on line 12 +Warning: fopen(): failed to open stream (../bad/./bad.txt): %s in %s on line 12 bool(false) Warning: fopen(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d -Warning: fopen(./../.): failed to open stream: %s in %s on line %d +Warning: fopen(): failed to open stream (./../.): %s in %s on line %d bool(false) resource(%d) of type (stream) resource(%d) of type (stream) diff --git a/tests/security/open_basedir_opendir.phpt b/tests/security/open_basedir_opendir.phpt index 6b88e13080ced..414f65ce73456 100644 --- a/tests/security/open_basedir_opendir.phpt +++ b/tests/security/open_basedir_opendir.phpt @@ -29,42 +29,42 @@ bool(true) Warning: opendir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d -Warning: opendir(../bad): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (../bad): %s in %s on line %d bool(false) Warning: opendir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: opendir(../bad/bad.txt): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (../bad/bad.txt): %s in %s on line %d bool(false) Warning: opendir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d -Warning: opendir(..): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (..): %s in %s on line %d bool(false) Warning: opendir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d -Warning: opendir(../): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (../): %s in %s on line %d bool(false) Warning: opendir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d -Warning: opendir(/): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (/): %s in %s on line %d bool(false) Warning: opendir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d -Warning: opendir(../bad/.): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (../bad/.): %s in %s on line %d bool(false) Warning: opendir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: opendir(%s/test/bad/bad.txt): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (%s/test/bad/bad.txt): %s in %s on line %d bool(false) Warning: opendir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: opendir(%s/test/bad/../bad/bad.txt): failed to open dir: %s in %s on line %d +Warning: opendir(): failed to open dir (%s/test/bad/../bad/bad.txt): %s in %s on line %d bool(false) resource(%d) of type (stream) resource(%d) of type (stream) diff --git a/tests/security/open_basedir_parse_ini_file.phpt b/tests/security/open_basedir_parse_ini_file.phpt index 11db63fa50d3b..07e65a0e0b9dd 100644 --- a/tests/security/open_basedir_parse_ini_file.phpt +++ b/tests/security/open_basedir_parse_ini_file.phpt @@ -39,36 +39,36 @@ bool(true) Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest\bad) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 6 -Warning: parse_ini_file(%stest\bad): failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 6 +Warning: parse_ini_file(): failed to open stream (%stest\bad): Operation not permitted in %sopen_basedir_parse_ini_file.php on line 6 bool(false) Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest\bad\bad.txt) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 7 -Warning: parse_ini_file(%stest\bad\bad.txt): failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 7 +Warning: parse_ini_file(): failed to open stream (%stest\bad\bad.txt): Operation not permitted in %sopen_basedir_parse_ini_file.php on line 7 bool(false) Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 8 -Warning: parse_ini_file(%stest): failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 8 +Warning: parse_ini_file(): failed to open stream (%stest): Operation not permitted in %sopen_basedir_parse_ini_file.php on line 8 bool(false) Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 9 -Warning: parse_ini_file(%stest): failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 9 +Warning: parse_ini_file(): failed to open stream (%stest): Operation not permitted in %sopen_basedir_parse_ini_file.php on line 9 bool(false) Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest\bad) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 10 -Warning: parse_ini_file(%stest\bad): failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 10 +Warning: parse_ini_file(): failed to open stream (%stest\bad): Operation not permitted in %sopen_basedir_parse_ini_file.php on line 10 bool(false) Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest\bad\bad.txt) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 11 -Warning: parse_ini_file(%stest\bad\bad.txt): failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 11 +Warning: parse_ini_file(): failed to open stream (%stest\bad\bad.txt): Operation not permitted in %sopen_basedir_parse_ini_file.php on line 11 bool(false) Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 12 -Warning: parse_ini_file(%stest): failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 12 +Warning: parse_ini_file(): failed to open stream (%stest): Operation not permitted in %sopen_basedir_parse_ini_file.php on line 12 bool(false) *** Finished testing open_basedir configuration [parse_ini_file] *** diff --git a/tests/security/open_basedir_scandir.phpt b/tests/security/open_basedir_scandir.phpt index 46ea7906108d8..7d551fc9563a4 100644 --- a/tests/security/open_basedir_scandir.phpt +++ b/tests/security/open_basedir_scandir.phpt @@ -29,56 +29,56 @@ bool(true) Warning: scandir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d -Warning: scandir(../bad): failed to open dir: %s in %s on line %d +Warning: scandir(): failed to open dir (../bad): %s in %s on line %d Warning: scandir(): (errno 1): %s in %s on line %d bool(false) Warning: scandir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: scandir(../bad/bad.txt): failed to open dir: %s in %s on line %d +Warning: scandir(): failed to open dir (../bad/bad.txt): %s in %s on line %d Warning: scandir(): (errno 1): %s in %s on line %d bool(false) Warning: scandir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d -Warning: scandir(..): failed to open dir: %s in %s on line %d +Warning: scandir(): failed to open dir (..): %s in %s on line %d Warning: scandir(): (errno 1): %s in %s on line %d bool(false) Warning: scandir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d -Warning: scandir(../): failed to open dir: %s in %s on line %d +Warning: scandir(): failed to open dir (../): %s in %s on line %d Warning: scandir(): (errno 1): %s in %s on line %d bool(false) Warning: scandir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d -Warning: scandir(/): failed to open dir: %s in %s on line %d +Warning: scandir(): failed to open dir (/): %s in %s on line %d Warning: scandir(): (errno 1): %s in %s on line %d bool(false) Warning: scandir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d -Warning: scandir(../bad/.): failed to open dir: %s in %s on line %d +Warning: scandir(): failed to open dir (../bad/.): %s in %s on line %d Warning: scandir(): (errno 1): %s in %s on line %d bool(false) Warning: scandir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: scandir(%s/test/bad/bad.txt): failed to open dir: %s in %s on line %d +Warning: scandir(): failed to open dir (%s/test/bad/bad.txt): %s in %s on line %d Warning: scandir(): (errno 1): %s in %s on line %d bool(false) Warning: scandir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -Warning: scandir(%s/test/bad/../bad/bad.txt): failed to open dir: %s in %s on line %d +Warning: scandir(): failed to open dir (%s/test/bad/../bad/bad.txt): %s in %s on line %d Warning: scandir(): (errno 1): %s in %s on line %d bool(false)