Merge branch 'PHP-7.0'

Conflicts:
	ext/reflection/php_reflection.c

2 files changed, 38 insertions, 0 deletions

diff --git a/ext/reflection/tests/ReflectionProperty_getValue_error.phpt b/ext/reflection/tests/ReflectionProperty_getValue_error.phpt
index c2152e9f87..62009d8bb9 100644
--- a/ext/reflection/tests/ReflectionProperty_getValue_error.phpt
+++ b/ext/reflection/tests/ReflectionProperty_getValue_error.phpt
@@ -78,4 +78,6 @@ Protected property:
 Cannot access non-public member TestClass::prot
 
 Instance without property:
+
+Notice: Undefined property: AnotherClass::$pub2 in %s on line %d
 NULL
diff --git a/ext/reflection/tests/bug72174.phpt b/ext/reflection/tests/bug72174.phpt
new file mode 100644
index 0000000000..94416d6153
--- /dev/null
+++ b/ext/reflection/tests/bug72174.phpt
@@ -0,0 +1,36 @@
+--TEST--
+Bug #72174: ReflectionProperty#getValue() causes __isset call
+--FILE--
+<?php
+
+class Foo
+{
+    private $bar;
+
+    public function __construct()
+    {
+        unset($this->bar);
+    }
+
+    public function __isset($name)
+    {
+        var_dump(__METHOD__);
+        return true;
+    }
+    
+    public function __get($name)
+    {
+        var_dump(__METHOD__);
+        return $name;
+    }
+}
+
+$instance = new Foo();
+$reflectionBar = (new ReflectionProperty(Foo::class, 'bar'));
+$reflectionBar->setAccessible(true);
+var_dump($reflectionBar->getValue($instance));
+
+?>
+--EXPECT--
+string(10) "Foo::__get"
+string(3) "bar"