Merge branch 'feature/2.x-generic-classbracesameline-minor-fix' of https://github.com/jrfnl/PHP_CodeSniffer into 2.9

Author: gsherwood

CodeSniffer/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php

@@ -74,7 +74,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
         $openingBrace = $tokens[$stackPtr]['scope_opener'];
 
         // Is the brace on the same line as the class/interface/trait declaration ?
-        $lastClassLineToken = $phpcsFile->findPrevious(T_STRING, ($openingBrace - 1), $stackPtr);
+        $lastClassLineToken = $phpcsFile->findPrevious(T_WHITESPACE, ($openingBrace - 1), $stackPtr, true);
         $lastClassLine      = $tokens[$lastClassLineToken]['line'];
         $braceLine          = $tokens[$openingBrace]['line'];
         $lineDifference     = ($braceLine - $lastClassLine);

CodeSniffer/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.inc

@@ -79,3 +79,13 @@ class A_Class_With_Really_Long_Name_4
 {
 
 }
+
+// While this is ok again.
+class Test_Class_Bad_G /*some comment*/ {
+}
+
+// And this is not.
+class Test_Class_Bad_G
+    /*some comment*/
+{
+}

CodeSniffer/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.inc.fixed

@@ -79,3 +79,13 @@ class A_Class_With_Really_Long_Name_4
 
 
 }
+
+// While this is ok again.
+class Test_Class_Bad_G /*some comment*/ {
+}
+
+// And this is not.
+class Test_Class_Bad_G
+    /*some comment*/ {
+
+}

CodeSniffer/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.php

@@ -54,6 +54,7 @@ public function getErrorList()
                 47 => 1,
                 70 => 1,
                 79 => 1,
+                90 => 1,
                );
 
     }//end getErrorList()