Merge branch 'PHP-7.4'

Author: nikic

Zend/tests/bug50810.phpt

@@ -40,7 +40,7 @@ var_dump($example->propertyBarExists());
 
 ?>
 --EXPECT--
-bool(false)
+bool(true)
 bool(true)
 bool(true)
 bool(true)

Zend/zend_builtin_functions.c

@@ -1148,7 +1148,11 @@ ZEND_FUNCTION(method_exists)
 	zend_string_release_ex(lcname, 0);
 
 	if (func) {
-		RETURN_BOOL(!(func->common.fn_flags & ZEND_ACC_PRIVATE) || func->common.scope == ce);
+		/* Exclude shadow properties when checking a method on a specific class. Include
+		 * them when checking an object, as method_exists() generally ignores visibility.
+		 * TODO: Should we use EG(scope) for the object case instead? */
+		RETURN_BOOL(Z_TYPE_P(klass) == IS_OBJECT
+			|| !(func->common.fn_flags & ZEND_ACC_PRIVATE) || func->common.scope == ce);
 	}
 
 	if (Z_TYPE_P(klass) == IS_OBJECT) {

ext/standard/tests/class_object/method_exists_basic_001.phpt

@@ -50,7 +50,7 @@ foreach ($methods as $method) {
 echo "Done";
 ?>
 --EXPECT--
- ---(Using string class name)---
+---(Using string class name)---
 Does C::inherit_pub exist? bool(true)
 Does C::inherit_prot exist? bool(true)
 Does C::inherit_priv exist? bool(false)
@@ -68,10 +68,10 @@ Does C::non_existent exist? bool(false)
  ---(Using object)---
 Does C::inherit_pub exist? bool(true)
 Does C::inherit_prot exist? bool(true)
-Does C::inherit_priv exist? bool(false)
+Does C::inherit_priv exist? bool(true)
 Does C::inherit_static_pub exist? bool(true)
 Does C::inherit_static_prot exist? bool(true)
-Does C::inherit_static_priv exist? bool(false)
+Does C::inherit_static_priv exist? bool(true)
 Does C::pub exist? bool(true)
 Does C::prot exist? bool(true)
 Does C::priv exist? bool(true)