Bug #55424 Fatal error when calling a method from a trait that is defined in parent class and required by using an abstract method in the trait.

# The method got unconditionally deleted from the class, since it was assumed that we override it, but we did not in case of abstract methods coming from a trait. Thus, dont delete when we try to merge in an abstract method.

1 files changed, 35 insertions, 0 deletions

diff --git a/Zend/tests/traits/bug55424.phpt b/Zend/tests/traits/bug55424.phpt
new file mode 100644
index 0000000000..b6c3b54515
--- /dev/null
+++ b/Zend/tests/traits/bug55424.phpt
@@ -0,0 +1,35 @@
+--TEST--
+Bug #55424 (Method got missing from class when a trait defined an abstract method to express a requirement)
+--FILE--
+<?php
+
+	trait ATrait
+	{
+		function setRequired()
+		{
+			$this->setAttribute();
+		}
+
+		abstract function setAttribute();
+	}	
+
+	class Base
+	{
+		function setAttribute() { }
+	}
+
+	class MyClass extends Base
+	{
+		use ATrait;
+	}
+
+	$i = new Base();
+	$i->setAttribute();
+
+	$t = new MyClass();
+	/* setAttribute used to disappear for no good reason. */
+	$t->setRequired();
+	echo 'DONE';
+?>
+--EXPECT--
+DONE