archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Enable better trait conflict error message

Browse source 
I don't think there is any reason to disable this anymore,
at least all the messages generated in tests look correct and
more useful.
This commit is contained in:
Nikita Popov 2020-03-10 16:17:32 +01:00
parent fff5771ccc
commit d9219f997d
10 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/tests/traits/bugs/case-sensitive.phpt
View file

@ -20,4 +20,4 @@ class MyClass {
} }
?> ?>
--EXPECTF-- --EXPECTF--
Fatal error: Trait method M1 has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d Fatal error: Trait method B::M1 has not been applied as MyClass::M1, because of collision with A::M1 in %s on line %d

2
Zend/tests/traits/conflict001.phpt
View file

@ -22,4 +22,4 @@ class TraitsTest {
} }
?> ?>
--EXPECTF-- --EXPECTF--
Fatal error: Trait method hello has not been applied, because there are collisions with other trait methods on TraitsTest in %s on line %d Fatal error: Trait method THello2::hello has not been applied as TraitsTest::hello, because of collision with THello1::hello in %s on line %d

2
Zend/tests/traits/conflict003.phpt
View file

@ -28,4 +28,4 @@ class Talker {
?> ?>
--EXPECTF-- --EXPECTF--
Fatal error: Trait method smallTalk has not been applied, because there are collisions with other trait methods on Talker in %s on line %d Fatal error: Trait method B::smallTalk has not been applied as Talker::smallTalk, because of collision with A::smallTalk in %s on line %d

2
Zend/tests/traits/error_011.phpt
View file

@ -23,4 +23,4 @@ var_dump($x->test());
?> ?>
--EXPECTF-- --EXPECTF--
Fatal error: Trait method test has not been applied, because there are collisions with other trait methods on bar in %s on line %d Fatal error: Trait method c::test has not been applied as bar::test, because of collision with foo::test in %s on line %d

2
Zend/tests/traits/error_015.phpt
View file

@ -23,4 +23,4 @@ var_dump($x->test());
?> ?>
--EXPECTF-- --EXPECTF--
Fatal error: Trait method test has not been applied, because there are collisions with other trait methods on bar in %s on line %d Fatal error: Trait method baz::test has not been applied as bar::test, because of collision with foo::test in %s on line %d

2
Zend/tests/traits/language010.phpt
View file

@ -27,4 +27,4 @@ $o->world();
?> ?>
--EXPECTF-- --EXPECTF--
Fatal error: Trait method world has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d Fatal error: Trait method World::world has not been applied as MyClass::world, because of collision with Hello::world in %s on line %d

2
Zend/tests/traits/language011.phpt
View file

@ -27,4 +27,4 @@ $o->sayWorld();
?> ?>
--EXPECTF-- --EXPECTF--
Fatal error: Trait method sayHello has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d Fatal error: Trait method World::sayHello has not been applied as MyClass::sayHello, because of collision with Hello::sayHello in %s on line %d

2
Zend/tests/traits/language014.phpt
View file

@ -27,4 +27,4 @@ $o->world();
?> ?>
--EXPECTF-- --EXPECTF--
Fatal error: Trait method hello has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d Fatal error: Trait method World::world has not been applied as MyClass::hello, because of collision with Hello::hello in %s on line %d

2
Zend/tests/traits/methods_002.phpt
View file

@ -25,4 +25,4 @@ var_dump(clone $o);
?> ?>
--EXPECTF-- --EXPECTF--
Fatal error: Trait method __clone has not been applied, because there are collisions with other trait methods on bar in %s on line %d Fatal error: Trait method baz::__clone has not been applied as bar::__clone, because of collision with foo::__clone in %s on line %d

5
Zend/zend_inheritance.c
View file

@ -1612,15 +1612,10 @@ static void zend_add_trait_method(zend_class_entry *ce, zend_string *name, zend_
} else if (UNEXPECTED((existing_fn->common.scope->ce_flags & ZEND_ACC_TRAIT) } else if (UNEXPECTED((existing_fn->common.scope->ce_flags & ZEND_ACC_TRAIT)
&& !(existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT))) { && !(existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT))) {
/* two traits can't define the same non-abstract method */ /* two traits can't define the same non-abstract method */
#if 1
zend_error_noreturn(E_COMPILE_ERROR, "Trait method %s has not been applied, because there are collisions with other trait methods on %s",
ZSTR_VAL(name), ZSTR_VAL(ce->name));
#else /* TODO: better error message */
zend_error_noreturn(E_COMPILE_ERROR, "Trait method %s::%s has not been applied as %s::%s, because of collision with %s::%s", zend_error_noreturn(E_COMPILE_ERROR, "Trait method %s::%s has not been applied as %s::%s, because of collision with %s::%s",
ZSTR_VAL(fn->common.scope->name), ZSTR_VAL(fn->common.function_name), ZSTR_VAL(fn->common.scope->name), ZSTR_VAL(fn->common.function_name),
ZSTR_VAL(ce->name), ZSTR_VAL(name), ZSTR_VAL(ce->name), ZSTR_VAL(name),
ZSTR_VAL(existing_fn->common.scope->name), ZSTR_VAL(existing_fn->common.function_name)); ZSTR_VAL(existing_fn->common.scope->name), ZSTR_VAL(existing_fn->common.function_name));
#endif
} else { } else {
/* inherited members are overridden by members inserted by traits */ /* inherited members are overridden by members inserted by traits */
/* check whether the trait method fulfills the inheritance requirements */ /* check whether the trait method fulfills the inheritance requirements */