@@ -1111,7 +1111,7 @@ static ZEND_FUNCTION(zend_call_method)
11111111 } else if (Z_TYPE_P (class_or_object ) == IS_STRING ) {
11121112 ce = zend_lookup_class (Z_STR_P (class_or_object ));
11131113 if (!ce ) {
1114- zend_error_noreturn (E_ERROR , "Unknown class '%s '" , Z_STRVAL_P (class_or_object ));
1114+ zend_error_noreturn (E_ERROR , "Unknown class '%pS '" , Z_STR_P (class_or_object ));
11151115 }
11161116 } else {
11171117 zend_argument_type_error (1 , "must be of type object|string, %s given" , zend_zval_value_name (class_or_object ));
@@ -1280,7 +1280,7 @@ static ZEND_FUNCTION(zend_test_zend_ini_parse_quantity)
12801280 RETVAL_LONG (zend_ini_parse_quantity (str , & errstr ));
12811281
12821282 if (errstr ) {
1283- zend_error (E_WARNING , "%s " , ZSTR_VAL ( errstr ) );
1283+ zend_error (E_WARNING , "%pS " , errstr );
12841284 zend_string_release (errstr );
12851285 }
12861286}
@@ -1297,7 +1297,7 @@ static ZEND_FUNCTION(zend_test_zend_ini_parse_uquantity)
12971297 RETVAL_LONG ((zend_long )zend_ini_parse_uquantity (str , & errstr ));
12981298
12991299 if (errstr ) {
1300- zend_error (E_WARNING , "%s " , ZSTR_VAL ( errstr ) );
1300+ zend_error (E_WARNING , "%pS " , errstr );
13011301 zend_string_release (errstr );
13021302 }
13031303}
@@ -1440,7 +1440,7 @@ static ZEND_FUNCTION(zend_test_crash)
14401440 ZEND_PARSE_PARAMETERS_END ();
14411441
14421442 if (message ) {
1443- php_printf ("%s " , ZSTR_VAL ( message ) );
1443+ php_printf ("%pS " , message );
14441444 }
14451445
14461446 char * invalid = (char * ) 1 ;
@@ -2321,7 +2321,7 @@ static ZEND_METHOD(_ZendTestClass, takesUnionType)
23212321 );
23222322 if (!type_matches ) {
23232323 zend_string * ty = zend_type_to_string (execute_data -> func -> internal_function .arg_info -> type );
2324- zend_argument_type_error (1 , "must be of type %s , %s given" , ZSTR_VAL ( ty ), ZSTR_VAL ( obj -> ce -> name ) );
2324+ zend_argument_type_error (1 , "must be of type %pS , %pS given" , ty , obj -> ce -> name );
23252325 zend_string_release (ty );
23262326 RETURN_THROWS ();
23272327 }
@@ -2382,7 +2382,7 @@ static ZEND_NAMED_FUNCTION(zend_test_internal_dnf_arguments)
23822382 );
23832383 if (!type_matches ) {
23842384 zend_string * ty = zend_type_to_string (arginfo_zend_test_internal_dnf_arguments [1 ].type );
2385- zend_argument_type_error (1 , "must be of type %s , %s given" , ZSTR_VAL ( ty ), ZSTR_VAL ( obj -> ce -> name ) );
2385+ zend_argument_type_error (1 , "must be of type %pS , %pS given" , ty , obj -> ce -> name );
23862386 zend_string_release (ty );
23872387 RETURN_THROWS ();
23882388 }
0 commit comments