- Convert cfunction -> function.

diff --git a/tests/classes/class_example.phpt b/tests/classes/class_example.phpt
index d3d1b45f597a7d708d2c871439d3377b9b5fd5f7..8f07c278fcaf24a4ba41bd699a2ec122b7fd181c 100644 (file)
--- a/tests/classes/class_example.phpt
+++ b/tests/classes/class_example.phpt
@@ -10,7 +10,7 @@ Classes general test
 
 class user {
   var $first_name,$family_name,$address,$phone_num;
-  cfunction display()
+  function display()
   {
     echo "User information\n";
     echo "----------------\n\n";
@@ -20,7 +20,7 @@ class user {
     echo "Phone:\t\t  ".$this->phone_num."\n";
     echo "\n\n";
   }
-  cfunction initialize($first_name,$family_name,$address,$phone_num)
+  function initialize($first_name,$family_name,$address,$phone_num)
   {
     $this->first_name = $first_name;
     $this->family_name = $family_name;

diff --git a/tests/classes/inheritance.phpt b/tests/classes/inheritance.phpt
index 45aafab7de8cfaf910fbe298d920d9102f3933f3..2a2f0f755bffb618b00633b6cdcb2121e82783ca 100644 (file)
--- a/tests/classes/inheritance.phpt
+++ b/tests/classes/inheritance.phpt
@@ -10,19 +10,19 @@ Classes inheritance test
 class foo {
   var $a;
   var $b;
-  cfunction display() {
+  function display() {
        echo "This is class foo\n";
     echo "a = ".$this->a."\n";
     echo "b = ".$this->b."\n";
   }
-  cfunction mul() {
+  function mul() {
     return $this->a*$this->b;
   }
 };
 
 class bar extends foo {
   var $c;
-  cfunction display() {  /* alternative display function for class bar */
+  function display() {  /* alternative display function for class bar */
     echo "This is class bar\n";
     echo "a = ".$this->a."\n";
     echo "b = ".$this->b."\n";

diff --git a/tests/lang/019.phpt b/tests/lang/019.phpt
index 43ab7e29e6b8b1d61f40804da687bdc8c5af6c1d..f8339b94a39c09daf8f8433d4a400324e0be428d 100644 (file)
--- a/tests/lang/019.phpt
+++ b/tests/lang/019.phpt
@@ -7,7 +7,7 @@ eval() test
 
 error_reporting(0);
 
-eval("cfunction test() { echo \"hey, this is a function inside an eval()!\\n\"; }");
+eval("function test() { echo \"hey, this is a function inside an eval()!\\n\"; }");
 
 $i=0;
 while ($i<10) {

diff --git a/tests/lang/022.phpt b/tests/lang/022.phpt
index 5c07f7d79153289a85fe02e072797a1c3a92cdcc..1465396926a1c51b153a21791ceb3e501832f7e1 100644 (file)
--- a/tests/lang/022.phpt
+++ b/tests/lang/022.phpt
@@ -5,7 +5,7 @@ Switch test 3
 --FILE--
 <?php 
 
-cfunction switchtest ($i, $j)
+function switchtest ($i, $j)
 {
        switch ($i):
                case 0: