Added missing consistency check for abstract methods required by one trait and implemented by another.

2 files changed, 51 insertions, 0 deletions

diff --git a/Zend/tests/traits/bugs/abstract-methods05.phpt b/Zend/tests/traits/bugs/abstract-methods05.phpt
new file mode 100644
index 0000000000..e90ce39a32
--- /dev/null
+++ b/Zend/tests/traits/bugs/abstract-methods05.phpt
@@ -0,0 +1,25 @@
+--TEST--
+The compatibility with the signature of abstract methods should be checked.
+--FILE--
+<?php
+error_reporting(E_ALL);
+
+trait THelloB {
+  public function hello() {
+	echo 'Hello';
+  }
+}
+
+trait THelloA {
+  public abstract function hello($a);
+}
+
+class TraitsTest1 {
+	use THelloB;
+	use THelloA;  
+}
+
+
+?>
+--EXPECTF--	
+Fatal error: Declaration of THelloB::hello() must be compatible with THelloA::hello($a) in %s on line %d
\ No newline at end of file
diff --git a/Zend/tests/traits/bugs/abstract-methods06.phpt b/Zend/tests/traits/bugs/abstract-methods06.phpt
new file mode 100644
index 0000000000..fdcd816961
--- /dev/null
+++ b/Zend/tests/traits/bugs/abstract-methods06.phpt
@@ -0,0 +1,26 @@
+--TEST--
+The compatibility with the signature of abstract methods should be checked. (also checking the second possible implementation branch)
+--FILE--
+<?php
+error_reporting(E_ALL);
+
+trait THelloB {
+  public function hello() {
+    echo 'Hello';
+  }  
+}
+
+trait THelloA {
+  public abstract function hello($a);
+}
+
+class TraitsTest1 {
+	use THelloA;
+	use THelloB;
+}
+
+
+
+?>
+--EXPECTF--	
+Fatal error: Declaration of THelloB::hello() must be compatible with THelloA::hello($a) in %s on line %d
\ No newline at end of file