Skip to content

Commit 8866698

Browse files
GirgiasGirgias
committed
Change warning messages in test and improve one error message
1 parent 10e0ff6 commit 8866698

12 files changed

+36
-36
lines changed

‎ext/dba/tests/bug72157.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ $var5 = dba_open(null,$var0);
1313
$var5 = dba_open($var0,$var0);
1414
?>
1515
--EXPECTF--
16-
Warning: dba_open(,Resource id #5): Illegal DBA mode in %sbug72157.php on line %d
16+
Warning: dba_open(): Illegal DBA mode Resource id #5 for path in %sbug72157.php on line %d
1717

18-
Warning: dba_open(,Resource id #5): Illegal DBA mode in %sbug72157.php on line %d
18+
Warning: dba_open(): Illegal DBA mode Resource id #5 for path in %sbug72157.php on line %d
1919

20-
Warning: dba_open(,Resource id #5): Illegal DBA mode in %sbug72157.php on line %d
20+
Warning: dba_open(): Illegal DBA mode Resource id #5 for path in %sbug72157.php on line %d
2121

22-
Warning: dba_open(Resource id #5,Resource id #5): Illegal DBA mode in %sbug72157.php on line %d
22+
Warning: dba_open(): Illegal DBA mode Resource id #5 for path Resource id #5 in %sbug72157.php on line %d

‎ext/dba/tests/dba011.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ Warning: Wrong parameter count for dba_open() in %sdba011.php on line %d
2727
NULL
2828
resource(%d) of type (dba)
2929

30-
Warning: dba_open(%stest0.dbm,n): No such handler: bogus in %sdba011.php on line %d
30+
Warning: dba_open(): No such handler: bogus for path %stest0.dbm with mode n in %sdba011.php on line %d
3131
bool(false)
3232

33-
Warning: dba_open(%stest0.dbm,q): Illegal DBA mode in %sdba011.php on line %d
33+
Warning: dba_open(): Illegal DBA mode q for path %stest0.dbm in %sdba011.php on line %d
3434
bool(false)
3535

36-
Warning: dba_open(%stest0.dbm,nq): Illegal DBA mode in %sdba011.php on line %d
36+
Warning: dba_open(): Illegal DBA mode nq for path %stest0.dbm in %sdba011.php on line %d
3737
bool(false)
3838
resource(%d) of type (dba)

‎ext/dba/tests/dba012.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ Warning: ini_set(): No such handler: does_not_exist in %sdba012.php on line %d
3838
resource(%d) of type (dba)
3939
Test 2
4040

41-
Warning: dba_open(%stest0.dbm,n): No default handler selected in %sdba012.php on line %d
41+
Warning: dba_open(): No default handler selected for path %stest0.dbm with mode n in %sdba012.php on line %d
4242
bool(false)

‎ext/dba/tests/dba016.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ $db_file1 = dba_popen($db_filename, 'n-t', 'flatfile');
2323
--EXPECTF--
2424
database handler: flatfile
2525

26-
Warning: dba_popen(%stest0.dbm,n-t): You cannot combine modifiers - (no lock) and t (test lock) in %sdba016.php on line %d
26+
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
2727
===DONE===

‎ext/dba/tests/dba_cdb_001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ bool(true)
7777
bool(true)
7878
Test 1
7979

80-
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
80+
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
8181
Failed to open DB
8282
Test 2
8383

8484
Warning: dba_insert(): You cannot perform a modification to a database without proper access in %sdba_cdb_001.php on line %d
8585
Test 3
8686

87-
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
87+
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
8888
Failed to open DB
8989
===DONE===

‎ext/standard/tests/file/popen_pclose_error.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ NULL
4040
Warning: popen() expects exactly 2 parameters, 1 given in %s on line %d
4141
NULL
4242

43-
Warning: popen(abc.txt,rw): %s on line %d
43+
Warning: popen(): Invalid argument with command abc.txt and POSIX mode rw in %s on line %d
4444
bool(false)
4545

4646
Warning: pclose() expects exactly 1 parameter, 0 given in %s on line %d

‎ext/standard/tests/file/rename_variation.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ bool(false)
5555
bool(true)
5656
-- Iteration 2 --
5757

58-
Warning: rename(%s,%s): Not a directory in %s on line %d
58+
Warning: rename(): Not a directory (%s) in %s on line %d
5959
bool(false)
6060
bool(false)
6161
bool(false)

‎ext/standard/tests/file/rename_variation12.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ bool(true)
8989

9090
-- Iteration 5 --
9191

92-
Warning: rename(%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/renameMe.tmp,%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/IwasRenamed.tmp): %s in %s on line %d
92+
Warning: rename(): %s (%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/renameMe.tmp) in %s on line %d
9393
bool(false)
9494

9595
-- Iteration 6 --
9696

97-
Warning: rename(%s/renameVar11/renameVar11Sub/BADDIR/renameMe.tmp,%s/renameVar11/renameVar11Sub/BADDIR/IwasRenamed.tmp): %s in %s on line %d
97+
Warning: rename(): %s (%s/renameVar11/renameVar11Sub/BADDIR/renameMe.tmp) in %s on line %d
9898
bool(false)
9999

100100
-- Iteration 7 --
@@ -115,7 +115,7 @@ bool(true)
115115

116116
-- Iteration 11 --
117117

118-
Warning: rename(BADDIR/renameMe.tmp,BADDIR/IwasRenamed.tmp): %s in %s on line %d
118+
Warning: rename(): %s (BADDIR/renameMe.tmp) in %s on line %d
119119
bool(false)
120120

121121
*** Done ***

‎ext/standard/tests/file/rename_variation13.phpt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,38 +64,38 @@ echo "\n*** Done ***\n";
6464
-- testing '-1' --
6565
bool(true)
6666

67-
Warning: rename(-1,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d
67+
Warning: rename(): No such file or directory (-1) in %s on line %d
6868
bool(false)
6969
-- testing '1' --
7070
bool(true)
7171

72-
Warning: rename(1,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d
72+
Warning: rename(): No such file or directory (1) in %s on line %d
7373
bool(false)
7474
-- testing '' --
7575

76-
Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
76+
Warning: rename(): %s (%s/renameVar13/afile.tmp) in %s on line %d
7777
bool(false)
7878

79-
Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
79+
Warning: rename(): %s () in %s on line %d
8080
bool(false)
8181
-- testing '' --
8282

83-
Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
83+
Warning: rename(): %s (%s/renameVar13/afile.tmp) in %s on line %d
8484
bool(false)
8585

86-
Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
86+
Warning: rename(): %s () in %s on line %d
8787
bool(false)
8888
-- testing '' --
8989

90-
Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
90+
Warning: rename(): %s (%s/renameVar13/afile.tmp) in %s on line %d
9191
bool(false)
9292

93-
Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
93+
Warning: rename(): %s () in %s on line %d
9494
bool(false)
9595
-- testing ' ' --
9696
bool(true)
9797

98-
Warning: rename( ,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d
98+
Warning: rename(): No such file or directory ( ) in %s on line %d
9999
bool(false)
100100
-- testing '%s' --
101101

@@ -117,17 +117,17 @@ Warning: rename() expects parameter 1 to be a valid path, array given in %s on l
117117
bool(false)
118118
-- testing '/no/such/file/dir' --
119119

120-
Warning: rename(%s/renameVar13/afile.tmp,/no/such/file/dir): No such file or directory in %s on line %d
120+
Warning: rename(): No such file or directory (%s/renameVar13/afile.tmp) in %s on line %d
121121
bool(false)
122122

123-
Warning: rename(/no/such/file/dir,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d
123+
Warning: rename(): No such file or directory (/no/such/file/dir) in %s on line %d
124124
bool(false)
125125
-- testing 'php/php' --
126126

127-
Warning: rename(%s/renameVar13/afile.tmp,php/php): %s directory in %s on line %d
127+
Warning: rename(): %s directory (%s/renameVar13/afile.tmp) in %s on line %d
128128
bool(false)
129129

130-
Warning: rename(php/php,%s/renameVar13/afile.tmp): %s directory in %s on line %d
130+
Warning: rename(): %s directory (php/php) in %s on line %d
131131
bool(false)
132132

133133
*** Done ***

‎ext/standard/tests/file/rename_variation5.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,27 +70,27 @@ bool(true)
7070

7171
-- Renaming existing link to existing directory name --
7272

73-
Warning: rename(%s,%s): Is a directory in %s on line %d
73+
Warning: rename(): Is a directory (%s) in %s on line %d
7474
bool(false)
7575

7676
-- Renaming existing link to existing file name --
7777
bool(true)
7878

7979
-- Renaming existing file to existing directory name --
8080

81-
Warning: rename(%s,%s): Is a directory in %s on line %d
81+
Warning: rename(): Is a directory (%s) in %s on line %d
8282
bool(false)
8383

8484
-- Renaming existing file to existing link name --
8585
bool(true)
8686

8787
-- Renaming existing directory to existing file name --
8888

89-
Warning: rename(%s,%s): Not a directory in %s on line %d
89+
Warning: rename(): Not a directory (%s) in %s on line %d
9090
bool(false)
9191

9292
-- Renaming existing directory to existing link name --
9393

94-
Warning: rename(%s,%s): Not a directory in %s on line %d
94+
Warning: rename(): Not a directory (%s) in %s on line %d
9595
bool(false)
9696
Done

‎ext/standard/tests/file/rename_variation8.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ rmdir(__DIR__."/rename_basic_dir1");
5151
--EXPECTF--
5252
*** Testing rename() on non-existing file ***
5353

54-
Warning: rename(%s/non_existent_file.tmp,%s/rename_variation8_new.tmp): No such file or directory in %s on line %d
54+
Warning: rename(): No such file or directory (%s/non_existent_file.tmp) in %s on line %d
5555
bool(false)
5656
bool(false)
5757
bool(false)
@@ -63,7 +63,7 @@ bool(true)
6363

6464
*** Testing rename() on non-existing directory ***
6565

66-
Warning: rename(%s/non_existent_dir,%s/rename_basic_dir2): No such file or directory in %s on line %d
66+
Warning: rename(): No such file or directory (%s/non_existent_dir) in %s on line %d
6767
bool(false)
6868
bool(false)
6969
bool(false)

‎main/streams/plain_wrapper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1249,7 +1249,7 @@ static int php_plain_files_rename(php_stream_wrapper *wrapper, const char *url_f
12491249
#ifdef PHP_WIN32
12501250
php_win32_docref2_from_error(GetLastError(), url_from, url_to);
12511251
#else
1252-
php_error_docref(NULL, E_WARNING, "%s from %s to %s", strerror(errno), url_from, url_to);
1252+
php_error_docref(NULL, E_WARNING, "%s (%s)", strerror(errno), url_from);
12531253
#endif
12541254
return 0;
12551255
}

0 commit comments

Comments
 (0)