archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Make highlight_string() accept string in zpp

Browse source 
To satisfy the type declaration.
This commit is contained in:
Nikita Popov 2020-10-22 14:31:23 +02:00
parent c23eefb1ad
commit db5979dfe2
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ext/standard/basic_functions.c
View file

@ -1931,22 +1931,18 @@ PHP_FUNCTION(php_strip_whitespace)
/* {{{ Syntax highlight a string or optionally return it */
PHP_FUNCTION(highlight_string)
{
zval *expr;
zend_string *str;
zend_syntax_highlighter_ini syntax_highlighter_ini;
char *hicompiled_string_description;
zend_bool i = 0;
int old_error_reporting = EG(error_reporting);
ZEND_PARSE_PARAMETERS_START(1, 2)
Z_PARAM_ZVAL(expr)
Z_PARAM_STR(str)
Z_PARAM_OPTIONAL
Z_PARAM_BOOL(i)
ZEND_PARSE_PARAMETERS_END();
if (!try_convert_to_string(expr)) {
RETURN_THROWS();
}
if (i) {
php_output_start_default();
}
@ -1957,8 +1953,12 @@ PHP_FUNCTION(highlight_string)
hicompiled_string_description = zend_make_compiled_string_description("highlighted code");
highlight_string(expr, &syntax_highlighter_ini, hicompiled_string_description);
// TODO: Accept zend_string in highlight_string API.
zval str_zv;
ZVAL_STR_COPY(&str_zv, str);
highlight_string(&str_zv, &syntax_highlighter_ini, hicompiled_string_description);
efree(hicompiled_string_description);
zval_ptr_dtor(&str_zv);
EG(error_reporting) = old_error_reporting;