php5 test coverage

diff

@@ -159,8 +159,10 @@
 159
 -160
 -161
+-162
 163
 164
+-165
 166
 167
 168
@@ -172,6 +174,7 @@
 174
 175
 176
+-177
 178
 179
 180
@@ -180,10 +183,14 @@
 183
 184
 185
+-186
 187
 188
 189
+-190
 191
+-192
+-193
 194
 195
 196
@@ -192,7 +199,11 @@
 199
 200
 201
+-202
+-203
 204
+-205
+-206
 208
 209
 211
@@ -380,17 +391,6 @@
 528
 
 
--162
--165
--177
--186
--190
--192
--193
--202
--203
--205
--206
 -207
 -210
 -215

node/stmt/t_class_method_test.go

@@ -36,6 +36,45 @@ func TestSimpleClassMethod(t *testing.T) {
 	assertEqual(t, expected, actual)
 }
 
+func TestPrivateProtectedClassMethod(t *testing.T) {
+	src := `<? class foo{ final private function bar() {} protected function baz() {} }`
+
+	expected := &stmt.StmtList{
+		Stmts: []node.Node{
+			&stmt.Class{
+				ClassName: &node.Identifier{Value: "foo"},
+				Stmts: []node.Node{
+					&stmt.ClassMethod{
+						PhpDocComment: "",
+						ReturnsRef:    false,
+						MethodName:    &node.Identifier{Value: "bar"},
+						Modifiers: []node.Node{
+							&node.Identifier{Value: "final"},
+							&node.Identifier{Value: "private"},
+						},
+						Stmts: []node.Node{},
+					},
+					&stmt.ClassMethod{
+						PhpDocComment: "",
+						ReturnsRef:    false,
+						MethodName:    &node.Identifier{Value: "baz"},
+						Modifiers: []node.Node{
+							&node.Identifier{Value: "protected"},
+						},
+						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)
+}
+
 func TestPhp5ClassMethod(t *testing.T) {
 	src := `<? class foo{ public static function &bar() {} }`
 
@@ -91,6 +130,67 @@ func TestPhp7ClassMethod(t *testing.T) {
 		},
 	}
 
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+}
+
+func TestAbstractClassMethod(t *testing.T) {
+	src := `<? abstract class Foo{ abstract public function bar(); }`
+
+	expected := &stmt.StmtList{
+		Stmts: []node.Node{
+			&stmt.Class{
+				Modifiers: []node.Node{&node.Identifier{Value: "abstract"}},
+				ClassName: &node.Identifier{Value: "Foo"},
+				Stmts: []node.Node{
+					&stmt.ClassMethod{
+						PhpDocComment: "",
+						ReturnsRef: false,
+						MethodName: &node.Identifier{Value: "bar"},
+						Modifiers: []node.Node{
+							&node.Identifier{Value: "abstract"},
+							&node.Identifier{Value: "public"},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	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 TestPhp7AbstractClassMethod(t *testing.T) {
+	src := `<? abstract class Foo{ public function bar(): void; }`
+
+	expected := &stmt.StmtList{
+		Stmts: []node.Node{
+			&stmt.Class{
+				Modifiers: []node.Node{&node.Identifier{Value: "abstract"}},
+				ClassName: &node.Identifier{Value: "Foo"},
+				Stmts: []node.Node{
+					&stmt.ClassMethod{
+						PhpDocComment: "",
+						ReturnsRef: false,
+						MethodName: &node.Identifier{Value: "bar"},
+						Modifiers: []node.Node{
+							&node.Identifier{Value: "public"},
+						},
+						ReturnType: &name.Name{
+							Parts: []node.Node{
+								&name.NamePart{Value: "void"},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
 	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 	assertEqual(t, expected, actual)
 }

node/stmt/t_trait_use_test.go

@@ -76,6 +76,128 @@ func TestTraitsUse(t *testing.T) {
 	assertEqual(t, expected, actual)
 }
 
+func TestTraitsUseEmptyAdaptations(t *testing.T) {
+	src := `<? class Foo { use Bar, Baz {} }`
+
+	expected := &stmt.StmtList{
+		Stmts: []node.Node{
+			&stmt.Class{
+				PhpDocComment: "",
+				ClassName: &node.Identifier{Value: "Foo"},
+				Stmts: []node.Node{
+					&stmt.TraitUse{
+						Traits: []node.Node{
+							&name.Name{
+								Parts: []node.Node{
+									&name.NamePart{Value: "Bar"},
+								},
+							},
+							&name.Name{
+								Parts: []node.Node{
+									&name.NamePart{Value: "Baz"},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	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 TestTraitsUseModifier(t *testing.T) {
+	src := `<? class Foo { use Bar, Baz { one as public; } }`
+
+	expected := &stmt.StmtList{
+		Stmts: []node.Node{
+			&stmt.Class{
+				PhpDocComment: "",
+				ClassName: &node.Identifier{Value: "Foo"},
+				Stmts: []node.Node{
+					&stmt.TraitUse{
+						Traits: []node.Node{
+							&name.Name{
+								Parts: []node.Node{
+									&name.NamePart{Value: "Bar"},
+								},
+							},
+							&name.Name{
+								Parts: []node.Node{
+									&name.NamePart{Value: "Baz"},
+								},
+							},
+						},
+						Adaptations: []node.Node{
+							&stmt.TraitUseAlias{
+								Ref: &stmt.TraitMethodRef{
+									Method: &node.Identifier{Value: "one"},
+								},
+								Modifier: &node.Identifier{Value: "public"},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	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 TestTraitsUseAliasModifier(t *testing.T) {
+	src := `<? class Foo { use Bar, Baz { one as public two; } }`
+
+	expected := &stmt.StmtList{
+		Stmts: []node.Node{
+			&stmt.Class{
+				PhpDocComment: "",
+				ClassName: &node.Identifier{Value: "Foo"},
+				Stmts: []node.Node{
+					&stmt.TraitUse{
+						Traits: []node.Node{
+							&name.Name{
+								Parts: []node.Node{
+									&name.NamePart{Value: "Bar"},
+								},
+							},
+							&name.Name{
+								Parts: []node.Node{
+									&name.NamePart{Value: "Baz"},
+								},
+							},
+						},
+						Adaptations: []node.Node{
+							&stmt.TraitUseAlias{
+								Ref: &stmt.TraitMethodRef{
+									Method: &node.Identifier{Value: "one"},
+								},
+								Modifier: &node.Identifier{Value: "public"},
+								Alias: &node.Identifier{Value: "two"},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	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 TestTraitsUseAdaptions(t *testing.T) {
 	src := `<? class Foo { use Bar, Baz { Bar::one insteadof Baz, Quux; Baz::one as two; } }`
 

php5/php5_test.go

@@ -106,8 +106,8 @@ CAD;
 		class foo{ const FOO = 1, BAR = 2; }
 		class foo{ function bar() {} }
 		class foo{ public static function &bar() {} }
-		class foo{ public static function &bar() {} }
+		class foo{ final private function bar() {} protected function baz() {} }
-		abstract class foo{ }
+		abstract class foo{ abstract public function bar(); }
 		final class foo extends bar { }
 		final class foo implements bar { }
 		final class foo implements bar, baz { }
@@ -187,7 +187,9 @@ CAD;
 		throw $e;
 		trait Foo {}
 		class Foo { use Bar; }
-		class Foo { use Bar, Baz; }
+		class Foo { use Bar, Baz {} }
+		class Foo { use Bar, Baz { one as public; } }
+		class Foo { use Bar, Baz { one as public two; } }
 		class Foo { use Bar, Baz { Bar::one insteadof Baz, Quux; Baz::one as two; } }
 
 		try {}
@@ -684,11 +686,20 @@ CAD;
 				Stmts: []node.Node{
 					&stmt.ClassMethod{
 						PhpDocComment: "",
-						ReturnsRef:    true,
+						ReturnsRef:    false,
 						MethodName:    &node.Identifier{Value: "bar"},
 						Modifiers: []node.Node{
-							&node.Identifier{Value: "public"},
+							&node.Identifier{Value: "final"},
-							&node.Identifier{Value: "static"},
+							&node.Identifier{Value: "private"},
+						},
+						Stmts: []node.Node{},
+					},
+					&stmt.ClassMethod{
+						PhpDocComment: "",
+						ReturnsRef:    false,
+						MethodName:    &node.Identifier{Value: "baz"},
+						Modifiers: []node.Node{
+							&node.Identifier{Value: "protected"},
 						},
 						Stmts: []node.Node{},
 					},
@@ -699,7 +710,17 @@ CAD;
 				Modifiers: []node.Node{
 					&node.Identifier{Value: "abstract"},
 				},
-				Stmts: []node.Node{},
+				Stmts: []node.Node{
+					&stmt.ClassMethod{
+						PhpDocComment: "",
+						ReturnsRef:    false,
+						MethodName:    &node.Identifier{Value: "bar"},
+						Modifiers: []node.Node{
+							&node.Identifier{Value: "abstract"},
+							&node.Identifier{Value: "public"},
+						},
+					},
+				},
 			},
 			&stmt.Class{
 				ClassName: &node.Identifier{Value: "foo"},
@@ -1310,6 +1331,63 @@ CAD;
 					},
 				},
 			},
+			&stmt.Class{
+				PhpDocComment: "",
+				ClassName:     &node.Identifier{Value: "Foo"},
+				Stmts: []node.Node{
+					&stmt.TraitUse{
+						Traits: []node.Node{
+							&name.Name{
+								Parts: []node.Node{
+									&name.NamePart{Value: "Bar"},
+								},
+							},
+							&name.Name{
+								Parts: []node.Node{
+									&name.NamePart{Value: "Baz"},
+								},
+							},
+						},
+						Adaptations: []node.Node{
+							&stmt.TraitUseAlias{
+								Ref: &stmt.TraitMethodRef{
+									Method: &node.Identifier{Value: "one"},
+								},
+								Modifier: &node.Identifier{Value: "public"},
+							},
+						},
+					},
+				},
+			},
+			&stmt.Class{
+				PhpDocComment: "",
+				ClassName:     &node.Identifier{Value: "Foo"},
+				Stmts: []node.Node{
+					&stmt.TraitUse{
+						Traits: []node.Node{
+							&name.Name{
+								Parts: []node.Node{
+									&name.NamePart{Value: "Bar"},
+								},
+							},
+							&name.Name{
+								Parts: []node.Node{
+									&name.NamePart{Value: "Baz"},
+								},
+							},
+						},
+						Adaptations: []node.Node{
+							&stmt.TraitUseAlias{
+								Ref: &stmt.TraitMethodRef{
+									Method: &node.Identifier{Value: "one"},
+								},
+								Modifier: &node.Identifier{Value: "public"},
+								Alias: &node.Identifier{Value: "two"},
+							},
+						},
+					},
+				},
+			},
 			&stmt.Class{
 				PhpDocComment: "",
 				ClassName:     &node.Identifier{Value: "Foo"},