fix(php): try catch anchoring (#1338)

* refactor: use correct name for IsAnchored result

* fix: unanchor catch blocks and exception types

internal/languages/golang/pattern/pattern.go

@@ -131,8 +131,8 @@ func (*Pattern) IsAnchored(node *tree.Node) (bool, bool) {
 		"var_declaration",
 	}
 
-	isUnanchored := !slices.Contains(unAnchored, parent.Type())
-	return isUnanchored, isUnanchored
+	isAnchored := !slices.Contains(unAnchored, parent.Type())
+	return isAnchored, isAnchored
 }
 
 func (*Pattern) IsRoot(node *tree.Node) bool {

internal/languages/java/pattern/pattern.go

@@ -103,8 +103,8 @@ func (*Pattern) IsAnchored(node *tree.Node) (bool, bool) {
 	// try {} catch () {}
 	unAnchored := []string{"class_body", "block", "try_statement", "catch_type", "resource_specification"}
 
-	isUnanchored := !slices.Contains(unAnchored, parent.Type())
-	return isUnanchored, isUnanchored
+	isAnchored := !slices.Contains(unAnchored, parent.Type())
+	return isAnchored, isAnchored
 }
 
 func (*Pattern) IsRoot(node *tree.Node) bool {

internal/languages/javascript/pattern/pattern.go

@@ -106,8 +106,8 @@ func (*Pattern) IsAnchored(node *tree.Node) (bool, bool) {
 	// method statement_block
 	unAnchored := []string{"statement_block", "class_body", "object_pattern", "named_imports"}
 
-	isUnanchored := !slices.Contains(unAnchored, parent.Type())
-	return isUnanchored, isUnanchored
+	isAnchored := !slices.Contains(unAnchored, parent.Type())
+	return isAnchored, isAnchored
 }
 
 func (*Pattern) IsRoot(node *tree.Node) bool {

internal/languages/php/.snapshots/TestPattern-catch_clauses_and_types_are_unanchored

@@ -0,0 +1,12 @@
+(*builder.Result)({
+  Query: (string) (len=158) "([(try_statement  . [ (compound_statement )] [(catch_clause   . [(type_list (_))] . [(variable_name  . (_) .)] @match  . [ (compound_statement )] .)])] @root)",
+  VariableNames: ([]string) (len=1) {
+    (string) (len=1) "_"
+  },
+  ParamToVariable: (map[string]string) {
+  },
+  EqualParams: ([][]string) <nil>,
+  ParamToContent: (map[string]map[string]string) {
+  },
+  RootVariable: (*language.PatternVariable)(<nil>)
+})

internal/languages/php/.snapshots/TestPattern-parameter_names_are_unanchored

@@ -1,5 +1,5 @@
 (*builder.Result)({
-  Query: (string) (len=210) "([(class_declaration  . (_) . [(declaration_list  [(method_declaration [ (visibility_modifier )]  (_) . [(formal_parameters  . [(simple_parameter . (_) (_) @match)] . )] [ (compound_statement )])] )] .)] @root)",
+  Query: (string) (len=224) "([(class_declaration  . (_) . [(declaration_list  [(method_declaration [ (visibility_modifier )]  (_) . [(formal_parameters  . [(simple_parameter . [(type_list (_))] (_) @match)] . )] [ (compound_statement )])] )] .)] @root)",
   VariableNames: ([]string) (len=1) {
     (string) (len=1) "_"
   },

internal/languages/php/analyzer/analyzer.go

@@ -49,6 +49,8 @@ func (analyzer *analyzer) Analyze(node *sitter.Node, visitChildren func() error)
 		return analyzer.analyzeDynamicVariableName(node, visitChildren)
 	case "subscript_expression":
 		return analyzer.analyzeSubscript(node, visitChildren)
+	case "catch_clause":
+		return analyzer.analyzeCatchClause(node, visitChildren)
 	case "binary_expression",
 		"unary_op_expression",
 		"argument",
@@ -193,6 +195,16 @@ func (analyzer *analyzer) analyzeSubscript(node *sitter.Node, visitChildren func
 	return visitChildren()
 }
 
+// catch(FooException | BarException $e) {}
+func (analyzer *analyzer) analyzeCatchClause(node *sitter.Node, visitChildren func() error) error {
+	return analyzer.withScope(language.NewScope(analyzer.scope), func() error {
+		name := node.ChildByFieldName("name")
+		analyzer.scope.Declare(analyzer.builder.ContentFor(name), name)
+
+		return visitChildren()
+	})
+}
+
 // default analysis, where the children are assumed to be aliases
 func (analyzer *analyzer) analyzeGenericConstruct(node *sitter.Node, visitChildren func() error) error {
 	analyzer.builder.Alias(node, analyzer.builder.ChildrenFor(node)...)

internal/languages/php/pattern/pattern.go

@@ -16,8 +16,8 @@ var (
 	patternQueryVariableRegex      = regexp.MustCompile(`\$<(?P<name>[^>:!\.]+)(?::(?P<types>[^>]+))?>`)
 	matchNodeRegex                 = regexp.MustCompile(`\$<!>`)
 	ellipsisRegex                  = regexp.MustCompile(`\$<\.\.\.>`)
-	unanchoredPatternNodeTypes     = []string{}
-	patternMatchNodeContainerTypes = []string{"formal_parameters", "simple_parameter", "argument"}
+	unanchoredPatternNodeTypes     = []string{"catch_clause"}
+	patternMatchNodeContainerTypes = []string{"formal_parameters", "simple_parameter", "argument", "type_list"}
 
 	allowedPatternQueryTypes = []string{"_"}
 
@@ -203,13 +203,15 @@ func (*Pattern) IsAnchored(node *tree.Node) (bool, bool) {
 
 	// Class body declaration_list
 	// function/block compound_statement
+	// Type1 | Type2
 	unAnchored := []string{
 		"declaration_list",
 		"compound_statement",
+		"type_list",
 	}
 
-	isUnanchored := !slices.Contains(unAnchored, parent.Type())
-	return isUnanchored, isUnanchored
+	isAnchored := !slices.Contains(unAnchored, parent.Type())
+	return isAnchored, isAnchored
 }
 
 func (*Pattern) IsRoot(node *tree.Node) bool {

internal/languages/php/php_test.go

@@ -43,6 +43,9 @@ func TestPattern(t *testing.T) {
 					public function $<_>($<_> $<!>$<_>) {}
 				}
 		`},
+		{"catch clauses and types are unanchored", `
+				try {} catch ($<_> $<!>$$<_>) {}
+		`},
 	} {
 		t.Run(test.name, func(tt *testing.T) {
 			result, err := patternquerybuilder.Build(php.Get(), test.pattern, "")

internal/languages/python/pattern/pattern.go

@@ -133,8 +133,8 @@ func (*Pattern) IsAnchored(node *tree.Node) (bool, bool) {
 	// function/block compound_statement
 	unAnchored := []string{}
 
-	isUnanchored := !slices.Contains(unAnchored, parent.Type())
-	return isUnanchored, isUnanchored
+	isAnchored := !slices.Contains(unAnchored, parent.Type())
+	return isAnchored, isAnchored
 }
 
 func (*Pattern) IsRoot(node *tree.Node) bool {