Merge pull request #626 from kkoomen/feature/php-fix-incorrect-throw-statement-logic

Optimise exception parsing logic

Author: kkoomen

helper/src/php/parser.rs

@@ -308,9 +308,15 @@ impl<'a> PhpParser<'a> {
                     .and_then(|node| Some(self.get_node_text(&node)))
                     .unwrap();
 
-                tokens.insert("name".to_string(), Value::String(name));
+                let prev_sibling_node = &child_node.prev_sibling();
 
-                exceptions.push(Value::Object(tokens));
+                if name.ends_with("Exception") || (prev_sibling_node.is_some() && prev_sibling_node.unwrap().kind() == "throw") {
+                    tokens.insert("name".to_string(), Value::String(name));
+                }
+
+                if !tokens.is_empty()  {
+                    exceptions.push(Value::Object(tokens));
+                }
             }
 
         }

test/filetypes/php/functions.vader

@@ -117,6 +117,7 @@ Expect php (generated comment with @param and @return tags):
 Given php (function with exceptions being raised in the body):
   <?php
   function test() {
+    $user = new User(); // this should be ignored
     $err = new FirstException('Foo');
     throw $err;
     throw new SecondException('Bar');
@@ -137,6 +138,7 @@ Expect php (generated comment with @param, @throws and @return tags):
    * @return [TODO:type] [TODO:description]
    */
   function test() {
+    $user = new User(); // this should be ignored
     $err = new FirstException('Foo');
     throw $err;
     throw new SecondException('Bar');