Skip to content

Convert usage of php_error/zend_error to php_error_docref #22927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
NattyNarwhal wants to merge 13 commits into
base: master
Choose a base branch
from
Draft

Convert usage of php_error/zend_error to php_error_docref #22927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d3a538a
exif: Remove zend_error usage
NattyNarwhal Jul 29, 2026
edd4cc9
sodium: Remove zend_error usage
NattyNarwhal Jul 29, 2026
d2c2c5c
soap: Remove php_error usage
NattyNarwhal Jul 29, 2026
82f6938
soap: remove soap_errorN macros and use docref
NattyNarwhal Jul 29, 2026
797c53b
soap: Remove macro and pointless SOAP-ERROR prefix
NattyNarwhal Jul 29, 2026
0db3ae6
standard: remove php/zend_error usage from net_get_interfaces
NattyNarwhal Jul 29, 2026
b714d91
standard: remove php/zend_error usage from browscap
NattyNarwhal Jul 29, 2026
a9052ab
standard: remove php/zend_error usage from ini_parse_quantity
NattyNarwhal Jul 29, 2026
940ee85
standard: remove zend_error from auto_detect_line_endings
NattyNarwhal Jul 29, 2026
ad8ad2d
pdo: remove zend_error usage
NattyNarwhal Jul 29, 2026
351c8d2
standard: remove zend_error usage in math
NattyNarwhal Jul 29, 2026
8a87c0b
pdo_sqlite: remove zend_error usage
NattyNarwhal Jul 29, 2026
6a518e4
standard: browscap ini docref
NattyNarwhal Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Zend/tests/zend_ini/gh16886.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,29 @@ echo ini_parse_quantity('0o+0'), "\n";
echo ini_parse_quantity('0o-0'), "\n";
?>
--EXPECTF--
Warning: Invalid quantity "0x 0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
Warning: ini_parse_quantity(): Invalid quantity "0x 0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
0

Warning: Invalid quantity "0x+0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
Warning: ini_parse_quantity(): Invalid quantity "0x+0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
0

Warning: Invalid quantity "0x-0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
Warning: ini_parse_quantity(): Invalid quantity "0x-0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
0

Warning: Invalid quantity "0b 0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
Warning: ini_parse_quantity(): Invalid quantity "0b 0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
0

Warning: Invalid quantity "0b+0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
Warning: ini_parse_quantity(): Invalid quantity "0b+0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
0

Warning: Invalid quantity "0b-0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
Warning: ini_parse_quantity(): Invalid quantity "0b-0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
0

Warning: Invalid quantity "0o 0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
Warning: ini_parse_quantity(): Invalid quantity "0o 0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
0

Warning: Invalid quantity "0o+0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
Warning: ini_parse_quantity(): Invalid quantity "0o+0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
0

Warning: Invalid quantity "0o-0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
Warning: ini_parse_quantity(): Invalid quantity "0o-0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
0
2 changes: 1 addition & 1 deletion ext/exif/exif.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,7 +1337,7 @@ static HashTable *exif_make_tag_ht(tag_info_type *tag_table)
zend_hash_init(ht, 0, NULL, NULL, 1);
while (tag_table->Tag != TAG_END_OF_LIST) {
if (!zend_hash_index_add_ptr(ht, tag_table->Tag, tag_table->Desc)) {
zend_error(E_CORE_ERROR, "Duplicate tag %x", tag_table->Tag);
php_error_docref(NULL, E_CORE_ERROR, "Duplicate tag %x", tag_table->Tag);
}
tag_table++;
}
Expand Down
2 changes: 1 addition & 1 deletion ext/pdo/pdo_dbh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ PDO_API void php_pdo_internal_construct_driver(INTERNAL_FUNCTION_PARAMETERS, zen
}

if (!strncmp(data_source, "uri:", sizeof("uri:")-1)) {
zend_error(E_DEPRECATED, "Looking up the DSN from a URI is deprecated due to possible security concerns with DSNs coming from remote URIs");
php_error_docref(NULL, E_DEPRECATED, "Looking up the DSN from a URI is deprecated due to possible security concerns with DSNs coming from remote URIs");
if (EG(exception)) {
RETURN_THROWS();
}
Expand Down
4 changes: 2 additions & 2 deletions ext/pdo_mysql/tests/pdo_mysql___construct_uri.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ MySQLPDOTest::skip();
print "done!";
?>
--EXPECTF--
Deprecated: Looking up the DSN from a URI is deprecated due to possible security concerns with DSNs coming from remote URIs in %s on line %d
Deprecated: PDO::__construct(): Looking up the DSN from a URI is deprecated due to possible security concerns with DSNs coming from remote URIs in %s on line %d

Deprecated: Looking up the DSN from a URI is deprecated due to possible security concerns with DSNs coming from remote URIs in %s on line %d
Deprecated: PDO::__construct(): Looking up the DSN from a URI is deprecated due to possible security concerns with DSNs coming from remote URIs in %s on line %d
done!
2 changes: 1 addition & 1 deletion ext/pdo_sqlite/pdo_sqlite.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ PHP_METHOD(Pdo_Sqlite, openBlob)
sqlite_flags = (flags & SQLITE_OPEN_READWRITE) ? 1 : 0;

if (sqlite3_blob_open(sqlite_handle, dbname, table, column, rowid, sqlite_flags, &blob) != SQLITE_OK) {
zend_error(E_WARNING, "Unable to open blob: %s", sqlite3_errmsg(sqlite_handle));
php_error_docref(NULL, E_WARNING, "Unable to open blob: %s", sqlite3_errmsg(sqlite_handle));
RETURN_FALSE;
}

Expand Down
4 changes: 2 additions & 2 deletions ext/pdo_sqlite/tests/pdo_sqlite___construct_uri.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ var_dump(file_exists($dbFile));
--EXPECTF--
bool(false)

Deprecated: Looking up the DSN from a URI is deprecated due to possible security concerns with DSNs coming from remote URIs in %s on line %d
Deprecated: PDO::__construct(): Looking up the DSN from a URI is deprecated due to possible security concerns with DSNs coming from remote URIs in %s on line %d
bool(true)
bool(false)
ErrorException: Looking up the DSN from a URI is deprecated due to possible security concerns with DSNs coming from remote URIs
ErrorException: PDO::__construct(): Looking up the DSN from a URI is deprecated due to possible security concerns with DSNs coming from remote URIs
bool(false)
Loading
Loading