Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ PHP NEWS
Phar::addEmptyDir() for paths starting with "/.phar", while allowing
non-magic directory names that merely share the ".phar" prefix. (Weilin Du)

- Reflection:
. Preserve class-name case in ReflectionClass::getProperty() error messages
and autoloading. (jorgsowa)

- Sqlite:
. Fix error checks for column retrieval. (ndossche)

Expand Down
4 changes: 1 addition & 3 deletions ext/reflection/php_reflection.c
Original file line number Diff line number Diff line change
Expand Up @@ -4734,9 +4734,7 @@ ZEND_METHOD(ReflectionClass, getProperty)
str_name = ZSTR_VAL(name);
if ((tmp = strstr(ZSTR_VAL(name), "::")) != NULL) {
classname_len = tmp - ZSTR_VAL(name);
classname = zend_string_alloc(classname_len, 0);
zend_str_tolower_copy(ZSTR_VAL(classname), ZSTR_VAL(name), classname_len);
ZSTR_VAL(classname)[classname_len] = '\0';
classname = zend_string_init(ZSTR_VAL(name), classname_len, 0);
str_name_len = ZSTR_LEN(name) - (classname_len + 2);
str_name = tmp + 2;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,4 +244,4 @@ Fully qualified property name X::$privC does not specify a base class of C
--- (Reflecting on X::doesNotExist) ---
Fully qualified property name X::$doesNotExist does not specify a base class of C
--- (Reflecting on doesNotexist::doesNotExist) ---
Class "doesnotexist" does not exist
Class "doesNotexist" does not exist
Original file line number Diff line number Diff line change
Expand Up @@ -248,4 +248,4 @@ Fully qualified property name X::$privC does not specify a base class of C
--- (Reflecting on X::doesNotExist) ---
Fully qualified property name X::$doesNotExist does not specify a base class of C
--- (Reflecting on doesNotexist::doesNotExist) ---
Class "doesnotexist" does not exist
Class "doesNotexist" does not exist
4 changes: 2 additions & 2 deletions tests/classes/autoload_016.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ $rc->getProperty("UndefC::p");
}
?>
--EXPECT--
In autoload: string(6) "undefc"
Class "undefc" does not exist
In autoload: string(6) "UndefC"
Class "UndefC" does not exist
Loading