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.

diff --git a/Zend/tests/traits/language003.phpt b/Zend/tests/traits/language003.phpt
index 716dda8518103ed41acf0a0cb0303258ec80900a..77d4429f43a9192dbdee0df93ebe18a49493bcd4 100644 (file)
--- 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 ed176dc2a7afdbc0936b7d82f5efc408e3342eae..4df307ab8df95320bf5d7135e14f957dc15b28a3 100644 (file)
--- 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 5ee7ab0079edbe2b69f360b1a8f7e64674981e33..20eaeb35c256ec7087eeaca32717488dea0d0518 100644 (file)
--- 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 23462e5c17b951ab45e8b3ea86f98da305085631..fdb8a63d2e9859d0f88b7820e389c655c0bf3446 100644 (file)
--- 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; 
        }
 }