Changeset 1443 in subversion for trunk/tools/PHP_CodeSniffer/CodeSniffer/Standards/RoundCube/Sniffs/ControlStructures/DisallowPEARIfElseElseifSniff.php

Timestamp:

May 27, 2008 7:10:54 PM (5 years ago)

Author:

till

Message:

• refactored code

File:

• trunk/tools/PHP_CodeSniffer/CodeSniffer/Standards/RoundCube/Sniffs/ControlStructures/DisallowPEARIfElseElseifSniff.php (modified) (2 diffs)

trunk/tools/PHP_CodeSniffer/CodeSniffer/Standards/RoundCube/Sniffs/ControlStructures/DisallowPEARIfElseElseifSniff.php

@@ -65 +65 @@
     public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     {
+        static $_eol = array("\n", "\r", "\n\r");
+
         $tokens = $phpcsFile->getTokens();
         $count  = 0;
@@ -73 +75 @@
             return;
         }
-        while(true) {
-            $count++;
-            if ($tokens[$stackPtr - 1]['content'] === "\n") {
-                break;
-            }
-            if ($tokens[$stackPtr - 1]['content'] === "\r") {
-                break;
-            }
-            if ($tokens[$stackPtr - 1]['content'] === "\r\n") {
-                break;
-            }
-            if ($count > 3) {
-                $phpcsFile->addError($error . " - " . var_export($tokens[$stackPtr - 1]['content'], true), $stackPtr);
-                return;
-            }
+        if (!in_array($tokens[$stackPtr - 1]['content'], $_eol)) {
+            $phpcsFile->addError($error . " - " . var_export($tokens[$stackPtr - 1]['content'], true), $stackPtr);
+            return;
         }
         return;