From 806407e62489f1e5e0d460b4bae0e9560e1f9758 Mon Sep 17 00:00:00 2001 From: Daniel Scherzer Date: Sat, 8 Aug 2026 18:09:33 -0700 Subject: [PATCH] [`%pS` migration] Use `%pS` in ext/tidy --- ext/tidy/tidy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index 98e1c05a720f..b94ec772cba4 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -737,7 +737,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; @@ -761,7 +761,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); @@ -1074,7 +1074,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; } @@ -1354,7 +1354,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(); } @@ -1399,7 +1399,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; }