?? ??? 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)
--- /dev/null
+--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
--- /dev/null
+--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
}
}
--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
}
}
--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
}
}
--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
{
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);
}
/* }}} */