clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Xinchen Hui 2013-02-21 18:18:41 +08:00
parent bae95bd9d4
commit 9a44a9806c
7 changed files with 79 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -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)

34
Zend/tests/traits/bug64235.phpt Normal file
View File

@ -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

35
Zend/tests/traits/bug64235b.phpt Normal file
View File

@ -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

2
Zend/tests/traits/language015.phpt
View File

@ -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

2
Zend/tests/traits/language016.phpt
View File

@ -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

2
Zend/tests/traits/language017.phpt
View File

@ -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

6
Zend/zend_compile.c
View File

@ -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);
}
/* }}} */