Declare ext/mbstring constants in stubs

[kocsismate]

No description provided.

[cmb69]

Thank you! Looks good overall to me. I wonder, though, whether we want to use some macro expansion trickery to get the MB_ONIGURUMA_VERSION value, instead of assembling it via runtime.

@alexdowad may also want to review.

[alexdowad]

Thanks, looks good.

[kocsismate]

Thank you! Looks good overall to me. I wonder, though, whether we want to use some macro expansion trickery to get the MB_ONIGURUMA_VERSION value, instead of assembling it via runtime.

I like the idea, and I wasn't pleased that I had to add a global variable. However, I didn't manage to make the macro expansion trickery work. :(

[cmb69]

@kocsismate, you can do something like:

#define STR_HELPER(x) #x
#define STR(x) STR_HELPER(x)
#define PHP_ONIGURUMA_VERSION STR(ONIGURUMA_VERSION_MAJOR) "." STR(ONIGURUMA_VERSION_MINOR) "." STR(ONIGURUMA_VERSION_TEENY)

The STR_HELPER() and STR() macros might be useful for other cases as well, so they might generally be provided (somewhere in Zend/) and renamed (ZEND_ prefix).

[kocsismate]

you can do something like:

Thank you for the suggestion, but that's exactly what I tried. Unfortunately, I got the constant names printed instead of the values. I don't have any idea what causes this.

[cmb69]

Unfortunately, I got the constant names printed instead of the values. I don't have any idea what causes this.

It works for me on Windows (MSVC) and Debian (WSL; gcc). Are you sure that you're using the indirection? The following is supposed to show the constant names:

#define STR(x) #x
#define PHP_ONIGURUMA_VERSION STR(ONIGURUMA_VERSION_MAJOR) "." STR(ONIGURUMA_VERSION_MINOR) "." STR(ONIGURUMA_VERSION_TEENY)

[kocsismate]

Are you sure that you're using the indirection?

Yes, sure! I've just tried to use the original PHP_ONIGURUMA_VERSION inside the PHP_MINFO_FUNCTION(mb_regex), and it worked, but it still didn't work as constant value.

[cmb69]

Oh, indeed, there is an inclusion (order) issue. PHP_MB_ONIGURUMA_VERSION would need to be defined in a compilation unit where ONIGURUMA_VERSION_* are defined, and where mbstring_arginfo.h is included. That's likely not really viable; it might be an option to split off a mbregex.stub.php; or just leave it as is.

[kocsismate]

I'm going to simply go with the current solution :)