X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
index c2ba473..0f3e50e 100644
--- a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
+++ b/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
@@ -7,55 +7,181 @@ package net.sourceforge.phpeclipse.tests.parser;
  * distribution, and is available at http://www.eclipse.org/legal/cpl-v10.html
  ******************************************************************************/
 import net.sourceforge.phpdt.core.tests.util.AbstractCompilerTest;
-import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
 
 /**
  * Tests the php parser
  */
 public class PHPParserTestCase extends AbstractCompilerTest {
-	// Parser parser;
+
 	public PHPParserTestCase(String name) {
 		super(name);
 	}
 
 	/**
+	 * Test the PHP Parser with failing PHP snippets
+	 * 
+	 */
+	public void testPHPParserFailingSyntax() {
+		checkPHP(
+				"i=10;",
+				"----------\n"
+						+ "1. ERROR in  (at line 1)\n"
+						+ "	i=10;\n"
+						+ "	 ^^\n"
+						+ "Parser error \"Assignment operator \'=\' not allowed after identifier \'i\' (use \'define(...)\' to define constants).\"\n"
+						+ "----------\n");
+	}
+
+	/**
+	 * Test Interface Extending multiple Interfaces
+	 * 
+	 * This is valid PHP5 syntax Bug 1431425
+	 */
+	public void testMIInterfaceExtendsInterface() {
+		// valid PHP5
+		checkPHP("interface a {}\n" + "interface b {}\n" + "\n"
+				+ "interface c extends a, b\n" + "{}\n");
+	}
+
+	/**
+	 * Test Interface implementing multiple Interfaces
+	 * 
+	 * This is invalid PHP5 syntax Bug 1431425
+	 */
+	public void testMIInterfaceImplementsInterface() {
+		// invalid PHP5
+		checkPHP(
+				"interface a {}\n" + "interface b {}\n" + "\n"
+						+ "interface c implements a, b\n" + "{}\n",
+				"----------\n"
+						+ "1. ERROR in  (at line 1)\n"
+						+ "	interface c implements a, b\n"
+						+ "	            ^^^^^^^^^^^\n"
+						+ "Parser error \"'{' expected at start of class body.\"\n"
+						+ "----------\n"
+						+ "2. ERROR in  (at line 1)\n"
+						+ "	{}\n"
+						+ "\n"
+						+ "	 ^^\n"
+						+ "Parser error \"Too many closing '}'; end-of-file not reached.\"\n"
+						+ "----------\n");
+
+	}
+
+	/**
+	 * Test Class Extending multiple Interfaces
+	 * 
+	 * This is invalid PHP5 syntax Bug 1431425
+	 */
+	public void testMIClassExtendsInterface() {
+		// invalid PHP5
+		checkPHP(
+				"interface a {}\n" + "interface b {}\n" + "\n"
+						+ "class c extends a, b\n" + "{}\n",
+				"----------\n"
+						+ "1. ERROR in  (at line 1)\n"
+						+ "	class c extends a, b\n"
+						+ "	                 ^^\n"
+						+ "Parser error \"No multiple inheritence allowed. Expected token \'implements\' or \'{\'.\"\n"
+						+ "----------\n");
+	}
+
+	/**
+	 * Test Class implementing multiple Interfaces
+	 * 
+	 * This is valid PHP5 syntax Bug 1431425
+	 */
+	public void testMIClassImplementsInterfaces() {
+		// valid PHP5
+		checkPHP("interface a {}\n" + "interface b {}\n" + "\n"
+				+ "class c implements a, b\n" + "{}\n");
+	}
+
+	/**
+	 * Test Class Implementing multiple classes
+	 * 
+	 * This is invalid PHP5 syntax Bug 1431425
+	 */
+	public void testMIClassImplementsClasses() {
+		// invalid PHP5
+		checkPHP("class a {}\n" + "class b {}\n" + "\n"
+				+ "class c implements a, b\n" + "{}\n",
+				"This should fail, but doesn't currently.");
+	}
+
+	/**
+	 * Test Class Extending multiple Classes
+	 * 
+	 * This is invalid PHP5 syntax Bug 1431425
+	 */
+	public void testMIClassExtendsClasses() {
+		// invalid PHP5
+		checkPHP(
+				"class a {}\n" + "class b {}\n" + "\n"
+						+ "class c extends a, b\n" + "{}\n",
+				"----------\n"
+						+ "1. ERROR in  (at line 1)\n"
+						+ "	class c extends a, b\n"
+						+ "	                 ^^\n"
+						+ "Parser error \"No multiple inheritence allowed. Expected token \'implements\' or \'{\'.\"\n"
+						+ "----------\n");
+	}
+
+	/**
 	 * Test the PHP Parser with different PHP snippets
 	 */
-	public void testPHPParser() {
-		// checkPHP("i=10;"); // should get an error !
+	public void testPHPParserGoodSyntax() {
+		checkPHP("$y=self::$x->huba;");
+		checkPHP("self::x()->set();");
 		checkPHP("$test=\"{4IP}/{$include}\";");
 		checkPHP("$this->mRegex = \"/{$this->mBaseRegex}/{$case}\";");
 		checkPHP("$schema_create .= \" DEFAULT \'$row[Default]\'\";");
 		checkPHP("$stringVar=\"ein normaler $varText\";");
 		checkPHP("$stringVar=\'ein normaler $varText\';");
-		checkPHP("switch ($aItem[ELM_NAME]) {\r\n" + "                case \'channel\':\r\n"
-				+ "                    $this->readChannel($aItem);\r\n" + "                    break;\r\n"
-				+ "                case \'item\':\r\n" + "                    $this->readItem($aItem);\r\n"
-				+ "                    break;\r\n" + "                default:\r\n" + "                    //printr($aItem);\r\n"
-				+ "            }");
-		checkPHP("try {echo $Stream->readAll(); } catch (Exception $e) {\r\n" + "            // Swallow exception\r\n" + "        }");
-
-		checkHTML("<?php\n" + "	  function overLib($path = \"\") {\n" + "\n" + "	  	if (strlen($path)) $this->ol_path = $path;\n"
-				+ "\n" + "?>\n" + "\n" + "<nolink rel=\'stylesheet\' href=<?php echo \"\'$this->ol_path/overlib.css\' \"; ?> \n" + "\n"
-				+ "      type=\'text/css\'>\n" + "\n"
-				+ "<div id=\'overDiv\' style=\'position:absolute; visibility:hide; z-index: 1000;\'>\n" + "\n" + "</div>\n" + "\n"
-				+ "<script language=\'javascript\' src=<?php echo \"\'$this->ol_path/overlib.js\'\"; ?>>\n" + "\n" + "</script>\n" + "\n"
-				+ "<?php\n" + "\n" + "	  } \n" + "?>");
+		checkPHP("switch ($aItem[ELM_NAME]) {\r\n"
+				+ "                case \'channel\':\r\n"
+				+ "                    $this->readChannel($aItem);\r\n"
+				+ "                    break;\r\n"
+				+ "                case \'item\':\r\n"
+				+ "                    $this->readItem($aItem);\r\n"
+				+ "                    break;\r\n"
+				+ "                default:\r\n"
+				+ "                    //printr($aItem);\r\n" + "            }");
+		checkPHP("try {echo $Stream->readAll(); } catch (Exception $e) {\r\n"
+				+ "            // Swallow exception\r\n" + "        }");
+
+		checkHTML("<?php\n"
+				+ "	  function overLib($path = \"\") {\n"
+				+ "\n"
+				+ "	  	if (strlen($path)) $this->ol_path = $path;\n"
+				+ "\n"
+				+ "?>\n"
+				+ "\n"
+				+ "<nolink rel=\'stylesheet\' href=<?php echo \"\'$this->ol_path/overlib.css\' \"; ?> \n"
+				+ "\n"
+				+ "      type=\'text/css\'>\n"
+				+ "\n"
+				+ "<div id=\'overDiv\' style=\'position:absolute; visibility:hide; z-index: 1000;\'>\n"
+				+ "\n"
+				+ "</div>\n"
+				+ "\n"
+				+ "<script language=\'javascript\' src=<?php echo \"\'$this->ol_path/overlib.js\'\"; ?>>\n"
+				+ "\n" + "</script>\n" + "\n" + "<?php\n" + "\n" + "	  } \n"
+				+ "?>");
 		checkPHP("$t = \') {$ya[]=\'.$this->iFunc.\';$xa[]=\'.$this->iXFunc.\';}\';");
-		checkPHP("$output .=  \n" + "            \"\\$_smarty_tpl_vars = \\$this->_tpl_vars;\\n\" . \n"
+		checkPHP("$output .=  \n"
+				+ "            \"\\$_smarty_tpl_vars = \\$this->_tpl_vars;\\n\" . \n"
 				+ "            \"\\$this->_smarty_include(\".$include_file.\", array(\".implode(\',\', (array)$arg_list).\"));\\n\" .\n"
-				+ "            \"\\$this->_tpl_vars = \\$_smarty_tpl_vars;\\n\" .\n" + "            \"unset(\\$_smarty_tpl_vars);\\n\";");
+				+ "            \"\\$this->_tpl_vars = \\$_smarty_tpl_vars;\\n\" .\n"
+				+ "            \"unset(\\$_smarty_tpl_vars);\\n\";");
 		checkPHP("$test=\"=$post_id#$post_id\"");
 		checkPHP("$comments .= \"        \\${$attrname}[\'xmlns\'] = \'{$this->namespaces[$_argtype[\'namespace\']]}\';\\n\";");
 		checkPHP("$this->_raiseSoapFault(\"method \'{{$this->method_namespace}}$this->methodname\' not defined in service\",\'\',\'\',\'Server\');");
 
-		// checkPHP("$emailer->assign_vars(array(\r\n" +
-		// " \'U_TOPIC\' => $server_protocol . POST_POST_URL .
-		// \"=$post_id#$post_id\",\r\n" +
-		// " \'U_STOP_WATCHING_TOPIC\' => $server_protocol . $server_name .
-		// $server_port . $script_name . \'&\' . POST_TOPIC_URL .
-		// \"=$topic_id&unwatch=topic\")\r\n" +
-		// " );");
+		checkPHP("$emailer->assign_vars(array(\r\n"
+				+ " \'U_TOPIC\' => $server_protocol . POST_POST_URL . \"=$post_id#$post_id\",\r\n"
+				+ " \'U_STOP_WATCHING_TOPIC\' => $server_protocol . $server_name . $server_port . $script_name . \'&\' . POST_TOPIC_URL . \"=$topic_id&unwatch=topic\")\r\n"
+				+ " );");
 		checkPHP("$_compile_data = \'<?php $_config_vars = unserialize(\\\'\' . str_replace(\'\\\'\',\'\\\\\\\'\', serialize($_config_vars)) . \'\\\'); return true; ?>\';");
 		checkPHP("$output = \'<?php \';");
 		checkPHP("$key_part = \'\';");
@@ -73,56 +199,94 @@ public class PHPParserTestCase extends AbstractCompilerTest {
 		checkPHP("do {$array[] = array(\"$myrow[uid]\" => \"$myrow[uname]\"); } while($myrow = mysql_fetch_array($result));");
 		checkPHP("\"\\\"\";");
 		checkPHP(" print \"$value\"; \n");
-		checkPHP("if ($shape instanceof Rectangle) { \n" + "    print \'$shape is a Rectangle\'; \n" + "} ");
+		checkPHP("if ($shape instanceof Rectangle) { \n"
+				+ "    print \'$shape is a Rectangle\'; \n" + "} ");
 		checkPHP("$test=\"values(\'$user\',\'${res[\"name\"]}\'  \";");
 
 		checkPHP("$this->raiseError(\"The auth mode: $mode isn\'t implemented\");");
 		checkPHP("\'<img src=\"\'");
 		checkPHP("$test=\"values(\'$user\',\'${res[\"name\"]}\',\'${res[\"position\"]}\',\'${res[\"ord\"]}\',\'${res[\"type\"]}\',\'${res[\"title\"]}\',\'${res[\"cache_time\"]}\',\'${res[\"rows\"]}\',\'${res[\"groups\"]}\',\'${res[\"params\"]}\')\";");
-		checkPHP("class tiki_phpOpenTracker extends TikiLib, phpOpenTracker { }");
+		// checkPHP("class tiki_phpOpenTracker extends TikiLib, phpOpenTracker {
+		// }");
 		checkPHP("$template_source = $prefilter[0]($template_source, $this);");
 		checkPHP("$keyval[] = $this->{$this->_keycolumn[$i]};");
-		checkPHP("$this->_reg_objects[$object] =\n" + "     array(&$object_impl, $allowed, $smarty_args);");
-		checkPHP("echo <<< EOF\n" + "        <table border=\'1\'><tr><td>\n" + "EOF;");
-		checkPHP("interface Shape { \n" + "    function draw(); \n" + "} \n" + "\n" + "class Rectangle implements Shape { \n"
-				+ "    function draw() { \n" + "        print \"Drawing a rectangle\"; \n" + "    } \n" + "}");
-		checkPHP("class MyClass { \n" + "    private $priv; \n" + "\n" + "    public function getVar() { \n"
+		checkPHP("$this->_reg_objects[$object] =\n"
+				+ "     array(&$object_impl, $allowed, $smarty_args);");
+		checkPHP("echo <<< EOF\n" + "        <table border=\'1\'><tr><td>\n"
+				+ "EOF;");
+		checkPHP("interface Shape { \n" + "    function draw(); \n" + "} \n"
+				+ "\n" + "class Rectangle implements Shape { \n"
+				+ "    function draw() { \n"
+				+ "        print \"Drawing a rectangle\"; \n" + "    } \n"
+				+ "}");
+		checkPHP("class MyClass { \n" + "    private $priv; \n" + "\n"
+				+ "    public function getVar() { \n"
 				+ "        return $this->priv; \n" + "    } \n" + "} ");
-		checkPHP("class Test { \n" + "    function __construct() { \n" + "        print \"Test	 constructor\"; \n" + "    } \n" + "}");
-		checkPHP("class Test { \n" + "    function __destruct() { \n" + "        print \"Destroying Test object\"; \n" + "    } \n"
+		checkPHP("class Test { \n" + "    function __construct() { \n"
+				+ "        print \"Test	 constructor\"; \n" + "    } \n" + "}");
+		checkPHP("class Test { \n" + "    function __destruct() { \n"
+				+ "        print \"Destroying Test object\"; \n" + "    } \n"
 				+ "}");
 
-		checkPHP("class Test { \n" + "    final function doNotOverload() { \n" + "        return __CLASS__; \n" + "    } \n" + "}");
-		checkPHP("final class Test { \n" + "} \n" + "\n" + "class DoNotInherit extends Test { \n" + "}");
-		checkPHP("class Test { \n" + "    function __clone() { \n" + "        print \"Clone test object\"; \n" + "    } \n" + "} \n"
-				+ "$test = new Test(); \n" + "clone $test; ");
-		checkPHP("class Test { \n" + "    const SEMICOLON = \";\"; \n" + "    const QUESTIONMARK = \"?\"; \n" + "} \n"
+		checkPHP("class Test { \n" + "    final function doNotOverload() { \n"
+				+ "        return __CLASS__; \n" + "    } \n" + "}");
+		checkPHP("final class Test { \n" + "} \n" + "\n"
+				+ "class DoNotInherit extends Test { \n" + "}");
+		checkPHP("class Test { \n" + "    function __clone() { \n"
+				+ "        print \"Clone test object\"; \n" + "    } \n"
+				+ "} \n" + "$test = new Test(); \n" + "clone $test; ");
+		checkPHP("class Test { \n" + "    const SEMICOLON = \";\"; \n"
+				+ "    const QUESTIONMARK = \"?\"; \n" + "} \n"
 				+ "print Test::SEMICOLON; ");
-		checkPHP("class Singleton { \n" + "    static $instance = NULL; \n" + "    function getInstance() { \n"
-				+ "        if ($this->instance == NULL) { \n" + "            $this->instance = new Singleton(); \n" + "        } \n"
-				+ "        return $this->instance; \n" + "    } \n" + "} ");
-		checkPHP("class Test { \n" + "    static function helloWorld() { \n" + "        print \"Hello, world\"; \n" + "    } \n"
-				+ "} \n" + "Test::helloWorld();");
-		checkPHP("abstract class Test { \n" + "    function draw() { \n" + "        print \"Inside draw()\"; \n" + "    } \n" + "} ");
-		checkPHP("abstract class Test { \n" + "    abstract function draw(); \n" + "} ");
+		checkPHP("class Singleton { \n" + "    static $instance = NULL; \n"
+				+ "    function getInstance() { \n"
+				+ "        if ($this->instance == NULL) { \n"
+				+ "            $this->instance = new Singleton(); \n"
+				+ "        } \n" + "        return $this->instance; \n"
+				+ "    } \n" + "} ");
+		checkPHP("class Test { \n" + "    static function helloWorld() { \n"
+				+ "        print \"Hello, world\"; \n" + "    } \n" + "} \n"
+				+ "Test::helloWorld();");
+		checkPHP("abstract class Test { \n" + "    function draw() { \n"
+				+ "        print \"Inside draw()\"; \n" + "    } \n" + "} ");
+		checkPHP("abstract class Test { \n"
+				+ "    abstract function draw(); \n" + "} ");
 		checkPHP("function f1(Test $test) { \n" + "\n" + "}");
 		checkPHP("$test->m1()->m2(); ");
-		checkPHP("$test = new IteratorImpl(); \n" + "foreach ($test as $value) { \n" + "    print \"$value\"; \n" + "}");
-		checkPHP("function __autoload($clazz) { \n" + "    include_once($clazz . \"php\"); \n" + "} \n" + "\n"
+		checkPHP("$test = new IteratorImpl(); \n"
+				+ "foreach ($test as $value) { \n" + "    print \"$value\"; \n"
+				+ "}");
+		checkPHP("function __autoload($clazz) { \n"
+				+ "    include_once($clazz . \"php\"); \n" + "} \n" + "\n"
 				+ "$obj  = new Test1(); \n" + "$obj2 = new Test2(); ");
-		checkPHP("class SQLException extends Exception { \n" + "    public $problem; \n" + "    function __construct($problem) { \n"
-				+ "        $this->problem = $problem; \n" + "    } \n" + "} \n" + "\n" + "try { \n"
-				+ "    throw new SQLException(\"Couldn&#8217;t connect to database\"); \n" + "} catch (SQLException $e) { \n"
-				+ "    print \"Caught an SQLException with problem $obj->problem\"; \n" + "} catch (Exception $e) { \n"
+		checkPHP("class SQLException extends Exception { \n"
+				+ "    public $problem; \n"
+				+ "    function __construct($problem) { \n"
+				+ "        $this->problem = $problem; \n"
+				+ "    } \n"
+				+ "} \n"
+				+ "\n"
+				+ "try { \n"
+				+ "    throw new SQLException(\"Couldn&#8217;t connect to database\"); \n"
+				+ "} catch (SQLException $e) { \n"
+				+ "    print \"Caught an SQLException with problem $obj->problem\"; \n"
+				+ "} catch (Exception $e) { \n"
 				+ "    print \"Caught unrecognized exception\"; \n" + "}");
-		checkPHP("function my_func(&$arg = null) { \n" + "    if ($arg === NULL) { \n" + "        print \'$arg is empty\'; \n"
-				+ "    } \n" + "} \n" + "my_func();");
-		checkPHP("foreach ($array as &$value) { \n" + "    if ($value === \"NULL\") { \n" + "        $value = NULL; \n" + "    } \n"
-				+ "}");
-		checkPHP("$testxml = simplexml_load_file(\'test.xml\'); \n" + "foreach ($$testxml->client as $test) { \n"
-				+ "    print \"$test->name has account number $test->account_number \"; \n" + "} ");
+		checkPHP("function my_func(&$arg = null) { \n"
+				+ "    if ($arg === NULL) { \n"
+				+ "        print \'$arg is empty\'; \n" + "    } \n" + "} \n"
+				+ "my_func();");
+		checkPHP("foreach ($array as &$value) { \n"
+				+ "    if ($value === \"NULL\") { \n"
+				+ "        $value = NULL; \n" + "    } \n" + "}");
+		checkPHP("$testxml = simplexml_load_file(\'test.xml\'); \n"
+				+ "foreach ($$testxml->client as $test) { \n"
+				+ "    print \"$test->name has account number $test->account_number \"; \n"
+				+ "} ");
 		checkHTML("<?php if ($a==$b) {\n" + "}\n" + "" + "?> ");
-		checkHTML("<?php if ($a==$b) {?>\n" + "<b>test <?php echo \"test\";?> me</b>\n" + "<?php } \n" + "echo $bgcolor2 ?>");
+		checkHTML("<?php if ($a==$b) {?>\n"
+				+ "<b>test <?php echo \"test\";?> me</b>\n" + "<?php } \n"
+				+ "echo $bgcolor2 ?>");
 
 		checkHTML("<?php echo $bgcolor2 ?>");
 		checkPHP("function clean_words($mode, &$entry, &$stopword_list, &$synonym_list)\r\n"
@@ -132,12 +296,15 @@ public class PHPParserTestCase extends AbstractCompilerTest {
 		checkPHP("$this->result_field_names[$result_id][] = odbc_field_name($result_id, $i);");
 		checkPHP("$db->sql_query($sql);");
 		checkPHP("$val = $$add;");
-		// checkPHP("if(!$result = mysql_query($sql)) return(array());");
+		checkPHP("if(!$result = mysql_query($sql)) return(array());");
 		checkPHP("class test { function &fetchRow($result, $fetchmode = DB_FETCHMODE_DEFAULT, $rownum=null) \n{ \n } \n }");
 		// Bugs item #690938
-		checkPHP("$ebus_sql['sel_url_list'] = <<<EOS\n" + "select rtrim(URL_NAME) as url_name\n" + "	, rtrim(URL) as url\n"
-				+ "	, rtrim(URL_DESC) as url_desc\n" + "from appl_url\n" + "where appl_instnc_sk = <<INSTNC>>\n"
-				+ "and appl_sect_deftn_sk = <<SECT>>\n" + "order by url_ord\n" + "EOS;\n");
+		checkPHP("$ebus_sql['sel_url_list'] = <<<EOS\n"
+				+ "select rtrim(URL_NAME) as url_name\n"
+				+ "	, rtrim(URL) as url\n" + "	, rtrim(URL_DESC) as url_desc\n"
+				+ "from appl_url\n" + "where appl_instnc_sk = <<INSTNC>>\n"
+				+ "and appl_sect_deftn_sk = <<SECT>>\n" + "order by url_ord\n"
+				+ "EOS;\n");
 		checkPHP("foreach ($HTTP_GET_VARS as $secvalue) { }");
 
 		checkPHP("\"\\[addsig]\"");
@@ -160,8 +327,7 @@ public class PHPParserTestCase extends AbstractCompilerTest {
 		checkPHP("@$connect_function($dbhost, $user, $pw);");
 		checkPHP("$conn = @$connect_function($dbhost, $user, $pw);");
 		checkPHP("global ${$objectname}; ");
-		// checkPHP("class DB_mssql extends DB_common { var $connection; var
-		// $phptype, $dbsyntax; } ");
+		checkPHP("class DB_mssql extends DB_common { var $connection; var $phptype, $dbsyntax; } ");
 		checkPHP("unset($this->blockvariables[$block][$varname]);");
 		checkPHP("new IT_Error(\"The block '$block' was not found in the template.\", __FILE__, __LINE__);");
 		checkPHP("for ($i=156, $j=0; $i<512; $i++, $j++) $v_checksum += ord(substr($v_binary_data_last,$j,1));");
@@ -172,13 +338,17 @@ public class PHPParserTestCase extends AbstractCompilerTest {
 		checkPHP("function validateAndParseResponse($code, &$arguments) { }");
 		checkPHP("$options = Console_Getopt::getopt($argv, \"h?v:e:p:d:\");");
 		checkPHP("$this->container = new $container_class($container_options);");
-		// checkPHP("class Cmd extends PEAR { var $arrSetting = array(); }");
-		// checkPHP("class Cmd extends PEAR { var $arrSetting = array(), $i=10; }");
+		checkPHP("class Cmd extends PEAR { var $arrSetting = array(); }");
+		checkPHP("class Cmd extends PEAR { var $arrSetting = array(), $i=10; }");
 		checkPHP("if (isset($test)) { } elseif (isset($lang)) { }");
 		checkPHP("require_once(\"mainfile.php\");  ");
-		checkPHP("if (eregi(\"footer.php\",$PHP_SELF)) {\n" + "Header(\"Location: index.php\");\n" + "die();\n" + "}\n");
-		checkPHP("while (eregi(\"footer.php\",$PHP_SELF)) {\n" + "Header(\"Location: index.php\");\n" + "die();\n" + "}\n");
-		checkPHP("while (eregi(\"footer.php\",$PHP_SELF)) :\n" + "Header(\"Location: index.php\");\n" + "die();\n" + "endwhile;\n");
+		checkPHP("if (eregi(\"footer.php\",$PHP_SELF)) {\n"
+				+ "Header(\"Location: index.php\");\n" + "die();\n" + "}\n");
+		checkPHP("while (eregi(\"footer.php\",$PHP_SELF)) {\n"
+				+ "Header(\"Location: index.php\");\n" + "die();\n" + "}\n");
+		checkPHP("while (eregi(\"footer.php\",$PHP_SELF)) :\n"
+				+ "Header(\"Location: index.php\");\n" + "die();\n"
+				+ "endwhile;\n");
 		checkPHP("$tipath = \"images/topics/\";");
 		checkPHP("$reasons = array(\"1\", \"2\",\"test\");");
 		checkPHP("if ($home == 1) { message_box(); blocks(Center);}");
@@ -199,47 +369,18 @@ public class PHPParserTestCase extends AbstractCompilerTest {
 		checkPHP("/* \n overLib is from Eric Bosrup (http://www.bosrup.com/web/overlib/) \n */");
 		checkPHP("if ($arrAtchCookie[1]==0 && $IdAtchPostId!=null){  } ");
 		checkPHP("$arrAtchCookie[1] -= filesize(realpath($AtchTempDir).\"/\".$xattachlist)/ 1024; ");
-		checkPHP("if (!isset($message)){ \n" + "$message = $myrow[post_text];\n"
+		checkPHP("if (!isset($message)){ \n"
+				+ "$message = $myrow[post_text];\n"
 				+ "$message = eregi_replace(\"\\[addsig]\", \"\\n-----------------\\n\" .    $myrow[user_sig], $message); \n"
-				+ "$message = str_replace(\"<BR>\", \"\\n\", $message); \n" + "$message = str_replace(\"<br>\", \"\\n\", $message); \n } ");
+				+ "$message = str_replace(\"<BR>\", \"\\n\", $message); \n"
+				+ "$message = str_replace(\"<br>\", \"\\n\", $message); \n } ");
 		checkPHP("$ol = new Overlib();");
 		checkPHP("$risultato = mysql_query($sql) or\n    die(mysql_error());");
-		// checkHTML("\n\n\n\n <?php print \"Hello world\" ?>");
-		// checkHTML("<?php phpinfo(); ?>");
-		// checkHTML("<?php phpinfo()?>");
-		// checkHTML("<?php phpinfo(); ?> foo <?php phpinfo(); ?>");
-		// checkHTML(" <?php //this is a line comment ?>");
-		// checkHTML("<?php echo $module_name ?>");
-	}
-
-	private void checkPHP(String strEval) {
-		if (Scanner.DEBUG) {
-			System.out.println("\n------------------------------------");
-			System.out.println(strEval);
-		}
-		checkParsePHP(strEval.toCharArray(), "");
-		// parser.phpParserTester(strEval, 1);
-	}
-
-	private void checkHTML(String strEval) {
-		if (Scanner.DEBUG) {
-			System.out.println("\n------------------------------------");
-			System.out.println(strEval);
-		}
-		checkParseHTML(strEval.toCharArray(), "");
-		// parser.phpParserTester(strEval, 1);
+		checkHTML("\n\n\n\n <?php print \"Hello world\" ?>");
+		checkHTML("<?php phpinfo(); ?>");
+		checkHTML("<?php phpinfo()?>");
+		checkHTML("<?php phpinfo(); ?> foo <?php phpinfo(); ?>");
+		checkHTML(" <?php //this is a line comment ?>");
+		checkHTML("<?php echo $module_name ?>");
 	}
-	// private void checkHTML(String strEval) {
-	// if (Scanner.DEBUG) {
-	// System.out.println("\n------------------------------------");
-	// System.out.println(strEval);
-	// }
-	// parser.parse(strEval);
-	// }
-	// /**
-	// * The JUnit setup method
-	// */
-	// protected void setUp() {
-	// parser = new Parser(null);
-	// }
 }