Add separate static property through trait if parent already declares it

Closes GH-10935

Author: iluuu1994

Zend/tests/gh10935.phpt

@@ -0,0 +1,23 @@
+--TEST--
+GH-1093: Add separate static property through trait if parent already declares it
+--FILE--
+<?php
+trait Foo {
+    static $test;
+}
+
+class A {
+    use Foo;
+}
+
+class B extends A {
+    use Foo;
+}
+
+A::$test = 'A';
+B::$test = 'B';
+var_dump(A::$test, B::$test);
+?>
+--EXPECT--
+string(1) "A"
+string(1) "B"

Zend/zend_inheritance.c

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