* small fixes

git-svn-id: https://svn.roundcube.net/trunk@1442 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 8 insertions, 6 deletions

diff --git a/tools/PHP_CodeSniffer/CodeSniffer/Standards/RoundCube/Sniffs/ControlStructures/DisallowPEARIfElseElseifSniff.php b/tools/PHP_CodeSniffer/CodeSniffer/Standards/RoundCube/Sniffs/ControlStructures/DisallowPEARIfElseElseifSniff.php
index 5f6c24f1e..413778124 100644
--- a/tools/PHP_CodeSniffer/CodeSniffer/Standards/RoundCube/Sniffs/ControlStructures/DisallowPEARIfElseElseifSniff.php
+++ b/tools/PHP_CodeSniffer/CodeSniffer/Standards/RoundCube/Sniffs/ControlStructures/DisallowPEARIfElseElseifSniff.php
@@ -66,23 +66,25 @@ class RoundCube_Sniffs_ControlStructures_DisallowPEARIfElseElseifSniff implement
     {
         $tokens = $phpcsFile->getTokens();
         $count  = 0;
-        if ($tokens[$stackPtr - 1] !== T_WHITESPACE) {
-            $phpcsFile->addError('} else {/} elseif (...) { not allowed.', $stackPtr);
+        $error  = '} else {/} elseif (...) { not allowed.';
+
+        if ($tokens[$stackPtr - 1]['type'] !== 'T_WHITESPACE') {
+            $phpcsFile->addError($error, $stackPtr);
             return;
         }
         while(true) {
             $count++;
-            if ($tokens[$stackPtr - 1] === "\n") {
+            if ($tokens[$stackPtr - 1]['content'] === "\n") {
                 break;
             }
-            if ($tokens[$stackPtr - 1] === "\r") {
+            if ($tokens[$stackPtr - 1]['content'] === "\r") {
                 break;
             }
-            if ($tokens[$stackPtr - 1] === "\r\n") {
+            if ($tokens[$stackPtr - 1]['content'] === "\r\n") {
                 break;
             }
             if ($count > 3) {
-                $phpcsFile->addError('} else {/} elseif (...) { not allowed.', $stackPtr);
+                $phpcsFile->addError($error . " - " . var_export($tokens[$stackPtr - 1]['content'], true), $stackPtr);
                 return;
             }
         }