summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-11-06 12:53:21 +0100
committerNikita Popov <nikita.ppv@gmail.com>2019-11-06 12:53:21 +0100
commita3e454aacc80521ae18aa597ff510b9f94bbd6ea (patch)
tree08d36454d315f0f838830c26bdb1495880df3c54
parent537c6a6992d7e1bfaf1e3d15a8af9fcc9455db9e (diff)
parent6d4965febdb1745444e7a3408fa7c01bcfc52b68 (diff)
downloadphp-git-a3e454aacc80521ae18aa597ff510b9f94bbd6ea.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fixed bug #78787
-rw-r--r--Zend/tests/bug78787.phpt22
1 files changed, 22 insertions, 0 deletions
diff --git a/Zend/tests/bug78787.phpt b/Zend/tests/bug78787.phpt
new file mode 100644
index 0000000000..91d5a9aa83
--- /dev/null
+++ b/Zend/tests/bug78787.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #78787: Segfault with trait overriding inherited private shadow property
+--FILE--
+<?php
+
+trait T {
+ private $prop;
+}
+class C1 {
+ /** Doc comment */
+ private $prop;
+}
+class C2 extends C1 {
+}
+class C3 extends C2 {
+ use T;
+}
+
+?>
+===DONE===
+--EXPECT--
+===DONE===