php5 test coverage

diff

@@ -325,12 +325,17 @@
 325
 326
 327
+-328
 329
+-330
 331
+-332
 333
 334
 335
 336
+-337
+-338
 339
 352
 354
@@ -418,11 +423,6 @@
 528
 
 
--328
--330
--332
--337
--338
 -340
 -341
 -342

node/expr/t_class_const_fetch_test.go

@@ -38,3 +38,24 @@ func TestClassConstFetch(t *testing.T) {
 	actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
 	assertEqual(t, expected, actual)
 }
+
+func TestStaticClassConstFetch(t *testing.T) {
+	src := `<? static::bar;`
+
+	expected := &stmt.StmtList{
+		Stmts: []node.Node{
+			&stmt.Expression{
+				Expr: &expr.ClassConstFetch{
+					Class: &node.Identifier{Value: "static"},
+					ConstantName: &node.Identifier{Value: "bar"},
+				},
+			},
+		},
+	}
+
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+
+	actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+}

node/expr/t_static_call_test.go

@@ -91,3 +91,51 @@ func TestStaticCallFullyQualified(t *testing.T) {
 	actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
 	assertEqual(t, expected, actual)
 }
+
+func TestStaticCallVar(t *testing.T) {
+	src := `<? Foo::$bar();`
+
+	expected := &stmt.StmtList{
+		Stmts: []node.Node{
+			&stmt.Expression{
+				Expr: &expr.StaticCall{
+					Class: &name.Name{
+						Parts: []node.Node{
+							&name.NamePart{Value: "Foo"},
+						},
+					},
+					Call:      &expr.Variable{VarName: &node.Identifier{Value: "$bar"}},
+					Arguments: []node.Node{},
+				},
+			},
+		},
+	}
+
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+
+	actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+}
+
+func TestStaticCallVarVar(t *testing.T) {
+	src := `<? $foo::$bar();`
+
+	expected := &stmt.StmtList{
+		Stmts: []node.Node{
+			&stmt.Expression{
+				Expr: &expr.StaticCall{
+					Class:     &expr.Variable{VarName: &node.Identifier{Value: "$foo"}},
+					Call:      &expr.Variable{VarName: &node.Identifier{Value: "$bar"}},
+					Arguments: []node.Node{},
+				},
+			},
+		},
+	}
+
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+
+	actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+}

node/stmt/t_try_catch_finnaly_test.go

@@ -190,3 +190,62 @@ func TestTryCatchFinally(t *testing.T) {
 	actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
 	assertEqual(t, expected, actual)
 }
+
+func TestTryCatchCatchCatch(t *testing.T) {
+	src := `<? try {} catch (Exception $e) {} catch (\RuntimeException $e) {} catch (namespace\AdditionException $e) {}`
+
+	expected := &stmt.StmtList{
+		Stmts: []node.Node{
+			&stmt.Try{
+				Stmts: []node.Node{},
+				Catches: []node.Node{
+					&stmt.Catch{
+						Types: []node.Node{
+							&name.Name{
+								Parts: []node.Node{
+									&name.NamePart{Value: "Exception"},
+								},
+							},
+						},
+						Variable: &expr.Variable{
+							VarName: &node.Identifier{Value: "$e"},
+						},
+						Stmts: []node.Node{},
+					},
+					&stmt.Catch{
+						Types: []node.Node{
+							&name.FullyQualified{
+								Parts: []node.Node{
+									&name.NamePart{Value: "RuntimeException"},
+								},
+							},
+						},
+						Variable: &expr.Variable{
+							VarName: &node.Identifier{Value: "$e"},
+						},
+						Stmts: []node.Node{},
+					},
+					&stmt.Catch{
+						Types: []node.Node{
+							&name.Relative{
+								Parts: []node.Node{
+									&name.NamePart{Value: "AdditionException"},
+								},
+							},
+						},
+						Variable: &expr.Variable{
+							VarName: &node.Identifier{Value: "$e"},
+						},
+						Stmts: []node.Node{},
+					},
+				},
+			},
+		},
+	}
+
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+
+	actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+}

php5/php5_test.go

@@ -196,7 +196,7 @@ CAD;
 		try {}
 		try {} catch (Exception $e) {}
 		try {} catch (Exception $e) {} catch (RuntimeException $e) {}
-		try {} catch (Exception $e) {} catch (RuntimeException $e) {} catch (AdditionException $e) {}
+		try {} catch (Exception $e) {} catch (\RuntimeException $e) {} catch (namespace\AdditionException $e) {}
 		try {} catch (Exception $e) {} finally {}
 
 		unset($a, $b);
@@ -275,6 +275,8 @@ CAD;
 		Foo::bar();
 		namespace\Foo::bar();
 		\Foo::bar();
+		Foo::$bar();
+		$foo::$bar();
 		Foo::$bar;
 		namespace\Foo::$bar;
 		\Foo::$bar;
@@ -354,6 +356,7 @@ CAD;
 		array([0])[0][0];
 		"foo"[0];
 		foo[0];
+		static::foo;
 	`
 
 	expectedParams := []node.Node{
@@ -1543,7 +1546,7 @@ CAD;
 					},
 					&stmt.Catch{
 						Types: []node.Node{
-							&name.Name{
+							&name.FullyQualified{
 								Parts: []node.Node{
 									&name.NamePart{Value: "RuntimeException"},
 								},
@@ -1556,7 +1559,7 @@ CAD;
 					},
 					&stmt.Catch{
 						Types: []node.Node{
-							&name.Name{
+							&name.Relative{
 								Parts: []node.Node{
 									&name.NamePart{Value: "AdditionException"},
 								},
@@ -2254,6 +2257,24 @@ CAD;
 					Arguments: []node.Node{},
 				},
 			},
+			&stmt.Expression{
+				Expr: &expr.StaticCall{
+					Class: &name.Name{
+						Parts: []node.Node{
+							&name.NamePart{Value: "Foo"},
+						},
+					},
+					Call:      &expr.Variable{VarName: &node.Identifier{Value: "$bar"}},
+					Arguments: []node.Node{},
+				},
+			},
+			&stmt.Expression{
+				Expr: &expr.StaticCall{
+					Class:     &expr.Variable{VarName: &node.Identifier{Value: "$foo"}},
+					Call:      &expr.Variable{VarName: &node.Identifier{Value: "$bar"}},
+					Arguments: []node.Node{},
+				},
+			},
 			&stmt.Expression{
 				Expr: &expr.StaticPropertyFetch{
 					Class: &name.Name{
@@ -2773,6 +2794,12 @@ CAD;
 					Dim: &scalar.Lnumber{Value: "0"},
 				},
 			},
+			&stmt.Expression{
+				Expr: &expr.ClassConstFetch{
+					Class: &node.Identifier{Value: "static"},
+					ConstantName: &node.Identifier{Value: "foo"},
+				},
+			},
 		},
 	}