summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2018-07-02 18:56:27 +0200
committerNikita Popov <nikita.ppv@gmail.com>2018-07-02 18:56:27 +0200
commitc97b8bbf8252c3a493a44bcb91fb137952f03710 (patch)
treedada258f2d2dc8d5e86826422df33ac9b40c3046
parent787593b708372f67fdaabbe4ae7667f6ee5b062f (diff)
downloadphp-git-c97b8bbf8252c3a493a44bcb91fb137952f03710.tar.gz
Fixed bug #75231
The behavior is now consistent with ReflectionMethod.
-rw-r--r--NEWS2
-rw-r--r--ext/reflection/php_reflection.c2
-rw-r--r--ext/reflection/tests/bug75231.phpt25
3 files changed, 28 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 3e208f16ac..d4ebb9aa75 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,8 @@ PHP NEWS
- Reflection:
. Fixed bug #76536 (PHP crashes with core dump when throwing exception in
error handler). (Laruence)
+ . Fixed bug #75231 (ReflectionProperty#getValue() incorrectly works with
+ inherited classes). (Nikita)
- Standard:
. Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys).
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 95b86e7283..690aaa0fe6 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -5645,7 +5645,7 @@ ZEND_METHOD(reflection_property, getValue)
return;
}
- if (!instanceof_function(Z_OBJCE_P(object), ref->ce)) {
+ if (!instanceof_function(Z_OBJCE_P(object), ref->prop.ce)) {
_DO_THROW("Given object is not an instance of the class this property was declared in");
/* Returns from this function */
}
diff --git a/ext/reflection/tests/bug75231.phpt b/ext/reflection/tests/bug75231.phpt
new file mode 100644
index 0000000000..5aff0be19c
--- /dev/null
+++ b/ext/reflection/tests/bug75231.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Bug #75231: ReflectionProperty#getValue() incorrectly works with inherited classes
+--FILE--
+<?php
+class A
+{
+ public $prop;
+ public function __construct()
+ {
+ $this->prop = 'prop';
+ }
+ public function method()
+ {
+ return 'method';
+ }
+}
+class B extends A
+{
+}
+print_r((new ReflectionMethod(B::class, 'method'))->invoke(new A()).PHP_EOL);
+print_r((new ReflectionProperty(B::class, 'prop'))->getValue(new A()).PHP_EOL);
+?>
+--EXPECT--
+method
+prop