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

Promote warning to ValueError for Spoofchecker::setRestrictionLevel()

Browse source 
Closes GH-6197
This commit is contained in:
George Peter Banyard 2020-09-23 17:02:43 +01:00
parent 3c10d4d9a9
commit a91cb2f48c
2 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ext/intl/spoofchecker/spoofchecker_main.c
View file

@ -125,6 +125,7 @@ PHP_METHOD(Spoofchecker, setChecks)
/* }}} */
#if U_ICU_VERSION_MAJOR_NUM >= 58
/* TODO Document this method on PHP.net */
/* {{{ Set the loosest restriction level allowed for strings. */
PHP_METHOD(Spoofchecker, setRestrictionLevel)
{
@ -143,8 +144,10 @@ PHP_METHOD(Spoofchecker, setRestrictionLevel)
USPOOF_MODERATELY_RESTRICTIVE != level &&
USPOOF_MINIMALLY_RESTRICTIVE != level &&
USPOOF_UNRESTRICTIVE != level) {
php_error_docref(NULL, E_WARNING, "Invalid restriction level value");
return;
zend_argument_value_error(1, "must be one of Spoofchecker::ASCII, Spoofchecker::SINGLE_SCRIPT_RESTRICTIVE, "
"Spoofchecker::SINGLE_HIGHLY_RESTRICTIVE, Spoofchecker::SINGLE_MODERATELY_RESTRICTIVE, "
"Spoofchecker::SINGLE_MINIMALLY_RESTRICTIVE, or Spoofchecker::UNRESTRICTIVE");
RETURN_THROWS();
}
uspoof_setRestrictionLevel(co->uspoof, (URestrictionLevel)level);

17
ext/intl/tests/spoofchecker_unknown_restriction_level.phpt Normal file
View file

@ -0,0 +1,17 @@
--TEST--
Spoofchecker attempting to pass an unknown restriction level
--SKIPIF--
<?php if(!extension_loaded('intl') || !class_exists("Spoofchecker")) print 'skip'; ?>
--FILE--
<?php
$x = new Spoofchecker();
try {
$x->setRestrictionLevel(Spoofchecker::SINGLE_SCRIPT);
} catch (\ValueError $e) {
echo $e->getMessage(), \PHP_EOL;
}
?>
--EXPECT--
Spoofchecker::setRestrictionLevel(): Argument #1 ($level) must be one of Spoofchecker::ASCII, Spoofchecker::SINGLE_SCRIPT_RESTRICTIVE, Spoofchecker::SINGLE_HIGHLY_RESTRICTIVE, Spoofchecker::SINGLE_MODERATELY_RESTRICTIVE, Spoofchecker::SINGLE_MINIMALLY_RESTRICTIVE, or Spoofchecker::UNRESTRICTIVE