Skip to content

Commit 825cb52

Browse files
Merge branch 'PHP-8.5'
* PHP-8.5: Update NEWS after upmerge Preserve class-name case in ReflectionClass::getProperty() (#22272)
2 parents 3ed338c + eaa40bb commit 825cb52

4 files changed

Lines changed: 5 additions & 7 deletions

File tree

ext/reflection/php_reflection.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4635,9 +4635,7 @@ ZEND_METHOD(ReflectionClass, getProperty)
46354635
str_name = ZSTR_VAL(name);
46364636
if ((tmp = strstr(ZSTR_VAL(name), "::")) != NULL) {
46374637
classname_len = tmp - ZSTR_VAL(name);
4638-
classname = zend_string_alloc(classname_len, 0);
4639-
zend_str_tolower_copy(ZSTR_VAL(classname), ZSTR_VAL(name), classname_len);
4640-
ZSTR_VAL(classname)[classname_len] = '\0';
4638+
classname = zend_string_init(ZSTR_VAL(name), classname_len, 0);
46414639
str_name_len = ZSTR_LEN(name) - (classname_len + 2);
46424640
str_name = tmp + 2;
46434641

ext/reflection/tests/ReflectionClass_getProperty_003.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,4 +244,4 @@ Fully qualified property name X::$privC does not specify a base class of C
244244
--- (Reflecting on X::doesNotExist) ---
245245
Fully qualified property name X::$doesNotExist does not specify a base class of C
246246
--- (Reflecting on doesNotexist::doesNotExist) ---
247-
Class "doesnotexist" does not exist
247+
Class "doesNotexist" does not exist

ext/reflection/tests/ReflectionClass_getProperty_004.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,4 +248,4 @@ Fully qualified property name X::$privC does not specify a base class of C
248248
--- (Reflecting on X::doesNotExist) ---
249249
Fully qualified property name X::$doesNotExist does not specify a base class of C
250250
--- (Reflecting on doesNotexist::doesNotExist) ---
251-
Class "doesnotexist" does not exist
251+
Class "doesNotexist" does not exist

tests/classes/autoload_016.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ $rc->getProperty("UndefC::p");
1616
}
1717
?>
1818
--EXPECT--
19-
In autoload: string(6) "undefc"
20-
Class "undefc" does not exist
19+
In autoload: string(6) "UndefC"
20+
Class "UndefC" does not exist

0 commit comments

Comments
 (0)