com php-src: Add MB_ONIGURUMA_VERSION and use it in a version dependent test: ext/mbstring/php_mbreg ex.c ext/mbstring/tests/mb_ereg_variation3.phpt

From: Date: Mon, 11 Feb 2019 13:53:19 +0000
Subject: com php-src: Add MB_ONIGURUMA_VERSION and use it in a version dependent test: ext/mbstring/php_mbreg ex.c ext/mbstring/tests/mb_ereg_variation3.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-104547@lists.php.net to get a copy of this message
Commit: e91d8ac5f6210c7283795b9b7b5ee90576d1bfa7 Author: Nikita Popov <nikita.ppv@gmail.com> Tue, 5 Feb 2019 13:56:13 +0100 Parents: d1c1481081ef6280bf403b290501ca62d736cb8b Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e91d8ac5f6210c7283795b9b7b5ee90576d1bfa7 Log: Add MB_ONIGURUMA_VERSION and use it in a version dependent test Changed paths: M ext/mbstring/php_mbregex.c M ext/mbstring/tests/mb_ereg_variation3.phpt Diff: diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index 30ff0b3..5128fab 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -105,7 +105,13 @@ void php_mb_regex_globals_free(zend_mb_regex_globals *pglobals) /* {{{ PHP_MINIT_FUNCTION(mb_regex) */ PHP_MINIT_FUNCTION(mb_regex) { + char version[256]; + onig_init(); + + snprintf(version, sizeof(version), "%d.%d.%d", + ONIGURUMA_VERSION_MAJOR, ONIGURUMA_VERSION_MINOR, ONIGURUMA_VERSION_TEENY); + REGISTER_STRING_CONSTANT("MB_ONIGURUMA_VERSION", version, CONST_CS | CONST_PERSISTENT); return SUCCESS; } /* }}} */ diff --git a/ext/mbstring/tests/mb_ereg_variation3.phpt b/ext/mbstring/tests/mb_ereg_variation3.phpt index 5264ad4..17fa944 100644 --- a/ext/mbstring/tests/mb_ereg_variation3.phpt +++ b/ext/mbstring/tests/mb_ereg_variation3.phpt @@ -4,6 +4,7 @@ Test mb_ereg() function : usage variations - pass different character classes to <?php extension_loaded('mbstring') or die('skip'); function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build"); +version_compare(MB_ONIGURUMA_VERSION, '6.1.0', '>=') or die("skip requires oniguruma >= 6.1.0"); ?> --FILE-- <?php

« previous php.cvs (#104547) next »