PHP: Update locals query

queries/php/highlights.scm

@@ -33,6 +33,7 @@
 
 (member_access_expression
   name: (variable_name (name)) @property)
+
 (member_access_expression
   name: (name) @property)
 

queries/php/locals.scm

@@ -2,21 +2,42 @@
 ;-------
 
 (class_declaration) @scope
-(property_declaration) @scope
-(method_declaration) @scope
-(function_definition) @scope
 (while_statement) @scope
 (foreach_statement) @scope
 (if_statement) @scope
 (try_statement) @scope
+(method_declaration
+  name: (name) @definition.method) @scope
+(function_definition
+  name: (name) @definition.function) @scope
 
 ; Definitions
 ;------------
 
-(variable_name
+(simple_parameter
-  (name) @definition.var)
+  (variable_name
+    (name) @definition.var))
+
+(anonymous_function_use_clause
+  (variable_name
+    (name) @definition.var))
+
+(assignment_expression
+  left: (variable_name
+    (name) @definition.var))
+
+(property_declaration
+  (variable_name
+    (name) @definition.field))
+
+(namespace_use_clause
+  (qualified_name
+    (name) @definition.class))
+
+(class_declaration
+  name: (name) @definition.class)
 
 ; References
 ;------------
 
-(variable_name) @reference
+(name) @reference