Merge branch 'PHP-5.4' into PHP-5.5

laruence · laruence · commit f39d12c8210d · 2013-02-21T18:20:48.000+08:00
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
@@ -4048,12 +4048,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
`@@ -4048,12 +4048,16 @@ static void zend_check_trait_usage(zend_class_entry ce, zend_class_entry trait`
`4048`	`4048`	`{`
`4049`	`4049`	`zend_uint i;`
`4050`	`4050`
	`4051`	`+ if ((trait->ce_flags & ZEND_ACC_TRAIT) != ZEND_ACC_TRAIT) {`
	`4052`	`+ zend_error(E_COMPILE_ERROR, "Class %s is not a trait, Only traits may be used in 'as' and 'insteadof' statements", trait->name);`
	`4053`	`+ }`
	`4054`	`+`
`4051`	`4055`	`for (i = 0; i < ce->num_traits; i++) {`
`4052`	`4056`	`if (ce->traits[i] == trait) {`
`4053`	`4057`	`return;`
`4054`	`4058`	`}`
`4055`	`4059`	`}`
`4056`		`- zend_error(E_COMPILE_ERROR, "Trait %s is not used", trait->name);`
	`4060`	`+ zend_error(E_COMPILE_ERROR, "Required Trait %s wasn't added to %s", trait->name, ce->name);`
`4057`	`4061`	`}`
`4058`	`4062`	`/* }}} */`
`4059`	`4063`