Fixed bug squizlabs#485 : PHP notice in Squiz.Commenting.FunctionComm…

…ent when checking malformed @throws comment
gimler · Feb 10, 2015 · 74170c1 · 74170c1
1 parent 5cddfb3
commit 74170c1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/CodeSniffer/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php b/CodeSniffer/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php
@@ -176,7 +176,7 @@ protected function processThrows(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $co
                 $matches = array();
                 preg_match('/([^\s]+)(?:\s+(.*))?/', $tokens[($tag + 2)]['content'], $matches);
                 $exception = $matches[1];
-                if (isset($matches[2]) === true) {
+                if (isset($matches[2]) === true && trim($matches[2]) !== '') {
                     $comment = $matches[2];
                 }
             }

diff --git a/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.inc b/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.inc
@@ -660,4 +660,12 @@ class Baz {
     public function __construct() {
 
     }
-}
+}
+
+/**
+ * Test
+ *
+ * @return void
+ * @throws E 
+ */
+function myFunction() {}
diff --git a/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php b/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php
@@ -108,6 +108,7 @@ public function getErrorList()
                 526 => 1,
                 548 => 1,
                 641 => 1,
+                669 => 1,
                );
 
     }//end getErrorList()

diff --git a/package.xml b/package.xml
@@ -44,6 +44,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #457 : FunctionCallSignature sniffs do not support here/nowdoc syntax and can cause syntax error when fixing
   - Fixed bug #466 : PropertyLabelSpacing JS fixer issue when there is no space after colon
   - Fixed bug #473 : Writing a report for an empty folder to existing file includes the existing contents
+  - Fixed bug #485 : PHP notice in Squiz.Commenting.FunctionComment when checking malformed @throws comment
  </notes>
  <contents>
   <dir name="/">
-Original file line number
+Diff line change
@@ Expand Up / @@ -108,6 +108,7 @@ public function getErrorList() @@
 => 1,
 => 1,
 => 1,
+=> 1,
                    );
         }//end getErrorList()
@@ Expand Down @@