Skip to content

Commit 514ecba

Browse files
committed
Enable better conflict message
1 parent e141e08 commit 514ecba

11 files changed

+10
-15
lines changed

Zend/tests/traits/bug55554e.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ class ReportCollision {
2525
echo "ReportCollision: ";
2626
$o = new ReportCollision;
2727
--EXPECTF--
28-
Fatal error: Trait method ReportCollision has not been applied, because there are collisions with other trait methods on ReportCollision in %s on line %d
28+
Fatal error: Trait method TC2::ReportCollision has not been applied as ReportCollision::ReportCollision, because of collision with TC1::ReportCollision in %s on line %d

Zend/tests/traits/bugs/case-sensitive.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ class MyClass {
2020
}
2121
?>
2222
--EXPECTF--
23-
Fatal error: Trait method M1 has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d
23+
Fatal error: Trait method B::M1 has not been applied as MyClass::M1, because of collision with A::M1 in %s

Zend/tests/traits/conflict001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ class TraitsTest {
2222
}
2323
?>
2424
--EXPECTF--
25-
Fatal error: Trait method hello has not been applied, because there are collisions with other trait methods on TraitsTest in %s on line %d
25+
Fatal error: Trait method THello2::hello has not been applied as TraitsTest::hello, because of collision with THello1::hello in %s on line %d

Zend/tests/traits/conflict003.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ class Talker {
2828

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

Zend/tests/traits/error_011.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ var_dump($x->test());
2323

2424
?>
2525
--EXPECTF--
26-
Fatal error: Trait method test has not been applied, because there are collisions with other trait methods on bar in %s on line %d
26+
Fatal error: Trait method c::test has not been applied as bar::test, because of collision with foo::test in %s

Zend/tests/traits/error_015.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ var_dump($x->test());
2323

2424
?>
2525
--EXPECTF--
26-
Fatal error: Trait method test has not been applied, because there are collisions with other trait methods on bar in %s on line %d
26+
Fatal error: Trait method baz::test has not been applied as bar::test, because of collision with foo::test in %s

Zend/tests/traits/language010.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ $o->world();
2727

2828
?>
2929
--EXPECTF--
30-
Fatal error: Trait method world has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d
30+
Fatal error: Trait method World::world has not been applied as MyClass::world, because of collision with Hello::hello in %s on line %d

Zend/tests/traits/language011.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ $o->sayWorld();
2727

2828
?>
2929
--EXPECTF--
30-
Fatal error: Trait method sayHello has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d
30+
Fatal error: Trait method World::sayHello has not been applied as MyClass::sayHello, because of collision with Hello::sayHello in %s on line %d

Zend/tests/traits/language014.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ $o->world();
2727

2828
?>
2929
--EXPECTF--
30-
Fatal error: Trait method hello has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d
30+
Fatal error: Trait method World::world has not been applied as MyClass::hello, because of collision with Hello::hello in %s on line %d

Zend/tests/traits/methods_002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ var_dump(clone $o);
2525

2626
?>
2727
--EXPECTF--
28-
Fatal error: Trait method __clone has not been applied, because there are collisions with other trait methods on bar in %s on line %d
28+
Fatal error: Trait method baz::__clone has not been applied as bar::__clone, because of collision with foo::__clone in %s

0 commit comments

Comments
 (0)