Modify default value for grapheme_stri* functions

Author: youkidearitai

ext/intl/grapheme/grapheme_string.c

@@ -142,7 +142,7 @@ PHP_FUNCTION(grapheme_stripos)
 	const char *found;
 	zend_long loffset = 0;
 	int32_t offset = 0;
-	zend_long strength = UCOL_DEFAULT_STRENGTH;
+	zend_long strength = UCOL_SECONDARY;
 	zend_long ret_pos;
 	int is_ascii;
 
@@ -271,7 +271,7 @@ PHP_FUNCTION(grapheme_strripos)
 	size_t haystack_len, needle_len, locale_len = 0;
 	zend_long loffset = 0;
 	int32_t offset = 0;
-	zend_long strength = UCOL_DEFAULT_STRENGTH;
+	zend_long strength = UCOL_SECONDARY;
 	zend_long ret_pos;
 	int is_ascii;
 
@@ -557,9 +557,15 @@ static void strstr_common_handler(INTERNAL_FUNCTION_PARAMETERS, int f_ignore_cas
 	const char *found;
 	size_t haystack_len, needle_len, locale_len = 0;
 	int32_t ret_pos, uchar_pos;
-	zend_long strength = UCOL_DEFAULT_STRENGTH;
+	zend_long strength;
 	bool part = false;
 
+	if (f_ignore_case) {
+		strength = UCOL_SECONDARY;
+	} else {
+		strength = UCOL_DEFAULT_STRENGTH;
+	}
+
 	ZEND_PARSE_PARAMETERS_START(2, 5)
 		Z_PARAM_STRING(haystack, haystack_len)
 		Z_PARAM_STRING(needle, needle_len)

ext/intl/grapheme/grapheme_util.c

@@ -139,14 +139,11 @@ int32_t grapheme_strpos_utf16(char *haystack, size_t haystack_len, char *needle,
 	src = usearch_open(uneedle, uneedle_len, uhaystack, uhaystack_len, locale, bi, &status);
 	STRPOS_CHECK_STATUS(status, "Error creating search object");
 
-	if(f_ignore_case) {
-		UCollator *coll = usearch_getCollator(src);
-		ucol_setStrength(coll, strength);
-		status = U_ZERO_ERROR;
-		ucol_setAttribute(coll, UCOL_STRENGTH, UCOL_SECONDARY, &status);
-		STRPOS_CHECK_STATUS(status, "Error setting collation strength");
-		usearch_reset(src);
-	}
+	UCollator *coll = usearch_getCollator(src);
+	ucol_setAttribute(coll, UCOL_STRENGTH, strength, &status);
+	STRPOS_CHECK_STATUS(status, "Error setting collation strength");
+	status = U_ZERO_ERROR;
+	usearch_reset(src);
 
 	if(offset != 0) {
 		offset_pos = grapheme_get_haystack_offset(bi, offset);

ext/intl/php_intl.stub.php

@@ -171,6 +171,11 @@
  * @cvalue UCOL_DEFAULT_STRENGTH
  */
 const UCOL_DEFAULT_STRENGTH = UNKNOWN;
+/**
+ * @var int
+ * @cvalue UCOL_SECONDARY
+ */
+const UCOL_SECONDARY = UNKNOWN;
 
 class IntlException extends Exception
 {
@@ -438,17 +443,17 @@ function grapheme_strlen(string $string): int|false|null {}
 
 function grapheme_strpos(string $haystack, string $needle, int $offset = 0, string $locale = "", int $strength = UCOL_DEFAULT_STRENGTH): int|false {}
 
-function grapheme_stripos(string $haystack, string $needle, int $offset = 0, string $locale = "", int $strength = UCOL_DEFAULT_STRENGTH): int|false {}
+function grapheme_stripos(string $haystack, string $needle, int $offset = 0, string $locale = "", int $strength = UCOL_SECONDARY): int|false {}
 
 function grapheme_strrpos(string $haystack, string $needle, int $offset = 0, string $locale = "", int $strength = UCOL_DEFAULT_STRENGTH): int|false {}
 
-function grapheme_strripos(string $haystack, string $needle, int $offset = 0, string $locale = "", int $strength = UCOL_DEFAULT_STRENGTH): int|false {}
+function grapheme_strripos(string $haystack, string $needle, int $offset = 0, string $locale = "", int $strength = UCOL_SECONDARY): int|false {}
 
 function grapheme_substr(string $string, int $offset, ?int $length = null, string $locale = "", int $strength = UCOL_DEFAULT_STRENGTH): string|false {}
 
 function grapheme_strstr(string $haystack, string $needle, bool $beforeNeedle = false, string $locale = "", int $strength = UCOL_DEFAULT_STRENGTH): string|false {}
 
-function grapheme_stristr(string $haystack, string $needle, bool $beforeNeedle = false, string $locale = "", int $strength = UCOL_DEFAULT_STRENGTH): string|false {}
+function grapheme_stristr(string $haystack, string $needle, bool $beforeNeedle = false, string $locale = "", int $strength = UCOL_SECONDARY): string|false {}
 
 function grapheme_str_split(string $string, int $length = 1): array|false {}