Merge branch 'PHP-7.1' into PHP-7.2

Author: nikic

NEWS

@@ -45,6 +45,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).

ext/reflection/php_reflection.c

@@ -5531,7 +5531,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 */
 		}

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