timw4mail / HummingBirdAnimeClient

src/MenuGenerator.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 /**
  * Hummingbird Anime Client
  *

src/Dispatcher.php

Spacing +3 added lines, -3 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 /**
  * Hummingbird Anime Client
  *
@@ -143,7 +143,7 @@ 
 				$response->getStatusCode(),
 				'API Error',
 				'There was a problem getting data from an external source.',
-				(string) $response->getBody()
+				(string)$response->getBody()
 			]);
 		}
 	}
@@ -289,7 +289,7 @@ 
 
 		$params = [];
 
-		switch($failure->failedRule) {
+		switch ($failure->failedRule) {
 			case 'Aura\Router\Rule\Allows':
 				$params = [
 					'http_code' => 405,

Braces +2 added lines, -1 removed lines

@@ -289,7 +289,8 @@
 
 		$params = [];
 
-		switch($failure->failedRule) {
+		switch($failure->failedRule)
+		{
 			case 'Aura\Router\Rule\Allows':
 				$params = [
 					'http_code' => 405,

src/RoutingBase.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 /**
  * Hummingbird Anime Client
  *
@@ -71,7 +71,7 @@ 
 	 */
 	public function __get($key)
 	{
-		$routing_config =& $this->route_config;
+		$routing_config = & $this->route_config;
 
 		if (array_key_exists($key, $routing_config))
 		{

build/CodeIgniter/UnusedSniffs/Files/AbstractClosingCommentSniff.php

Indentation +61 added lines, -61 removed lines

@@ -34,71 +34,71 @@
 
 class AbstractClosingCommentSniff implements Sniff
 {
-    /**
-     * As an abstract class, this sniff is not associated to any token.
-     */
-    public function register()
-    {
-      return array();
-    }
+	/**
+	 * As an abstract class, this sniff is not associated to any token.
+	 */
+	public function register()
+	{
+	  return array();
+	}
 
-    /**
-     * As an abstract class, this sniff is not dedicated to process a token.
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-      $error = __CLASS__.'::'.__METHOD__.' is abstract. Please develop this method in a child class.';
-      throw new PHP_CodeSniffer_Exception($error);
-    }
+	/**
+	 * As an abstract class, this sniff is not dedicated to process a token.
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+	  $error = __CLASS__.'::'.__METHOD__.' is abstract. Please develop this method in a child class.';
+	  throw new PHP_CodeSniffer_Exception($error);
+	}
 
-    /**
-     * Returns the comment without its delimiter(s) as well as leading
-     * and traling whitespaces.
-     *
-     * It removes the first #, the two first / (i.e. //) or the first /*
-     * and last \*\/. If a comment starts with /**, then the last * will remain
-     * as well as whitespaces between this star and the comment content.
-     *
-     * @param string $comment Comment containing either comment delimiter(s) and
-     * trailing or leading whitspaces to clean.
-     *
-     * @return string Comment without comment delimiter(s) and whitespaces.
-     */
-    protected static function _getCommentContent ($comment)
-    {
-        if (self::_stringStartsWith($comment, '#')) {
-            $comment = substr($comment, 1);
-        } else if (self::_stringStartsWith($comment, '//')) {
-            $comment = substr($comment, 2);
-        } else if (self::_stringStartsWith($comment, '/*')) {
-            $comment = substr($comment, 2, strlen($comment) - 2 - 2);
-        }
-        $comment = trim($comment);
-        return $comment;
-    }//_getCommentContent()
+	/**
+	 * Returns the comment without its delimiter(s) as well as leading
+	 * and traling whitespaces.
+	 *
+	 * It removes the first #, the two first / (i.e. //) or the first /*
+	 * and last \*\/. If a comment starts with /**, then the last * will remain
+	 * as well as whitespaces between this star and the comment content.
+	 *
+	 * @param string $comment Comment containing either comment delimiter(s) and
+	 * trailing or leading whitspaces to clean.
+	 *
+	 * @return string Comment without comment delimiter(s) and whitespaces.
+	 */
+	protected static function _getCommentContent ($comment)
+	{
+		if (self::_stringStartsWith($comment, '#')) {
+			$comment = substr($comment, 1);
+		} else if (self::_stringStartsWith($comment, '//')) {
+			$comment = substr($comment, 2);
+		} else if (self::_stringStartsWith($comment, '/*')) {
+			$comment = substr($comment, 2, strlen($comment) - 2 - 2);
+		}
+		$comment = trim($comment);
+		return $comment;
+	}//_getCommentContent()
 
 
-    /**
-     * Binary safe string comparison between $needle and
-     * the beginning of $haystack. Returns true if $haystack starts with
-     * $needle, false otherwise.
-     *
-     * @param string $haystack The string to search in.
-     * @param string $needle   The string to search for.
-     *
-     * @return bool true if $haystack starts with $needle, false otherwise.
-     */
-    protected static function _stringStartsWith ($haystack, $needle)
-    {
-        $startsWith = false;
-        if (strlen($needle) <= strlen($haystack)) {
-            $haystackBeginning = substr($haystack, 0, strlen($needle));
-            if (0 === strcmp($haystackBeginning, $needle)) {
-                $startsWith = true;
-            }
-        }
-        return $startsWith;
-    }//_stringStartsWith()
+	/**
+	 * Binary safe string comparison between $needle and
+	 * the beginning of $haystack. Returns true if $haystack starts with
+	 * $needle, false otherwise.
+	 *
+	 * @param string $haystack The string to search in.
+	 * @param string $needle   The string to search for.
+	 *
+	 * @return bool true if $haystack starts with $needle, false otherwise.
+	 */
+	protected static function _stringStartsWith ($haystack, $needle)
+	{
+		$startsWith = false;
+		if (strlen($needle) <= strlen($haystack)) {
+			$haystackBeginning = substr($haystack, 0, strlen($needle));
+			if (0 === strcmp($haystackBeginning, $needle)) {
+				$startsWith = true;
+			}
+		}
+		return $startsWith;
+	}//_stringStartsWith()
 }//end class
 
 ?>

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-      $error = __CLASS__.'::'.__METHOD__.' is abstract. Please develop this method in a child class.';
+      $error = __CLASS__ . '::' . __METHOD__ . ' is abstract. Please develop this method in a child class.';
       throw new PHP_CodeSniffer_Exception($error);
     }
 
@@ -64,7 +64,7 @@ 
      *
      * @return string Comment without comment delimiter(s) and whitespaces.
      */
-    protected static function _getCommentContent ($comment)
+    protected static function _getCommentContent($comment)
     {
         if (self::_stringStartsWith($comment, '#')) {
             $comment = substr($comment, 1);
@@ -88,7 +88,7 @@ 
      *
      * @return bool true if $haystack starts with $needle, false otherwise.
      */
-    protected static function _stringStartsWith ($haystack, $needle)
+    protected static function _stringStartsWith($haystack, $needle)
     {
         $startsWith = false;
         if (strlen($needle) <= strlen($haystack)) {

Braces +13 added lines, -7 removed lines

@@ -32,8 +32,7 @@ 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
 
-class AbstractClosingCommentSniff implements Sniff
-{
+class AbstractClosingCommentSniff implements Sniff {
     /**
      * As an abstract class, this sniff is not associated to any token.
      */
@@ -66,11 +65,16 @@ 
      */
     protected static function _getCommentContent ($comment)
     {
-        if (self::_stringStartsWith($comment, '#')) {
+        if (self::_stringStartsWith($comment, '#'))
+        {
             $comment = substr($comment, 1);
-        } else if (self::_stringStartsWith($comment, '//')) {
+        }
+        else if (self::_stringStartsWith($comment, '//'))
+        {
             $comment = substr($comment, 2);
-        } else if (self::_stringStartsWith($comment, '/*')) {
+        }
+        else if (self::_stringStartsWith($comment, '/*'))
+        {
             $comment = substr($comment, 2, strlen($comment) - 2 - 2);
         }
         $comment = trim($comment);
@@ -91,9 +95,11 @@ 
     protected static function _stringStartsWith ($haystack, $needle)
     {
         $startsWith = false;
-        if (strlen($needle) <= strlen($haystack)) {
+        if (strlen($needle) <= strlen($haystack))
+        {
             $haystackBeginning = substr($haystack, 0, strlen($needle));
-            if (0 === strcmp($haystackBeginning, $needle)) {
+            if (0 === strcmp($haystackBeginning, $needle))
+            {
                 $startsWith = true;
             }
         }

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -90,11 +90,11 @@
      */
     protected static function _stringStartsWith ($haystack, $needle)
     {
-        $startsWith = false;
+        $startsWith = FALSE;
         if (strlen($needle) <= strlen($haystack)) {
             $haystackBeginning = substr($haystack, 0, strlen($needle));
             if (0 === strcmp($haystackBeginning, $needle)) {
-                $startsWith = true;
+                $startsWith = TRUE;
             }
         }
         return $startsWith;

build/CodeIgniter/UnusedSniffs/Files/ClosingFileCommentSniff.php

Indentation +59 added lines, -59 removed lines

@@ -39,71 +39,71 @@
 class ClosingFileCommentSniff extends AbstractClosingCommentSniff
 {
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            T_OPEN_TAG,
-        );
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(
+			T_OPEN_TAG,
+		);
 
-    }//end register()
+	}//end register()
 
 
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param File $phpcsFile The current file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        // We are only interested if this is the first open tag.
-        if ($stackPtr !== 0) {
-            if ($phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1)) !== false) {
-                return;
-            }
-        }
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param File $phpcsFile The current file being scanned.
+	 * @param int                  $stackPtr  The position of the current token
+	 *                                        in the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		// We are only interested if this is the first open tag.
+		if ($stackPtr !== 0) {
+			if ($phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1)) !== false) {
+				return;
+			}
+		}
 
-        $fullFilename = $phpcsFile->getFilename();
-        $filename = basename($fullFilename);
-        $commentTemplate = "End of file $filename";
+		$fullFilename = $phpcsFile->getFilename();
+		$filename = basename($fullFilename);
+		$commentTemplate = "End of file $filename";
 
-        $tokens = $phpcsFile->getTokens();
-        $currentToken = count($tokens) - 1;
-        $hasClosingFileComment = false;
-        $isNotAWhitespaceOrAComment = false;
-        while ($currentToken >= 0
-            && ! $isNotAWhitespaceOrAComment
-            && ! $hasClosingFileComment
-        ) {
-            $token = $tokens[$currentToken];
-            $tokenCode = $token['code'];
-            if (T_COMMENT === $tokenCode) {
-                $commentString = self::_getCommentContent($token['content']);
-                if (0 === strcmp($commentString, $commentTemplate)) {
-                    $hasClosingFileComment = true;
-                }
-            } else if (T_WHITESPACE === $tokenCode) {
-                // Whitespaces are allowed between the closing file comment,
-                // other comments and end of file
-            } else {
-                $isNotAWhitespaceOrAComment = true;
-            }
-            $currentToken--;
-        }
+		$tokens = $phpcsFile->getTokens();
+		$currentToken = count($tokens) - 1;
+		$hasClosingFileComment = false;
+		$isNotAWhitespaceOrAComment = false;
+		while ($currentToken >= 0
+			&& ! $isNotAWhitespaceOrAComment
+			&& ! $hasClosingFileComment
+		) {
+			$token = $tokens[$currentToken];
+			$tokenCode = $token['code'];
+			if (T_COMMENT === $tokenCode) {
+				$commentString = self::_getCommentContent($token['content']);
+				if (0 === strcmp($commentString, $commentTemplate)) {
+					$hasClosingFileComment = true;
+				}
+			} else if (T_WHITESPACE === $tokenCode) {
+				// Whitespaces are allowed between the closing file comment,
+				// other comments and end of file
+			} else {
+				$isNotAWhitespaceOrAComment = true;
+			}
+			$currentToken--;
+		}
 
-        if ( ! $hasClosingFileComment) {
-            $error = 'No comment block marks the end of file instead of the closing PHP tag. Please add a comment block containing only "' . $commentTemplate . '".';
-            $phpcsFile->addError($error, $currentToken);
-        }
-    }//end process()
+		if ( ! $hasClosingFileComment) {
+			$error = 'No comment block marks the end of file instead of the closing PHP tag. Please add a comment block containing only "' . $commentTemplate . '".';
+			$phpcsFile->addError($error, $currentToken);
+		}
+	}//end process()
 }//end class
 
 ?>

Braces +17 added lines, -9 removed lines

@@ -36,8 +36,7 @@ 
 
 use PHP_CodeSniffer\Files\File;
 
-class ClosingFileCommentSniff extends AbstractClosingCommentSniff
-{
+class ClosingFileCommentSniff extends AbstractClosingCommentSniff {
 
     /**
      * Returns an array of tokens this test wants to listen for.
@@ -65,8 +64,10 @@ 
     public function process(File $phpcsFile, $stackPtr)
     {
         // We are only interested if this is the first open tag.
-        if ($stackPtr !== 0) {
-            if ($phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1)) !== false) {
+        if ($stackPtr !== 0)
+        {
+            if ($phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1)) !== false)
+            {
                 return;
             }
         }
@@ -85,21 +86,28 @@ 
         ) {
             $token = $tokens[$currentToken];
             $tokenCode = $token['code'];
-            if (T_COMMENT === $tokenCode) {
+            if (T_COMMENT === $tokenCode)
+            {
                 $commentString = self::_getCommentContent($token['content']);
-                if (0 === strcmp($commentString, $commentTemplate)) {
+                if (0 === strcmp($commentString, $commentTemplate))
+                {
                     $hasClosingFileComment = true;
                 }
-            } else if (T_WHITESPACE === $tokenCode) {
+            }
+            else if (T_WHITESPACE === $tokenCode)
+            {
                 // Whitespaces are allowed between the closing file comment,
                 // other comments and end of file
-            } else {
+            }
+            else
+            {
                 $isNotAWhitespaceOrAComment = true;
             }
             $currentToken--;
         }
 
-        if ( ! $hasClosingFileComment) {
+        if ( ! $hasClosingFileComment)
+        {
             $error = 'No comment block marks the end of file instead of the closing PHP tag. Please add a comment block containing only "' . $commentTemplate . '".';
             $phpcsFile->addError($error, $currentToken);
         }

Upper-Lower-Casing +5 added lines, -5 removed lines

@@ -66,7 +66,7 @@ 
     {
         // We are only interested if this is the first open tag.
         if ($stackPtr !== 0) {
-            if ($phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1)) !== false) {
+            if ($phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1)) !== FALSE) {
                 return;
             }
         }
@@ -77,8 +77,8 @@ 
 
         $tokens = $phpcsFile->getTokens();
         $currentToken = count($tokens) - 1;
-        $hasClosingFileComment = false;
-        $isNotAWhitespaceOrAComment = false;
+        $hasClosingFileComment = FALSE;
+        $isNotAWhitespaceOrAComment = FALSE;
         while ($currentToken >= 0
             && ! $isNotAWhitespaceOrAComment
             && ! $hasClosingFileComment
@@ -88,13 +88,13 @@ 
             if (T_COMMENT === $tokenCode) {
                 $commentString = self::_getCommentContent($token['content']);
                 if (0 === strcmp($commentString, $commentTemplate)) {
-                    $hasClosingFileComment = true;
+                    $hasClosingFileComment = TRUE;
                 }
             } else if (T_WHITESPACE === $tokenCode) {
                 // Whitespaces are allowed between the closing file comment,
                 // other comments and end of file
             } else {
-                $isNotAWhitespaceOrAComment = true;
+                $isNotAWhitespaceOrAComment = TRUE;
             }
             $currentToken--;
         }

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return integer[]
      */
     public function register()
     {

build/CodeIgniter/UnusedSniffs/NamingConventions/ConstructorNameSniff.php

Indentation +92 added lines, -92 removed lines

@@ -36,101 +36,101 @@
 {
 
 
-    public $php5Constructors = '1';
-
-
-    /**
-     * Constructs the test with the tokens it wishes to listen for.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct(array(T_CLASS, T_INTERFACE), array(T_FUNCTION), true);
-
-    }//end __construct()
-
-
-    /**
-     * Processes this test when one of its tokens is encountered.
-     *
-     * @param File $phpcsFile The current file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     * @param int                  $currScope A pointer to the start of the scope.
-     *
-     * @return void
-     */
-    protected function processTokenWithinScope(
-        File $phpcsFile,
-        $stackPtr,
-        $currScope
-    ) {
-        $methodName = $phpcsFile->getDeclarationName($stackPtr);
-        $className  = $phpcsFile->getDeclarationName($currScope);
+	public $php5Constructors = '1';
+
+
+	/**
+	 * Constructs the test with the tokens it wishes to listen for.
+	 *
+	 * @return void
+	 */
+	public function __construct()
+	{
+		parent::__construct(array(T_CLASS, T_INTERFACE), array(T_FUNCTION), true);
+
+	}//end __construct()
+
+
+	/**
+	 * Processes this test when one of its tokens is encountered.
+	 *
+	 * @param File $phpcsFile The current file being scanned.
+	 * @param int                  $stackPtr  The position of the current token
+	 *                                        in the stack passed in $tokens.
+	 * @param int                  $currScope A pointer to the start of the scope.
+	 *
+	 * @return void
+	 */
+	protected function processTokenWithinScope(
+		File $phpcsFile,
+		$stackPtr,
+		$currScope
+	) {
+		$methodName = $phpcsFile->getDeclarationName($stackPtr);
+		$className  = $phpcsFile->getDeclarationName($currScope);
 
 	$isPhp4Constructor = strcasecmp($methodName, $className) === 0;
 	$isPhp5Constructor = strcasecmp($methodName, '__construct') === 0;
-        if ($this->php5Constructors != '0') {
-            if ($isPhp4Constructor) {
-                $error = "PHP4 style constructors are not allowed; use \"__construct\" instead";
-                $phpcsFile->addError($error, $stackPtr);
-            }
-        } else {
-            if ($isPhp5Constructor) {
-                $error = "PHP5 style constructors are not allowed; use \"$className\" instead";
-                $phpcsFile->addError($error, $stackPtr);
-            }
-        }
-        if ( ! $isPhp4Constructor && ! $isPhp5Constructor ) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        $parentClassName = $phpcsFile->findExtendedClassName($currScope);
-        $wrongConstructor = '';
-        // prepares the error message and wrong constructor
-        if ($this->php5Constructors != '0') {
-            $error = 'PHP4 style calls to parent constructors are not allowed.';
-            $error = "$error Please use \"parent::__construct\" instead.";
-            if (false !== $parentClassName) {
-                $wrongConstructor = $parentClassName;
-            }
-            // Else $wrongConstructor will be empty
-            // and the test expression will always be false.
-            // It doesn't check that no parent method should be called
-            // when no parent class is defined.
-        } else {
-            $error = 'PHP5 style calls to parent constructors are not allowed.';
-            if (false !== $parentClassName) {
-                $error = "$error Please use \"parent::$parentClassName\" instead.";
-            }
-            $wrongConstructor = '__construct';
-        }
-
-        // looks for the use of a wrong constructor.
-        $endFunctionIndex = $tokens[$stackPtr]['scope_closer'];
-        $doubleColonIndex = $phpcsFile->findNext(
-            array(T_DOUBLE_COLON),
-            $stackPtr,
-            $endFunctionIndex
-        );
-        while ($doubleColonIndex) {
-            if ($tokens[($doubleColonIndex + 1)]['code'] === T_STRING
-                && $tokens[($doubleColonIndex + 1)]['content'] === $wrongConstructor
-            ) {
-                $phpcsFile->addError($error, ($doubleColonIndex + 1));
-            }
-
-            $doubleColonIndex = $phpcsFile->findNext(
-                array(T_DOUBLE_COLON),
-                $doubleColonIndex + 1,
-                $endFunctionIndex
-            );
-        }
-
-    }//end processTokenWithinScope()
+		if ($this->php5Constructors != '0') {
+			if ($isPhp4Constructor) {
+				$error = "PHP4 style constructors are not allowed; use \"__construct\" instead";
+				$phpcsFile->addError($error, $stackPtr);
+			}
+		} else {
+			if ($isPhp5Constructor) {
+				$error = "PHP5 style constructors are not allowed; use \"$className\" instead";
+				$phpcsFile->addError($error, $stackPtr);
+			}
+		}
+		if ( ! $isPhp4Constructor && ! $isPhp5Constructor ) {
+			return;
+		}
+
+		$tokens = $phpcsFile->getTokens();
+
+		$parentClassName = $phpcsFile->findExtendedClassName($currScope);
+		$wrongConstructor = '';
+		// prepares the error message and wrong constructor
+		if ($this->php5Constructors != '0') {
+			$error = 'PHP4 style calls to parent constructors are not allowed.';
+			$error = "$error Please use \"parent::__construct\" instead.";
+			if (false !== $parentClassName) {
+				$wrongConstructor = $parentClassName;
+			}
+			// Else $wrongConstructor will be empty
+			// and the test expression will always be false.
+			// It doesn't check that no parent method should be called
+			// when no parent class is defined.
+		} else {
+			$error = 'PHP5 style calls to parent constructors are not allowed.';
+			if (false !== $parentClassName) {
+				$error = "$error Please use \"parent::$parentClassName\" instead.";
+			}
+			$wrongConstructor = '__construct';
+		}
+
+		// looks for the use of a wrong constructor.
+		$endFunctionIndex = $tokens[$stackPtr]['scope_closer'];
+		$doubleColonIndex = $phpcsFile->findNext(
+			array(T_DOUBLE_COLON),
+			$stackPtr,
+			$endFunctionIndex
+		);
+		while ($doubleColonIndex) {
+			if ($tokens[($doubleColonIndex + 1)]['code'] === T_STRING
+				&& $tokens[($doubleColonIndex + 1)]['content'] === $wrongConstructor
+			) {
+				$phpcsFile->addError($error, ($doubleColonIndex + 1));
+			}
+
+			$doubleColonIndex = $phpcsFile->findNext(
+				array(T_DOUBLE_COLON),
+				$doubleColonIndex + 1,
+				$endFunctionIndex
+			);
+		}
+
+	}//end processTokenWithinScope()
 
 	protected function processTokenOutsideScope(File $phpcsFile, $stackPtr)
 	{

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
                 $phpcsFile->addError($error, $stackPtr);
             }
         }
-        if ( ! $isPhp4Constructor && ! $isPhp5Constructor ) {
+        if ( ! $isPhp4Constructor && ! $isPhp5Constructor) {
             return;
         }
 

Braces +23 added lines, -12 removed lines

@@ -32,8 +32,7 @@ 
  * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class ConstructorNameSniff extends AbstractScopeSniff
-{
+class ConstructorNameSniff extends AbstractScopeSniff {
 
 
     public $php5Constructors = '1';
@@ -71,18 +70,24 @@ 
 
 	$isPhp4Constructor = strcasecmp($methodName, $className) === 0;
 	$isPhp5Constructor = strcasecmp($methodName, '__construct') === 0;
-        if ($this->php5Constructors != '0') {
-            if ($isPhp4Constructor) {
+        if ($this->php5Constructors != '0')
+        {
+            if ($isPhp4Constructor)
+            {
                 $error = "PHP4 style constructors are not allowed; use \"__construct\" instead";
                 $phpcsFile->addError($error, $stackPtr);
             }
-        } else {
-            if ($isPhp5Constructor) {
+        }
+        else
+        {
+            if ($isPhp5Constructor)
+            {
                 $error = "PHP5 style constructors are not allowed; use \"$className\" instead";
                 $phpcsFile->addError($error, $stackPtr);
             }
         }
-        if ( ! $isPhp4Constructor && ! $isPhp5Constructor ) {
+        if ( ! $isPhp4Constructor && ! $isPhp5Constructor )
+        {
             return;
         }
 
@@ -91,19 +96,24 @@ 
         $parentClassName = $phpcsFile->findExtendedClassName($currScope);
         $wrongConstructor = '';
         // prepares the error message and wrong constructor
-        if ($this->php5Constructors != '0') {
+        if ($this->php5Constructors != '0')
+        {
             $error = 'PHP4 style calls to parent constructors are not allowed.';
             $error = "$error Please use \"parent::__construct\" instead.";
-            if (false !== $parentClassName) {
+            if (false !== $parentClassName)
+            {
                 $wrongConstructor = $parentClassName;
             }
             // Else $wrongConstructor will be empty
             // and the test expression will always be false.
             // It doesn't check that no parent method should be called
             // when no parent class is defined.
-        } else {
+        }
+        else
+        {
             $error = 'PHP5 style calls to parent constructors are not allowed.';
-            if (false !== $parentClassName) {
+            if (false !== $parentClassName)
+            {
                 $error = "$error Please use \"parent::$parentClassName\" instead.";
             }
             $wrongConstructor = '__construct';
@@ -116,7 +126,8 @@ 
             $stackPtr,
             $endFunctionIndex
         );
-        while ($doubleColonIndex) {
+        while ($doubleColonIndex)
+        {
             if ($tokens[($doubleColonIndex + 1)]['code'] === T_STRING
                 && $tokens[($doubleColonIndex + 1)]['content'] === $wrongConstructor
             ) {

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -46,7 +46,7 @@ 
      */
     public function __construct()
     {
-        parent::__construct(array(T_CLASS, T_INTERFACE), array(T_FUNCTION), true);
+        parent::__construct(array(T_CLASS, T_INTERFACE), array(T_FUNCTION), TRUE);
 
     }//end __construct()
 
@@ -94,7 +94,7 @@ 
         if ($this->php5Constructors != '0') {
             $error = 'PHP4 style calls to parent constructors are not allowed.';
             $error = "$error Please use \"parent::__construct\" instead.";
-            if (false !== $parentClassName) {
+            if (FALSE !== $parentClassName) {
                 $wrongConstructor = $parentClassName;
             }
             // Else $wrongConstructor will be empty
@@ -103,7 +103,7 @@ 
             // when no parent class is defined.
         } else {
             $error = 'PHP5 style calls to parent constructors are not allowed.';
-            if (false !== $parentClassName) {
+            if (FALSE !== $parentClassName) {
                 $error = "$error Please use \"parent::$parentClassName\" instead.";
             }
             $wrongConstructor = '__construct';

build/CodeIgniter/UnusedSniffs/NamingConventions/ValidClassNameSniff.php

Indentation +37 added lines, -37 removed lines

@@ -39,45 +39,45 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            T_CLASS,
-            T_INTERFACE,
-        );
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(
+			T_CLASS,
+			T_INTERFACE,
+		);
 
-    }//end register()
+	}//end register()
 
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param File $phpcsFile The current file being processed.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        // get the class name
-        $className = trim($phpcsFile->getDeclarationName($stackPtr));
-        // compute the expected class name
-        // [^_] means "something different from _", but not "nothing or something different from _"
-        $lcClassNameChunk = preg_replace('/([^_])([A-Z])/', '${1}_${2}', $className);
-        $expectedClassName
-            = strtoupper($className[0]) . strtolower(substr($lcClassNameChunk,1));
-        // ensures that the current class name
-        // and the expected class name are identical
-        if (0 !== strcmp($className, $expectedClassName)) {
-            $error =  'Class names should always have their first letter uppercase. Multiple words should be separated with an underscore, and not CamelCased. Please consider ' . $expectedClassName . ' instead of ' . $className . '.';
-            $phpcsFile->addError($error, $stackPtr);
-        }
-    }//end process()
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param File $phpcsFile The current file being processed.
+	 * @param int                  $stackPtr  The position of the current token
+	 *                                        in the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		// get the class name
+		$className = trim($phpcsFile->getDeclarationName($stackPtr));
+		// compute the expected class name
+		// [^_] means "something different from _", but not "nothing or something different from _"
+		$lcClassNameChunk = preg_replace('/([^_])([A-Z])/', '${1}_${2}', $className);
+		$expectedClassName
+			= strtoupper($className[0]) . strtolower(substr($lcClassNameChunk,1));
+		// ensures that the current class name
+		// and the expected class name are identical
+		if (0 !== strcmp($className, $expectedClassName)) {
+			$error =  'Class names should always have their first letter uppercase. Multiple words should be separated with an underscore, and not CamelCased. Please consider ' . $expectedClassName . ' instead of ' . $className . '.';
+			$phpcsFile->addError($error, $stackPtr);
+		}
+	}//end process()
 
 }//end class
 

Spacing +2 added lines, -2 removed lines

@@ -70,11 +70,11 @@
         // [^_] means "something different from _", but not "nothing or something different from _"
         $lcClassNameChunk = preg_replace('/([^_])([A-Z])/', '${1}_${2}', $className);
         $expectedClassName
-            = strtoupper($className[0]) . strtolower(substr($lcClassNameChunk,1));
+            = strtoupper($className[0]) . strtolower(substr($lcClassNameChunk, 1));
         // ensures that the current class name
         // and the expected class name are identical
         if (0 !== strcmp($className, $expectedClassName)) {
-            $error =  'Class names should always have their first letter uppercase. Multiple words should be separated with an underscore, and not CamelCased. Please consider ' . $expectedClassName . ' instead of ' . $className . '.';
+            $error = 'Class names should always have their first letter uppercase. Multiple words should be separated with an underscore, and not CamelCased. Please consider ' . $expectedClassName . ' instead of ' . $className . '.';
             $phpcsFile->addError($error, $stackPtr);
         }
     }//end process()

Braces +3 added lines, -3 removed lines

@@ -35,8 +35,7 @@ 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
 
-class ValidClassNameSniff implements Sniff
-{
+class ValidClassNameSniff implements Sniff {
 
 
     /**
@@ -73,7 +72,8 @@ 
             = strtoupper($className[0]) . strtolower(substr($lcClassNameChunk,1));
         // ensures that the current class name
         // and the expected class name are identical
-        if (0 !== strcmp($className, $expectedClassName)) {
+        if (0 !== strcmp($className, $expectedClassName))
+        {
             $error =  'Class names should always have their first letter uppercase. Multiple words should be separated with an underscore, and not CamelCased. Please consider ' . $expectedClassName . ' instead of ' . $className . '.';
             $phpcsFile->addError($error, $stackPtr);
         }

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return integer[]
      */
     public function register()
     {

build/CodeIgniter/UnusedSniffs/NamingConventions/ValidVariableNameSniff.php

Indentation +494 added lines, -494 removed lines

@@ -44,519 +44,519 @@
 {
 
 
-    /**
-     * Processes class member variables.
-     *
-     * @param File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    protected function processMemberVar(File $phpcsFile, $stackPtr)
-    {
-        // get variable name and properties
-        $tokens = $phpcsFile->getTokens();
-        $varTk = $tokens[$stackPtr];
-        $varName = substr($varTk['content'], 1);
-        $varProps = $phpcsFile->getMemberProperties($stackPtr);
-        // check(s)
-        if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName) ) {
-            return;
-        }
-        if ( ! $this->checkVisibilityPrefix($phpcsFile, $stackPtr, $varName, $varProps)) {
-            return;
-        }
-        if ( ! $this->checkLength($phpcsFile, $stackPtr, $varName)) {
-            return;
-        }
+	/**
+	 * Processes class member variables.
+	 *
+	 * @param File $phpcsFile The file being scanned.
+	 * @param int                  $stackPtr  The position of the current token
+	 *                                        in the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	protected function processMemberVar(File $phpcsFile, $stackPtr)
+	{
+		// get variable name and properties
+		$tokens = $phpcsFile->getTokens();
+		$varTk = $tokens[$stackPtr];
+		$varName = substr($varTk['content'], 1);
+		$varProps = $phpcsFile->getMemberProperties($stackPtr);
+		// check(s)
+		if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName) ) {
+			return;
+		}
+		if ( ! $this->checkVisibilityPrefix($phpcsFile, $stackPtr, $varName, $varProps)) {
+			return;
+		}
+		if ( ! $this->checkLength($phpcsFile, $stackPtr, $varName)) {
+			return;
+		}
 
-    }//end processMemberVar()
+	}//end processMemberVar()
 
 
-    /**
-     * Processes normal variables.
-     *
-     * @param File $phpcsFile The file where this token was found.
-     * @param int                  $stackPtr  The position where the token was found.
-     *
-     * @return void
-     */
-    protected function processVariable(File $phpcsFile, $stackPtr)
-    {
-        // get variable name
-        $tokens = $phpcsFile->getTokens();
-        $varTk = $tokens[$stackPtr];
-        $varName = substr($varTk['content'], 1);
-        // skip the current object variable, i.e. $this
-        if (0 === strcmp($varName, 'this')) {
-            return;
-        }
-        // check(s)
-        if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName)) {
-            return;
-        }
-        if ( ! $this->checkLength($phpcsFile, $stackPtr, $varName)) {
-            return;
-        }
+	/**
+	 * Processes normal variables.
+	 *
+	 * @param File $phpcsFile The file where this token was found.
+	 * @param int                  $stackPtr  The position where the token was found.
+	 *
+	 * @return void
+	 */
+	protected function processVariable(File $phpcsFile, $stackPtr)
+	{
+		// get variable name
+		$tokens = $phpcsFile->getTokens();
+		$varTk = $tokens[$stackPtr];
+		$varName = substr($varTk['content'], 1);
+		// skip the current object variable, i.e. $this
+		if (0 === strcmp($varName, 'this')) {
+			return;
+		}
+		// check(s)
+		if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName)) {
+			return;
+		}
+		if ( ! $this->checkLength($phpcsFile, $stackPtr, $varName)) {
+			return;
+		}
 
-    }//end processVariable()
+	}//end processVariable()
 
 
-    /**
-     * Processes variables in double quoted strings.
-     *
-     * @param File $phpcsFile The file where this token was found.
-     * @param int                  $stackPtr  The position where the token was found.
-     *
-     * @return void
-     */
-    protected function processVariableInString(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $stringTk = $tokens[$stackPtr];
-        $stringString = $stringTk['content'];
-        $varAt = self::_getVariablePosition($stringString, 0);
-        while (false !== $varAt) {
-            // get variable name
-            $matches = array();
-            preg_match('/^\$\{?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\}?/', substr($stringString, $varAt), $matches);
-            $varName = $matches[1];
-            // check(s)
-            if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName)) {
-                return;
-            }
-            if ( ! $this->checkLength($phpcsFile, $stackPtr, $varName)) {
-                return;
-            }
-            // prepare checking next variable
-            $varAt = self::_getVariablePosition($stringString, $varAt + 1);
-        }
+	/**
+	 * Processes variables in double quoted strings.
+	 *
+	 * @param File $phpcsFile The file where this token was found.
+	 * @param int                  $stackPtr  The position where the token was found.
+	 *
+	 * @return void
+	 */
+	protected function processVariableInString(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+		$stringTk = $tokens[$stackPtr];
+		$stringString = $stringTk['content'];
+		$varAt = self::_getVariablePosition($stringString, 0);
+		while (false !== $varAt) {
+			// get variable name
+			$matches = array();
+			preg_match('/^\$\{?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\}?/', substr($stringString, $varAt), $matches);
+			$varName = $matches[1];
+			// check(s)
+			if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName)) {
+				return;
+			}
+			if ( ! $this->checkLength($phpcsFile, $stackPtr, $varName)) {
+				return;
+			}
+			// prepare checking next variable
+			$varAt = self::_getVariablePosition($stringString, $varAt + 1);
+		}
 
-    }//end processVariableInString()
+	}//end processVariableInString()
 
 
-    /**
-     * Checks that the variable name is all in lower case, else it add an error
-     * to $phpcsFile. Returns true if variable name is all in lower case, false
-     * otherwise.
-     *
-     * @param File $phpcsFile The current file being processed.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     * @param string               $varName   The name of the variable to
-     *                                        procced without $, { nor }.
-     *
-     * @return bool true if variable name is all in lower case, false otherwise.
-     */
-    protected function checkLowerCase(File $phpcsFile, $stackPtr, $varName)
-    {
-        $isInLowerCase = true;
-        if (0 !== strcmp($varName, strtolower($varName))) {
-            // get the expected variable name
-            $varNameWithUnderscores = preg_replace('/([A-Z])/', '_${1}', $varName);
-            $expectedVarName = strtolower(ltrim($varNameWithUnderscores, '_'));
-            // adapts the error message to the error case
-            if (strlen($varNameWithUnderscores) > strlen($varName)) {
-                $error = 'Variables should not use CamelCasing or start with a Capital.';
-            } else {
-                $error = 'Variables should be entirely lowercased.';
-            }
-            $error = $error . 'Please consider "' . $expectedVarName
-                . '" instead of "' . $varName . '".';
-            // adds the error and changes return value
-            $phpcsFile->addError($error, $stackPtr);
-            $isInLowerCase = false;
-        }
-        return $isInLowerCase;
-    }//end checkLowerCase()
+	/**
+	 * Checks that the variable name is all in lower case, else it add an error
+	 * to $phpcsFile. Returns true if variable name is all in lower case, false
+	 * otherwise.
+	 *
+	 * @param File $phpcsFile The current file being processed.
+	 * @param int                  $stackPtr  The position of the current token
+	 *                                        in the stack passed in $tokens.
+	 * @param string               $varName   The name of the variable to
+	 *                                        procced without $, { nor }.
+	 *
+	 * @return bool true if variable name is all in lower case, false otherwise.
+	 */
+	protected function checkLowerCase(File $phpcsFile, $stackPtr, $varName)
+	{
+		$isInLowerCase = true;
+		if (0 !== strcmp($varName, strtolower($varName))) {
+			// get the expected variable name
+			$varNameWithUnderscores = preg_replace('/([A-Z])/', '_${1}', $varName);
+			$expectedVarName = strtolower(ltrim($varNameWithUnderscores, '_'));
+			// adapts the error message to the error case
+			if (strlen($varNameWithUnderscores) > strlen($varName)) {
+				$error = 'Variables should not use CamelCasing or start with a Capital.';
+			} else {
+				$error = 'Variables should be entirely lowercased.';
+			}
+			$error = $error . 'Please consider "' . $expectedVarName
+				. '" instead of "' . $varName . '".';
+			// adds the error and changes return value
+			$phpcsFile->addError($error, $stackPtr);
+			$isInLowerCase = false;
+		}
+		return $isInLowerCase;
+	}//end checkLowerCase()
 
-    /**
-     * Checks that an underscore is used at the beginning of a variable only if
-     * it is about a private variable. If it isn't a private variable, then it
-     * must not be prefixed with an underscore. Returns true if $varName is
-     * properly prefixed according to the variable visibility provided in
-     * $varProps, false otherwise.
-     *
-     * @param File $phpcsFile The current file being processed.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     * @param string               $varName   The name of the variable to
-     *                                        procced without $, { nor }.
-     * @param array                $varProps  Member variable properties like
-     *                                        its visibility.
-     *
-     * @return bool true if variable name is prefixed with an underscore only
-     * when it is about a private variable, false otherwise.
-     */
-    protected function checkVisibilityPrefix(File $phpcsFile, $stackPtr, $varName, $varProps)
-    {
-        $isVisibilityPrefixRight = true;
-        $scope = $varProps['scope'];
-        // If it's a private variable, it must have an underscore on the front.
-        if ($scope === 'private' && $varName{0} !== '_') {
-            $error = "Private variable name \"$varName\" must be prefixed with an underscore";
-            $phpcsFile->addError($error, $stackPtr);
-            $isVisibilityPrefixRight = false;
-        } else if ($scope !== 'private' && $varName{0} === '_') {
-            // If it's not a private variable,
-            // then it must not start with an underscore.
-            if (isset ($scopeSpecified) && true === $scopeSpecified) {
-                $error = "Public variable name \"$varName\" must not be prefixed with an underscore";
-            } else {
-                $error = ucfirst($scope) . " variable name \"$varName\" must not be prefixed with an underscore";
-            }
-            $phpcsFile->addError($error, $stackPtr);
-            $isVisibilityPrefixRight = false;
-        }
-        return $isVisibilityPrefixRight;
-    }//end checkVisibilityPrefix()
+	/**
+	 * Checks that an underscore is used at the beginning of a variable only if
+	 * it is about a private variable. If it isn't a private variable, then it
+	 * must not be prefixed with an underscore. Returns true if $varName is
+	 * properly prefixed according to the variable visibility provided in
+	 * $varProps, false otherwise.
+	 *
+	 * @param File $phpcsFile The current file being processed.
+	 * @param int                  $stackPtr  The position of the current token
+	 *                                        in the stack passed in $tokens.
+	 * @param string               $varName   The name of the variable to
+	 *                                        procced without $, { nor }.
+	 * @param array                $varProps  Member variable properties like
+	 *                                        its visibility.
+	 *
+	 * @return bool true if variable name is prefixed with an underscore only
+	 * when it is about a private variable, false otherwise.
+	 */
+	protected function checkVisibilityPrefix(File $phpcsFile, $stackPtr, $varName, $varProps)
+	{
+		$isVisibilityPrefixRight = true;
+		$scope = $varProps['scope'];
+		// If it's a private variable, it must have an underscore on the front.
+		if ($scope === 'private' && $varName{0} !== '_') {
+			$error = "Private variable name \"$varName\" must be prefixed with an underscore";
+			$phpcsFile->addError($error, $stackPtr);
+			$isVisibilityPrefixRight = false;
+		} else if ($scope !== 'private' && $varName{0} === '_') {
+			// If it's not a private variable,
+			// then it must not start with an underscore.
+			if (isset ($scopeSpecified) && true === $scopeSpecified) {
+				$error = "Public variable name \"$varName\" must not be prefixed with an underscore";
+			} else {
+				$error = ucfirst($scope) . " variable name \"$varName\" must not be prefixed with an underscore";
+			}
+			$phpcsFile->addError($error, $stackPtr);
+			$isVisibilityPrefixRight = false;
+		}
+		return $isVisibilityPrefixRight;
+	}//end checkVisibilityPrefix()
 
-    /**
-     * Checks that variable name length is not too short. Returns true, if it
-     * meets minimum length requirement, false otherwise.
-     *
-     * A variable name is too short if it is shorter than the minimal
-     * length and it isn't in the list of allowed short names nor declared in a
-     * for loop (in which it would be nested).
-     * The minimal length is defined in the function. It is 3 chars now.
-     * The list of allowed short names is defined in the function.
-     * It is case-sensitive. It contains only 'ci' now.
-     *
-     * @param File $phpcsFile The current file being processed.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     * @param string               $varName   The name of the variable to
-     *                                        procced without $, { nor }.
-     *
-     * @return bool false if variable name $varName is shorter than the minimal
-     * length and it isn't in the list of allowed short names nor declared in a
-     * for loop (in which it would be nested), otherwise true.
-     */
-    protected function checkLength(File $phpcsFile, $stackPtr, $varName)
-    {
-        $minLength = 3;
-        $allowedShortName = array('ci');
+	/**
+	 * Checks that variable name length is not too short. Returns true, if it
+	 * meets minimum length requirement, false otherwise.
+	 *
+	 * A variable name is too short if it is shorter than the minimal
+	 * length and it isn't in the list of allowed short names nor declared in a
+	 * for loop (in which it would be nested).
+	 * The minimal length is defined in the function. It is 3 chars now.
+	 * The list of allowed short names is defined in the function.
+	 * It is case-sensitive. It contains only 'ci' now.
+	 *
+	 * @param File $phpcsFile The current file being processed.
+	 * @param int                  $stackPtr  The position of the current token
+	 *                                        in the stack passed in $tokens.
+	 * @param string               $varName   The name of the variable to
+	 *                                        procced without $, { nor }.
+	 *
+	 * @return bool false if variable name $varName is shorter than the minimal
+	 * length and it isn't in the list of allowed short names nor declared in a
+	 * for loop (in which it would be nested), otherwise true.
+	 */
+	protected function checkLength(File $phpcsFile, $stackPtr, $varName)
+	{
+		$minLength = 3;
+		$allowedShortName = array('ci');
 
-        $isLengthRight = true;
-        // cleans variable name
-        $varName = ltrim($varName, '_');
-        if (strlen($varName) <= $minLength) {
-            // skips adding an error, if it is a specific variable name
-            if (in_array($varName, $allowedShortName)) {
-                return $isLengthRight;
-            }
-            // skips adding an error, if the variable is in a for loop
-            if (false !== self::_isInForLoop($phpcsFile, $stackPtr, $varName)) {
-                return $isLengthRight;
-            }
-            // adds the error message finally
-            $error = 'Very short'
-                . (
-                    $minLength > 0 ?
-                    ' (i.e. less than ' . ($minLength + 1) . ' chars)'
-                    : ''
-                )
-                . ', non-word variables like "' . $varName
-                . '" should only be used as iterators in for() loops.';
-            $phpcsFile->addError($error, $stackPtr);
-            $isLengthRight = false;
-        }
-        return $isLengthRight;
-    }//end checkLength()
+		$isLengthRight = true;
+		// cleans variable name
+		$varName = ltrim($varName, '_');
+		if (strlen($varName) <= $minLength) {
+			// skips adding an error, if it is a specific variable name
+			if (in_array($varName, $allowedShortName)) {
+				return $isLengthRight;
+			}
+			// skips adding an error, if the variable is in a for loop
+			if (false !== self::_isInForLoop($phpcsFile, $stackPtr, $varName)) {
+				return $isLengthRight;
+			}
+			// adds the error message finally
+			$error = 'Very short'
+				. (
+					$minLength > 0 ?
+					' (i.e. less than ' . ($minLength + 1) . ' chars)'
+					: ''
+				)
+				. ', non-word variables like "' . $varName
+				. '" should only be used as iterators in for() loops.';
+			$phpcsFile->addError($error, $stackPtr);
+			$isLengthRight = false;
+		}
+		return $isLengthRight;
+	}//end checkLength()
 
-    /**
-     * Returns the position of closest previous T_FOR, if token associated with
-     * $stackPtr in $phpcsFile is in a for loop, otherwise false.
-     *
-     * @param File $phpcsFile The current file being processed.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     * @param string               $varName   The name of the variable to
-     *                                        procced without $, { nor }.
-     *
-     * @return int|bool Position of T_FOR if token associated with $stackPtr in
-     *                  $phpcsFile is in the head of a for loop, otherwise false.
-     */
-    private static function _isInForLoop(File $phpcsFile, $stackPtr, $varName)
-    {
-        $keepLookingFromPtr = $stackPtr;
-        while (false !== $keepLookingFromPtr) {
-            // looks if it is in (head or body) of a for loop
-            $forPtr = self::_isInForLoopHead($phpcsFile, $keepLookingFromPtr);
-            if (false === $forPtr) {
-                $forPtr = self::_isInForLoopBody($phpcsFile, $keepLookingFromPtr);
-            }
-            // checks if it is declared in here and prepares next step
-            if (false !== $forPtr) {
-                if (false !== self::_isDeclaredInForLoop($phpcsFile, $forPtr, $varName)) {
-                    return $forPtr;
-                }
-                $keepLookingFromPtr = $forPtr;
-            } else {
-                $keepLookingFromPtr = false;
-            }
-        }
-        return false;
-    }//end _isInForLoop()
+	/**
+	 * Returns the position of closest previous T_FOR, if token associated with
+	 * $stackPtr in $phpcsFile is in a for loop, otherwise false.
+	 *
+	 * @param File $phpcsFile The current file being processed.
+	 * @param int                  $stackPtr  The position of the current token
+	 *                                        in the stack passed in $tokens.
+	 * @param string               $varName   The name of the variable to
+	 *                                        procced without $, { nor }.
+	 *
+	 * @return int|bool Position of T_FOR if token associated with $stackPtr in
+	 *                  $phpcsFile is in the head of a for loop, otherwise false.
+	 */
+	private static function _isInForLoop(File $phpcsFile, $stackPtr, $varName)
+	{
+		$keepLookingFromPtr = $stackPtr;
+		while (false !== $keepLookingFromPtr) {
+			// looks if it is in (head or body) of a for loop
+			$forPtr = self::_isInForLoopHead($phpcsFile, $keepLookingFromPtr);
+			if (false === $forPtr) {
+				$forPtr = self::_isInForLoopBody($phpcsFile, $keepLookingFromPtr);
+			}
+			// checks if it is declared in here and prepares next step
+			if (false !== $forPtr) {
+				if (false !== self::_isDeclaredInForLoop($phpcsFile, $forPtr, $varName)) {
+					return $forPtr;
+				}
+				$keepLookingFromPtr = $forPtr;
+			} else {
+				$keepLookingFromPtr = false;
+			}
+		}
+		return false;
+	}//end _isInForLoop()
 
-    /**
-     * Returns the position of closest previous T_FOR, if token associated with
-     * $stackPtr in $phpcsFile is in the head of a for loop, otherwise false.
-     * The head is the code placed between parenthesis next to the key word
-     * 'for' : for (<loop_head>) {<loop_body>}.
-     *
-     * @param File $phpcsFile The current file being processed.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return int|bool Position of T_FOR if token associated with $stackPtr in
-     *                  $phpcsFile is in the head of a for loop, otherwise false.
-     */
-    private static function _isInForLoopHead(File $phpcsFile, $stackPtr)
-    {
-        $isInForLoop = false;
-        $tokens = $phpcsFile->getTokens();
-        $currentTk = $tokens[$stackPtr];
-        if (array_key_exists('nested_parenthesis', $currentTk)) {
-            $nestedParenthesis = $currentTk['nested_parenthesis'];
-            foreach ( $nestedParenthesis as $openParPtr => $closeParPtr) {
-                $nonWhitspacePtr = $phpcsFile->findPrevious(
-                    array(T_WHITESPACE),
-                    $openParPtr - 1,
-                    null,
-                    true,
-                    null,
-                    true
-                );
-                if (false !== $nonWhitspacePtr) {
-                    $isFor = T_FOR === $tokens[$nonWhitspacePtr]['code'];
-                    if ($isFor) {
-                        $isInForLoop = $nonWhitspacePtr;
-                        break;
-                    }
-                }
-            }
-        }
-        return $isInForLoop;
-    }//end _isInForLoopHead()
+	/**
+	 * Returns the position of closest previous T_FOR, if token associated with
+	 * $stackPtr in $phpcsFile is in the head of a for loop, otherwise false.
+	 * The head is the code placed between parenthesis next to the key word
+	 * 'for' : for (<loop_head>) {<loop_body>}.
+	 *
+	 * @param File $phpcsFile The current file being processed.
+	 * @param int                  $stackPtr  The position of the current token
+	 *                                        in the stack passed in $tokens.
+	 *
+	 * @return int|bool Position of T_FOR if token associated with $stackPtr in
+	 *                  $phpcsFile is in the head of a for loop, otherwise false.
+	 */
+	private static function _isInForLoopHead(File $phpcsFile, $stackPtr)
+	{
+		$isInForLoop = false;
+		$tokens = $phpcsFile->getTokens();
+		$currentTk = $tokens[$stackPtr];
+		if (array_key_exists('nested_parenthesis', $currentTk)) {
+			$nestedParenthesis = $currentTk['nested_parenthesis'];
+			foreach ( $nestedParenthesis as $openParPtr => $closeParPtr) {
+				$nonWhitspacePtr = $phpcsFile->findPrevious(
+					array(T_WHITESPACE),
+					$openParPtr - 1,
+					null,
+					true,
+					null,
+					true
+				);
+				if (false !== $nonWhitspacePtr) {
+					$isFor = T_FOR === $tokens[$nonWhitspacePtr]['code'];
+					if ($isFor) {
+						$isInForLoop = $nonWhitspacePtr;
+						break;
+					}
+				}
+			}
+		}
+		return $isInForLoop;
+	}//end _isInForLoopHead()
 
-    /**
-     * Returns the position of closest previous T_FOR, if token associated with
-     * $stackPtr in $phpcsFile is in the body of a for loop, otherwise false.
-     * The body are the instructions placed after parenthesis of a 'for'
-     * declaration, enclosed with curly brackets usually.
-     * 'for' : for (<loop_head>) {<loop_body>}.
-     *
-     * @param File $phpcsFile The current file being processed.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return int|bool Position of T_FOR if token associated with $stackPtr in
-     *                  $phpcsFile is in the body of a for loop, otherwise false.
-     */
-    private static function _isInForLoopBody(File $phpcsFile, $stackPtr)
-    {
-        $isInForLoop = false;
-        $tokens = $phpcsFile->getTokens();
-        // get englobing hierarchy
-        $parentPtrAndCode = $tokens[$stackPtr]['conditions'];
-        krsort($parentPtrAndCode);
+	/**
+	 * Returns the position of closest previous T_FOR, if token associated with
+	 * $stackPtr in $phpcsFile is in the body of a for loop, otherwise false.
+	 * The body are the instructions placed after parenthesis of a 'for'
+	 * declaration, enclosed with curly brackets usually.
+	 * 'for' : for (<loop_head>) {<loop_body>}.
+	 *
+	 * @param File $phpcsFile The current file being processed.
+	 * @param int                  $stackPtr  The position of the current token
+	 *                                        in the stack passed in $tokens.
+	 *
+	 * @return int|bool Position of T_FOR if token associated with $stackPtr in
+	 *                  $phpcsFile is in the body of a for loop, otherwise false.
+	 */
+	private static function _isInForLoopBody(File $phpcsFile, $stackPtr)
+	{
+		$isInForLoop = false;
+		$tokens = $phpcsFile->getTokens();
+		// get englobing hierarchy
+		$parentPtrAndCode = $tokens[$stackPtr]['conditions'];
+		krsort($parentPtrAndCode);
 
-        // looks for a for loop having a body not enclosed with curly brackets,
-        // which involves that its body contains only one instruction.
-        if (is_array($parentPtrAndCode) && ! empty($parentPtrAndCode)) {
-            $parentCode = reset($parentPtrAndCode);
-            $parentPtr = key($parentPtrAndCode);
-            $openBracketPtr = $tokens[$parentPtr]['scope_opener'];
-        } else {
-            $parentCode = 0;
-            $parentPtr = 0;
-            $openBracketPtr = 0;
-        }
-        $openResearchScopePtr = $stackPtr;
-        // recursive search, since a for statement may englobe other inline
-        // control statement or may be near to function calls, etc...
-        while (false !== $openResearchScopePtr) {
-            $closeParPtr = $phpcsFile->findPrevious(
-                array(T_CLOSE_PARENTHESIS),
-                $openResearchScopePtr,
-                null,
-                false,
-                null,
-                true
-            );
-            // is there a closing parenthesis with a control statement before
-            // the previous instruction ?
-            if (false !== $closeParPtr) {
-                // is there no opening curly bracket specific to
-                // set of instructions, between the closing parenthesis
-                // and the current token ?
-                if ($openBracketPtr < $closeParPtr) {
-                    // starts the search from the token before the closing
-                    // parenthesis, if it isn't a for statement
-                    $openResearchScopePtr = $closeParPtr - 1;
-                    // is this parenthesis associated with a for statement ?
-                    $closeParenthesisTk = $tokens[$closeParPtr];
-                    if (array_key_exists('parenthesis_owner', $closeParenthesisTk)) {
-                        $mayBeForPtr = $closeParenthesisTk['parenthesis_owner'];
-                        $mayBeForTk = $tokens[$mayBeForPtr];
-                        if (T_FOR === $mayBeForTk['code']) {
-                            return $mayBeForPtr;
-                        }
-                    }
-                } else {
-                    // if it is about a for loop, don't go further
-                    // and detect it after one more loop execution, do it now
-                    if (T_FOR === $parentCode) {
-                        return $parentPtr;
-                    }
-                    // starts the search from the token before the one
-                    // englobing the current statement
-                    $openResearchScopePtr = $parentPtr - 1;
-                    // re-initialize variables about the englobing structure
-                    if (is_array($parentPtrAndCode)) {
-                        $parentCode = next($parentPtrAndCode);
-                        $parentPtr = key($parentPtrAndCode);
-                        $openBracketPtr = $tokens[$parentPtr]['scope_opener'];
-                    }
-                }
-            } else {
-                $openResearchScopePtr = false;
-            }
-        }
-        // looks for a for loop having a body enclosed with curly brackets
-        foreach ($parentPtrAndCode as $parentPtr => $parentCode) {
-            if (T_FOR === $parentCode) {
-                return $parentPtr;
-            }
-        }
-        return false;
-    }//end _isInForLoopBody()
+		// looks for a for loop having a body not enclosed with curly brackets,
+		// which involves that its body contains only one instruction.
+		if (is_array($parentPtrAndCode) && ! empty($parentPtrAndCode)) {
+			$parentCode = reset($parentPtrAndCode);
+			$parentPtr = key($parentPtrAndCode);
+			$openBracketPtr = $tokens[$parentPtr]['scope_opener'];
+		} else {
+			$parentCode = 0;
+			$parentPtr = 0;
+			$openBracketPtr = 0;
+		}
+		$openResearchScopePtr = $stackPtr;
+		// recursive search, since a for statement may englobe other inline
+		// control statement or may be near to function calls, etc...
+		while (false !== $openResearchScopePtr) {
+			$closeParPtr = $phpcsFile->findPrevious(
+				array(T_CLOSE_PARENTHESIS),
+				$openResearchScopePtr,
+				null,
+				false,
+				null,
+				true
+			);
+			// is there a closing parenthesis with a control statement before
+			// the previous instruction ?
+			if (false !== $closeParPtr) {
+				// is there no opening curly bracket specific to
+				// set of instructions, between the closing parenthesis
+				// and the current token ?
+				if ($openBracketPtr < $closeParPtr) {
+					// starts the search from the token before the closing
+					// parenthesis, if it isn't a for statement
+					$openResearchScopePtr = $closeParPtr - 1;
+					// is this parenthesis associated with a for statement ?
+					$closeParenthesisTk = $tokens[$closeParPtr];
+					if (array_key_exists('parenthesis_owner', $closeParenthesisTk)) {
+						$mayBeForPtr = $closeParenthesisTk['parenthesis_owner'];
+						$mayBeForTk = $tokens[$mayBeForPtr];
+						if (T_FOR === $mayBeForTk['code']) {
+							return $mayBeForPtr;
+						}
+					}
+				} else {
+					// if it is about a for loop, don't go further
+					// and detect it after one more loop execution, do it now
+					if (T_FOR === $parentCode) {
+						return $parentPtr;
+					}
+					// starts the search from the token before the one
+					// englobing the current statement
+					$openResearchScopePtr = $parentPtr - 1;
+					// re-initialize variables about the englobing structure
+					if (is_array($parentPtrAndCode)) {
+						$parentCode = next($parentPtrAndCode);
+						$parentPtr = key($parentPtrAndCode);
+						$openBracketPtr = $tokens[$parentPtr]['scope_opener'];
+					}
+				}
+			} else {
+				$openResearchScopePtr = false;
+			}
+		}
+		// looks for a for loop having a body enclosed with curly brackets
+		foreach ($parentPtrAndCode as $parentPtr => $parentCode) {
+			if (T_FOR === $parentCode) {
+				return $parentPtr;
+			}
+		}
+		return false;
+	}//end _isInForLoopBody()
 
-    /**
-     * Returns true if a variable declared in the head of the for loop pointed
-     * by $forPtr in file $phpcsFile has the name $varName.
-     *
-     * @param File $phpcsFile The current file being processed.
-     * @param int                  $forPtr    The position of the 'for' token
-     *                                        in the stack passed in $tokens.
-     * @param string               $varName   The name of the variable to
-     *                                        procced without $, { nor }.
-     *
-     * @return int|bool true if a variable declared in the head of the for loop
-     * pointed by $forPtr in file $phpcsFile has the name $varName.
-     */
-    private static function _isDeclaredInForLoop(File $phpcsFile, $forPtr, $varName)
-    {
-        $isDeclaredInFor = false;
-        $tokens = $phpcsFile->getTokens();
-        $forVarPtrs = self::_getVarDeclaredInFor($phpcsFile, $forPtr);
-        foreach ($forVarPtrs as $forVarPtr) {
-            $forVarTk = $tokens[$forVarPtr];
-            // get variable name
-            $matches = array();
-            preg_match('/^\$\{?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\}?/', $forVarTk['content'], $matches);
-            $forVarName = $matches[1];
-            if (0 === strcmp($forVarName, $varName)) {
-                $isDeclaredInFor = $forVarPtr;
-                break;
-            }
-        }
-        return $isDeclaredInFor;
-    }//end _isDeclaredInForLoop()
+	/**
+	 * Returns true if a variable declared in the head of the for loop pointed
+	 * by $forPtr in file $phpcsFile has the name $varName.
+	 *
+	 * @param File $phpcsFile The current file being processed.
+	 * @param int                  $forPtr    The position of the 'for' token
+	 *                                        in the stack passed in $tokens.
+	 * @param string               $varName   The name of the variable to
+	 *                                        procced without $, { nor }.
+	 *
+	 * @return int|bool true if a variable declared in the head of the for loop
+	 * pointed by $forPtr in file $phpcsFile has the name $varName.
+	 */
+	private static function _isDeclaredInForLoop(File $phpcsFile, $forPtr, $varName)
+	{
+		$isDeclaredInFor = false;
+		$tokens = $phpcsFile->getTokens();
+		$forVarPtrs = self::_getVarDeclaredInFor($phpcsFile, $forPtr);
+		foreach ($forVarPtrs as $forVarPtr) {
+			$forVarTk = $tokens[$forVarPtr];
+			// get variable name
+			$matches = array();
+			preg_match('/^\$\{?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\}?/', $forVarTk['content'], $matches);
+			$forVarName = $matches[1];
+			if (0 === strcmp($forVarName, $varName)) {
+				$isDeclaredInFor = $forVarPtr;
+				break;
+			}
+		}
+		return $isDeclaredInFor;
+	}//end _isDeclaredInForLoop()
 
-    /**
-     * Returns list of pointers to variables declared in for loop associated to
-     * $forPtr in file $phpcsFile.
-     *
-     * All pointers in the result list are pointing to token with code
-     * T_VARIABLE. An exception is raised, if $forPtr doesn't point a token with
-     * code T_FOR.
-     *
-     * @param File $phpcsFile The current file being processed.
-     * @param int                  $forPtr    The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return array List of pointers to variables declared in for loop $forPtr.
-     */
-    private static function _getVarDeclaredInFor(File $phpcsFile, $forPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $forTk = $tokens[$forPtr];
-        if (T_FOR !== $forTk['code']) {
-            throw new PHP_CodeSniffer_Exception('$forPtr must be of type T_FOR');
-        }
-        $openParPtr = $forTk['parenthesis_opener'];
-        $openParenthesisTk = $tokens[$openParPtr];
-        $endOfDeclPtr = $phpcsFile->findNext(array(T_SEMICOLON), $openParPtr);
-        $forVarPtrs = array();
-        $varPtr = $phpcsFile->findNext(
-            array(T_VARIABLE),
-            $openParPtr + 1,
-            $endOfDeclPtr
-        );
-        while (false !== $varPtr) {
-            $forVarPtrs [] = $varPtr;
-            $varPtr = $phpcsFile->findNext(
-                array(T_VARIABLE),
-                $varPtr + 1,
-                $endOfDeclPtr
-            );
-        }
-        return $forVarPtrs;
-    }//end _getVarDeclaredInFor()
+	/**
+	 * Returns list of pointers to variables declared in for loop associated to
+	 * $forPtr in file $phpcsFile.
+	 *
+	 * All pointers in the result list are pointing to token with code
+	 * T_VARIABLE. An exception is raised, if $forPtr doesn't point a token with
+	 * code T_FOR.
+	 *
+	 * @param File $phpcsFile The current file being processed.
+	 * @param int                  $forPtr    The position of the current token
+	 *                                        in the stack passed in $tokens.
+	 *
+	 * @return array List of pointers to variables declared in for loop $forPtr.
+	 */
+	private static function _getVarDeclaredInFor(File $phpcsFile, $forPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+		$forTk = $tokens[$forPtr];
+		if (T_FOR !== $forTk['code']) {
+			throw new PHP_CodeSniffer_Exception('$forPtr must be of type T_FOR');
+		}
+		$openParPtr = $forTk['parenthesis_opener'];
+		$openParenthesisTk = $tokens[$openParPtr];
+		$endOfDeclPtr = $phpcsFile->findNext(array(T_SEMICOLON), $openParPtr);
+		$forVarPtrs = array();
+		$varPtr = $phpcsFile->findNext(
+			array(T_VARIABLE),
+			$openParPtr + 1,
+			$endOfDeclPtr
+		);
+		while (false !== $varPtr) {
+			$forVarPtrs [] = $varPtr;
+			$varPtr = $phpcsFile->findNext(
+				array(T_VARIABLE),
+				$varPtr + 1,
+				$endOfDeclPtr
+			);
+		}
+		return $forVarPtrs;
+	}//end _getVarDeclaredInFor()
 
-    /**
-     * Returns the position of first occurrence of a PHP variable starting with
-     * $ in $haystack from $offset.
-     *
-     * @param string $haystack The string to search in.
-     * @param int    $offset   The optional offset parameter allows you to
-     *                         specify which character in haystack to start
-     *                         searching. The returned position is still
-     *                         relative to the beginning of haystack.
-     *
-     * @return mixed The position as an integer
-     *               or the boolean false, if no variable is found.
-     */
-    private static function _getVariablePosition($haystack, $offset = 0)
-    {
-        $var_starts_at = strpos($haystack, '$', $offset);
-        $is_a_var = false;
-        while (false !== $var_starts_at && ! $is_a_var) {
-            // makes sure that $ is used for a variable and not as a symbol,
-            // if $ is protected with the escape char, then it is a symbol.
-            if (0 !== strcmp($haystack[$var_starts_at - 1], '\\')) {
-                if (0 === strcmp($haystack[$var_starts_at + 1], '{')) {
-                    // there is an opening brace in the right place
-                    // so it looks for the closing brace in the right place
-                    $hsChunk2 = substr($haystack, $var_starts_at + 2);
-                    if (1 === preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\}/', $hsChunk2)) {
-                        $is_a_var = true;
-                    }
-                } else {
-                    $hsChunk1 = substr($haystack, $var_starts_at + 1);
-                    if (1 === preg_match('/^[a-zA-Z_\x7f-\xff]/', $hsChunk1)) {
-                        // $ is used for a variable and not as a symbol,
-                        // since what follows $ matchs the definition of
-                        // a variable label for PHP.
-                        $is_a_var = true;
-                    }
-                }
-            }
-            // update $var_starts_at for the next variable
-            // only if no variable was found, since it is returned otherwise.
-            if ( ! $is_a_var) {
-                $var_starts_at = strpos($haystack, '$', $var_starts_at + 1);
-            }
-        }
-        if ($is_a_var) {
-            return $var_starts_at;
-        } else {
-            return false;
-        }
-    }//end _getVariablePosition()
+	/**
+	 * Returns the position of first occurrence of a PHP variable starting with
+	 * $ in $haystack from $offset.
+	 *
+	 * @param string $haystack The string to search in.
+	 * @param int    $offset   The optional offset parameter allows you to
+	 *                         specify which character in haystack to start
+	 *                         searching. The returned position is still
+	 *                         relative to the beginning of haystack.
+	 *
+	 * @return mixed The position as an integer
+	 *               or the boolean false, if no variable is found.
+	 */
+	private static function _getVariablePosition($haystack, $offset = 0)
+	{
+		$var_starts_at = strpos($haystack, '$', $offset);
+		$is_a_var = false;
+		while (false !== $var_starts_at && ! $is_a_var) {
+			// makes sure that $ is used for a variable and not as a symbol,
+			// if $ is protected with the escape char, then it is a symbol.
+			if (0 !== strcmp($haystack[$var_starts_at - 1], '\\')) {
+				if (0 === strcmp($haystack[$var_starts_at + 1], '{')) {
+					// there is an opening brace in the right place
+					// so it looks for the closing brace in the right place
+					$hsChunk2 = substr($haystack, $var_starts_at + 2);
+					if (1 === preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\}/', $hsChunk2)) {
+						$is_a_var = true;
+					}
+				} else {
+					$hsChunk1 = substr($haystack, $var_starts_at + 1);
+					if (1 === preg_match('/^[a-zA-Z_\x7f-\xff]/', $hsChunk1)) {
+						// $ is used for a variable and not as a symbol,
+						// since what follows $ matchs the definition of
+						// a variable label for PHP.
+						$is_a_var = true;
+					}
+				}
+			}
+			// update $var_starts_at for the next variable
+			// only if no variable was found, since it is returned otherwise.
+			if ( ! $is_a_var) {
+				$var_starts_at = strpos($haystack, '$', $var_starts_at + 1);
+			}
+		}
+		if ($is_a_var) {
+			return $var_starts_at;
+		} else {
+			return false;
+		}
+	}//end _getVariablePosition()
 }//end class
 
 ?>

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
         $varName = substr($varTk['content'], 1);
         $varProps = $phpcsFile->getMemberProperties($stackPtr);
         // check(s)
-        if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName) ) {
+        if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName)) {
             return;
         }
         if ( ! $this->checkVisibilityPrefix($phpcsFile, $stackPtr, $varName, $varProps)) {
@@ -320,7 +320,7 @@ 
         $currentTk = $tokens[$stackPtr];
         if (array_key_exists('nested_parenthesis', $currentTk)) {
             $nestedParenthesis = $currentTk['nested_parenthesis'];
-            foreach ( $nestedParenthesis as $openParPtr => $closeParPtr) {
+            foreach ($nestedParenthesis as $openParPtr => $closeParPtr) {
                 $nonWhitspacePtr = $phpcsFile->findPrevious(
                     array(T_WHITESPACE),
                     $openParPtr - 1,

Braces +118 added lines, -56 removed lines

@@ -40,8 +40,7 @@ 
 use PHP_CodeSniffer\Sniffs\AbstractVariableSniff;
 use PHP_CodeSniffer\Files\File;
 
-class ValidVariableNameSniff extends AbstractVariableSniff
-{
+class ValidVariableNameSniff extends AbstractVariableSniff {
 
 
     /**
@@ -61,13 +60,16 @@ 
         $varName = substr($varTk['content'], 1);
         $varProps = $phpcsFile->getMemberProperties($stackPtr);
         // check(s)
-        if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName) ) {
+        if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName) )
+        {
             return;
         }
-        if ( ! $this->checkVisibilityPrefix($phpcsFile, $stackPtr, $varName, $varProps)) {
+        if ( ! $this->checkVisibilityPrefix($phpcsFile, $stackPtr, $varName, $varProps))
+        {
             return;
         }
-        if ( ! $this->checkLength($phpcsFile, $stackPtr, $varName)) {
+        if ( ! $this->checkLength($phpcsFile, $stackPtr, $varName))
+        {
             return;
         }
 
@@ -89,14 +91,17 @@ 
         $varTk = $tokens[$stackPtr];
         $varName = substr($varTk['content'], 1);
         // skip the current object variable, i.e. $this
-        if (0 === strcmp($varName, 'this')) {
+        if (0 === strcmp($varName, 'this'))
+        {
             return;
         }
         // check(s)
-        if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName)) {
+        if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName))
+        {
             return;
         }
-        if ( ! $this->checkLength($phpcsFile, $stackPtr, $varName)) {
+        if ( ! $this->checkLength($phpcsFile, $stackPtr, $varName))
+        {
             return;
         }
 
@@ -117,16 +122,19 @@ 
         $stringTk = $tokens[$stackPtr];
         $stringString = $stringTk['content'];
         $varAt = self::_getVariablePosition($stringString, 0);
-        while (false !== $varAt) {
+        while (false !== $varAt)
+        {
             // get variable name
             $matches = array();
             preg_match('/^\$\{?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\}?/', substr($stringString, $varAt), $matches);
             $varName = $matches[1];
             // check(s)
-            if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName)) {
+            if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName))
+            {
                 return;
             }
-            if ( ! $this->checkLength($phpcsFile, $stackPtr, $varName)) {
+            if ( ! $this->checkLength($phpcsFile, $stackPtr, $varName))
+            {
                 return;
             }
             // prepare checking next variable
@@ -152,14 +160,18 @@ 
     protected function checkLowerCase(File $phpcsFile, $stackPtr, $varName)
     {
         $isInLowerCase = true;
-        if (0 !== strcmp($varName, strtolower($varName))) {
+        if (0 !== strcmp($varName, strtolower($varName)))
+        {
             // get the expected variable name
             $varNameWithUnderscores = preg_replace('/([A-Z])/', '_${1}', $varName);
             $expectedVarName = strtolower(ltrim($varNameWithUnderscores, '_'));
             // adapts the error message to the error case
-            if (strlen($varNameWithUnderscores) > strlen($varName)) {
+            if (strlen($varNameWithUnderscores) > strlen($varName))
+            {
                 $error = 'Variables should not use CamelCasing or start with a Capital.';
-            } else {
+            }
+            else
+            {
                 $error = 'Variables should be entirely lowercased.';
             }
             $error = $error . 'Please consider "' . $expectedVarName
@@ -194,16 +206,22 @@ 
         $isVisibilityPrefixRight = true;
         $scope = $varProps['scope'];
         // If it's a private variable, it must have an underscore on the front.
-        if ($scope === 'private' && $varName{0} !== '_') {
+        if ($scope === 'private' && $varName{0} !== '_')
+        {
             $error = "Private variable name \"$varName\" must be prefixed with an underscore";
             $phpcsFile->addError($error, $stackPtr);
             $isVisibilityPrefixRight = false;
-        } else if ($scope !== 'private' && $varName{0} === '_') {
+        }
+        else if ($scope !== 'private' && $varName{0} === '_')
+        {
             // If it's not a private variable,
             // then it must not start with an underscore.
-            if (isset ($scopeSpecified) && true === $scopeSpecified) {
+            if (isset ($scopeSpecified) && true === $scopeSpecified)
+            {
                 $error = "Public variable name \"$varName\" must not be prefixed with an underscore";
-            } else {
+            }
+            else
+            {
                 $error = ucfirst($scope) . " variable name \"$varName\" must not be prefixed with an underscore";
             }
             $phpcsFile->addError($error, $stackPtr);
@@ -241,13 +259,16 @@ 
         $isLengthRight = true;
         // cleans variable name
         $varName = ltrim($varName, '_');
-        if (strlen($varName) <= $minLength) {
+        if (strlen($varName) <= $minLength)
+        {
             // skips adding an error, if it is a specific variable name
-            if (in_array($varName, $allowedShortName)) {
+            if (in_array($varName, $allowedShortName))
+            {
                 return $isLengthRight;
             }
             // skips adding an error, if the variable is in a for loop
-            if (false !== self::_isInForLoop($phpcsFile, $stackPtr, $varName)) {
+            if (false !== self::_isInForLoop($phpcsFile, $stackPtr, $varName))
+            {
                 return $isLengthRight;
             }
             // adds the error message finally
@@ -281,19 +302,25 @@ 
     private static function _isInForLoop(File $phpcsFile, $stackPtr, $varName)
     {
         $keepLookingFromPtr = $stackPtr;
-        while (false !== $keepLookingFromPtr) {
+        while (false !== $keepLookingFromPtr)
+        {
             // looks if it is in (head or body) of a for loop
             $forPtr = self::_isInForLoopHead($phpcsFile, $keepLookingFromPtr);
-            if (false === $forPtr) {
+            if (false === $forPtr)
+            {
                 $forPtr = self::_isInForLoopBody($phpcsFile, $keepLookingFromPtr);
             }
             // checks if it is declared in here and prepares next step
-            if (false !== $forPtr) {
-                if (false !== self::_isDeclaredInForLoop($phpcsFile, $forPtr, $varName)) {
+            if (false !== $forPtr)
+            {
+                if (false !== self::_isDeclaredInForLoop($phpcsFile, $forPtr, $varName))
+                {
                     return $forPtr;
                 }
                 $keepLookingFromPtr = $forPtr;
-            } else {
+            }
+            else
+            {
                 $keepLookingFromPtr = false;
             }
         }
@@ -318,9 +345,11 @@ 
         $isInForLoop = false;
         $tokens = $phpcsFile->getTokens();
         $currentTk = $tokens[$stackPtr];
-        if (array_key_exists('nested_parenthesis', $currentTk)) {
+        if (array_key_exists('nested_parenthesis', $currentTk))
+        {
             $nestedParenthesis = $currentTk['nested_parenthesis'];
-            foreach ( $nestedParenthesis as $openParPtr => $closeParPtr) {
+            foreach ( $nestedParenthesis as $openParPtr => $closeParPtr)
+            {
                 $nonWhitspacePtr = $phpcsFile->findPrevious(
                     array(T_WHITESPACE),
                     $openParPtr - 1,
@@ -329,9 +358,11 @@ 
                     null,
                     true
                 );
-                if (false !== $nonWhitspacePtr) {
+                if (false !== $nonWhitspacePtr)
+                {
                     $isFor = T_FOR === $tokens[$nonWhitspacePtr]['code'];
-                    if ($isFor) {
+                    if ($isFor)
+                    {
                         $isInForLoop = $nonWhitspacePtr;
                         break;
                     }
@@ -365,11 +396,14 @@ 
 
         // looks for a for loop having a body not enclosed with curly brackets,
         // which involves that its body contains only one instruction.
-        if (is_array($parentPtrAndCode) && ! empty($parentPtrAndCode)) {
+        if (is_array($parentPtrAndCode) && ! empty($parentPtrAndCode))
+        {
             $parentCode = reset($parentPtrAndCode);
             $parentPtr = key($parentPtrAndCode);
             $openBracketPtr = $tokens[$parentPtr]['scope_opener'];
-        } else {
+        }
+        else
+        {
             $parentCode = 0;
             $parentPtr = 0;
             $openBracketPtr = 0;
@@ -377,7 +411,8 @@ 
         $openResearchScopePtr = $stackPtr;
         // recursive search, since a for statement may englobe other inline
         // control statement or may be near to function calls, etc...
-        while (false !== $openResearchScopePtr) {
+        while (false !== $openResearchScopePtr)
+        {
             $closeParPtr = $phpcsFile->findPrevious(
                 array(T_CLOSE_PARENTHESIS),
                 $openResearchScopePtr,
@@ -388,46 +423,58 @@ 
             );
             // is there a closing parenthesis with a control statement before
             // the previous instruction ?
-            if (false !== $closeParPtr) {
+            if (false !== $closeParPtr)
+            {
                 // is there no opening curly bracket specific to
                 // set of instructions, between the closing parenthesis
                 // and the current token ?
-                if ($openBracketPtr < $closeParPtr) {
+                if ($openBracketPtr < $closeParPtr)
+                {
                     // starts the search from the token before the closing
                     // parenthesis, if it isn't a for statement
                     $openResearchScopePtr = $closeParPtr - 1;
                     // is this parenthesis associated with a for statement ?
                     $closeParenthesisTk = $tokens[$closeParPtr];
-                    if (array_key_exists('parenthesis_owner', $closeParenthesisTk)) {
+                    if (array_key_exists('parenthesis_owner', $closeParenthesisTk))
+                    {
                         $mayBeForPtr = $closeParenthesisTk['parenthesis_owner'];
                         $mayBeForTk = $tokens[$mayBeForPtr];
-                        if (T_FOR === $mayBeForTk['code']) {
+                        if (T_FOR === $mayBeForTk['code'])
+                        {
                             return $mayBeForPtr;
                         }
                     }
-                } else {
+                }
+                else
+                {
                     // if it is about a for loop, don't go further
                     // and detect it after one more loop execution, do it now
-                    if (T_FOR === $parentCode) {
+                    if (T_FOR === $parentCode)
+                    {
                         return $parentPtr;
                     }
                     // starts the search from the token before the one
                     // englobing the current statement
                     $openResearchScopePtr = $parentPtr - 1;
                     // re-initialize variables about the englobing structure
-                    if (is_array($parentPtrAndCode)) {
+                    if (is_array($parentPtrAndCode))
+                    {
                         $parentCode = next($parentPtrAndCode);
                         $parentPtr = key($parentPtrAndCode);
                         $openBracketPtr = $tokens[$parentPtr]['scope_opener'];
                     }
                 }
-            } else {
+            }
+            else
+            {
                 $openResearchScopePtr = false;
             }
         }
         // looks for a for loop having a body enclosed with curly brackets
-        foreach ($parentPtrAndCode as $parentPtr => $parentCode) {
-            if (T_FOR === $parentCode) {
+        foreach ($parentPtrAndCode as $parentPtr => $parentCode)
+        {
+            if (T_FOR === $parentCode)
+            {
                 return $parentPtr;
             }
         }
@@ -452,13 +499,15 @@ 
         $isDeclaredInFor = false;
         $tokens = $phpcsFile->getTokens();
         $forVarPtrs = self::_getVarDeclaredInFor($phpcsFile, $forPtr);
-        foreach ($forVarPtrs as $forVarPtr) {
+        foreach ($forVarPtrs as $forVarPtr)
+        {
             $forVarTk = $tokens[$forVarPtr];
             // get variable name
             $matches = array();
             preg_match('/^\$\{?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\}?/', $forVarTk['content'], $matches);
             $forVarName = $matches[1];
-            if (0 === strcmp($forVarName, $varName)) {
+            if (0 === strcmp($forVarName, $varName))
+            {
                 $isDeclaredInFor = $forVarPtr;
                 break;
             }
@@ -484,7 +533,8 @@ 
     {
         $tokens = $phpcsFile->getTokens();
         $forTk = $tokens[$forPtr];
-        if (T_FOR !== $forTk['code']) {
+        if (T_FOR !== $forTk['code'])
+        {
             throw new PHP_CodeSniffer_Exception('$forPtr must be of type T_FOR');
         }
         $openParPtr = $forTk['parenthesis_opener'];
@@ -496,7 +546,8 @@ 
             $openParPtr + 1,
             $endOfDeclPtr
         );
-        while (false !== $varPtr) {
+        while (false !== $varPtr)
+        {
             $forVarPtrs [] = $varPtr;
             $varPtr = $phpcsFile->findNext(
                 array(T_VARIABLE),
@@ -524,20 +575,27 @@ 
     {
         $var_starts_at = strpos($haystack, '$', $offset);
         $is_a_var = false;
-        while (false !== $var_starts_at && ! $is_a_var) {
+        while (false !== $var_starts_at && ! $is_a_var)
+        {
             // makes sure that $ is used for a variable and not as a symbol,
             // if $ is protected with the escape char, then it is a symbol.
-            if (0 !== strcmp($haystack[$var_starts_at - 1], '\\')) {
-                if (0 === strcmp($haystack[$var_starts_at + 1], '{')) {
+            if (0 !== strcmp($haystack[$var_starts_at - 1], '\\'))
+            {
+                if (0 === strcmp($haystack[$var_starts_at + 1], '{'))
+                {
                     // there is an opening brace in the right place
                     // so it looks for the closing brace in the right place
                     $hsChunk2 = substr($haystack, $var_starts_at + 2);
-                    if (1 === preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\}/', $hsChunk2)) {
+                    if (1 === preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\}/', $hsChunk2))
+                    {
                         $is_a_var = true;
                     }
-                } else {
+                }
+                else
+                {
                     $hsChunk1 = substr($haystack, $var_starts_at + 1);
-                    if (1 === preg_match('/^[a-zA-Z_\x7f-\xff]/', $hsChunk1)) {
+                    if (1 === preg_match('/^[a-zA-Z_\x7f-\xff]/', $hsChunk1))
+                    {
                         // $ is used for a variable and not as a symbol,
                         // since what follows $ matchs the definition of
                         // a variable label for PHP.
@@ -547,13 +605,17 @@ 
             }
             // update $var_starts_at for the next variable
             // only if no variable was found, since it is returned otherwise.
-            if ( ! $is_a_var) {
+            if ( ! $is_a_var)
+            {
                 $var_starts_at = strpos($haystack, '$', $var_starts_at + 1);
             }
         }
-        if ($is_a_var) {
+        if ($is_a_var)
+        {
             return $var_starts_at;
-        } else {
+        }
+        else
+        {
             return false;
         }
     }//end _getVariablePosition()

Upper-Lower-Casing +38 added lines, -38 removed lines

@@ -117,7 +117,7 @@ 
         $stringTk = $tokens[$stackPtr];
         $stringString = $stringTk['content'];
         $varAt = self::_getVariablePosition($stringString, 0);
-        while (false !== $varAt) {
+        while (FALSE !== $varAt) {
             // get variable name
             $matches = array();
             preg_match('/^\$\{?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\}?/', substr($stringString, $varAt), $matches);
@@ -151,7 +151,7 @@ 
      */
     protected function checkLowerCase(File $phpcsFile, $stackPtr, $varName)
     {
-        $isInLowerCase = true;
+        $isInLowerCase = TRUE;
         if (0 !== strcmp($varName, strtolower($varName))) {
             // get the expected variable name
             $varNameWithUnderscores = preg_replace('/([A-Z])/', '_${1}', $varName);
@@ -166,7 +166,7 @@ 
                 . '" instead of "' . $varName . '".';
             // adds the error and changes return value
             $phpcsFile->addError($error, $stackPtr);
-            $isInLowerCase = false;
+            $isInLowerCase = FALSE;
         }
         return $isInLowerCase;
     }//end checkLowerCase()
@@ -191,23 +191,23 @@ 
      */
     protected function checkVisibilityPrefix(File $phpcsFile, $stackPtr, $varName, $varProps)
     {
-        $isVisibilityPrefixRight = true;
+        $isVisibilityPrefixRight = TRUE;
         $scope = $varProps['scope'];
         // If it's a private variable, it must have an underscore on the front.
         if ($scope === 'private' && $varName{0} !== '_') {
             $error = "Private variable name \"$varName\" must be prefixed with an underscore";
             $phpcsFile->addError($error, $stackPtr);
-            $isVisibilityPrefixRight = false;
+            $isVisibilityPrefixRight = FALSE;
         } else if ($scope !== 'private' && $varName{0} === '_') {
             // If it's not a private variable,
             // then it must not start with an underscore.
-            if (isset ($scopeSpecified) && true === $scopeSpecified) {
+            if (isset ($scopeSpecified) && TRUE === $scopeSpecified) {
                 $error = "Public variable name \"$varName\" must not be prefixed with an underscore";
             } else {
                 $error = ucfirst($scope) . " variable name \"$varName\" must not be prefixed with an underscore";
             }
             $phpcsFile->addError($error, $stackPtr);
-            $isVisibilityPrefixRight = false;
+            $isVisibilityPrefixRight = FALSE;
         }
         return $isVisibilityPrefixRight;
     }//end checkVisibilityPrefix()
@@ -238,7 +238,7 @@ 
         $minLength = 3;
         $allowedShortName = array('ci');
 
-        $isLengthRight = true;
+        $isLengthRight = TRUE;
         // cleans variable name
         $varName = ltrim($varName, '_');
         if (strlen($varName) <= $minLength) {
@@ -247,7 +247,7 @@ 
                 return $isLengthRight;
             }
             // skips adding an error, if the variable is in a for loop
-            if (false !== self::_isInForLoop($phpcsFile, $stackPtr, $varName)) {
+            if (FALSE !== self::_isInForLoop($phpcsFile, $stackPtr, $varName)) {
                 return $isLengthRight;
             }
             // adds the error message finally
@@ -260,7 +260,7 @@ 
                 . ', non-word variables like "' . $varName
                 . '" should only be used as iterators in for() loops.';
             $phpcsFile->addError($error, $stackPtr);
-            $isLengthRight = false;
+            $isLengthRight = FALSE;
         }
         return $isLengthRight;
     }//end checkLength()
@@ -281,23 +281,23 @@ 
     private static function _isInForLoop(File $phpcsFile, $stackPtr, $varName)
     {
         $keepLookingFromPtr = $stackPtr;
-        while (false !== $keepLookingFromPtr) {
+        while (FALSE !== $keepLookingFromPtr) {
             // looks if it is in (head or body) of a for loop
             $forPtr = self::_isInForLoopHead($phpcsFile, $keepLookingFromPtr);
-            if (false === $forPtr) {
+            if (FALSE === $forPtr) {
                 $forPtr = self::_isInForLoopBody($phpcsFile, $keepLookingFromPtr);
             }
             // checks if it is declared in here and prepares next step
-            if (false !== $forPtr) {
-                if (false !== self::_isDeclaredInForLoop($phpcsFile, $forPtr, $varName)) {
+            if (FALSE !== $forPtr) {
+                if (FALSE !== self::_isDeclaredInForLoop($phpcsFile, $forPtr, $varName)) {
                     return $forPtr;
                 }
                 $keepLookingFromPtr = $forPtr;
             } else {
-                $keepLookingFromPtr = false;
+                $keepLookingFromPtr = FALSE;
             }
         }
-        return false;
+        return FALSE;
     }//end _isInForLoop()
 
     /**
@@ -315,7 +315,7 @@ 
      */
     private static function _isInForLoopHead(File $phpcsFile, $stackPtr)
     {
-        $isInForLoop = false;
+        $isInForLoop = FALSE;
         $tokens = $phpcsFile->getTokens();
         $currentTk = $tokens[$stackPtr];
         if (array_key_exists('nested_parenthesis', $currentTk)) {
@@ -324,12 +324,12 @@ 
                 $nonWhitspacePtr = $phpcsFile->findPrevious(
                     array(T_WHITESPACE),
                     $openParPtr - 1,
-                    null,
-                    true,
-                    null,
-                    true
+                    NULL,
+                    TRUE,
+                    NULL,
+                    TRUE
                 );
-                if (false !== $nonWhitspacePtr) {
+                if (FALSE !== $nonWhitspacePtr) {
                     $isFor = T_FOR === $tokens[$nonWhitspacePtr]['code'];
                     if ($isFor) {
                         $isInForLoop = $nonWhitspacePtr;
@@ -357,7 +357,7 @@ 
      */
     private static function _isInForLoopBody(File $phpcsFile, $stackPtr)
     {
-        $isInForLoop = false;
+        $isInForLoop = FALSE;
         $tokens = $phpcsFile->getTokens();
         // get englobing hierarchy
         $parentPtrAndCode = $tokens[$stackPtr]['conditions'];
@@ -377,18 +377,18 @@ 
         $openResearchScopePtr = $stackPtr;
         // recursive search, since a for statement may englobe other inline
         // control statement or may be near to function calls, etc...
-        while (false !== $openResearchScopePtr) {
+        while (FALSE !== $openResearchScopePtr) {
             $closeParPtr = $phpcsFile->findPrevious(
                 array(T_CLOSE_PARENTHESIS),
                 $openResearchScopePtr,
-                null,
-                false,
-                null,
-                true
+                NULL,
+                FALSE,
+                NULL,
+                TRUE
             );
             // is there a closing parenthesis with a control statement before
             // the previous instruction ?
-            if (false !== $closeParPtr) {
+            if (FALSE !== $closeParPtr) {
                 // is there no opening curly bracket specific to
                 // set of instructions, between the closing parenthesis
                 // and the current token ?
@@ -422,7 +422,7 @@ 
                     }
                 }
             } else {
-                $openResearchScopePtr = false;
+                $openResearchScopePtr = FALSE;
             }
         }
         // looks for a for loop having a body enclosed with curly brackets
@@ -431,7 +431,7 @@ 
                 return $parentPtr;
             }
         }
-        return false;
+        return FALSE;
     }//end _isInForLoopBody()
 
     /**
@@ -449,7 +449,7 @@ 
      */
     private static function _isDeclaredInForLoop(File $phpcsFile, $forPtr, $varName)
     {
-        $isDeclaredInFor = false;
+        $isDeclaredInFor = FALSE;
         $tokens = $phpcsFile->getTokens();
         $forVarPtrs = self::_getVarDeclaredInFor($phpcsFile, $forPtr);
         foreach ($forVarPtrs as $forVarPtr) {
@@ -496,7 +496,7 @@ 
             $openParPtr + 1,
             $endOfDeclPtr
         );
-        while (false !== $varPtr) {
+        while (FALSE !== $varPtr) {
             $forVarPtrs [] = $varPtr;
             $varPtr = $phpcsFile->findNext(
                 array(T_VARIABLE),
@@ -523,8 +523,8 @@ 
     private static function _getVariablePosition($haystack, $offset = 0)
     {
         $var_starts_at = strpos($haystack, '$', $offset);
-        $is_a_var = false;
-        while (false !== $var_starts_at && ! $is_a_var) {
+        $is_a_var = FALSE;
+        while (FALSE !== $var_starts_at && ! $is_a_var) {
             // makes sure that $ is used for a variable and not as a symbol,
             // if $ is protected with the escape char, then it is a symbol.
             if (0 !== strcmp($haystack[$var_starts_at - 1], '\\')) {
@@ -533,7 +533,7 @@ 
                     // so it looks for the closing brace in the right place
                     $hsChunk2 = substr($haystack, $var_starts_at + 2);
                     if (1 === preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\}/', $hsChunk2)) {
-                        $is_a_var = true;
+                        $is_a_var = TRUE;
                     }
                 } else {
                     $hsChunk1 = substr($haystack, $var_starts_at + 1);
@@ -541,7 +541,7 @@ 
                         // $ is used for a variable and not as a symbol,
                         // since what follows $ matchs the definition of
                         // a variable label for PHP.
-                        $is_a_var = true;
+                        $is_a_var = TRUE;
                     }
                 }
             }
@@ -554,7 +554,7 @@ 
         if ($is_a_var) {
             return $var_starts_at;
         } else {
-            return false;
+            return FALSE;
         }
     }//end _getVariablePosition()
 }//end class

build/CodeIgniter/UnusedSniffs/NamingConventions/ValidMethodNameSniff.php

Indentation +115 added lines, -115 removed lines

@@ -40,121 +40,121 @@
 
 class ValidMethodNameSniff extends AbstractScopeSniff
 {
-    /**
-     * A list of all PHP magic methods.
-     *
-     * @var array
-     */
-    protected static $magicMethods = array(
-                               'construct',
-                               'destruct',
-                               'call',
-                               'callStatic',
-                               'get',
-                               'set',
-                               'isset',
-                               'unset',
-                               'sleep',
-                               'wakeup',
-                               'toString',
-                               'set_state',
-                               'clone',
-                              );
-
-    /**
-     * Defines which token(s) in which scope(s) will be proceed.
-     */
-    public function __construct()
-    {
-        parent::__construct(array(T_CLASS, T_INTERFACE), array(T_FUNCTION), true);
-
-    }//end __construct()
-
-
-    /**
-     * Processes the tokens within the scope.
-     *
-     * @param File $phpcsFile The file being processed.
-     * @param int                  $stackPtr  The position where this token was
-     *                                        found.
-     * @param int                  $currScope The position of the current scope.
-     *
-     * @return void
-     */
-    protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScope)
-    {
-        $methodName = $phpcsFile->getDeclarationName($stackPtr);
-        if ($methodName === null) {
-            // Ignore closures.
-            return;
-        }
-
-        $className  = $phpcsFile->getDeclarationName($currScope);
-
-        // Is this a magic method i.e. is prefixed with "__".
-        if (0 === strcmp(substr($methodName, 0, 2), '__')) {
-            $magicPart = substr($methodName, 2);
-            if (in_array($magicPart, self::$magicMethods) === false) {
-                 $error = "Method name \"$className::$methodName\" is invalid; only PHP magic methods should be prefixed with a double underscore";
-                 $phpcsFile->addError($error, $stackPtr);
-            }
-
-            return;
-        }
-
-        // PHP4 constructors are allowed to break our rules.
-        if ($methodName === $className) {
-            return;
-        }
-
-        // PHP4 destructors are allowed to break our rules.
-        if ($methodName === '_'.$className) {
-            return;
-        }
-
-        if (0 !== strcmp($methodName, strtolower($methodName))) {
-            $uscrdMethodName = preg_replace('/([A-Z])/', '_${1}', $methodName);
-            $expectedMethodName = strtolower($uscrdMethodName);
-            $error = "Class methods should be entirely lowercased. Please consider \"$expectedMethodName\" instead of \"$methodName\".";
-            $phpcsFile->addError($error, $stackPtr);
-            return;
-        }
-
-        $methodProps    = $phpcsFile->getMethodProperties($stackPtr);
-        $scope          = $methodProps['scope'];
-        $scopeSpecified = $methodProps['scope_specified'];
-
-        // If it's a private method, it must have an underscore on the front.
-        if ($scope === 'private' && $methodName{0} !== '_') {
-            $error = "Private method name \"$className::$methodName\" must be prefixed with an underscore";
-            $phpcsFile->addError($error, $stackPtr);
-            return;
-        }
-
-        // If it's not a private method, it must not have an underscore on the front.
-        if ($scope !== 'private' && $methodName{0} === '_') {
-            if (true === $scopeSpecified) {
-                $error = "Public method name \"$className::$methodName\" must not be prefixed with an underscore";
-            } else {
-                $error = ucfirst($scope)." method name \"$className::$methodName\" must not be prefixed with an underscore";
-            }
-            $phpcsFile->addError($error, $stackPtr);
-            return;
-        }
-
-        // If name is too verbose,
-        // then either an error or a warning is displayed.
-        $error_limit = 50;
-        $warning_limit = 35;
-        if (strlen($methodName) > $error_limit) {
-            $error = "Overly long and verbose names are prohibited. Please find a name shorter than $error_limit chars.";
-            $phpcsFile->addError($error, $stackPtr);
-            return;
-        } else if (strlen($methodName) > $warning_limit) {
-            $warning = "Try to avoid overly long and verbose names in finding a name shorter than $warning_limit chars.";
-            $phpcsFile->addWarning($warning, $stackPtr);
-        }
-    }//end processTokenWithinScope()
+	/**
+	 * A list of all PHP magic methods.
+	 *
+	 * @var array
+	 */
+	protected static $magicMethods = array(
+							   'construct',
+							   'destruct',
+							   'call',
+							   'callStatic',
+							   'get',
+							   'set',
+							   'isset',
+							   'unset',
+							   'sleep',
+							   'wakeup',
+							   'toString',
+							   'set_state',
+							   'clone',
+							  );
+
+	/**
+	 * Defines which token(s) in which scope(s) will be proceed.
+	 */
+	public function __construct()
+	{
+		parent::__construct(array(T_CLASS, T_INTERFACE), array(T_FUNCTION), true);
+
+	}//end __construct()
+
+
+	/**
+	 * Processes the tokens within the scope.
+	 *
+	 * @param File $phpcsFile The file being processed.
+	 * @param int                  $stackPtr  The position where this token was
+	 *                                        found.
+	 * @param int                  $currScope The position of the current scope.
+	 *
+	 * @return void
+	 */
+	protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScope)
+	{
+		$methodName = $phpcsFile->getDeclarationName($stackPtr);
+		if ($methodName === null) {
+			// Ignore closures.
+			return;
+		}
+
+		$className  = $phpcsFile->getDeclarationName($currScope);
+
+		// Is this a magic method i.e. is prefixed with "__".
+		if (0 === strcmp(substr($methodName, 0, 2), '__')) {
+			$magicPart = substr($methodName, 2);
+			if (in_array($magicPart, self::$magicMethods) === false) {
+				 $error = "Method name \"$className::$methodName\" is invalid; only PHP magic methods should be prefixed with a double underscore";
+				 $phpcsFile->addError($error, $stackPtr);
+			}
+
+			return;
+		}
+
+		// PHP4 constructors are allowed to break our rules.
+		if ($methodName === $className) {
+			return;
+		}
+
+		// PHP4 destructors are allowed to break our rules.
+		if ($methodName === '_'.$className) {
+			return;
+		}
+
+		if (0 !== strcmp($methodName, strtolower($methodName))) {
+			$uscrdMethodName = preg_replace('/([A-Z])/', '_${1}', $methodName);
+			$expectedMethodName = strtolower($uscrdMethodName);
+			$error = "Class methods should be entirely lowercased. Please consider \"$expectedMethodName\" instead of \"$methodName\".";
+			$phpcsFile->addError($error, $stackPtr);
+			return;
+		}
+
+		$methodProps    = $phpcsFile->getMethodProperties($stackPtr);
+		$scope          = $methodProps['scope'];
+		$scopeSpecified = $methodProps['scope_specified'];
+
+		// If it's a private method, it must have an underscore on the front.
+		if ($scope === 'private' && $methodName{0} !== '_') {
+			$error = "Private method name \"$className::$methodName\" must be prefixed with an underscore";
+			$phpcsFile->addError($error, $stackPtr);
+			return;
+		}
+
+		// If it's not a private method, it must not have an underscore on the front.
+		if ($scope !== 'private' && $methodName{0} === '_') {
+			if (true === $scopeSpecified) {
+				$error = "Public method name \"$className::$methodName\" must not be prefixed with an underscore";
+			} else {
+				$error = ucfirst($scope)." method name \"$className::$methodName\" must not be prefixed with an underscore";
+			}
+			$phpcsFile->addError($error, $stackPtr);
+			return;
+		}
+
+		// If name is too verbose,
+		// then either an error or a warning is displayed.
+		$error_limit = 50;
+		$warning_limit = 35;
+		if (strlen($methodName) > $error_limit) {
+			$error = "Overly long and verbose names are prohibited. Please find a name shorter than $error_limit chars.";
+			$phpcsFile->addError($error, $stackPtr);
+			return;
+		} else if (strlen($methodName) > $warning_limit) {
+			$warning = "Try to avoid overly long and verbose names in finding a name shorter than $warning_limit chars.";
+			$phpcsFile->addWarning($warning, $stackPtr);
+		}
+	}//end processTokenWithinScope()
 
 }//end class
 

Spacing +3 added lines, -3 removed lines

@@ -89,7 +89,7 @@ 
             return;
         }
 
-        $className  = $phpcsFile->getDeclarationName($currScope);
+        $className = $phpcsFile->getDeclarationName($currScope);
 
         // Is this a magic method i.e. is prefixed with "__".
         if (0 === strcmp(substr($methodName, 0, 2), '__')) {
@@ -108,7 +108,7 @@ 
         }
 
         // PHP4 destructors are allowed to break our rules.
-        if ($methodName === '_'.$className) {
+        if ($methodName === '_' . $className) {
             return;
         }
 
@@ -136,7 +136,7 @@ 
             if (true === $scopeSpecified) {
                 $error = "Public method name \"$className::$methodName\" must not be prefixed with an underscore";
             } else {
-                $error = ucfirst($scope)." method name \"$className::$methodName\" must not be prefixed with an underscore";
+                $error = ucfirst($scope) . " method name \"$className::$methodName\" must not be prefixed with an underscore";
             }
             $phpcsFile->addError($error, $stackPtr);
             return;

Braces +27 added lines, -14 removed lines

@@ -38,8 +38,7 @@ 
 use PHP_CodeSniffer\Sniffs\AbstactScopeSniff;
 use PHP_CodeSniffer\Files\File;
 
-class ValidMethodNameSniff extends AbstractScopeSniff
-{
+class ValidMethodNameSniff extends AbstractScopeSniff {
     /**
      * A list of all PHP magic methods.
      *
@@ -84,7 +83,8 @@ 
     protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScope)
     {
         $methodName = $phpcsFile->getDeclarationName($stackPtr);
-        if ($methodName === null) {
+        if ($methodName === null)
+        {
             // Ignore closures.
             return;
         }
@@ -92,9 +92,11 @@ 
         $className  = $phpcsFile->getDeclarationName($currScope);
 
         // Is this a magic method i.e. is prefixed with "__".
-        if (0 === strcmp(substr($methodName, 0, 2), '__')) {
+        if (0 === strcmp(substr($methodName, 0, 2), '__'))
+        {
             $magicPart = substr($methodName, 2);
-            if (in_array($magicPart, self::$magicMethods) === false) {
+            if (in_array($magicPart, self::$magicMethods) === false)
+            {
                  $error = "Method name \"$className::$methodName\" is invalid; only PHP magic methods should be prefixed with a double underscore";
                  $phpcsFile->addError($error, $stackPtr);
             }
@@ -103,16 +105,19 @@ 
         }
 
         // PHP4 constructors are allowed to break our rules.
-        if ($methodName === $className) {
+        if ($methodName === $className)
+        {
             return;
         }
 
         // PHP4 destructors are allowed to break our rules.
-        if ($methodName === '_'.$className) {
+        if ($methodName === '_'.$className)
+        {
             return;
         }
 
-        if (0 !== strcmp($methodName, strtolower($methodName))) {
+        if (0 !== strcmp($methodName, strtolower($methodName)))
+        {
             $uscrdMethodName = preg_replace('/([A-Z])/', '_${1}', $methodName);
             $expectedMethodName = strtolower($uscrdMethodName);
             $error = "Class methods should be entirely lowercased. Please consider \"$expectedMethodName\" instead of \"$methodName\".";
@@ -125,17 +130,22 @@ 
         $scopeSpecified = $methodProps['scope_specified'];
 
         // If it's a private method, it must have an underscore on the front.
-        if ($scope === 'private' && $methodName{0} !== '_') {
+        if ($scope === 'private' && $methodName{0} !== '_')
+        {
             $error = "Private method name \"$className::$methodName\" must be prefixed with an underscore";
             $phpcsFile->addError($error, $stackPtr);
             return;
         }
 
         // If it's not a private method, it must not have an underscore on the front.
-        if ($scope !== 'private' && $methodName{0} === '_') {
-            if (true === $scopeSpecified) {
+        if ($scope !== 'private' && $methodName{0} === '_')
+        {
+            if (true === $scopeSpecified)
+            {
                 $error = "Public method name \"$className::$methodName\" must not be prefixed with an underscore";
-            } else {
+            }
+            else
+            {
                 $error = ucfirst($scope)." method name \"$className::$methodName\" must not be prefixed with an underscore";
             }
             $phpcsFile->addError($error, $stackPtr);
@@ -146,11 +156,14 @@ 
         // then either an error or a warning is displayed.
         $error_limit = 50;
         $warning_limit = 35;
-        if (strlen($methodName) > $error_limit) {
+        if (strlen($methodName) > $error_limit)
+        {
             $error = "Overly long and verbose names are prohibited. Please find a name shorter than $error_limit chars.";
             $phpcsFile->addError($error, $stackPtr);
             return;
-        } else if (strlen($methodName) > $warning_limit) {
+        }
+        else if (strlen($methodName) > $warning_limit)
+        {
             $warning = "Try to avoid overly long and verbose names in finding a name shorter than $warning_limit chars.";
             $phpcsFile->addWarning($warning, $stackPtr);
         }

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -66,7 +66,7 @@ 
      */
     public function __construct()
     {
-        parent::__construct(array(T_CLASS, T_INTERFACE), array(T_FUNCTION), true);
+        parent::__construct(array(T_CLASS, T_INTERFACE), array(T_FUNCTION), TRUE);
 
     }//end __construct()
 
@@ -84,7 +84,7 @@ 
     protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScope)
     {
         $methodName = $phpcsFile->getDeclarationName($stackPtr);
-        if ($methodName === null) {
+        if ($methodName === NULL) {
             // Ignore closures.
             return;
         }
@@ -94,7 +94,7 @@ 
         // Is this a magic method i.e. is prefixed with "__".
         if (0 === strcmp(substr($methodName, 0, 2), '__')) {
             $magicPart = substr($methodName, 2);
-            if (in_array($magicPart, self::$magicMethods) === false) {
+            if (in_array($magicPart, self::$magicMethods) === FALSE) {
                  $error = "Method name \"$className::$methodName\" is invalid; only PHP magic methods should be prefixed with a double underscore";
                  $phpcsFile->addError($error, $stackPtr);
             }
@@ -133,7 +133,7 @@ 
 
         // If it's not a private method, it must not have an underscore on the front.
         if ($scope !== 'private' && $methodName{0} === '_') {
-            if (true === $scopeSpecified) {
+            if (TRUE === $scopeSpecified) {
                 $error = "Public method name \"$className::$methodName\" must not be prefixed with an underscore";
             } else {
                 $error = ucfirst($scope)." method name \"$className::$methodName\" must not be prefixed with an underscore";