From ef2608925c73430c25ad42a049a1039cd210ae67 Mon Sep 17 00:00:00 2001
From: Sander Roobol <sander@php.net>
Date: Fri, 29 Mar 2002 17:12:11 +0000
Subject: [PATCH] Updating tests: remove alternative syntax in tests, added a
 special alternative-syntax testfile.

---
 tests/lang/002.phpt |  8 ++++---
 tests/lang/003.phpt | 14 +++++++-----
 tests/lang/004.phpt | 10 +++++----
 tests/lang/005.phpt | 13 ++++++-----
 tests/lang/006.phpt | 22 +++++++++++--------
 tests/lang/007.phpt | 40 +++++++++++++++++++---------------
 tests/lang/008.phpt | 20 ++++++++++-------
 tests/lang/009.phpt | 10 +++++----
 tests/lang/010.phpt | 14 +++++++-----
 tests/lang/012.phpt | 12 +++++-----
 tests/lang/013.phpt |  6 ++---
 tests/lang/014.phpt |  4 ++--
 tests/lang/015.phpt |  4 ++--
 tests/lang/016.inc  |  6 ++---
 tests/lang/016.phpt |  4 ++--
 tests/lang/017.phpt | 16 ++++++++------
 tests/lang/022.phpt |  4 ++--
 tests/lang/025.phpt | 29 ++++++++++---------------
 tests/lang/029.phpt |  6 +----
 tests/lang/030.phpt | 17 ++++++++++-----
 tests/lang/031.phpt | 17 +++++++--------
 tests/lang/033.phpt | 53 +++++++++++++++++++++++++++++++++++++++++++++
 22 files changed, 201 insertions(+), 128 deletions(-)
 create mode 100644 tests/lang/033.phpt

diff --git a/tests/lang/002.phpt b/tests/lang/002.phpt
index 9197a9762b..dd2c83b4f6 100644
--- a/tests/lang/002.phpt
+++ b/tests/lang/002.phpt
@@ -3,10 +3,12 @@ Simple While Loop Test
 --POST--
 --GET--
 --FILE--
-<?php $a=1; 
-  while($a<10):
+<?php
+$a=1; 
+while ($a<10) {
 	echo $a;
 	$a++;
-  endwhile?>
+}
+?>
 --EXPECT--
 123456789
diff --git a/tests/lang/003.phpt b/tests/lang/003.phpt
index 23bc99e9f4..cb2a3c38cd 100644
--- a/tests/lang/003.phpt
+++ b/tests/lang/003.phpt
@@ -3,17 +3,19 @@ Simple Switch Test
 --POST--
 --GET--
 --FILE--
-<?php $a=1; 
-  switch($a):
-	case 0;
+<?php
+$a=1; 
+switch($a) {
+	case 0:
 		echo "bad";	
 		break;
-	case 1;
+	case 1:
 		echo "good";
 		break;
-	default;
+	default:
 		echo "bad";
 		break;
-  endswitch?>
+}
+?>
 --EXPECT--
 good
diff --git a/tests/lang/004.phpt b/tests/lang/004.phpt
index be1f98ade5..bd47328c16 100644
--- a/tests/lang/004.phpt
+++ b/tests/lang/004.phpt
@@ -3,11 +3,13 @@ Simple If/Else Test
 --POST--
 --GET--
 --FILE--
-<?php $a=1; 
-  if($a==0):
+<?php
+$a=1; 
+if($a==0) {
 	echo "bad";
-  else:
+} else {
 	echo "good";
-  endif?>	
+}
+?>	
 --EXPECT--
 good
diff --git a/tests/lang/005.phpt b/tests/lang/005.phpt
index ea413769b0..f74590e860 100644
--- a/tests/lang/005.phpt
+++ b/tests/lang/005.phpt
@@ -3,13 +3,16 @@ Simple If/ElseIf/Else Test
 --POST--
 --GET--
 --FILE--
-<?php $a=1; 
-  if($a==0):
+<?php
+$a=1; 
+
+if($a==0) {
 	echo "bad";
-  elseif($a==3):
+} elseif($a==3) {
 	echo "bad";
-  else:
+} else {
 	echo "good";
-  endif?>	
+}
+?>	
 --EXPECT--
 good
diff --git a/tests/lang/006.phpt b/tests/lang/006.phpt
index b0cc9cf0e2..e9e8c2357f 100644
--- a/tests/lang/006.phpt
+++ b/tests/lang/006.phpt
@@ -3,19 +3,23 @@ Nested If/ElseIf/Else Test
 --POST--
 --GET--
 --FILE--
-<?php $a=1; $b=2;
-  if($a==0):
+<?php
+$a=1;
+$b=2;
+
+if($a==0) {
 	echo "bad";
-  elseif($a==3):
+} elseif($a==3) {
 	echo "bad";
-  else:
-	if($b==1):
+} else {
+	if($b==1) {
 		echo "bad";
-	elseif($b==2):
+	} elseif($b==2) {
 		echo "good";
-	else:
+	} else {
 		echo "bad";
-	endif;
-  endif?>	
+	}
+}
+?>	
 --EXPECT--
 good
diff --git a/tests/lang/007.phpt b/tests/lang/007.phpt
index f0aa61f876..04af8111fd 100644
--- a/tests/lang/007.phpt
+++ b/tests/lang/007.phpt
@@ -3,23 +3,27 @@ Function call with global and static variables
 --POST--
 --GET--
 --FILE--
-<?php  error_reporting(0);
-	$a = 10;
-	function Test()
-	{
-		static $a=1;
-		global $b;
-		$c = 1;
-		$b = 5;
-		echo "$a $b ";
-		$a++;
-		$c++;
-		echo "$a $c ";
-	}
-	Test();	
-	echo "$a $b $c ";
-	Test();	
-	echo "$a $b $c ";
-	Test()?>
+<?php
+error_reporting(0);
+$a = 10;
+
+function Test()
+{
+	static $a=1;
+	global $b;
+	$c = 1;
+	$b = 5;
+	echo "$a $b ";
+	$a++;
+	$c++;
+	echo "$a $c ";
+}
+
+Test();	
+echo "$a $b $c ";
+Test();	
+echo "$a $b $c ";
+Test();
+?>
 --EXPECT--
 1 5 2 2 10 5  2 5 3 2 10 5  3 5 4 2 
diff --git a/tests/lang/008.phpt b/tests/lang/008.phpt
index 145214cbb4..1e9c86ff5a 100644
--- a/tests/lang/008.phpt
+++ b/tests/lang/008.phpt
@@ -3,14 +3,18 @@ Testing recursive function
 --POST--
 --GET--
 --FILE--
-<?php  Function Test()
-	{
-		static $a=1;
+<?php
 
-		echo "$a ";	
-		$a++;
-		if($a<10): Test(); endif;
-	}
-	Test()?>
+function Test()
+{
+	static $a=1;
+	echo "$a ";	
+	$a++;
+	if($a<10): Test(); endif;
+}
+
+Test();
+
+?>
 --EXPECT--
 1 2 3 4 5 6 7 8 9 
diff --git a/tests/lang/009.phpt b/tests/lang/009.phpt
index 5498288dcf..96278c22b1 100644
--- a/tests/lang/009.phpt
+++ b/tests/lang/009.phpt
@@ -3,9 +3,11 @@ Testing function parameter passing
 --POST--
 --GET--
 --FILE--
-<?php  old_function Test $a,$b (
-		echo $a+$b;	
-	);
-	Test(1,2)?>
+<?php
+function test ($a,$b) {
+	echo $a+$b;	
+}
+test(1,2);
+?>
 --EXPECT--
 3
diff --git a/tests/lang/010.phpt b/tests/lang/010.phpt
index 03def4b112..e414baae6e 100644
--- a/tests/lang/010.phpt
+++ b/tests/lang/010.phpt
@@ -3,11 +3,13 @@ Testing function parameter passing with a return value
 --POST--
 --GET--
 --FILE--
-<?php  old_function Test $b (
-		$b++;
-		return($b);
-	);
-	$a = Test(1);
-	echo $a?>
+<?php
+function test ($b) {
+	$b++;
+	return($b);
+}
+$a = test(1);
+echo $a;
+?>
 --EXPECT--
 2
diff --git a/tests/lang/012.phpt b/tests/lang/012.phpt
index b3c7abbfda..b54132b906 100644
--- a/tests/lang/012.phpt
+++ b/tests/lang/012.phpt
@@ -4,17 +4,17 @@ Testing stack after early function return
 --GET--
 --FILE--
 <?php 
-old_function F ( 
-	if(1):
+function F () { 
+	if(1) {
 		return("Hello");
-	endif;
-);
+	}
+}
 
 $i=0;
-while($i<2):
+while ($i<2) {
 	echo F();
 	$i++;
-endwhile;
+}
 ?>
 --EXPECT--
 HelloHello
diff --git a/tests/lang/013.phpt b/tests/lang/013.phpt
index 74a8f197f1..4b661c071a 100644
--- a/tests/lang/013.phpt
+++ b/tests/lang/013.phpt
@@ -4,9 +4,9 @@ Testing eval function
 --GET--
 --FILE--
 <?php 
-	error_reporting(0);
-	$a="echo \"Hello\";";
-	eval($a);
+error_reporting(0);
+$a="echo \"Hello\";";
+eval($a);
 ?>
 --EXPECT--
 Hello
diff --git a/tests/lang/014.phpt b/tests/lang/014.phpt
index a03aa47870..6338d7c23c 100644
--- a/tests/lang/014.phpt
+++ b/tests/lang/014.phpt
@@ -4,9 +4,9 @@ Testing eval function inside user-defined function
 --GET--
 --FILE--
 <?php 
-old_function F $a ( 
+function F ($a) { 
 	eval($a);
-);
+}
 
 error_reporting(0);
 F("echo \"Hello\";");
diff --git a/tests/lang/015.phpt b/tests/lang/015.phpt
index e6376067cd..399f802866 100644
--- a/tests/lang/015.phpt
+++ b/tests/lang/015.phpt
@@ -3,8 +3,8 @@ Testing include
 --POST--
 --GET--
 --FILE--
-<?php 
-	include "015.inc";
+<?php
+include "015.inc";
 ?>
 --EXPECT--
 Hello
diff --git a/tests/lang/016.inc b/tests/lang/016.inc
index 7039e3f395..b73333f7b0 100755
--- a/tests/lang/016.inc
+++ b/tests/lang/016.inc
@@ -1,5 +1,5 @@
 <?php 
-	old_function MyFunc $a (
-		echo $a;
-	);
+function MyFunc ($a) {
+	echo $a;
+}
 ?>
diff --git a/tests/lang/016.phpt b/tests/lang/016.phpt
index 238fc29a61..49c4d4d1a6 100644
--- a/tests/lang/016.phpt
+++ b/tests/lang/016.phpt
@@ -4,8 +4,8 @@ Testing user-defined function in included file
 --GET--
 --FILE--
 <?php 
-	include "016.inc";
-	MyFunc("Hello");
+include "016.inc";
+MyFunc("Hello");
 ?>
 --EXPECT--
 Hello
diff --git a/tests/lang/017.phpt b/tests/lang/017.phpt
index 1fc8429a82..bb18194e5d 100644
--- a/tests/lang/017.phpt
+++ b/tests/lang/017.phpt
@@ -3,16 +3,18 @@ Testing user-defined function falling out of an If into another
 --POST--
 --GET--
 --FILE--
-<?php $a = 1;
-old_function Test $a (
-	if($a<3):
+<?php
+$a = 1;
+function Test ($a) {
+	if ($a<3) {
 		return(3);
-	endif;
-);
+	}
+}
 
-if($a < Test($a)):
+if ($a < Test($a)) {
 	echo "$a\n";
 	$a++;
-endif?>
+}
+?>
 --EXPECT--
 1
diff --git a/tests/lang/022.phpt b/tests/lang/022.phpt
index 1465396926..e1847b2c0e 100644
--- a/tests/lang/022.phpt
+++ b/tests/lang/022.phpt
@@ -7,7 +7,7 @@ Switch test 3
 
 function switchtest ($i, $j)
 {
-	switch ($i):
+	switch ($i) {
 		case 0:
 				switch($j) {
 					case 0:
@@ -24,7 +24,7 @@ function switchtest ($i, $j)
 				break;
 		default:
 				echo "Default taken\n";
-	endswitch;
+	}
 }
 for ($i=0; $i<3; $i++) {
   for ($k=0; $k<10; $k++) {
diff --git a/tests/lang/025.phpt b/tests/lang/025.phpt
index 34e0e8d6f4..4f5397d5a8 100644
--- a/tests/lang/025.phpt
+++ b/tests/lang/025.phpt
@@ -4,24 +4,17 @@ Mean recursion test
 --GET--
 --FILE--
 <?php 
-old_function RekTest $nr (
-
-echo " $nr ";
-
-
-$j=$nr+1;
-while ($j < 10)
-{
-  echo " a ";
-  RekTest($j);
-  $j++;
-  echo " b $j ";
-};
-echo "\n";
-
-
-
-);
+function RekTest ($nr) {
+	echo " $nr ";
+	$j=$nr+1;
+	while ($j < 10) {
+	  echo " a ";
+	  RekTest($j);
+	  $j++;
+	  echo " b $j ";
+	}
+	echo "\n";
+}
 
 RekTest(0);
 ?>
diff --git a/tests/lang/029.phpt b/tests/lang/029.phpt
index 6226d42880..4fcaa3811a 100644
--- a/tests/lang/029.phpt
+++ b/tests/lang/029.phpt
@@ -6,11 +6,7 @@ OO Bug Test (Bug #7515)
 <?php
 class obj {
 	function method() {}
-    }
-
-function test($o_copy) {
-	$o_copy->root->set_in_copied_o=TRUE;
- 	var_dump($o_copy);?><BR><?php }
+}
 
 $o->root=new obj();
 
diff --git a/tests/lang/030.phpt b/tests/lang/030.phpt
index 162997fca9..ba809c8e31 100644
--- a/tests/lang/030.phpt
+++ b/tests/lang/030.phpt
@@ -8,13 +8,17 @@ class foo {
 	function foo($name) {
      	$GLOBALS['List']= &$this;
      	$this->Name = $name;
-		$GLOBALS['List']->echoName(); }
+		$GLOBALS['List']->echoName();
+	}
 
 	function echoName() {
-     	$GLOBALS['names'][]=$this->Name; } }
+     	$GLOBALS['names'][]=$this->Name;
+	}
+}
 
-function &foo2(&$foo)	{
-	return $foo; }
+function &foo2(&$foo) {
+	return $foo;
+}
 
 
 $bar1 =& new foo('constructor');
@@ -28,6 +32,7 @@ $bar1->echoName();
 
 $List->echoName();
 
-print ($names==array('constructor','outside','outside','constructor','outside','outside')) ? 'success':'failure'; ?>
+print ($names==array('constructor','outside','outside','constructor','outside','outside')) ? 'success':'failure';
+?>
 --EXPECT--
-success
\ No newline at end of file
+success
diff --git a/tests/lang/031.phpt b/tests/lang/031.phpt
index b74d135748..bb3d776239 100644
--- a/tests/lang/031.phpt
+++ b/tests/lang/031.phpt
@@ -5,17 +5,16 @@ Internal hash position bug on assignment (Bug #16227)
 --FILE--
 <?php
 // reported by php.net@alienbill.com
-       $outsidearray = array("key1","key2");
-       $insidearray = array("0","1");
+$outsidearray = array("key1","key2");
+$insidearray = array("0","1");
 
-           while(list(,$outerval) = each($outsidearray)){
-               $placeholder = $insidearray;
-               while(list(,$innerval) = each($insidearray)){
-                       print "inloop $innerval for $outerval\n";
-               }
-       }
+while(list(,$outerval) = each($outsidearray)){
+	$placeholder = $insidearray;
+	while(list(,$innerval) = each($insidearray)){
+    		print "inloop $innerval for $outerval\n";
+	}
+}
 ?>
 --EXPECT--
 inloop 0 for key1
 inloop 1 for key1
-
diff --git a/tests/lang/033.phpt b/tests/lang/033.phpt
new file mode 100644
index 0000000000..0fb639ad53
--- /dev/null
+++ b/tests/lang/033.phpt
@@ -0,0 +1,53 @@
+--TEST--
+Alternative syntaxes test
+--POST--
+--GET--
+--FILE--
+<?php
+$a = 1;
+
+echo "If: ";
+if ($a) echo 1; else echo 0;
+if ($a):
+	echo 1;
+else:
+	echo 0;
+endif;
+
+echo "\nWhile: ";
+while ($a<5) echo $a++;
+while ($a<9):
+	echo ++$a;
+endwhile;
+
+echo "\nFor: ";
+for($a=0;$a<5;$a++) echo $a;
+for($a=0;$a<5;$a++):
+	echo $a;
+endfor;
+
+echo "\nSwitch: ";
+switch ($a):
+	case 0;
+		echo 0;
+		break;
+	case 5:
+		echo 1;
+		break;
+	default;
+		echo 0;
+		break;
+endswitch;
+
+echo "\nold_function: ";
+old_function foo $bar, $baz (
+	return sprintf("foo(%s, %s);\n", $bar, $baz);
+);
+echo foo(1,2);
+?>
+--EXPECT--
+If: 11
+While: 12346789
+For: 0123401234
+Switch: 1
+old_function: foo(1, 2);
-- 
2.50.1