Commit 74725bf3250 for php
commit 74725bf3250b7ec685cad21cf8efacfe551aae43
Author: Daniel Scherzer <daniel.e.scherzer@gmail.com>
Date: Sun Nov 15 10:03:08 2026 -0800
[`%pS` migration] Use `%pS` in ext/tidy (#23170)
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index a47871ede0d..8588a89ddf1 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -768,7 +768,7 @@ static bool php_tidy_set_tidy_opt(TidyDoc doc, const char *optname, zval *value,
const zend_string *str = zval_get_tmp_string(value, &tmp_str);
const bool result = tidyOptSetValue(doc, tidyOptGetId(opt), ZSTR_VAL(str));
if (UNEXPECTED(!result)) {
- zend_argument_type_error(arg, "option \"%s\" does not accept \"%s\" as a value", optname, ZSTR_VAL(str));
+ zend_argument_type_error(arg, "option \"%s\" does not accept \"%pS\" as a value", optname, str);
}
zend_tmp_string_release(tmp_str);
return result;
@@ -792,7 +792,7 @@ static bool php_tidy_set_tidy_opt(TidyDoc doc, const char *optname, zval *value,
} else {
result = tidyOptSetValue(doc, tidyOptGetId(opt), ZSTR_VAL(str));
if (UNEXPECTED(!result)) {
- zend_argument_type_error(arg, "option \"%s\" does not accept \"%s\" as a value", optname, ZSTR_VAL(str));
+ zend_argument_type_error(arg, "option \"%s\" does not accept \"%pS\" as a value", optname, str);
}
}
zend_tmp_string_release(tmp_str);
@@ -1106,7 +1106,7 @@ PHP_FUNCTION(tidy_parse_file)
ZEND_PARSE_PARAMETERS_END();
if (!(contents = php_tidy_file_to_mem(inputfile, use_include_path))) {
- php_error_docref(NULL, E_WARNING, "Cannot load \"%s\" into memory%s", ZSTR_VAL(inputfile), (use_include_path) ? " (using include path)" : "");
+ php_error_docref(NULL, E_WARNING, "Cannot load \"%pS\" into memory%s", inputfile, (use_include_path) ? " (using include path)" : "");
RETURN_FALSE;
}
@@ -1386,7 +1386,7 @@ PHP_METHOD(tidy, __construct)
if (inputfile) {
if (!(contents = php_tidy_file_to_mem(inputfile, use_include_path))) {
- zend_throw_error(zend_ce_exception, "Cannot load \"%s\" into memory%s", ZSTR_VAL(inputfile), (use_include_path) ? " (using include path)" : "");
+ zend_throw_error(zend_ce_exception, "Cannot load \"%pS\" into memory%s", inputfile, (use_include_path) ? " (using include path)" : "");
RETURN_THROWS();
}
@@ -1431,7 +1431,7 @@ PHP_METHOD(tidy, parseFile)
obj = Z_TIDY_P(ZEND_THIS);
if (!(contents = php_tidy_file_to_mem(inputfile, use_include_path))) {
- php_error_docref(NULL, E_WARNING, "Cannot load \"%s\" into memory%s", ZSTR_VAL(inputfile), (use_include_path) ? " (using include path)" : "");
+ php_error_docref(NULL, E_WARNING, "Cannot load \"%pS\" into memory%s", inputfile, (use_include_path) ? " (using include path)" : "");
RETURN_FALSE;
}