diff options
| -rw-r--r-- | Zend/tests/traits/bug64235.phpt | 34 | ||||
| -rw-r--r-- | Zend/tests/traits/bug64235b.phpt | 35 | ||||
| -rw-r--r-- | Zend/tests/traits/language015.phpt | 2 | ||||
| -rw-r--r-- | Zend/tests/traits/language016.phpt | 2 | ||||
| -rw-r--r-- | Zend/tests/traits/language017.phpt | 2 | ||||
| -rw-r--r-- | Zend/zend_compile.c | 6 |
6 files changed, 77 insertions, 4 deletions
diff --git a/Zend/tests/traits/bug64235.phpt b/Zend/tests/traits/bug64235.phpt new file mode 100644 index 0000000000..d0a2a98a8c --- /dev/null +++ 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 new file mode 100644 index 0000000000..a326ec02c3 --- /dev/null +++ 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 index df1f744841..0c9fb4afb2 100644 --- 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 index e9281198e5..1c6bbeabac 100644 --- 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 index 56f9e2409c..539a05d02f 100644 --- 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 index 701151106a..e45419d3f0 100644 --- 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); } /* }}} */ |