File tree Expand file tree Collapse file tree 2 files changed +3
-7
lines changed Expand file tree Collapse file tree 2 files changed +3
-7
lines changed Original file line number Diff line number Diff line change @@ -85,9 +85,7 @@ static zend_string *validate_allow_dynamic_properties(
85
85
msg = "Cannot apply #[\\AllowDynamicProperties] to enum %s" ;
86
86
}
87
87
if (msg != NULL ) {
88
- smart_str str = {0 };
89
- smart_str_append_printf (& str , msg , ZSTR_VAL (scope -> name ));
90
- return smart_str_extract (& str );
88
+ return zend_strpprintf (0 , msg , ZSTR_VAL (scope -> name ));
91
89
}
92
90
scope -> ce_flags |= ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES ;
93
91
return NULL ;
@@ -107,9 +105,7 @@ static zend_string *validate_attribute(
107
105
msg = "Cannot apply #[\\Attribute] to abstract class %s" ;
108
106
}
109
107
if (msg != NULL ) {
110
- smart_str str = {0 };
111
- smart_str_append_printf (& str , msg , ZSTR_VAL (scope -> name ));
112
- return smart_str_extract (& str );
108
+ return zend_strpprintf (0 , msg , ZSTR_VAL (scope -> name ));
113
109
}
114
110
return NULL ;
115
111
}
Original file line number Diff line number Diff line change @@ -7604,7 +7604,7 @@ static void zend_compile_attributes(
7604
7604
if (run_validator && config -> validator != NULL ) {
7605
7605
zend_string * error = config -> validator (attr , target , CG (active_class_entry ));
7606
7606
if (error != NULL ) {
7607
- if (delayed_target_validation == false ) {
7607
+ if (delayed_target_validation == NULL ) {
7608
7608
zend_error_noreturn (E_COMPILE_ERROR , "%s" , ZSTR_VAL (error ));
7609
7609
zend_string_efree (error );
7610
7610
} else {
You can’t perform that action at this time.
0 commit comments