Address review comments

Author: TysonAndre

Zend/zend_operators.c

@@ -66,27 +66,6 @@ static const unsigned char tolower_map[256] = {
 
 #define zend_tolower_ascii(c) (tolower_map[(unsigned char)(c)])
 
-/* ctype's isalpha varies based on locale, which is not what we want for many use cases.
- * This is what it'd be in the "C" locale. */
-ZEND_API const bool zend_isalpha_map[256] = {
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-};
-
 /* ctype's isalnum is isalpha + isdigit(0-9) */
 ZEND_API const bool zend_isalnum_map[256] = {
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,

Zend/zend_operators.h

@@ -414,11 +414,15 @@ ZEND_API int ZEND_FASTCALL string_compare_function(zval *op1, zval *op2);
 ZEND_API int ZEND_FASTCALL string_case_compare_function(zval *op1, zval *op2);
 ZEND_API int ZEND_FASTCALL string_locale_compare_function(zval *op1, zval *op2);
 
-/* NOTE: The locale-independent alternatives to ctype(isalpha/isalnum) were added to fix bugs in php 7.3 patch releases, and should not be used externally until php 8.2 */
-ZEND_API extern const bool zend_isalpha_map[256];
+/* NOTE: The locale-independent alternatives to ctype(isalpha/isalnum) were added to fix bugs in php 8.0 patch releases, and should not be used externally until php 8.2 */
 ZEND_API extern const bool zend_isalnum_map[256];
 
-#define zend_isalpha_ascii(c) (zend_isalpha_map[(unsigned char)(c)])
+static zend_always_inline bool zend_isalpha_ascii(unsigned char c) {
+	/* Returns true for a-z and A-Z in a locale-independent way.
+	 * This is implemented in a way that can avoid branching. Note that ASCII 'a' == 'A' | 0x20. */
+	c = (c | 0x20) - 'a';
+	return c <= ('z' - 'a' + 1);
+}
 #define zend_isalnum_ascii(c) (zend_isalnum_map[(unsigned char)(c)])
 
 ZEND_API void         ZEND_FASTCALL zend_str_tolower(char *str, size_t length);

ext/filter/tests/filter_validate_domain_locale.phpt

@@ -4,14 +4,14 @@ FILTER_VALIDATE_DOMAIN FILTER_FLAG_HOSTNAME should not be locale dependent
 filter
 --SKIPIF--
 <?php  // try to activate a single-byte german locale
-if (!setlocale(LC_ALL, "de_DE")) {
-    print "skip Can't find german locale";
+if (!setlocale(LC_ALL, 'de_DE', 'de_DE.ISO8859-1', 'de_DE.ISO_8859-1')) {
+    print "skip Can't find german locale\n";
 }
 ?>
 --FILE--
 <?php
 var_dump(filter_var('٪', FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME));
-setlocale(LC_ALL, "de_DE");
+setlocale(LC_ALL, 'de_DE', 'de_DE.ISO8859-1', 'de_DE.ISO_8859-1');
 var_dump(filter_var('٪', FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME));
 ?>
 --EXPECT--

ext/standard/tests/streams/locale.phpt

@@ -2,16 +2,16 @@
 Stream wrappers should not be locale dependent
 --SKIPIF--
 <?php  // try to activate a single-byte german locale
-if (!setlocale(LC_ALL, "de_DE")) {
-    print "skip Can't find german locale";
+if (!setlocale(LC_ALL, 'de_DE','de_DE.ISO8859-1','de_DE.ISO_8859-1')) {
+    print "skip Can't find german locale\n";
 }
 ?>
 --INI--
 allow_url_fopen=1
 display_errors=stderr
 --FILE--
 <?php
-setlocale(LC_ALL, "de_DE");
+setlocale(LC_ALL, 'de_DE', 'de_DE.ISO8859-1', 'de_DE.ISO_8859-1');
 class testwrapper {
 }