From 05a964904386605ed8afcd9e20ce978f1454640d Mon Sep 17 00:00:00 2001
From: Stefan Marr <gron@php.net>
Date: Thu, 22 Apr 2010 21:56:55 +0000
Subject: 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.

---
 Zend/tests/traits/language003.phpt | 2 +-
 Zend/tests/traits/language004.phpt | 2 +-
 Zend/tests/traits/language005.phpt | 4 ++--
 Zend/tests/traits/language009.phpt | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'Zend/tests/traits')

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; 
 	}
 }
 
-- 
cgit v1.2.1