Skip to content

Commit 92b51f1

Browse files
GirgiasGirgias
committed
Refactor various php_error_docref<n> usages
Converted docref1 and 2 function usage to standard docref (previously docref0).
1 parent f573ba1 commit 92b51f1

File tree

248 files changed

+642
-651
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

248 files changed

+642
-651
lines changed

‎Zend/tests/bug30998.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $f = fopen("/tmp/blah", "r");
1515
?>
1616
===DONE===
1717
--EXPECTF--
18-
fopen(/tmp/blah): failed to open stream: %s (2) in %s:%d
18+
fopen(): failed to open stream (/tmp/blah): %s (2) in %s:%d
1919

20-
Warning: fopen(/tmp/blah): failed to open stream: %s in %s on line %d
20+
Warning: fopen(): failed to open stream (/tmp/blah): %s in %s on line %d
2121
===DONE===

‎Zend/tests/bug60909_1.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ set_error_handler(function($errno, $errstr, $errfile, $errline){
1010

1111
require 'notfound.php';
1212
--EXPECTF--
13-
error(require(notfound.php): failed to open stream: %s)
13+
error(require(): failed to open stream (notfound.php): %s)
1414
Warning: Uncaught Exception: Foo in %sbug60909_1.php:5
1515
Stack trace:
16-
#0 %sbug60909_1.php(8): {closure}(2, 'require(notfoun...', '%s', 8, Array)
16+
#0 %sbug60909_1.php(8): {closure}(2, 'require(): fail...', '%s', 8, Array)
1717
#1 %sbug60909_1.php(8): require()
1818
#2 {main}
1919
thrown in %sbug60909_1.php on line 5

‎Zend/tests/debug_backtrace_with_include_and_this.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ try {
2828
echo $e."\n";
2929
}
3030
--EXPECTF--
31-
ERR#2: include(class://non.existent.Class): failed to open stream: "CLWrapper::stream_open" call failed @ include
31+
ERR#2: include(): failed to open stream (class://non.existent.Class): "CLWrapper::stream_open" call failed @ include
3232
ERR#2: include(): Failed opening 'class://non.existent.Class' for inclusion (include_path='%s') @ include
3333

3434
Fatal error: Uncaught Exception: Failed loading class://non.existent.Class in %s

‎ext/bz2/tests/001.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ bool(false)
3737
Warning: bzopen(): 'rw' is not a valid mode for bzopen(). Only 'w' and 'r' are supported. in %s on line %d
3838
bool(false)
3939

40-
Warning: bzopen(no_such_file): failed to open stream: No such file or directory in %s on line %d
40+
Warning: bzopen(): failed to open stream (no_such_file): No such file or directory in %s on line %d
4141
bool(false)
4242
resource(%d) of type (stream)
4343
Done

‎ext/bz2/tests/002.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ bool(false)
8383
resource(%d) of type (stream)
8484
resource(%d) of type (stream)
8585

86-
Warning: fopen(bz_open_002.txt): failed to open stream: Bad file %s in %s on line %d
86+
Warning: fopen(): failed to open stream (bz_open_002.txt): Bad file %s in %s on line %d
8787

8888
Warning: bzopen(): first parameter has to be string or file-resource in %s on line %d
8989
bool(false)
9090

91-
Warning: fopen(bz_open_002.txt): failed to open stream: Bad file %s in %s on line %d
91+
Warning: fopen(): failed to open stream (bz_open_002.txt): Bad file %s in %s on line %d
9292

9393
Warning: bzopen(): first parameter has to be string or file-resource in %s on line %d
9494
bool(false)

‎ext/dba/dba.c‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,8 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
710710
if (ac==2) {
711711
hptr = DBA_G(default_hptr);
712712
if (!hptr) {
713-
php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_WARNING, "No default handler selected");
713+
php_error_docref(NULL, E_WARNING, "No default handler selected for path \"%s\" with mode %s",
714+
Z_STRVAL(args[0]), Z_STRVAL(args[1]));
714715
FREENOW;
715716
RETURN_FALSE;
716717
}
@@ -719,7 +720,8 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
719720
}
720721

721722
if (!hptr->name) {
722-
php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_WARNING, "No such handler: %s", Z_STRVAL(args[2]));
723+
php_error_docref(NULL, E_WARNING, "No such handler: %s for path \"%s\" with mode %s",
724+
Z_STRVAL(args[2]), Z_STRVAL(args[0]), Z_STRVAL(args[1]));
723725
FREENOW;
724726
RETURN_FALSE;
725727
}
@@ -750,13 +752,15 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
750752
case 'l':
751753
lock_flag = DBA_LOCK_ALL;
752754
if ((hptr->flags & DBA_LOCK_ALL) == 0) {
753-
php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_NOTICE, "Handler %s does locking internally", hptr->name);
755+
php_error_docref(NULL, E_NOTICE, "Handler %s does locking internally with path %s with mode %s",
756+
hptr->name, Z_STRVAL(args[0]), Z_STRVAL(args[1]));
754757
}
755758
break;
756759
default:
757760
case '-':
758761
if ((hptr->flags & DBA_LOCK_ALL) == 0) {
759-
php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_WARNING, "Locking cannot be disabled for handler %s", hptr->name);
762+
php_error_docref(NULL, E_WARNING, "Locking cannot be disabled for handler %s with path %s with mode %s",
763+
hptr->name, Z_STRVAL(args[0]), Z_STRVAL(args[1]));
760764
FREENOW;
761765
RETURN_FALSE;
762766
}
@@ -827,7 +831,8 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
827831
file_mode = "w+b";
828832
break;
829833
default:
830-
php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_WARNING, "Illegal DBA mode");
834+
/* Mode is second argument and path is first argument */
835+
php_error_docref(NULL, E_WARNING, "Illegal DBA mode %s for path \"%s\"", Z_STRVAL(args[1]), Z_STRVAL(args[0]));
831836
FREENOW;
832837
RETURN_FALSE;
833838
}
@@ -840,17 +845,23 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
840845
if (*pmode=='t') {
841846
pmode++;
842847
if (!lock_flag) {
843-
php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_WARNING, "You cannot combine modifiers - (no lock) and t (test lock)");
848+
php_error_docref(NULL, E_WARNING,
849+
"Cannot combine modifiers - (no lock) and t (test lock) for path \"%s\" with mode %s",
850+
Z_STRVAL(args[0]), Z_STRVAL(args[1]));
844851
FREENOW;
845852
RETURN_FALSE;
846853
}
847854
if (!lock_mode) {
848855
if ((hptr->flags & DBA_LOCK_ALL) == 0) {
849-
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);
856+
php_error_docref(NULL, E_WARNING,
857+
"Handler %s uses its own locking which doesn't support mode modifier t (test lock) for path \"%s\" with mode %s",
858+
hptr->name, Z_STRVAL(args[0]), Z_STRVAL(args[1]));
850859
FREENOW;
851860
RETURN_FALSE;
852861
} else {
853-
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);
862+
php_error_docref(NULL, E_WARNING,
863+
"Handler %s doesn't uses locking for this mode which makes modifier t (test lock) obsolete for path \"%s\" with mode %s",
864+
hptr->name, Z_STRVAL(args[0]), Z_STRVAL(args[1]));
854865
FREENOW;
855866
RETURN_FALSE;
856867
}
@@ -859,7 +870,8 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
859870
}
860871
}
861872
if (*pmode) {
862-
php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_WARNING, "Illegal DBA mode");
873+
/* Mode is second argument and path is first argument */
874+
php_error_docref(NULL, E_WARNING, "Illegal DBA mode %s for path \"%s\"", Z_STRVAL(args[1]), Z_STRVAL(args[0]));
863875
FREENOW;
864876
RETURN_FALSE;
865877
}
@@ -993,7 +1005,8 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
9931005

9941006
if (error || hptr->open(info, &error) != SUCCESS) {
9951007
dba_close(info);
996-
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:"");
1008+
php_error_docref(NULL, E_WARNING, "Driver initialization failed for handler: %s%s%s for path \"%s\" with mode %s",
1009+
hptr->name, error?": ":"", error?error:"", Z_STRVAL(args[0]), Z_STRVAL(args[1]));
9971010
FREENOW;
9981011
RETURN_FALSE;
9991012
}
@@ -1005,7 +1018,8 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
10051018
if (persistent) {
10061019
if (zend_register_persistent_resource(key, keylen, info, le_pdb) == NULL) {
10071020
dba_close(info);
1008-
php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_WARNING, "Could not register persistent resource");
1021+
php_error_docref(NULL, E_WARNING, "Could not register persistent resource for path \"%s\" with mode %s",
1022+
Z_STRVAL(args[0]), Z_STRVAL(args[1]));
10091023
FREENOW;
10101024
RETURN_FALSE;
10111025
}

‎ext/dba/dba_flatfile.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ DBA_UPDATE_FUNC(flatfile)
9191
case 1:
9292
return FAILURE;
9393
case -1:
94-
php_error_docref1(NULL, key, E_WARNING, "Operation not possible");
94+
php_error_docref(NULL, E_WARNING, "Operation impossible with key \"%s\"", key);
9595
return FAILURE;
9696
default:
97-
php_error_docref2(NULL, key, val, E_WARNING, "Unknown return value");
97+
php_error_docref(NULL, E_WARNING, "Unknown return value for key-value pair (%s, %s)", key, val);
9898
return FAILURE;
9999
}
100100
}

‎ext/dba/dba_gdbm.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ DBA_UPDATE_FUNC(gdbm)
107107
case 1:
108108
return FAILURE;
109109
case -1:
110-
php_error_docref2(NULL, key, val, E_WARNING, "%s", gdbm_strerror(gdbm_errno));
110+
php_error_docref(NULL, E_WARNING, "%s for key-value pair (%s, %s)", gdbm_strerror(gdbm_errno), key, val);
111111
return FAILURE;
112112
default:
113-
php_error_docref2(NULL, key, val, E_WARNING, "Unknown return value");
113+
php_error_docref(NULL, E_WARNING, "Unknown return value for key-value pair (%s, %s)", key, val);
114114
return FAILURE;
115115
}
116116
}

‎ext/dba/dba_inifile.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ DBA_UPDATE_FUNC(inifile)
9393
INIFILE_DONE;
9494
switch(res) {
9595
case -1:
96-
php_error_docref1(NULL, key, E_WARNING, "Operation not possible");
96+
php_error_docref(NULL, E_WARNING, "Operation impossible with key \"%s\"", key);
9797
return FAILURE;
9898
default:
9999
case 0:

‎ext/dba/dba_lmdb.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ DBA_FETCH_FUNC(lmdb)
112112
rc = mdb_txn_begin(LMDB_IT(env), NULL, MDB_RDONLY, &LMDB_IT(txn));
113113
}
114114
if (rc) {
115-
php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc));
115+
php_error_docref(NULL, E_WARNING, "Error %s on key \"%s\"", mdb_strerror(rc), key);
116116
return NULL;
117117
}
118118

@@ -122,7 +122,7 @@ DBA_FETCH_FUNC(lmdb)
122122
rc = mdb_get(LMDB_IT(txn), LMDB_IT(dbi), &k, &v);
123123
if (rc) {
124124
if (MDB_NOTFOUND != rc) {
125-
php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc));
125+
php_error_docref(NULL, E_WARNING, "Error %s on key \"%s\"", mdb_strerror(rc), key);
126126
}
127127
mdb_txn_abort(LMDB_IT(txn));
128128
return NULL;
@@ -149,7 +149,7 @@ DBA_UPDATE_FUNC(lmdb)
149149

150150
rc = mdb_txn_begin(LMDB_IT(env), NULL, 0, &LMDB_IT(txn));
151151
if (rc) {
152-
php_error_docref2(NULL, key, val, E_WARNING, "%s", mdb_strerror(rc));
152+
php_error_docref(NULL, E_WARNING, "%s for key-value pair (%s, %s)", mdb_strerror(rc), key, val);
153153
return FAILURE;
154154
}
155155

@@ -161,15 +161,15 @@ DBA_UPDATE_FUNC(lmdb)
161161
rc = mdb_put(LMDB_IT(txn), LMDB_IT(dbi), &k, &v, mode == 1 ? MDB_NOOVERWRITE : 0);
162162
if (rc) {
163163
if (MDB_KEYEXIST != rc) {
164-
php_error_docref2(NULL, key, val, E_WARNING, "%s", mdb_strerror(rc));
164+
php_error_docref(NULL, E_WARNING, "%s for key-value pair (%s, %s)", mdb_strerror(rc), key, val);
165165
}
166166
mdb_txn_abort(LMDB_IT(txn));
167167
return FAILURE;
168168
}
169169

170170
rc = mdb_txn_commit(LMDB_IT(txn));
171171
if (rc) {
172-
php_error_docref2(NULL, key, val, E_WARNING, "%s", mdb_strerror(rc));
172+
php_error_docref(NULL, E_WARNING, "%s for key-value pair (%s, %s)", mdb_strerror(rc), key, val);
173173
mdb_txn_abort(LMDB_IT(txn));
174174
return FAILURE;
175175
}
@@ -188,7 +188,7 @@ DBA_EXISTS_FUNC(lmdb)
188188
rc = mdb_txn_begin(LMDB_IT(env), NULL, MDB_RDONLY, &LMDB_IT(txn));
189189
}
190190
if (rc) {
191-
php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc));
191+
php_error_docref(NULL, E_WARNING, "Error %s on key \"%s\"", mdb_strerror(rc), key);
192192
return FAILURE;
193193
}
194194

@@ -198,7 +198,7 @@ DBA_EXISTS_FUNC(lmdb)
198198
rc = mdb_get(LMDB_IT(txn), LMDB_IT(dbi), &k, &v);
199199
if (rc) {
200200
if (MDB_NOTFOUND != rc) {
201-
php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc));
201+
php_error_docref(NULL, E_WARNING, "Error %s on key \"%s\"", mdb_strerror(rc), key);
202202
}
203203
mdb_txn_abort(LMDB_IT(txn));
204204
return FAILURE;
@@ -220,7 +220,7 @@ DBA_DELETE_FUNC(lmdb)
220220

221221
rc = mdb_txn_begin(LMDB_IT(env), NULL, 0, &LMDB_IT(txn));
222222
if (rc) {
223-
php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc));
223+
php_error_docref(NULL, E_WARNING, "Error %s on key \"%s\"", mdb_strerror(rc), key);
224224
return FAILURE;
225225
}
226226

@@ -231,14 +231,14 @@ DBA_DELETE_FUNC(lmdb)
231231
if (!rc) {
232232
rc = mdb_txn_commit(LMDB_IT(txn));
233233
if (rc) {
234-
php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc));
234+
php_error_docref(NULL, E_WARNING, "Error %s on key \"%s\"", mdb_strerror(rc), key);
235235
mdb_txn_abort(LMDB_IT(txn));
236236
return FAILURE;
237237
}
238238
return SUCCESS;
239239
}
240240

241-
php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc));
241+
php_error_docref(NULL, E_WARNING, "Error %s on key \"%s\"", mdb_strerror(rc), key);
242242

243243
return FAILURE;
244244
}

0 commit comments

Comments
 (0)