parser: support types on class var statements

phpast/samples/full-class-defs.php

@@ -0,0 +1,6 @@
+<?php
+
+class Foo {
+    var $bar;
+    var string $baz;
+}

trunk_parser/src/ast.rs

@@ -72,9 +72,11 @@ pub enum Statement {
     InlineHtml(String),
     Var {
         var: String,
+        r#type: Option<Type>,
     },
     Property {
         var: String,
+        r#type: Option<Type>,
     },
     Function {
         name: Identifier,

trunk_parser/src/parser/mod.rs

@@ -261,11 +261,17 @@ impl Parser {
             TokenKind::Var => {
                 self.next();
 
+                let mut var_type = None;
+
+                if ! matches!(self.current.kind, TokenKind::Variable(_)) {
+                    var_type = Some(self.type_string()?);
+                }
+
                 let var = expect!(self, TokenKind::Variable(i), i, "expected variable name");
 
                 expect!(self, TokenKind::SemiColon, "expected semi-colon");
 
-                Statement::Var { var }
+                Statement::Var { var, r#type: var_type }
             },
             TokenKind::SemiColon => {
                 self.next();
@@ -316,8 +322,8 @@ impl Parser {
                 Statement::Function { name, params, body, .. } => {
                     Statement::Method { name, params, body, flags: vec![] }
                 },
-                Statement::Var { var } => {
+                Statement::Var { var, r#type } => {
-                    Statement::Property { var }
+                    Statement::Property { var, r#type }
                 },
                 Statement::Method { .. } | Statement::Comment { .. } => s,
                 _ => {