Traits refactoring

Author: dstogov

Zend/tests/traits/bug60153.phpt

@@ -16,4 +16,4 @@ class C implements IFoo {
 }
 
 --EXPECTF--
-Fatal error: Declaration of C::oneArgument() must be compatible with IFoo::oneArgument($a) in %s on line %d
+Fatal error: Declaration of TFoo::oneArgument() must be compatible with IFoo::oneArgument($a) in %s on line %d

Zend/tests/traits/bug60217b.phpt

@@ -23,4 +23,4 @@ $o = new CBroken;
 $o->foo(1);
 
 --EXPECTF--
-Fatal error: Declaration of TBroken1::foo($a) must be compatible with TBroken2::foo($a, $b = 0) in %s on line %d
+Fatal error: Declaration of TBroken2::foo($a, $b = 0) must be compatible with TBroken1::foo($a) in %s on line %d

Zend/tests/traits/bug60217c.phpt

@@ -23,4 +23,4 @@ $o = new CBroken;
 $o->foo(1);
 
 --EXPECTF--
-Fatal error: Declaration of TBroken1::foo($a, $b = 0) must be compatible with TBroken2::foo($a) in %s on line %d
+Fatal error: Declaration of TBroken2::foo($a) must be compatible with TBroken1::foo($a, $b = 0) in %s on line %d

Zend/tests/traits/bugs/abstract-methods05.phpt

@@ -22,4 +22,4 @@ class TraitsTest1 {
 
 ?>
 --EXPECTF--	
-Fatal error: Declaration of THelloB::hello() must be compatible with THelloA::hello($a) in %s on line %d
+Fatal error: Declaration of THelloA::hello($a) must be compatible with THelloB::hello() in %s on line %d

Zend/tests/traits/bugs/abstract-methods06.phpt

@@ -23,4 +23,4 @@ class TraitsTest1 {
 
 ?>
 --EXPECTF--	
-Fatal error: Declaration of THelloA::hello($a) must be compatible with THelloB::hello() in %s on line %d
+Fatal error: Declaration of THelloB::hello() must be compatible with THelloA::hello($a) in %s on line %d

Zend/tests/traits/error_010.phpt

@@ -10,13 +10,9 @@ trait c {
 	public function test() { return 2; }
 }
 
-trait b {
-	public function test() { return 1; }
-}
-
 class bar {
-	use foo, c { c::test insteadof foo, b; }
-	use foo, c { c::test insteadof foo, b; }
+	use foo, c { c::test insteadof foo; }
+	use foo, c { c::test insteadof foo; }
 }
 
 $x = new bar;

Zend/tests/traits/inheritance003.phpt

@@ -35,4 +35,4 @@ $o->sayHello(array());
 --EXPECTF--	
 World!
 
-Fatal error: Declaration of MyHelloWorld::sayHello() must be compatible with Base::sayHello(array $a) in %s on line %d
+Fatal error: Declaration of SayWorld::sayHello(Base $d) must be compatible with Base::sayHello(array $a) in %s on line %d

Zend/tests/traits/language014.phpt

@@ -0,0 +1,30 @@
+--TEST--
+Aliasing leading to conflict should result in error message
+--FILE--
+<?php
+error_reporting(E_ALL);
+
+trait Hello {
+   public function hello() {
+     echo 'Hello';
+   }
+}
+
+trait World {
+   public function world() {
+     echo ' World!';
+   }
+}
+
+
+class MyClass {
+   use Hello, World { world as hello; }
+}
+
+$o = new MyClass();
+$o->hello();
+$o->world();
+
+?>
+--EXPECTF--	
+Fatal error: Trait method hello has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d

Zend/tests/traits/language015.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Invalid conflict resolution (unused trait as lhs of "insteadof")
+--FILE--
+<?php
+trait T1 {
+	function foo() {echo "T1\n";}
+}
+trait T2 {
+        function foo() {echo "T2\n";}
+}
+class C {
+	use T1 {
+		T2::foo insteadof T1;
+	}
+}
+--EXPECTF--
+Fatal error: Trait T2 is not used in %s on line %d

Zend/tests/traits/language016.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Invalid conflict resolution (unused trait as rhs of "insteadof")
+--FILE--
+<?php
+trait T1 {
+	function foo() {echo "T1\n";}
+}
+trait T2 {
+        function foo() {echo "T2\n";}
+}
+class C {
+	use T1 {
+		T1::foo insteadof T2;
+	}
+}
+--EXPECTF--
+Fatal error: Trait T2 is not used in %s on line %d

Zend/tests/traits/language017.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Invalid conflict resolution (unused trait as lhs of "as")
+--FILE--
+<?php
+trait T1 {
+	function foo() {echo "T1\n";}
+}
+trait T2 {
+        function foo() {echo "T2\n";}
+}
+class C {
+	use T1 {
+		T2::foo as private;
+	}
+}
+--EXPECTF--
+Fatal error: Trait T2 is not used in %s on line %d

Zend/tests/traits/language018.phpt

@@ -0,0 +1,15 @@
+--TEST--
+abstract alias
+--FILE--
+<?php
+trait T1 {
+	function foo() {}
+}
+class C1 {
+	use T1 {
+		T1::foo as abstract;
+	}
+}
+?>
+--EXPECTF--
+Fatal error: Cannot use 'abstarct' as method modifier in %s on line %d

Zend/tests/traits/language019.phpt

@@ -0,0 +1,15 @@
+--TEST--
+final alias
+--FILE--
+<?php
+trait T1 {
+	function foo() {}
+}
+class C1 {
+	use T1 {
+		T1::foo as final;
+	}
+}
+?>
+--EXPECTF--
+Fatal error: Cannot use 'final' as method modifier in %s on line %d

Zend/zend.h

@@ -437,7 +437,7 @@ struct _zend_trait_precedence {
 
 	zend_class_entry** exclude_from_classes;
 
-	union _zend_function* function;
+	union _zend_function* function; /* FIXME: kept in 5.4 for BC, not used */
 };
 typedef struct _zend_trait_precedence zend_trait_precedence;
 
@@ -455,7 +455,7 @@ struct _zend_trait_alias {
 	*/
 	zend_uint modifiers;
 
-	union _zend_function* function;
+	union _zend_function* function; /* FIXME: kept in 5.4 for BC, not used */
 };
 typedef struct _zend_trait_alias zend_trait_alias;