MFH: fix #39067 (getDeclaringClass() and private properties)

2 files changed, 37 insertions, 0 deletions

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index a733a6a2f3..280f635188 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -4029,6 +4029,10 @@ ZEND_METHOD(reflection_property, getDeclaringClass)
 	while (tmp_ce && zend_hash_find(&tmp_ce->properties_info, prop_name, prop_name_len + 1, (void **) &tmp_info) == SUCCESS) {
 		ce = tmp_ce;
 		tmp_ce = tmp_ce->parent;
+		if (tmp_info->flags & ZEND_ACC_PRIVATE) {
+			/* it's a private property, so it can't be inherited */
+			break;
+		}
 	}
 
 	zend_reflection_class_factory(ce, return_value TSRMLS_CC);
diff --git a/ext/reflection/tests/bug39067.phpt b/ext/reflection/tests/bug39067.phpt
new file mode 100644
index 0000000000..a3bf2ad092
--- /dev/null
+++ b/ext/reflection/tests/bug39067.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Bug #39067 (getDeclaringClass() and private properties)
+--FILE--
+<?php
+
+class A {
+	private $x;
+}
+
+class B extends A {
+	private $x;
+}
+
+class C extends B {
+	private $x;
+}
+
+$rc = new ReflectionClass('C');
+var_dump($rc->getProperty('x')->getDeclaringClass()->getName());
+
+$rc = new ReflectionClass('B');
+var_dump($rc->getProperty('x')->getDeclaringClass()->getName());
+
+$rc = new ReflectionClass('A');
+var_dump($rc->getProperty('x')->getDeclaringClass()->getName());
+
+echo "Done\n";
+?>
+--EXPECTF--	
+string(1) "C"
+string(1) "B"
+string(1) "A"
+Done