[pull] master from php:master

Zend/tests/gh20672.phpt

@@ -0,0 +1,31 @@
+--TEST--
+GH-20672: Incorrect property_info sizing for locally shadowed trait properties
+--CREDITS--
+Jonne Ransijn (yyny)
+--FILE--
+<?php
+
+trait T {
+    public static $a;
+    public static $b;
+    public static $c;
+}
+
+class Base {
+    public $x;
+    public $y;
+}
+
+class Child extends Base {
+    public static $a;
+    public static $b;
+    public static $c;
+    public static $d;
+
+    use T;
+}
+
+?>
+===DONE===
+--EXPECT--
+===DONE===

Zend/zend_inheritance.c

@@ -2925,9 +2925,7 @@ static void zend_do_traits_property_binding(zend_class_entry *ce, zend_class_ent
 								ZSTR_VAL(prop_name),
 								ZSTR_VAL(ce->name));
 					}
-					if (!(flags & ZEND_ACC_STATIC)) {
-						continue;
-					}
+					continue;
 				}
 			}