svn: /php/php-src/trunk/Zend/tests/traits/ language003.phpt language004.phpt language005.phpt language009.phpt

gron Thu, 22 Apr 2010 21:56:55 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=298347 Log: 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. Changed paths: U php/php-src/trunk/Zend/tests/traits/language003.phpt U php/php-src/trunk/Zend/tests/traits/language004.phpt U php/php-src/trunk/Zend/tests/traits/language005.phpt U php/php-src/trunk/Zend/tests/traits/language009.phpt Modified: php/php-src/trunk/Zend/tests/traits/language003.phpt =================================================================== --- php/php-src/trunk/Zend/tests/traits/language003.phpt 2010-04-22 21:50:53 UTC (rev 298346) +++ php/php-src/trunk/Zend/tests/traits/language003.phpt 2010-04-22 21:56:55 UTC (rev 298347) @@ -18,7 +18,7 @@ class MyHelloWorld { use Hello, World { - Hello::saySomething instead World; + Hello::saySomething insteadof World; } } Modified: php/php-src/trunk/Zend/tests/traits/language004.phpt =================================================================== --- php/php-src/trunk/Zend/tests/traits/language004.phpt 2010-04-22 21:50:53 UTC (rev 298346) +++ php/php-src/trunk/Zend/tests/traits/language004.phpt 2010-04-22 21:56:55 UTC (rev 298347) @@ -18,7 +18,7 @@ class MyHelloWorld { use Hello, World { - Hello::saySomething instead World; + Hello::saySomething insteadof World; World::saySomething as sayWorld; } } Modified: php/php-src/trunk/Zend/tests/traits/language005.phpt =================================================================== --- php/php-src/trunk/Zend/tests/traits/language005.phpt 2010-04-22 21:50:53 UTC (rev 298346) +++ php/php-src/trunk/Zend/tests/traits/language005.phpt 2010-04-22 21:56:55 UTC (rev 298347) @@ -24,8 +24,8 @@ 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; } } Modified: php/php-src/trunk/Zend/tests/traits/language009.phpt =================================================================== --- php/php-src/trunk/Zend/tests/traits/language009.phpt 2010-04-22 21:50:53 UTC (rev 298346) +++ php/php-src/trunk/Zend/tests/traits/language009.phpt 2010-04-22 21:56:55 UTC (rev 298347) @@ -24,7 +24,7 @@ class Foo { use C, A, B { - B::foo instead A, C; + B::foo insteadof A, C; } }