summaryrefslogtreecommitdiff
path: root/Zend/tests
diff options
context:
space:
mode:
authorStefan Marr <gron@php.net>2010-04-22 21:56:55 +0000
committerStefan Marr <gron@php.net>2010-04-22 21:56:55 +0000
commit05a964904386605ed8afcd9e20ce978f1454640d (patch)
treeff9f9d85de3e61f5e7524a141e65fdd498001421 /Zend/tests
parent5234958f8a835587abea7abf7492eadcc5f75773 (diff)
downloadphp-git-05a964904386605ed8afcd9e20ce978f1454640d.tar.gz
Changed the exclusion keyword from 'instead' to 'insteadof'. [TRAITS]
#That was suggested several times already, but am still not sure whether that really reads better. #Especially since only the trait is mentioned, since the method name would be duplicated anyway.
Diffstat (limited to 'Zend/tests')
-rw-r--r--Zend/tests/traits/language003.phpt2
-rw-r--r--Zend/tests/traits/language004.phpt2
-rw-r--r--Zend/tests/traits/language005.phpt4
-rw-r--r--Zend/tests/traits/language009.phpt2
4 files changed, 5 insertions, 5 deletions
diff --git a/Zend/tests/traits/language003.phpt b/Zend/tests/traits/language003.phpt
index 716dda8518..77d4429f43 100644
--- a/Zend/tests/traits/language003.phpt
+++ b/Zend/tests/traits/language003.phpt
@@ -18,7 +18,7 @@ trait World {
class MyHelloWorld {
use Hello, World {
- Hello::saySomething instead World;
+ Hello::saySomething insteadof World;
}
}
diff --git a/Zend/tests/traits/language004.phpt b/Zend/tests/traits/language004.phpt
index ed176dc2a7..4df307ab8d 100644
--- a/Zend/tests/traits/language004.phpt
+++ b/Zend/tests/traits/language004.phpt
@@ -18,7 +18,7 @@ trait World {
class MyHelloWorld {
use Hello, World {
- Hello::saySomething instead World;
+ Hello::saySomething insteadof World;
World::saySomething as sayWorld;
}
}
diff --git a/Zend/tests/traits/language005.phpt b/Zend/tests/traits/language005.phpt
index 5ee7ab0079..20eaeb35c2 100644
--- a/Zend/tests/traits/language005.phpt
+++ b/Zend/tests/traits/language005.phpt
@@ -24,8 +24,8 @@ trait B {
class Talker {
use A, B {
- B::smallTalk instead A;
- A::bigTalk instead B;
+ B::smallTalk insteadof A;
+ A::bigTalk insteadof B;
B::bigTalk as talk;
}
}
diff --git a/Zend/tests/traits/language009.phpt b/Zend/tests/traits/language009.phpt
index 23462e5c17..fdb8a63d2e 100644
--- a/Zend/tests/traits/language009.phpt
+++ b/Zend/tests/traits/language009.phpt
@@ -24,7 +24,7 @@ trait C {
class Foo {
use C, A, B {
- B::foo instead A, C;
+ B::foo insteadof A, C;
}
}