Merge branch 'master' into report-memory-improvements

Author: gsherwood

CodeSniffer.conf.dist

@@ -0,0 +1,9 @@
+<?php
+ $phpCodeSnifferConfig = array (
+  'default_standard' => 'PSR2',
+  'report_format' => 'summary',
+  'show_warnings' => '0',
+  'show_progress' => '1',
+  'report_wdith' => '120',
+)
+?>

CodeSniffer/File.php

@@ -1497,7 +1497,7 @@ private static function _recurseScopeMap(
                     echo "=> Found semicolon before scope opener for $stackPtr (T_IF), bailing".PHP_EOL;
                 }
 
-                return $stackPtr;
+                return $i;
             }
 
             // Is this an opening condition ?

CodeSniffer/Standards/Generic/Sniffs/Debug/CSSLintSniff.php

@@ -0,0 +1,117 @@
+<?php
+/**
+ * Generic_Sniffs_Debug_CSSLintSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Roman Levishchenko <[email protected]>
+ * @copyright 2013 Roman Levishchenko
+ * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * Generic_Sniffs_Debug_CSSLintSniff.
+ *
+ * Runs csslint on the file.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Roman Levishchenko <[email protected]>
+ * @copyright 2013 Roman Levishchenko
+ * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @version   Release: @package_version@
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+class Generic_Sniffs_Debug_CSSLintSniff implements PHP_CodeSniffer_Sniff
+{
+
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = array('CSS');
+
+
+    /**
+     * Returns the token types that this sniff is interested in.
+     *
+     * @return array(int)
+     */
+    public function register()
+    {
+        return array(T_OPEN_TAG);
+
+    }//end register()
+
+
+    /**
+     * Processes the tokens that this sniff is interested in.
+     *
+     * @param PHP_CodeSniffer_File $phpcsFile The file where the token was found.
+     * @param int                  $stackPtr  The position in the stack where
+     *                                        the token was found.
+     *
+     * @return void
+     */
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    {
+        $fileName = $phpcsFile->getFilename();
+
+        $csslintPath = PHP_CodeSniffer::getConfigData('csslint_path');
+        if ($csslintPath === null) {
+            return;
+        }
+
+        $cmd = $csslintPath.' '.escapeshellarg($fileName);
+        exec($cmd, $output, $retval);
+
+        if (is_array($output) === false) {
+            return;
+        }
+
+        $tokens = $phpcsFile->getTokens();
+        $count  = count($output);
+
+        for ($i = 0; $i < $count; $i++) {
+            $matches    = array();
+            $numMatches = preg_match(
+                '/(error|warning) at line (\d+)/',
+                $output[$i],
+                $matches
+            );
+
+            if ($numMatches === 0) {
+                continue;
+            }
+
+            $line    = (int) $matches[2];
+            $message = 'csslint says: '.$output[($i + 1)];
+            // 1-st line is message with error line and error code.
+            // 2-nd error message.
+            // 3-d wrong line in file.
+            // 4-th empty line.
+            $i += 4;
+
+            $lineToken = null;
+            foreach ($tokens as $ptr => $info) {
+                if ($info['line'] === $line) {
+                    $lineToken = $ptr;
+                    break;
+                }
+            }
+
+            if ($lineToken !== null) {
+                $phpcsFile->addWarning($message, $lineToken, 'ExternalTool');
+            }
+        }//end for
+
+    }//end process()
+
+
+}//end class
+
+?>

CodeSniffer/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php

@@ -28,6 +28,18 @@
 class Generic_Sniffs_Files_EndFileNewlineSniff implements PHP_CodeSniffer_Sniff
 {
 
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = array(
+                                   'PHP',
+                                   'JS',
+                                   'CSS',
+    );
+
+
     /**
      * Returns an array of tokens this test wants to listen for.
      *
@@ -62,10 +74,16 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
         $tokens   = $phpcsFile->getTokens();
         $stackPtr = ($phpcsFile->numTokens - 1);
 
+        if ($phpcsFile->tokenizerType === 'JS') {
+            $stackPtr--;
+        } else if ($phpcsFile->tokenizerType === 'CSS') {
+            $stackPtr -= 2;
+        }
+
         $eolCharLen = strlen($phpcsFile->eolChar);
         $lastChars  = substr($tokens[$stackPtr]['content'], ($eolCharLen * -1));
         if ($lastChars !== $phpcsFile->eolChar) {
-            $error = 'All PHP files must end with a newline character';
+            $error = 'File must end with a newline character';
             $phpcsFile->addError($error, $stackPtr, 'NotFound');
         }
 

CodeSniffer/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.1.css

@@ -0,0 +1,3 @@
+
+#login-container {}
+

CodeSniffer/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.1.js

@@ -0,0 +1,3 @@
+
+alert('hi);
+

CodeSniffer/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.2.css

@@ -0,0 +1,2 @@
+
+#login-container {}

CodeSniffer/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.2.js

@@ -0,0 +1,2 @@
+
+alert('hi);

CodeSniffer/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.3.css

@@ -0,0 +1,2 @@
+
+#login-container {}

CodeSniffer/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.3.js

@@ -0,0 +1,2 @@
+
+alert('hi);