Skip to content

[%pS migration] Use %pS in ext/xsl #23175

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
DanielEScherzer wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −8
Draft

[%pS migration] Use %pS in ext/xsl #23175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ext/xsl/php_xsl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ static zval *xsl_objects_write_property_with_validation(zend_object *object, zen
/* Validate value *after* coercions have been performed, and restore the old value if necessary. */
if (UNEXPECTED(Z_LVAL_P(property) < 0)) {
Z_LVAL_P(property) = old_property_value;
zend_value_error("%s::$%s must be greater than or equal to 0", ZSTR_VAL(object->ce->name), ZSTR_VAL(member));
zend_value_error("%pS::$%pS must be greater than or equal to 0", object->ce->name, member);
return &EG(error_zval);
}

Expand Down Expand Up @@ -198,7 +198,7 @@ static zval *xsl_objects_read_property(zend_object *object, zend_string *member,
{
/* read handler is being called as a fallback after get_property_ptr_ptr returned NULL */
if (type != BP_VAR_IS && type != BP_VAR_R && xsl_is_validated_property(member)) {
zend_throw_error(NULL, "Indirect modification of %s::$%s is not allowed", ZSTR_VAL(object->ce->name), ZSTR_VAL(member));
zend_throw_error(NULL, "Indirect modification of %pS::$%pS is not allowed", object->ce->name, member);
return &EG(uninitialized_zval);
}

Expand All @@ -208,7 +208,7 @@ static zval *xsl_objects_read_property(zend_object *object, zend_string *member,
static void xsl_objects_unset_property(zend_object *object, zend_string *member, void **cache_slot)
{
if (xsl_is_validated_property(member)) {
zend_throw_error(NULL, "Cannot unset %s::$%s", ZSTR_VAL(object->ce->name), ZSTR_VAL(member));
zend_throw_error(NULL, "Cannot unset %pS::$%pS", object->ce->name, member);
return;
}

Expand Down
10 changes: 5 additions & 5 deletions ext/xsl/xsltprocessor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ static zend_result php_xsl_xslt_apply_params(xsltTransformContextPtr ctxt, HashT

int result = xsltQuoteOneUserParam(ctxt, (const xmlChar *) ZSTR_VAL(string_key), (const xmlChar *) Z_STRVAL_P(value));
if (result < 0) {
php_error_docref(NULL, E_WARNING, "Could not apply parameter \"%s\"", ZSTR_VAL(string_key));
php_error_docref(NULL, E_WARNING, "Could not apply parameter \"%pS\"", string_key);
return FAILURE;
}
} ZEND_HASH_FOREACH_END();
Expand Down Expand Up @@ -307,8 +307,8 @@ static xmlDocPtr php_xsl_apply_stylesheet(zval *id, xsl_object *intern, xsltStyl

if (style == NULL) {
zend_string *name = get_active_function_or_method_name();
zend_throw_error(NULL, "%s() can only be called after a stylesheet has been imported",
ZSTR_VAL(name));
zend_throw_error(NULL, "%pS() can only be called after a stylesheet has been imported",
name);
zend_string_release(name);
return NULL;
}
Expand Down Expand Up @@ -454,8 +454,8 @@ PHP_METHOD(XSLTProcessor, transformToDoc)

if (!instanceof_function(ret_class, current_ce)) {
xmlFreeDoc(newdocp);
zend_argument_type_error(2, "must be a class name compatible with %s, %s given",
ZSTR_VAL(current_class_name), ZSTR_VAL(ret_class->name)
zend_argument_type_error(2, "must be a class name compatible with %pS, %pS given",
current_class_name, ret_class->name
);
RETURN_THROWS();
}
Expand Down
Loading