Fixed bug #64235 (Insteadof not work for class method in 5.4.11)

laruence · laruence · commit 9a44a9806c7c · 2013-02-21T18:18:41.000+08:00
As we discussed with stefan, we think previous of allowing use with
classes is a bug, should be forbided, anyway, the error message should
be improved.
diff --git a/NEWS b/NEWS
@@ -3,6 +3,8 @@ PHP                                                                        NEWS
 ?? ??? 2012, PHP 5.4.13
 
 - Core:
+  . Fixed bug #64235 (Insteadof not work for class method in 5.4.11).
+    (Laruence)
   . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell)
   . Fixed bug #64142 (dval to lval different behavior on ppc64). (Remi)
   . Fixed bug #64070 (Inheritance with Traits failed with error). (Dmitry)
diff --git a/Zend/tests/traits/bug64235.phpt b/Zend/tests/traits/bug64235.phpt
@@ -0,0 +1,34 @@
+--TEST--
+Bug #64235 (Insteadof not work for class method in 5.4.11)
+--FILE--
+<?php
+
+class TestParentClass
+{
+    public function method()
+    {
+        print_r('Parent method');
+        print "\n";
+    }
+}
+
+trait TestTrait
+{
+    public function method()
+    {
+        print_r('Trait method');
+        print "\n";
+    }
+}
+
+class TestChildClass extends TestParentClass
+{
+    use TestTrait
+    {
+        TestTrait::method as methodAlias;
+        TestParentClass::method insteadof TestTrait;
+    }
+}
+?>
+--EXPECTF--
+Fatal error: Class TestParentClass is not a trait, Only traits may be used in 'as' and 'insteadof' statements in %sbug64235.php on line %d
diff --git a/Zend/tests/traits/bug64235b.phpt b/Zend/tests/traits/bug64235b.phpt
@@ -0,0 +1,35 @@
+--TEST--
+Bug #64235 (Insteadof not work for class method in 5.4.11)
+--FILE--
+<?php
+
+class TestParentClass
+{
+    public function method()
+    {
+        print_r('Parent method');
+        print "\n";
+    }
+}
+
+trait TestTrait
+{
+    public function method()
+    {
+        print_r('Trait method');
+        print "\n";
+    }
+}
+
+class TestChildClass extends TestParentClass
+{
+    use TestTrait
+    {
+        TestTrait::method as methodAlias;
+        TestParentClass::method as TestParent;
+    }
+}
+
+?>
+--EXPECTF--
+Fatal error: Class TestParentClass is not a trait, Only traits may be used in 'as' and 'insteadof' statements in %sbug64235b.php on line %d
diff --git a/Zend/tests/traits/language015.phpt b/Zend/tests/traits/language015.phpt
@@ -14,4 +14,4 @@ class C {
 	}
 }
 --EXPECTF--
-Fatal error: Trait T2 is not used in %s on line %d
+Fatal error: Required Trait T2 wasn't added to C in %slanguage015.php on line %d
diff --git a/Zend/tests/traits/language016.phpt b/Zend/tests/traits/language016.phpt
@@ -14,4 +14,4 @@ class C {
 	}
 }
 --EXPECTF--
-Fatal error: Trait T2 is not used in %s on line %d
+Fatal error: Required Trait T2 wasn't added to C in %slanguage016.php on line %d
diff --git a/Zend/tests/traits/language017.phpt b/Zend/tests/traits/language017.phpt
@@ -14,4 +14,4 @@ class C {
 	}
 }
 --EXPECTF--
-Fatal error: Trait T2 is not used in %s on line %d
+Fatal error: Required Trait T2 wasn't added to C in %slanguage017.php on line %d
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -3859,12 +3859,16 @@ static void zend_check_trait_usage(zend_class_entry *ce, zend_class_entry *trait
 {
 	zend_uint i;
 
+	if ((trait->ce_flags & ZEND_ACC_TRAIT) != ZEND_ACC_TRAIT) {
+		zend_error(E_COMPILE_ERROR, "Class %s is not a trait, Only traits may be used in 'as' and 'insteadof' statements", trait->name);
+	}
+
 	for (i = 0; i < ce->num_traits; i++) {
 		if (ce->traits[i] == trait) {
 			return;
 		}
 	}
-	zend_error(E_COMPILE_ERROR, "Trait %s is not used", trait->name);
+	zend_error(E_COMPILE_ERROR, "Required Trait %s wasn't added to %s", trait->name, ce->name);
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@ class C {`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`--EXPECTF--`
`17`		`-Fatal error: Trait T2 is not used in %s on line %d`
	`17`	`+Fatal error: Required Trait T2 wasn't added to C in %slanguage015.php on line %d`
Original file line number	Diff line number	Diff line change
`@@ -3859,12 +3859,16 @@ static void zend_check_trait_usage(zend_class_entry ce, zend_class_entry trait`
`3859`	`3859`	`{`
`3860`	`3860`	`zend_uint i;`
`3861`	`3861`
	`3862`	`+ if ((trait->ce_flags & ZEND_ACC_TRAIT) != ZEND_ACC_TRAIT) {`
	`3863`	`+ zend_error(E_COMPILE_ERROR, "Class %s is not a trait, Only traits may be used in 'as' and 'insteadof' statements", trait->name);`
	`3864`	`+ }`
	`3865`	`+`
`3862`	`3866`	`for (i = 0; i < ce->num_traits; i++) {`
`3863`	`3867`	`if (ce->traits[i] == trait) {`
`3864`	`3868`	`return;`
`3865`	`3869`	`}`
`3866`	`3870`	`}`
`3867`		`- zend_error(E_COMPILE_ERROR, "Trait %s is not used", trait->name);`
	`3871`	`+ zend_error(E_COMPILE_ERROR, "Required Trait %s wasn't added to %s", trait->name, ce->name);`
`3868`	`3872`	`}`
`3869`	`3873`	`/* }}} */`
`3870`	`3874`